History

Backmerge drm-fixes merge into Linus's tree into drm-next.

This merges '5b726e06d6e8309e5c9ef4109a32caf27c71dfc8' into drm-next Just to resolve some merges to make Daniel's life easier.

Dave Airlie committed 10 years ago

Commit 20f8e032 parents ade1ba7 5b726e0529 files · +4211 −2598Browse files

Unified · Split

529 files
  1. Documentation/devicetree/bindings/dma/ti-edma.txt +4 −6
  2. Documentation/devicetree/bindings/gpio/gpio-mpc8xxx.txt +4 −0
  3. Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt +1 −1
  4. Documentation/devicetree/bindings/mtd/partition.txt +6 −1
  5. Documentation/networking/e100.txt +0 −14
  6. MAINTAINERS +18 −2
  7. Makefile +1 −1
  8. arch/arc/Kconfig +1 −0
  9. arch/arc/boot/dts/axs10x_mb.dtsi +1 −0
  10. arch/arc/boot/dts/nsim_hs.dts +2 −1
  11. arch/arc/include/asm/mach_desc.h +2 −2
  12. arch/arc/include/asm/smp.h +2 −2
  13. arch/arc/include/asm/unwind.h +0 −4
  14. arch/arc/kernel/intc-arcv2.c +13 −2
  15. arch/arc/kernel/irq.c +24 −9
  16. arch/arc/kernel/mcip.c +1 −1
  17. arch/arc/kernel/perf_event.c +9 −23
  18. arch/arc/kernel/setup.c +0 −1
  19. arch/arc/kernel/smp.c +4 −4
  20. arch/arc/kernel/unwind.c +35 −18
  21. arch/arc/mm/init.c +3 −1
  22. arch/arm/boot/dts/am4372.dtsi +2 −2
  23. arch/arm/boot/dts/am43xx-clocks.dtsi +8 −0
  24. arch/arm/boot/dts/at91-sama5d2_xplained.dts +1 −0
  25. arch/arm/boot/dts/berlin2q.dtsi +5 −3
  26. arch/arm/boot/dts/dm816x.dtsi +6 −2
  27. arch/arm/boot/dts/vf610-colibri.dtsi +0 −5
  28. arch/arm/boot/dts/vf610.dtsi +1 −1
  29. arch/arm/boot/dts/vfxxx.dtsi +4 −2
  30. arch/arm/include/asm/arch_gicv3.h +1 −0
  31. arch/arm/include/asm/uaccess.h +4 −0
  32. arch/arm/kernel/process.c +18 −15
  33. arch/arm/kernel/swp_emulate.c +3 −3
  34. arch/arm/lib/uaccess_with_memcpy.c +23 −6
  35. arch/arm/mach-at91/Kconfig +5 −1
  36. arch/arm/mach-at91/pm.c +6 −1
  37. arch/arm/mach-exynos/pmu.c +5 −1
  38. arch/arm/mach-ixp4xx/include/mach/io.h +6 −6
  39. arch/arm/mach-omap2/Kconfig +1 −1
  40. arch/arm/mach-pxa/ezx.c +5 −0
  41. arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c +1 −1
  42. arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c +1 −1
  43. arch/arm/mm/context.c +26 −12
  44. arch/arm/mm/dma-mapping.c +1 −1
  45. arch/arm/mm/init.c +62 −30
  46. arch/arm/mm/proc-v7.S +2 −2
  47. arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +5 −0
  48. arch/arm64/include/asm/arch_gicv3.h +1 −0
  49. arch/arm64/include/asm/pgtable.h +8 −4
  50. arch/arm64/kernel/vmlinux.lds.S +3 −2
  51. arch/blackfin/kernel/perf_event.c +1 −1
  52. arch/ia64/include/asm/unistd.h +1 −1
  53. arch/ia64/include/uapi/asm/unistd.h +1 −0
  54. arch/ia64/kernel/entry.S +1 −0
  55. arch/microblaze/kernel/dma.c +2 −1
  56. arch/mips/mm/dma-default.c +1 −1
  57. arch/parisc/include/asm/pgtable.h +2 −1
  58. arch/parisc/include/uapi/asm/unistd.h +2 −1
  59. arch/parisc/kernel/pci.c +0 −18
  60. arch/parisc/kernel/syscall_table.S +1 −0
  61. arch/powerpc/boot/dts/sbc8641d.dts +0 −8
  62. arch/powerpc/include/asm/systbl.h +12 −12
  63. arch/powerpc/include/uapi/asm/unistd.h +0 −12
  64. arch/powerpc/kernel/eeh_driver.c +4 −10
  65. arch/powerpc/kvm/book3s_hv.c +6 −0
  66. arch/powerpc/platforms/powernv/opal-irqchip.c +38 −26
  67. arch/powerpc/platforms/powernv/opal.c +1 −1
  68. arch/s390/kernel/dis.c +12 −5
  69. arch/sh/include/uapi/asm/unistd_64.h +1 −1
  70. arch/sh/kernel/perf_event.c +1 −1
  71. arch/sparc/kernel/perf_event.c +1 −1
  72. arch/tile/kernel/perf_event.c +1 −1
  73. arch/um/Makefile +1 −1
  74. arch/um/drivers/net_user.c +6 −4
  75. arch/um/kernel/signal.c +1 −1
  76. arch/x86/kernel/cpu/perf_event.c +1 −1
  77. arch/x86/kernel/cpu/perf_event.h +3 −2
  78. arch/x86/kernel/cpu/perf_event_intel.c +1 −1
  79. arch/x86/kernel/cpu/perf_event_intel_cqm.c +1 −1
  80. arch/x86/kernel/cpu/perf_event_intel_lbr.c +3 −1
  81. arch/x86/kernel/irq_work.c +1 −1
  82. arch/x86/kvm/cpuid.h +8 −0
  83. arch/x86/kvm/mtrr.c +19 −6
  84. arch/x86/kvm/svm.c +2 −2
  85. arch/x86/kvm/vmx.c +4 −3
  86. arch/x86/kvm/x86.c +8 −4
  87. arch/x86/mm/dump_pagetables.c +1 −1
  88. arch/x86/um/signal.c +10 −8
  89. arch/x86/xen/mmu.c +2 −7
  90. arch/x86/xen/suspend.c +10 −10
  91. block/blk-cgroup.c +3 −3
  92. block/blk-core.c +14 −2
  93. crypto/ablkcipher.c +1 −1
  94. crypto/blkcipher.c +1 −1
  95. drivers/acpi/nfit.c +1 −1
  96. drivers/ata/ahci.c +12 −10
  97. drivers/ata/ahci_mvebu.c +5 −0
  98. drivers/ata/libahci.c +9 −0
  99. drivers/ata/libata-eh.c +8 −0
  100. drivers/ata/sata_fsl.c +2 −1
  101. drivers/ata/sata_sil.c +3 −0
  102. drivers/base/memory.c +4 −0
  103. drivers/base/power/domain.c +22 −11
  104. drivers/block/null_blk.c +24 −14
  105. drivers/block/xen-blkback/blkback.c +10 −5
  106. drivers/block/xen-blkback/common.h +4 −4
  107. drivers/char/ipmi/ipmi_si_intf.c +4 −4
  108. drivers/clk/clk-gpio.c +17 −16
  109. drivers/clk/clk-qoriq.c +3 −1
  110. drivers/clk/clk-scpi.c +1 −0
  111. drivers/clk/imx/clk-pllv1.c +7 −7
  112. drivers/clk/imx/clk-pllv2.c +5 −4
  113. drivers/clk/imx/clk-vf610.c +4 −4
  114. drivers/clk/mmp/clk-mmp2.c +1 −0
  115. drivers/clk/mmp/clk-pxa168.c +1 −0
  116. drivers/clk/mmp/clk-pxa910.c +1 −0
  117. drivers/clk/sunxi/clk-a10-pll2.c +5 −18
  118. drivers/clk/ti/clk-816x.c +2 −0
  119. drivers/clk/ti/clkt_dpll.c +2 −2
  120. drivers/clk/ti/divider.c +3 −13
  121. drivers/clk/ti/fapll.c +2 −2
  122. drivers/clk/ti/mux.c +3 −12
  123. drivers/clocksource/mmio.c +1 −1
  124. drivers/cpufreq/Kconfig.arm +1 −1
  125. drivers/cpufreq/intel_pstate.c +1 −1
  126. drivers/cpufreq/s3c24xx-cpufreq.c +1 −1
  127. drivers/dma/at_xdmac.c +6 −3
  128. drivers/dma/bcm2835-dma.c +54 −24
  129. drivers/dma/edma.c +35 −18
  130. drivers/dma/mic_x100_dma.c +10 −5
  131. drivers/fpga/fpga-mgr.c +4 −9
  132. drivers/gpio/gpio-ath79.c +1 −1
  133. drivers/gpio/gpio-generic.c +2 −2
  134. drivers/gpio/gpiolib.c +7 −1
  135. drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 −1
  136. drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +42 −21
  137. drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +8 −0
  138. drivers/gpu/drm/exynos/exynos_drm_crtc.c +3 −0
  139. drivers/gpu/drm/i915/intel_display.c +19 −1
  140. drivers/gpu/drm/i915/intel_hdmi.c +4 −3
  141. drivers/gpu/drm/i915/intel_pm.c +2 −3
  142. drivers/gpu/drm/nouveau/include/nvkm/core/device.h +0 −1
  143. drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c +4 −31
  144. drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c +1 −0
  145. drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c +1 −3
  146. drivers/gpu/drm/omapdrm/omap_fbdev.c +1 −4
  147. drivers/gpu/drm/radeon/cik.c +1 −5
  148. drivers/gpu/drm/radeon/radeon_vce.c +50 −50
  149. drivers/gpu/drm/ttm/ttm_lock.c +1 −1
  150. drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +1 −0
  151. drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +1 −0
  152. drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +1 −1
  153. drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +51 −13
  154. drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +5 −2
  155. drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +1 −1
  156. drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +1 −1
  157. drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +1 −1
  158. drivers/gpu/vga/vgaarb.c +4 −2
  159. drivers/hid/hid-ids.h +0 −5
  160. drivers/hid/usbhid/hid-quirks.c +3 −6
  161. drivers/hwmon/Kconfig +1 −0
  162. drivers/hwmon/tmp102.c +15 −1
  163. drivers/i2c/busses/i2c-davinci.c +9 −2
  164. drivers/i2c/busses/i2c-designware-core.c +6 −0
  165. drivers/i2c/busses/i2c-designware-core.h +1 −0
  166. drivers/i2c/busses/i2c-designware-platdrv.c +10 −6
  167. drivers/i2c/busses/i2c-imx.c +2 −2
  168. drivers/i2c/busses/i2c-mv64xxx.c +18 −9
  169. drivers/i2c/busses/i2c-rcar.c +2 −2
  170. drivers/i2c/busses/i2c-rk3x.c +1 −1
  171. drivers/i2c/busses/i2c-st.c +1 −1
  172. drivers/iio/adc/qcom-spmi-vadc.c +3 −1
  173. drivers/iio/industrialio-buffer.c +1 −1
  174. drivers/iio/industrialio-core.c +1 −1
  175. drivers/iio/light/apds9960.c +1 −0
  176. drivers/iio/proximity/pulsedlight-lidar-lite-v2.c +3 −3
  177. drivers/infiniband/core/cma.c +1 −4
  178. drivers/infiniband/core/mad.c +5 −0
  179. drivers/infiniband/core/sa_query.c +17 −15
  180. drivers/infiniband/core/uverbs_cmd.c +17 −10
  181. drivers/infiniband/core/verbs.c +22 −21
  182. drivers/infiniband/hw/mlx4/main.c +1 −1
  183. drivers/infiniband/hw/mlx4/qp.c +13 −6
  184. drivers/infiniband/hw/mlx4/srq.c +8 −3
  185. drivers/infiniband/hw/mlx5/mr.c +13 −1
  186. drivers/infiniband/hw/qib/qib_qsfp.c +2 −2
  187. drivers/infiniband/hw/qib/qib_verbs.h +1 −1
  188. drivers/infiniband/ulp/iser/iser_verbs.c +1 −1
  189. drivers/infiniband/ulp/isert/ib_isert.c +3 −10
  190. drivers/infiniband/ulp/srp/ib_srp.c +26 −22
  191. drivers/infiniband/ulp/srp/ib_srp.h +1 −4
  192. drivers/input/joystick/db9.c +1 −0
  193. drivers/input/joystick/gamecon.c +1 −0
  194. drivers/input/joystick/turbografx.c +1 −0
  195. drivers/input/joystick/walkera0701.c +1 −0
  196. drivers/input/misc/arizona-haptics.c +1 −2
  197. drivers/input/mouse/elan_i2c_core.c +3 −0
  198. drivers/input/serio/parkbd.c +1 −0
  199. drivers/input/tablet/aiptek.c +9 −0
  200. drivers/input/touchscreen/atmel_mxt_ts.c +34 −0
  201. drivers/input/touchscreen/elants_i2c.c +12 −9
  202. drivers/iommu/amd_iommu_v2.c +18 −2
  203. drivers/iommu/intel-iommu.c +2 −2
  204. drivers/iommu/intel-svm.c +20 −0
  205. drivers/iommu/iommu.c +1 −1
  206. drivers/irqchip/irq-versatile-fpga.c +5 −0
  207. drivers/isdn/gigaset/ser-gigaset.c +11 −12
  208. drivers/isdn/hardware/mISDN/mISDNipac.c +3 −4
  209. drivers/lightnvm/Kconfig +1 −0
  210. drivers/lightnvm/core.c +42 −43
  211. drivers/lightnvm/gennvm.c +11 −9
  212. drivers/lightnvm/rrpc.c +21 −4
  213. drivers/md/dm-thin-metadata.c +29 −5
  214. drivers/md/md.c +15 −7
  215. drivers/md/md.h +6 −2
  216. drivers/md/persistent-data/dm-btree.c +99 −2
  217. drivers/md/persistent-data/dm-btree.h +11 −3
  218. drivers/md/persistent-data/dm-space-map-metadata.c +22 −10
  219. drivers/md/raid10.c +3 −1
  220. drivers/media/pci/ivtv/ivtv-driver.c +2 −2
  221. drivers/media/usb/airspy/airspy.c +1 −1
  222. drivers/media/usb/hackrf/hackrf.c +12 −1
  223. drivers/misc/cxl/native.c +1 −1
  224. drivers/mtd/ofpart.c +10 −2
  225. drivers/net/ethernet/amd/xgbe/xgbe-dev.c +2 −2
  226. drivers/net/ethernet/apm/xgene/xgene_enet_main.c +22 −16
  227. drivers/net/ethernet/apm/xgene/xgene_enet_main.h +2 −2
  228. drivers/net/ethernet/atheros/atl1c/atl1c_main.c +3 −4
  229. drivers/net/ethernet/aurora/Kconfig +1 −0
  230. drivers/net/ethernet/broadcom/bnxt/bnxt.c +32 −14
  231. drivers/net/ethernet/broadcom/bnxt/bnxt.h +3 −3
  232. drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c +1 −1
  233. drivers/net/ethernet/cavium/thunder/nic_main.c +18 −21
  234. drivers/net/ethernet/ezchip/nps_enet.c +9 −21
  235. drivers/net/ethernet/freescale/fs_enet/mac-fcc.c +1 −1
  236. drivers/net/ethernet/freescale/fsl_pq_mdio.c +1 −1
  237. drivers/net/ethernet/freescale/gianfar.c +5 −3
  238. drivers/net/ethernet/freescale/gianfar.h +1 −0
  239. drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +14 −35
  240. drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h +6 −5
  241. drivers/net/ethernet/intel/i40e/i40e_adminq.c +0 −6
  242. drivers/net/ethernet/intel/i40e/i40e_main.c +10 −1
  243. drivers/net/ethernet/intel/i40evf/i40e_adminq.c +0 −6
  244. drivers/net/ethernet/intel/i40evf/i40evf_main.c +10 −0
  245. drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +3 −0
  246. drivers/net/ethernet/marvell/mvpp2.c +33 −19
  247. drivers/net/ethernet/mellanox/mlx4/cmd.c +1 −1
  248. drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +3 −2
  249. drivers/net/ethernet/qlogic/qed/qed.h +3 −0
  250. drivers/net/ethernet/qlogic/qed/qed_dev.c +32 −21
  251. drivers/net/ethernet/qlogic/qed/qed_int.c +24 −9
  252. drivers/net/ethernet/qlogic/qed/qed_int.h +10 −5
  253. drivers/net/ethernet/qlogic/qed/qed_main.c +18 −38
  254. drivers/net/ethernet/qlogic/qed/qed_reg_addr.h +4 −0
  255. drivers/net/ethernet/qlogic/qed/qed_sp.h +6 −2
  256. drivers/net/ethernet/qlogic/qed/qed_spq.c +48 −15
  257. drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c +2 −1
  258. drivers/net/ethernet/qlogic/qlge/qlge_main.c +3 −2
  259. drivers/net/ethernet/qualcomm/qca_spi.c +2 −3
  260. drivers/net/ethernet/renesas/ravb_main.c +4 −1
  261. drivers/net/ethernet/renesas/sh_eth.c +41 −14
  262. drivers/net/ethernet/renesas/sh_eth.h +0 −25
  263. drivers/net/ethernet/sfc/ef10.c +12 −12
  264. drivers/net/ethernet/sfc/efx.h +5 −0
  265. drivers/net/ethernet/sfc/farch.c +1 −1
  266. drivers/net/ethernet/sfc/txc43128_phy.c +1 −1
  267. drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c +5 −1
  268. drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +6 −3
  269. drivers/net/geneve.c +0 −2
  270. drivers/net/phy/mdio-mux.c +6 −1
  271. drivers/net/phy/micrel.c +11 −2
  272. drivers/net/ppp/pppoe.c +10 −4
  273. drivers/net/ppp/pptp.c +6 −0
  274. drivers/net/usb/cdc_mbim.c +25 −1
  275. drivers/net/usb/cdc_ncm.c +9 −1
  276. drivers/net/usb/r8152.c +3 −18
  277. drivers/net/virtio_net.c +19 −15
  278. drivers/net/vxlan.c +59 −16
  279. drivers/net/xen-netback/netback.c +15 −19
  280. drivers/nvme/host/lightnvm.c +14 −12
  281. drivers/nvme/host/pci.c +19 −1
  282. drivers/of/address.c +3 −2
  283. drivers/of/fdt.c +6 −1
  284. drivers/of/irq.c +2 −1
  285. drivers/of/of_reserved_mem.c +7 −1
  286. drivers/parisc/iommu-helpers.h +8 −7
  287. drivers/pci/host/pcie-altera.c +16 −7
  288. drivers/pci/msi.c +2 −2
  289. drivers/phy/Kconfig +1 −0
  290. drivers/phy/phy-bcm-cygnus-pcie.c +12 −4
  291. drivers/phy/phy-berlin-sata.c +14 −6
  292. drivers/phy/phy-brcmstb-sata.c +12 −5
  293. drivers/phy/phy-core.c +15 −6
  294. drivers/phy/phy-miphy28lp.c +11 −5
  295. drivers/phy/phy-miphy365x.c +11 −5
  296. drivers/phy/phy-mt65xx-usb3.c +13 −7
  297. drivers/phy/phy-rockchip-usb.c +12 −5
  298. drivers/pinctrl/bcm/pinctrl-bcm2835.c +7 −6
  299. drivers/pinctrl/freescale/pinctrl-vf610.c +1 −1
  300. drivers/pinctrl/intel/pinctrl-broxton.c +1 −0
  301. drivers/pinctrl/intel/pinctrl-intel.c +20 −21
  302. drivers/pinctrl/intel/pinctrl-intel.h +3 −0
  303. drivers/pinctrl/intel/pinctrl-sunrisepoint.c +1 −0
  304. drivers/powercap/intel_rapl.c +5 −2
  305. drivers/rtc/rtc-da9063.c +9 −10
  306. drivers/rtc/rtc-rk808.c +44 −4
  307. drivers/s390/crypto/ap_bus.c +3 −1
  308. drivers/s390/virtio/virtio_ccw.c +37 −25
  309. drivers/scsi/scsi_pm.c +10 −10
  310. drivers/scsi/ses.c +28 −2
  311. drivers/spi/spi-fsl-dspi.c +6 −6
  312. drivers/spi/spi.c +1 −1
  313. drivers/spi/spidev.c +1 −1
  314. drivers/staging/android/ion/ion_chunk_heap.c +2 −2
  315. drivers/staging/iio/iio_simple_dummy_events.c +1 −1
  316. drivers/staging/lustre/lustre/obdecho/echo_client.c +11 −9
  317. drivers/tty/n_tty.c +9 −13
  318. drivers/tty/serial/8250/8250_uniphier.c +6 −2
  319. drivers/tty/serial/earlycon.c +2 −0
  320. drivers/tty/serial/sh-sci.c +1 −1
  321. drivers/tty/tty_buffer.c +1 −1
  322. drivers/usb/class/cdc-acm.c +5 −0
  323. drivers/usb/core/config.c +2 −1
  324. drivers/usb/core/hub.c +33 −11
  325. drivers/usb/core/port.c +2 −2
  326. drivers/usb/core/quirks.c +9 −0
  327. drivers/usb/dwc2/platform.c +53 −28
  328. drivers/usb/dwc3/gadget.c +1 −0
  329. drivers/usb/gadget/function/f_fs.c +3 −3
  330. drivers/usb/gadget/function/f_midi.c +2 −1
  331. drivers/usb/gadget/function/uvc_configfs.c +1 −1
  332. drivers/usb/gadget/udc/pxa27x_udc.c +3 −0
  333. drivers/usb/host/ohci-at91.c +5 −6
  334. drivers/usb/host/whci/qset.c +4 −0
  335. drivers/usb/host/xhci-hub.c +42 −5
  336. drivers/usb/host/xhci-pci.c +6 −2
  337. drivers/usb/host/xhci-ring.c +2 −1
  338. drivers/usb/host/xhci.c +8 −0
  339. drivers/usb/musb/Kconfig +1 −1
  340. drivers/usb/musb/musb_core.c +7 −1
  341. drivers/usb/phy/phy-msm-usb.c +3 −3
  342. drivers/usb/phy/phy-mxs-usb.c +5 −0
  343. drivers/usb/renesas_usbhs/mod_gadget.c +9 −2
  344. drivers/usb/serial/cp210x.c +0 −1
  345. drivers/usb/serial/ipaq.c +2 −1
  346. drivers/usb/serial/usb-serial-simple.c +1 −0
  347. drivers/usb/storage/uas.c +4 −0
  348. drivers/usb/storage/unusual_devs.h +1 −1
  349. drivers/usb/storage/unusual_uas.h +1 −1
  350. drivers/vfio/Kconfig +0 −15
  351. drivers/vfio/pci/vfio_pci.c +5 −5
  352. drivers/vfio/platform/vfio_platform.c +0 −1
  353. drivers/vfio/platform/vfio_platform_common.c +1 −4
  354. drivers/vfio/vfio.c +7 −181
  355. drivers/vhost/vhost.c +4 −4
  356. drivers/video/fbdev/fsl-diu-fb.c +12 −1
  357. drivers/video/fbdev/omap2/dss/venc.c +12 −0
  358. drivers/virtio/virtio.c +1 −0
  359. drivers/virtio/virtio_ring.c +35 −13
  360. drivers/xen/events/events_fifo.c +18 −5
  361. drivers/xen/xen-pciback/pciback.h +1 −0
  362. drivers/xen/xen-pciback/pciback_ops.c +60 −15
  363. drivers/xen/xen-pciback/xenbus.c +3 −1
  364. drivers/xen/xen-scsiback.c +1 −1
  365. fs/9p/vfs_inode.c +2 −2
  366. fs/block_dev.c +6 −3
  367. fs/btrfs/extent-tree.c +7 −3
  368. fs/btrfs/file.c +14 −4
  369. fs/btrfs/free-space-cache.c +6 −4
  370. fs/btrfs/transaction.c +0 −1
  371. fs/btrfs/transaction.h +1 −1
  372. fs/btrfs/volumes.c +1 −2
  373. fs/cifs/inode.c +3 −3
  374. fs/direct-io.c +1 −0
  375. fs/exofs/inode.c +1 −4
  376. fs/ext4/crypto.c +1 −1
  377. fs/ext4/ext4.h +44 −7
  378. fs/ext4/symlink.c +1 −1
  379. fs/ext4/sysfs.c +1 −1
  380. fs/fuse/cuse.c +2 −0
  381. fs/fuse/file.c +1 −1
  382. fs/jbd2/transaction.c +9 −3
  383. fs/nfs/callback_xdr.c +2 −5
  384. fs/nfs/inode.c +3 −3
  385. fs/nfs/internal.h +1 −1
  386. fs/nfs/objlayout/objio_osd.c +1 −4
  387. fs/nfs/pagelist.c +1 −1
  388. fs/nfs/pnfs.c +2 −2
  389. fs/nfsd/nfs4layouts.c +1 −1
  390. fs/ocfs2/namei.c +1 −3
  391. fs/proc/base.c +1 −0
  392. include/asm-generic/tlb.h +1 −1
  393. include/linux/bitops.h +1 −1
  394. include/linux/cgroup-defs.h +3 −10
  395. include/linux/cgroup.h +23 −24
  396. include/linux/enclosure.h +4 −0
  397. include/linux/irqchip/arm-gic-v3.h +1 −0
  398. include/linux/jump_label.h +1 −1
  399. include/linux/kmemleak.h +1 −1
  400. include/linux/libata.h +1 −0
  401. include/linux/lightnvm.h +14 −7
  402. include/linux/lockdep.h +1 −1
  403. include/linux/mlx4/device.h +11 −0
  404. include/linux/mmdebug.h +1 −0
  405. include/linux/netdevice.h +1 −1
  406. include/linux/netfilter/nfnetlink.h +1 −1
  407. include/linux/of_irq.h +12 −7
  408. include/linux/perf_event.h +4 −2
  409. include/linux/platform_data/edma.h +1 −1
  410. include/linux/proportions.h +1 −1
  411. include/linux/qed/common_hsi.h +2 −0
  412. include/linux/qed/qed_chain.h +2 −1
  413. include/linux/rhashtable.h +11 −7
  414. include/linux/stop_machine.h +3 −3
  415. include/linux/uprobes.h +1 −1
  416. include/linux/usb/quirks.h +3 −0
  417. include/linux/vfio.h +0 −3
  418. include/linux/wait.h +5 −5
  419. include/net/dst.h +33 −0
  420. include/net/inet_sock.h +23 −4
  421. include/net/inetpeer.h +1 −0
  422. include/net/sctp/structs.h +2 −1
  423. include/net/sock.h +5 −2
  424. include/net/vxlan.h +1 −1
  425. include/net/xfrm.h +16 −9
  426. include/rdma/ib_mad.h +2 −0
  427. include/rdma/ib_verbs.h +1 −0
  428. include/sound/hda_register.h +3 −0
  429. include/uapi/linux/Kbuild +1 −0
  430. include/uapi/linux/openvswitch.h +1 −1
  431. include/uapi/linux/vfio.h +0 −7
  432. include/xen/interface/io/ring.h +14 −0
  433. init/Kconfig +0 −7
  434. kernel/cgroup.c +78 −21
  435. kernel/cgroup_freezer.c +10 −13
  436. kernel/cgroup_pids.c +20 −57
  437. kernel/cpuset.c +21 −12
  438. kernel/events/callchain.c +1 −1
  439. kernel/events/core.c +64 −26
  440. kernel/events/ring_buffer.c +1 −1
  441. kernel/events/uprobes.c +1 −1
  442. kernel/fork.c +3 −6
  443. kernel/irq_work.c +1 −1
  444. kernel/jump_label.c +1 −1
  445. kernel/locking/lockdep.c +1 −1
  446. kernel/locking/lockdep_proc.c +1 −1
  447. kernel/locking/osq_lock.c +5 −3
  448. kernel/sched/clock.c +1 −1
  449. kernel/sched/core.c +6 −6
  450. kernel/sched/fair.c +1 −1
  451. kernel/sched/wait.c +10 −10
  452. kernel/stop_machine.c +2 −2
  453. kernel/trace/trace_event_perf.c +1 −1
  454. lib/btree.c +1 −1
  455. lib/dma-debug.c +2 −2
  456. lib/proportions.c +1 −1
  457. lib/rhashtable.c +40 −27
  458. mm/backing-dev.c +16 −3
  459. mm/hugetlb.c +20 −7
  460. mm/memcontrol.c +25 −24
  461. mm/oom_kill.c +2 −0
  462. mm/page-writeback.c +1 −1
  463. mm/page_alloc.c +2 −1
  464. mm/shmem.c +14 −20
  465. mm/vmstat.c +5 −3
  466. mm/zswap.c +3 −3
  467. net/ax25/af_ax25.c +3 −0
  468. net/batman-adv/distributed-arp-table.c +4 −1
  469. net/batman-adv/routing.c +15 −4
  470. net/batman-adv/translation-table.c +12 −4
  471. net/bluetooth/sco.c +3 −0
  472. net/core/netclassid_cgroup.c +4 −2
  473. net/core/netprio_cgroup.c +5 −4
  474. net/core/skbuff.c +3 −2
  475. net/core/sock.c +3 −4
  476. net/decnet/af_decnet.c +3 −0
  477. net/ipv4/af_inet.c +3 −0
  478. net/ipv4/fib_frontend.c +9 −0
  479. net/ipv4/fou.c +2 −1
  480. net/ipv4/netfilter/Kconfig +1 −0
  481. net/ipv4/tcp_ipv4.c +2 −3
  482. net/ipv4/tcp_output.c +12 −11
  483. net/ipv6/addrconf.c +7 −1
  484. net/ipv6/af_inet6.c +3 −0
  485. net/ipv6/ip6_gre.c +3 −5
  486. net/ipv6/netfilter/Kconfig +1 −0
  487. net/ipv6/tcp_ipv6.c +1 −2
  488. net/irda/af_irda.c +3 −0
  489. net/mac80211/cfg.c +1 −2
  490. net/mac80211/ieee80211_i.h +2 −2
  491. net/mac80211/mlme.c +11 −6
  492. net/mac80211/rx.c +1 −2
  493. net/mac80211/util.c +63 −50
  494. net/mac80211/vht.c +3 −7
  495. net/mpls/af_mpls.c +31 −12
  496. net/mpls/mpls_iptunnel.c +2 −2
  497. net/netfilter/nf_tables_api.c +47 −52
  498. net/netfilter/nfnetlink.c +1 −3
  499. net/netfilter/nfnetlink_queue.c +6 −3
  500. net/openvswitch/conntrack.c +13 −3
  501. net/rfkill/core.c +3 −3
  502. net/sched/sch_api.c +1 −1
  503. net/sctp/ipv6.c +9 −2
  504. net/sctp/outqueue.c +2 −0
  505. net/sctp/sm_make_chunk.c +2 −2
  506. net/sctp/sm_statefuns.c +2 −1
  507. net/sctp/socket.c +6 −6
  508. net/socket.c +1 −0
  509. net/sunrpc/backchannel_rqst.c +0 −8
  510. net/sunrpc/sched.c +3 −3
  511. net/sunrpc/svc.c +12 −0
  512. net/unix/af_unix.c +3 −10
  513. net/wireless/nl80211.c +4 −1
  514. net/wireless/reg.c +4 −1
  515. net/xfrm/xfrm_policy.c +36 −14
  516. scripts/link-vmlinux.sh +1 −1
  517. sound/pci/hda/hda_intel.c +23 −0
  518. sound/pci/hda/patch_ca0132.c +2 −1
  519. sound/pci/hda/patch_realtek.c +55 −7
  520. sound/pci/rme96.c +26 −15
  521. sound/usb/mixer.c +2 −0
  522. sound/usb/mixer_maps.c +0 −12
  523. sound/usb/mixer_quirks.c +37 −0
  524. sound/usb/mixer_quirks.h +4 −0
  525. sound/usb/quirks.c +1 −0
  526. tools/virtio/linux/kernel.h +6 −0
  527. tools/virtio/linux/virtio.h +0 −6
  528. tools/virtio/linux/virtio_config.h +13 −7
  529. virt/kvm/arm/vgic.c +1 −1
Documentation/devicetree/bindings/dma/ti-edma.txt+4−6
@@ -22,8 +22,7 @@ Required properties: · 21 unmodified lines
2222 Optional properties:
2323 - ti,hwmods: Name of the hwmods associated to the eDMA CC
2424 - ti,edma-memcpy-channels: List of channels allocated to be used for memcpy, iow
25− these channels will be SW triggered channels. The list must
26− contain 16 bits numbers, see example.
25+ these channels will be SW triggered channels. See example.
2726 - ti,edma-reserved-slot-ranges: PaRAM slot ranges which should not be used by
2827 the driver, they are allocated to be used by for example the
2928 DSP. See example.
@@ -56,10 +55,9 @@ edma: edma@49000000 { · 26 unmodified lines
5655 ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 7>, <&edma_tptc2 0>;
5756
5857 /* Channel 20 and 21 is allocated for memcpy */
59− ti,edma-memcpy-channels = /bits/ 16 <20 21>;
60− /* The following PaRAM slots are reserved: 35-45 and 100-110 */
61− ti,edma-reserved-slot-ranges = /bits/ 16 <35 10>,
62− /bits/ 16 <100 10>;
58+ ti,edma-memcpy-channels = <20 21>;
59+ /* The following PaRAM slots are reserved: 35-44 and 100-109 */
60+ ti,edma-reserved-slot-ranges = <35 10>, <100 10>;
6361 };
6462
6563 edma_tptc0: tptc@49800000 {
Documentation/devicetree/bindings/gpio/gpio-mpc8xxx.txt+4−0
@@ -11,6 +11,10 @@ Required properties: · 10 unmodified lines
1111 0 = active high
1212 1 = active low
1313
14+Optional properties:
15+- little-endian : GPIO registers are used as little endian. If not
16+ present registers are used as big endian by default.
17+
1418 Example:
1519
1620 gpio0: gpio@1100 {
Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt+1−1
@@ -12,7 +12,7 @@ Each key is represented as a sub-node of "allwinner,sun4i-a10-lradc-keys": · 11 unmodified lines
1212 Required subnode-properties:
1313 - label: Descriptive name of the key.
1414 - linux,code: Keycode to emit.
15− - channel: Channel this key is attached to, mut be 0 or 1.
15+ - channel: Channel this key is attached to, must be 0 or 1.
1616 - voltage: Voltage in µV at lradc input when this key is pressed.
1717
1818 Example:
Documentation/devicetree/bindings/mtd/partition.txt+6−1
@@ -6,7 +6,9 @@ used for what purposes, but which don't use an on-flash partition table such · 5 unmodified lines
66 as RedBoot.
77
88 The partition table should be a subnode of the mtd node and should be named
9−'partitions'. Partitions are defined in subnodes of the partitions node.
9+'partitions'. This node should have the following property:
10+- compatible : (required) must be "fixed-partitions"
11+Partitions are then defined in subnodes of the partitions node.
1012
1113 For backwards compatibility partitions as direct subnodes of the mtd device are
1214 supported. This use is discouraged.
@@ -36,6 +38,7 @@ Examples: · 23 unmodified lines
3638
3739 flash@0 {
3840 partitions {
41+ compatible = "fixed-partitions";
3942 #address-cells = <1>;
4043 #size-cells = <1>;
4144
@@ -53,6 +56,7 @@ flash@0 { · 11 unmodified lines
5356
5457 flash@1 {
5558 partitions {
59+ compatible = "fixed-partitions";
5660 #address-cells = <1>;
5761 #size-cells = <2>;
5862
@@ -66,6 +70,7 @@ flash@1 { · 7 unmodified lines
6670
6771 flash@2 {
6872 partitions {
73+ compatible = "fixed-partitions";
6974 #address-cells = <2>;
7075 #size-cells = <2>;
7176
Documentation/networking/e100.txt+0−14
@@ -181,17 +181,3 @@ For general information, go to the Intel support website at: · 180 unmodified lines
181181 If an issue is identified with the released source code on the supported
182182 kernel with a supported adapter, email the specific information related to the
183183 issue to e1000-devel@lists.sourceforge.net.
184−
185−
186−License
187−=======
188−
189−This software program is released under the terms of a license agreement
190−between you ('Licensee') and Intel. Do not use or load this software or any
191−associated materials (collectively, the 'Software') until you have carefully
192−read the full terms and conditions of the file COPYING located in this software
193−package. By loading or using the Software, you agree to the terms of this
194−Agreement. If you do not agree with the terms of this Agreement, do not install
195−or use the Software.
196−
197−* Other names and brands may be claimed as the property of others.
MAINTAINERS+18−2
@@ -2975,6 +2975,7 @@ F: kernel/cpuset.c · 2974 unmodified lines
29752975 CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
29762976 M: Johannes Weiner <hannes@cmpxchg.org>
29772977 M: Michal Hocko <mhocko@kernel.org>
2978+M: Vladimir Davydov <vdavydov@virtuozzo.com>
29782979 L: cgroups@vger.kernel.org
29792980 L: linux-mm@kvack.org
29802981 S: Maintained
@@ -5586,7 +5587,7 @@ R: Jesse Brandeburg <jesse.brandeburg@intel.com> · 2605 unmodified lines
55865587 R: Shannon Nelson <shannon.nelson@intel.com>
55875588 R: Carolyn Wyborny <carolyn.wyborny@intel.com>
55885589 R: Don Skidmore <donald.c.skidmore@intel.com>
5589−R: Matthew Vick <matthew.vick@intel.com>
5590+R: Bruce Allan <bruce.w.allan@intel.com>
55905591 R: John Ronciak <john.ronciak@intel.com>
55915592 R: Mitch Williams <mitch.a.williams@intel.com>
55925593 L: intel-wired-lan@lists.osuosl.org
@@ -8295,7 +8296,7 @@ F: include/linux/delayacct.h · 2702 unmodified lines
82958296 F: kernel/delayacct.c
82968297
82978298 PERFORMANCE EVENTS SUBSYSTEM
8298−M: Peter Zijlstra <a.p.zijlstra@chello.nl>
8299+M: Peter Zijlstra <peterz@infradead.org>
82998300 M: Ingo Molnar <mingo@redhat.com>
83008301 M: Arnaldo Carvalho de Melo <acme@kernel.org>
83018302 L: linux-kernel@vger.kernel.org
@@ -8388,6 +8389,14 @@ L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) · 86 unmodified lines
83888389 S: Maintained
83898390 F: drivers/pinctrl/samsung/
83908391
8392+PIN CONTROLLER - SINGLE
8393+M: Tony Lindgren <tony@atomide.com>
8394+M: Haojian Zhuang <haojian.zhuang@linaro.org>
8395+L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
8396+L: linux-omap@vger.kernel.org
8397+S: Maintained
8398+F: drivers/pinctrl/pinctrl-single.c
8399+
83918400 PIN CONTROLLER - ST SPEAR
83928401 M: Viresh Kumar <vireshk@kernel.org>
83938402 L: spear-devel@list.st.com
@@ -8954,6 +8963,13 @@ F: drivers/rpmsg/ · 560 unmodified lines
89548963 F: Documentation/rpmsg.txt
89558964 F: include/linux/rpmsg.h
89568965
8966+RENESAS ETHERNET DRIVERS
8967+R: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
8968+L: netdev@vger.kernel.org
8969+L: linux-sh@vger.kernel.org
8970+F: drivers/net/ethernet/renesas/
8971+F: include/linux/sh_eth.h
8972+
89578973 RESET CONTROLLER FRAMEWORK
89588974 M: Philipp Zabel <p.zabel@pengutronix.de>
89598975 S: Maintained
Makefile+1−1
@@ -1,7 +1,7 @@
11 VERSION = 4
22 PATCHLEVEL = 4
33 SUBLEVEL = 0
4−EXTRAVERSION = -rc4
4+EXTRAVERSION = -rc6
55 NAME = Blurry Fish Butt
66
77 # *DOCUMENTATION*
arch/arc/Kconfig+1−0
@@ -445,6 +445,7 @@ config LINUX_LINK_BASE · 444 unmodified lines
445445 However some customers have peripherals mapped at this addr, so
446446 Linux needs to be scooted a bit.
447447 If you don't know what the above means, leave this setting alone.
448+ This needs to match memory start address specified in Device Tree
448449
449450 config HIGHMEM
450451 bool "High Memory Support"
arch/arc/boot/dts/axs10x_mb.dtsi+1−0
@@ -46,6 +46,7 @@ · 45 unmodified lines
4646 snps,pbl = < 32 >;
4747 clocks = <&apbclk>;
4848 clock-names = "stmmaceth";
49+ max-speed = <100>;
4950 };
5051
5152 ehci@0x40000 {
arch/arc/boot/dts/nsim_hs.dts+2−1
@@ -17,7 +17,8 @@ · 16 unmodified lines
1717
1818 memory {
1919 device_type = "memory";
20− reg = <0x0 0x80000000 0x0 0x40000000 /* 1 GB low mem */
20+ /* CONFIG_LINUX_LINK_BASE needs to match low mem start */
21+ reg = <0x0 0x80000000 0x0 0x20000000 /* 512 MB low mem */
2122 0x1 0x00000000 0x0 0x40000000>; /* 1 GB highmem */
2223 };
2324
arch/arc/include/asm/mach_desc.h+2−2
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 * @dt_compat: Array of device tree 'compatible' strings
2424 * (XXX: although only 1st entry is looked at)
2525 * @init_early: Very early callback [called from setup_arch()]
26− * @init_cpu_smp: for each CPU as it is coming up (SMP as well as UP)
26+ * @init_per_cpu: for each CPU as it is coming up (SMP as well as UP)
2727 * [(M):init_IRQ(), (o):start_kernel_secondary()]
2828 * @init_machine: arch initcall level callback (e.g. populate static
2929 * platform devices or parse Devicetree)
@@ -35,7 +35,7 @@ struct machine_desc { · 5 unmodified lines
3535 const char **dt_compat;
3636 void (*init_early)(void);
3737 #ifdef CONFIG_SMP
38− void (*init_cpu_smp)(unsigned int);
38+ void (*init_per_cpu)(unsigned int);
3939 #endif
4040 void (*init_machine)(void);
4141 void (*init_late)(void);
arch/arc/include/asm/smp.h+2−2
@@ -48,7 +48,7 @@ extern int smp_ipi_irq_setup(int cpu, int irq); · 47 unmodified lines
4848 * @init_early_smp: A SMP specific h/w block can init itself
4949 * Could be common across platforms so not covered by
5050 * mach_desc->init_early()
51− * @init_irq_cpu: Called for each core so SMP h/w block driver can do
51+ * @init_per_cpu: Called for each core so SMP h/w block driver can do
5252 * any needed setup per cpu (e.g. IPI request)
5353 * @cpu_kick: For Master to kickstart a cpu (optionally at a PC)
5454 * @ipi_send: To send IPI to a @cpu
@@ -57,7 +57,7 @@ extern int smp_ipi_irq_setup(int cpu, int irq); · 2 unmodified lines
5757 struct plat_smp_ops {
5858 const char *info;
5959 void (*init_early_smp)(void);
60− void (*init_irq_cpu)(int cpu);
60+ void (*init_per_cpu)(int cpu);
6161 void (*cpu_kick)(int cpu, unsigned long pc);
6262 void (*ipi_send)(int cpu);
6363 void (*ipi_clear)(int irq);
arch/arc/include/asm/unwind.h+0−4
@@ -112,7 +112,6 @@ struct unwind_frame_info { · 111 unmodified lines
112112
113113 extern int arc_unwind(struct unwind_frame_info *frame);
114114 extern void arc_unwind_init(void);
115−extern void arc_unwind_setup(void);
116115 extern void *unwind_add_table(struct module *module, const void *table_start,
117116 unsigned long table_size);
118117 extern void unwind_remove_table(void *handle, int init_only);
@@ -152,9 +151,6 @@ static inline void arc_unwind_init(void) · 33 unmodified lines
152151 {
153152 }
154153
155−static inline void arc_unwind_setup(void)
156−{
157−}
158154 #define unwind_add_table(a, b, c)
159155 #define unwind_remove_table(a, b)
160156
arch/arc/kernel/intc-arcv2.c+13−2
@@ -106,10 +106,21 @@ static struct irq_chip arcv2_irq_chip = { · 105 unmodified lines
106106 static int arcv2_irq_map(struct irq_domain *d, unsigned int irq,
107107 irq_hw_number_t hw)
108108 {
109− if (irq == TIMER0_IRQ || irq == IPI_IRQ)
109+ /*
110+ * core intc IRQs [16, 23]:
111+ * Statically assigned always private-per-core (Timers, WDT, IPI, PCT)
112+ */
113+ if (hw < 24) {
114+ /*
115+ * A subsequent request_percpu_irq() fails if percpu_devid is
116+ * not set. That in turns sets NOAUTOEN, meaning each core needs
117+ * to call enable_percpu_irq()
118+ */
119+ irq_set_percpu_devid(irq);
110120 irq_set_chip_and_handler(irq, &arcv2_irq_chip, handle_percpu_irq);
111− else
121+ } else {
112122 irq_set_chip_and_handler(irq, &arcv2_irq_chip, handle_level_irq);
123+ }
113124
114125 return 0;
115126 }
arch/arc/kernel/irq.c+24−9
@@ -29,11 +29,11 @@ void __init init_IRQ(void) · 28 unmodified lines
2929
3030 #ifdef CONFIG_SMP
3131 /* a SMP H/w block could do IPI IRQ request here */
32− if (plat_smp_ops.init_irq_cpu)
33− plat_smp_ops.init_irq_cpu(smp_processor_id());
32+ if (plat_smp_ops.init_per_cpu)
33+ plat_smp_ops.init_per_cpu(smp_processor_id());
3434
35− if (machine_desc->init_cpu_smp)
36− machine_desc->init_cpu_smp(smp_processor_id());
35+ if (machine_desc->init_per_cpu)
36+ machine_desc->init_per_cpu(smp_processor_id());
3737 #endif
3838 }
3939
@@ -51,6 +51,18 @@ void arch_do_IRQ(unsigned int irq, struct pt_regs *regs) · 11 unmodified lines
5151 set_irq_regs(old_regs);
5252 }
5353
54+/*
55+ * API called for requesting percpu interrupts - called by each CPU
56+ * - For boot CPU, actually request the IRQ with genirq core + enables
57+ * - For subsequent callers only enable called locally
58+ *
59+ * Relies on being called by boot cpu first (i.e. request called ahead) of
60+ * any enable as expected by genirq. Hence Suitable only for TIMER, IPI
61+ * which are guaranteed to be setup on boot core first.
62+ * Late probed peripherals such as perf can't use this as there no guarantee
63+ * of being called on boot CPU first.
64+ */
65+
5466 void arc_request_percpu_irq(int irq, int cpu,
5567 irqreturn_t (*isr)(int irq, void *dev),
5668 const char *irq_nm,
@@ -60,14 +72,17 @@ void arc_request_percpu_irq(int irq, int cpu, · 3 unmodified lines
6072 if (!cpu) {
6173 int rc;
6274
75+#ifdef CONFIG_ISA_ARCOMPACT
6376 /*
64− * These 2 calls are essential to making percpu IRQ APIs work
65− * Ideally these details could be hidden in irq chip map function
66− * but the issue is IPIs IRQs being static (non-DT) and platform
67− * specific, so we can't identify them there.
77+ * A subsequent request_percpu_irq() fails if percpu_devid is
78+ * not set. That in turns sets NOAUTOEN, meaning each core needs
79+ * to call enable_percpu_irq()
80+ *
81+ * For ARCv2, this is done in irq map function since we know
82+ * which irqs are strictly per cpu
6883 */
6984 irq_set_percpu_devid(irq);
70− irq_modify_status(irq, IRQ_NOAUTOEN, 0); /* @irq, @clr, @set */
85+#endif
7186
7287 rc = request_percpu_irq(irq, isr, irq_nm, percpu_dev);
7388 if (rc)
arch/arc/kernel/mcip.c+1−1
@@ -132,7 +132,7 @@ static void mcip_probe_n_setup(void) · 131 unmodified lines
132132 struct plat_smp_ops plat_smp_ops = {
133133 .info = smp_cpuinfo_buf,
134134 .init_early_smp = mcip_probe_n_setup,
135− .init_irq_cpu = mcip_setup_per_cpu,
135+ .init_per_cpu = mcip_setup_per_cpu,
136136 .ipi_send = mcip_ipi_send,
137137 .ipi_clear = mcip_ipi_clear,
138138 };
arch/arc/kernel/perf_event.c+9−23
@@ -428,12 +428,11 @@ static irqreturn_t arc_pmu_intr(int irq, void *dev) · 427 unmodified lines
428428
429429 #endif /* CONFIG_ISA_ARCV2 */
430430
431−void arc_cpu_pmu_irq_init(void)
431+static void arc_cpu_pmu_irq_init(void *data)
432432 {
433− struct arc_pmu_cpu *pmu_cpu = this_cpu_ptr(&arc_pmu_cpu);
433+ int irq = *(int *)data;
434434
435− arc_request_percpu_irq(arc_pmu->irq, smp_processor_id(), arc_pmu_intr,
436− "ARC perf counters", pmu_cpu);
435+ enable_percpu_irq(irq, IRQ_TYPE_NONE);
437436
438437 /* Clear all pending interrupt flags */
439438 write_aux_reg(ARC_REG_PCT_INT_ACT, 0xffffffff);
@@ -515,7 +514,6 @@ static int arc_pmu_device_probe(struct platform_device *pdev) · 75 unmodified lines
515514
516515 if (has_interrupts) {
517516 int irq = platform_get_irq(pdev, 0);
518− unsigned long flags;
519517
520518 if (irq < 0) {
521519 pr_err("Cannot get IRQ number for the platform\n");
@@ -524,24 +522,12 @@ static int arc_pmu_device_probe(struct platform_device *pdev) · 2 unmodified lines
524522
525523 arc_pmu->irq = irq;
526524
527− /*
528− * arc_cpu_pmu_irq_init() needs to be called on all cores for
529− * their respective local PMU.
530− * However we use opencoded on_each_cpu() to ensure it is called
531− * on core0 first, so that arc_request_percpu_irq() sets up
532− * AUTOEN etc. Otherwise enable_percpu_irq() fails to enable
533− * perf IRQ on non master cores.
534− * see arc_request_percpu_irq()
535− */
536− preempt_disable();
537− local_irq_save(flags);
538− arc_cpu_pmu_irq_init();
539− local_irq_restore(flags);
540− smp_call_function((smp_call_func_t)arc_cpu_pmu_irq_init, 0, 1);
541− preempt_enable();
542−
543− /* Clean all pending interrupt flags */
544− write_aux_reg(ARC_REG_PCT_INT_ACT, 0xffffffff);
525+ /* intc map function ensures irq_set_percpu_devid() called */
526+ request_percpu_irq(irq, arc_pmu_intr, "ARC perf counters",
527+ this_cpu_ptr(&arc_pmu_cpu));
528+
529+ on_each_cpu(arc_cpu_pmu_irq_init, &irq, 1);
530+
545531 } else
546532 arc_pmu->pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT;
547533
arch/arc/kernel/setup.c+0−1
@@ -429,7 +429,6 @@ void __init setup_arch(char **cmdline_p) · 428 unmodified lines
429429 #endif
430430
431431 arc_unwind_init();
432− arc_unwind_setup();
433432 }
434433
435434 static int __init customize_machine(void)
arch/arc/kernel/smp.c+4−4
@@ -132,11 +132,11 @@ void start_kernel_secondary(void) · 131 unmodified lines
132132 pr_info("## CPU%u LIVE ##: Executing Code...\n", cpu);
133133
134134 /* Some SMP H/w setup - for each cpu */
135− if (plat_smp_ops.init_irq_cpu)
136− plat_smp_ops.init_irq_cpu(cpu);
135+ if (plat_smp_ops.init_per_cpu)
136+ plat_smp_ops.init_per_cpu(cpu);
137137
138− if (machine_desc->init_cpu_smp)
139− machine_desc->init_cpu_smp(cpu);
138+ if (machine_desc->init_per_cpu)
139+ machine_desc->init_per_cpu(cpu);
140140
141141 arc_local_timer_setup();
142142
arch/arc/kernel/unwind.c+35−18
@@ -170,6 +170,23 @@ static struct unwind_table *find_table(unsigned long pc) · 169 unmodified lines
170170
171171 static unsigned long read_pointer(const u8 **pLoc,
172172 const void *end, signed ptrType);
173+static void init_unwind_hdr(struct unwind_table *table,
174+ void *(*alloc) (unsigned long));
175+
176+/*
177+ * wrappers for header alloc (vs. calling one vs. other at call site)
178+ * to elide section mismatches warnings
179+ */
180+static void *__init unw_hdr_alloc_early(unsigned long sz)
181+{
182+ return __alloc_bootmem_nopanic(sz, sizeof(unsigned int),
183+ MAX_DMA_ADDRESS);
184+}
185+
186+static void *unw_hdr_alloc(unsigned long sz)
187+{
188+ return kmalloc(sz, GFP_KERNEL);
189+}
173190
174191 static void init_unwind_table(struct unwind_table *table, const char *name,
175192 const void *core_start, unsigned long core_size,
@@ -209,6 +226,8 @@ void __init arc_unwind_init(void) · 33 unmodified lines
209226 __start_unwind, __end_unwind - __start_unwind,
210227 NULL, 0);
211228 /*__start_unwind_hdr, __end_unwind_hdr - __start_unwind_hdr);*/
229+
230+ init_unwind_hdr(&root_table, unw_hdr_alloc_early);
212231 }
213232
214233 static const u32 bad_cie, not_fde;
@@ -241,8 +260,8 @@ static void swap_eh_frame_hdr_table_entries(void *p1, void *p2, int size) · 26 unmodified lines
241260 e2->fde = v;
242261 }
243262
244−static void __init setup_unwind_table(struct unwind_table *table,
245− void *(*alloc) (unsigned long))
263+static void init_unwind_hdr(struct unwind_table *table,
264+ void *(*alloc) (unsigned long))
246265 {
247266 const u8 *ptr;
248267 unsigned long tableSize = table->size, hdrSize;
@@ -274,13 +293,13 @@ static void __init setup_unwind_table(struct unwind_table *table, · 25 unmodified lines
274293 const u32 *cie = cie_for_fde(fde, table);
275294 signed ptrType;
276295
277− if (cie == &not_fde)
296+ if (cie == &not_fde) /* only process FDE here */
278297 continue;
279298 if (cie == NULL || cie == &bad_cie)
280− return;
299+ continue; /* say FDE->CIE.version != 1 */
281300 ptrType = fde_pointer_type(cie);
282301 if (ptrType < 0)
283− return;
302+ continue;
284303
285304 ptr = (const u8 *)(fde + 2);
286305 if (!read_pointer(&ptr, (const u8 *)(fde + 1) + *fde,
@@ -300,9 +319,11 @@ static void __init setup_unwind_table(struct unwind_table *table, · 13 unmodified lines
300319
301320 hdrSize = 4 + sizeof(unsigned long) + sizeof(unsigned int)
302321 + 2 * n * sizeof(unsigned long);
322+
303323 header = alloc(hdrSize);
304324 if (!header)
305325 return;
326+
306327 header->version = 1;
307328 header->eh_frame_ptr_enc = DW_EH_PE_abs | DW_EH_PE_native;
308329 header->fde_count_enc = DW_EH_PE_abs | DW_EH_PE_data4;
@@ -322,6 +343,10 @@ static void __init setup_unwind_table(struct unwind_table *table, · 13 unmodified lines
322343
323344 if (fde[1] == 0xffffffff)
324345 continue; /* this is a CIE */
346+
347+ if (*(u8 *)(cie + 2) != 1)
348+ continue; /* FDE->CIE.version not supported */
349+
325350 ptr = (const u8 *)(fde + 2);
326351 header->table[n].start = read_pointer(&ptr,
327352 (const u8 *)(fde + 1) +
@@ -342,18 +367,6 @@ static void __init setup_unwind_table(struct unwind_table *table, · 14 unmodified lines
342367 table->header = (const void *)header;
343368 }
344369
345−static void *__init balloc(unsigned long sz)
346−{
347− return __alloc_bootmem_nopanic(sz,
348− sizeof(unsigned int),
349− __pa(MAX_DMA_ADDRESS));
350−}
351−
352−void __init arc_unwind_setup(void)
353−{
354− setup_unwind_table(&root_table, balloc);
355−}
356−
357370 #ifdef CONFIG_MODULES
358371
359372 static struct unwind_table *last_table;
@@ -377,6 +390,8 @@ void *unwind_add_table(struct module *module, const void *table_start, · 17 unmodified lines
377390 table_start, table_size,
378391 NULL, 0);
379392
393+ init_unwind_hdr(table, unw_hdr_alloc);
394+
380395 #ifdef UNWIND_DEBUG
381396 unw_debug("Table added for [%s] %lx %lx\n",
382397 module->name, table->core.pc, table->core.range);
@@ -439,6 +454,7 @@ void unwind_remove_table(void *handle, int init_only) · 56 unmodified lines
439454 info.init_only = init_only;
440455
441456 unlink_table(&info); /* XXX: SMP */
457+ kfree(table->header);
442458 kfree(table);
443459 }
444460
@@ -507,7 +523,8 @@ static const u32 *cie_for_fde(const u32 *fde, const struct unwind_table *table) · 62 unmodified lines
507523
508524 if (*cie <= sizeof(*cie) + 4 || *cie >= fde[1] - sizeof(*fde)
509525 || (*cie & (sizeof(*cie) - 1))
510− || (cie[1] != 0xffffffff))
526+ || (cie[1] != 0xffffffff)
527+ || ( *(u8 *)(cie + 2) != 1)) /* version 1 supported */
511528 return NULL; /* this is not a (valid) CIE */
512529 return cie;
513530 }
arch/arc/mm/init.c+3−1
@@ -51,7 +51,9 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) · 50 unmodified lines
5151 int in_use = 0;
5252
5353 if (!low_mem_sz) {
54− BUG_ON(base != low_mem_start);
54+ if (base != low_mem_start)
55+ panic("CONFIG_LINUX_LINK_BASE != DT memory { }");
56+
5557 low_mem_sz = size;
5658 in_use = 1;
5759 } else {
arch/arm/boot/dts/am4372.dtsi+2−2
@@ -74,7 +74,7 @@ · 73 unmodified lines
7474 reg = <0x48240200 0x100>;
7575 interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
7676 interrupt-parent = <&gic>;
77− clocks = <&dpll_mpu_m2_ck>;
77+ clocks = <&mpu_periphclk>;
7878 };
7979
8080 local_timer: timer@48240600 {
@@ -82,7 +82,7 @@ · 1 unmodified line
8282 reg = <0x48240600 0x100>;
8383 interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
8484 interrupt-parent = <&gic>;
85− clocks = <&dpll_mpu_m2_ck>;
85+ clocks = <&mpu_periphclk>;
8686 };
8787
8888 l2-cache-controller@48242000 {
arch/arm/boot/dts/am43xx-clocks.dtsi+8−0
@@ -259,6 +259,14 @@ · 258 unmodified lines
259259 ti,invert-autoidle-bit;
260260 };
261261
262+ mpu_periphclk: mpu_periphclk {
263+ #clock-cells = <0>;
264+ compatible = "fixed-factor-clock";
265+ clocks = <&dpll_mpu_m2_ck>;
266+ clock-mult = <1>;
267+ clock-div = <2>;
268+ };
269+
262270 dpll_ddr_ck: dpll_ddr_ck {
263271 #clock-cells = <0>;
264272 compatible = "ti,am3-dpll-clock";
arch/arm/boot/dts/at91-sama5d2_xplained.dts+1−0
@@ -184,6 +184,7 @@ · 183 unmodified lines
184184 regulator-name = "VDD_SDHC_1V8";
185185 regulator-min-microvolt = <1800000>;
186186 regulator-max-microvolt = <1800000>;
187+ regulator-always-on;
187188 };
188189 };
189190 };
arch/arm/boot/dts/berlin2q.dtsi+5−3
@@ -118,7 +118,8 @@ · 117 unmodified lines
118118 sdhci0: sdhci@ab0000 {
119119 compatible = "mrvl,pxav3-mmc";
120120 reg = <0xab0000 0x200>;
121− clocks = <&chip_clk CLKID_SDIO1XIN>;
121+ clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO>;
122+ clock-names = "io", "core";
122123 interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
123124 status = "disabled";
124125 };
@@ -126,7 +127,8 @@ · 1 unmodified line
126127 sdhci1: sdhci@ab0800 {
127128 compatible = "mrvl,pxav3-mmc";
128129 reg = <0xab0800 0x200>;
129− clocks = <&chip_clk CLKID_SDIO1XIN>;
130+ clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO>;
131+ clock-names = "io", "core";
130132 interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
131133 status = "disabled";
132134 };
@@ -135,7 +137,7 @@ · 2 unmodified lines
135137 compatible = "mrvl,pxav3-mmc";
136138 reg = <0xab1000 0x200>;
137139 interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
138− clocks = <&chip_clk CLKID_NFC_ECC>, <&chip_clk CLKID_NFC>;
140+ clocks = <&chip_clk CLKID_NFC_ECC>, <&chip_clk CLKID_SDIO>;
139141 clock-names = "io", "core";
140142 status = "disabled";
141143 };
arch/arm/boot/dts/dm816x.dtsi+6−2
@@ -218,6 +218,7 @@ · 217 unmodified lines
218218 reg = <0x480c8000 0x2000>;
219219 interrupts = <77>;
220220 ti,hwmods = "mailbox";
221+ #mbox-cells = <1>;
221222 ti,mbox-num-users = <4>;
222223 ti,mbox-num-fifos = <12>;
223224 mbox_dsp: mbox_dsp {
@@ -279,8 +280,11 @@ · 55 unmodified lines
279280 ti,spi-num-cs = <4>;
280281 ti,hwmods = "mcspi1";
281282 dmas = <&edma 16 &edma 17
282− &edma 18 &edma 19>;
283− dma-names = "tx0", "rx0", "tx1", "rx1";
283+ &edma 18 &edma 19
284+ &edma 20 &edma 21
285+ &edma 22 &edma 23>;
286+ dma-names = "tx0", "rx0", "tx1", "rx1",
287+ "tx2", "rx2", "tx3", "rx3";
284288 };
285289
286290 mmc1: mmc@48060000 {
arch/arm/boot/dts/vf610-colibri.dtsi+0−5
@@ -18,8 +18,3 @@ · 17 unmodified lines
1818 reg = <0x80000000 0x10000000>;
1919 };
2020 };
21−
22−&L2 {
23− arm,data-latency = <2 1 2>;
24− arm,tag-latency = <3 2 3>;
25−};
arch/arm/boot/dts/vf610.dtsi+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 reg = <0x40006000 0x1000>;
2020 cache-unified;
2121 cache-level = <2>;
22− arm,data-latency = <1 1 1>;
22+ arm,data-latency = <3 3 3>;
2323 arm,tag-latency = <2 2 2>;
2424 };
2525 };
arch/arm/boot/dts/vfxxx.dtsi+4−2
@@ -178,8 +178,10 @@ · 177 unmodified lines
178178 compatible = "fsl,vf610-sai";
179179 reg = <0x40031000 0x1000>;
180180 interrupts = <86 IRQ_TYPE_LEVEL_HIGH>;
181− clocks = <&clks VF610_CLK_SAI2>;
182− clock-names = "sai";
181+ clocks = <&clks VF610_CLK_SAI2>,
182+ <&clks VF610_CLK_SAI2_DIV>,
183+ <&clks 0>, <&clks 0>;
184+ clock-names = "bus", "mclk1", "mclk2", "mclk3";
183185 dma-names = "tx", "rx";
184186 dmas = <&edma0 0 21>,
185187 <&edma0 0 20>;
arch/arm/include/asm/arch_gicv3.h+1−0
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121 #ifndef __ASSEMBLY__
2222
2323 #include <linux/io.h>
24+#include <asm/barrier.h>
2425
2526 #define __ACCESS_CP15(CRn, Op1, CRm, Op2) p15, Op1, %0, CRn, CRm, Op2
2627 #define __ACCESS_CP15_64(Op1, CRm) p15, Op1, %Q0, %R0, CRm
arch/arm/include/asm/uaccess.h+4−0
@@ -510,10 +510,14 @@ __copy_to_user_std(void __user *to, const void *from, unsigned long n); · 509 unmodified lines
510510 static inline unsigned long __must_check
511511 __copy_to_user(void __user *to, const void *from, unsigned long n)
512512 {
513+#ifndef CONFIG_UACCESS_WITH_MEMCPY
513514 unsigned int __ua_flags = uaccess_save_and_enable();
514515 n = arm_copy_to_user(to, from, n);
515516 uaccess_restore(__ua_flags);
516517 return n;
518+#else
519+ return arm_copy_to_user(to, from, n);
520+#endif
517521 }
518522
519523 extern unsigned long __must_check
arch/arm/kernel/process.c+18−15
@@ -95,6 +95,22 @@ void __show_regs(struct pt_regs *regs) · 94 unmodified lines
9595 {
9696 unsigned long flags;
9797 char buf[64];
98+#ifndef CONFIG_CPU_V7M
99+ unsigned int domain;
100+#ifdef CONFIG_CPU_SW_DOMAIN_PAN
101+ /*
102+ * Get the domain register for the parent context. In user
103+ * mode, we don't save the DACR, so lets use what it should
104+ * be. For other modes, we place it after the pt_regs struct.
105+ */
106+ if (user_mode(regs))
107+ domain = DACR_UACCESS_ENABLE;
108+ else
109+ domain = *(unsigned int *)(regs + 1);
110+#else
111+ domain = get_domain();
112+#endif
113+#endif
98114
99115 show_regs_print_info(KERN_DEFAULT);
100116
@@ -123,21 +139,8 @@ void __show_regs(struct pt_regs *regs) · 22 unmodified lines
123139
124140 #ifndef CONFIG_CPU_V7M
125141 {
126− unsigned int domain = get_domain();
127142 const char *segment;
128143
129−#ifdef CONFIG_CPU_SW_DOMAIN_PAN
130− /*
131− * Get the domain register for the parent context. In user
132− * mode, we don't save the DACR, so lets use what it should
133− * be. For other modes, we place it after the pt_regs struct.
134− */
135− if (user_mode(regs))
136− domain = DACR_UACCESS_ENABLE;
137− else
138− domain = *(unsigned int *)(regs + 1);
139−#endif
140−
141144 if ((domain & domain_mask(DOMAIN_USER)) ==
142145 domain_val(DOMAIN_USER, DOMAIN_NOACCESS))
143146 segment = "none";
@@ -163,11 +166,11 @@ void __show_regs(struct pt_regs *regs) · 19 unmodified lines
163166 buf[0] = '\0';
164167 #ifdef CONFIG_CPU_CP15_MMU
165168 {
166− unsigned int transbase, dac = get_domain();
169+ unsigned int transbase;
167170 asm("mrc p15, 0, %0, c2, c0\n\t"
168171 : "=r" (transbase));
169172 snprintf(buf, sizeof(buf), " Table: %08x DAC: %08x",
170− transbase, dac);
173+ transbase, domain);
171174 }
172175 #endif
173176 asm("mrc p15, 0, %0, c1, c0\n" : "=r" (ctrl));
arch/arm/kernel/swp_emulate.c+3−3
@@ -36,10 +36,10 @@ · 35 unmodified lines
3636 */
3737 #define __user_swpX_asm(data, addr, res, temp, B) \
3838 __asm__ __volatile__( \
39− " mov %2, %1\n" \
40− "0: ldrex"B" %1, [%3]\n" \
41− "1: strex"B" %0, %2, [%3]\n" \
39+ "0: ldrex"B" %2, [%3]\n" \
40+ "1: strex"B" %0, %1, [%3]\n" \
4241 " cmp %0, #0\n" \
42+ " moveq %1, %2\n" \
4343 " movne %0, %4\n" \
4444 "2:\n" \
4545 " .section .text.fixup,\"ax\"\n" \
arch/arm/lib/uaccess_with_memcpy.c+23−6
@@ -88,6 +88,7 @@ pin_page_for_write(const void __user *_addr, pte_t **ptep, spinlock_t **ptlp) · 87 unmodified lines
8888 static unsigned long noinline
8989 __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n)
9090 {
91+ unsigned long ua_flags;
9192 int atomic;
9293
9394 if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
@@ -118,7 +119,9 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n) · 24 unmodified lines
118119 if (tocopy > n)
119120 tocopy = n;
120121
122+ ua_flags = uaccess_save_and_enable();
121123 memcpy((void *)to, from, tocopy);
124+ uaccess_restore(ua_flags);
122125 to += tocopy;
123126 from += tocopy;
124127 n -= tocopy;
@@ -145,14 +148,21 @@ arm_copy_to_user(void __user *to, const void *from, unsigned long n) · 20 unmodified lines
145148 * With frame pointer disabled, tail call optimization kicks in
146149 * as well making this test almost invisible.
147150 */
148− if (n < 64)
149− return __copy_to_user_std(to, from, n);
150− return __copy_to_user_memcpy(to, from, n);
151+ if (n < 64) {
152+ unsigned long ua_flags = uaccess_save_and_enable();
153+ n = __copy_to_user_std(to, from, n);
154+ uaccess_restore(ua_flags);
155+ } else {
156+ n = __copy_to_user_memcpy(to, from, n);
157+ }
158+ return n;
151159 }
152160
153161 static unsigned long noinline
154162 __clear_user_memset(void __user *addr, unsigned long n)
155163 {
164+ unsigned long ua_flags;
165+
156166 if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
157167 memset((void *)addr, 0, n);
158168 return 0;
@@ -175,7 +185,9 @@ __clear_user_memset(void __user *addr, unsigned long n) · 16 unmodified lines
175185 if (tocopy > n)
176186 tocopy = n;
177187
188+ ua_flags = uaccess_save_and_enable();
178189 memset((void *)addr, 0, tocopy);
190+ uaccess_restore(ua_flags);
179191 addr += tocopy;
180192 n -= tocopy;
181193
@@ -193,9 +205,14 @@ out: · 11 unmodified lines
193205 unsigned long arm_clear_user(void __user *addr, unsigned long n)
194206 {
195207 /* See rational for this in __copy_to_user() above. */
196− if (n < 64)
197− return __clear_user_std(addr, n);
198− return __clear_user_memset(addr, n);
208+ if (n < 64) {
209+ unsigned long ua_flags = uaccess_save_and_enable();
210+ n = __clear_user_std(addr, n);
211+ uaccess_restore(ua_flags);
212+ } else {
213+ n = __clear_user_memset(addr, n);
214+ }
215+ return n;
199216 }
200217
201218 #if 0
arch/arm/mach-at91/Kconfig+5−1
@@ -4,7 +4,6 @@ menuconfig ARCH_AT91 · 3 unmodified lines
44 select ARCH_REQUIRE_GPIOLIB
55 select COMMON_CLK_AT91
66 select PINCTRL
7− select PINCTRL_AT91
87 select SOC_BUS
98
109 if ARCH_AT91
@@ -17,6 +16,7 @@ config SOC_SAMA5D2 · 6 unmodified lines
1716 select HAVE_AT91_USB_CLK
1817 select HAVE_AT91_H32MX
1918 select HAVE_AT91_GENERATED_CLK
19+ select PINCTRL_AT91PIO4
2020 help
2121 Select this if ou are using one of Atmel's SAMA5D2 family SoC.
2222
@@ -27,6 +27,7 @@ config SOC_SAMA5D3 · 4 unmodified lines
2727 select HAVE_AT91_UTMI
2828 select HAVE_AT91_SMD
2929 select HAVE_AT91_USB_CLK
30+ select PINCTRL_AT91
3031 help
3132 Select this if you are using one of Atmel's SAMA5D3 family SoC.
3233 This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36.
@@ -40,6 +41,7 @@ config SOC_SAMA5D4 · 7 unmodified lines
4041 select HAVE_AT91_SMD
4142 select HAVE_AT91_USB_CLK
4243 select HAVE_AT91_H32MX
44+ select PINCTRL_AT91
4345 help
4446 Select this if you are using one of Atmel's SAMA5D4 family SoC.
4547
@@ -50,6 +52,7 @@ config SOC_AT91RM9200 · 4 unmodified lines
5052 select CPU_ARM920T
5153 select HAVE_AT91_USB_CLK
5254 select MIGHT_HAVE_PCI
55+ select PINCTRL_AT91
5356 select SOC_SAM_V4_V5
5457 select SRAM if PM
5558 help
@@ -65,6 +68,7 @@ config SOC_AT91SAM9 · 9 unmodified lines
6568 select HAVE_AT91_UTMI
6669 select HAVE_FB_ATMEL
6770 select MEMORY
71+ select PINCTRL_AT91
6872 select SOC_SAM_V4_V5
6973 select SRAM if PM
7074 help
arch/arm/mach-at91/pm.c+6−1
@@ -41,8 +41,10 @@ · 40 unmodified lines
4141 * implementation should be moved down into the pinctrl driver and get
4242 * called as part of the generic suspend/resume path.
4343 */
44+#ifdef CONFIG_PINCTRL_AT91
4445 extern void at91_pinctrl_gpio_suspend(void);
4546 extern void at91_pinctrl_gpio_resume(void);
47+#endif
4648
4749 static struct {
4850 unsigned long uhp_udp_mask;
@@ -151,8 +153,9 @@ static void at91_pm_suspend(suspend_state_t state) · 102 unmodified lines
151153
152154 static int at91_pm_enter(suspend_state_t state)
153155 {
156+#ifdef CONFIG_PINCTRL_AT91
154157 at91_pinctrl_gpio_suspend();
155−
158+#endif
156159 switch (state) {
157160 /*
158161 * Suspend-to-RAM is like STANDBY plus slow clock mode, so
@@ -192,7 +195,9 @@ static int at91_pm_enter(suspend_state_t state) · 33 unmodified lines
192195 error:
193196 target_state = PM_SUSPEND_ON;
194197
198+#ifdef CONFIG_PINCTRL_AT91
195199 at91_pinctrl_gpio_resume();
200+#endif
196201 return 0;
197202 }
198203
arch/arm/mach-exynos/pmu.c+5−1
@@ -748,8 +748,12 @@ static void exynos5_powerdown_conf(enum sys_powerdown mode) · 747 unmodified lines
748748 void exynos_sys_powerdown_conf(enum sys_powerdown mode)
749749 {
750750 unsigned int i;
751+ const struct exynos_pmu_data *pmu_data;
752+
753+ if (!pmu_context)
754+ return;
751755
752− const struct exynos_pmu_data *pmu_data = pmu_context->pmu_data;
756+ pmu_data = pmu_context->pmu_data;
753757
754758 if (pmu_data->powerdown_conf)
755759 pmu_data->powerdown_conf(mode);
arch/arm/mach-ixp4xx/include/mach/io.h+6−6
@@ -143,7 +143,7 @@ static inline void __indirect_writesl(volatile void __iomem *bus_addr, · 142 unmodified lines
143143 writel(*vaddr++, bus_addr);
144144 }
145145
146−static inline unsigned char __indirect_readb(const volatile void __iomem *p)
146+static inline u8 __indirect_readb(const volatile void __iomem *p)
147147 {
148148 u32 addr = (u32)p;
149149 u32 n, byte_enables, data;
@@ -166,7 +166,7 @@ static inline void __indirect_readsb(const volatile void __iomem *bus_addr, · 16 unmodified lines
166166 *vaddr++ = readb(bus_addr);
167167 }
168168
169−static inline unsigned short __indirect_readw(const volatile void __iomem *p)
169+static inline u16 __indirect_readw(const volatile void __iomem *p)
170170 {
171171 u32 addr = (u32)p;
172172 u32 n, byte_enables, data;
@@ -189,7 +189,7 @@ static inline void __indirect_readsw(const volatile void __iomem *bus_addr, · 16 unmodified lines
189189 *vaddr++ = readw(bus_addr);
190190 }
191191
192−static inline unsigned long __indirect_readl(const volatile void __iomem *p)
192+static inline u32 __indirect_readl(const volatile void __iomem *p)
193193 {
194194 u32 addr = (__force u32)p;
195195 u32 data;
@@ -350,7 +350,7 @@ static inline void insl(u32 io_addr, void *p, u32 count) · 154 unmodified lines
350350 ((unsigned long)p <= (PIO_MASK + PIO_OFFSET)))
351351
352352 #define ioread8(p) ioread8(p)
353−static inline unsigned int ioread8(const void __iomem *addr)
353+static inline u8 ioread8(const void __iomem *addr)
354354 {
355355 unsigned long port = (unsigned long __force)addr;
356356 if (__is_io_address(port))
@@ -378,7 +378,7 @@ static inline void ioread8_rep(const void __iomem *addr, void *vaddr, u32 count) · 21 unmodified lines
378378 }
379379
380380 #define ioread16(p) ioread16(p)
381−static inline unsigned int ioread16(const void __iomem *addr)
381+static inline u16 ioread16(const void __iomem *addr)
382382 {
383383 unsigned long port = (unsigned long __force)addr;
384384 if (__is_io_address(port))
@@ -407,7 +407,7 @@ static inline void ioread16_rep(const void __iomem *addr, void *vaddr, · 22 unmodified lines
407407 }
408408
409409 #define ioread32(p) ioread32(p)
410−static inline unsigned int ioread32(const void __iomem *addr)
410+static inline u32 ioread32(const void __iomem *addr)
411411 {
412412 unsigned long port = (unsigned long __force)addr;
413413 if (__is_io_address(port))
arch/arm/mach-omap2/Kconfig+1−1
@@ -121,6 +121,7 @@ config ARCH_OMAP2PLUS_TYPICAL · 120 unmodified lines
121121 select NEON if CPU_V7
122122 select PM
123123 select REGULATOR
124+ select REGULATOR_FIXED_VOLTAGE
124125 select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
125126 select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
126127 select VFP
@@ -201,7 +202,6 @@ config MACH_OMAP3_PANDORA · 74 unmodified lines
201202 depends on ARCH_OMAP3
202203 default y
203204 select OMAP_PACKAGE_CBB
204− select REGULATOR_FIXED_VOLTAGE if REGULATOR
205205
206206 config MACH_NOKIA_N810
207207 bool
arch/arm/mach-pxa/ezx.c+5−0
@@ -889,6 +889,7 @@ static void __init e680_init(void) · 888 unmodified lines
889889
890890 pxa_set_keypad_info(&e680_keypad_platform_data);
891891
892+ pwm_add_table(ezx_pwm_lookup, ARRAY_SIZE(ezx_pwm_lookup));
892893 platform_add_devices(ARRAY_AND_SIZE(ezx_devices));
893894 platform_add_devices(ARRAY_AND_SIZE(e680_devices));
894895 }
@@ -956,6 +957,7 @@ static void __init a1200_init(void) · 61 unmodified lines
956957
957958 pxa_set_keypad_info(&a1200_keypad_platform_data);
958959
960+ pwm_add_table(ezx_pwm_lookup, ARRAY_SIZE(ezx_pwm_lookup));
959961 platform_add_devices(ARRAY_AND_SIZE(ezx_devices));
960962 platform_add_devices(ARRAY_AND_SIZE(a1200_devices));
961963 }
@@ -1148,6 +1150,7 @@ static void __init a910_init(void) · 186 unmodified lines
11481150 platform_device_register(&a910_camera);
11491151 }
11501152
1153+ pwm_add_table(ezx_pwm_lookup, ARRAY_SIZE(ezx_pwm_lookup));
11511154 platform_add_devices(ARRAY_AND_SIZE(ezx_devices));
11521155 platform_add_devices(ARRAY_AND_SIZE(a910_devices));
11531156 }
@@ -1215,6 +1218,7 @@ static void __init e6_init(void) · 61 unmodified lines
12151218
12161219 pxa_set_keypad_info(&e6_keypad_platform_data);
12171220
1221+ pwm_add_table(ezx_pwm_lookup, ARRAY_SIZE(ezx_pwm_lookup));
12181222 platform_add_devices(ARRAY_AND_SIZE(ezx_devices));
12191223 platform_add_devices(ARRAY_AND_SIZE(e6_devices));
12201224 }
@@ -1256,6 +1260,7 @@ static void __init e2_init(void) · 35 unmodified lines
12561260
12571261 pxa_set_keypad_info(&e2_keypad_platform_data);
12581262
1263+ pwm_add_table(ezx_pwm_lookup, ARRAY_SIZE(ezx_pwm_lookup));
12591264 platform_add_devices(ARRAY_AND_SIZE(ezx_devices));
12601265 platform_add_devices(ARRAY_AND_SIZE(e2_devices));
12611266 }
arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #include <plat/cpu.h>
2121 #include <plat/cpu-freq-core.h>
2222
23−static struct cpufreq_frequency_table s3c2440_plls_12[] __initdata = {
23+static struct cpufreq_frequency_table s3c2440_plls_12[] = {
2424 { .frequency = 75000000, .driver_data = PLLVAL(0x75, 3, 3), }, /* FVco 600.000000 */
2525 { .frequency = 80000000, .driver_data = PLLVAL(0x98, 4, 3), }, /* FVco 640.000000 */
2626 { .frequency = 90000000, .driver_data = PLLVAL(0x70, 2, 3), }, /* FVco 720.000000 */
arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #include <plat/cpu.h>
2121 #include <plat/cpu-freq-core.h>
2222
23−static struct cpufreq_frequency_table s3c2440_plls_169344[] __initdata = {
23+static struct cpufreq_frequency_table s3c2440_plls_169344[] = {
2424 { .frequency = 78019200, .driver_data = PLLVAL(121, 5, 3), }, /* FVco 624.153600 */
2525 { .frequency = 84067200, .driver_data = PLLVAL(131, 5, 3), }, /* FVco 672.537600 */
2626 { .frequency = 90115200, .driver_data = PLLVAL(141, 5, 3), }, /* FVco 720.921600 */
arch/arm/mm/context.c+26−12
@@ -165,13 +165,28 @@ static void flush_context(unsigned int cpu) · 164 unmodified lines
165165 __flush_icache_all();
166166 }
167167
168−static int is_reserved_asid(u64 asid)
168+static bool check_update_reserved_asid(u64 asid, u64 newasid)
169169 {
170170 int cpu;
171− for_each_possible_cpu(cpu)
172− if (per_cpu(reserved_asids, cpu) == asid)
173− return 1;
174− return 0;
171+ bool hit = false;
172+
173+ /*
174+ * Iterate over the set of reserved ASIDs looking for a match.
175+ * If we find one, then we can update our mm to use newasid
176+ * (i.e. the same ASID in the current generation) but we can't
177+ * exit the loop early, since we need to ensure that all copies
178+ * of the old ASID are updated to reflect the mm. Failure to do
179+ * so could result in us missing the reserved ASID in a future
180+ * generation.
181+ */
182+ for_each_possible_cpu(cpu) {
183+ if (per_cpu(reserved_asids, cpu) == asid) {
184+ hit = true;
185+ per_cpu(reserved_asids, cpu) = newasid;
186+ }
187+ }
188+
189+ return hit;
175190 }
176191
177192 static u64 new_context(struct mm_struct *mm, unsigned int cpu)
@@ -181,12 +196,14 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu) · 3 unmodified lines
181196 u64 generation = atomic64_read(&asid_generation);
182197
183198 if (asid != 0) {
199+ u64 newasid = generation | (asid & ~ASID_MASK);
200+
184201 /*
185202 * If our current ASID was active during a rollover, we
186203 * can continue to use it and this was just a false alarm.
187204 */
188− if (is_reserved_asid(asid))
189− return generation | (asid & ~ASID_MASK);
205+ if (check_update_reserved_asid(asid, newasid))
206+ return newasid;
190207
191208 /*
192209 * We had a valid ASID in a previous life, so try to re-use
@@ -194,7 +211,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu) · 1 unmodified line
194211 */
195212 asid &= ~ASID_MASK;
196213 if (!__test_and_set_bit(asid, asid_map))
197− goto bump_gen;
214+ return newasid;
198215 }
199216
200217 /*
@@ -216,11 +233,8 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu) · 15 unmodified lines
216233
217234 __set_bit(asid, asid_map);
218235 cur_idx = asid;
219−
220−bump_gen:
221− asid |= generation;
222236 cpumask_clear(mm_cpumask(mm));
223− return asid;
237+ return asid | generation;
224238 }
225239
226240 void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
arch/arm/mm/dma-mapping.c+1−1
@@ -1521,7 +1521,7 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, · 1520 unmodified lines
15211521 return -ENOMEM;
15221522
15231523 for (count = 0, s = sg; count < (size >> PAGE_SHIFT); s = sg_next(s)) {
1524− phys_addr_t phys = sg_phys(s) & PAGE_MASK;
1524+ phys_addr_t phys = page_to_phys(sg_page(s));
15251525 unsigned int len = PAGE_ALIGN(s->offset + s->length);
15261526
15271527 if (!is_coherent &&
arch/arm/mm/init.c+62−30
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #include <linux/memblock.h>
2323 #include <linux/dma-contiguous.h>
2424 #include <linux/sizes.h>
25+#include <linux/stop_machine.h>
2526
2627 #include <asm/cp15.h>
2728 #include <asm/mach-types.h>
@@ -627,12 +628,10 @@ static struct section_perm ro_perms[] = { · 599 unmodified lines
627628 * safe to be called with preemption disabled, as under stop_machine().
628629 */
629630 static inline void section_update(unsigned long addr, pmdval_t mask,
630− pmdval_t prot)
631+ pmdval_t prot, struct mm_struct *mm)
631632 {
632− struct mm_struct *mm;
633633 pmd_t *pmd;
634634
635− mm = current->active_mm;
636635 pmd = pmd_offset(pud_offset(pgd_offset(mm, addr), addr), addr);
637636
638637 #ifdef CONFIG_ARM_LPAE
@@ -656,49 +655,82 @@ static inline bool arch_has_strict_perms(void) · 17 unmodified lines
656655 return !!(get_cr() & CR_XP);
657656 }
658657
659−#define set_section_perms(perms, field) { \
660− size_t i; \
661− unsigned long addr; \
662− \
663− if (!arch_has_strict_perms()) \
664− return; \
665− \
666− for (i = 0; i < ARRAY_SIZE(perms); i++) { \
667− if (!IS_ALIGNED(perms[i].start, SECTION_SIZE) || \
668− !IS_ALIGNED(perms[i].end, SECTION_SIZE)) { \
669− pr_err("BUG: section %lx-%lx not aligned to %lx\n", \
670− perms[i].start, perms[i].end, \
671− SECTION_SIZE); \
672− continue; \
673− } \
674− \
675− for (addr = perms[i].start; \
676− addr < perms[i].end; \
677− addr += SECTION_SIZE) \
678− section_update(addr, perms[i].mask, \
679− perms[i].field); \
680− } \
658+void set_section_perms(struct section_perm *perms, int n, bool set,
659+ struct mm_struct *mm)
660+{
661+ size_t i;
662+ unsigned long addr;
663+
664+ if (!arch_has_strict_perms())
665+ return;
666+
667+ for (i = 0; i < n; i++) {
668+ if (!IS_ALIGNED(perms[i].start, SECTION_SIZE) ||
669+ !IS_ALIGNED(perms[i].end, SECTION_SIZE)) {
670+ pr_err("BUG: section %lx-%lx not aligned to %lx\n",
671+ perms[i].start, perms[i].end,
672+ SECTION_SIZE);
673+ continue;
674+ }
675+
676+ for (addr = perms[i].start;
677+ addr < perms[i].end;
678+ addr += SECTION_SIZE)
679+ section_update(addr, perms[i].mask,
680+ set ? perms[i].prot : perms[i].clear, mm);
681+ }
682+
681683 }
682684
683−static inline void fix_kernmem_perms(void)
685+static void update_sections_early(struct section_perm perms[], int n)
684686 {
685− set_section_perms(nx_perms, prot);
687+ struct task_struct *t, *s;
688+
689+ read_lock(&tasklist_lock);
690+ for_each_process(t) {
691+ if (t->flags & PF_KTHREAD)
692+ continue;
693+ for_each_thread(t, s)
694+ set_section_perms(perms, n, true, s->mm);
695+ }
696+ read_unlock(&tasklist_lock);
697+ set_section_perms(perms, n, true, current->active_mm);
698+ set_section_perms(perms, n, true, &init_mm);
699+}
700+
701+int __fix_kernmem_perms(void *unused)
702+{
703+ update_sections_early(nx_perms, ARRAY_SIZE(nx_perms));
704+ return 0;
705+}
706+
707+void fix_kernmem_perms(void)
708+{
709+ stop_machine(__fix_kernmem_perms, NULL, NULL);
686710 }
687711
688712 #ifdef CONFIG_DEBUG_RODATA
713+int __mark_rodata_ro(void *unused)
714+{
715+ update_sections_early(ro_perms, ARRAY_SIZE(ro_perms));
716+ return 0;
717+}
718+
689719 void mark_rodata_ro(void)
690720 {
691− set_section_perms(ro_perms, prot);
721+ stop_machine(__mark_rodata_ro, NULL, NULL);
692722 }
693723
694724 void set_kernel_text_rw(void)
695725 {
696− set_section_perms(ro_perms, clear);
726+ set_section_perms(ro_perms, ARRAY_SIZE(ro_perms), false,
727+ current->active_mm);
697728 }
698729
699730 void set_kernel_text_ro(void)
700731 {
701− set_section_perms(ro_perms, prot);
732+ set_section_perms(ro_perms, ARRAY_SIZE(ro_perms), true,
733+ current->active_mm);
702734 }
703735 #endif /* CONFIG_DEBUG_RODATA */
704736
arch/arm/mm/proc-v7.S+2−2
@@ -95,7 +95,7 @@ ENDPROC(cpu_v7_dcache_clean_area) · 94 unmodified lines
9595 .equ cpu_v7_suspend_size, 4 * 9
9696 #ifdef CONFIG_ARM_CPU_SUSPEND
9797 ENTRY(cpu_v7_do_suspend)
98− stmfd sp!, {r4 - r10, lr}
98+ stmfd sp!, {r4 - r11, lr}
9999 mrc p15, 0, r4, c13, c0, 0 @ FCSE/PID
100100 mrc p15, 0, r5, c13, c0, 3 @ User r/o thread ID
101101 stmia r0!, {r4 - r5}
@@ -112,7 +112,7 @@ ENTRY(cpu_v7_do_suspend) · 10 unmodified lines
112112 mrc p15, 0, r9, c1, c0, 1 @ Auxiliary control register
113113 mrc p15, 0, r10, c1, c0, 2 @ Co-processor access control
114114 stmia r0, {r5 - r11}
115− ldmfd sp!, {r4 - r10, pc}
115+ ldmfd sp!, {r4 - r11, pc}
116116 ENDPROC(cpu_v7_do_suspend)
117117
118118 ENTRY(cpu_v7_do_resume)
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi+5−0
@@ -269,6 +269,7 @@ · 268 unmodified lines
269269 clock-frequency = <0>; /* Updated by bootloader */
270270 voltage-ranges = <1800 1800 3300 3300>;
271271 sdhci,auto-cmd12;
272+ little-endian;
272273 bus-width = <4>;
273274 };
274275
@@ -277,6 +278,7 @@ · 2 unmodified lines
277278 reg = <0x0 0x2300000 0x0 0x10000>;
278279 interrupts = <0 36 0x4>; /* Level high type */
279280 gpio-controller;
281+ little-endian;
280282 #gpio-cells = <2>;
281283 interrupt-controller;
282284 #interrupt-cells = <2>;
@@ -287,6 +289,7 @@ · 4 unmodified lines
287289 reg = <0x0 0x2310000 0x0 0x10000>;
288290 interrupts = <0 36 0x4>; /* Level high type */
289291 gpio-controller;
292+ little-endian;
290293 #gpio-cells = <2>;
291294 interrupt-controller;
292295 #interrupt-cells = <2>;
@@ -297,6 +300,7 @@ · 4 unmodified lines
297300 reg = <0x0 0x2320000 0x0 0x10000>;
298301 interrupts = <0 37 0x4>; /* Level high type */
299302 gpio-controller;
303+ little-endian;
300304 #gpio-cells = <2>;
301305 interrupt-controller;
302306 #interrupt-cells = <2>;
@@ -307,6 +311,7 @@ · 4 unmodified lines
307311 reg = <0x0 0x2330000 0x0 0x10000>;
308312 interrupts = <0 37 0x4>; /* Level high type */
309313 gpio-controller;
314+ little-endian;
310315 #gpio-cells = <2>;
311316 interrupt-controller;
312317 #interrupt-cells = <2>;
arch/arm64/include/asm/arch_gicv3.h+1−0
@@ -77,6 +77,7 @@ · 76 unmodified lines
7777 #ifndef __ASSEMBLY__
7878
7979 #include <linux/stringify.h>
80+#include <asm/barrier.h>
8081
8182 /*
8283 * Low-level accessors
arch/arm64/include/asm/pgtable.h+8−4
@@ -276,10 +276,14 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, · 275 unmodified lines
276276 * hardware updates of the pte (ptep_set_access_flags safely changes
277277 * valid ptes without going through an invalid entry).
278278 */
279− if (IS_ENABLED(CONFIG_DEBUG_VM) && IS_ENABLED(CONFIG_ARM64_HW_AFDBM) &&
280− pte_valid(*ptep)) {
281− BUG_ON(!pte_young(pte));
282− BUG_ON(pte_write(*ptep) && !pte_dirty(pte));
279+ if (IS_ENABLED(CONFIG_ARM64_HW_AFDBM) &&
280+ pte_valid(*ptep) && pte_valid(pte)) {
281+ VM_WARN_ONCE(!pte_young(pte),
282+ "%s: racy access flag clearing: 0x%016llx -> 0x%016llx",
283+ __func__, pte_val(*ptep), pte_val(pte));
284+ VM_WARN_ONCE(pte_write(*ptep) && !pte_dirty(pte),
285+ "%s: racy dirty state clearing: 0x%016llx -> 0x%016llx",
286+ __func__, pte_val(*ptep), pte_val(pte));
283287 }
284288
285289 set_pte(ptep, pte);
arch/arm64/kernel/vmlinux.lds.S+3−2
@@ -5,6 +5,7 @@ · 4 unmodified lines
55 */
66
77 #include <asm-generic/vmlinux.lds.h>
8+#include <asm/cache.h>
89 #include <asm/kernel-pgtable.h>
910 #include <asm/thread_info.h>
1011 #include <asm/memory.h>
@@ -140,7 +141,7 @@ SECTIONS · 129 unmodified lines
140141 ARM_EXIT_KEEP(EXIT_DATA)
141142 }
142143
143− PERCPU_SECTION(64)
144+ PERCPU_SECTION(L1_CACHE_BYTES)
144145
145146 . = ALIGN(PAGE_SIZE);
146147 __init_end = .;
@@ -158,7 +159,7 @@ SECTIONS · 11 unmodified lines
158159 . = ALIGN(PAGE_SIZE);
159160 _data = .;
160161 _sdata = .;
161− RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE)
162+ RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
162163 PECOFF_EDATA_PADDING
163164 _edata = .;
164165
arch/blackfin/kernel/perf_event.c+1−1
@@ -14,7 +14,7 @@ · 13 unmodified lines
1414 * Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
1515 * Copyright (C) 2009 Jaswinder Singh Rajput
1616 * Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter
17− * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
17+ * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra
1818 * Copyright (C) 2009 Intel Corporation, <markus.t.metzger@intel.com>
1919 *
2020 * ppc:
arch/ia64/include/asm/unistd.h+1−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
1111
1212
1313
14−#define NR_syscalls 322 /* length of syscall table */
14+#define NR_syscalls 323 /* length of syscall table */
1515
1616 /*
1717 * The following defines stop scripts/checksyscalls.sh from complaining about
arch/ia64/include/uapi/asm/unistd.h+1−0
@@ -335,5 +335,6 @@ · 334 unmodified lines
335335 #define __NR_userfaultfd 1343
336336 #define __NR_membarrier 1344
337337 #define __NR_kcmp 1345
338+#define __NR_mlock2 1346
338339
339340 #endif /* _UAPI_ASM_IA64_UNISTD_H */
arch/ia64/kernel/entry.S+1−0
@@ -1771,5 +1771,6 @@ sys_call_table: · 1770 unmodified lines
17711771 data8 sys_userfaultfd
17721772 data8 sys_membarrier
17731773 data8 sys_kcmp // 1345
1774+ data8 sys_mlock2
17741775
17751776 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
arch/microblaze/kernel/dma.c+2−1
@@ -61,7 +61,8 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, · 60 unmodified lines
6161 /* FIXME this part of code is untested */
6262 for_each_sg(sgl, sg, nents, i) {
6363 sg->dma_address = sg_phys(sg);
64− __dma_sync(sg_phys(sg), sg->length, direction);
64+ __dma_sync(page_to_phys(sg_page(sg)) + sg->offset,
65+ sg->length, direction);
6566 }
6667
6768 return nents;
arch/mips/mm/dma-default.c+1−1
@@ -145,7 +145,7 @@ static void *mips_dma_alloc_coherent(struct device *dev, size_t size, · 144 unmodified lines
145145
146146 gfp = massage_gfp_flags(dev, gfp);
147147
148− if (IS_ENABLED(CONFIG_DMA_CMA) && !(gfp & GFP_ATOMIC))
148+ if (IS_ENABLED(CONFIG_DMA_CMA) && gfpflags_allow_blocking(gfp))
149149 page = dma_alloc_from_contiguous(dev,
150150 count, get_order(size));
151151 if (!page)
arch/parisc/include/asm/pgtable.h+2−1
@@ -372,7 +372,8 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } · 371 unmodified lines
372372 */
373373 #ifdef CONFIG_HUGETLB_PAGE
374374 #define pte_huge(pte) (pte_val(pte) & _PAGE_HUGE)
375−#define pte_mkhuge(pte) (__pte(pte_val(pte) | _PAGE_HUGE))
375+#define pte_mkhuge(pte) (__pte(pte_val(pte) | \
376+ (parisc_requires_coherency() ? 0 : _PAGE_HUGE)))
376377 #else
377378 #define pte_huge(pte) (0)
378379 #define pte_mkhuge(pte) (pte)
arch/parisc/include/uapi/asm/unistd.h+2−1
@@ -360,8 +360,9 @@ · 359 unmodified lines
360360 #define __NR_execveat (__NR_Linux + 342)
361361 #define __NR_membarrier (__NR_Linux + 343)
362362 #define __NR_userfaultfd (__NR_Linux + 344)
363+#define __NR_mlock2 (__NR_Linux + 345)
363364
364−#define __NR_Linux_syscalls (__NR_userfaultfd + 1)
365+#define __NR_Linux_syscalls (__NR_mlock2 + 1)
365366
366367
367368 #define __IGNORE_select /* newselect */
arch/parisc/kernel/pci.c+0−18
@@ -171,24 +171,6 @@ void pcibios_set_master(struct pci_dev *dev) · 170 unmodified lines
171171 }
172172
173173
174−void __init pcibios_init_bus(struct pci_bus *bus)
175−{
176− struct pci_dev *dev = bus->self;
177− unsigned short bridge_ctl;
178−
179− /* We deal only with pci controllers and pci-pci bridges. */
180− if (!dev || (dev->class >> 8) != PCI_CLASS_BRIDGE_PCI)
181− return;
182−
183− /* PCI-PCI bridge - set the cache line and default latency
184− (32) for primary and secondary buses. */
185− pci_write_config_byte(dev, PCI_SEC_LATENCY_TIMER, 32);
186−
187− pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &bridge_ctl);
188− bridge_ctl |= PCI_BRIDGE_CTL_PARITY | PCI_BRIDGE_CTL_SERR;
189− pci_write_config_word(dev, PCI_BRIDGE_CONTROL, bridge_ctl);
190−}
191−
192174 /*
193175 * pcibios align resources() is called every time generic PCI code
194176 * wants to generate a new address. The process of looking for
arch/parisc/kernel/syscall_table.S+1−0
@@ -440,6 +440,7 @@ · 439 unmodified lines
440440 ENTRY_COMP(execveat)
441441 ENTRY_SAME(membarrier)
442442 ENTRY_SAME(userfaultfd)
443+ ENTRY_SAME(mlock2) /* 345 */
443444
444445
445446 .ifne (. - 90b) - (__NR_Linux_syscalls * (91b - 90b))
arch/powerpc/boot/dts/sbc8641d.dts+0−8
@@ -227,23 +227,15 @@ · 226 unmodified lines
227227 reg = <0x520 0x20>;
228228
229229 phy0: ethernet-phy@1f {
230− interrupt-parent = <&mpic>;
231− interrupts = <10 1>;
232230 reg = <0x1f>;
233231 };
234232 phy1: ethernet-phy@0 {
235− interrupt-parent = <&mpic>;
236− interrupts = <10 1>;
237233 reg = <0>;
238234 };
239235 phy2: ethernet-phy@1 {
240− interrupt-parent = <&mpic>;
241− interrupts = <10 1>;
242236 reg = <1>;
243237 };
244238 phy3: ethernet-phy@2 {
245− interrupt-parent = <&mpic>;
246− interrupts = <10 1>;
247239 reg = <2>;
248240 };
249241 tbi0: tbi-phy@11 {
arch/powerpc/include/asm/systbl.h+12−12
@@ -370,16 +370,16 @@ COMPAT_SYS(execveat) · 369 unmodified lines
370370 PPC64ONLY(switch_endian)
371371 SYSCALL_SPU(userfaultfd)
372372 SYSCALL_SPU(membarrier)
373−SYSCALL(semop)
374−SYSCALL(semget)
375−COMPAT_SYS(semctl)
376−COMPAT_SYS(semtimedop)
377−COMPAT_SYS(msgsnd)
378−COMPAT_SYS(msgrcv)
379−SYSCALL(msgget)
380−COMPAT_SYS(msgctl)
381−COMPAT_SYS(shmat)
382−SYSCALL(shmdt)
383−SYSCALL(shmget)
384−COMPAT_SYS(shmctl)
373+SYSCALL(ni_syscall)
374+SYSCALL(ni_syscall)
375+SYSCALL(ni_syscall)
376+SYSCALL(ni_syscall)
377+SYSCALL(ni_syscall)
378+SYSCALL(ni_syscall)
379+SYSCALL(ni_syscall)
380+SYSCALL(ni_syscall)
381+SYSCALL(ni_syscall)
382+SYSCALL(ni_syscall)
383+SYSCALL(ni_syscall)
384+SYSCALL(ni_syscall)
385385 SYSCALL(mlock2)
arch/powerpc/include/uapi/asm/unistd.h+0−12
@@ -388,18 +388,6 @@ · 387 unmodified lines
388388 #define __NR_switch_endian 363
389389 #define __NR_userfaultfd 364
390390 #define __NR_membarrier 365
391−#define __NR_semop 366
392−#define __NR_semget 367
393−#define __NR_semctl 368
394−#define __NR_semtimedop 369
395−#define __NR_msgsnd 370
396−#define __NR_msgrcv 371
397−#define __NR_msgget 372
398−#define __NR_msgctl 373
399−#define __NR_shmat 374
400−#define __NR_shmdt 375
401−#define __NR_shmget 376
402−#define __NR_shmctl 377
403391 #define __NR_mlock2 378
404392
405393 #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */
arch/powerpc/kernel/eeh_driver.c+4−10
@@ -590,16 +590,10 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus) · 589 unmodified lines
590590 eeh_ops->configure_bridge(pe);
591591 eeh_pe_restore_bars(pe);
592592
593− /*
594− * If it's PHB PE, the frozen state on all available PEs should have
595− * been cleared by the PHB reset. Otherwise, we unfreeze the PE and its
596− * child PEs because they might be in frozen state.
597− */
598− if (!(pe->type & EEH_PE_PHB)) {
599− rc = eeh_clear_pe_frozen_state(pe, false);
600− if (rc)
601− return rc;
602− }
593+ /* Clear frozen state */
594+ rc = eeh_clear_pe_frozen_state(pe, false);
595+ if (rc)
596+ return rc;
603597
604598 /* Give the system 5 seconds to finish running the user-space
605599 * hotplug shutdown scripts, e.g. ifdown for ethernet. Yes,
arch/powerpc/kvm/book3s_hv.c+6−0
@@ -224,6 +224,12 @@ static void kvmppc_core_vcpu_put_hv(struct kvm_vcpu *vcpu) · 223 unmodified lines
224224
225225 static void kvmppc_set_msr_hv(struct kvm_vcpu *vcpu, u64 msr)
226226 {
227+ /*
228+ * Check for illegal transactional state bit combination
229+ * and if we find it, force the TS field to a safe state.
230+ */
231+ if ((msr & MSR_TS_MASK) == MSR_TS_MASK)
232+ msr &= ~MSR_TS_MASK;
227233 vcpu->arch.shregs.msr = msr;
228234 kvmppc_end_cede(vcpu);
229235 }
arch/powerpc/platforms/powernv/opal-irqchip.c+38−26
@@ -43,11 +43,34 @@ static unsigned int opal_irq_count; · 42 unmodified lines
4343 static unsigned int *opal_irqs;
4444
4545 static void opal_handle_irq_work(struct irq_work *work);
46−static __be64 last_outstanding_events;
46+static u64 last_outstanding_events;
4747 static struct irq_work opal_event_irq_work = {
4848 .func = opal_handle_irq_work,
4949 };
5050
51+void opal_handle_events(uint64_t events)
52+{
53+ int virq, hwirq = 0;
54+ u64 mask = opal_event_irqchip.mask;
55+
56+ if (!in_irq() && (events & mask)) {
57+ last_outstanding_events = events;
58+ irq_work_queue(&opal_event_irq_work);
59+ return;
60+ }
61+
62+ while (events & mask) {
63+ hwirq = fls64(events) - 1;
64+ if (BIT_ULL(hwirq) & mask) {
65+ virq = irq_find_mapping(opal_event_irqchip.domain,
66+ hwirq);
67+ if (virq)
68+ generic_handle_irq(virq);
69+ }
70+ events &= ~BIT_ULL(hwirq);
71+ }
72+}
73+
5174 static void opal_event_mask(struct irq_data *d)
5275 {
5376 clear_bit(d->hwirq, &opal_event_irqchip.mask);
@@ -55,9 +78,21 @@ static void opal_event_mask(struct irq_data *d) · 1 unmodified line
5578
5679 static void opal_event_unmask(struct irq_data *d)
5780 {
81+ __be64 events;
82+
5883 set_bit(d->hwirq, &opal_event_irqchip.mask);
5984
60− opal_poll_events(&last_outstanding_events);
85+ opal_poll_events(&events);
86+ last_outstanding_events = be64_to_cpu(events);
87+
88+ /*
89+ * We can't just handle the events now with opal_handle_events().
90+ * If we did we would deadlock when opal_event_unmask() is called from
91+ * handle_level_irq() with the irq descriptor lock held, because
92+ * calling opal_handle_events() would call generic_handle_irq() and
93+ * then handle_level_irq() which would try to take the descriptor lock
94+ * again. Instead queue the events for later.
95+ */
6196 if (last_outstanding_events & opal_event_irqchip.mask)
6297 /* Need to retrigger the interrupt */
6398 irq_work_queue(&opal_event_irq_work);
@@ -96,29 +131,6 @@ static int opal_event_map(struct irq_domain *d, unsigned int irq, · 32 unmodified lines
96131 return 0;
97132 }
98133
99−void opal_handle_events(uint64_t events)
100−{
101− int virq, hwirq = 0;
102− u64 mask = opal_event_irqchip.mask;
103−
104− if (!in_irq() && (events & mask)) {
105− last_outstanding_events = events;
106− irq_work_queue(&opal_event_irq_work);
107− return;
108− }
109−
110− while (events & mask) {
111− hwirq = fls64(events) - 1;
112− if (BIT_ULL(hwirq) & mask) {
113− virq = irq_find_mapping(opal_event_irqchip.domain,
114− hwirq);
115− if (virq)
116− generic_handle_irq(virq);
117− }
118− events &= ~BIT_ULL(hwirq);
119− }
120−}
121−
122134 static irqreturn_t opal_interrupt(int irq, void *data)
123135 {
124136 __be64 events;
@@ -131,7 +143,7 @@ static irqreturn_t opal_interrupt(int irq, void *data) · 6 unmodified lines
131143
132144 static void opal_handle_irq_work(struct irq_work *work)
133145 {
134− opal_handle_events(be64_to_cpu(last_outstanding_events));
146+ opal_handle_events(last_outstanding_events);
135147 }
136148
137149 static int opal_event_match(struct irq_domain *h, struct device_node *node,
arch/powerpc/platforms/powernv/opal.c+1−1
@@ -278,7 +278,7 @@ static void opal_handle_message(void) · 277 unmodified lines
278278
279279 /* Sanity check */
280280 if (type >= OPAL_MSG_TYPE_MAX) {
281− pr_warning("%s: Unknown message type: %u\n", __func__, type);
281+ pr_warn_once("%s: Unknown message type: %u\n", __func__, type);
282282 return;
283283 }
284284 opal_message_do_notify(type, (void *)&msg);
arch/s390/kernel/dis.c+12−5
@@ -1920,16 +1920,23 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr) · 1919 unmodified lines
19201920 }
19211921 if (separator)
19221922 ptr += sprintf(ptr, "%c", separator);
1923+ /*
1924+ * Use four '%' characters below because of the
1925+ * following two conversions:
1926+ *
1927+ * 1) sprintf: %%%%r -> %%r
1928+ * 2) printk : %%r -> %r
1929+ */
19231930 if (operand->flags & OPERAND_GPR)
1924− ptr += sprintf(ptr, "%%r%i", value);
1931+ ptr += sprintf(ptr, "%%%%r%i", value);
19251932 else if (operand->flags & OPERAND_FPR)
1926− ptr += sprintf(ptr, "%%f%i", value);
1933+ ptr += sprintf(ptr, "%%%%f%i", value);
19271934 else if (operand->flags & OPERAND_AR)
1928− ptr += sprintf(ptr, "%%a%i", value);
1935+ ptr += sprintf(ptr, "%%%%a%i", value);
19291936 else if (operand->flags & OPERAND_CR)
1930− ptr += sprintf(ptr, "%%c%i", value);
1937+ ptr += sprintf(ptr, "%%%%c%i", value);
19311938 else if (operand->flags & OPERAND_VR)
1932− ptr += sprintf(ptr, "%%v%i", value);
1939+ ptr += sprintf(ptr, "%%%%v%i", value);
19331940 else if (operand->flags & OPERAND_PCREL)
19341941 ptr += sprintf(ptr, "%lx", (signed int) value
19351942 + addr);
arch/sh/include/uapi/asm/unistd_64.h+1−1
@@ -278,7 +278,7 @@ · 277 unmodified lines
278278 #define __NR_fsetxattr 256
279279 #define __NR_getxattr 257
280280 #define __NR_lgetxattr 258
281−#define __NR_fgetxattr 269
281+#define __NR_fgetxattr 259
282282 #define __NR_listxattr 260
283283 #define __NR_llistxattr 261
284284 #define __NR_flistxattr 262
arch/sh/kernel/perf_event.c+1−1
@@ -10,7 +10,7 @@ · 9 unmodified lines
1010 * Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
1111 * Copyright (C) 2009 Jaswinder Singh Rajput
1212 * Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter
13− * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
13+ * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra
1414 * Copyright (C) 2009 Intel Corporation, <markus.t.metzger@intel.com>
1515 *
1616 * ppc:
arch/sparc/kernel/perf_event.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99 * Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
1010 * Copyright (C) 2009 Jaswinder Singh Rajput
1111 * Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter
12− * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
12+ * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra
1313 */
1414
1515 #include <linux/perf_event.h>
arch/tile/kernel/perf_event.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121 * Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
2222 * Copyright (C) 2009 Jaswinder Singh Rajput
2323 * Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter
24− * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
24+ * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra
2525 * Copyright (C) 2009 Intel Corporation, <markus.t.metzger@intel.com>
2626 * Copyright (C) 2009 Google, Inc., Stephane Eranian
2727 */
arch/um/Makefile+1−1
@@ -131,7 +131,7 @@ export LDS_ELF_FORMAT := $(ELF_FORMAT) · 130 unmodified lines
131131 # The wrappers will select whether using "malloc" or the kernel allocator.
132132 LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
133133
134−LD_FLAGS_CMDLINE = $(foreach opt,$(LDFLAGS),-Wl,$(opt)) -lrt
134+LD_FLAGS_CMDLINE = $(foreach opt,$(LDFLAGS),-Wl,$(opt))
135135
136136 # Used by link-vmlinux.sh which has special support for um link
137137 export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE)
arch/um/drivers/net_user.c+6−4
@@ -249,21 +249,23 @@ void close_addr(unsigned char *addr, unsigned char *netmask, void *arg) · 248 unmodified lines
249249
250250 char *split_if_spec(char *str, ...)
251251 {
252− char **arg, *end;
252+ char **arg, *end, *ret = NULL;
253253 va_list ap;
254254
255255 va_start(ap, str);
256256 while ((arg = va_arg(ap, char **)) != NULL) {
257257 if (*str == '\0')
258− return NULL;
258+ goto out;
259259 end = strchr(str, ',');
260260 if (end != str)
261261 *arg = str;
262262 if (end == NULL)
263− return NULL;
263+ goto out;
264264 *end++ = '\0';
265265 str = end;
266266 }
267+ ret = str;
268+out:
267269 va_end(ap);
268− return str;
270+ return ret;
269271 }
arch/um/kernel/signal.c+1−1
@@ -69,7 +69,7 @@ void do_signal(struct pt_regs *regs) · 68 unmodified lines
6969 struct ksignal ksig;
7070 int handled_sig = 0;
7171
72− while (get_signal(&ksig)) {
72+ if (get_signal(&ksig)) {
7373 handled_sig = 1;
7474 /* Whee! Actually deliver the signal. */
7575 handle_signal(&ksig, regs);
arch/x86/kernel/cpu/perf_event.c+1−1
@@ -5,7 +5,7 @@ · 4 unmodified lines
55 * Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
66 * Copyright (C) 2009 Jaswinder Singh Rajput
77 * Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter
8− * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
8+ * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra
99 * Copyright (C) 2009 Intel Corporation, <markus.t.metzger@intel.com>
1010 * Copyright (C) 2009 Google, Inc., Stephane Eranian
1111 *
arch/x86/kernel/cpu/perf_event.h+3−2
@@ -5,7 +5,7 @@ · 4 unmodified lines
55 * Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
66 * Copyright (C) 2009 Jaswinder Singh Rajput
77 * Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter
8− * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
8+ * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra
99 * Copyright (C) 2009 Intel Corporation, <markus.t.metzger@intel.com>
1010 * Copyright (C) 2009 Google, Inc., Stephane Eranian
1111 *
@@ -387,7 +387,7 @@ struct cpu_hw_events { · 375 unmodified lines
387387 /* Check flags and event code/umask, and set the HSW N/A flag */
388388 #define INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_NA(code, n) \
389389 __EVENT_CONSTRAINT(code, n, \
390− INTEL_ARCH_EVENT_MASK|INTEL_ARCH_EVENT_MASK, \
390+ INTEL_ARCH_EVENT_MASK|X86_ALL_EVENT_FLAGS, \
391391 HWEIGHT(n), 0, PERF_X86_EVENT_PEBS_NA_HSW)
392392
393393
@@ -627,6 +627,7 @@ struct x86_perf_task_context { · 233 unmodified lines
627627 u64 lbr_from[MAX_LBR_ENTRIES];
628628 u64 lbr_to[MAX_LBR_ENTRIES];
629629 u64 lbr_info[MAX_LBR_ENTRIES];
630+ int tos;
630631 int lbr_callstack_users;
631632 int lbr_stack_state;
632633 };
arch/x86/kernel/cpu/perf_event_intel.c+1−1
@@ -232,7 +232,7 @@ static struct event_constraint intel_hsw_event_constraints[] = { · 231 unmodified lines
232232 FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */
233233 FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */
234234 FIXED_EVENT_CONSTRAINT(0x0300, 2), /* CPU_CLK_UNHALTED.REF */
235− INTEL_EVENT_CONSTRAINT(0x48, 0x4), /* L1D_PEND_MISS.* */
235+ INTEL_UEVENT_CONSTRAINT(0x148, 0x4), /* L1D_PEND_MISS.PENDING */
236236 INTEL_UEVENT_CONSTRAINT(0x01c0, 0x2), /* INST_RETIRED.PREC_DIST */
237237 INTEL_EVENT_CONSTRAINT(0xcd, 0x8), /* MEM_TRANS_RETIRED.LOAD_LATENCY */
238238 /* CYCLE_ACTIVITY.CYCLES_L1D_PENDING */
arch/x86/kernel/cpu/perf_event_intel_cqm.c+1−1
@@ -298,7 +298,7 @@ static bool __match_event(struct perf_event *a, struct perf_event *b) · 297 unmodified lines
298298 static inline struct perf_cgroup *event_to_cgroup(struct perf_event *event)
299299 {
300300 if (event->attach_state & PERF_ATTACH_TASK)
301− return perf_cgroup_from_task(event->hw.target);
301+ return perf_cgroup_from_task(event->hw.target, event->ctx);
302302
303303 return event->cgrp;
304304 }
arch/x86/kernel/cpu/perf_event_intel_lbr.c+3−1
@@ -239,7 +239,7 @@ static void __intel_pmu_lbr_restore(struct x86_perf_task_context *task_ctx) · 238 unmodified lines
239239 }
240240
241241 mask = x86_pmu.lbr_nr - 1;
242− tos = intel_pmu_lbr_tos();
242+ tos = task_ctx->tos;
243243 for (i = 0; i < tos; i++) {
244244 lbr_idx = (tos - i) & mask;
245245 wrmsrl(x86_pmu.lbr_from + lbr_idx, task_ctx->lbr_from[i]);
@@ -247,6 +247,7 @@ static void __intel_pmu_lbr_restore(struct x86_perf_task_context *task_ctx) · 1 unmodified line
247247 if (x86_pmu.intel_cap.lbr_format == LBR_FORMAT_INFO)
248248 wrmsrl(MSR_LBR_INFO_0 + lbr_idx, task_ctx->lbr_info[i]);
249249 }
250+ wrmsrl(x86_pmu.lbr_tos, tos);
250251 task_ctx->lbr_stack_state = LBR_NONE;
251252 }
252253
@@ -270,6 +271,7 @@ static void __intel_pmu_lbr_save(struct x86_perf_task_context *task_ctx) · 17 unmodified lines
270271 if (x86_pmu.intel_cap.lbr_format == LBR_FORMAT_INFO)
271272 rdmsrl(MSR_LBR_INFO_0 + lbr_idx, task_ctx->lbr_info[i]);
272273 }
274+ task_ctx->tos = tos;
273275 task_ctx->lbr_stack_state = LBR_VALID;
274276 }
275277
arch/x86/kernel/irq_work.c+1−1
@@ -1,7 +1,7 @@
11 /*
22 * x86 specific code for irq_work
33 *
4− * Copyright (C) 2010 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
4+ * Copyright (C) 2010 Red Hat, Inc., Peter Zijlstra
55 */
66
77 #include <linux/kernel.h>
arch/x86/kvm/cpuid.h+8−0
@@ -38,6 +38,14 @@ static inline bool guest_cpuid_has_xsave(struct kvm_vcpu *vcpu) · 37 unmodified lines
3838 return best && (best->ecx & bit(X86_FEATURE_XSAVE));
3939 }
4040
41+static inline bool guest_cpuid_has_mtrr(struct kvm_vcpu *vcpu)
42+{
43+ struct kvm_cpuid_entry2 *best;
44+
45+ best = kvm_find_cpuid_entry(vcpu, 1, 0);
46+ return best && (best->edx & bit(X86_FEATURE_MTRR));
47+}
48+
4149 static inline bool guest_cpuid_has_tsc_adjust(struct kvm_vcpu *vcpu)
4250 {
4351 struct kvm_cpuid_entry2 *best;
arch/x86/kvm/mtrr.c+19−6
@@ -120,14 +120,22 @@ static u8 mtrr_default_type(struct kvm_mtrr *mtrr_state) · 119 unmodified lines
120120 return mtrr_state->deftype & IA32_MTRR_DEF_TYPE_TYPE_MASK;
121121 }
122122
123−static u8 mtrr_disabled_type(void)
123+static u8 mtrr_disabled_type(struct kvm_vcpu *vcpu)
124124 {
125125 /*
126126 * Intel SDM 11.11.2.2: all MTRRs are disabled when
127127 * IA32_MTRR_DEF_TYPE.E bit is cleared, and the UC
128128 * memory type is applied to all of physical memory.
129+ *
130+ * However, virtual machines can be run with CPUID such that
131+ * there are no MTRRs. In that case, the firmware will never
132+ * enable MTRRs and it is obviously undesirable to run the
133+ * guest entirely with UC memory and we use WB.
129134 */
130− return MTRR_TYPE_UNCACHABLE;
135+ if (guest_cpuid_has_mtrr(vcpu))
136+ return MTRR_TYPE_UNCACHABLE;
137+ else
138+ return MTRR_TYPE_WRBACK;
131139 }
132140
133141 /*
@@ -267,7 +275,7 @@ static int fixed_mtrr_addr_to_seg(u64 addr) · 133 unmodified lines
267275
268276 for (seg = 0; seg < seg_num; seg++) {
269277 mtrr_seg = &fixed_seg_table[seg];
270− if (mtrr_seg->start >= addr && addr < mtrr_seg->end)
278+ if (mtrr_seg->start <= addr && addr < mtrr_seg->end)
271279 return seg;
272280 }
273281
@@ -300,7 +308,6 @@ static void var_mtrr_range(struct kvm_mtrr_range *range, u64 *start, u64 *end) · 26 unmodified lines
300308 *start = range->base & PAGE_MASK;
301309
302310 mask = range->mask & PAGE_MASK;
303− mask |= ~0ULL << boot_cpu_data.x86_phys_bits;
304311
305312 /* This cannot overflow because writing to the reserved bits of
306313 * variable MTRRs causes a #GP.
@@ -356,10 +363,14 @@ static void set_var_mtrr_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data) · 49 unmodified lines
356363 if (var_mtrr_range_is_valid(cur))
357364 list_del(&mtrr_state->var_ranges[index].node);
358365
366+ /* Extend the mask with all 1 bits to the left, since those
367+ * bits must implicitly be 0. The bits are then cleared
368+ * when reading them.
369+ */
359370 if (!is_mtrr_mask)
360371 cur->base = data;
361372 else
362− cur->mask = data;
373+ cur->mask = data | (-1LL << cpuid_maxphyaddr(vcpu));
363374
364375 /* add it to the list if it's enabled. */
365376 if (var_mtrr_range_is_valid(cur)) {
@@ -426,6 +437,8 @@ int kvm_mtrr_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) · 60 unmodified lines
426437 *pdata = vcpu->arch.mtrr_state.var_ranges[index].base;
427438 else
428439 *pdata = vcpu->arch.mtrr_state.var_ranges[index].mask;
440+
441+ *pdata &= (1ULL << cpuid_maxphyaddr(vcpu)) - 1;
429442 }
430443
431444 return 0;
@@ -670,7 +683,7 @@ u8 kvm_mtrr_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn) · 238 unmodified lines
670683 }
671684
672685 if (iter.mtrr_disabled)
673− return mtrr_disabled_type();
686+ return mtrr_disabled_type(vcpu);
674687
675688 /* not contained in any MTRRs. */
676689 if (type == -1)
arch/x86/kvm/svm.c+2−2
@@ -3422,6 +3422,8 @@ static int handle_exit(struct kvm_vcpu *vcpu) · 3421 unmodified lines
34223422 struct kvm_run *kvm_run = vcpu->run;
34233423 u32 exit_code = svm->vmcb->control.exit_code;
34243424
3425+ trace_kvm_exit(exit_code, vcpu, KVM_ISA_SVM);
3426+
34253427 if (!is_cr_intercept(svm, INTERCEPT_CR0_WRITE))
34263428 vcpu->arch.cr0 = svm->vmcb->save.cr0;
34273429 if (npt_enabled)
@@ -3892,8 +3894,6 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) · 464 unmodified lines
38923894 vcpu->arch.regs[VCPU_REGS_RSP] = svm->vmcb->save.rsp;
38933895 vcpu->arch.regs[VCPU_REGS_RIP] = svm->vmcb->save.rip;
38943896
3895− trace_kvm_exit(svm->vmcb->control.exit_code, vcpu, KVM_ISA_SVM);
3896−
38973897 if (unlikely(svm->vmcb->control.exit_code == SVM_EXIT_NMI))
38983898 kvm_before_handle_nmi(&svm->vcpu);
38993899
arch/x86/kvm/vmx.c+4−3
@@ -2803,7 +2803,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) · 2802 unmodified lines
28032803 msr_info->data = vcpu->arch.ia32_xss;
28042804 break;
28052805 case MSR_TSC_AUX:
2806− if (!guest_cpuid_has_rdtscp(vcpu))
2806+ if (!guest_cpuid_has_rdtscp(vcpu) && !msr_info->host_initiated)
28072807 return 1;
28082808 /* Otherwise falls through */
28092809 default:
@@ -2909,7 +2909,7 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) · 99 unmodified lines
29092909 clear_atomic_switch_msr(vmx, MSR_IA32_XSS);
29102910 break;
29112911 case MSR_TSC_AUX:
2912− if (!guest_cpuid_has_rdtscp(vcpu))
2912+ if (!guest_cpuid_has_rdtscp(vcpu) && !msr_info->host_initiated)
29132913 return 1;
29142914 /* Check reserved bit, higher 32 bits should be zero */
29152915 if ((data >> 32) != 0)
@@ -8042,6 +8042,8 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu) · 5126 unmodified lines
80428042 u32 exit_reason = vmx->exit_reason;
80438043 u32 vectoring_info = vmx->idt_vectoring_info;
80448044
8045+ trace_kvm_exit(exit_reason, vcpu, KVM_ISA_VMX);
8046+
80458047 /*
80468048 * Flush logged GPAs PML buffer, this will make dirty_bitmap more
80478049 * updated. Another good is, in kvm_vm_ioctl_get_dirty_log, before
@@ -8668,7 +8670,6 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) · 620 unmodified lines
86688670 vmx->loaded_vmcs->launched = 1;
86698671
86708672 vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
8671− trace_kvm_exit(vmx->exit_reason, vcpu, KVM_ISA_VMX);
86728673
86738674 /*
86748675 * the KVM_REQ_EVENT optimization bit is only on for one entry, and if
arch/x86/kvm/x86.c+8−4
@@ -3572,9 +3572,11 @@ static int kvm_vm_ioctl_get_pit(struct kvm *kvm, struct kvm_pit_state *ps) · 3571 unmodified lines
35723572
35733573 static int kvm_vm_ioctl_set_pit(struct kvm *kvm, struct kvm_pit_state *ps)
35743574 {
3575+ int i;
35753576 mutex_lock(&kvm->arch.vpit->pit_state.lock);
35763577 memcpy(&kvm->arch.vpit->pit_state, ps, sizeof(struct kvm_pit_state));
3577− kvm_pit_load_count(kvm, 0, ps->channels[0].count, 0);
3578+ for (i = 0; i < 3; i++)
3579+ kvm_pit_load_count(kvm, i, ps->channels[i].count, 0);
35783580 mutex_unlock(&kvm->arch.vpit->pit_state.lock);
35793581 return 0;
35803582 }
@@ -3593,6 +3595,7 @@ static int kvm_vm_ioctl_get_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps) · 12 unmodified lines
35933595 static int kvm_vm_ioctl_set_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps)
35943596 {
35953597 int start = 0;
3598+ int i;
35963599 u32 prev_legacy, cur_legacy;
35973600 mutex_lock(&kvm->arch.vpit->pit_state.lock);
35983601 prev_legacy = kvm->arch.vpit->pit_state.flags & KVM_PIT_FLAGS_HPET_LEGACY;
@@ -3602,7 +3605,8 @@ static int kvm_vm_ioctl_set_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps) · 3 unmodified lines
36023605 memcpy(&kvm->arch.vpit->pit_state.channels, &ps->channels,
36033606 sizeof(kvm->arch.vpit->pit_state.channels));
36043607 kvm->arch.vpit->pit_state.flags = ps->flags;
3605− kvm_pit_load_count(kvm, 0, kvm->arch.vpit->pit_state.channels[0].count, start);
3608+ for (i = 0; i < 3; i++)
3609+ kvm_pit_load_count(kvm, i, kvm->arch.vpit->pit_state.channels[i].count, start);
36063610 mutex_unlock(&kvm->arch.vpit->pit_state.lock);
36073611 return 0;
36083612 }
@@ -6515,6 +6519,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) · 2906 unmodified lines
65156519 if (req_immediate_exit)
65166520 smp_send_reschedule(vcpu->cpu);
65176521
6522+ trace_kvm_entry(vcpu->vcpu_id);
6523+ wait_lapic_expire(vcpu);
65186524 __kvm_guest_enter();
65196525
65206526 if (unlikely(vcpu->arch.switch_db_regs)) {
@@ -6527,8 +6533,6 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) · 6 unmodified lines
65276533 vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_RELOAD;
65286534 }
65296535
6530− trace_kvm_entry(vcpu->vcpu_id);
6531− wait_lapic_expire(vcpu);
65326536 kvm_x86_ops->run(vcpu);
65336537
65346538 /*
arch/x86/mm/dump_pagetables.c+1−1
@@ -89,7 +89,7 @@ static struct addr_marker address_markers[] = { · 88 unmodified lines
8989 { 0/* VMALLOC_START */, "vmalloc() Area" },
9090 { 0/*VMALLOC_END*/, "vmalloc() End" },
9191 # ifdef CONFIG_HIGHMEM
92− { 0/*PKMAP_BASE*/, "Persisent kmap() Area" },
92+ { 0/*PKMAP_BASE*/, "Persistent kmap() Area" },
9393 # endif
9494 { 0/*FIXADDR_START*/, "Fixmap Area" },
9595 #endif
arch/x86/um/signal.c+10−8
@@ -211,7 +211,7 @@ static int copy_sc_from_user(struct pt_regs *regs, · 210 unmodified lines
211211 if (err)
212212 return 1;
213213
214− err = convert_fxsr_from_user(&fpx, sc.fpstate);
214+ err = convert_fxsr_from_user(&fpx, (void *)sc.fpstate);
215215 if (err)
216216 return 1;
217217
@@ -227,7 +227,7 @@ static int copy_sc_from_user(struct pt_regs *regs, · 9 unmodified lines
227227 {
228228 struct user_i387_struct fp;
229229
230− err = copy_from_user(&fp, sc.fpstate,
230+ err = copy_from_user(&fp, (void *)sc.fpstate,
231231 sizeof(struct user_i387_struct));
232232 if (err)
233233 return 1;
@@ -291,7 +291,7 @@ static int copy_sc_to_user(struct sigcontext __user *to, · 57 unmodified lines
291291 #endif
292292 #undef PUTREG
293293 sc.oldmask = mask;
294− sc.fpstate = to_fp;
294+ sc.fpstate = (unsigned long)to_fp;
295295
296296 err = copy_to_user(to, &sc, sizeof(struct sigcontext));
297297 if (err)
@@ -468,12 +468,10 @@ long sys_sigreturn(void) · 170 unmodified lines
468468 struct sigframe __user *frame = (struct sigframe __user *)(sp - 8);
469469 sigset_t set;
470470 struct sigcontext __user *sc = &frame->sc;
471− unsigned long __user *oldmask = &sc->oldmask;
472− unsigned long __user *extramask = frame->extramask;
473471 int sig_size = (_NSIG_WORDS - 1) * sizeof(unsigned long);
474472
475− if (copy_from_user(&set.sig[0], oldmask, sizeof(set.sig[0])) ||
476− copy_from_user(&set.sig[1], extramask, sig_size))
473+ if (copy_from_user(&set.sig[0], &sc->oldmask, sizeof(set.sig[0])) ||
474+ copy_from_user(&set.sig[1], frame->extramask, sig_size))
477475 goto segfault;
478476
479477 set_current_blocked(&set);
@@ -505,6 +503,7 @@ int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig, · 25 unmodified lines
505503 {
506504 struct rt_sigframe __user *frame;
507505 int err = 0, sig = ksig->sig;
506+ unsigned long fp_to;
508507
509508 frame = (struct rt_sigframe __user *)
510509 round_down(stack_top - sizeof(struct rt_sigframe), 16);
@@ -526,7 +525,10 @@ int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig, · 15 unmodified lines
526525 err |= __save_altstack(&frame->uc.uc_stack, PT_REGS_SP(regs));
527526 err |= copy_sc_to_user(&frame->uc.uc_mcontext, &frame->fpstate, regs,
528527 set->sig[0]);
529− err |= __put_user(&frame->fpstate, &frame->uc.uc_mcontext.fpstate);
528+
529+ fp_to = (unsigned long)&frame->fpstate;
530+
531+ err |= __put_user(fp_to, &frame->uc.uc_mcontext.fpstate);
530532 if (sizeof(*set) == 16) {
531533 err |= __put_user(set->sig[0], &frame->uc.uc_sigmask.sig[0]);
532534 err |= __put_user(set->sig[1], &frame->uc.uc_sigmask.sig[1]);
arch/x86/xen/mmu.c+2−7
@@ -2495,14 +2495,9 @@ void __init xen_init_mmu_ops(void) · 2494 unmodified lines
24952495 {
24962496 x86_init.paging.pagetable_init = xen_pagetable_init;
24972497
2498− /* Optimization - we can use the HVM one but it has no idea which
2499− * VCPUs are descheduled - which means that it will needlessly IPI
2500− * them. Xen knows so let it do the job.
2501− */
2502− if (xen_feature(XENFEAT_auto_translated_physmap)) {
2503− pv_mmu_ops.flush_tlb_others = xen_flush_tlb_others;
2498+ if (xen_feature(XENFEAT_auto_translated_physmap))
25042499 return;
2505− }
2500+
25062501 pv_mmu_ops = xen_mmu_ops;
25072502
25082503 memset(dummy_mapping, 0xff, PAGE_SIZE);
arch/x86/xen/suspend.c+10−10
@@ -68,26 +68,16 @@ static void xen_pv_post_suspend(int suspend_cancelled) · 67 unmodified lines
6868
6969 void xen_arch_pre_suspend(void)
7070 {
71− int cpu;
72−
73− for_each_online_cpu(cpu)
74− xen_pmu_finish(cpu);
75−
7671 if (xen_pv_domain())
7772 xen_pv_pre_suspend();
7873 }
7974
8075 void xen_arch_post_suspend(int cancelled)
8176 {
82− int cpu;
83−
8477 if (xen_pv_domain())
8578 xen_pv_post_suspend(cancelled);
8679 else
8780 xen_hvm_post_suspend(cancelled);
88−
89− for_each_online_cpu(cpu)
90− xen_pmu_init(cpu);
9181 }
9282
9383 static void xen_vcpu_notify_restore(void *data)
@@ -106,10 +96,20 @@ static void xen_vcpu_notify_suspend(void *data) · 12 unmodified lines
10696
10797 void xen_arch_resume(void)
10898 {
99+ int cpu;
100+
109101 on_each_cpu(xen_vcpu_notify_restore, NULL, 1);
102+
103+ for_each_online_cpu(cpu)
104+ xen_pmu_init(cpu);
110105 }
111106
112107 void xen_arch_suspend(void)
113108 {
109+ int cpu;
110+
111+ for_each_online_cpu(cpu)
112+ xen_pmu_finish(cpu);
113+
114114 on_each_cpu(xen_vcpu_notify_suspend, NULL, 1);
115115 }
block/blk-cgroup.c+3−3
@@ -1127,15 +1127,15 @@ void blkcg_exit_queue(struct request_queue *q) · 1126 unmodified lines
11271127 * of the main cic data structures. For now we allow a task to change
11281128 * its cgroup only if it's the only owner of its ioc.
11291129 */
1130−static int blkcg_can_attach(struct cgroup_subsys_state *css,
1131− struct cgroup_taskset *tset)
1130+static int blkcg_can_attach(struct cgroup_taskset *tset)
11321131 {
11331132 struct task_struct *task;
1133+ struct cgroup_subsys_state *dst_css;
11341134 struct io_context *ioc;
11351135 int ret = 0;
11361136
11371137 /* task_lock() is needed to avoid races with exit_io_context() */
1138− cgroup_taskset_for_each(task, tset) {
1138+ cgroup_taskset_for_each(task, dst_css, tset) {
11391139 task_lock(task);
11401140 ioc = task->io_context;
11411141 if (ioc && atomic_read(&ioc->nr_tasks) > 1)
block/blk-core.c+14−2
@@ -1689,8 +1689,6 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio) · 1688 unmodified lines
16891689 struct request *req;
16901690 unsigned int request_count = 0;
16911691
1692− blk_queue_split(q, &bio, q->bio_split);
1693−
16941692 /*
16951693 * low level driver can indicate that it wants pages above a
16961694 * certain limit bounced to low memory (ie for highmem, or even
@@ -1698,6 +1696,8 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio) · 1 unmodified line
16981696 */
16991697 blk_queue_bounce(q, &bio);
17001698
1699+ blk_queue_split(q, &bio, q->bio_split);
1700+
17011701 if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {
17021702 bio->bi_error = -EIO;
17031703 bio_endio(bio);
@@ -3405,6 +3405,9 @@ int blk_pre_runtime_suspend(struct request_queue *q) · 1701 unmodified lines
34053405 {
34063406 int ret = 0;
34073407
3408+ if (!q->dev)
3409+ return ret;
3410+
34083411 spin_lock_irq(q->queue_lock);
34093412 if (q->nr_pending) {
34103413 ret = -EBUSY;
@@ -3432,6 +3435,9 @@ EXPORT_SYMBOL(blk_pre_runtime_suspend); · 21 unmodified lines
34323435 */
34333436 void blk_post_runtime_suspend(struct request_queue *q, int err)
34343437 {
3438+ if (!q->dev)
3439+ return;
3440+
34353441 spin_lock_irq(q->queue_lock);
34363442 if (!err) {
34373443 q->rpm_status = RPM_SUSPENDED;
@@ -3456,6 +3462,9 @@ EXPORT_SYMBOL(blk_post_runtime_suspend); · 18 unmodified lines
34563462 */
34573463 void blk_pre_runtime_resume(struct request_queue *q)
34583464 {
3465+ if (!q->dev)
3466+ return;
3467+
34593468 spin_lock_irq(q->queue_lock);
34603469 q->rpm_status = RPM_RESUMING;
34613470 spin_unlock_irq(q->queue_lock);
@@ -3478,6 +3487,9 @@ EXPORT_SYMBOL(blk_pre_runtime_resume); · 16 unmodified lines
34783487 */
34793488 void blk_post_runtime_resume(struct request_queue *q, int err)
34803489 {
3490+ if (!q->dev)
3491+ return;
3492+
34813493 spin_lock_irq(q->queue_lock);
34823494 if (!err) {
34833495 q->rpm_status = RPM_ACTIVE;
crypto/ablkcipher.c+1−1
@@ -277,12 +277,12 @@ static int ablkcipher_walk_first(struct ablkcipher_request *req, · 276 unmodified lines
277277 if (WARN_ON_ONCE(in_irq()))
278278 return -EDEADLK;
279279
280+ walk->iv = req->info;
280281 walk->nbytes = walk->total;
281282 if (unlikely(!walk->total))
282283 return 0;
283284
284285 walk->iv_buffer = NULL;
285− walk->iv = req->info;
286286 if (unlikely(((unsigned long)walk->iv & alignmask))) {
287287 int err = ablkcipher_copy_iv(walk, tfm, alignmask);
288288
crypto/blkcipher.c+1−1
@@ -326,12 +326,12 @@ static int blkcipher_walk_first(struct blkcipher_desc *desc, · 325 unmodified lines
326326 if (WARN_ON_ONCE(in_irq()))
327327 return -EDEADLK;
328328
329+ walk->iv = desc->info;
329330 walk->nbytes = walk->total;
330331 if (unlikely(!walk->total))
331332 return 0;
332333
333334 walk->buffer = NULL;
334− walk->iv = desc->info;
335335 if (unlikely(((unsigned long)walk->iv & walk->alignmask))) {
336336 int err = blkcipher_copy_iv(walk);
337337 if (err)
drivers/acpi/nfit.c+1−1
@@ -1810,7 +1810,7 @@ static void acpi_nfit_notify(struct acpi_device *adev, u32 event) · 1809 unmodified lines
18101810 if (!dev->driver) {
18111811 /* dev->driver may be null if we're being removed */
18121812 dev_dbg(dev, "%s: no driver found for dev\n", __func__);
1813− return;
1813+ goto out_unlock;
18141814 }
18151815
18161816 if (!acpi_desc) {
drivers/ata/ahci.c+12−10
@@ -314,16 +314,6 @@ static const struct pci_device_id ahci_pci_tbl[] = { · 313 unmodified lines
314314 { PCI_VDEVICE(INTEL, 0x1f37), board_ahci_avn }, /* Avoton RAID */
315315 { PCI_VDEVICE(INTEL, 0x1f3e), board_ahci_avn }, /* Avoton RAID */
316316 { PCI_VDEVICE(INTEL, 0x1f3f), board_ahci_avn }, /* Avoton RAID */
317− { PCI_VDEVICE(INTEL, 0xa182), board_ahci }, /* Lewisburg AHCI*/
318− { PCI_VDEVICE(INTEL, 0xa202), board_ahci }, /* Lewisburg AHCI*/
319− { PCI_VDEVICE(INTEL, 0xa184), board_ahci }, /* Lewisburg RAID*/
320− { PCI_VDEVICE(INTEL, 0xa204), board_ahci }, /* Lewisburg RAID*/
321− { PCI_VDEVICE(INTEL, 0xa186), board_ahci }, /* Lewisburg RAID*/
322− { PCI_VDEVICE(INTEL, 0xa206), board_ahci }, /* Lewisburg RAID*/
323− { PCI_VDEVICE(INTEL, 0x2822), board_ahci }, /* Lewisburg RAID*/
324− { PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* Lewisburg RAID*/
325− { PCI_VDEVICE(INTEL, 0xa18e), board_ahci }, /* Lewisburg RAID*/
326− { PCI_VDEVICE(INTEL, 0xa20e), board_ahci }, /* Lewisburg RAID*/
327317 { PCI_VDEVICE(INTEL, 0x2823), board_ahci }, /* Wellsburg RAID */
328318 { PCI_VDEVICE(INTEL, 0x2827), board_ahci }, /* Wellsburg RAID */
329319 { PCI_VDEVICE(INTEL, 0x8d02), board_ahci }, /* Wellsburg AHCI */
@@ -350,10 +340,22 @@ static const struct pci_device_id ahci_pci_tbl[] = { · 20 unmodified lines
350340 { PCI_VDEVICE(INTEL, 0x9d03), board_ahci }, /* Sunrise Point-LP AHCI */
351341 { PCI_VDEVICE(INTEL, 0x9d05), board_ahci }, /* Sunrise Point-LP RAID */
352342 { PCI_VDEVICE(INTEL, 0x9d07), board_ahci }, /* Sunrise Point-LP RAID */
343+ { PCI_VDEVICE(INTEL, 0xa102), board_ahci }, /* Sunrise Point-H AHCI */
353344 { PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H AHCI */
354345 { PCI_VDEVICE(INTEL, 0xa105), board_ahci }, /* Sunrise Point-H RAID */
346+ { PCI_VDEVICE(INTEL, 0xa106), board_ahci }, /* Sunrise Point-H RAID */
355347 { PCI_VDEVICE(INTEL, 0xa107), board_ahci }, /* Sunrise Point-H RAID */
356348 { PCI_VDEVICE(INTEL, 0xa10f), board_ahci }, /* Sunrise Point-H RAID */
349+ { PCI_VDEVICE(INTEL, 0x2822), board_ahci }, /* Lewisburg RAID*/
350+ { PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* Lewisburg RAID*/
351+ { PCI_VDEVICE(INTEL, 0xa182), board_ahci }, /* Lewisburg AHCI*/
352+ { PCI_VDEVICE(INTEL, 0xa184), board_ahci }, /* Lewisburg RAID*/
353+ { PCI_VDEVICE(INTEL, 0xa186), board_ahci }, /* Lewisburg RAID*/
354+ { PCI_VDEVICE(INTEL, 0xa18e), board_ahci }, /* Lewisburg RAID*/
355+ { PCI_VDEVICE(INTEL, 0xa202), board_ahci }, /* Lewisburg AHCI*/
356+ { PCI_VDEVICE(INTEL, 0xa204), board_ahci }, /* Lewisburg RAID*/
357+ { PCI_VDEVICE(INTEL, 0xa206), board_ahci }, /* Lewisburg RAID*/
358+ { PCI_VDEVICE(INTEL, 0xa20e), board_ahci }, /* Lewisburg RAID*/
357359
358360 /* JMicron 360/1/3/5/6, match class to avoid IDE function */
359361 { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
drivers/ata/ahci_mvebu.c+5−0
@@ -62,6 +62,7 @@ static void ahci_mvebu_regret_option(struct ahci_host_priv *hpriv) · 61 unmodified lines
6262 writel(0x80, hpriv->mmio + AHCI_VENDOR_SPECIFIC_0_DATA);
6363 }
6464
65+#ifdef CONFIG_PM_SLEEP
6566 static int ahci_mvebu_suspend(struct platform_device *pdev, pm_message_t state)
6667 {
6768 return ahci_platform_suspend_host(&pdev->dev);
@@ -81,6 +82,10 @@ static int ahci_mvebu_resume(struct platform_device *pdev) · 13 unmodified lines
8182
8283 return ahci_platform_resume_host(&pdev->dev);
8384 }
85+#else
86+#define ahci_mvebu_suspend NULL
87+#define ahci_mvebu_resume NULL
88+#endif
8489
8590 static const struct ata_port_info ahci_mvebu_port_info = {
8691 .flags = AHCI_FLAG_COMMON,
drivers/ata/libahci.c+9−0
@@ -1273,6 +1273,15 @@ static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp, · 1272 unmodified lines
12731273 ata_tf_to_fis(tf, pmp, is_cmd, fis);
12741274 ahci_fill_cmd_slot(pp, 0, cmd_fis_len | flags | (pmp << 12));
12751275
1276+ /* set port value for softreset of Port Multiplier */
1277+ if (pp->fbs_enabled && pp->fbs_last_dev != pmp) {
1278+ tmp = readl(port_mmio + PORT_FBS);
1279+ tmp &= ~(PORT_FBS_DEV_MASK | PORT_FBS_DEC);
1280+ tmp |= pmp << PORT_FBS_DEV_OFFSET;
1281+ writel(tmp, port_mmio + PORT_FBS);
1282+ pp->fbs_last_dev = pmp;
1283+ }
1284+
12761285 /* issue & wait */
12771286 writel(1, port_mmio + PORT_CMD_ISSUE);
12781287
drivers/ata/libata-eh.c+8−0
@@ -1505,12 +1505,20 @@ static const char *ata_err_string(unsigned int err_mask) · 1504 unmodified lines
15051505 unsigned int ata_read_log_page(struct ata_device *dev, u8 log,
15061506 u8 page, void *buf, unsigned int sectors)
15071507 {
1508+ unsigned long ap_flags = dev->link->ap->flags;
15081509 struct ata_taskfile tf;
15091510 unsigned int err_mask;
15101511 bool dma = false;
15111512
15121513 DPRINTK("read log page - log 0x%x, page 0x%x\n", log, page);
15131514
1515+ /*
1516+ * Return error without actually issuing the command on controllers
1517+ * which e.g. lockup on a read log page.
1518+ */
1519+ if (ap_flags & ATA_FLAG_NO_LOG_PAGE)
1520+ return AC_ERR_DEV;
1521+
15141522 retry:
15151523 ata_tf_init(dev, &tf);
15161524 if (dev->dma_mode && ata_id_has_read_log_dma_ext(dev->id) &&
drivers/ata/sata_fsl.c+2−1
@@ -45,7 +45,8 @@ enum { · 44 unmodified lines
4545 SATA_FSL_MAX_PRD_DIRECT = 16, /* Direct PRDT entries */
4646
4747 SATA_FSL_HOST_FLAGS = (ATA_FLAG_SATA | ATA_FLAG_PIO_DMA |
48− ATA_FLAG_PMP | ATA_FLAG_NCQ | ATA_FLAG_AN),
48+ ATA_FLAG_PMP | ATA_FLAG_NCQ |
49+ ATA_FLAG_AN | ATA_FLAG_NO_LOG_PAGE),
4950
5051 SATA_FSL_MAX_CMDS = SATA_FSL_QUEUE_DEPTH,
5152 SATA_FSL_CMD_HDR_SIZE = 16, /* 4 DWORDS */
drivers/ata/sata_sil.c+3−0
@@ -630,6 +630,9 @@ static void sil_dev_config(struct ata_device *dev) · 629 unmodified lines
630630 unsigned int n, quirks = 0;
631631 unsigned char model_num[ATA_ID_PROD_LEN + 1];
632632
633+ /* This controller doesn't support trim */
634+ dev->horkage |= ATA_HORKAGE_NOTRIM;
635+
633636 ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
634637
635638 for (n = 0; sil_blacklist[n].product; n++)
drivers/base/memory.c+4−0
@@ -303,6 +303,10 @@ static int memory_subsys_offline(struct device *dev) · 302 unmodified lines
303303 if (mem->state == MEM_OFFLINE)
304304 return 0;
305305
306+ /* Can't offline block with non-present sections */
307+ if (mem->section_count != sections_per_block)
308+ return -EINVAL;
309+
306310 return memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE);
307311 }
308312
drivers/base/power/domain.c+22−11
@@ -390,6 +390,7 @@ static int pm_genpd_runtime_suspend(struct device *dev) · 389 unmodified lines
390390 struct generic_pm_domain *genpd;
391391 bool (*stop_ok)(struct device *__dev);
392392 struct gpd_timing_data *td = &dev_gpd_data(dev)->td;
393+ bool runtime_pm = pm_runtime_enabled(dev);
393394 ktime_t time_start;
394395 s64 elapsed_ns;
395396 int ret;
@@ -400,12 +401,19 @@ static int pm_genpd_runtime_suspend(struct device *dev) · 4 unmodified lines
400401 if (IS_ERR(genpd))
401402 return -EINVAL;
402403
404+ /*
405+ * A runtime PM centric subsystem/driver may re-use the runtime PM
406+ * callbacks for other purposes than runtime PM. In those scenarios
407+ * runtime PM is disabled. Under these circumstances, we shall skip
408+ * validating/measuring the PM QoS latency.
409+ */
403410 stop_ok = genpd->gov ? genpd->gov->stop_ok : NULL;
404− if (stop_ok && !stop_ok(dev))
411+ if (runtime_pm && stop_ok && !stop_ok(dev))
405412 return -EBUSY;
406413
407414 /* Measure suspend latency. */
408− time_start = ktime_get();
415+ if (runtime_pm)
416+ time_start = ktime_get();
409417
410418 ret = genpd_save_dev(genpd, dev);
411419 if (ret)
@@ -418,13 +426,15 @@ static int pm_genpd_runtime_suspend(struct device *dev) · 6 unmodified lines
418426 }
419427
420428 /* Update suspend latency value if the measured time exceeds it. */
421− elapsed_ns = ktime_to_ns(ktime_sub(ktime_get(), time_start));
422− if (elapsed_ns > td->suspend_latency_ns) {
423− td->suspend_latency_ns = elapsed_ns;
424− dev_dbg(dev, "suspend latency exceeded, %lld ns\n",
425− elapsed_ns);
426− genpd->max_off_time_changed = true;
427− td->constraint_changed = true;
429+ if (runtime_pm) {
430+ elapsed_ns = ktime_to_ns(ktime_sub(ktime_get(), time_start));
431+ if (elapsed_ns > td->suspend_latency_ns) {
432+ td->suspend_latency_ns = elapsed_ns;
433+ dev_dbg(dev, "suspend latency exceeded, %lld ns\n",
434+ elapsed_ns);
435+ genpd->max_off_time_changed = true;
436+ td->constraint_changed = true;
437+ }
428438 }
429439
430440 /*
@@ -453,6 +463,7 @@ static int pm_genpd_runtime_resume(struct device *dev) · 22 unmodified lines
453463 {
454464 struct generic_pm_domain *genpd;
455465 struct gpd_timing_data *td = &dev_gpd_data(dev)->td;
466+ bool runtime_pm = pm_runtime_enabled(dev);
456467 ktime_t time_start;
457468 s64 elapsed_ns;
458469 int ret;
@@ -479,14 +490,14 @@ static int pm_genpd_runtime_resume(struct device *dev) · 20 unmodified lines
479490
480491 out:
481492 /* Measure resume latency. */
482− if (timed)
493+ if (timed && runtime_pm)
483494 time_start = ktime_get();
484495
485496 genpd_start_dev(genpd, dev);
486497 genpd_restore_dev(genpd, dev);
487498
488499 /* Update resume latency value if the measured time exceeds it. */
489− if (timed) {
500+ if (timed && runtime_pm) {
490501 elapsed_ns = ktime_to_ns(ktime_sub(ktime_get(), time_start));
491502 if (elapsed_ns > td->resume_latency_ns) {
492503 td->resume_latency_ns = elapsed_ns;
drivers/block/null_blk.c+24−14
@@ -219,6 +219,9 @@ static void end_cmd(struct nullb_cmd *cmd) · 218 unmodified lines
219219 {
220220 struct request_queue *q = NULL;
221221
222+ if (cmd->rq)
223+ q = cmd->rq->q;
224+
222225 switch (queue_mode) {
223226 case NULL_Q_MQ:
224227 blk_mq_end_request(cmd->rq, 0);
@@ -232,9 +235,6 @@ static void end_cmd(struct nullb_cmd *cmd) · 7 unmodified lines
232235 goto free_cmd;
233236 }
234237
235− if (cmd->rq)
236− q = cmd->rq->q;
237−
238238 /* Restart queue if needed, as we are freeing a tag */
239239 if (q && !q->mq_ops && blk_queue_stopped(q)) {
240240 unsigned long flags;
@@ -444,8 +444,9 @@ static void null_lnvm_end_io(struct request *rq, int error) · 203 unmodified lines
444444 blk_put_request(rq);
445445 }
446446
447−static int null_lnvm_submit_io(struct request_queue *q, struct nvm_rq *rqd)
447+static int null_lnvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)
448448 {
449+ struct request_queue *q = dev->q;
449450 struct request *rq;
450451 struct bio *bio = rqd->bio;
451452
@@ -470,7 +471,7 @@ static int null_lnvm_submit_io(struct request_queue *q, struct nvm_rq *rqd) · 18 unmodified lines
470471 return 0;
471472 }
472473
473−static int null_lnvm_id(struct request_queue *q, struct nvm_id *id)
474+static int null_lnvm_id(struct nvm_dev *dev, struct nvm_id *id)
474475 {
475476 sector_t size = gb * 1024 * 1024 * 1024ULL;
476477 sector_t blksize;
@@ -523,7 +524,7 @@ static int null_lnvm_id(struct request_queue *q, struct nvm_id *id) · 46 unmodified lines
523524 return 0;
524525 }
525526
526−static void *null_lnvm_create_dma_pool(struct request_queue *q, char *name)
527+static void *null_lnvm_create_dma_pool(struct nvm_dev *dev, char *name)
527528 {
528529 mempool_t *virtmem_pool;
529530
@@ -541,7 +542,7 @@ static void null_lnvm_destroy_dma_pool(void *pool) · 11 unmodified lines
541542 mempool_destroy(pool);
542543 }
543544
544−static void *null_lnvm_dev_dma_alloc(struct request_queue *q, void *pool,
545+static void *null_lnvm_dev_dma_alloc(struct nvm_dev *dev, void *pool,
545546 gfp_t mem_flags, dma_addr_t *dma_handler)
546547 {
547548 return mempool_alloc(pool, mem_flags);
@@ -765,7 +766,9 @@ out: · 217 unmodified lines
765766
766767 static int __init null_init(void)
767768 {
769+ int ret = 0;
768770 unsigned int i;
771+ struct nullb *nullb;
769772
770773 if (bs > PAGE_SIZE) {
771774 pr_warn("null_blk: invalid block size\n");
@@ -807,22 +810,29 @@ static int __init null_init(void) · 35 unmodified lines
807810 0, 0, NULL);
808811 if (!ppa_cache) {
809812 pr_err("null_blk: unable to create ppa cache\n");
810− return -ENOMEM;
813+ ret = -ENOMEM;
814+ goto err_ppa;
811815 }
812816 }
813817
814818 for (i = 0; i < nr_devices; i++) {
815− if (null_add_dev()) {
816− unregister_blkdev(null_major, "nullb");
817− goto err_ppa;
818− }
819+ ret = null_add_dev();
820+ if (ret)
821+ goto err_dev;
819822 }
820823
821824 pr_info("null: module loaded\n");
822825 return 0;
823−err_ppa:
826+
827+err_dev:
828+ while (!list_empty(&nullb_list)) {
829+ nullb = list_entry(nullb_list.next, struct nullb, list);
830+ null_del_dev(nullb);
831+ }
824832 kmem_cache_destroy(ppa_cache);
825− return -EINVAL;
833+err_ppa:
834+ unregister_blkdev(null_major, "nullb");
835+ return ret;
826836 }
827837
828838 static void __exit null_exit(void)
drivers/block/xen-blkback/blkback.c+10−5
@@ -950,6 +950,8 @@ static int xen_blkbk_parse_indirect(struct blkif_request *req, · 949 unmodified lines
950950 goto unmap;
951951
952952 for (n = 0, i = 0; n < nseg; n++) {
953+ uint8_t first_sect, last_sect;
954+
953955 if ((n % SEGS_PER_INDIRECT_FRAME) == 0) {
954956 /* Map indirect segments */
955957 if (segments)
@@ -957,15 +959,18 @@ static int xen_blkbk_parse_indirect(struct blkif_request *req, · 1 unmodified line
957959 segments = kmap_atomic(pages[n/SEGS_PER_INDIRECT_FRAME]->page);
958960 }
959961 i = n % SEGS_PER_INDIRECT_FRAME;
962+
960963 pending_req->segments[n]->gref = segments[i].gref;
961− seg[n].nsec = segments[i].last_sect -
962− segments[i].first_sect + 1;
963− seg[n].offset = (segments[i].first_sect << 9);
964− if ((segments[i].last_sect >= (XEN_PAGE_SIZE >> 9)) ||
965− (segments[i].last_sect < segments[i].first_sect)) {
964+
965+ first_sect = READ_ONCE(segments[i].first_sect);
966+ last_sect = READ_ONCE(segments[i].last_sect);
967+ if (last_sect >= (XEN_PAGE_SIZE >> 9) || last_sect < first_sect) {
966968 rc = -EINVAL;
967969 goto unmap;
968970 }
971+
972+ seg[n].nsec = last_sect - first_sect + 1;
973+ seg[n].offset = first_sect << 9;
969974 preq->nr_sects += seg[n].nsec;
970975 }
971976
drivers/block/xen-blkback/common.h+4−4
@@ -408,8 +408,8 @@ static inline void blkif_get_x86_32_req(struct blkif_request *dst, · 407 unmodified lines
408408 struct blkif_x86_32_request *src)
409409 {
410410 int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST, j;
411− dst->operation = src->operation;
412− switch (src->operation) {
411+ dst->operation = READ_ONCE(src->operation);
412+ switch (dst->operation) {
413413 case BLKIF_OP_READ:
414414 case BLKIF_OP_WRITE:
415415 case BLKIF_OP_WRITE_BARRIER:
@@ -456,8 +456,8 @@ static inline void blkif_get_x86_64_req(struct blkif_request *dst, · 40 unmodified lines
456456 struct blkif_x86_64_request *src)
457457 {
458458 int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST, j;
459− dst->operation = src->operation;
460− switch (src->operation) {
459+ dst->operation = READ_ONCE(src->operation);
460+ switch (dst->operation) {
461461 case BLKIF_OP_READ:
462462 case BLKIF_OP_WRITE:
463463 case BLKIF_OP_WRITE_BARRIER:
drivers/char/ipmi/ipmi_si_intf.c+4−4
@@ -1230,14 +1230,14 @@ static int smi_start_processing(void *send_info, · 1229 unmodified lines
12301230
12311231 new_smi->intf = intf;
12321232
1233− /* Try to claim any interrupts. */
1234− if (new_smi->irq_setup)
1235− new_smi->irq_setup(new_smi);
1236−
12371233 /* Set up the timer that drives the interface. */
12381234 setup_timer(&new_smi->si_timer, smi_timeout, (long)new_smi);
12391235 smi_mod_timer(new_smi, jiffies + SI_TIMEOUT_JIFFIES);
12401236
1237+ /* Try to claim any interrupts. */
1238+ if (new_smi->irq_setup)
1239+ new_smi->irq_setup(new_smi);
1240+
12411241 /*
12421242 * Check if the user forcefully enabled the daemon.
12431243 */
drivers/clk/clk-gpio.c+17−16
@@ -209,6 +209,8 @@ EXPORT_SYMBOL_GPL(clk_register_gpio_mux); · 208 unmodified lines
209209
210210 struct clk_gpio_delayed_register_data {
211211 const char *gpio_name;
212+ int num_parents;
213+ const char **parent_names;
212214 struct device_node *node;
213215 struct mutex lock;
214216 struct clk *clk;
@@ -222,8 +224,6 @@ static struct clk *of_clk_gpio_delayed_register_get( · 7 unmodified lines
222224 {
223225 struct clk_gpio_delayed_register_data *data = _data;
224226 struct clk *clk;
225− const char **parent_names;
226− int i, num_parents;
227227 int gpio;
228228 enum of_gpio_flags of_flags;
229229
@@ -248,26 +248,14 @@ static struct clk *of_clk_gpio_delayed_register_get( · 18 unmodified lines
248248 return ERR_PTR(gpio);
249249 }
250250
251− num_parents = of_clk_get_parent_count(data->node);
252−
253− parent_names = kcalloc(num_parents, sizeof(char *), GFP_KERNEL);
254− if (!parent_names) {
255− clk = ERR_PTR(-ENOMEM);
256− goto out;
257− }
258−
259− for (i = 0; i < num_parents; i++)
260− parent_names[i] = of_clk_get_parent_name(data->node, i);
261−
262− clk = data->clk_register_get(data->node->name, parent_names,
263− num_parents, gpio, of_flags & OF_GPIO_ACTIVE_LOW);
251+ clk = data->clk_register_get(data->node->name, data->parent_names,
252+ data->num_parents, gpio, of_flags & OF_GPIO_ACTIVE_LOW);
264253 if (IS_ERR(clk))
265254 goto out;
266255
267256 data->clk = clk;
268257 out:
269258 mutex_unlock(&data->lock);
270− kfree(parent_names);
271259
272260 return clk;
273261 }
@@ -296,11 +284,24 @@ static void __init of_gpio_clk_setup(struct device_node *node, · 22 unmodified lines
296284 unsigned gpio, bool active_low))
297285 {
298286 struct clk_gpio_delayed_register_data *data;
287+ const char **parent_names;
288+ int i, num_parents;
299289
300290 data = kzalloc(sizeof(*data), GFP_KERNEL);
301291 if (!data)
302292 return;
303293
294+ num_parents = of_clk_get_parent_count(node);
295+
296+ parent_names = kcalloc(num_parents, sizeof(char *), GFP_KERNEL);
297+ if (!parent_names)
298+ return;
299+
300+ for (i = 0; i < num_parents; i++)
301+ parent_names[i] = of_clk_get_parent_name(node, i);
302+
303+ data->num_parents = num_parents;
304+ data->parent_names = parent_names;
304305 data->node = node;
305306 data->gpio_name = gpio_name;
306307 data->clk_register_get = clk_register_get;
drivers/clk/clk-qoriq.c+3−1
@@ -778,8 +778,10 @@ static struct clk * __init create_one_cmux(struct clockgen *cg, int idx) · 777 unmodified lines
778778 */
779779 clksel = (cg_in(cg, hwc->reg) & CLKSEL_MASK) >> CLKSEL_SHIFT;
780780 div = get_pll_div(cg, hwc, clksel);
781− if (!div)
781+ if (!div) {
782+ kfree(hwc);
782783 return NULL;
784+ }
783785
784786 pct80_rate = clk_get_rate(div->clk);
785787 pct80_rate *= 8;
drivers/clk/clk-scpi.c+1−0
@@ -292,6 +292,7 @@ static int scpi_clocks_probe(struct platform_device *pdev) · 291 unmodified lines
292292 ret = scpi_clk_add(dev, child, match);
293293 if (ret) {
294294 scpi_clocks_remove(pdev);
295+ of_node_put(child);
295296 return ret;
296297 }
297298 }
drivers/clk/imx/clk-pllv1.c+7−7
@@ -52,7 +52,7 @@ static unsigned long clk_pllv1_recalc_rate(struct clk_hw *hw, · 51 unmodified lines
5252 unsigned long parent_rate)
5353 {
5454 struct clk_pllv1 *pll = to_clk_pllv1(hw);
55− long long ll;
55+ unsigned long long ull;
5656 int mfn_abs;
5757 unsigned int mfi, mfn, mfd, pd;
5858 u32 reg;
@@ -94,16 +94,16 @@ static unsigned long clk_pllv1_recalc_rate(struct clk_hw *hw, · 35 unmodified lines
9494 rate = parent_rate * 2;
9595 rate /= pd + 1;
9696
97− ll = (unsigned long long)rate * mfn_abs;
97+ ull = (unsigned long long)rate * mfn_abs;
9898
99− do_div(ll, mfd + 1);
99+ do_div(ull, mfd + 1);
100100
101101 if (mfn_is_negative(pll, mfn))
102− ll = -ll;
102+ ull = (rate * mfi) - ull;
103+ else
104+ ull = (rate * mfi) + ull;
103105
104− ll = (rate * mfi) + ll;
105−
106− return ll;
106+ return ull;
107107 }
108108
109109 static struct clk_ops clk_pllv1_ops = {
drivers/clk/imx/clk-pllv2.c+5−4
@@ -79,7 +79,7 @@ static unsigned long __clk_pllv2_recalc_rate(unsigned long parent_rate, · 78 unmodified lines
7979 {
8080 long mfi, mfn, mfd, pdf, ref_clk;
8181 unsigned long dbl;
82− s64 temp;
82+ u64 temp;
8383
8484 dbl = dp_ctl & MXC_PLL_DP_CTL_DPDCK0_2_EN;
8585
@@ -98,8 +98,9 @@ static unsigned long __clk_pllv2_recalc_rate(unsigned long parent_rate, · 12 unmodified lines
9898 temp = (u64) ref_clk * abs(mfn);
9999 do_div(temp, mfd + 1);
100100 if (mfn < 0)
101− temp = -temp;
102− temp = (ref_clk * mfi) + temp;
101+ temp = (ref_clk * mfi) - temp;
102+ else
103+ temp = (ref_clk * mfi) + temp;
103104
104105 return temp;
105106 }
@@ -126,7 +127,7 @@ static int __clk_pllv2_set_rate(unsigned long rate, unsigned long parent_rate, · 20 unmodified lines
126127 {
127128 u32 reg;
128129 long mfi, pdf, mfn, mfd = 999999;
129− s64 temp64;
130+ u64 temp64;
130131 unsigned long quad_parent_rate;
131132
132133 quad_parent_rate = 4 * parent_rate;
drivers/clk/imx/clk-vf610.c+4−4
@@ -335,22 +335,22 @@ static void __init vf610_clocks_init(struct device_node *ccm_node) · 334 unmodified lines
335335 clk[VF610_CLK_SAI0_SEL] = imx_clk_mux("sai0_sel", CCM_CSCMR1, 0, 2, sai_sels, 4);
336336 clk[VF610_CLK_SAI0_EN] = imx_clk_gate("sai0_en", "sai0_sel", CCM_CSCDR1, 16);
337337 clk[VF610_CLK_SAI0_DIV] = imx_clk_divider("sai0_div", "sai0_en", CCM_CSCDR1, 0, 4);
338− clk[VF610_CLK_SAI0] = imx_clk_gate2("sai0", "sai0_div", CCM_CCGR0, CCM_CCGRx_CGn(15));
338+ clk[VF610_CLK_SAI0] = imx_clk_gate2("sai0", "ipg_bus", CCM_CCGR0, CCM_CCGRx_CGn(15));
339339
340340 clk[VF610_CLK_SAI1_SEL] = imx_clk_mux("sai1_sel", CCM_CSCMR1, 2, 2, sai_sels, 4);
341341 clk[VF610_CLK_SAI1_EN] = imx_clk_gate("sai1_en", "sai1_sel", CCM_CSCDR1, 17);
342342 clk[VF610_CLK_SAI1_DIV] = imx_clk_divider("sai1_div", "sai1_en", CCM_CSCDR1, 4, 4);
343− clk[VF610_CLK_SAI1] = imx_clk_gate2("sai1", "sai1_div", CCM_CCGR1, CCM_CCGRx_CGn(0));
343+ clk[VF610_CLK_SAI1] = imx_clk_gate2("sai1", "ipg_bus", CCM_CCGR1, CCM_CCGRx_CGn(0));
344344
345345 clk[VF610_CLK_SAI2_SEL] = imx_clk_mux("sai2_sel", CCM_CSCMR1, 4, 2, sai_sels, 4);
346346 clk[VF610_CLK_SAI2_EN] = imx_clk_gate("sai2_en", "sai2_sel", CCM_CSCDR1, 18);
347347 clk[VF610_CLK_SAI2_DIV] = imx_clk_divider("sai2_div", "sai2_en", CCM_CSCDR1, 8, 4);
348− clk[VF610_CLK_SAI2] = imx_clk_gate2("sai2", "sai2_div", CCM_CCGR1, CCM_CCGRx_CGn(1));
348+ clk[VF610_CLK_SAI2] = imx_clk_gate2("sai2", "ipg_bus", CCM_CCGR1, CCM_CCGRx_CGn(1));
349349
350350 clk[VF610_CLK_SAI3_SEL] = imx_clk_mux("sai3_sel", CCM_CSCMR1, 6, 2, sai_sels, 4);
351351 clk[VF610_CLK_SAI3_EN] = imx_clk_gate("sai3_en", "sai3_sel", CCM_CSCDR1, 19);
352352 clk[VF610_CLK_SAI3_DIV] = imx_clk_divider("sai3_div", "sai3_en", CCM_CSCDR1, 12, 4);
353− clk[VF610_CLK_SAI3] = imx_clk_gate2("sai3", "sai3_div", CCM_CCGR1, CCM_CCGRx_CGn(2));
353+ clk[VF610_CLK_SAI3] = imx_clk_gate2("sai3", "ipg_bus", CCM_CCGR1, CCM_CCGRx_CGn(2));
354354
355355 clk[VF610_CLK_NFC_SEL] = imx_clk_mux("nfc_sel", CCM_CSCMR1, 12, 2, nfc_sels, 4);
356356 clk[VF610_CLK_NFC_EN] = imx_clk_gate("nfc_en", "nfc_sel", CCM_CSCDR2, 9);
drivers/clk/mmp/clk-mmp2.c+1−0
@@ -9,6 +9,7 @@ · 8 unmodified lines
99 * warranty of any kind, whether express or implied.
1010 */
1111
12+#include <linux/clk.h>
1213 #include <linux/module.h>
1314 #include <linux/kernel.h>
1415 #include <linux/spinlock.h>
drivers/clk/mmp/clk-pxa168.c+1−0
@@ -9,6 +9,7 @@ · 8 unmodified lines
99 * warranty of any kind, whether express or implied.
1010 */
1111
12+#include <linux/clk.h>
1213 #include <linux/module.h>
1314 #include <linux/kernel.h>
1415 #include <linux/spinlock.h>
drivers/clk/mmp/clk-pxa910.c+1−0
@@ -9,6 +9,7 @@ · 8 unmodified lines
99 * warranty of any kind, whether express or implied.
1010 */
1111
12+#include <linux/clk.h>
1213 #include <linux/module.h>
1314 #include <linux/kernel.h>
1415 #include <linux/spinlock.h>
drivers/clk/sunxi/clk-a10-pll2.c+5−18
@@ -41,15 +41,10 @@ · 40 unmodified lines
4141
4242 #define SUN4I_PLL2_OUTPUTS 4
4343
44−struct sun4i_pll2_data {
45− u32 post_div_offset;
46− u32 pre_div_flags;
47−};
48−
4944 static DEFINE_SPINLOCK(sun4i_a10_pll2_lock);
5045
5146 static void __init sun4i_pll2_setup(struct device_node *node,
52− struct sun4i_pll2_data *data)
47+ int post_div_offset)
5348 {
5449 const char *clk_name = node->name, *parent;
5550 struct clk **clks, *base_clk, *prediv_clk;
@@ -76,7 +71,7 @@ static void __init sun4i_pll2_setup(struct device_node *node, · 20 unmodified lines
7671 parent, 0, reg,
7772 SUN4I_PLL2_PRE_DIV_SHIFT,
7873 SUN4I_PLL2_PRE_DIV_WIDTH,
79− data->pre_div_flags,
74+ CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO,
8075 &sun4i_a10_pll2_lock);
8176 if (!prediv_clk) {
8277 pr_err("Couldn't register the prediv clock\n");
@@ -127,7 +122,7 @@ static void __init sun4i_pll2_setup(struct device_node *node, · 44 unmodified lines
127122 */
128123 val = readl(reg);
129124 val &= ~(SUN4I_PLL2_POST_DIV_MASK << SUN4I_PLL2_POST_DIV_SHIFT);
130− val |= (SUN4I_PLL2_POST_DIV_VALUE - data->post_div_offset) << SUN4I_PLL2_POST_DIV_SHIFT;
125+ val |= (SUN4I_PLL2_POST_DIV_VALUE - post_div_offset) << SUN4I_PLL2_POST_DIV_SHIFT;
131126 writel(val, reg);
132127
133128 of_property_read_string_index(node, "clock-output-names",
@@ -191,25 +186,17 @@ err_unmap: · 57 unmodified lines
191186 iounmap(reg);
192187 }
193188
194−static struct sun4i_pll2_data sun4i_a10_pll2_data = {
195− .pre_div_flags = CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO,
196−};
197−
198189 static void __init sun4i_a10_pll2_setup(struct device_node *node)
199190 {
200− sun4i_pll2_setup(node, &sun4i_a10_pll2_data);
191+ sun4i_pll2_setup(node, 0);
201192 }
202193
203194 CLK_OF_DECLARE(sun4i_a10_pll2, "allwinner,sun4i-a10-pll2-clk",
204195 sun4i_a10_pll2_setup);
205196
206−static struct sun4i_pll2_data sun5i_a13_pll2_data = {
207− .post_div_offset = 1,
208−};
209−
210197 static void __init sun5i_a13_pll2_setup(struct device_node *node)
211198 {
212− sun4i_pll2_setup(node, &sun5i_a13_pll2_data);
199+ sun4i_pll2_setup(node, 1);
213200 }
214201
215202 CLK_OF_DECLARE(sun5i_a13_pll2, "allwinner,sun5i-a13-pll2-clk",
drivers/clk/ti/clk-816x.c+2−0
@@ -20,6 +20,8 @@ static struct ti_dt_clk dm816x_clks[] = { · 19 unmodified lines
2020 DT_CLK(NULL, "sys_clkin", "sys_clkin_ck"),
2121 DT_CLK(NULL, "timer_sys_ck", "sys_clkin_ck"),
2222 DT_CLK(NULL, "sys_32k_ck", "sys_32k_ck"),
23+ DT_CLK(NULL, "timer_32k_ck", "sysclk18_ck"),
24+ DT_CLK(NULL, "timer_ext_ck", "tclkin_ck"),
2325 DT_CLK(NULL, "mpu_ck", "mpu_ck"),
2426 DT_CLK(NULL, "timer1_fck", "timer1_fck"),
2527 DT_CLK(NULL, "timer2_fck", "timer2_fck"),
drivers/clk/ti/clkt_dpll.c+2−2
@@ -240,7 +240,7 @@ u8 omap2_init_dpll_parent(struct clk_hw *hw) · 239 unmodified lines
240240 */
241241 unsigned long omap2_get_dpll_rate(struct clk_hw_omap *clk)
242242 {
243− long long dpll_clk;
243+ u64 dpll_clk;
244244 u32 dpll_mult, dpll_div, v;
245245 struct dpll_data *dd;
246246
@@ -262,7 +262,7 @@ unsigned long omap2_get_dpll_rate(struct clk_hw_omap *clk) · 15 unmodified lines
262262 dpll_div = v & dd->div1_mask;
263263 dpll_div >>= __ffs(dd->div1_mask);
264264
265− dpll_clk = (long long)clk_get_rate(dd->clk_ref) * dpll_mult;
265+ dpll_clk = (u64)clk_get_rate(dd->clk_ref) * dpll_mult;
266266 do_div(dpll_clk, dpll_div + 1);
267267
268268 return dpll_clk;
drivers/clk/ti/divider.c+3−13
@@ -214,7 +214,6 @@ static int ti_clk_divider_set_rate(struct clk_hw *hw, unsigned long rate, · 213 unmodified lines
214214 {
215215 struct clk_divider *divider;
216216 unsigned int div, value;
217− unsigned long flags = 0;
218217 u32 val;
219218
220219 if (!hw || !rate)
@@ -228,9 +227,6 @@ static int ti_clk_divider_set_rate(struct clk_hw *hw, unsigned long rate, · 7 unmodified lines
228227 if (value > div_mask(divider))
229228 value = div_mask(divider);
230229
231− if (divider->lock)
232− spin_lock_irqsave(divider->lock, flags);
233−
234230 if (divider->flags & CLK_DIVIDER_HIWORD_MASK) {
235231 val = div_mask(divider) << (divider->shift + 16);
236232 } else {
@@ -240,9 +236,6 @@ static int ti_clk_divider_set_rate(struct clk_hw *hw, unsigned long rate, · 3 unmodified lines
240236 val |= value << divider->shift;
241237 ti_clk_ll_ops->clk_writel(val, divider->reg);
242238
243− if (divider->lock)
244− spin_unlock_irqrestore(divider->lock, flags);
245−
246239 return 0;
247240 }
248241
@@ -256,8 +249,7 @@ static struct clk *_register_divider(struct device *dev, const char *name, · 7 unmodified lines
256249 const char *parent_name,
257250 unsigned long flags, void __iomem *reg,
258251 u8 shift, u8 width, u8 clk_divider_flags,
259− const struct clk_div_table *table,
260− spinlock_t *lock)
252+ const struct clk_div_table *table)
261253 {
262254 struct clk_divider *div;
263255 struct clk *clk;
@@ -288,7 +280,6 @@ static struct clk *_register_divider(struct device *dev, const char *name, · 24 unmodified lines
288280 div->shift = shift;
289281 div->width = width;
290282 div->flags = clk_divider_flags;
291− div->lock = lock;
292283 div->hw.init = &init;
293284 div->table = table;
294285
@@ -421,7 +412,7 @@ struct clk *ti_clk_register_divider(struct ti_clk *setup) · 126 unmodified lines
421412
422413 clk = _register_divider(NULL, setup->name, div->parent,
423414 flags, (void __iomem *)reg, div->bit_shift,
424− width, div_flags, table, NULL);
415+ width, div_flags, table);
425416
426417 if (IS_ERR(clk))
427418 kfree(table);
@@ -584,8 +575,7 @@ static void __init of_ti_divider_clk_setup(struct device_node *node) · 156 unmodified lines
584575 goto cleanup;
585576
586577 clk = _register_divider(NULL, node->name, parent_name, flags, reg,
587− shift, width, clk_divider_flags, table,
588− NULL);
578+ shift, width, clk_divider_flags, table);
589579
590580 if (!IS_ERR(clk)) {
591581 of_clk_add_provider(node, of_clk_src_simple_get, clk);
drivers/clk/ti/fapll.c+2−2
@@ -168,7 +168,7 @@ static unsigned long ti_fapll_recalc_rate(struct clk_hw *hw, · 167 unmodified lines
168168 {
169169 struct fapll_data *fd = to_fapll(hw);
170170 u32 fapll_n, fapll_p, v;
171− long long rate;
171+ u64 rate;
172172
173173 if (ti_fapll_clock_is_bypass(fd))
174174 return parent_rate;
@@ -314,7 +314,7 @@ static unsigned long ti_fapll_synth_recalc_rate(struct clk_hw *hw, · 139 unmodified lines
314314 {
315315 struct fapll_synth *synth = to_synth(hw);
316316 u32 synth_div_m;
317− long long rate;
317+ u64 rate;
318318
319319 /* The audio_pll_clk1 is hardwired to produce 32.768KiHz clock */
320320 if (!synth->div)
drivers/clk/ti/mux.c+3−12
@@ -69,7 +69,6 @@ static int ti_clk_mux_set_parent(struct clk_hw *hw, u8 index) · 68 unmodified lines
6969 {
7070 struct clk_mux *mux = to_clk_mux(hw);
7171 u32 val;
72− unsigned long flags = 0;
7372
7473 if (mux->table) {
7574 index = mux->table[index];
@@ -81,9 +80,6 @@ static int ti_clk_mux_set_parent(struct clk_hw *hw, u8 index) · 5 unmodified lines
8180 index++;
8281 }
8382
84− if (mux->lock)
85− spin_lock_irqsave(mux->lock, flags);
86−
8783 if (mux->flags & CLK_MUX_HIWORD_MASK) {
8884 val = mux->mask << (mux->shift + 16);
8985 } else {
@@ -93,9 +89,6 @@ static int ti_clk_mux_set_parent(struct clk_hw *hw, u8 index) · 3 unmodified lines
9389 val |= index << mux->shift;
9490 ti_clk_ll_ops->clk_writel(val, mux->reg);
9591
96− if (mux->lock)
97− spin_unlock_irqrestore(mux->lock, flags);
98−
9992 return 0;
10093 }
10194
@@ -109,7 +102,7 @@ static struct clk *_register_mux(struct device *dev, const char *name, · 7 unmodified lines
109102 const char **parent_names, u8 num_parents,
110103 unsigned long flags, void __iomem *reg,
111104 u8 shift, u32 mask, u8 clk_mux_flags,
112− u32 *table, spinlock_t *lock)
105+ u32 *table)
113106 {
114107 struct clk_mux *mux;
115108 struct clk *clk;
@@ -133,7 +126,6 @@ static struct clk *_register_mux(struct device *dev, const char *name, · 17 unmodified lines
133126 mux->shift = shift;
134127 mux->mask = mask;
135128 mux->flags = clk_mux_flags;
136− mux->lock = lock;
137129 mux->table = table;
138130 mux->hw.init = &init;
139131
@@ -175,7 +167,7 @@ struct clk *ti_clk_register_mux(struct ti_clk *setup) · 35 unmodified lines
175167
176168 return _register_mux(NULL, setup->name, mux->parents, mux->num_parents,
177169 flags, (void __iomem *)reg, mux->bit_shift, mask,
178− mux_flags, NULL, NULL);
170+ mux_flags, NULL);
179171 }
180172
181173 /**
@@ -227,8 +219,7 @@ static void of_mux_clk_setup(struct device_node *node) · 45 unmodified lines
227219 mask = (1 << fls(mask)) - 1;
228220
229221 clk = _register_mux(NULL, node->name, parent_names, num_parents,
230− flags, reg, shift, mask, clk_mux_flags, NULL,
231− NULL);
222+ flags, reg, shift, mask, clk_mux_flags, NULL);
232223
233224 if (!IS_ERR(clk))
234225 of_clk_add_provider(node, of_clk_src_simple_get, clk);
drivers/clocksource/mmio.c+1−1
@@ -55,7 +55,7 @@ int __init clocksource_mmio_init(void __iomem *base, const char *name, · 54 unmodified lines
5555 {
5656 struct clocksource_mmio *cs;
5757
58− if (bits > 32 || bits < 16)
58+ if (bits > 64 || bits < 16)
5959 return -EINVAL;
6060
6161 cs = kzalloc(sizeof(struct clocksource_mmio), GFP_KERNEL);
drivers/cpufreq/Kconfig.arm+1−1
@@ -226,7 +226,7 @@ config ARM_TEGRA20_CPUFREQ · 225 unmodified lines
226226
227227 config ARM_TEGRA124_CPUFREQ
228228 tristate "Tegra124 CPUFreq support"
229− depends on ARCH_TEGRA && CPUFREQ_DT
229+ depends on ARCH_TEGRA && CPUFREQ_DT && REGULATOR
230230 default y
231231 help
232232 This adds the CPUFreq driver support for Tegra124 SOCs.
drivers/cpufreq/intel_pstate.c+1−1
@@ -1123,7 +1123,7 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) · 1122 unmodified lines
11231123 limits->max_sysfs_pct);
11241124 limits->max_perf_pct = max(limits->min_policy_pct,
11251125 limits->max_perf_pct);
1126− limits->max_perf = round_up(limits->max_perf, 8);
1126+ limits->max_perf = round_up(limits->max_perf, FRAC_BITS);
11271127
11281128 /* Make sure min_perf_pct <= max_perf_pct */
11291129 limits->min_perf_pct = min(limits->max_perf_pct, limits->min_perf_pct);
drivers/cpufreq/s3c24xx-cpufreq.c+1−1
@@ -648,7 +648,7 @@ late_initcall(s3c_cpufreq_initcall); · 647 unmodified lines
648648 *
649649 * Register the given set of PLLs with the system.
650650 */
651−int __init s3c_plltab_register(struct cpufreq_frequency_table *plls,
651+int s3c_plltab_register(struct cpufreq_frequency_table *plls,
652652 unsigned int plls_no)
653653 {
654654 struct cpufreq_frequency_table *vals;
drivers/dma/at_xdmac.c+6−3
@@ -156,7 +156,7 @@ · 155 unmodified lines
156156 #define AT_XDMAC_CC_WRIP (0x1 << 23) /* Write in Progress (read only) */
157157 #define AT_XDMAC_CC_WRIP_DONE (0x0 << 23)
158158 #define AT_XDMAC_CC_WRIP_IN_PROGRESS (0x1 << 23)
159−#define AT_XDMAC_CC_PERID(i) (0x7f & (h) << 24) /* Channel Peripheral Identifier */
159+#define AT_XDMAC_CC_PERID(i) (0x7f & (i) << 24) /* Channel Peripheral Identifier */
160160 #define AT_XDMAC_CDS_MSP 0x2C /* Channel Data Stride Memory Set Pattern */
161161 #define AT_XDMAC_CSUS 0x30 /* Channel Source Microblock Stride */
162162 #define AT_XDMAC_CDUS 0x34 /* Channel Destination Microblock Stride */
@@ -965,7 +965,9 @@ at_xdmac_prep_interleaved(struct dma_chan *chan, · 802 unmodified lines
965965 NULL,
966966 src_addr, dst_addr,
967967 xt, xt->sgl);
968− for (i = 0; i < xt->numf; i++)
968+
969+ /* Length of the block is (BLEN+1) microblocks. */
970+ for (i = 0; i < xt->numf - 1; i++)
969971 at_xdmac_increment_block_count(chan, first);
970972
971973 dev_dbg(chan2dev(chan), "%s: add desc 0x%p to descs_list 0x%p\n",
@@ -1086,6 +1088,7 @@ at_xdmac_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, · 114 unmodified lines
10861088 /* Check remaining length and change data width if needed. */
10871089 dwidth = at_xdmac_align_width(chan,
10881090 src_addr | dst_addr | xfer_size);
1091+ chan_cc &= ~AT_XDMAC_CC_DWIDTH_MASK;
10891092 chan_cc |= AT_XDMAC_CC_DWIDTH(dwidth);
10901093
10911094 ublen = xfer_size >> dwidth;
@@ -1333,7 +1336,7 @@ at_xdmac_prep_dma_memset_sg(struct dma_chan *chan, struct scatterlist *sgl, · 241 unmodified lines
13331336 * since we don't care about the stride anymore.
13341337 */
13351338 if ((i == (sg_len - 1)) &&
1336− sg_dma_len(ppsg) == sg_dma_len(psg)) {
1339+ sg_dma_len(psg) == sg_dma_len(sg)) {
13371340 dev_dbg(chan2dev(chan),
13381341 "%s: desc 0x%p can be merged with desc 0x%p\n",
13391342 __func__, desc, pdesc);
drivers/dma/bcm2835-dma.c+54−24
@@ -31,6 +31,7 @@ · 30 unmodified lines
3131 */
3232 #include <linux/dmaengine.h>
3333 #include <linux/dma-mapping.h>
34+#include <linux/dmapool.h>
3435 #include <linux/err.h>
3536 #include <linux/init.h>
3637 #include <linux/interrupt.h>
@@ -62,6 +63,11 @@ struct bcm2835_dma_cb { · 25 unmodified lines
6263 uint32_t pad[2];
6364 };
6465
66+struct bcm2835_cb_entry {
67+ struct bcm2835_dma_cb *cb;
68+ dma_addr_t paddr;
69+};
70+
6571 struct bcm2835_chan {
6672 struct virt_dma_chan vc;
6773 struct list_head node;
@@ -72,18 +78,18 @@ struct bcm2835_chan { · 4 unmodified lines
7278
7379 int ch;
7480 struct bcm2835_desc *desc;
81+ struct dma_pool *cb_pool;
7582
7683 void __iomem *chan_base;
7784 int irq_number;
7885 };
7986
8087 struct bcm2835_desc {
88+ struct bcm2835_chan *c;
8189 struct virt_dma_desc vd;
8290 enum dma_transfer_direction dir;
8391
84− unsigned int control_block_size;
85− struct bcm2835_dma_cb *control_block_base;
86− dma_addr_t control_block_base_phys;
92+ struct bcm2835_cb_entry *cb_list;
8793
8894 unsigned int frames;
8995 size_t size;
@@ -143,10 +149,13 @@ static inline struct bcm2835_desc *to_bcm2835_dma_desc( · 53 unmodified lines
143149 static void bcm2835_dma_desc_free(struct virt_dma_desc *vd)
144150 {
145151 struct bcm2835_desc *desc = container_of(vd, struct bcm2835_desc, vd);
146− dma_free_coherent(desc->vd.tx.chan->device->dev,
147− desc->control_block_size,
148− desc->control_block_base,
149− desc->control_block_base_phys);
152+ int i;
153+
154+ for (i = 0; i < desc->frames; i++)
155+ dma_pool_free(desc->c->cb_pool, desc->cb_list[i].cb,
156+ desc->cb_list[i].paddr);
157+
158+ kfree(desc->cb_list);
150159 kfree(desc);
151160 }
152161
@@ -199,7 +208,7 @@ static void bcm2835_dma_start_desc(struct bcm2835_chan *c) · 46 unmodified lines
199208
200209 c->desc = d = to_bcm2835_dma_desc(&vd->tx);
201210
202− writel(d->control_block_base_phys, c->chan_base + BCM2835_DMA_ADDR);
211+ writel(d->cb_list[0].paddr, c->chan_base + BCM2835_DMA_ADDR);
203212 writel(BCM2835_DMA_ACTIVE, c->chan_base + BCM2835_DMA_CS);
204213 }
205214
@@ -232,9 +241,16 @@ static irqreturn_t bcm2835_dma_callback(int irq, void *data) · 26 unmodified lines
232241 static int bcm2835_dma_alloc_chan_resources(struct dma_chan *chan)
233242 {
234243 struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
244+ struct device *dev = c->vc.chan.device->dev;
245+
246+ dev_dbg(dev, "Allocating DMA channel %d\n", c->ch);
235247
236− dev_dbg(c->vc.chan.device->dev,
237− "Allocating DMA channel %d\n", c->ch);
248+ c->cb_pool = dma_pool_create(dev_name(dev), dev,
249+ sizeof(struct bcm2835_dma_cb), 0, 0);
250+ if (!c->cb_pool) {
251+ dev_err(dev, "unable to allocate descriptor pool\n");
252+ return -ENOMEM;
253+ }
238254
239255 return request_irq(c->irq_number,
240256 bcm2835_dma_callback, 0, "DMA IRQ", c);
@@ -246,6 +262,7 @@ static void bcm2835_dma_free_chan_resources(struct dma_chan *chan) · 5 unmodified lines
246262
247263 vchan_free_chan_resources(&c->vc);
248264 free_irq(c->irq_number, c);
265+ dma_pool_destroy(c->cb_pool);
249266
250267 dev_dbg(c->vc.chan.device->dev, "Freeing DMA channel %u\n", c->ch);
251268 }
@@ -261,8 +278,7 @@ static size_t bcm2835_dma_desc_size_pos(struct bcm2835_desc *d, dma_addr_t addr) · 9 unmodified lines
261278 size_t size;
262279
263280 for (size = i = 0; i < d->frames; i++) {
264− struct bcm2835_dma_cb *control_block =
265− &d->control_block_base[i];
281+ struct bcm2835_dma_cb *control_block = d->cb_list[i].cb;
266282 size_t this_size = control_block->length;
267283 dma_addr_t dma;
268284
@@ -343,6 +359,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic( · 74 unmodified lines
343359 dma_addr_t dev_addr;
344360 unsigned int es, sync_type;
345361 unsigned int frame;
362+ int i;
346363
347364 /* Grab configuration */
348365 if (!is_slave_direction(direction)) {
@@ -374,27 +391,31 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic( · 25 unmodified lines
374391 if (!d)
375392 return NULL;
376393
394+ d->c = c;
377395 d->dir = direction;
378396 d->frames = buf_len / period_len;
379397
380− /* Allocate memory for control blocks */
381− d->control_block_size = d->frames * sizeof(struct bcm2835_dma_cb);
382− d->control_block_base = dma_zalloc_coherent(chan->device->dev,
383− d->control_block_size, &d->control_block_base_phys,
384− GFP_NOWAIT);
385−
386− if (!d->control_block_base) {
398+ d->cb_list = kcalloc(d->frames, sizeof(*d->cb_list), GFP_KERNEL);
399+ if (!d->cb_list) {
387400 kfree(d);
388401 return NULL;
389402 }
403+ /* Allocate memory for control blocks */
404+ for (i = 0; i < d->frames; i++) {
405+ struct bcm2835_cb_entry *cb_entry = &d->cb_list[i];
406+
407+ cb_entry->cb = dma_pool_zalloc(c->cb_pool, GFP_ATOMIC,
408+ &cb_entry->paddr);
409+ if (!cb_entry->cb)
410+ goto error_cb;
411+ }
390412
391413 /*
392414 * Iterate over all frames, create a control block
393415 * for each frame and link them together.
394416 */
395417 for (frame = 0; frame < d->frames; frame++) {
396− struct bcm2835_dma_cb *control_block =
397− &d->control_block_base[frame];
418+ struct bcm2835_dma_cb *control_block = d->cb_list[frame].cb;
398419
399420 /* Setup adresses */
400421 if (d->dir == DMA_DEV_TO_MEM) {
@@ -428,12 +449,21 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic( · 27 unmodified lines
428449 * This DMA engine driver currently only supports cyclic DMA.
429450 * Therefore, wrap around at number of frames.
430451 */
431− control_block->next = d->control_block_base_phys +
432− sizeof(struct bcm2835_dma_cb)
433− * ((frame + 1) % d->frames);
452+ control_block->next = d->cb_list[((frame + 1) % d->frames)].paddr;
434453 }
435454
436455 return vchan_tx_prep(&c->vc, &d->vd, flags);
456+error_cb:
457+ i--;
458+ for (; i >= 0; i--) {
459+ struct bcm2835_cb_entry *cb_entry = &d->cb_list[i];
460+
461+ dma_pool_free(c->cb_pool, cb_entry->cb, cb_entry->paddr);
462+ }
463+
464+ kfree(d->cb_list);
465+ kfree(d);
466+ return NULL;
437467 }
438468
439469 static int bcm2835_dma_slave_config(struct dma_chan *chan,
drivers/dma/edma.c+35−18
@@ -1752,16 +1752,14 @@ static enum dma_status edma_tx_status(struct dma_chan *chan, · 1751 unmodified lines
17521752 return ret;
17531753 }
17541754
1755−static bool edma_is_memcpy_channel(int ch_num, u16 *memcpy_channels)
1755+static bool edma_is_memcpy_channel(int ch_num, s32 *memcpy_channels)
17561756 {
1757− s16 *memcpy_ch = memcpy_channels;
1758−
17591757 if (!memcpy_channels)
17601758 return false;
1761− while (*memcpy_ch != -1) {
1762− if (*memcpy_ch == ch_num)
1759+ while (*memcpy_channels != -1) {
1760+ if (*memcpy_channels == ch_num)
17631761 return true;
1764− memcpy_ch++;
1762+ memcpy_channels++;
17651763 }
17661764 return false;
17671765 }
@@ -1775,7 +1773,7 @@ static void edma_dma_init(struct edma_cc *ecc, bool legacy_mode) · 7 unmodified lines
17751773 {
17761774 struct dma_device *s_ddev = &ecc->dma_slave;
17771775 struct dma_device *m_ddev = NULL;
1778− s16 *memcpy_channels = ecc->info->memcpy_channels;
1776+ s32 *memcpy_channels = ecc->info->memcpy_channels;
17791777 int i, j;
17801778
17811779 dma_cap_zero(s_ddev->cap_mask);
@@ -1996,16 +1994,16 @@ static struct edma_soc_info *edma_setup_info_from_dt(struct device *dev, · 214 unmodified lines
19961994 prop = of_find_property(dev->of_node, "ti,edma-memcpy-channels", &sz);
19971995 if (prop) {
19981996 const char pname[] = "ti,edma-memcpy-channels";
1999− size_t nelm = sz / sizeof(s16);
2000− s16 *memcpy_ch;
1997+ size_t nelm = sz / sizeof(s32);
1998+ s32 *memcpy_ch;
20011999
2002− memcpy_ch = devm_kcalloc(dev, nelm + 1, sizeof(s16),
2000+ memcpy_ch = devm_kcalloc(dev, nelm + 1, sizeof(s32),
20032001 GFP_KERNEL);
20042002 if (!memcpy_ch)
20052003 return ERR_PTR(-ENOMEM);
20062004
2007− ret = of_property_read_u16_array(dev->of_node, pname,
2008− (u16 *)memcpy_ch, nelm);
2005+ ret = of_property_read_u32_array(dev->of_node, pname,
2006+ (u32 *)memcpy_ch, nelm);
20092007 if (ret)
20102008 return ERR_PTR(ret);
20112009
@@ -2017,31 +2015,50 @@ static struct edma_soc_info *edma_setup_info_from_dt(struct device *dev, · 5 unmodified lines
20172015 &sz);
20182016 if (prop) {
20192017 const char pname[] = "ti,edma-reserved-slot-ranges";
2018+ u32 (*tmp)[2];
20202019 s16 (*rsv_slots)[2];
2021− size_t nelm = sz / sizeof(*rsv_slots);
2020+ size_t nelm = sz / sizeof(*tmp);
20222021 struct edma_rsv_info *rsv_info;
2022+ int i;
20232023
20242024 if (!nelm)
20252025 return info;
20262026
2027+ tmp = kcalloc(nelm, sizeof(*tmp), GFP_KERNEL);
2028+ if (!tmp)
2029+ return ERR_PTR(-ENOMEM);
2030+
20272031 rsv_info = devm_kzalloc(dev, sizeof(*rsv_info), GFP_KERNEL);
2028− if (!rsv_info)
2032+ if (!rsv_info) {
2033+ kfree(tmp);
20292034 return ERR_PTR(-ENOMEM);
2035+ }
20302036
20312037 rsv_slots = devm_kcalloc(dev, nelm + 1, sizeof(*rsv_slots),
20322038 GFP_KERNEL);
2033− if (!rsv_slots)
2039+ if (!rsv_slots) {
2040+ kfree(tmp);
20342041 return ERR_PTR(-ENOMEM);
2042+ }
20352043
2036− ret = of_property_read_u16_array(dev->of_node, pname,
2037− (u16 *)rsv_slots, nelm * 2);
2038− if (ret)
2044+ ret = of_property_read_u32_array(dev->of_node, pname,
2045+ (u32 *)tmp, nelm * 2);
2046+ if (ret) {
2047+ kfree(tmp);
20392048 return ERR_PTR(ret);
2049+ }
20402050
2051+ for (i = 0; i < nelm; i++) {
2052+ rsv_slots[i][0] = tmp[i][0];
2053+ rsv_slots[i][1] = tmp[i][1];
2054+ }
20412055 rsv_slots[nelm][0] = -1;
20422056 rsv_slots[nelm][1] = -1;
2057+
20432058 info->rsv = rsv_info;
20442059 info->rsv->rsv_slots = (const s16 (*)[2])rsv_slots;
2060+
2061+ kfree(tmp);
20452062 }
20462063
20472064 return info;
drivers/dma/mic_x100_dma.c+10−5
@@ -317,6 +317,7 @@ mic_dma_prep_memcpy_lock(struct dma_chan *ch, dma_addr_t dma_dest, · 316 unmodified lines
317317 struct mic_dma_chan *mic_ch = to_mic_dma_chan(ch);
318318 struct device *dev = mic_dma_ch_to_device(mic_ch);
319319 int result;
320+ struct dma_async_tx_descriptor *tx = NULL;
320321
321322 if (!len && !flags)
322323 return NULL;
@@ -324,10 +325,13 @@ mic_dma_prep_memcpy_lock(struct dma_chan *ch, dma_addr_t dma_dest, · 1 unmodified line
324325 spin_lock(&mic_ch->prep_lock);
325326 result = mic_dma_do_dma(mic_ch, flags, dma_src, dma_dest, len);
326327 if (result >= 0)
327− return allocate_tx(mic_ch);
328− dev_err(dev, "Error enqueueing dma, error=%d\n", result);
328+ tx = allocate_tx(mic_ch);
329+
330+ if (!tx)
331+ dev_err(dev, "Error enqueueing dma, error=%d\n", result);
332+
329333 spin_unlock(&mic_ch->prep_lock);
330− return NULL;
334+ return tx;
331335 }
332336
333337 static struct dma_async_tx_descriptor *
@@ -335,13 +339,14 @@ mic_dma_prep_interrupt_lock(struct dma_chan *ch, unsigned long flags) · 1 unmodified line
335339 {
336340 struct mic_dma_chan *mic_ch = to_mic_dma_chan(ch);
337341 int ret;
342+ struct dma_async_tx_descriptor *tx = NULL;
338343
339344 spin_lock(&mic_ch->prep_lock);
340345 ret = mic_dma_do_dma(mic_ch, flags, 0, 0, 0);
341346 if (!ret)
342− return allocate_tx(mic_ch);
347+ tx = allocate_tx(mic_ch);
343348 spin_unlock(&mic_ch->prep_lock);
344− return NULL;
349+ return tx;
345350 }
346351
347352 /* Return the status of the transaction */
drivers/fpga/fpga-mgr.c+4−9
@@ -122,12 +122,10 @@ int fpga_mgr_firmware_load(struct fpga_manager *mgr, u32 flags, · 121 unmodified lines
122122 }
123123
124124 ret = fpga_mgr_buf_load(mgr, flags, fw->data, fw->size);
125− if (ret)
126− return ret;
127125
128126 release_firmware(fw);
129127
130− return 0;
128+ return ret;
131129 }
132130 EXPORT_SYMBOL_GPL(fpga_mgr_firmware_load);
133131
@@ -256,7 +254,6 @@ int fpga_mgr_register(struct device *dev, const char *name, · 122 unmodified lines
256254 void *priv)
257255 {
258256 struct fpga_manager *mgr;
259− const char *dt_label;
260257 int id, ret;
261258
262259 if (!mops || !mops->write_init || !mops->write ||
@@ -300,11 +297,9 @@ int fpga_mgr_register(struct device *dev, const char *name, · 37 unmodified lines
300297 mgr->dev.id = id;
301298 dev_set_drvdata(dev, mgr);
302299
303− dt_label = of_get_property(mgr->dev.of_node, "label", NULL);
304− if (dt_label)
305− ret = dev_set_name(&mgr->dev, "%s", dt_label);
306− else
307− ret = dev_set_name(&mgr->dev, "fpga%d", id);
300+ ret = dev_set_name(&mgr->dev, "fpga%d", id);
301+ if (ret)
302+ goto error_device;
308303
309304 ret = device_add(&mgr->dev);
310305 if (ret)
drivers/gpio/gpio-ath79.c+1−1
@@ -113,7 +113,7 @@ static int ar934x_gpio_direction_output(struct gpio_chip *chip, unsigned offset, · 112 unmodified lines
113113 __raw_writel(BIT(offset), ctrl->base + AR71XX_GPIO_REG_CLEAR);
114114
115115 __raw_writel(
116− __raw_readl(ctrl->base + AR71XX_GPIO_REG_OE) & BIT(offset),
116+ __raw_readl(ctrl->base + AR71XX_GPIO_REG_OE) & ~BIT(offset),
117117 ctrl->base + AR71XX_GPIO_REG_OE);
118118
119119 spin_unlock_irqrestore(&ctrl->lock, flags);
drivers/gpio/gpio-generic.c+2−2
@@ -141,9 +141,9 @@ static int bgpio_get_set(struct gpio_chip *gc, unsigned int gpio) · 140 unmodified lines
141141 unsigned long pinmask = bgc->pin2mask(bgc, gpio);
142142
143143 if (bgc->dir & pinmask)
144− return bgc->read_reg(bgc->reg_set) & pinmask;
144+ return !!(bgc->read_reg(bgc->reg_set) & pinmask);
145145 else
146− return bgc->read_reg(bgc->reg_dat) & pinmask;
146+ return !!(bgc->read_reg(bgc->reg_dat) & pinmask);
147147 }
148148
149149 static int bgpio_get(struct gpio_chip *gc, unsigned int gpio)
drivers/gpio/gpiolib.c+7−1
@@ -1279,7 +1279,13 @@ static int _gpiod_get_raw_value(const struct gpio_desc *desc) · 1278 unmodified lines
12791279 chip = desc->chip;
12801280 offset = gpio_chip_hwgpio(desc);
12811281 value = chip->get ? chip->get(chip, offset) : -EIO;
1282− value = value < 0 ? value : !!value;
1282+ /*
1283+ * FIXME: fix all drivers to clamp to [0,1] or return negative,
1284+ * then change this to:
1285+ * value = value < 0 ? value : !!value;
1286+ * so we can properly propagate error codes.
1287+ */
1288+ value = !!value;
12831289 trace_gpio_value(desc_to_gpio(desc), 1, value);
12841290 return value;
12851291 }
drivers/gpu/drm/amd/amdgpu/amdgpu.h+2−1
@@ -1266,7 +1266,8 @@ struct amdgpu_cs_parser { · 1265 unmodified lines
12661266 struct ww_acquire_ctx ticket;
12671267
12681268 /* user fence */
1269− struct amdgpu_user_fence uf;
1269+ struct amdgpu_user_fence uf;
1270+ struct amdgpu_bo_list_entry uf_entry;
12701271 };
12711272
12721273 struct amdgpu_job {
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c+42−21
@@ -127,6 +127,37 @@ int amdgpu_cs_get_ring(struct amdgpu_device *adev, u32 ip_type, · 126 unmodified lines
127127 return 0;
128128 }
129129
130+static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
131+ struct drm_amdgpu_cs_chunk_fence *fence_data)
132+{
133+ struct drm_gem_object *gobj;
134+ uint32_t handle;
135+
136+ handle = fence_data->handle;
137+ gobj = drm_gem_object_lookup(p->adev->ddev, p->filp,
138+ fence_data->handle);
139+ if (gobj == NULL)
140+ return -EINVAL;
141+
142+ p->uf.bo = amdgpu_bo_ref(gem_to_amdgpu_bo(gobj));
143+ p->uf.offset = fence_data->offset;
144+
145+ if (amdgpu_ttm_tt_has_userptr(p->uf.bo->tbo.ttm)) {
146+ drm_gem_object_unreference_unlocked(gobj);
147+ return -EINVAL;
148+ }
149+
150+ p->uf_entry.robj = amdgpu_bo_ref(p->uf.bo);
151+ p->uf_entry.prefered_domains = AMDGPU_GEM_DOMAIN_GTT;
152+ p->uf_entry.allowed_domains = AMDGPU_GEM_DOMAIN_GTT;
153+ p->uf_entry.priority = 0;
154+ p->uf_entry.tv.bo = &p->uf_entry.robj->tbo;
155+ p->uf_entry.tv.shared = true;
156+
157+ drm_gem_object_unreference_unlocked(gobj);
158+ return 0;
159+}
160+
130161 int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data)
131162 {
132163 union drm_amdgpu_cs *cs = data;
@@ -207,28 +238,15 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data) · 74 unmodified lines
207238
208239 case AMDGPU_CHUNK_ID_FENCE:
209240 size = sizeof(struct drm_amdgpu_cs_chunk_fence);
210− if (p->chunks[i].length_dw * sizeof(uint32_t) >= size) {
211− uint32_t handle;
212− struct drm_gem_object *gobj;
213− struct drm_amdgpu_cs_chunk_fence *fence_data;
214−
215− fence_data = (void *)p->chunks[i].kdata;
216− handle = fence_data->handle;
217− gobj = drm_gem_object_lookup(p->adev->ddev,
218− p->filp, handle);
219− if (gobj == NULL) {
220− ret = -EINVAL;
221− goto free_partial_kdata;
222− }
223−
224− p->uf.bo = gem_to_amdgpu_bo(gobj);
225− amdgpu_bo_ref(p->uf.bo);
226− drm_gem_object_unreference_unlocked(gobj);
227− p->uf.offset = fence_data->offset;
228− } else {
241+ if (p->chunks[i].length_dw * sizeof(uint32_t) < size) {
229242 ret = -EINVAL;
230243 goto free_partial_kdata;
231244 }
245+
246+ ret = amdgpu_cs_user_fence_chunk(p, (void *)p->chunks[i].kdata);
247+ if (ret)
248+ goto free_partial_kdata;
249+
232250 break;
233251
234252 case AMDGPU_CHUNK_ID_DEPENDENCIES:
@@ -391,6 +409,9 @@ static int amdgpu_cs_parser_relocs(struct amdgpu_cs_parser *p) · 156 unmodified lines
391409 INIT_LIST_HEAD(&duplicates);
392410 amdgpu_vm_get_pd_bo(&fpriv->vm, &p->validated, &p->vm_pd);
393411
412+ if (p->uf.bo)
413+ list_add(&p->uf_entry.tv.head, &p->validated);
414+
394415 if (need_mmap_lock)
395416 down_read(&current->mm->mmap_sem);
396417
@@ -488,8 +509,8 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error, bo · 91 unmodified lines
488509 for (i = 0; i < parser->num_ibs; i++)
489510 amdgpu_ib_free(parser->adev, &parser->ibs[i]);
490511 kfree(parser->ibs);
491− if (parser->uf.bo)
492− amdgpu_bo_unref(&parser->uf.bo);
512+ amdgpu_bo_unref(&parser->uf.bo);
513+ amdgpu_bo_unref(&parser->uf_entry.robj);
493514 }
494515
495516 static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p,
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c+8−0
@@ -476,6 +476,14 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev, · 475 unmodified lines
476476 if (domain == AMDGPU_GEM_DOMAIN_CPU)
477477 goto error_unreserve;
478478 }
479+ list_for_each_entry(entry, &duplicates, head) {
480+ domain = amdgpu_mem_type_to_domain(entry->bo->mem.mem_type);
481+ /* if anything is swapped out don't swap it in here,
482+ just abort and wait for the next CS */
483+ if (domain == AMDGPU_GEM_DOMAIN_CPU)
484+ goto error_unreserve;
485+ }
486+
479487 r = amdgpu_vm_update_page_directory(adev, bo_va->vm);
480488 if (r)
481489 goto error_unreserve;
drivers/gpu/drm/exynos/exynos_drm_crtc.c+3−0
@@ -55,6 +55,9 @@ static int exynos_crtc_atomic_check(struct drm_crtc *crtc, · 54 unmodified lines
5555 {
5656 struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
5757
58+ if (!state->enable)
59+ return 0;
60+
5861 if (exynos_crtc->ops->atomic_check)
5962 return exynos_crtc->ops->atomic_check(exynos_crtc, state);
6063
drivers/gpu/drm/i915/intel_display.c+19−1
@@ -14059,6 +14059,7 @@ intel_check_cursor_plane(struct drm_plane *plane, · 14058 unmodified lines
1405914059 struct drm_crtc *crtc = crtc_state->base.crtc;
1406014060 struct drm_framebuffer *fb = state->base.fb;
1406114061 struct drm_i915_gem_object *obj = intel_fb_obj(fb);
14062+ enum pipe pipe = to_intel_plane(plane)->pipe;
1406214063 unsigned stride;
1406314064 int ret;
1406414065
@@ -14092,6 +14093,22 @@ intel_check_cursor_plane(struct drm_plane *plane, · 27 unmodified lines
1409214093 return -EINVAL;
1409314094 }
1409414095
14096+ /*
14097+ * There's something wrong with the cursor on CHV pipe C.
14098+ * If it straddles the left edge of the screen then
14099+ * moving it away from the edge or disabling it often
14100+ * results in a pipe underrun, and often that can lead to
14101+ * dead pipe (constant underrun reported, and it scans
14102+ * out just a solid color). To recover from that, the
14103+ * display power well must be turned off and on again.
14104+ * Refuse the put the cursor into that compromised position.
14105+ */
14106+ if (IS_CHERRYVIEW(plane->dev) && pipe == PIPE_C &&
14107+ state->visible && state->base.crtc_x < 0) {
14108+ DRM_DEBUG_KMS("CHV cursor C not allowed to straddle the left screen edge\n");
14109+ return -EINVAL;
14110+ }
14111+
1409514112 return 0;
1409614113 }
1409714114
@@ -14124,7 +14141,8 @@ intel_commit_cursor_plane(struct drm_plane *plane, · 26 unmodified lines
1412414141
1412514142 intel_crtc->cursor_addr = addr;
1412614143
14127− intel_crtc_update_cursor(crtc, state->visible);
14144+ if (crtc->state->active)
14145+ intel_crtc_update_cursor(crtc, state->visible);
1412814146 }
1412914147
1413014148 static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
drivers/gpu/drm/i915/intel_hdmi.c+4−3
@@ -1385,17 +1385,18 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) · 1384 unmodified lines
13851385 struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
13861386 struct drm_i915_private *dev_priv = to_i915(connector->dev);
13871387 bool live_status = false;
1388− unsigned int retry = 3;
1388+ unsigned int try;
13891389
13901390 DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
13911391 connector->base.id, connector->name);
13921392
13931393 intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
13941394
1395− while (!live_status && --retry) {
1395+ for (try = 0; !live_status && try < 4; try++) {
1396+ if (try)
1397+ msleep(10);
13961398 live_status = intel_digital_port_connected(dev_priv,
13971399 hdmi_to_dig_port(intel_hdmi));
1398− msleep(10);
13991400 }
14001401
14011402 if (!live_status)
drivers/gpu/drm/i915/intel_pm.c+2−3
@@ -4713,9 +4713,8 @@ static void gen9_enable_rc6(struct drm_device *dev) · 4712 unmodified lines
47134713 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
47144714 * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6.
47154715 */
4716− if (IS_BXT_REVID(dev, 0, BXT_REVID_A1) ||
4717− ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) &&
4718− IS_SKL_REVID(dev, 0, SKL_REVID_F0)))
4716+ if ((IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) ||
4717+ ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && (INTEL_REVID(dev) <= SKL_REVID_F0)))
47194718 I915_WRITE(GEN9_PG_ENABLE, 0);
47204719 else
47214720 I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
drivers/gpu/drm/nouveau/include/nvkm/core/device.h+0−1
@@ -159,7 +159,6 @@ struct nvkm_device_func { · 158 unmodified lines
159159 struct nvkm_device_quirk {
160160 u8 tv_pin_mask;
161161 u8 tv_gpio;
162− bool War00C800_0;
163162 };
164163
165164 struct nvkm_device_chip {
drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c+4−31
@@ -258,12 +258,6 @@ nvkm_device_pci_10de_0df4[] = { · 257 unmodified lines
258258 {}
259259 };
260260
261−static const struct nvkm_device_pci_vendor
262−nvkm_device_pci_10de_0fcd[] = {
263− { 0x17aa, 0x3801, NULL, { .War00C800_0 = true } }, /* Lenovo Y510P */
264− {}
265−};
266−
267261 static const struct nvkm_device_pci_vendor
268262 nvkm_device_pci_10de_0fd2[] = {
269263 { 0x1028, 0x0595, "GeForce GT 640M LE" },
@@ -278,12 +272,6 @@ nvkm_device_pci_10de_0fe3[] = { · 8 unmodified lines
278272 {}
279273 };
280274
281−static const struct nvkm_device_pci_vendor
282−nvkm_device_pci_10de_0fe4[] = {
283− { 0x144d, 0xc740, NULL, { .War00C800_0 = true } },
284− {}
285−};
286−
287275 static const struct nvkm_device_pci_vendor
288276 nvkm_device_pci_10de_104b[] = {
289277 { 0x1043, 0x844c, "GeForce GT 625" },
@@ -690,13 +678,6 @@ nvkm_device_pci_10de_1189[] = { · 400 unmodified lines
690678 static const struct nvkm_device_pci_vendor
691679 nvkm_device_pci_10de_1199[] = {
692680 { 0x1458, 0xd001, "GeForce GTX 760" },
693− { 0x1462, 0x1106, "GeForce GTX 780M", { .War00C800_0 = true } }, /* Medion Erazer X7827 */
694− {}
695−};
696−
697−static const struct nvkm_device_pci_vendor
698−nvkm_device_pci_10de_11e0[] = {
699− { 0x1558, 0x5106, NULL, { .War00C800_0 = true } },
700681 {}
701682 };
702683
@@ -706,14 +687,6 @@ nvkm_device_pci_10de_11e3[] = { · 3 unmodified lines
706687 {}
707688 };
708689
709−static const struct nvkm_device_pci_vendor
710−nvkm_device_pci_10de_11fc[] = {
711− { 0x1179, 0x0001, NULL, { .War00C800_0 = true } }, /* Toshiba Tecra W50 */
712− { 0x17aa, 0x2211, NULL, { .War00C800_0 = true } }, /* Lenovo W541 */
713− { 0x17aa, 0x221e, NULL, { .War00C800_0 = true } }, /* Lenovo W541 */
714− {}
715−};
716−
717690 static const struct nvkm_device_pci_vendor
718691 nvkm_device_pci_10de_1247[] = {
719692 { 0x1043, 0x212a, "GeForce GT 635M" },
@@ -1368,7 +1341,7 @@ nvkm_device_pci_10de[] = { · 648 unmodified lines
13681341 { 0x0fc6, "GeForce GTX 650" },
13691342 { 0x0fc8, "GeForce GT 740" },
13701343 { 0x0fc9, "GeForce GT 730" },
1371− { 0x0fcd, "GeForce GT 755M", nvkm_device_pci_10de_0fcd },
1344+ { 0x0fcd, "GeForce GT 755M" },
13721345 { 0x0fce, "GeForce GT 640M LE" },
13731346 { 0x0fd1, "GeForce GT 650M" },
13741347 { 0x0fd2, "GeForce GT 640M", nvkm_device_pci_10de_0fd2 },
@@ -1382,7 +1355,7 @@ nvkm_device_pci_10de[] = { · 7 unmodified lines
13821355 { 0x0fe1, "GeForce GT 730M" },
13831356 { 0x0fe2, "GeForce GT 745M" },
13841357 { 0x0fe3, "GeForce GT 745M", nvkm_device_pci_10de_0fe3 },
1385− { 0x0fe4, "GeForce GT 750M", nvkm_device_pci_10de_0fe4 },
1358+ { 0x0fe4, "GeForce GT 750M" },
13861359 { 0x0fe9, "GeForce GT 750M" },
13871360 { 0x0fea, "GeForce GT 755M" },
13881361 { 0x0fec, "GeForce 710A" },
@@ -1497,12 +1470,12 @@ nvkm_device_pci_10de[] = { · 108 unmodified lines
14971470 { 0x11c6, "GeForce GTX 650 Ti" },
14981471 { 0x11c8, "GeForce GTX 650" },
14991472 { 0x11cb, "GeForce GT 740" },
1500− { 0x11e0, "GeForce GTX 770M", nvkm_device_pci_10de_11e0 },
1473+ { 0x11e0, "GeForce GTX 770M" },
15011474 { 0x11e1, "GeForce GTX 765M" },
15021475 { 0x11e2, "GeForce GTX 765M" },
15031476 { 0x11e3, "GeForce GTX 760M", nvkm_device_pci_10de_11e3 },
15041477 { 0x11fa, "Quadro K4000" },
1505− { 0x11fc, "Quadro K2100M", nvkm_device_pci_10de_11fc },
1478+ { 0x11fc, "Quadro K2100M" },
15061479 { 0x1200, "GeForce GTX 560 Ti" },
15071480 { 0x1201, "GeForce GTX 560" },
15081481 { 0x1203, "GeForce GTX 460 SE v2" },
drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c+1−0
@@ -83,6 +83,7 @@ nvbios_fan_parse(struct nvkm_bios *bios, struct nvbios_therm_fan *fan) · 82 unmodified lines
8383 fan->type = NVBIOS_THERM_FAN_UNK;
8484 }
8585
86+ fan->fan_mode = NVBIOS_THERM_FAN_LINEAR;
8687 fan->min_duty = nvbios_rd08(bios, data + 0x02);
8788 fan->max_duty = nvbios_rd08(bios, data + 0x03);
8889
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c+1−3
@@ -81,9 +81,7 @@ gk104_pmu_pgob(struct nvkm_pmu *pmu, bool enable) · 80 unmodified lines
8181 nvkm_mask(device, 0x000200, 0x00001000, 0x00001000);
8282 nvkm_rd32(device, 0x000200);
8383
84− if ( nvkm_boolopt(device->cfgopt, "War00C800_0",
85− device->quirk ? device->quirk->War00C800_0 : false)) {
86− nvkm_info(&pmu->subdev, "hw bug workaround enabled\n");
84+ if (nvkm_boolopt(device->cfgopt, "War00C800_0", true)) {
8785 switch (device->chipset) {
8886 case 0xe4:
8987 magic(device, 0x04000000);
drivers/gpu/drm/omapdrm/omap_fbdev.c+1−4
@@ -112,11 +112,8 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, · 111 unmodified lines
112112 dma_addr_t paddr;
113113 int ret;
114114
115− /* only doing ARGB32 since this is what is needed to alpha-blend
116− * with video overlays:
117− */
118115 sizes->surface_bpp = 32;
119− sizes->surface_depth = 32;
116+ sizes->surface_depth = 24;
120117
121118 DBG("create fbdev: %dx%d@%d (%dx%d)", sizes->surface_width,
122119 sizes->surface_height, sizes->surface_bpp,
drivers/gpu/drm/radeon/cik.c+1−5
@@ -4173,11 +4173,7 @@ void cik_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib) · 4172 unmodified lines
41734173 control |= ib->length_dw | (vm_id << 24);
41744174
41754175 radeon_ring_write(ring, header);
4176− radeon_ring_write(ring,
4177−#ifdef __BIG_ENDIAN
4178− (2 << 0) |
4179−#endif
4180− (ib->gpu_addr & 0xFFFFFFFC));
4176+ radeon_ring_write(ring, (ib->gpu_addr & 0xFFFFFFFC));
41814177 radeon_ring_write(ring, upper_32_bits(ib->gpu_addr) & 0xFFFF);
41824178 radeon_ring_write(ring, control);
41834179 }
drivers/gpu/drm/radeon/radeon_vce.c+50−50
@@ -361,31 +361,31 @@ int radeon_vce_get_create_msg(struct radeon_device *rdev, int ring, · 360 unmodified lines
361361
362362 /* stitch together an VCE create msg */
363363 ib.length_dw = 0;
364− ib.ptr[ib.length_dw++] = 0x0000000c; /* len */
365− ib.ptr[ib.length_dw++] = 0x00000001; /* session cmd */
366− ib.ptr[ib.length_dw++] = handle;
367−
368− ib.ptr[ib.length_dw++] = 0x00000030; /* len */
369− ib.ptr[ib.length_dw++] = 0x01000001; /* create cmd */
370− ib.ptr[ib.length_dw++] = 0x00000000;
371− ib.ptr[ib.length_dw++] = 0x00000042;
372− ib.ptr[ib.length_dw++] = 0x0000000a;
373− ib.ptr[ib.length_dw++] = 0x00000001;
374− ib.ptr[ib.length_dw++] = 0x00000080;
375− ib.ptr[ib.length_dw++] = 0x00000060;
376− ib.ptr[ib.length_dw++] = 0x00000100;
377− ib.ptr[ib.length_dw++] = 0x00000100;
378− ib.ptr[ib.length_dw++] = 0x0000000c;
379− ib.ptr[ib.length_dw++] = 0x00000000;
380−
381− ib.ptr[ib.length_dw++] = 0x00000014; /* len */
382− ib.ptr[ib.length_dw++] = 0x05000005; /* feedback buffer */
383− ib.ptr[ib.length_dw++] = upper_32_bits(dummy);
384− ib.ptr[ib.length_dw++] = dummy;
385− ib.ptr[ib.length_dw++] = 0x00000001;
364+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x0000000c); /* len */
365+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000001); /* session cmd */
366+ ib.ptr[ib.length_dw++] = cpu_to_le32(handle);
367+
368+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000030); /* len */
369+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x01000001); /* create cmd */
370+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000000);
371+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000042);
372+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x0000000a);
373+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000001);
374+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000080);
375+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000060);
376+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000100);
377+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000100);
378+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x0000000c);
379+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000000);
380+
381+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000014); /* len */
382+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x05000005); /* feedback buffer */
383+ ib.ptr[ib.length_dw++] = cpu_to_le32(upper_32_bits(dummy));
384+ ib.ptr[ib.length_dw++] = cpu_to_le32(dummy);
385+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000001);
386386
387387 for (i = ib.length_dw; i < ib_size_dw; ++i)
388− ib.ptr[i] = 0x0;
388+ ib.ptr[i] = cpu_to_le32(0x0);
389389
390390 r = radeon_ib_schedule(rdev, &ib, NULL, false);
391391 if (r) {
@@ -428,21 +428,21 @@ int radeon_vce_get_destroy_msg(struct radeon_device *rdev, int ring, · 36 unmodified lines
428428
429429 /* stitch together an VCE destroy msg */
430430 ib.length_dw = 0;
431− ib.ptr[ib.length_dw++] = 0x0000000c; /* len */
432− ib.ptr[ib.length_dw++] = 0x00000001; /* session cmd */
433− ib.ptr[ib.length_dw++] = handle;
431+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x0000000c); /* len */
432+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000001); /* session cmd */
433+ ib.ptr[ib.length_dw++] = cpu_to_le32(handle);
434434
435− ib.ptr[ib.length_dw++] = 0x00000014; /* len */
436− ib.ptr[ib.length_dw++] = 0x05000005; /* feedback buffer */
437− ib.ptr[ib.length_dw++] = upper_32_bits(dummy);
438− ib.ptr[ib.length_dw++] = dummy;
439− ib.ptr[ib.length_dw++] = 0x00000001;
435+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000014); /* len */
436+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x05000005); /* feedback buffer */
437+ ib.ptr[ib.length_dw++] = cpu_to_le32(upper_32_bits(dummy));
438+ ib.ptr[ib.length_dw++] = cpu_to_le32(dummy);
439+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000001);
440440
441− ib.ptr[ib.length_dw++] = 0x00000008; /* len */
442− ib.ptr[ib.length_dw++] = 0x02000001; /* destroy cmd */
441+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000008); /* len */
442+ ib.ptr[ib.length_dw++] = cpu_to_le32(0x02000001); /* destroy cmd */
443443
444444 for (i = ib.length_dw; i < ib_size_dw; ++i)
445− ib.ptr[i] = 0x0;
445+ ib.ptr[i] = cpu_to_le32(0x0);
446446
447447 r = radeon_ib_schedule(rdev, &ib, NULL, false);
448448 if (r) {
@@ -699,12 +699,12 @@ bool radeon_vce_semaphore_emit(struct radeon_device *rdev, · 250 unmodified lines
699699 {
700700 uint64_t addr = semaphore->gpu_addr;
701701
702− radeon_ring_write(ring, VCE_CMD_SEMAPHORE);
703− radeon_ring_write(ring, (addr >> 3) & 0x000FFFFF);
704− radeon_ring_write(ring, (addr >> 23) & 0x000FFFFF);
705− radeon_ring_write(ring, 0x01003000 | (emit_wait ? 1 : 0));
702+ radeon_ring_write(ring, cpu_to_le32(VCE_CMD_SEMAPHORE));
703+ radeon_ring_write(ring, cpu_to_le32((addr >> 3) & 0x000FFFFF));
704+ radeon_ring_write(ring, cpu_to_le32((addr >> 23) & 0x000FFFFF));
705+ radeon_ring_write(ring, cpu_to_le32(0x01003000 | (emit_wait ? 1 : 0)));
706706 if (!emit_wait)
707− radeon_ring_write(ring, VCE_CMD_END);
707+ radeon_ring_write(ring, cpu_to_le32(VCE_CMD_END));
708708
709709 return true;
710710 }
@@ -719,10 +719,10 @@ bool radeon_vce_semaphore_emit(struct radeon_device *rdev, · 8 unmodified lines
719719 void radeon_vce_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)
720720 {
721721 struct radeon_ring *ring = &rdev->ring[ib->ring];
722− radeon_ring_write(ring, VCE_CMD_IB);
723− radeon_ring_write(ring, ib->gpu_addr);
724− radeon_ring_write(ring, upper_32_bits(ib->gpu_addr));
725− radeon_ring_write(ring, ib->length_dw);
722+ radeon_ring_write(ring, cpu_to_le32(VCE_CMD_IB));
723+ radeon_ring_write(ring, cpu_to_le32(ib->gpu_addr));
724+ radeon_ring_write(ring, cpu_to_le32(upper_32_bits(ib->gpu_addr)));
725+ radeon_ring_write(ring, cpu_to_le32(ib->length_dw));
726726 }
727727
728728 /**
@@ -738,12 +738,12 @@ void radeon_vce_fence_emit(struct radeon_device *rdev, · 9 unmodified lines
738738 struct radeon_ring *ring = &rdev->ring[fence->ring];
739739 uint64_t addr = rdev->fence_drv[fence->ring].gpu_addr;
740740
741− radeon_ring_write(ring, VCE_CMD_FENCE);
742− radeon_ring_write(ring, addr);
743− radeon_ring_write(ring, upper_32_bits(addr));
744− radeon_ring_write(ring, fence->seq);
745− radeon_ring_write(ring, VCE_CMD_TRAP);
746− radeon_ring_write(ring, VCE_CMD_END);
741+ radeon_ring_write(ring, cpu_to_le32(VCE_CMD_FENCE));
742+ radeon_ring_write(ring, cpu_to_le32(addr));
743+ radeon_ring_write(ring, cpu_to_le32(upper_32_bits(addr)));
744+ radeon_ring_write(ring, cpu_to_le32(fence->seq));
745+ radeon_ring_write(ring, cpu_to_le32(VCE_CMD_TRAP));
746+ radeon_ring_write(ring, cpu_to_le32(VCE_CMD_END));
747747 }
748748
749749 /**
@@ -765,7 +765,7 @@ int radeon_vce_ring_test(struct radeon_device *rdev, struct radeon_ring *ring) · 15 unmodified lines
765765 ring->idx, r);
766766 return r;
767767 }
768− radeon_ring_write(ring, VCE_CMD_END);
768+ radeon_ring_write(ring, cpu_to_le32(VCE_CMD_END));
769769 radeon_ring_unlock_commit(rdev, ring, false);
770770
771771 for (i = 0; i < rdev->usec_timeout; i++) {
drivers/gpu/drm/ttm/ttm_lock.c+1−1
@@ -180,7 +180,7 @@ int ttm_write_lock(struct ttm_lock *lock, bool interruptible) · 179 unmodified lines
180180 spin_unlock(&lock->lock);
181181 }
182182 } else
183− wait_event(lock->queue, __ttm_read_lock(lock));
183+ wait_event(lock->queue, __ttm_write_lock(lock));
184184
185185 return ret;
186186 }
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c+1−0
@@ -1233,6 +1233,7 @@ static void vmw_master_drop(struct drm_device *dev, · 1232 unmodified lines
12331233
12341234 vmw_fp->locked_master = drm_master_get(file_priv->master);
12351235 ret = ttm_vt_lock(&vmaster->lock, false, vmw_fp->tfile);
1236+ vmw_kms_legacy_hotspot_clear(dev_priv);
12361237 if (unlikely((ret != 0))) {
12371238 DRM_ERROR("Unable to lock TTM at VT switch.\n");
12381239 drm_master_put(&vmw_fp->locked_master);
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h+1−0
@@ -925,6 +925,7 @@ int vmw_kms_present(struct vmw_private *dev_priv, · 924 unmodified lines
925925 uint32_t num_clips);
926926 int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data,
927927 struct drm_file *file_priv);
928+void vmw_kms_legacy_hotspot_clear(struct vmw_private *dev_priv);
928929
929930 int vmw_dumb_create(struct drm_file *file_priv,
930931 struct drm_device *dev,
drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c+1−1
@@ -390,7 +390,7 @@ void *vmw_fifo_reserve_dx(struct vmw_private *dev_priv, uint32_t bytes, · 389 unmodified lines
390390 else if (ctx_id == SVGA3D_INVALID_ID)
391391 ret = vmw_local_fifo_reserve(dev_priv, bytes);
392392 else {
393− WARN_ON("Command buffer has not been allocated.\n");
393+ WARN(1, "Command buffer has not been allocated.\n");
394394 ret = NULL;
395395 }
396396 if (IS_ERR_OR_NULL(ret)) {
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c+51−13
@@ -133,13 +133,19 @@ void vmw_cursor_update_position(struct vmw_private *dev_priv, · 132 unmodified lines
133133 vmw_mmio_write(++count, fifo_mem + SVGA_FIFO_CURSOR_COUNT);
134134 }
135135
136−int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
137− uint32_t handle, uint32_t width, uint32_t height)
136+
137+/*
138+ * vmw_du_crtc_cursor_set2 - Driver cursor_set2 callback.
139+ */
140+int vmw_du_crtc_cursor_set2(struct drm_crtc *crtc, struct drm_file *file_priv,
141+ uint32_t handle, uint32_t width, uint32_t height,
142+ int32_t hot_x, int32_t hot_y)
138143 {
139144 struct vmw_private *dev_priv = vmw_priv(crtc->dev);
140145 struct vmw_display_unit *du = vmw_crtc_to_du(crtc);
141146 struct vmw_surface *surface = NULL;
142147 struct vmw_dma_buffer *dmabuf = NULL;
148+ s32 hotspot_x, hotspot_y;
143149 int ret;
144150
145151 /*
@@ -151,6 +157,8 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, · 5 unmodified lines
151157 */
152158 drm_modeset_unlock_crtc(crtc);
153159 drm_modeset_lock_all(dev_priv->dev);
160+ hotspot_x = hot_x + du->hotspot_x;
161+ hotspot_y = hot_y + du->hotspot_y;
154162
155163 /* A lot of the code assumes this */
156164 if (handle && (width != 64 || height != 64)) {
@@ -187,31 +195,34 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, · 30 unmodified lines
187195 vmw_dmabuf_unreference(&du->cursor_dmabuf);
188196
189197 /* setup new image */
198+ ret = 0;
190199 if (surface) {
191200 /* vmw_user_surface_lookup takes one reference */
192201 du->cursor_surface = surface;
193202
194203 du->cursor_surface->snooper.crtc = crtc;
195204 du->cursor_age = du->cursor_surface->snooper.age;
196− vmw_cursor_update_image(dev_priv, surface->snooper.image,
197− 64, 64, du->hotspot_x, du->hotspot_y);
205+ ret = vmw_cursor_update_image(dev_priv, surface->snooper.image,
206+ 64, 64, hotspot_x, hotspot_y);
198207 } else if (dmabuf) {
199208 /* vmw_user_surface_lookup takes one reference */
200209 du->cursor_dmabuf = dmabuf;
201210
202211 ret = vmw_cursor_update_dmabuf(dev_priv, dmabuf, width, height,
203− du->hotspot_x, du->hotspot_y);
212+ hotspot_x, hotspot_y);
204213 } else {
205214 vmw_cursor_update_position(dev_priv, false, 0, 0);
206− ret = 0;
207215 goto out;
208216 }
209217
210− vmw_cursor_update_position(dev_priv, true,
211− du->cursor_x + du->hotspot_x,
212− du->cursor_y + du->hotspot_y);
218+ if (!ret) {
219+ vmw_cursor_update_position(dev_priv, true,
220+ du->cursor_x + hotspot_x,
221+ du->cursor_y + hotspot_y);
222+ du->core_hotspot_x = hot_x;
223+ du->core_hotspot_y = hot_y;
224+ }
213225
214− ret = 0;
215226 out:
216227 drm_modeset_unlock_all(dev_priv->dev);
217228 drm_modeset_lock_crtc(crtc, crtc->cursor);
@@ -239,8 +250,10 @@ int vmw_du_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) · 21 unmodified lines
239250 drm_modeset_lock_all(dev_priv->dev);
240251
241252 vmw_cursor_update_position(dev_priv, shown,
242− du->cursor_x + du->hotspot_x,
243− du->cursor_y + du->hotspot_y);
253+ du->cursor_x + du->hotspot_x +
254+ du->core_hotspot_x,
255+ du->cursor_y + du->hotspot_y +
256+ du->core_hotspot_y);
244257
245258 drm_modeset_unlock_all(dev_priv->dev);
246259 drm_modeset_lock_crtc(crtc, crtc->cursor);
@@ -334,6 +347,29 @@ err_unreserve: · 87 unmodified lines
334347 ttm_bo_unreserve(bo);
335348 }
336349
350+/**
351+ * vmw_kms_legacy_hotspot_clear - Clear legacy hotspots
352+ *
353+ * @dev_priv: Pointer to the device private struct.
354+ *
355+ * Clears all legacy hotspots.
356+ */
357+void vmw_kms_legacy_hotspot_clear(struct vmw_private *dev_priv)
358+{
359+ struct drm_device *dev = dev_priv->dev;
360+ struct vmw_display_unit *du;
361+ struct drm_crtc *crtc;
362+
363+ drm_modeset_lock_all(dev);
364+ drm_for_each_crtc(crtc, dev) {
365+ du = vmw_crtc_to_du(crtc);
366+
367+ du->hotspot_x = 0;
368+ du->hotspot_y = 0;
369+ }
370+ drm_modeset_unlock_all(dev);
371+}
372+
337373 void vmw_kms_cursor_post_execbuf(struct vmw_private *dev_priv)
338374 {
339375 struct drm_device *dev = dev_priv->dev;
@@ -351,7 +387,9 @@ void vmw_kms_cursor_post_execbuf(struct vmw_private *dev_priv) · 11 unmodified lines
351387 du->cursor_age = du->cursor_surface->snooper.age;
352388 vmw_cursor_update_image(dev_priv,
353389 du->cursor_surface->snooper.image,
354− 64, 64, du->hotspot_x, du->hotspot_y);
390+ 64, 64,
391+ du->hotspot_x + du->core_hotspot_x,
392+ du->hotspot_y + du->core_hotspot_y);
355393 }
356394
357395 mutex_unlock(&dev->mode_config.mutex);
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h+5−2
@@ -159,6 +159,8 @@ struct vmw_display_unit { · 158 unmodified lines
159159
160160 int hotspot_x;
161161 int hotspot_y;
162+ s32 core_hotspot_x;
163+ s32 core_hotspot_y;
162164
163165 unsigned unit;
164166
@@ -193,8 +195,9 @@ void vmw_du_crtc_restore(struct drm_crtc *crtc); · 28 unmodified lines
193195 void vmw_du_crtc_gamma_set(struct drm_crtc *crtc,
194196 u16 *r, u16 *g, u16 *b,
195197 uint32_t start, uint32_t size);
196−int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
197− uint32_t handle, uint32_t width, uint32_t height);
198+int vmw_du_crtc_cursor_set2(struct drm_crtc *crtc, struct drm_file *file_priv,
199+ uint32_t handle, uint32_t width, uint32_t height,
200+ int32_t hot_x, int32_t hot_y);
198201 int vmw_du_crtc_cursor_move(struct drm_crtc *crtc, int x, int y);
199202 int vmw_du_connector_dpms(struct drm_connector *connector, int mode);
200203 void vmw_du_connector_save(struct drm_connector *connector);
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c+1−1
@@ -295,7 +295,7 @@ static int vmw_ldu_crtc_set_config(struct drm_mode_set *set) · 294 unmodified lines
295295 }
296296
297297 static const struct drm_crtc_funcs vmw_legacy_crtc_funcs = {
298− .cursor_set = vmw_du_crtc_cursor_set,
298+ .cursor_set2 = vmw_du_crtc_cursor_set2,
299299 .cursor_move = vmw_du_crtc_cursor_move,
300300 .gamma_set = vmw_du_crtc_gamma_set,
301301 .destroy = vmw_ldu_crtc_destroy,
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c+1−1
@@ -531,7 +531,7 @@ out_no_fence: · 530 unmodified lines
531531 }
532532
533533 static const struct drm_crtc_funcs vmw_screen_object_crtc_funcs = {
534− .cursor_set = vmw_du_crtc_cursor_set,
534+ .cursor_set2 = vmw_du_crtc_cursor_set2,
535535 .cursor_move = vmw_du_crtc_cursor_move,
536536 .gamma_set = vmw_du_crtc_gamma_set,
537537 .destroy = vmw_sou_crtc_destroy,
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c+1−1
@@ -1041,7 +1041,7 @@ out_finish: · 1040 unmodified lines
10411041 * Screen Target CRTC dispatch table
10421042 */
10431043 static const struct drm_crtc_funcs vmw_stdu_crtc_funcs = {
1044− .cursor_set = vmw_du_crtc_cursor_set,
1044+ .cursor_set2 = vmw_du_crtc_cursor_set2,
10451045 .cursor_move = vmw_du_crtc_cursor_move,
10461046 .gamma_set = vmw_du_crtc_gamma_set,
10471047 .destroy = vmw_stdu_crtc_destroy,
drivers/gpu/vga/vgaarb.c+4−2
@@ -395,8 +395,10 @@ int vga_get(struct pci_dev *pdev, unsigned int rsrc, int interruptible) · 394 unmodified lines
395395 set_current_state(interruptible ?
396396 TASK_INTERRUPTIBLE :
397397 TASK_UNINTERRUPTIBLE);
398− if (signal_pending(current)) {
399− rc = -EINTR;
398+ if (interruptible && signal_pending(current)) {
399+ __set_current_state(TASK_RUNNING);
400+ remove_wait_queue(&vga_wait_queue, &wait);
401+ rc = -ERESTARTSYS;
400402 break;
401403 }
402404 schedule();
drivers/hid/hid-ids.h+0−5
@@ -316,11 +316,6 @@ · 315 unmodified lines
316316 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001
317317
318318 #define USB_VENDOR_ID_ELAN 0x04f3
319−#define USB_DEVICE_ID_ELAN_TOUCHSCREEN 0x0089
320−#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B 0x009b
321−#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103 0x0103
322−#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c 0x010c
323−#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F 0x016f
324319
325320 #define USB_VENDOR_ID_ELECOM 0x056e
326321 #define USB_DEVICE_ID_ELECOM_BM084 0x0061
drivers/hid/usbhid/hid-quirks.c+3−6
@@ -72,11 +72,7 @@ static const struct hid_blacklist { · 71 unmodified lines
7272 { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },
7373 { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
7474 { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },
75− { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL },
76− { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL },
77− { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103, HID_QUIRK_ALWAYS_POLL },
78− { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c, HID_QUIRK_ALWAYS_POLL },
79− { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F, HID_QUIRK_ALWAYS_POLL },
75+ { USB_VENDOR_ID_ELAN, HID_ANY_ID, HID_QUIRK_ALWAYS_POLL },
8076 { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
8177 { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },
8278 { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
@@ -340,7 +336,8 @@ static const struct hid_blacklist *usbhid_exists_squirk(const u16 idVendor, · 257 unmodified lines
340336
341337 for (; hid_blacklist[n].idVendor; n++)
342338 if (hid_blacklist[n].idVendor == idVendor &&
343− hid_blacklist[n].idProduct == idProduct)
339+ (hid_blacklist[n].idProduct == (__u16) HID_ANY_ID ||
340+ hid_blacklist[n].idProduct == idProduct))
344341 bl_entry = &hid_blacklist[n];
345342
346343 if (bl_entry != NULL)
drivers/hwmon/Kconfig+1−0
@@ -1217,6 +1217,7 @@ config SENSORS_PWM_FAN · 1216 unmodified lines
12171217 config SENSORS_SHT15
12181218 tristate "Sensiron humidity and temperature sensors. SHT15 and compat."
12191219 depends on GPIOLIB || COMPILE_TEST
1220+ select BITREVERSE
12201221 help
12211222 If you say yes here you get support for the Sensiron SHT10, SHT11,
12221223 SHT15, SHT71, SHT75 humidity and temperature sensors.
drivers/hwmon/tmp102.c+15−1
@@ -58,6 +58,7 @@ struct tmp102 { · 57 unmodified lines
5858 u16 config_orig;
5959 unsigned long last_update;
6060 int temp[3];
61+ bool first_time;
6162 };
6263
6364 /* convert left adjusted 13-bit TMP102 register value to milliCelsius */
@@ -93,6 +94,7 @@ static struct tmp102 *tmp102_update_device(struct device *dev) · 29 unmodified lines
9394 tmp102->temp[i] = tmp102_reg_to_mC(status);
9495 }
9596 tmp102->last_update = jiffies;
97+ tmp102->first_time = false;
9698 }
9799 mutex_unlock(&tmp102->lock);
98100 return tmp102;
@@ -102,6 +104,12 @@ static int tmp102_read_temp(void *dev, int *temp) · 3 unmodified lines
102104 {
103105 struct tmp102 *tmp102 = tmp102_update_device(dev);
104106
107+ /* Is it too early even to return a conversion? */
108+ if (tmp102->first_time) {
109+ dev_dbg(dev, "%s: Conversion not ready yet..\n", __func__);
110+ return -EAGAIN;
111+ }
112+
105113 *temp = tmp102->temp[0];
106114
107115 return 0;
@@ -114,6 +122,10 @@ static ssize_t tmp102_show_temp(struct device *dev, · 6 unmodified lines
114122 struct sensor_device_attribute *sda = to_sensor_dev_attr(attr);
115123 struct tmp102 *tmp102 = tmp102_update_device(dev);
116124
125+ /* Is it too early even to return a read? */
126+ if (tmp102->first_time)
127+ return -EAGAIN;
128+
117129 return sprintf(buf, "%d\n", tmp102->temp[sda->index]);
118130 }
119131
@@ -207,7 +219,9 @@ static int tmp102_probe(struct i2c_client *client, · 87 unmodified lines
207219 status = -ENODEV;
208220 goto fail_restore_config;
209221 }
210− tmp102->last_update = jiffies - HZ;
222+ tmp102->last_update = jiffies;
223+ /* Mark that we are not ready with data until conversion is complete */
224+ tmp102->first_time = true;
211225 mutex_init(&tmp102->lock);
212226
213227 hwmon_dev = hwmon_device_register_with_groups(dev, client->name,
drivers/i2c/busses/i2c-davinci.c+9−2
@@ -202,8 +202,15 @@ static void i2c_davinci_calc_clk_dividers(struct davinci_i2c_dev *dev) · 201 unmodified lines
202202 * d is always 6 on Keystone I2C controller
203203 */
204204
205− /* get minimum of 7 MHz clock, but max of 12 MHz */
206− psc = (input_clock / 7000000) - 1;
205+ /*
206+ * Both Davinci and current Keystone User Guides recommend a value
207+ * between 7MHz and 12MHz. In reality 7MHz module clock doesn't
208+ * always produce enough margin between SDA and SCL transitions.
209+ * Measurements show that the higher the module clock is, the
210+ * bigger is the margin, providing more reliable communication.
211+ * So we better target for 12MHz.
212+ */
213+ psc = (input_clock / 12000000) - 1;
207214 if ((input_clock / (psc + 1)) > 12000000)
208215 psc++; /* better to run under spec than over */
209216 d = (psc >= 2) ? 5 : 7 - psc;
drivers/i2c/busses/i2c-designware-core.c+6−0
@@ -813,6 +813,12 @@ static irqreturn_t i2c_dw_isr(int this_irq, void *dev_id) · 812 unmodified lines
813813 tx_aborted:
814814 if ((stat & (DW_IC_INTR_TX_ABRT | DW_IC_INTR_STOP_DET)) || dev->msg_err)
815815 complete(&dev->cmd_complete);
816+ else if (unlikely(dev->accessor_flags & ACCESS_INTR_MASK)) {
817+ /* workaround to trigger pending interrupt */
818+ stat = dw_readl(dev, DW_IC_INTR_MASK);
819+ i2c_dw_disable_int(dev);
820+ dw_writel(dev, stat, DW_IC_INTR_MASK);
821+ }
816822
817823 return IRQ_HANDLED;
818824 }
drivers/i2c/busses/i2c-designware-core.h+1−0
@@ -111,6 +111,7 @@ struct dw_i2c_dev { · 110 unmodified lines
111111
112112 #define ACCESS_SWAP 0x00000001
113113 #define ACCESS_16BIT 0x00000002
114+#define ACCESS_INTR_MASK 0x00000004
114115
115116 extern int i2c_dw_init(struct dw_i2c_dev *dev);
116117 extern void i2c_dw_disable(struct dw_i2c_dev *dev);
drivers/i2c/busses/i2c-designware-platdrv.c+10−6
@@ -93,6 +93,7 @@ static void dw_i2c_acpi_params(struct platform_device *pdev, char method[], · 92 unmodified lines
9393 static int dw_i2c_acpi_configure(struct platform_device *pdev)
9494 {
9595 struct dw_i2c_dev *dev = platform_get_drvdata(pdev);
96+ const struct acpi_device_id *id;
9697
9798 dev->adapter.nr = -1;
9899 dev->tx_fifo_depth = 32;
@@ -106,6 +107,10 @@ static int dw_i2c_acpi_configure(struct platform_device *pdev) · 7 unmodified lines
106107 dw_i2c_acpi_params(pdev, "FMCN", &dev->fs_hcnt, &dev->fs_lcnt,
107108 &dev->sda_hold_time);
108109
110+ id = acpi_match_device(pdev->dev.driver->acpi_match_table, &pdev->dev);
111+ if (id && id->driver_data)
112+ dev->accessor_flags |= (u32)id->driver_data;
113+
109114 return 0;
110115 }
111116
@@ -116,7 +121,7 @@ static const struct acpi_device_id dw_i2c_acpi_match[] = { · 4 unmodified lines
116121 { "INT3433", 0 },
117122 { "80860F41", 0 },
118123 { "808622C1", 0 },
119− { "AMD0010", 0 },
124+ { "AMD0010", ACCESS_INTR_MASK },
120125 { }
121126 };
122127 MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match);
@@ -240,12 +245,10 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) · 117 unmodified lines
240245 }
241246
242247 r = i2c_dw_probe(dev);
243− if (r) {
248+ if (r && !dev->pm_runtime_disabled)
244249 pm_runtime_disable(&pdev->dev);
245− return r;
246− }
247250
248− return 0;
251+ return r;
249252 }
250253
251254 static int dw_i2c_plat_remove(struct platform_device *pdev)
@@ -260,7 +263,8 @@ static int dw_i2c_plat_remove(struct platform_device *pdev) · 8 unmodified lines
260263
261264 pm_runtime_dont_use_autosuspend(&pdev->dev);
262265 pm_runtime_put_sync(&pdev->dev);
263− pm_runtime_disable(&pdev->dev);
266+ if (!dev->pm_runtime_disabled)
267+ pm_runtime_disable(&pdev->dev);
264268
265269 return 0;
266270 }
drivers/i2c/busses/i2c-imx.c+2−2
@@ -1119,6 +1119,8 @@ static int i2c_imx_probe(struct platform_device *pdev) · 1118 unmodified lines
11191119 i2c_imx, IMX_I2C_I2CR);
11201120 imx_i2c_write_reg(i2c_imx->hwdata->i2sr_clr_opcode, i2c_imx, IMX_I2C_I2SR);
11211121
1122+ i2c_imx_init_recovery_info(i2c_imx, pdev);
1123+
11221124 /* Add I2C adapter */
11231125 ret = i2c_add_numbered_adapter(&i2c_imx->adapter);
11241126 if (ret < 0) {
@@ -1126,8 +1128,6 @@ static int i2c_imx_probe(struct platform_device *pdev) · 1 unmodified line
11261128 goto clk_disable;
11271129 }
11281130
1129− i2c_imx_init_recovery_info(i2c_imx, pdev);
1130−
11311131 /* Set up platform driver data */
11321132 platform_set_drvdata(pdev, i2c_imx);
11331133 clk_disable_unprepare(i2c_imx->clk);
drivers/i2c/busses/i2c-mv64xxx.c+18−9
@@ -146,6 +146,8 @@ struct mv64xxx_i2c_data { · 145 unmodified lines
146146 bool errata_delay;
147147 struct reset_control *rstc;
148148 bool irq_clear_inverted;
149+ /* Clk div is 2 to the power n, not 2 to the power n + 1 */
150+ bool clk_n_base_0;
149151 };
150152
151153 static struct mv64xxx_i2c_regs mv64xxx_i2c_regs_mv64xxx = {
@@ -757,25 +759,29 @@ MODULE_DEVICE_TABLE(of, mv64xxx_i2c_of_match_table); · 605 unmodified lines
757759 #ifdef CONFIG_OF
758760 #ifdef CONFIG_HAVE_CLK
759761 static int
760−mv64xxx_calc_freq(const int tclk, const int n, const int m)
762+mv64xxx_calc_freq(struct mv64xxx_i2c_data *drv_data,
763+ const int tclk, const int n, const int m)
761764 {
762− return tclk / (10 * (m + 1) * (2 << n));
765+ if (drv_data->clk_n_base_0)
766+ return tclk / (10 * (m + 1) * (1 << n));
767+ else
768+ return tclk / (10 * (m + 1) * (2 << n));
763769 }
764770
765771 static bool
766−mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n,
767− u32 *best_m)
772+mv64xxx_find_baud_factors(struct mv64xxx_i2c_data *drv_data,
773+ const u32 req_freq, const u32 tclk)
768774 {
769775 int freq, delta, best_delta = INT_MAX;
770776 int m, n;
771777
772778 for (n = 0; n <= 7; n++)
773779 for (m = 0; m <= 15; m++) {
774− freq = mv64xxx_calc_freq(tclk, n, m);
780+ freq = mv64xxx_calc_freq(drv_data, tclk, n, m);
775781 delta = req_freq - freq;
776782 if (delta >= 0 && delta < best_delta) {
777− *best_m = m;
778− *best_n = n;
783+ drv_data->freq_m = m;
784+ drv_data->freq_n = n;
779785 best_delta = delta;
780786 }
781787 if (best_delta == 0)
@@ -813,8 +819,11 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, · 31 unmodified lines
813819 if (of_property_read_u32(np, "clock-frequency", &bus_freq))
814820 bus_freq = 100000; /* 100kHz by default */
815821
816− if (!mv64xxx_find_baud_factors(bus_freq, tclk,
817− &drv_data->freq_n, &drv_data->freq_m)) {
822+ if (of_device_is_compatible(np, "allwinner,sun4i-a10-i2c") ||
823+ of_device_is_compatible(np, "allwinner,sun6i-a31-i2c"))
824+ drv_data->clk_n_base_0 = true;
825+
826+ if (!mv64xxx_find_baud_factors(drv_data, bus_freq, tclk)) {
818827 rc = -EINVAL;
819828 goto out;
820829 }
drivers/i2c/busses/i2c-rcar.c+2−2
@@ -576,7 +576,7 @@ static int rcar_reg_slave(struct i2c_client *slave) · 575 unmodified lines
576576 if (slave->flags & I2C_CLIENT_TEN)
577577 return -EAFNOSUPPORT;
578578
579− pm_runtime_forbid(rcar_i2c_priv_to_dev(priv));
579+ pm_runtime_get_sync(rcar_i2c_priv_to_dev(priv));
580580
581581 priv->slave = slave;
582582 rcar_i2c_write(priv, ICSAR, slave->addr);
@@ -598,7 +598,7 @@ static int rcar_unreg_slave(struct i2c_client *slave) · 15 unmodified lines
598598
599599 priv->slave = NULL;
600600
601− pm_runtime_allow(rcar_i2c_priv_to_dev(priv));
601+ pm_runtime_put(rcar_i2c_priv_to_dev(priv));
602602
603603 return 0;
604604 }
drivers/i2c/busses/i2c-rk3x.c+1−1
@@ -908,7 +908,7 @@ static int rk3x_i2c_probe(struct platform_device *pdev) · 907 unmodified lines
908908 &i2c->scl_fall_ns))
909909 i2c->scl_fall_ns = 300;
910910 if (of_property_read_u32(pdev->dev.of_node, "i2c-sda-falling-time-ns",
911− &i2c->scl_fall_ns))
911+ &i2c->sda_fall_ns))
912912 i2c->sda_fall_ns = i2c->scl_fall_ns;
913913
914914 strlcpy(i2c->adap.name, "rk3x-i2c", sizeof(i2c->adap.name));
drivers/i2c/busses/i2c-st.c+1−1
@@ -822,7 +822,7 @@ static int st_i2c_probe(struct platform_device *pdev) · 821 unmodified lines
822822
823823 adap = &i2c_dev->adap;
824824 i2c_set_adapdata(adap, i2c_dev);
825− snprintf(adap->name, sizeof(adap->name), "ST I2C(0x%pa)", &res->start);
825+ snprintf(adap->name, sizeof(adap->name), "ST I2C(%pa)", &res->start);
826826 adap->owner = THIS_MODULE;
827827 adap->timeout = 2 * HZ;
828828 adap->retries = 0;
drivers/iio/adc/qcom-spmi-vadc.c+3−1
@@ -839,8 +839,10 @@ static int vadc_get_dt_data(struct vadc_priv *vadc, struct device_node *node) · 838 unmodified lines
839839
840840 for_each_available_child_of_node(node, child) {
841841 ret = vadc_get_dt_channel_data(vadc->dev, &prop, child);
842− if (ret)
842+ if (ret) {
843+ of_node_put(child);
843844 return ret;
845+ }
844846
845847 vadc->chan_props[index] = prop;
846848
drivers/iio/industrialio-buffer.c+1−1
@@ -302,7 +302,7 @@ static int iio_scan_mask_set(struct iio_dev *indio_dev, · 301 unmodified lines
302302 if (trialmask == NULL)
303303 return -ENOMEM;
304304 if (!indio_dev->masklength) {
305− WARN_ON("Trying to set scanmask prior to registering buffer\n");
305+ WARN(1, "Trying to set scanmask prior to registering buffer\n");
306306 goto err_invalid_mask;
307307 }
308308 bitmap_copy(trialmask, buffer->scan_mask, indio_dev->masklength);
drivers/iio/industrialio-core.c+1−1
@@ -655,7 +655,7 @@ int __iio_device_attr_init(struct device_attribute *dev_attr, · 654 unmodified lines
655655 break;
656656 case IIO_SEPARATE:
657657 if (!chan->indexed) {
658− WARN_ON("Differential channels must be indexed\n");
658+ WARN(1, "Differential channels must be indexed\n");
659659 ret = -EINVAL;
660660 goto error_free_full_postfix;
661661 }
drivers/iio/light/apds9960.c+1−0
@@ -453,6 +453,7 @@ static int apds9960_set_power_state(struct apds9960_data *data, bool on) · 452 unmodified lines
453453 usleep_range(data->als_adc_int_us,
454454 APDS9960_MAX_INT_TIME_IN_US);
455455 } else {
456+ pm_runtime_mark_last_busy(dev);
456457 ret = pm_runtime_put_autosuspend(dev);
457458 }
458459
drivers/iio/proximity/pulsedlight-lidar-lite-v2.c+3−3
@@ -130,10 +130,10 @@ static int lidar_get_measurement(struct lidar_data *data, u16 *reg) · 129 unmodified lines
130130 if (ret < 0)
131131 break;
132132
133− /* return 0 since laser is likely pointed out of range */
133+ /* return -EINVAL since laser is likely pointed out of range */
134134 if (ret & LIDAR_REG_STATUS_INVALID) {
135135 *reg = 0;
136− ret = 0;
136+ ret = -EINVAL;
137137 break;
138138 }
139139
@@ -197,7 +197,7 @@ static irqreturn_t lidar_trigger_handler(int irq, void *private) · 57 unmodified lines
197197 if (!ret) {
198198 iio_push_to_buffers_with_timestamp(indio_dev, data->buffer,
199199 iio_get_time_ns());
200− } else {
200+ } else if (ret != -EINVAL) {
201201 dev_err(&data->client->dev, "cannot read LIDAR measurement");
202202 }
203203
drivers/infiniband/core/cma.c+1−4
@@ -1126,10 +1126,7 @@ static bool validate_ipv4_net_dev(struct net_device *net_dev, · 1125 unmodified lines
11261126
11271127 rcu_read_lock();
11281128 err = fib_lookup(dev_net(net_dev), &fl4, &res, 0);
1129− if (err)
1130− return false;
1131−
1132− ret = FIB_RES_DEV(res) == net_dev;
1129+ ret = err == 0 && FIB_RES_DEV(res) == net_dev;
11331130 rcu_read_unlock();
11341131
11351132 return ret;
drivers/infiniband/core/mad.c+5−0
@@ -1811,6 +1811,11 @@ static int validate_mad(const struct ib_mad_hdr *mad_hdr, · 1810 unmodified lines
18111811 if (qp_num == 0)
18121812 valid = 1;
18131813 } else {
1814+ /* CM attributes other than ClassPortInfo only use Send method */
1815+ if ((mad_hdr->mgmt_class == IB_MGMT_CLASS_CM) &&
1816+ (mad_hdr->attr_id != IB_MGMT_CLASSPORTINFO_ATTR_ID) &&
1817+ (mad_hdr->method != IB_MGMT_METHOD_SEND))
1818+ goto out;
18141819 /* Filter GSI packets sent to QP0 */
18151820 if (qp_num != 0)
18161821 valid = 1;
drivers/infiniband/core/sa_query.c+17−15
@@ -512,7 +512,7 @@ static int ib_nl_get_path_rec_attrs_len(ib_sa_comp_mask comp_mask) · 511 unmodified lines
512512 return len;
513513 }
514514
515−static int ib_nl_send_msg(struct ib_sa_query *query)
515+static int ib_nl_send_msg(struct ib_sa_query *query, gfp_t gfp_mask)
516516 {
517517 struct sk_buff *skb = NULL;
518518 struct nlmsghdr *nlh;
@@ -526,7 +526,7 @@ static int ib_nl_send_msg(struct ib_sa_query *query) · 7 unmodified lines
526526 if (len <= 0)
527527 return -EMSGSIZE;
528528
529− skb = nlmsg_new(len, GFP_KERNEL);
529+ skb = nlmsg_new(len, gfp_mask);
530530 if (!skb)
531531 return -ENOMEM;
532532
@@ -544,7 +544,7 @@ static int ib_nl_send_msg(struct ib_sa_query *query) · 11 unmodified lines
544544 /* Repair the nlmsg header length */
545545 nlmsg_end(skb, nlh);
546546
547− ret = ibnl_multicast(skb, nlh, RDMA_NL_GROUP_LS, GFP_KERNEL);
547+ ret = ibnl_multicast(skb, nlh, RDMA_NL_GROUP_LS, gfp_mask);
548548 if (!ret)
549549 ret = len;
550550 else
@@ -553,7 +553,7 @@ static int ib_nl_send_msg(struct ib_sa_query *query) · 2 unmodified lines
553553 return ret;
554554 }
555555
556−static int ib_nl_make_request(struct ib_sa_query *query)
556+static int ib_nl_make_request(struct ib_sa_query *query, gfp_t gfp_mask)
557557 {
558558 unsigned long flags;
559559 unsigned long delay;
@@ -562,25 +562,27 @@ static int ib_nl_make_request(struct ib_sa_query *query) · 2 unmodified lines
562562 INIT_LIST_HEAD(&query->list);
563563 query->seq = (u32)atomic_inc_return(&ib_nl_sa_request_seq);
564564
565+ /* Put the request on the list first.*/
565566 spin_lock_irqsave(&ib_nl_request_lock, flags);
566− ret = ib_nl_send_msg(query);
567− if (ret <= 0) {
568− ret = -EIO;
569− goto request_out;
570− } else {
571− ret = 0;
572− }
573−
574567 delay = msecs_to_jiffies(sa_local_svc_timeout_ms);
575568 query->timeout = delay + jiffies;
576569 list_add_tail(&query->list, &ib_nl_request_list);
577570 /* Start the timeout if this is the only request */
578571 if (ib_nl_request_list.next == &query->list)
579572 queue_delayed_work(ib_nl_wq, &ib_nl_timed_work, delay);
580−
581−request_out:
582573 spin_unlock_irqrestore(&ib_nl_request_lock, flags);
583574
575+ ret = ib_nl_send_msg(query, gfp_mask);
576+ if (ret <= 0) {
577+ ret = -EIO;
578+ /* Remove the request */
579+ spin_lock_irqsave(&ib_nl_request_lock, flags);
580+ list_del(&query->list);
581+ spin_unlock_irqrestore(&ib_nl_request_lock, flags);
582+ } else {
583+ ret = 0;
584+ }
585+
584586 return ret;
585587 }
586588
@@ -1108,7 +1110,7 @@ static int send_mad(struct ib_sa_query *query, int timeout_ms, gfp_t gfp_mask) · 521 unmodified lines
11081110
11091111 if (query->flags & IB_SA_ENABLE_LOCAL_SERVICE) {
11101112 if (!ibnl_chk_listeners(RDMA_NL_GROUP_LS)) {
1111− if (!ib_nl_make_request(query))
1113+ if (!ib_nl_make_request(query, gfp_mask))
11121114 return id;
11131115 }
11141116 ib_sa_disable_local_svc(query);
drivers/infiniband/core/uverbs_cmd.c+17−10
@@ -62,9 +62,11 @@ static struct uverbs_lock_class rule_lock_class = { .name = "RULE-uobj" }; · 61 unmodified lines
6262 * The ib_uobject locking scheme is as follows:
6363 *
6464 * - ib_uverbs_idr_lock protects the uverbs idrs themselves, so it
65− * needs to be held during all idr operations. When an object is
65+ * needs to be held during all idr write operations. When an object is
6666 * looked up, a reference must be taken on the object's kref before
67− * dropping this lock.
67+ * dropping this lock. For read operations, the rcu_read_lock()
68+ * and rcu_write_lock() but similarly the kref reference is grabbed
69+ * before the rcu_read_unlock().
6870 *
6971 * - Each object also has an rwsem. This rwsem must be held for
7072 * reading while an operation that uses the object is performed.
@@ -96,7 +98,7 @@ static void init_uobj(struct ib_uobject *uobj, u64 user_handle, · 25 unmodified lines
9698
9799 static void release_uobj(struct kref *kref)
98100 {
99− kfree(container_of(kref, struct ib_uobject, ref));
101+ kfree_rcu(container_of(kref, struct ib_uobject, ref), rcu);
100102 }
101103
102104 static void put_uobj(struct ib_uobject *uobj)
@@ -145,7 +147,7 @@ static struct ib_uobject *__idr_get_uobj(struct idr *idr, int id, · 42 unmodified lines
145147 {
146148 struct ib_uobject *uobj;
147149
148− spin_lock(&ib_uverbs_idr_lock);
150+ rcu_read_lock();
149151 uobj = idr_find(idr, id);
150152 if (uobj) {
151153 if (uobj->context == context)
@@ -153,7 +155,7 @@ static struct ib_uobject *__idr_get_uobj(struct idr *idr, int id, · 1 unmodified line
153155 else
154156 uobj = NULL;
155157 }
156− spin_unlock(&ib_uverbs_idr_lock);
158+ rcu_read_unlock();
157159
158160 return uobj;
159161 }
@@ -2446,6 +2448,7 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file, · 2286 unmodified lines
24462448 int i, sg_ind;
24472449 int is_ud;
24482450 ssize_t ret = -EINVAL;
2451+ size_t next_size;
24492452
24502453 if (copy_from_user(&cmd, buf, sizeof cmd))
24512454 return -EFAULT;
@@ -2490,7 +2493,8 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file, · 38 unmodified lines
24902493 goto out_put;
24912494 }
24922495
2493− ud = alloc_wr(sizeof(*ud), user_wr->num_sge);
2496+ next_size = sizeof(*ud);
2497+ ud = alloc_wr(next_size, user_wr->num_sge);
24942498 if (!ud) {
24952499 ret = -ENOMEM;
24962500 goto out_put;
@@ -2511,7 +2515,8 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file, · 14 unmodified lines
25112515 user_wr->opcode == IB_WR_RDMA_READ) {
25122516 struct ib_rdma_wr *rdma;
25132517
2514− rdma = alloc_wr(sizeof(*rdma), user_wr->num_sge);
2518+ next_size = sizeof(*rdma);
2519+ rdma = alloc_wr(next_size, user_wr->num_sge);
25152520 if (!rdma) {
25162521 ret = -ENOMEM;
25172522 goto out_put;
@@ -2525,7 +2530,8 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file, · 7 unmodified lines
25252530 user_wr->opcode == IB_WR_ATOMIC_FETCH_AND_ADD) {
25262531 struct ib_atomic_wr *atomic;
25272532
2528− atomic = alloc_wr(sizeof(*atomic), user_wr->num_sge);
2533+ next_size = sizeof(*atomic);
2534+ atomic = alloc_wr(next_size, user_wr->num_sge);
25292535 if (!atomic) {
25302536 ret = -ENOMEM;
25312537 goto out_put;
@@ -2540,7 +2546,8 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file, · 8 unmodified lines
25402546 } else if (user_wr->opcode == IB_WR_SEND ||
25412547 user_wr->opcode == IB_WR_SEND_WITH_IMM ||
25422548 user_wr->opcode == IB_WR_SEND_WITH_INV) {
2543− next = alloc_wr(sizeof(*next), user_wr->num_sge);
2549+ next_size = sizeof(*next);
2550+ next = alloc_wr(next_size, user_wr->num_sge);
25442551 if (!next) {
25452552 ret = -ENOMEM;
25462553 goto out_put;
@@ -2572,7 +2579,7 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file, · 25 unmodified lines
25722579
25732580 if (next->num_sge) {
25742581 next->sg_list = (void *) next +
2575− ALIGN(sizeof *next, sizeof (struct ib_sge));
2582+ ALIGN(next_size, sizeof(struct ib_sge));
25762583 if (copy_from_user(next->sg_list,
25772584 buf + sizeof cmd +
25782585 cmd.wr_count * cmd.wqe_size +
drivers/infiniband/core/verbs.c+22−21
@@ -1516,7 +1516,7 @@ EXPORT_SYMBOL(ib_map_mr_sg); · 1515 unmodified lines
15161516 * @sg_nents: number of entries in sg
15171517 * @set_page: driver page assignment function pointer
15181518 *
1519− * Core service helper for drivers to covert the largest
1519+ * Core service helper for drivers to convert the largest
15201520 * prefix of given sg list to a page vector. The sg list
15211521 * prefix converted is the prefix that meet the requirements
15221522 * of ib_map_mr_sg.
@@ -1533,7 +1533,7 @@ int ib_sg_to_pages(struct ib_mr *mr, · 10 unmodified lines
15331533 u64 last_end_dma_addr = 0, last_page_addr = 0;
15341534 unsigned int last_page_off = 0;
15351535 u64 page_mask = ~((u64)mr->page_size - 1);
1536− int i;
1536+ int i, ret;
15371537
15381538 mr->iova = sg_dma_address(&sgl[0]);
15391539 mr->length = 0;
@@ -1544,27 +1544,29 @@ int ib_sg_to_pages(struct ib_mr *mr, · 4 unmodified lines
15441544 u64 end_dma_addr = dma_addr + dma_len;
15451545 u64 page_addr = dma_addr & page_mask;
15461546
1547− if (i && page_addr != dma_addr) {
1548− if (last_end_dma_addr != dma_addr) {
1549− /* gap */
1550− goto done;
1551−
1552− } else if (last_page_off + dma_len <= mr->page_size) {
1553− /* chunk this fragment with the last */
1554− mr->length += dma_len;
1555− last_end_dma_addr += dma_len;
1556− last_page_off += dma_len;
1557− continue;
1558− } else {
1559− /* map starting from the next page */
1560− page_addr = last_page_addr + mr->page_size;
1561− dma_len -= mr->page_size - last_page_off;
1562− }
1547+ /*
1548+ * For the second and later elements, check whether either the
1549+ * end of element i-1 or the start of element i is not aligned
1550+ * on a page boundary.
1551+ */
1552+ if (i && (last_page_off != 0 || page_addr != dma_addr)) {
1553+ /* Stop mapping if there is a gap. */
1554+ if (last_end_dma_addr != dma_addr)
1555+ break;
1556+
1557+ /*
1558+ * Coalesce this element with the last. If it is small
1559+ * enough just update mr->length. Otherwise start
1560+ * mapping from the next page.
1561+ */
1562+ goto next_page;
15631563 }
15641564
15651565 do {
1566− if (unlikely(set_page(mr, page_addr)))
1567− goto done;
1566+ ret = set_page(mr, page_addr);
1567+ if (unlikely(ret < 0))
1568+ return i ? : ret;
1569+next_page:
15681570 page_addr += mr->page_size;
15691571 } while (page_addr < end_dma_addr);
15701572
@@ -1574,7 +1576,6 @@ int ib_sg_to_pages(struct ib_mr *mr, · 3 unmodified lines
15741576 last_page_off = end_dma_addr & ~page_mask;
15751577 }
15761578
1577−done:
15781579 return i;
15791580 }
15801581 EXPORT_SYMBOL(ib_sg_to_pages);
drivers/infiniband/hw/mlx4/main.c+1−1
@@ -456,7 +456,7 @@ static int mlx4_ib_query_device(struct ib_device *ibdev, · 455 unmodified lines
456456 props->max_qp_wr = dev->dev->caps.max_wqes - MLX4_IB_SQ_MAX_SPARE;
457457 props->max_sge = min(dev->dev->caps.max_sq_sg,
458458 dev->dev->caps.max_rq_sg);
459− props->max_sge_rd = props->max_sge;
459+ props->max_sge_rd = MLX4_MAX_SGE_RD;
460460 props->max_cq = dev->dev->quotas.cq;
461461 props->max_cqe = dev->dev->caps.max_cqes;
462462 props->max_mr = dev->dev->quotas.mpt;
drivers/infiniband/hw/mlx4/qp.c+13−6
@@ -34,6 +34,7 @@ · 33 unmodified lines
3434 #include <linux/log2.h>
3535 #include <linux/slab.h>
3636 #include <linux/netdevice.h>
37+#include <linux/vmalloc.h>
3738
3839 #include <rdma/ib_cache.h>
3940 #include <rdma/ib_pack.h>
@@ -795,8 +796,14 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, · 755 unmodified lines
795796 if (err)
796797 goto err_mtt;
797798
798− qp->sq.wrid = kmalloc(qp->sq.wqe_cnt * sizeof (u64), gfp);
799− qp->rq.wrid = kmalloc(qp->rq.wqe_cnt * sizeof (u64), gfp);
799+ qp->sq.wrid = kmalloc(qp->sq.wqe_cnt * sizeof(u64), gfp);
800+ if (!qp->sq.wrid)
801+ qp->sq.wrid = __vmalloc(qp->sq.wqe_cnt * sizeof(u64),
802+ gfp, PAGE_KERNEL);
803+ qp->rq.wrid = kmalloc(qp->rq.wqe_cnt * sizeof(u64), gfp);
804+ if (!qp->rq.wrid)
805+ qp->rq.wrid = __vmalloc(qp->rq.wqe_cnt * sizeof(u64),
806+ gfp, PAGE_KERNEL);
800807 if (!qp->sq.wrid || !qp->rq.wrid) {
801808 err = -ENOMEM;
802809 goto err_wrid;
@@ -886,8 +893,8 @@ err_wrid: · 83 unmodified lines
886893 if (qp_has_rq(init_attr))
887894 mlx4_ib_db_unmap_user(to_mucontext(pd->uobject->context), &qp->db);
888895 } else {
889− kfree(qp->sq.wrid);
890− kfree(qp->rq.wrid);
896+ kvfree(qp->sq.wrid);
897+ kvfree(qp->rq.wrid);
891898 }
892899
893900 err_mtt:
@@ -1062,8 +1069,8 @@ static void destroy_qp_common(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp, · 168 unmodified lines
10621069 &qp->db);
10631070 ib_umem_release(qp->umem);
10641071 } else {
1065− kfree(qp->sq.wrid);
1066− kfree(qp->rq.wrid);
1072+ kvfree(qp->sq.wrid);
1073+ kvfree(qp->rq.wrid);
10671074 if (qp->mlx4_ib_qp_type & (MLX4_IB_QPT_PROXY_SMI_OWNER |
10681075 MLX4_IB_QPT_PROXY_SMI | MLX4_IB_QPT_PROXY_GSI))
10691076 free_proxy_bufs(&dev->ib_dev, qp);
drivers/infiniband/hw/mlx4/srq.c+8−3
@@ -34,6 +34,7 @@ · 33 unmodified lines
3434 #include <linux/mlx4/qp.h>
3535 #include <linux/mlx4/srq.h>
3636 #include <linux/slab.h>
37+#include <linux/vmalloc.h>
3738
3839 #include "mlx4_ib.h"
3940 #include "user.h"
@@ -172,8 +173,12 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd, · 132 unmodified lines
172173
173174 srq->wrid = kmalloc(srq->msrq.max * sizeof (u64), GFP_KERNEL);
174175 if (!srq->wrid) {
175− err = -ENOMEM;
176− goto err_mtt;
176+ srq->wrid = __vmalloc(srq->msrq.max * sizeof(u64),
177+ GFP_KERNEL, PAGE_KERNEL);
178+ if (!srq->wrid) {
179+ err = -ENOMEM;
180+ goto err_mtt;
181+ }
177182 }
178183 }
179184
@@ -204,7 +209,7 @@ err_wrid: · 24 unmodified lines
204209 if (pd->uobject)
205210 mlx4_ib_db_unmap_user(to_mucontext(pd->uobject->context), &srq->db);
206211 else
207− kfree(srq->wrid);
212+ kvfree(srq->wrid);
208213
209214 err_mtt:
210215 mlx4_mtt_cleanup(dev->dev, &srq->mtt);
drivers/infiniband/hw/mlx5/mr.c+13−1
@@ -381,7 +381,19 @@ static void __cache_work_func(struct mlx5_cache_ent *ent) · 380 unmodified lines
381381 }
382382 }
383383 } else if (ent->cur > 2 * ent->limit) {
384− if (!someone_adding(cache) &&
384+ /*
385+ * The remove_keys() logic is performed as garbage collection
386+ * task. Such task is intended to be run when no other active
387+ * processes are running.
388+ *
389+ * The need_resched() will return TRUE if there are user tasks
390+ * to be activated in near future.
391+ *
392+ * In such case, we don't execute remove_keys() and postpone
393+ * the garbage collection work to try to run in next cycle,
394+ * in order to free CPU resources to other tasks.
395+ */
396+ if (!need_resched() && !someone_adding(cache) &&
385397 time_after(jiffies, cache->last_add + 300 * HZ)) {
386398 remove_keys(dev, i, 1);
387399 if (ent->cur > ent->limit)
drivers/infiniband/hw/qib/qib_qsfp.c+2−2
@@ -292,7 +292,7 @@ int qib_refresh_qsfp_cache(struct qib_pportdata *ppd, struct qib_qsfp_cache *cp) · 291 unmodified lines
292292 qib_dev_porterr(ppd->dd, ppd->port,
293293 "QSFP byte0 is 0x%02X, S/B 0x0C/D\n", peek[0]);
294294
295− if ((peek[2] & 2) == 0) {
295+ if ((peek[2] & 4) == 0) {
296296 /*
297297 * If cable is paged, rather than "flat memory", we need to
298298 * set the page to zero, Even if it already appears to be zero.
@@ -538,7 +538,7 @@ int qib_qsfp_dump(struct qib_pportdata *ppd, char *buf, int len) · 239 unmodified lines
538538 sofar += scnprintf(buf + sofar, len - sofar, "Date:%.*s\n",
539539 QSFP_DATE_LEN, cd.date);
540540 sofar += scnprintf(buf + sofar, len - sofar, "Lot:%.*s\n",
541− QSFP_LOT_LEN, cd.date);
541+ QSFP_LOT_LEN, cd.lot);
542542
543543 while (bidx < QSFP_DEFAULT_HDR_CNT) {
544544 int iidx;
drivers/infiniband/hw/qib/qib_verbs.h+1−1
@@ -329,9 +329,9 @@ struct qib_sge { · 328 unmodified lines
329329 struct qib_mr {
330330 struct ib_mr ibmr;
331331 struct ib_umem *umem;
332− struct qib_mregion mr; /* must be last */
333332 u64 *pages;
334333 u32 npages;
334+ struct qib_mregion mr; /* must be last */
335335 };
336336
337337 /*
drivers/infiniband/ulp/iser/iser_verbs.c+1−1
@@ -1293,7 +1293,7 @@ u8 iser_check_task_pi_status(struct iscsi_iser_task *iser_task, · 1292 unmodified lines
12931293 if (mr_status.fail_status & IB_MR_CHECK_SIG_STATUS) {
12941294 sector_t sector_off = mr_status.sig_err.sig_err_offset;
12951295
1296− do_div(sector_off, sector_size + 8);
1296+ sector_div(sector_off, sector_size + 8);
12971297 *sector = scsi_get_lba(iser_task->sc) + sector_off;
12981298
12991299 pr_err("PI error found type %d at sector %llx "
drivers/infiniband/ulp/isert/ib_isert.c+3−10
@@ -157,16 +157,9 @@ isert_create_qp(struct isert_conn *isert_conn, · 156 unmodified lines
157157 attr.recv_cq = comp->cq;
158158 attr.cap.max_send_wr = ISERT_QP_MAX_REQ_DTOS;
159159 attr.cap.max_recv_wr = ISERT_QP_MAX_RECV_DTOS + 1;
160− /*
161− * FIXME: Use devattr.max_sge - 2 for max_send_sge as
162− * work-around for RDMA_READs with ConnectX-2.
163− *
164− * Also, still make sure to have at least two SGEs for
165− * outgoing control PDU responses.
166− */
167− attr.cap.max_send_sge = max(2, device->dev_attr.max_sge - 2);
168− isert_conn->max_sge = attr.cap.max_send_sge;
169−
160+ attr.cap.max_send_sge = device->dev_attr.max_sge;
161+ isert_conn->max_sge = min(device->dev_attr.max_sge,
162+ device->dev_attr.max_sge_rd);
170163 attr.cap.max_recv_sge = 1;
171164 attr.sq_sig_type = IB_SIGNAL_REQ_WR;
172165 attr.qp_type = IB_QPT_RC;
drivers/infiniband/ulp/srp/ib_srp.c+26−22
@@ -488,7 +488,7 @@ static int srp_create_ch_ib(struct srp_rdma_ch *ch) · 487 unmodified lines
488488 struct ib_qp *qp;
489489 struct ib_fmr_pool *fmr_pool = NULL;
490490 struct srp_fr_pool *fr_pool = NULL;
491− const int m = 1 + dev->use_fast_reg;
491+ const int m = dev->use_fast_reg ? 3 : 1;
492492 struct ib_cq_init_attr cq_attr = {};
493493 int ret;
494494
@@ -994,16 +994,16 @@ static int srp_connect_ch(struct srp_rdma_ch *ch, bool multich) · 499 unmodified lines
994994
995995 ret = srp_lookup_path(ch);
996996 if (ret)
997− return ret;
997+ goto out;
998998
999999 while (1) {
10001000 init_completion(&ch->done);
10011001 ret = srp_send_req(ch, multich);
10021002 if (ret)
1003− return ret;
1003+ goto out;
10041004 ret = wait_for_completion_interruptible(&ch->done);
10051005 if (ret < 0)
1006− return ret;
1006+ goto out;
10071007
10081008 /*
10091009 * The CM event handling code will set status to
@@ -1011,15 +1011,16 @@ static int srp_connect_ch(struct srp_rdma_ch *ch, bool multich) · 1 unmodified line
10111011 * back, or SRP_DLID_REDIRECT if we get a lid/qp
10121012 * redirect REJ back.
10131013 */
1014− switch (ch->status) {
1014+ ret = ch->status;
1015+ switch (ret) {
10151016 case 0:
10161017 ch->connected = true;
1017− return 0;
1018+ goto out;
10181019
10191020 case SRP_PORT_REDIRECT:
10201021 ret = srp_lookup_path(ch);
10211022 if (ret)
1022− return ret;
1023+ goto out;
10231024 break;
10241025
10251026 case SRP_DLID_REDIRECT:
@@ -1028,13 +1029,16 @@ static int srp_connect_ch(struct srp_rdma_ch *ch, bool multich) · 2 unmodified lines
10281029 case SRP_STALE_CONN:
10291030 shost_printk(KERN_ERR, target->scsi_host, PFX
10301031 "giving up on stale connection\n");
1031− ch->status = -ECONNRESET;
1032− return ch->status;
1032+ ret = -ECONNRESET;
1033+ goto out;
10331034
10341035 default:
1035− return ch->status;
1036+ goto out;
10361037 }
10371038 }
1039+
1040+out:
1041+ return ret <= 0 ? ret : -ENODEV;
10381042 }
10391043
10401044 static int srp_inv_rkey(struct srp_rdma_ch *ch, u32 rkey)
@@ -1309,7 +1313,7 @@ reset_state: · 268 unmodified lines
13091313 }
13101314
13111315 static int srp_map_finish_fr(struct srp_map_state *state,
1312− struct srp_rdma_ch *ch)
1316+ struct srp_rdma_ch *ch, int sg_nents)
13131317 {
13141318 struct srp_target_port *target = ch->target;
13151319 struct srp_device *dev = target->srp_host->srp_dev;
@@ -1324,10 +1328,10 @@ static int srp_map_finish_fr(struct srp_map_state *state, · 8 unmodified lines
13241328
13251329 WARN_ON_ONCE(!dev->use_fast_reg);
13261330
1327− if (state->sg_nents == 0)
1331+ if (sg_nents == 0)
13281332 return 0;
13291333
1330− if (state->sg_nents == 1 && target->global_mr) {
1334+ if (sg_nents == 1 && target->global_mr) {
13311335 srp_map_desc(state, sg_dma_address(state->sg),
13321336 sg_dma_len(state->sg),
13331337 target->global_mr->rkey);
@@ -1341,8 +1345,7 @@ static int srp_map_finish_fr(struct srp_map_state *state, · 7 unmodified lines
13411345 rkey = ib_inc_rkey(desc->mr->rkey);
13421346 ib_update_fast_reg_key(desc->mr, rkey);
13431347
1344− n = ib_map_mr_sg(desc->mr, state->sg, state->sg_nents,
1345− dev->mr_page_size);
1348+ n = ib_map_mr_sg(desc->mr, state->sg, sg_nents, dev->mr_page_size);
13461349 if (unlikely(n < 0))
13471350 return n;
13481351
@@ -1448,16 +1451,15 @@ static int srp_map_sg_fr(struct srp_map_state *state, struct srp_rdma_ch *ch, · 99 unmodified lines
14481451 state->fr.next = req->fr_list;
14491452 state->fr.end = req->fr_list + ch->target->cmd_sg_cnt;
14501453 state->sg = scat;
1451− state->sg_nents = scsi_sg_count(req->scmnd);
14521454
1453− while (state->sg_nents) {
1455+ while (count) {
14541456 int i, n;
14551457
1456− n = srp_map_finish_fr(state, ch);
1458+ n = srp_map_finish_fr(state, ch, count);
14571459 if (unlikely(n < 0))
14581460 return n;
14591461
1460− state->sg_nents -= n;
1462+ count -= n;
14611463 for (i = 0; i < n; i++)
14621464 state->sg = sg_next(state->sg);
14631465 }
@@ -1517,10 +1519,12 @@ static int srp_map_idb(struct srp_rdma_ch *ch, struct srp_request *req, · 53 unmodified lines
15171519
15181520 if (dev->use_fast_reg) {
15191521 state.sg = idb_sg;
1520− state.sg_nents = 1;
15211522 sg_set_buf(idb_sg, req->indirect_desc, idb_len);
15221523 idb_sg->dma_address = req->indirect_dma_addr; /* hack! */
1523− ret = srp_map_finish_fr(&state, ch);
1524+#ifdef CONFIG_NEED_SG_DMA_LENGTH
1525+ idb_sg->dma_length = idb_sg->length; /* hack^2 */
1526+#endif
1527+ ret = srp_map_finish_fr(&state, ch, 1);
15241528 if (ret < 0)
15251529 return ret;
15261530 } else if (dev->use_fmr) {
@@ -1655,7 +1659,7 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_rdma_ch *ch, · 128 unmodified lines
16551659 return ret;
16561660 req->nmdesc++;
16571661 } else {
1658− idb_rkey = target->global_mr->rkey;
1662+ idb_rkey = cpu_to_be32(target->global_mr->rkey);
16591663 }
16601664
16611665 indirect_hdr->table_desc.va = cpu_to_be64(req->indirect_dma_addr);
drivers/infiniband/ulp/srp/ib_srp.h+1−4
@@ -300,10 +300,7 @@ struct srp_map_state { · 299 unmodified lines
300300 dma_addr_t base_dma_addr;
301301 u32 dma_len;
302302 u32 total_len;
303− union {
304− unsigned int npages;
305− int sg_nents;
306− };
303+ unsigned int npages;
307304 unsigned int nmdesc;
308305 unsigned int ndesc;
309306 };
drivers/input/joystick/db9.c+1−0
@@ -592,6 +592,7 @@ static void db9_attach(struct parport *pp) · 591 unmodified lines
592592 return;
593593 }
594594
595+ memset(&db9_parport_cb, 0, sizeof(db9_parport_cb));
595596 db9_parport_cb.flags = PARPORT_FLAG_EXCL;
596597
597598 pd = parport_register_dev_model(pp, "db9", &db9_parport_cb, port_idx);
drivers/input/joystick/gamecon.c+1−0
@@ -951,6 +951,7 @@ static void gc_attach(struct parport *pp) · 950 unmodified lines
951951 pads = gc_cfg[port_idx].args + 1;
952952 n_pads = gc_cfg[port_idx].nargs - 1;
953953
954+ memset(&gc_parport_cb, 0, sizeof(gc_parport_cb));
954955 gc_parport_cb.flags = PARPORT_FLAG_EXCL;
955956
956957 pd = parport_register_dev_model(pp, "gamecon", &gc_parport_cb,
drivers/input/joystick/turbografx.c+1−0
@@ -181,6 +181,7 @@ static void tgfx_attach(struct parport *pp) · 180 unmodified lines
181181 n_buttons = tgfx_cfg[port_idx].args + 1;
182182 n_devs = tgfx_cfg[port_idx].nargs - 1;
183183
184+ memset(&tgfx_parport_cb, 0, sizeof(tgfx_parport_cb));
184185 tgfx_parport_cb.flags = PARPORT_FLAG_EXCL;
185186
186187 pd = parport_register_dev_model(pp, "turbografx", &tgfx_parport_cb,
drivers/input/joystick/walkera0701.c+1−0
@@ -218,6 +218,7 @@ static void walkera0701_attach(struct parport *pp) · 217 unmodified lines
218218
219219 w->parport = pp;
220220
221+ memset(&walkera0701_parport_cb, 0, sizeof(walkera0701_parport_cb));
221222 walkera0701_parport_cb.flags = PARPORT_FLAG_EXCL;
222223 walkera0701_parport_cb.irq_func = walkera0701_irq_handler;
223224 walkera0701_parport_cb.private = w;
drivers/input/misc/arizona-haptics.c+1−2
@@ -97,8 +97,7 @@ static void arizona_haptics_work(struct work_struct *work) · 96 unmodified lines
9797
9898 ret = regmap_update_bits(arizona->regmap,
9999 ARIZONA_HAPTICS_CONTROL_1,
100− ARIZONA_HAP_CTRL_MASK,
101− 1 << ARIZONA_HAP_CTRL_SHIFT);
100+ ARIZONA_HAP_CTRL_MASK, 0);
102101 if (ret != 0) {
103102 dev_err(arizona->dev, "Failed to stop haptics: %d\n",
104103 ret);
drivers/input/mouse/elan_i2c_core.c+3−0
@@ -41,6 +41,7 @@ · 40 unmodified lines
4141
4242 #define DRIVER_NAME "elan_i2c"
4343 #define ELAN_DRIVER_VERSION "1.6.1"
44+#define ELAN_VENDOR_ID 0x04f3
4445 #define ETP_MAX_PRESSURE 255
4546 #define ETP_FWIDTH_REDUCE 90
4647 #define ETP_FINGER_WIDTH 15
@@ -914,6 +915,8 @@ static int elan_setup_input_device(struct elan_tp_data *data) · 867 unmodified lines
914915
915916 input->name = "Elan Touchpad";
916917 input->id.bustype = BUS_I2C;
918+ input->id.vendor = ELAN_VENDOR_ID;
919+ input->id.product = data->product_id;
917920 input_set_drvdata(input, data);
918921
919922 error = input_mt_init_slots(input, ETP_MAX_FINGERS,
drivers/input/serio/parkbd.c+1−0
@@ -145,6 +145,7 @@ static int parkbd_getport(struct parport *pp) · 144 unmodified lines
145145 {
146146 struct pardev_cb parkbd_parport_cb;
147147
148+ memset(&parkbd_parport_cb, 0, sizeof(parkbd_parport_cb));
148149 parkbd_parport_cb.irq_func = parkbd_interrupt;
149150 parkbd_parport_cb.flags = PARPORT_FLAG_EXCL;
150151
drivers/input/tablet/aiptek.c+9−0
@@ -1819,6 +1819,14 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) · 1818 unmodified lines
18191819 input_set_abs_params(inputdev, ABS_TILT_Y, AIPTEK_TILT_MIN, AIPTEK_TILT_MAX, 0, 0);
18201820 input_set_abs_params(inputdev, ABS_WHEEL, AIPTEK_WHEEL_MIN, AIPTEK_WHEEL_MAX - 1, 0, 0);
18211821
1822+ /* Verify that a device really has an endpoint */
1823+ if (intf->altsetting[0].desc.bNumEndpoints < 1) {
1824+ dev_err(&intf->dev,
1825+ "interface has %d endpoints, but must have minimum 1\n",
1826+ intf->altsetting[0].desc.bNumEndpoints);
1827+ err = -EINVAL;
1828+ goto fail3;
1829+ }
18221830 endpoint = &intf->altsetting[0].endpoint[0].desc;
18231831
18241832 /* Go set up our URB, which is called when the tablet receives
@@ -1861,6 +1869,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) · 36 unmodified lines
18611869 if (i == ARRAY_SIZE(speeds)) {
18621870 dev_info(&intf->dev,
18631871 "Aiptek tried all speeds, no sane response\n");
1872+ err = -EINVAL;
18641873 goto fail3;
18651874 }
18661875
drivers/input/touchscreen/atmel_mxt_ts.c+34−0
@@ -2487,6 +2487,31 @@ static struct mxt_acpi_platform_data samus_platform_data[] = { · 2486 unmodified lines
24872487 { }
24882488 };
24892489
2490+static unsigned int chromebook_tp_buttons[] = {
2491+ KEY_RESERVED,
2492+ KEY_RESERVED,
2493+ KEY_RESERVED,
2494+ KEY_RESERVED,
2495+ KEY_RESERVED,
2496+ BTN_LEFT
2497+};
2498+
2499+static struct mxt_acpi_platform_data chromebook_platform_data[] = {
2500+ {
2501+ /* Touchpad */
2502+ .hid = "ATML0000",
2503+ .pdata = {
2504+ .t19_num_keys = ARRAY_SIZE(chromebook_tp_buttons),
2505+ .t19_keymap = chromebook_tp_buttons,
2506+ },
2507+ },
2508+ {
2509+ /* Touchscreen */
2510+ .hid = "ATML0001",
2511+ },
2512+ { }
2513+};
2514+
24902515 static const struct dmi_system_id mxt_dmi_table[] = {
24912516 {
24922517 /* 2015 Google Pixel */
@@ -2497,6 +2522,14 @@ static const struct dmi_system_id mxt_dmi_table[] = { · 4 unmodified lines
24972522 },
24982523 .driver_data = samus_platform_data,
24992524 },
2525+ {
2526+ /* Other Google Chromebooks */
2527+ .ident = "Chromebook",
2528+ .matches = {
2529+ DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
2530+ },
2531+ .driver_data = chromebook_platform_data,
2532+ },
25002533 { }
25012534 };
25022535
@@ -2701,6 +2734,7 @@ static const struct i2c_device_id mxt_id[] = { · 198 unmodified lines
27012734 { "qt602240_ts", 0 },
27022735 { "atmel_mxt_ts", 0 },
27032736 { "atmel_mxt_tp", 0 },
2737+ { "maxtouch", 0 },
27042738 { "mXT224", 0 },
27052739 { }
27062740 };
drivers/input/touchscreen/elants_i2c.c+12−9
@@ -1316,7 +1316,13 @@ static int __maybe_unused elants_i2c_suspend(struct device *dev) · 1315 unmodified lines
13161316
13171317 disable_irq(client->irq);
13181318
1319− if (device_may_wakeup(dev) || ts->keep_power_in_suspend) {
1319+ if (device_may_wakeup(dev)) {
1320+ /*
1321+ * The device will automatically enter idle mode
1322+ * that has reduced power consumption.
1323+ */
1324+ ts->wake_irq_enabled = (enable_irq_wake(client->irq) == 0);
1325+ } else if (ts->keep_power_in_suspend) {
13201326 for (retry_cnt = 0; retry_cnt < MAX_RETRIES; retry_cnt++) {
13211327 error = elants_i2c_send(client, set_sleep_cmd,
13221328 sizeof(set_sleep_cmd));
@@ -1326,10 +1332,6 @@ static int __maybe_unused elants_i2c_suspend(struct device *dev) · 3 unmodified lines
13261332 dev_err(&client->dev,
13271333 "suspend command failed: %d\n", error);
13281334 }
1329−
1330− if (device_may_wakeup(dev))
1331− ts->wake_irq_enabled =
1332− (enable_irq_wake(client->irq) == 0);
13331335 } else {
13341336 elants_i2c_power_off(ts);
13351337 }
@@ -1345,10 +1347,11 @@ static int __maybe_unused elants_i2c_resume(struct device *dev) · 9 unmodified lines
13451347 int retry_cnt;
13461348 int error;
13471349
1348− if (device_may_wakeup(dev) && ts->wake_irq_enabled)
1349− disable_irq_wake(client->irq);
1350−
1351− if (ts->keep_power_in_suspend) {
1350+ if (device_may_wakeup(dev)) {
1351+ if (ts->wake_irq_enabled)
1352+ disable_irq_wake(client->irq);
1353+ elants_i2c_sw_reset(client);
1354+ } else if (ts->keep_power_in_suspend) {
13521355 for (retry_cnt = 0; retry_cnt < MAX_RETRIES; retry_cnt++) {
13531356 error = elants_i2c_send(client, set_active_cmd,
13541357 sizeof(set_active_cmd));
drivers/iommu/amd_iommu_v2.c+18−2
@@ -494,6 +494,22 @@ static void handle_fault_error(struct fault *fault) · 493 unmodified lines
494494 }
495495 }
496496
497+static bool access_error(struct vm_area_struct *vma, struct fault *fault)
498+{
499+ unsigned long requested = 0;
500+
501+ if (fault->flags & PPR_FAULT_EXEC)
502+ requested |= VM_EXEC;
503+
504+ if (fault->flags & PPR_FAULT_READ)
505+ requested |= VM_READ;
506+
507+ if (fault->flags & PPR_FAULT_WRITE)
508+ requested |= VM_WRITE;
509+
510+ return (requested & ~vma->vm_flags) != 0;
511+}
512+
497513 static void do_fault(struct work_struct *work)
498514 {
499515 struct fault *fault = container_of(work, struct fault, work);
@@ -516,8 +532,8 @@ static void do_fault(struct work_struct *work) · 16 unmodified lines
516532 goto out;
517533 }
518534
519− if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE))) {
520− /* handle_mm_fault would BUG_ON() */
535+ /* Check if we have the right permissions on the vma */
536+ if (access_error(vma, fault)) {
521537 up_read(&mm->mmap_sem);
522538 handle_fault_error(fault);
523539 goto out;
drivers/iommu/intel-iommu.c+2−2
@@ -2159,7 +2159,7 @@ static int __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn, · 2158 unmodified lines
21592159 sg_res = aligned_nrpages(sg->offset, sg->length);
21602160 sg->dma_address = ((dma_addr_t)iov_pfn << VTD_PAGE_SHIFT) + sg->offset;
21612161 sg->dma_length = sg->length;
2162− pteval = (sg_phys(sg) & PAGE_MASK) | prot;
2162+ pteval = page_to_phys(sg_page(sg)) | prot;
21632163 phys_pfn = pteval >> VTD_PAGE_SHIFT;
21642164 }
21652165
@@ -3704,7 +3704,7 @@ static int intel_nontranslate_map_sg(struct device *hddev, · 1538 unmodified lines
37043704
37053705 for_each_sg(sglist, sg, nelems, i) {
37063706 BUG_ON(!sg_page(sg));
3707− sg->dma_address = sg_phys(sg);
3707+ sg->dma_address = page_to_phys(sg_page(sg)) + sg->offset;
37083708 sg->dma_length = sg->length;
37093709 }
37103710 return nelems;
drivers/iommu/intel-svm.c+20−0
@@ -484,6 +484,23 @@ struct page_req_dsc { · 483 unmodified lines
484484 };
485485
486486 #define PRQ_RING_MASK ((0x1000 << PRQ_ORDER) - 0x10)
487+
488+static bool access_error(struct vm_area_struct *vma, struct page_req_dsc *req)
489+{
490+ unsigned long requested = 0;
491+
492+ if (req->exe_req)
493+ requested |= VM_EXEC;
494+
495+ if (req->rd_req)
496+ requested |= VM_READ;
497+
498+ if (req->wr_req)
499+ requested |= VM_WRITE;
500+
501+ return (requested & ~vma->vm_flags) != 0;
502+}
503+
487504 static irqreturn_t prq_event_thread(int irq, void *d)
488505 {
489506 struct intel_iommu *iommu = d;
@@ -539,6 +556,9 @@ static irqreturn_t prq_event_thread(int irq, void *d) · 49 unmodified lines
539556 if (!vma || address < vma->vm_start)
540557 goto invalid;
541558
559+ if (access_error(vma, req))
560+ goto invalid;
561+
542562 ret = handle_mm_fault(svm->mm, vma, address,
543563 req->wr_req ? FAULT_FLAG_WRITE : 0);
544564 if (ret & VM_FAULT_ERROR)
drivers/iommu/iommu.c+1−1
@@ -1430,7 +1430,7 @@ size_t default_iommu_map_sg(struct iommu_domain *domain, unsigned long iova, · 1429 unmodified lines
14301430 min_pagesz = 1 << __ffs(domain->ops->pgsize_bitmap);
14311431
14321432 for_each_sg(sg, s, nents, i) {
1433− phys_addr_t phys = sg_phys(s);
1433+ phys_addr_t phys = page_to_phys(sg_page(s)) + s->offset;
14341434
14351435 /*
14361436 * We are mapping on IOMMU page boundaries, so offset within
drivers/irqchip/irq-versatile-fpga.c+5−0
@@ -210,7 +210,12 @@ int __init fpga_irq_of_init(struct device_node *node, · 209 unmodified lines
210210 parent_irq = -1;
211211 }
212212
213+#ifdef CONFIG_ARCH_VERSATILE
214+ fpga_irq_init(base, node->name, IRQ_SIC_START, parent_irq, valid_mask,
215+ node);
216+#else
213217 fpga_irq_init(base, node->name, 0, parent_irq, valid_mask, node);
218+#endif
214219
215220 writel(clear_mask, base + IRQ_ENABLE_CLEAR);
216221 writel(clear_mask, base + FIQ_ENABLE_CLEAR);
drivers/isdn/gigaset/ser-gigaset.c+11−12
@@ -67,8 +67,7 @@ static int write_modem(struct cardstate *cs) · 66 unmodified lines
6767 struct sk_buff *skb = bcs->tx_skb;
6868 int sent = -EOPNOTSUPP;
6969
70− if (!tty || !tty->driver || !skb)
71− return -EINVAL;
70+ WARN_ON(!tty || !tty->ops || !skb);
7271
7372 if (!skb->len) {
7473 dev_kfree_skb_any(skb);
@@ -109,8 +108,7 @@ static int send_cb(struct cardstate *cs) · 34 unmodified lines
109108 unsigned long flags;
110109 int sent = 0;
111110
112− if (!tty || !tty->driver)
113− return -EFAULT;
111+ WARN_ON(!tty || !tty->ops);
114112
115113 cb = cs->cmdbuf;
116114 if (!cb)
@@ -370,19 +368,18 @@ static void gigaset_freecshw(struct cardstate *cs) · 253 unmodified lines
370368 tasklet_kill(&cs->write_tasklet);
371369 if (!cs->hw.ser)
372370 return;
373− dev_set_drvdata(&cs->hw.ser->dev.dev, NULL);
374371 platform_device_unregister(&cs->hw.ser->dev);
375− kfree(cs->hw.ser);
376− cs->hw.ser = NULL;
377372 }
378373
379374 static void gigaset_device_release(struct device *dev)
380375 {
381− struct platform_device *pdev = to_platform_device(dev);
376+ struct cardstate *cs = dev_get_drvdata(dev);
382377
383− /* adapted from platform_device_release() in drivers/base/platform.c */
384− kfree(dev->platform_data);
385− kfree(pdev->resource);
378+ if (!cs)
379+ return;
380+ dev_set_drvdata(dev, NULL);
381+ kfree(cs->hw.ser);
382+ cs->hw.ser = NULL;
386383 }
387384
388385 /*
@@ -432,7 +429,9 @@ static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state, · 43 unmodified lines
432429 struct tty_struct *tty = cs->hw.ser->tty;
433430 unsigned int set, clear;
434431
435− if (!tty || !tty->driver || !tty->ops->tiocmset)
432+ WARN_ON(!tty || !tty->ops);
433+ /* tiocmset is an optional tty driver method */
434+ if (!tty->ops->tiocmset)
436435 return -EINVAL;
437436 set = new_state & ~old_state;
438437 clear = old_state & ~new_state;
drivers/isdn/hardware/mISDN/mISDNipac.c+3−4
@@ -1170,7 +1170,7 @@ mISDNipac_irq(struct ipac_hw *ipac, int maxloop) · 1169 unmodified lines
11701170
11711171 if (ipac->type & IPAC_TYPE_IPACX) {
11721172 ista = ReadIPAC(ipac, ISACX_ISTA);
1173− while (ista && cnt--) {
1173+ while (ista && --cnt) {
11741174 pr_debug("%s: ISTA %02x\n", ipac->name, ista);
11751175 if (ista & IPACX__ICA)
11761176 ipac_irq(&ipac->hscx[0], ista);
@@ -1182,7 +1182,7 @@ mISDNipac_irq(struct ipac_hw *ipac, int maxloop) · 5 unmodified lines
11821182 }
11831183 } else if (ipac->type & IPAC_TYPE_IPAC) {
11841184 ista = ReadIPAC(ipac, IPAC_ISTA);
1185− while (ista && cnt--) {
1185+ while (ista && --cnt) {
11861186 pr_debug("%s: ISTA %02x\n", ipac->name, ista);
11871187 if (ista & (IPAC__ICD | IPAC__EXD)) {
11881188 istad = ReadISAC(isac, ISAC_ISTA);
@@ -1200,7 +1200,7 @@ mISDNipac_irq(struct ipac_hw *ipac, int maxloop) · 11 unmodified lines
12001200 ista = ReadIPAC(ipac, IPAC_ISTA);
12011201 }
12021202 } else if (ipac->type & IPAC_TYPE_HSCX) {
1203− while (cnt) {
1203+ while (--cnt) {
12041204 ista = ReadIPAC(ipac, IPAC_ISTAB + ipac->hscx[1].off);
12051205 pr_debug("%s: B2 ISTA %02x\n", ipac->name, ista);
12061206 if (ista)
@@ -1211,7 +1211,6 @@ mISDNipac_irq(struct ipac_hw *ipac, int maxloop) · 4 unmodified lines
12111211 mISDNisac_irq(isac, istad);
12121212 if (0 == (ista | istad))
12131213 break;
1214− cnt--;
12151214 }
12161215 }
12171216 if (cnt > maxloop) /* only for ISAC/HSCX without PCI IRQ test */
drivers/lightnvm/Kconfig+1−0
@@ -18,6 +18,7 @@ if NVM · 17 unmodified lines
1818
1919 config NVM_DEBUG
2020 bool "Open-Channel SSD debugging support"
21+ default n
2122 ---help---
2223 Exposes a debug management interface to create/remove targets at:
2324
drivers/lightnvm/core.c+42−43
@@ -74,7 +74,7 @@ EXPORT_SYMBOL(nvm_unregister_target); · 73 unmodified lines
7474 void *nvm_dev_dma_alloc(struct nvm_dev *dev, gfp_t mem_flags,
7575 dma_addr_t *dma_handler)
7676 {
77− return dev->ops->dev_dma_alloc(dev->q, dev->ppalist_pool, mem_flags,
77+ return dev->ops->dev_dma_alloc(dev, dev->ppalist_pool, mem_flags,
7878 dma_handler);
7979 }
8080 EXPORT_SYMBOL(nvm_dev_dma_alloc);
@@ -97,15 +97,47 @@ static struct nvmm_type *nvm_find_mgr_type(const char *name) · 16 unmodified lines
9797 return NULL;
9898 }
9999
100+struct nvmm_type *nvm_init_mgr(struct nvm_dev *dev)
101+{
102+ struct nvmm_type *mt;
103+ int ret;
104+
105+ lockdep_assert_held(&nvm_lock);
106+
107+ list_for_each_entry(mt, &nvm_mgrs, list) {
108+ ret = mt->register_mgr(dev);
109+ if (ret < 0) {
110+ pr_err("nvm: media mgr failed to init (%d) on dev %s\n",
111+ ret, dev->name);
112+ return NULL; /* initialization failed */
113+ } else if (ret > 0)
114+ return mt;
115+ }
116+
117+ return NULL;
118+}
119+
100120 int nvm_register_mgr(struct nvmm_type *mt)
101121 {
122+ struct nvm_dev *dev;
102123 int ret = 0;
103124
104125 down_write(&nvm_lock);
105− if (nvm_find_mgr_type(mt->name))
126+ if (nvm_find_mgr_type(mt->name)) {
106127 ret = -EEXIST;
107− else
128+ goto finish;
129+ } else {
108130 list_add(&mt->list, &nvm_mgrs);
131+ }
132+
133+ /* try to register media mgr if any device have none configured */
134+ list_for_each_entry(dev, &nvm_devices, devices) {
135+ if (dev->mt)
136+ continue;
137+
138+ dev->mt = nvm_init_mgr(dev);
139+ }
140+finish:
109141 up_write(&nvm_lock);
110142
111143 return ret;
@@ -123,26 +155,6 @@ void nvm_unregister_mgr(struct nvmm_type *mt) · 11 unmodified lines
123155 }
124156 EXPORT_SYMBOL(nvm_unregister_mgr);
125157
126−/* register with device with a supported manager */
127−static int register_mgr(struct nvm_dev *dev)
128−{
129− struct nvmm_type *mt;
130− int ret = 0;
131−
132− list_for_each_entry(mt, &nvm_mgrs, list) {
133− ret = mt->register_mgr(dev);
134− if (ret > 0) {
135− dev->mt = mt;
136− break; /* successfully initialized */
137− }
138− }
139−
140− if (!ret)
141− pr_info("nvm: no compatible nvm manager found.\n");
142−
143− return ret;
144−}
145−
146158 static struct nvm_dev *nvm_find_nvm_dev(const char *name)
147159 {
148160 struct nvm_dev *dev;
@@ -246,7 +258,7 @@ static int nvm_init(struct nvm_dev *dev) · 97 unmodified lines
246258 if (!dev->q || !dev->ops)
247259 return ret;
248260
249− if (dev->ops->identity(dev->q, &dev->identity)) {
261+ if (dev->ops->identity(dev, &dev->identity)) {
250262 pr_err("nvm: device could not be identified\n");
251263 goto err;
252264 }
@@ -271,14 +283,6 @@ static int nvm_init(struct nvm_dev *dev) · 18 unmodified lines
271283 goto err;
272284 }
273285
274− down_write(&nvm_lock);
275− ret = register_mgr(dev);
276− up_write(&nvm_lock);
277− if (ret < 0)
278− goto err;
279− if (!ret)
280− return 0;
281−
282286 pr_info("nvm: registered %s [%u/%u/%u/%u/%u/%u]\n",
283287 dev->name, dev->sec_per_pg, dev->nr_planes,
284288 dev->pgs_per_blk, dev->blks_per_lun, dev->nr_luns,
@@ -326,8 +330,7 @@ int nvm_register(struct request_queue *q, char *disk_name, · 41 unmodified lines
326330 }
327331
328332 if (dev->ops->max_phys_sect > 1) {
329− dev->ppalist_pool = dev->ops->create_dma_pool(dev->q,
330− "ppalist");
333+ dev->ppalist_pool = dev->ops->create_dma_pool(dev, "ppalist");
331334 if (!dev->ppalist_pool) {
332335 pr_err("nvm: could not create ppa pool\n");
333336 ret = -ENOMEM;
@@ -335,7 +338,9 @@ int nvm_register(struct request_queue *q, char *disk_name, · 1 unmodified line
335338 }
336339 }
337340
341+ /* register device with a supported media manager */
338342 down_write(&nvm_lock);
343+ dev->mt = nvm_init_mgr(dev);
339344 list_add(&dev->devices, &nvm_devices);
340345 up_write(&nvm_lock);
341346
@@ -380,19 +385,13 @@ static int nvm_create_target(struct nvm_dev *dev, · 38 unmodified lines
380385 struct nvm_tgt_type *tt;
381386 struct nvm_target *t;
382387 void *targetdata;
383− int ret = 0;
384388
385− down_write(&nvm_lock);
386389 if (!dev->mt) {
387− ret = register_mgr(dev);
388− if (!ret)
389− ret = -ENODEV;
390− if (ret < 0) {
391− up_write(&nvm_lock);
392− return ret;
393− }
390+ pr_info("nvm: device has no media manager registered.\n");
391+ return -ENODEV;
394392 }
395393
394+ down_write(&nvm_lock);
396395 tt = nvm_find_target_type(create->tgttype);
397396 if (!tt) {
398397 pr_err("nvm: target type %s not found\n", create->tgttype);
drivers/lightnvm/gennvm.c+11−9
@@ -195,7 +195,7 @@ static int gennvm_blocks_init(struct nvm_dev *dev, struct gen_nvm *gn) · 194 unmodified lines
195195 }
196196
197197 if (dev->ops->get_l2p_tbl) {
198− ret = dev->ops->get_l2p_tbl(dev->q, 0, dev->total_pages,
198+ ret = dev->ops->get_l2p_tbl(dev, 0, dev->total_pages,
199199 gennvm_block_map, dev);
200200 if (ret) {
201201 pr_err("gennvm: could not read L2P table.\n");
@@ -219,6 +219,9 @@ static int gennvm_register(struct nvm_dev *dev) · 17 unmodified lines
219219 struct gen_nvm *gn;
220220 int ret;
221221
222+ if (!try_module_get(THIS_MODULE))
223+ return -ENODEV;
224+
222225 gn = kzalloc(sizeof(struct gen_nvm), GFP_KERNEL);
223226 if (!gn)
224227 return -ENOMEM;
@@ -242,12 +245,14 @@ static int gennvm_register(struct nvm_dev *dev) · 17 unmodified lines
242245 return 1;
243246 err:
244247 gennvm_free(dev);
248+ module_put(THIS_MODULE);
245249 return ret;
246250 }
247251
248252 static void gennvm_unregister(struct nvm_dev *dev)
249253 {
250254 gennvm_free(dev);
255+ module_put(THIS_MODULE);
251256 }
252257
253258 static struct nvm_block *gennvm_get_blk(struct nvm_dev *dev,
@@ -262,14 +267,11 @@ static struct nvm_block *gennvm_get_blk(struct nvm_dev *dev, · 8 unmodified lines
262267 if (list_empty(&lun->free_list)) {
263268 pr_err_ratelimited("gennvm: lun %u have no free pages available",
264269 lun->vlun.id);
265− spin_unlock(&vlun->lock);
266270 goto out;
267271 }
268272
269− while (!is_gc && lun->vlun.nr_free_blocks < lun->reserved_blocks) {
270− spin_unlock(&vlun->lock);
273+ if (!is_gc && lun->vlun.nr_free_blocks < lun->reserved_blocks)
271274 goto out;
272− }
273275
274276 blk = list_first_entry(&lun->free_list, struct nvm_block, list);
275277 list_move_tail(&blk->list, &lun->used_list);
@@ -278,8 +280,8 @@ static struct nvm_block *gennvm_get_blk(struct nvm_dev *dev, · 2 unmodified lines
278280 lun->vlun.nr_free_blocks--;
279281 lun->vlun.nr_inuse_blocks++;
280282
281− spin_unlock(&vlun->lock);
282283 out:
284+ spin_unlock(&vlun->lock);
283285 return blk;
284286 }
285287
@@ -349,7 +351,7 @@ static int gennvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd) · 63 unmodified lines
349351 gennvm_generic_to_addr_mode(dev, rqd);
350352
351353 rqd->dev = dev;
352− return dev->ops->submit_io(dev->q, rqd);
354+ return dev->ops->submit_io(dev, rqd);
353355 }
354356
355357 static void gennvm_blk_set_type(struct nvm_dev *dev, struct ppa_addr *ppa,
@@ -385,7 +387,7 @@ static void gennvm_mark_blk_bad(struct nvm_dev *dev, struct nvm_rq *rqd) · 29 unmodified lines
385387 if (!dev->ops->set_bb_tbl)
386388 return;
387389
388− if (dev->ops->set_bb_tbl(dev->q, rqd, 1))
390+ if (dev->ops->set_bb_tbl(dev, rqd, 1))
389391 return;
390392
391393 gennvm_addr_to_generic_mode(dev, rqd);
@@ -453,7 +455,7 @@ static int gennvm_erase_blk(struct nvm_dev *dev, struct nvm_block *blk, · 61 unmodified lines
453455
454456 gennvm_generic_to_addr_mode(dev, &rqd);
455457
456− ret = dev->ops->erase_block(dev->q, &rqd);
458+ ret = dev->ops->erase_block(dev, &rqd);
457459
458460 if (plane_cnt)
459461 nvm_dev_dma_free(dev, rqd.ppa_list, rqd.dma_ppa_list);
drivers/lightnvm/rrpc.c+21−4
@@ -182,7 +182,7 @@ static struct rrpc_block *rrpc_get_blk(struct rrpc *rrpc, struct rrpc_lun *rlun, · 181 unmodified lines
182182 struct nvm_block *blk;
183183 struct rrpc_block *rblk;
184184
185− blk = nvm_get_blk(rrpc->dev, rlun->parent, 0);
185+ blk = nvm_get_blk(rrpc->dev, rlun->parent, flags);
186186 if (!blk)
187187 return NULL;
188188
@@ -202,6 +202,20 @@ static void rrpc_put_blk(struct rrpc *rrpc, struct rrpc_block *rblk) · 13 unmodified lines
202202 nvm_put_blk(rrpc->dev, rblk->parent);
203203 }
204204
205+static void rrpc_put_blks(struct rrpc *rrpc)
206+{
207+ struct rrpc_lun *rlun;
208+ int i;
209+
210+ for (i = 0; i < rrpc->nr_luns; i++) {
211+ rlun = &rrpc->luns[i];
212+ if (rlun->cur)
213+ rrpc_put_blk(rrpc, rlun->cur);
214+ if (rlun->gc_cur)
215+ rrpc_put_blk(rrpc, rlun->gc_cur);
216+ }
217+}
218+
205219 static struct rrpc_lun *get_next_lun(struct rrpc *rrpc)
206220 {
207221 int next = atomic_inc_return(&rrpc->next_lun);
@@ -1002,7 +1016,7 @@ static int rrpc_map_init(struct rrpc *rrpc) · 794 unmodified lines
10021016 return 0;
10031017
10041018 /* Bring up the mapping table from device */
1005− ret = dev->ops->get_l2p_tbl(dev->q, 0, dev->total_pages,
1019+ ret = dev->ops->get_l2p_tbl(dev, 0, dev->total_pages,
10061020 rrpc_l2p_update, rrpc);
10071021 if (ret) {
10081022 pr_err("nvm: rrpc: could not read L2P table.\n");
@@ -1224,18 +1238,21 @@ static int rrpc_luns_configure(struct rrpc *rrpc) · 215 unmodified lines
12241238
12251239 rblk = rrpc_get_blk(rrpc, rlun, 0);
12261240 if (!rblk)
1227− return -EINVAL;
1241+ goto err;
12281242
12291243 rrpc_set_lun_cur(rlun, rblk);
12301244
12311245 /* Emergency gc block */
12321246 rblk = rrpc_get_blk(rrpc, rlun, 1);
12331247 if (!rblk)
1234− return -EINVAL;
1248+ goto err;
12351249 rlun->gc_cur = rblk;
12361250 }
12371251
12381252 return 0;
1253+err:
1254+ rrpc_put_blks(rrpc);
1255+ return -EINVAL;
12391256 }
12401257
12411258 static struct nvm_tgt_type tt_rrpc;
drivers/md/dm-thin-metadata.c+29−5
@@ -1206,6 +1206,12 @@ static int __reserve_metadata_snap(struct dm_pool_metadata *pmd) · 1205 unmodified lines
12061206 struct dm_block *copy, *sblock;
12071207 dm_block_t held_root;
12081208
1209+ /*
1210+ * We commit to ensure the btree roots which we increment in a
1211+ * moment are up to date.
1212+ */
1213+ __commit_transaction(pmd);
1214+
12091215 /*
12101216 * Copy the superblock.
12111217 */
@@ -1538,7 +1544,7 @@ static int __remove(struct dm_thin_device *td, dm_block_t block) · 326 unmodified lines
15381544 static int __remove_range(struct dm_thin_device *td, dm_block_t begin, dm_block_t end)
15391545 {
15401546 int r;
1541− unsigned count;
1547+ unsigned count, total_count = 0;
15421548 struct dm_pool_metadata *pmd = td->pmd;
15431549 dm_block_t keys[1] = { td->id };
15441550 __le64 value;
@@ -1561,11 +1567,29 @@ static int __remove_range(struct dm_thin_device *td, dm_block_t begin, dm_block_ · 16 unmodified lines
15611567 if (r)
15621568 return r;
15631569
1564− r = dm_btree_remove_leaves(&pmd->bl_info, mapping_root, &begin, end, &mapping_root, &count);
1565− if (r)
1566− return r;
1570+ /*
1571+ * Remove leaves stops at the first unmapped entry, so we have to
1572+ * loop round finding mapped ranges.
1573+ */
1574+ while (begin < end) {
1575+ r = dm_btree_lookup_next(&pmd->bl_info, mapping_root, &begin, &begin, &value);
1576+ if (r == -ENODATA)
1577+ break;
1578+
1579+ if (r)
1580+ return r;
1581+
1582+ if (begin >= end)
1583+ break;
1584+
1585+ r = dm_btree_remove_leaves(&pmd->bl_info, mapping_root, &begin, end, &mapping_root, &count);
1586+ if (r)
1587+ return r;
1588+
1589+ total_count += count;
1590+ }
15671591
1568− td->mapped_blocks -= count;
1592+ td->mapped_blocks -= total_count;
15691593 td->changed = 1;
15701594
15711595 /*
drivers/md/md.c+15−7
@@ -314,8 +314,8 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio) · 313 unmodified lines
314314 */
315315 void mddev_suspend(struct mddev *mddev)
316316 {
317− BUG_ON(mddev->suspended);
318− mddev->suspended = 1;
317+ if (mddev->suspended++)
318+ return;
319319 synchronize_rcu();
320320 wait_event(mddev->sb_wait, atomic_read(&mddev->active_io) == 0);
321321 mddev->pers->quiesce(mddev, 1);
@@ -326,7 +326,8 @@ EXPORT_SYMBOL_GPL(mddev_suspend); · 4 unmodified lines
326326
327327 void mddev_resume(struct mddev *mddev)
328328 {
329− mddev->suspended = 0;
329+ if (--mddev->suspended)
330+ return;
330331 wake_up(&mddev->sb_wait);
331332 mddev->pers->quiesce(mddev, 0);
332333
@@ -1652,7 +1653,7 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev) · 1319 unmodified lines
16521653 rdev->journal_tail = le64_to_cpu(sb->journal_tail);
16531654 if (mddev->recovery_cp == MaxSector)
16541655 set_bit(MD_JOURNAL_CLEAN, &mddev->flags);
1655− rdev->raid_disk = mddev->raid_disks;
1656+ rdev->raid_disk = 0;
16561657 break;
16571658 default:
16581659 rdev->saved_raid_disk = role;
@@ -2773,6 +2774,7 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len) · 1114 unmodified lines
27732774 /* Activating a spare .. or possibly reactivating
27742775 * if we ever get bitmaps working here.
27752776 */
2777+ int err;
27762778
27772779 if (rdev->raid_disk != -1)
27782780 return -EBUSY;
@@ -2794,9 +2796,15 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len) · 15 unmodified lines
27942796 rdev->saved_raid_disk = -1;
27952797 clear_bit(In_sync, &rdev->flags);
27962798 clear_bit(Bitmap_sync, &rdev->flags);
2797− remove_and_add_spares(rdev->mddev, rdev);
2798− if (rdev->raid_disk == -1)
2799− return -EBUSY;
2799+ err = rdev->mddev->pers->
2800+ hot_add_disk(rdev->mddev, rdev);
2801+ if (err) {
2802+ rdev->raid_disk = -1;
2803+ return err;
2804+ } else
2805+ sysfs_notify_dirent_safe(rdev->sysfs_state);
2806+ if (sysfs_link_rdev(rdev->mddev, rdev))
2807+ /* failure here is OK */;
28002808 /* don't wakeup anyone, leave that to userspace. */
28012809 } else {
28022810 if (slot >= rdev->mddev->raid_disks &&
drivers/md/md.h+6−2
@@ -566,7 +566,9 @@ static inline char * mdname (struct mddev * mddev) · 565 unmodified lines
566566 static inline int sysfs_link_rdev(struct mddev *mddev, struct md_rdev *rdev)
567567 {
568568 char nm[20];
569− if (!test_bit(Replacement, &rdev->flags) && mddev->kobj.sd) {
569+ if (!test_bit(Replacement, &rdev->flags) &&
570+ !test_bit(Journal, &rdev->flags) &&
571+ mddev->kobj.sd) {
570572 sprintf(nm, "rd%d", rdev->raid_disk);
571573 return sysfs_create_link(&mddev->kobj, &rdev->kobj, nm);
572574 } else
@@ -576,7 +578,9 @@ static inline int sysfs_link_rdev(struct mddev *mddev, struct md_rdev *rdev) · 3 unmodified lines
576578 static inline void sysfs_unlink_rdev(struct mddev *mddev, struct md_rdev *rdev)
577579 {
578580 char nm[20];
579− if (!test_bit(Replacement, &rdev->flags) && mddev->kobj.sd) {
581+ if (!test_bit(Replacement, &rdev->flags) &&
582+ !test_bit(Journal, &rdev->flags) &&
583+ mddev->kobj.sd) {
580584 sprintf(nm, "rd%d", rdev->raid_disk);
581585 sysfs_remove_link(&mddev->kobj, nm);
582586 }
drivers/md/persistent-data/dm-btree.c+99−2
@@ -63,6 +63,11 @@ int lower_bound(struct btree_node *n, uint64_t key) · 62 unmodified lines
6363 return bsearch(n, key, 0);
6464 }
6565
66+static int upper_bound(struct btree_node *n, uint64_t key)
67+{
68+ return bsearch(n, key, 1);
69+}
70+
6671 void inc_children(struct dm_transaction_manager *tm, struct btree_node *n,
6772 struct dm_btree_value_type *vt)
6873 {
@@ -252,6 +257,16 @@ static void pop_frame(struct del_stack *s) · 183 unmodified lines
252257 dm_tm_unlock(s->tm, f->b);
253258 }
254259
260+static void unlock_all_frames(struct del_stack *s)
261+{
262+ struct frame *f;
263+
264+ while (unprocessed_frames(s)) {
265+ f = s->spine + s->top--;
266+ dm_tm_unlock(s->tm, f->b);
267+ }
268+}
269+
255270 int dm_btree_del(struct dm_btree_info *info, dm_block_t root)
256271 {
257272 int r;
@@ -308,9 +323,13 @@ int dm_btree_del(struct dm_btree_info *info, dm_block_t root) · 50 unmodified lines
308323 pop_frame(s);
309324 }
310325 }
311−
312326 out:
327+ if (r) {
328+ /* cleanup all frames of del_stack */
329+ unlock_all_frames(s);
330+ }
313331 kfree(s);
332+
314333 return r;
315334 }
316335 EXPORT_SYMBOL_GPL(dm_btree_del);
@@ -392,6 +411,82 @@ int dm_btree_lookup(struct dm_btree_info *info, dm_block_t root, · 75 unmodified lines
392411 }
393412 EXPORT_SYMBOL_GPL(dm_btree_lookup);
394413
414+static int dm_btree_lookup_next_single(struct dm_btree_info *info, dm_block_t root,
415+ uint64_t key, uint64_t *rkey, void *value_le)
416+{
417+ int r, i;
418+ uint32_t flags, nr_entries;
419+ struct dm_block *node;
420+ struct btree_node *n;
421+
422+ r = bn_read_lock(info, root, &node);
423+ if (r)
424+ return r;
425+
426+ n = dm_block_data(node);
427+ flags = le32_to_cpu(n->header.flags);
428+ nr_entries = le32_to_cpu(n->header.nr_entries);
429+
430+ if (flags & INTERNAL_NODE) {
431+ i = lower_bound(n, key);
432+ if (i < 0 || i >= nr_entries) {
433+ r = -ENODATA;
434+ goto out;
435+ }
436+
437+ r = dm_btree_lookup_next_single(info, value64(n, i), key, rkey, value_le);
438+ if (r == -ENODATA && i < (nr_entries - 1)) {
439+ i++;
440+ r = dm_btree_lookup_next_single(info, value64(n, i), key, rkey, value_le);
441+ }
442+
443+ } else {
444+ i = upper_bound(n, key);
445+ if (i < 0 || i >= nr_entries) {
446+ r = -ENODATA;
447+ goto out;
448+ }
449+
450+ *rkey = le64_to_cpu(n->keys[i]);
451+ memcpy(value_le, value_ptr(n, i), info->value_type.size);
452+ }
453+out:
454+ dm_tm_unlock(info->tm, node);
455+ return r;
456+}
457+
458+int dm_btree_lookup_next(struct dm_btree_info *info, dm_block_t root,
459+ uint64_t *keys, uint64_t *rkey, void *value_le)
460+{
461+ unsigned level;
462+ int r = -ENODATA;
463+ __le64 internal_value_le;
464+ struct ro_spine spine;
465+
466+ init_ro_spine(&spine, info);
467+ for (level = 0; level < info->levels - 1u; level++) {
468+ r = btree_lookup_raw(&spine, root, keys[level],
469+ lower_bound, rkey,
470+ &internal_value_le, sizeof(uint64_t));
471+ if (r)
472+ goto out;
473+
474+ if (*rkey != keys[level]) {
475+ r = -ENODATA;
476+ goto out;
477+ }
478+
479+ root = le64_to_cpu(internal_value_le);
480+ }
481+
482+ r = dm_btree_lookup_next_single(info, root, keys[level], rkey, value_le);
483+out:
484+ exit_ro_spine(&spine);
485+ return r;
486+}
487+
488+EXPORT_SYMBOL_GPL(dm_btree_lookup_next);
489+
395490 /*
396491 * Splits a node by creating a sibling node and shifting half the nodes
397492 * contents across. Assumes there is a parent node, and it has room for
@@ -473,8 +568,10 @@ static int btree_split_sibling(struct shadow_spine *s, unsigned parent_index, · 75 unmodified lines
473568
474569 r = insert_at(sizeof(__le64), pn, parent_index + 1,
475570 le64_to_cpu(rn->keys[0]), &location);
476− if (r)
571+ if (r) {
572+ unlock_block(s->info, right);
477573 return r;
574+ }
478575
479576 if (key < le64_to_cpu(rn->keys[0])) {
480577 unlock_block(s->info, right);
drivers/md/persistent-data/dm-btree.h+11−3
@@ -109,6 +109,13 @@ int dm_btree_del(struct dm_btree_info *info, dm_block_t root); · 108 unmodified lines
109109 int dm_btree_lookup(struct dm_btree_info *info, dm_block_t root,
110110 uint64_t *keys, void *value_le);
111111
112+/*
113+ * Tries to find the first key where the bottom level key is >= to that
114+ * given. Useful for skipping empty sections of the btree.
115+ */
116+int dm_btree_lookup_next(struct dm_btree_info *info, dm_block_t root,
117+ uint64_t *keys, uint64_t *rkey, void *value_le);
118+
112119 /*
113120 * Insertion (or overwrite an existing value). O(ln(n))
114121 */
@@ -135,9 +142,10 @@ int dm_btree_remove(struct dm_btree_info *info, dm_block_t root, · 20 unmodified lines
135142 uint64_t *keys, dm_block_t *new_root);
136143
137144 /*
138− * Removes values between 'keys' and keys2, where keys2 is keys with the
139− * final key replaced with 'end_key'. 'end_key' is the one-past-the-end
140− * value. 'keys' may be altered.
145+ * Removes a _contiguous_ run of values starting from 'keys' and not
146+ * reaching keys2 (where keys2 is keys with the final key replaced with
147+ * 'end_key'). 'end_key' is the one-past-the-end value. 'keys' may be
148+ * altered.
141149 */
142150 int dm_btree_remove_leaves(struct dm_btree_info *info, dm_block_t root,
143151 uint64_t *keys, uint64_t end_key,
drivers/md/persistent-data/dm-space-map-metadata.c+22−10
@@ -136,7 +136,7 @@ static int brb_push(struct bop_ring_buffer *brb, · 135 unmodified lines
136136 return 0;
137137 }
138138
139−static int brb_pop(struct bop_ring_buffer *brb, struct block_op *result)
139+static int brb_peek(struct bop_ring_buffer *brb, struct block_op *result)
140140 {
141141 struct block_op *bop;
142142
@@ -147,6 +147,17 @@ static int brb_pop(struct bop_ring_buffer *brb, struct block_op *result) · 4 unmodified lines
147147 result->type = bop->type;
148148 result->block = bop->block;
149149
150+ return 0;
151+}
152+
153+static int brb_pop(struct bop_ring_buffer *brb)
154+{
155+ struct block_op *bop;
156+
157+ if (brb_empty(brb))
158+ return -ENODATA;
159+
160+ bop = brb->bops + brb->begin;
150161 brb->begin = brb_next(brb, brb->begin);
151162
152163 return 0;
@@ -211,7 +222,7 @@ static int apply_bops(struct sm_metadata *smm) · 58 unmodified lines
211222 while (!brb_empty(&smm->uncommitted)) {
212223 struct block_op bop;
213224
214− r = brb_pop(&smm->uncommitted, &bop);
225+ r = brb_peek(&smm->uncommitted, &bop);
215226 if (r) {
216227 DMERR("bug in bop ring buffer");
217228 break;
@@ -220,6 +231,8 @@ static int apply_bops(struct sm_metadata *smm) · 2 unmodified lines
220231 r = commit_bop(smm, &bop);
221232 if (r)
222233 break;
234+
235+ brb_pop(&smm->uncommitted);
223236 }
224237
225238 return r;
@@ -683,7 +696,6 @@ static struct dm_space_map bootstrap_ops = { · 457 unmodified lines
683696 static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
684697 {
685698 int r, i;
686− enum allocation_event ev;
687699 struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
688700 dm_block_t old_len = smm->ll.nr_blocks;
689701
@@ -705,11 +717,12 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks) · 15 unmodified lines
705717 * allocate any new blocks.
706718 */
707719 do {
708− for (i = old_len; !r && i < smm->begin; i++) {
709− r = sm_ll_inc(&smm->ll, i, &ev);
710− if (r)
711− goto out;
712− }
720+ for (i = old_len; !r && i < smm->begin; i++)
721+ r = add_bop(smm, BOP_INC, i);
722+
723+ if (r)
724+ goto out;
725+
713726 old_len = smm->begin;
714727
715728 r = apply_bops(smm);
@@ -754,7 +767,6 @@ int dm_sm_metadata_create(struct dm_space_map *sm, · 38 unmodified lines
754767 {
755768 int r;
756769 dm_block_t i;
757− enum allocation_event ev;
758770 struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
759771
760772 smm->begin = superblock + 1;
@@ -782,7 +794,7 @@ int dm_sm_metadata_create(struct dm_space_map *sm, · 21 unmodified lines
782794 * allocated blocks that they were built from.
783795 */
784796 for (i = superblock; !r && i < smm->begin; i++)
785− r = sm_ll_inc(&smm->ll, i, &ev);
797+ r = add_bop(smm, BOP_INC, i);
786798
787799 if (r)
788800 return r;
drivers/md/raid10.c+3−1
@@ -1946,6 +1946,8 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio) · 1945 unmodified lines
19461946
19471947 first = i;
19481948 fbio = r10_bio->devs[i].bio;
1949+ fbio->bi_iter.bi_size = r10_bio->sectors << 9;
1950+ fbio->bi_iter.bi_idx = 0;
19491951
19501952 vcnt = (r10_bio->sectors + (PAGE_SIZE >> 9) - 1) >> (PAGE_SHIFT - 9);
19511953 /* now find blocks with errors */
@@ -1989,7 +1991,7 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio) · 37 unmodified lines
19891991 bio_reset(tbio);
19901992
19911993 tbio->bi_vcnt = vcnt;
1992− tbio->bi_iter.bi_size = r10_bio->sectors << 9;
1994+ tbio->bi_iter.bi_size = fbio->bi_iter.bi_size;
19931995 tbio->bi_rw = WRITE;
19941996 tbio->bi_private = r10_bio;
19951997 tbio->bi_iter.bi_sector = r10_bio->devs[i].addr;
drivers/media/pci/ivtv/ivtv-driver.c+2−2
@@ -805,11 +805,11 @@ static void ivtv_init_struct2(struct ivtv *itv) · 804 unmodified lines
805805 {
806806 int i;
807807
808− for (i = 0; i < IVTV_CARD_MAX_VIDEO_INPUTS - 1; i++)
808+ for (i = 0; i < IVTV_CARD_MAX_VIDEO_INPUTS; i++)
809809 if (itv->card->video_inputs[i].video_type == 0)
810810 break;
811811 itv->nof_inputs = i;
812− for (i = 0; i < IVTV_CARD_MAX_AUDIO_INPUTS - 1; i++)
812+ for (i = 0; i < IVTV_CARD_MAX_AUDIO_INPUTS; i++)
813813 if (itv->card->audio_inputs[i].audio_type == 0)
814814 break;
815815 itv->nof_audio_inputs = i;
drivers/media/usb/airspy/airspy.c+1−1
@@ -134,7 +134,7 @@ struct airspy { · 133 unmodified lines
134134 int urbs_submitted;
135135
136136 /* USB control message buffer */
137− #define BUF_SIZE 24
137+ #define BUF_SIZE 128
138138 u8 buf[BUF_SIZE];
139139
140140 /* Current configuration */
drivers/media/usb/hackrf/hackrf.c+12−1
@@ -24,6 +24,15 @@ · 23 unmodified lines
2424 #include <media/videobuf2-v4l2.h>
2525 #include <media/videobuf2-vmalloc.h>
2626
27+/*
28+ * Used Avago MGA-81563 RF amplifier could be destroyed pretty easily with too
29+ * strong signal or transmitting to bad antenna.
30+ * Set RF gain control to 'grabbed' state by default for sure.
31+ */
32+static bool hackrf_enable_rf_gain_ctrl;
33+module_param_named(enable_rf_gain_ctrl, hackrf_enable_rf_gain_ctrl, bool, 0644);
34+MODULE_PARM_DESC(enable_rf_gain_ctrl, "enable RX/TX RF amplifier control (warn: could damage amplifier)");
35+
2736 /* HackRF USB API commands (from HackRF Library) */
2837 enum {
2938 CMD_SET_TRANSCEIVER_MODE = 0x01,
@@ -1451,6 +1460,7 @@ static int hackrf_probe(struct usb_interface *intf, · 1421 unmodified lines
14511460 dev_err(dev->dev, "Could not initialize controls\n");
14521461 goto err_v4l2_ctrl_handler_free_rx;
14531462 }
1463+ v4l2_ctrl_grab(dev->rx_rf_gain, !hackrf_enable_rf_gain_ctrl);
14541464 v4l2_ctrl_handler_setup(&dev->rx_ctrl_handler);
14551465
14561466 /* Register controls for transmitter */
@@ -1471,6 +1481,7 @@ static int hackrf_probe(struct usb_interface *intf, · 14 unmodified lines
14711481 dev_err(dev->dev, "Could not initialize controls\n");
14721482 goto err_v4l2_ctrl_handler_free_tx;
14731483 }
1484+ v4l2_ctrl_grab(dev->tx_rf_gain, !hackrf_enable_rf_gain_ctrl);
14741485 v4l2_ctrl_handler_setup(&dev->tx_ctrl_handler);
14751486
14761487 /* Register the v4l2_device structure */
@@ -1530,7 +1541,7 @@ err_v4l2_ctrl_handler_free_rx: · 53 unmodified lines
15301541 err_kfree:
15311542 kfree(dev);
15321543 err:
1533− dev_dbg(dev->dev, "failed=%d\n", ret);
1544+ dev_dbg(&intf->dev, "failed=%d\n", ret);
15341545 return ret;
15351546 }
15361547
drivers/misc/cxl/native.c+1−1
@@ -497,6 +497,7 @@ static u64 calculate_sr(struct cxl_context *ctx) · 496 unmodified lines
497497 {
498498 u64 sr = 0;
499499
500+ set_endian(sr);
500501 if (ctx->master)
501502 sr |= CXL_PSL_SR_An_MP;
502503 if (mfspr(SPRN_LPCR) & LPCR_TC)
@@ -506,7 +507,6 @@ static u64 calculate_sr(struct cxl_context *ctx) · 3 unmodified lines
506507 sr |= CXL_PSL_SR_An_HV;
507508 } else {
508509 sr |= CXL_PSL_SR_An_PR | CXL_PSL_SR_An_R;
509− set_endian(sr);
510510 sr &= ~(CXL_PSL_SR_An_HV);
511511 if (!test_tsk_thread_flag(current, TIF_32BIT))
512512 sr |= CXL_PSL_SR_An_SF;
drivers/mtd/ofpart.c+10−2
@@ -46,10 +46,18 @@ static int parse_ofpart_partitions(struct mtd_info *master, · 45 unmodified lines
4646
4747 ofpart_node = of_get_child_by_name(mtd_node, "partitions");
4848 if (!ofpart_node) {
49− pr_warn("%s: 'partitions' subnode not found on %s. Trying to parse direct subnodes as partitions.\n",
50− master->name, mtd_node->full_name);
49+ /*
50+ * We might get here even when ofpart isn't used at all (e.g.,
51+ * when using another parser), so don't be louder than
52+ * KERN_DEBUG
53+ */
54+ pr_debug("%s: 'partitions' subnode not found on %s. Trying to parse direct subnodes as partitions.\n",
55+ master->name, mtd_node->full_name);
5156 ofpart_node = mtd_node;
5257 dedicated = false;
58+ } else if (!of_device_is_compatible(ofpart_node, "fixed-partitions")) {
59+ /* The 'partitions' subnode might be used by another parser */
60+ return 0;
5361 }
5462
5563 /* First count the subnodes */
drivers/net/ethernet/amd/xgbe/xgbe-dev.c+2−2
@@ -1849,7 +1849,7 @@ static int xgbe_exit(struct xgbe_prv_data *pdata) · 1848 unmodified lines
18491849 usleep_range(10, 15);
18501850
18511851 /* Poll Until Poll Condition */
1852− while (count-- && XGMAC_IOREAD_BITS(pdata, DMA_MR, SWR))
1852+ while (--count && XGMAC_IOREAD_BITS(pdata, DMA_MR, SWR))
18531853 usleep_range(500, 600);
18541854
18551855 if (!count)
@@ -1873,7 +1873,7 @@ static int xgbe_flush_tx_queues(struct xgbe_prv_data *pdata) · 17 unmodified lines
18731873 /* Poll Until Poll Condition */
18741874 for (i = 0; i < pdata->tx_q_count; i++) {
18751875 count = 2000;
1876− while (count-- && XGMAC_MTL_IOREAD_BITS(pdata, i,
1876+ while (--count && XGMAC_MTL_IOREAD_BITS(pdata, i,
18771877 MTL_Q_TQOMR, FTQ))
18781878 usleep_range(500, 600);
18791879
drivers/net/ethernet/apm/xgene/xgene_enet_main.c+22−16
@@ -289,6 +289,7 @@ static int xgene_enet_setup_tx_desc(struct xgene_enet_desc_ring *tx_ring, · 288 unmodified lines
289289 struct sk_buff *skb)
290290 {
291291 struct device *dev = ndev_to_dev(tx_ring->ndev);
292+ struct xgene_enet_pdata *pdata = netdev_priv(tx_ring->ndev);
292293 struct xgene_enet_raw_desc *raw_desc;
293294 __le64 *exp_desc = NULL, *exp_bufs = NULL;
294295 dma_addr_t dma_addr, pbuf_addr, *frag_dma_addr;
@@ -419,6 +420,7 @@ out: · 124 unmodified lines
419420 raw_desc->m0 = cpu_to_le64(SET_VAL(LL, ll) | SET_VAL(NV, nv) |
420421 SET_VAL(USERINFO, tx_ring->tail));
421422 tx_ring->cp_ring->cp_skb[tx_ring->tail] = skb;
423+ pdata->tx_level += count;
422424 tx_ring->tail = tail;
423425
424426 return count;
@@ -429,14 +431,13 @@ static netdev_tx_t xgene_enet_start_xmit(struct sk_buff *skb, · 4 unmodified lines
429431 {
430432 struct xgene_enet_pdata *pdata = netdev_priv(ndev);
431433 struct xgene_enet_desc_ring *tx_ring = pdata->tx_ring;
432− struct xgene_enet_desc_ring *cp_ring = tx_ring->cp_ring;
433− u32 tx_level, cq_level;
434+ u32 tx_level = pdata->tx_level;
434435 int count;
435436
436− tx_level = pdata->ring_ops->len(tx_ring);
437− cq_level = pdata->ring_ops->len(cp_ring);
438− if (unlikely(tx_level > pdata->tx_qcnt_hi ||
439− cq_level > pdata->cp_qcnt_hi)) {
437+ if (tx_level < pdata->txc_level)
438+ tx_level += ((typeof(pdata->tx_level))~0U);
439+
440+ if ((tx_level - pdata->txc_level) > pdata->tx_qcnt_hi) {
440441 netif_stop_queue(ndev);
441442 return NETDEV_TX_BUSY;
442443 }
@@ -539,10 +540,13 @@ static int xgene_enet_process_ring(struct xgene_enet_desc_ring *ring, · 96 unmodified lines
539540 struct xgene_enet_raw_desc *raw_desc, *exp_desc;
540541 u16 head = ring->head;
541542 u16 slots = ring->slots - 1;
542− int ret, count = 0, processed = 0;
543+ int ret, desc_count, count = 0, processed = 0;
544+ bool is_completion;
543545
544546 do {
545547 raw_desc = &ring->raw_desc[head];
548+ desc_count = 0;
549+ is_completion = false;
546550 exp_desc = NULL;
547551 if (unlikely(xgene_enet_is_desc_slot_empty(raw_desc)))
548552 break;
@@ -559,18 +563,24 @@ static int xgene_enet_process_ring(struct xgene_enet_desc_ring *ring, · 10 unmodified lines
559563 }
560564 dma_rmb();
561565 count++;
566+ desc_count++;
562567 }
563− if (is_rx_desc(raw_desc))
568+ if (is_rx_desc(raw_desc)) {
564569 ret = xgene_enet_rx_frame(ring, raw_desc);
565− else
570+ } else {
566571 ret = xgene_enet_tx_completion(ring, raw_desc);
572+ is_completion = true;
573+ }
567574 xgene_enet_mark_desc_slot_empty(raw_desc);
568575 if (exp_desc)
569576 xgene_enet_mark_desc_slot_empty(exp_desc);
570577
571578 head = (head + 1) & slots;
572579 count++;
580+ desc_count++;
573581 processed++;
582+ if (is_completion)
583+ pdata->txc_level += desc_count;
574584
575585 if (ret)
576586 break;
@@ -580,10 +590,8 @@ static int xgene_enet_process_ring(struct xgene_enet_desc_ring *ring, · 3 unmodified lines
580590 pdata->ring_ops->wr_cmd(ring, -count);
581591 ring->head = head;
582592
583− if (netif_queue_stopped(ring->ndev)) {
584− if (pdata->ring_ops->len(ring) < pdata->cp_qcnt_low)
585− netif_wake_queue(ring->ndev);
586− }
593+ if (netif_queue_stopped(ring->ndev))
594+ netif_start_queue(ring->ndev);
587595 }
588596
589597 return processed;
@@ -1033,9 +1041,7 @@ static int xgene_enet_create_desc_rings(struct net_device *ndev) · 443 unmodified lines
10331041 pdata->tx_ring->cp_ring = cp_ring;
10341042 pdata->tx_ring->dst_ring_num = xgene_enet_dst_ring_num(cp_ring);
10351043
1036− pdata->tx_qcnt_hi = pdata->tx_ring->slots / 2;
1037− pdata->cp_qcnt_hi = pdata->rx_ring->slots / 2;
1038− pdata->cp_qcnt_low = pdata->cp_qcnt_hi / 2;
1044+ pdata->tx_qcnt_hi = pdata->tx_ring->slots - 128;
10391045
10401046 return 0;
10411047
drivers/net/ethernet/apm/xgene/xgene_enet_main.h+2−2
@@ -155,11 +155,11 @@ struct xgene_enet_pdata { · 154 unmodified lines
155155 enum xgene_enet_id enet_id;
156156 struct xgene_enet_desc_ring *tx_ring;
157157 struct xgene_enet_desc_ring *rx_ring;
158+ u16 tx_level;
159+ u16 txc_level;
158160 char *dev_name;
159161 u32 rx_buff_cnt;
160162 u32 tx_qcnt_hi;
161− u32 cp_qcnt_hi;
162− u32 cp_qcnt_low;
163163 u32 rx_irq;
164164 u32 txc_irq;
165165 u8 cq_cnt;
drivers/net/ethernet/atheros/atl1c/atl1c_main.c+3−4
@@ -1016,13 +1016,12 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter) · 1015 unmodified lines
10161016 sizeof(struct atl1c_recv_ret_status) * rx_desc_count +
10171017 8 * 4;
10181018
1019− ring_header->desc = pci_alloc_consistent(pdev, ring_header->size,
1020− &ring_header->dma);
1019+ ring_header->desc = dma_zalloc_coherent(&pdev->dev, ring_header->size,
1020+ &ring_header->dma, GFP_KERNEL);
10211021 if (unlikely(!ring_header->desc)) {
1022− dev_err(&pdev->dev, "pci_alloc_consistend failed\n");
1022+ dev_err(&pdev->dev, "could not get memory for DMA buffer\n");
10231023 goto err_nomem;
10241024 }
1025− memset(ring_header->desc, 0, ring_header->size);
10261025 /* init TPD ring */
10271026
10281027 tpd_ring[0].dma = roundup(ring_header->dma, 8);
drivers/net/ethernet/aurora/Kconfig+1−0
@@ -13,6 +13,7 @@ if NET_VENDOR_AURORA · 12 unmodified lines
1313
1414 config AURORA_NB8800
1515 tristate "Aurora AU-NB8800 support"
16+ depends on HAS_DMA
1617 select PHYLIB
1718 help
1819 Support for the AU-NB8800 gigabit Ethernet controller.
drivers/net/ethernet/broadcom/bnxt/bnxt.c+32−14
@@ -2693,17 +2693,16 @@ static int bnxt_hwrm_func_drv_rgtr(struct bnxt *bp) · 2692 unmodified lines
26932693 req.ver_upd = DRV_VER_UPD;
26942694
26952695 if (BNXT_PF(bp)) {
2696− unsigned long vf_req_snif_bmap[4];
2696+ DECLARE_BITMAP(vf_req_snif_bmap, 256);
26972697 u32 *data = (u32 *)vf_req_snif_bmap;
26982698
2699− memset(vf_req_snif_bmap, 0, 32);
2699+ memset(vf_req_snif_bmap, 0, sizeof(vf_req_snif_bmap));
27002700 for (i = 0; i < ARRAY_SIZE(bnxt_vf_req_snif); i++)
27012701 __set_bit(bnxt_vf_req_snif[i], vf_req_snif_bmap);
27022702
2703− for (i = 0; i < 8; i++) {
2704− req.vf_req_fwd[i] = cpu_to_le32(*data);
2705− data++;
2706− }
2703+ for (i = 0; i < 8; i++)
2704+ req.vf_req_fwd[i] = cpu_to_le32(data[i]);
2705+
27072706 req.enables |=
27082707 cpu_to_le32(FUNC_DRV_RGTR_REQ_ENABLES_VF_REQ_FWD);
27092708 }
@@ -4603,7 +4602,7 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) · 1893 unmodified lines
46034602 bp->nge_port_cnt = 1;
46044603 }
46054604
4606− bp->state = BNXT_STATE_OPEN;
4605+ set_bit(BNXT_STATE_OPEN, &bp->state);
46074606 bnxt_enable_int(bp);
46084607 /* Enable TX queues */
46094608 bnxt_tx_enable(bp);
@@ -4679,8 +4678,10 @@ int bnxt_close_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) · 69 unmodified lines
46794678 /* Change device state to avoid TX queue wake up's */
46804679 bnxt_tx_disable(bp);
46814680
4682− bp->state = BNXT_STATE_CLOSED;
4683− cancel_work_sync(&bp->sp_task);
4681+ clear_bit(BNXT_STATE_OPEN, &bp->state);
4682+ smp_mb__after_atomic();
4683+ while (test_bit(BNXT_STATE_IN_SP_TASK, &bp->state))
4684+ msleep(20);
46844685
46854686 /* Flush rings before disabling interrupts */
46864687 bnxt_shutdown_nic(bp, irq_re_init);
@@ -5030,8 +5031,10 @@ static void bnxt_dbg_dump_states(struct bnxt *bp) · 343 unmodified lines
50305031 static void bnxt_reset_task(struct bnxt *bp)
50315032 {
50325033 bnxt_dbg_dump_states(bp);
5033− if (netif_running(bp->dev))
5034− bnxt_tx_disable(bp); /* prevent tx timout again */
5034+ if (netif_running(bp->dev)) {
5035+ bnxt_close_nic(bp, false, false);
5036+ bnxt_open_nic(bp, false, false);
5037+ }
50355038 }
50365039
50375040 static void bnxt_tx_timeout(struct net_device *dev)
@@ -5081,8 +5084,12 @@ static void bnxt_sp_task(struct work_struct *work) · 43 unmodified lines
50815084 struct bnxt *bp = container_of(work, struct bnxt, sp_task);
50825085 int rc;
50835086
5084− if (bp->state != BNXT_STATE_OPEN)
5087+ set_bit(BNXT_STATE_IN_SP_TASK, &bp->state);
5088+ smp_mb__after_atomic();
5089+ if (!test_bit(BNXT_STATE_OPEN, &bp->state)) {
5090+ clear_bit(BNXT_STATE_IN_SP_TASK, &bp->state);
50855091 return;
5092+ }
50865093
50875094 if (test_and_clear_bit(BNXT_RX_MASK_SP_EVENT, &bp->sp_event))
50885095 bnxt_cfg_rx_mode(bp);
@@ -5106,8 +5113,19 @@ static void bnxt_sp_task(struct work_struct *work) · 17 unmodified lines
51065113 bnxt_hwrm_tunnel_dst_port_free(
51075114 bp, TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN);
51085115 }
5109− if (test_and_clear_bit(BNXT_RESET_TASK_SP_EVENT, &bp->sp_event))
5116+ if (test_and_clear_bit(BNXT_RESET_TASK_SP_EVENT, &bp->sp_event)) {
5117+ /* bnxt_reset_task() calls bnxt_close_nic() which waits
5118+ * for BNXT_STATE_IN_SP_TASK to clear.
5119+ */
5120+ clear_bit(BNXT_STATE_IN_SP_TASK, &bp->state);
5121+ rtnl_lock();
51105122 bnxt_reset_task(bp);
5123+ set_bit(BNXT_STATE_IN_SP_TASK, &bp->state);
5124+ rtnl_unlock();
5125+ }
5126+
5127+ smp_mb__before_atomic();
5128+ clear_bit(BNXT_STATE_IN_SP_TASK, &bp->state);
51115129 }
51125130
51135131 static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)
@@ -5186,7 +5204,7 @@ static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev) · 72 unmodified lines
51865204 bp->timer.function = bnxt_timer;
51875205 bp->current_interval = BNXT_TIMER_INTERVAL;
51885206
5189− bp->state = BNXT_STATE_CLOSED;
5207+ clear_bit(BNXT_STATE_OPEN, &bp->state);
51905208
51915209 return 0;
51925210
drivers/net/ethernet/broadcom/bnxt/bnxt.h+3−3
@@ -925,9 +925,9 @@ struct bnxt { · 924 unmodified lines
925925
926926 struct timer_list timer;
927927
928− int state;
929−#define BNXT_STATE_CLOSED 0
930−#define BNXT_STATE_OPEN 1
928+ unsigned long state;
929+#define BNXT_STATE_OPEN 0
930+#define BNXT_STATE_IN_SP_TASK 1
931931
932932 struct bnxt_irq *irq_tbl;
933933 u8 mac_addr[ETH_ALEN];
drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121 #ifdef CONFIG_BNXT_SRIOV
2222 static int bnxt_vf_ndo_prep(struct bnxt *bp, int vf_id)
2323 {
24− if (bp->state != BNXT_STATE_OPEN) {
24+ if (!test_bit(BNXT_STATE_OPEN, &bp->state)) {
2525 netdev_err(bp->dev, "vf ndo called though PF is down\n");
2626 return -EINVAL;
2727 }
drivers/net/ethernet/cavium/thunder/nic_main.c+18−21
@@ -37,7 +37,6 @@ struct nicpf { · 36 unmodified lines
3737 #define NIC_GET_BGX_FROM_VF_LMAC_MAP(map) ((map >> 4) & 0xF)
3838 #define NIC_GET_LMAC_FROM_VF_LMAC_MAP(map) (map & 0xF)
3939 u8 vf_lmac_map[MAX_LMAC];
40− u8 lmac_cnt;
4140 struct delayed_work dwork;
4241 struct workqueue_struct *check_link;
4342 u8 link[MAX_LMAC];
@@ -280,7 +279,6 @@ static void nic_set_lmac_vf_mapping(struct nicpf *nic) · 236 unmodified lines
280279 u64 lmac_credit;
281280
282281 nic->num_vf_en = 0;
283− nic->lmac_cnt = 0;
284282
285283 for (bgx = 0; bgx < NIC_MAX_BGX; bgx++) {
286284 if (!(bgx_map & (1 << bgx)))
@@ -290,7 +288,6 @@ static void nic_set_lmac_vf_mapping(struct nicpf *nic) · 3 unmodified lines
290288 nic->vf_lmac_map[next_bgx_lmac++] =
291289 NIC_SET_VF_LMAC_MAP(bgx, lmac);
292290 nic->num_vf_en += lmac_cnt;
293− nic->lmac_cnt += lmac_cnt;
294291
295292 /* Program LMAC credits */
296293 lmac_credit = (1ull << 1); /* channel credit enable */
@@ -618,6 +615,21 @@ static int nic_config_loopback(struct nicpf *nic, struct set_loopback *lbk) · 321 unmodified lines
618615 return 0;
619616 }
620617
618+static void nic_enable_vf(struct nicpf *nic, int vf, bool enable)
619+{
620+ int bgx, lmac;
621+
622+ nic->vf_enabled[vf] = enable;
623+
624+ if (vf >= nic->num_vf_en)
625+ return;
626+
627+ bgx = NIC_GET_BGX_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]);
628+ lmac = NIC_GET_LMAC_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]);
629+
630+ bgx_lmac_rx_tx_enable(nic->node, bgx, lmac, enable);
631+}
632+
621633 /* Interrupt handler to handle mailbox messages from VFs */
622634 static void nic_handle_mbx_intr(struct nicpf *nic, int vf)
623635 {
@@ -717,29 +729,14 @@ static void nic_handle_mbx_intr(struct nicpf *nic, int vf) · 93 unmodified lines
717729 break;
718730 case NIC_MBOX_MSG_CFG_DONE:
719731 /* Last message of VF config msg sequence */
720− nic->vf_enabled[vf] = true;
721− if (vf >= nic->lmac_cnt)
722− goto unlock;
723−
724− bgx = NIC_GET_BGX_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]);
725− lmac = NIC_GET_LMAC_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]);
726−
727− bgx_lmac_rx_tx_enable(nic->node, bgx, lmac, true);
732+ nic_enable_vf(nic, vf, true);
728733 goto unlock;
729734 case NIC_MBOX_MSG_SHUTDOWN:
730735 /* First msg in VF teardown sequence */
731− nic->vf_enabled[vf] = false;
732736 if (vf >= nic->num_vf_en)
733737 nic->sqs_used[vf - nic->num_vf_en] = false;
734738 nic->pqs_vf[vf] = 0;
735−
736− if (vf >= nic->lmac_cnt)
737− break;
738−
739− bgx = NIC_GET_BGX_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]);
740− lmac = NIC_GET_LMAC_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]);
741−
742− bgx_lmac_rx_tx_enable(nic->node, bgx, lmac, false);
739+ nic_enable_vf(nic, vf, false);
743740 break;
744741 case NIC_MBOX_MSG_ALLOC_SQS:
745742 nic_alloc_sqs(nic, &mbx.sqs_alloc);
@@ -958,7 +955,7 @@ static void nic_poll_for_link(struct work_struct *work) · 212 unmodified lines
958955
959956 mbx.link_status.msg = NIC_MBOX_MSG_BGX_LINK_CHANGE;
960957
961− for (vf = 0; vf < nic->lmac_cnt; vf++) {
958+ for (vf = 0; vf < nic->num_vf_en; vf++) {
962959 /* Poll only if VF is UP */
963960 if (!nic->vf_enabled[vf])
964961 continue;
drivers/net/ethernet/ezchip/nps_enet.c+9−21
@@ -48,21 +48,15 @@ static void nps_enet_read_rx_fifo(struct net_device *ndev, · 47 unmodified lines
4848 *reg = nps_enet_reg_get(priv, NPS_ENET_REG_RX_BUF);
4949 else { /* !dst_is_aligned */
5050 for (i = 0; i < len; i++, reg++) {
51− u32 buf =
52− nps_enet_reg_get(priv, NPS_ENET_REG_RX_BUF);
53−
54− /* to accommodate word-unaligned address of "reg"
55− * we have to do memcpy_toio() instead of simple "=".
56− */
57− memcpy_toio((void __iomem *)reg, &buf, sizeof(buf));
51+ u32 buf = nps_enet_reg_get(priv, NPS_ENET_REG_RX_BUF);
52+ put_unaligned(buf, reg);
5853 }
5954 }
6055
6156 /* copy last bytes (if any) */
6257 if (last) {
6358 u32 buf = nps_enet_reg_get(priv, NPS_ENET_REG_RX_BUF);
64−
65− memcpy_toio((void __iomem *)reg, &buf, last);
59+ memcpy((u8*)reg, &buf, last);
6660 }
6761 }
6862
@@ -367,7 +361,7 @@ static void nps_enet_send_frame(struct net_device *ndev, · 298 unmodified lines
367361 struct nps_enet_tx_ctl tx_ctrl;
368362 short length = skb->len;
369363 u32 i, len = DIV_ROUND_UP(length, sizeof(u32));
370− u32 *src = (u32 *)virt_to_phys(skb->data);
364+ u32 *src = (void *)skb->data;
371365 bool src_is_aligned = IS_ALIGNED((unsigned long)src, sizeof(u32));
372366
373367 tx_ctrl.value = 0;
@@ -375,17 +369,11 @@ static void nps_enet_send_frame(struct net_device *ndev, · 1 unmodified line
375369 if (src_is_aligned)
376370 for (i = 0; i < len; i++, src++)
377371 nps_enet_reg_set(priv, NPS_ENET_REG_TX_BUF, *src);
378− else { /* !src_is_aligned */
379− for (i = 0; i < len; i++, src++) {
380− u32 buf;
381−
382− /* to accommodate word-unaligned address of "src"
383− * we have to do memcpy_fromio() instead of simple "="
384− */
385− memcpy_fromio(&buf, (void __iomem *)src, sizeof(buf));
386− nps_enet_reg_set(priv, NPS_ENET_REG_TX_BUF, buf);
387− }
388− }
372+ else /* !src_is_aligned */
373+ for (i = 0; i < len; i++, src++)
374+ nps_enet_reg_set(priv, NPS_ENET_REG_TX_BUF,
375+ get_unaligned(src));
376+
389377 /* Write the length of the Frame */
390378 tx_ctrl.nt = length;
391379
drivers/net/ethernet/freescale/fs_enet/mac-fcc.c+1−1
@@ -552,7 +552,7 @@ static void tx_restart(struct net_device *dev) · 551 unmodified lines
552552 cbd_t __iomem *prev_bd;
553553 cbd_t __iomem *last_tx_bd;
554554
555− last_tx_bd = fep->tx_bd_base + (fpi->tx_ring * sizeof(cbd_t));
555+ last_tx_bd = fep->tx_bd_base + ((fpi->tx_ring - 1) * sizeof(cbd_t));
556556
557557 /* get the current bd held in TBPTR and scan back from this point */
558558 recheck_bd = curr_tbptr = (cbd_t __iomem *)
drivers/net/ethernet/freescale/fsl_pq_mdio.c+1−1
@@ -464,7 +464,7 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev) · 463 unmodified lines
464464 * address). Print error message but continue anyway.
465465 */
466466 if ((void *)tbipa > priv->map + resource_size(&res) - 4)
467− dev_err(&pdev->dev, "invalid register map (should be at least 0x%04x to contain TBI address)\n",
467+ dev_err(&pdev->dev, "invalid register map (should be at least 0x%04zx to contain TBI address)\n",
468468 ((void *)tbipa - priv->map) + 4);
469469
470470 iowrite32be(be32_to_cpup(prop), tbipa);
drivers/net/ethernet/freescale/gianfar.c+5−3
@@ -894,7 +894,8 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev) · 893 unmodified lines
894894 FSL_GIANFAR_DEV_HAS_VLAN |
895895 FSL_GIANFAR_DEV_HAS_MAGIC_PACKET |
896896 FSL_GIANFAR_DEV_HAS_EXTENDED_HASH |
897− FSL_GIANFAR_DEV_HAS_TIMER;
897+ FSL_GIANFAR_DEV_HAS_TIMER |
898+ FSL_GIANFAR_DEV_HAS_RX_FILER;
898899
899900 err = of_property_read_string(np, "phy-connection-type", &ctype);
900901
@@ -1396,8 +1397,9 @@ static int gfar_probe(struct platform_device *ofdev) · 495 unmodified lines
13961397 priv->rx_queue[i]->rxic = DEFAULT_RXIC;
13971398 }
13981399
1399− /* always enable rx filer */
1400− priv->rx_filer_enable = 1;
1400+ /* Always enable rx filer if available */
1401+ priv->rx_filer_enable =
1402+ (priv->device_flags & FSL_GIANFAR_DEV_HAS_RX_FILER) ? 1 : 0;
14011403 /* Enable most messages by default */
14021404 priv->msg_enable = (NETIF_MSG_IFUP << 1 ) - 1;
14031405 /* use pritority h/w tx queue scheduling for single queue devices */
drivers/net/ethernet/freescale/gianfar.h+1−0
@@ -923,6 +923,7 @@ struct gfar { · 922 unmodified lines
923923 #define FSL_GIANFAR_DEV_HAS_BUF_STASHING 0x00000400
924924 #define FSL_GIANFAR_DEV_HAS_TIMER 0x00000800
925925 #define FSL_GIANFAR_DEV_HAS_WAKE_ON_FILER 0x00001000
926+#define FSL_GIANFAR_DEV_HAS_RX_FILER 0x00002000
926927
927928 #if (MAXGROUPS == 2)
928929 #define DEFAULT_MAPPING 0xAA
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c+14−35
@@ -1259,12 +1259,8 @@ int hns_dsaf_set_mac_uc_entry( · 1258 unmodified lines
12591259 if (MAC_IS_ALL_ZEROS(mac_entry->addr) ||
12601260 MAC_IS_BROADCAST(mac_entry->addr) ||
12611261 MAC_IS_MULTICAST(mac_entry->addr)) {
1262− dev_err(dsaf_dev->dev,
1263− "set_uc %s Mac %02x:%02x:%02x:%02x:%02x:%02x err!\n",
1264− dsaf_dev->ae_dev.name, mac_entry->addr[0],
1265− mac_entry->addr[1], mac_entry->addr[2],
1266− mac_entry->addr[3], mac_entry->addr[4],
1267− mac_entry->addr[5]);
1262+ dev_err(dsaf_dev->dev, "set_uc %s Mac %pM err!\n",
1263+ dsaf_dev->ae_dev.name, mac_entry->addr);
12681264 return -EINVAL;
12691265 }
12701266
@@ -1331,12 +1327,8 @@ int hns_dsaf_set_mac_mc_entry( · 60 unmodified lines
13311327
13321328 /* mac addr check */
13331329 if (MAC_IS_ALL_ZEROS(mac_entry->addr)) {
1334− dev_err(dsaf_dev->dev,
1335− "set uc %s Mac %02x:%02x:%02x:%02x:%02x:%02x err!\n",
1336− dsaf_dev->ae_dev.name, mac_entry->addr[0],
1337− mac_entry->addr[1], mac_entry->addr[2],
1338− mac_entry->addr[3],
1339− mac_entry->addr[4], mac_entry->addr[5]);
1330+ dev_err(dsaf_dev->dev, "set uc %s Mac %pM err!\n",
1331+ dsaf_dev->ae_dev.name, mac_entry->addr);
13401332 return -EINVAL;
13411333 }
13421334
@@ -1410,11 +1402,8 @@ int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev, · 67 unmodified lines
14101402
14111403 /*chechk mac addr */
14121404 if (MAC_IS_ALL_ZEROS(mac_entry->addr)) {
1413− dev_err(dsaf_dev->dev,
1414− "set_entry failed,addr %02x:%02x:%02x:%02x:%02x:%02x!\n",
1415− mac_entry->addr[0], mac_entry->addr[1],
1416− mac_entry->addr[2], mac_entry->addr[3],
1417− mac_entry->addr[4], mac_entry->addr[5]);
1405+ dev_err(dsaf_dev->dev, "set_entry failed,addr %pM!\n",
1406+ mac_entry->addr);
14181407 return -EINVAL;
14191408 }
14201409
@@ -1497,9 +1486,8 @@ int hns_dsaf_del_mac_entry(struct dsaf_device *dsaf_dev, u16 vlan_id, · 76 unmodified lines
14971486
14981487 /*check mac addr */
14991488 if (MAC_IS_ALL_ZEROS(addr) || MAC_IS_BROADCAST(addr)) {
1500− dev_err(dsaf_dev->dev,
1501− "del_entry failed,addr %02x:%02x:%02x:%02x:%02x:%02x!\n",
1502− addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
1489+ dev_err(dsaf_dev->dev, "del_entry failed,addr %pM!\n",
1490+ addr);
15031491 return -EINVAL;
15041492 }
15051493
@@ -1563,11 +1551,8 @@ int hns_dsaf_del_mac_mc_port(struct dsaf_device *dsaf_dev, · 57 unmodified lines
15631551
15641552 /*check mac addr */
15651553 if (MAC_IS_ALL_ZEROS(mac_entry->addr)) {
1566− dev_err(dsaf_dev->dev,
1567− "del_port failed, addr %02x:%02x:%02x:%02x:%02x:%02x!\n",
1568− mac_entry->addr[0], mac_entry->addr[1],
1569− mac_entry->addr[2], mac_entry->addr[3],
1570− mac_entry->addr[4], mac_entry->addr[5]);
1554+ dev_err(dsaf_dev->dev, "del_port failed, addr %pM!\n",
1555+ mac_entry->addr);
15711556 return -EINVAL;
15721557 }
15731558
@@ -1644,11 +1629,8 @@ int hns_dsaf_get_mac_uc_entry(struct dsaf_device *dsaf_dev, · 70 unmodified lines
16441629 /* check macaddr */
16451630 if (MAC_IS_ALL_ZEROS(mac_entry->addr) ||
16461631 MAC_IS_BROADCAST(mac_entry->addr)) {
1647− dev_err(dsaf_dev->dev,
1648− "get_entry failed,addr %02x:%02x:%02x:%02x:%02x:%02x\n",
1649− mac_entry->addr[0], mac_entry->addr[1],
1650− mac_entry->addr[2], mac_entry->addr[3],
1651− mac_entry->addr[4], mac_entry->addr[5]);
1632+ dev_err(dsaf_dev->dev, "get_entry failed,addr %pM\n",
1633+ mac_entry->addr);
16521634 return -EINVAL;
16531635 }
16541636
@@ -1695,11 +1677,8 @@ int hns_dsaf_get_mac_mc_entry(struct dsaf_device *dsaf_dev, · 40 unmodified lines
16951677 /*check mac addr */
16961678 if (MAC_IS_ALL_ZEROS(mac_entry->addr) ||
16971679 MAC_IS_BROADCAST(mac_entry->addr)) {
1698− dev_err(dsaf_dev->dev,
1699− "get_entry failed,addr %02x:%02x:%02x:%02x:%02x:%02x\n",
1700− mac_entry->addr[0], mac_entry->addr[1],
1701− mac_entry->addr[2], mac_entry->addr[3],
1702− mac_entry->addr[4], mac_entry->addr[5]);
1680+ dev_err(dsaf_dev->dev, "get_entry failed,addr %pM\n",
1681+ mac_entry->addr);
17031682 return -EINVAL;
17041683 }
17051684
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h+6−5
@@ -898,7 +898,7 @@ · 897 unmodified lines
898898 #define XGMAC_PAUSE_CTL_RSP_MODE_B 2
899899 #define XGMAC_PAUSE_CTL_TX_XOFF_B 3
900900
901−static inline void dsaf_write_reg(void *base, u32 reg, u32 value)
901+static inline void dsaf_write_reg(void __iomem *base, u32 reg, u32 value)
902902 {
903903 u8 __iomem *reg_addr = ACCESS_ONCE(base);
904904
@@ -908,7 +908,7 @@ static inline void dsaf_write_reg(void *base, u32 reg, u32 value) · 3 unmodified lines
908908 #define dsaf_write_dev(a, reg, value) \
909909 dsaf_write_reg((a)->io_base, (reg), (value))
910910
911−static inline u32 dsaf_read_reg(u8 *base, u32 reg)
911+static inline u32 dsaf_read_reg(u8 __iomem *base, u32 reg)
912912 {
913913 u8 __iomem *reg_addr = ACCESS_ONCE(base);
914914
@@ -927,8 +927,8 @@ static inline u32 dsaf_read_reg(u8 *base, u32 reg) · 12 unmodified lines
927927 #define dsaf_set_bit(origin, shift, val) \
928928 dsaf_set_field((origin), (1ull << (shift)), (shift), (val))
929929
930−static inline void dsaf_set_reg_field(void *base, u32 reg, u32 mask, u32 shift,
931− u32 val)
930+static inline void dsaf_set_reg_field(void __iomem *base, u32 reg, u32 mask,
931+ u32 shift, u32 val)
932932 {
933933 u32 origin = dsaf_read_reg(base, reg);
934934
@@ -947,7 +947,8 @@ static inline void dsaf_set_reg_field(void *base, u32 reg, u32 mask, u32 shift, · 12 unmodified lines
947947 #define dsaf_get_bit(origin, shift) \
948948 dsaf_get_field((origin), (1ull << (shift)), (shift))
949949
950−static inline u32 dsaf_get_reg_field(void *base, u32 reg, u32 mask, u32 shift)
950+static inline u32 dsaf_get_reg_field(void __iomem *base, u32 reg, u32 mask,
951+ u32 shift)
951952 {
952953 u32 origin;
953954
drivers/net/ethernet/intel/i40e/i40e_adminq.c+0−6
@@ -567,10 +567,6 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) · 566 unmodified lines
567567 goto init_adminq_exit;
568568 }
569569
570− /* initialize locks */
571− mutex_init(&hw->aq.asq_mutex);
572− mutex_init(&hw->aq.arq_mutex);
573−
574570 /* Set up register offsets */
575571 i40e_adminq_init_regs(hw);
576572
@@ -664,8 +660,6 @@ i40e_status i40e_shutdown_adminq(struct i40e_hw *hw) · 87 unmodified lines
664660 i40e_shutdown_asq(hw);
665661 i40e_shutdown_arq(hw);
666662
667− /* destroy the locks */
668−
669663 if (hw->nvm_buff.va)
670664 i40e_free_virt_mem(hw, &hw->nvm_buff);
671665
drivers/net/ethernet/intel/i40e/i40e_main.c+10−1
@@ -10295,6 +10295,12 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · 10294 unmodified lines
1029510295 /* set up a default setting for link flow control */
1029610296 pf->hw.fc.requested_mode = I40E_FC_NONE;
1029710297
10298+ /* set up the locks for the AQ, do this only once in probe
10299+ * and destroy them only once in remove
10300+ */
10301+ mutex_init(&hw->aq.asq_mutex);
10302+ mutex_init(&hw->aq.arq_mutex);
10303+
1029810304 err = i40e_init_adminq(hw);
1029910305
1030010306 /* provide nvm, fw, api versions */
@@ -10697,7 +10703,6 @@ static void i40e_remove(struct pci_dev *pdev) · 396 unmodified lines
1069710703 set_bit(__I40E_DOWN, &pf->state);
1069810704 del_timer_sync(&pf->service_timer);
1069910705 cancel_work_sync(&pf->service_task);
10700− i40e_fdir_teardown(pf);
1070110706
1070210707 if (pf->flags & I40E_FLAG_SRIOV_ENABLED) {
1070310708 i40e_free_vfs(pf);
@@ -10740,6 +10745,10 @@ static void i40e_remove(struct pci_dev *pdev) · 36 unmodified lines
1074010745 "Failed to destroy the Admin Queue resources: %d\n",
1074110746 ret_code);
1074210747
10748+ /* destroy the locks only once, here */
10749+ mutex_destroy(&hw->aq.arq_mutex);
10750+ mutex_destroy(&hw->aq.asq_mutex);
10751+
1074310752 /* Clear all dynamic memory lists of rings, q_vectors, and VSIs */
1074410753 i40e_clear_interrupt_scheme(pf);
1074510754 for (i = 0; i < pf->num_alloc_vsi; i++) {
drivers/net/ethernet/intel/i40evf/i40e_adminq.c+0−6
@@ -551,10 +551,6 @@ i40e_status i40evf_init_adminq(struct i40e_hw *hw) · 550 unmodified lines
551551 goto init_adminq_exit;
552552 }
553553
554− /* initialize locks */
555− mutex_init(&hw->aq.asq_mutex);
556− mutex_init(&hw->aq.arq_mutex);
557−
558554 /* Set up register offsets */
559555 i40e_adminq_init_regs(hw);
560556
@@ -596,8 +592,6 @@ i40e_status i40evf_shutdown_adminq(struct i40e_hw *hw) · 35 unmodified lines
596592 i40e_shutdown_asq(hw);
597593 i40e_shutdown_arq(hw);
598594
599− /* destroy the locks */
600−
601595 if (hw->nvm_buff.va)
602596 i40e_free_virt_mem(hw, &hw->nvm_buff);
603597
drivers/net/ethernet/intel/i40evf/i40evf_main.c+10−0
@@ -2476,6 +2476,12 @@ static int i40evf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · 2475 unmodified lines
24762476 hw->bus.device = PCI_SLOT(pdev->devfn);
24772477 hw->bus.func = PCI_FUNC(pdev->devfn);
24782478
2479+ /* set up the locks for the AQ, do this only once in probe
2480+ * and destroy them only once in remove
2481+ */
2482+ mutex_init(&hw->aq.asq_mutex);
2483+ mutex_init(&hw->aq.arq_mutex);
2484+
24792485 INIT_LIST_HEAD(&adapter->mac_filter_list);
24802486 INIT_LIST_HEAD(&adapter->vlan_filter_list);
24812487
@@ -2629,6 +2635,10 @@ static void i40evf_remove(struct pci_dev *pdev) · 147 unmodified lines
26292635 if (hw->aq.asq.count)
26302636 i40evf_shutdown_adminq(hw);
26312637
2638+ /* destroy the locks only once, here */
2639+ mutex_destroy(&hw->aq.arq_mutex);
2640+ mutex_destroy(&hw->aq.asq_mutex);
2641+
26322642 iounmap(hw->hw_addr);
26332643 pci_release_regions(pdev);
26342644
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c+3−0
@@ -7920,6 +7920,9 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc) · 7919 unmodified lines
79207920 */
79217921 if (netif_running(dev))
79227922 ixgbe_close(dev);
7923+ else
7924+ ixgbe_reset(adapter);
7925+
79237926 ixgbe_clear_interrupt_scheme(adapter);
79247927
79257928 #ifdef CONFIG_IXGBE_DCB
drivers/net/ethernet/marvell/mvpp2.c+33−19
@@ -3413,16 +3413,23 @@ static void mvpp2_bm_pool_bufsize_set(struct mvpp2 *priv, · 3412 unmodified lines
34133413 }
34143414
34153415 /* Free all buffers from the pool */
3416−static void mvpp2_bm_bufs_free(struct mvpp2 *priv, struct mvpp2_bm_pool *bm_pool)
3416+static void mvpp2_bm_bufs_free(struct device *dev, struct mvpp2 *priv,
3417+ struct mvpp2_bm_pool *bm_pool)
34173418 {
34183419 int i;
34193420
34203421 for (i = 0; i < bm_pool->buf_num; i++) {
3422+ dma_addr_t buf_phys_addr;
34213423 u32 vaddr;
34223424
34233425 /* Get buffer virtual address (indirect access) */
3424− mvpp2_read(priv, MVPP2_BM_PHY_ALLOC_REG(bm_pool->id));
3426+ buf_phys_addr = mvpp2_read(priv,
3427+ MVPP2_BM_PHY_ALLOC_REG(bm_pool->id));
34253428 vaddr = mvpp2_read(priv, MVPP2_BM_VIRT_ALLOC_REG);
3429+
3430+ dma_unmap_single(dev, buf_phys_addr,
3431+ bm_pool->buf_size, DMA_FROM_DEVICE);
3432+
34263433 if (!vaddr)
34273434 break;
34283435 dev_kfree_skb_any((struct sk_buff *)vaddr);
@@ -3439,7 +3446,7 @@ static int mvpp2_bm_pool_destroy(struct platform_device *pdev, · 10 unmodified lines
34393446 {
34403447 u32 val;
34413448
3442− mvpp2_bm_bufs_free(priv, bm_pool);
3449+ mvpp2_bm_bufs_free(&pdev->dev, priv, bm_pool);
34433450 if (bm_pool->buf_num) {
34443451 WARN(1, "cannot free all buffers in pool %d\n", bm_pool->id);
34453452 return 0;
@@ -3692,7 +3699,8 @@ mvpp2_bm_pool_use(struct mvpp2_port *port, int pool, enum mvpp2_bm_type type, · 246 unmodified lines
36923699 MVPP2_BM_LONG_BUF_NUM :
36933700 MVPP2_BM_SHORT_BUF_NUM;
36943701 else
3695− mvpp2_bm_bufs_free(port->priv, new_pool);
3702+ mvpp2_bm_bufs_free(port->dev->dev.parent,
3703+ port->priv, new_pool);
36963704
36973705 new_pool->pkt_size = pkt_size;
36983706
@@ -3756,7 +3764,7 @@ static int mvpp2_bm_update_mtu(struct net_device *dev, int mtu) · 57 unmodified lines
37563764 int pkt_size = MVPP2_RX_PKT_SIZE(mtu);
37573765
37583766 /* Update BM pool with new buffer size */
3759− mvpp2_bm_bufs_free(port->priv, port_pool);
3767+ mvpp2_bm_bufs_free(dev->dev.parent, port->priv, port_pool);
37603768 if (port_pool->buf_num) {
37613769 WARN(1, "cannot free all buffers in pool %d\n", port_pool->id);
37623770 return -EIO;
@@ -4401,11 +4409,10 @@ static void mvpp2_txq_bufs_free(struct mvpp2_port *port, · 638 unmodified lines
44014409
44024410 mvpp2_txq_inc_get(txq_pcpu);
44034411
4404− if (!skb)
4405− continue;
4406−
44074412 dma_unmap_single(port->dev->dev.parent, buf_phys_addr,
44084413 skb_headlen(skb), DMA_TO_DEVICE);
4414+ if (!skb)
4415+ continue;
44094416 dev_kfree_skb_any(skb);
44104417 }
44114418 }
@@ -5092,7 +5099,8 @@ static int mvpp2_rx(struct mvpp2_port *port, int rx_todo, · 680 unmodified lines
50925099 struct mvpp2_rx_queue *rxq)
50935100 {
50945101 struct net_device *dev = port->dev;
5095− int rx_received, rx_filled, i;
5102+ int rx_received;
5103+ int rx_done = 0;
50965104 u32 rcvd_pkts = 0;
50975105 u32 rcvd_bytes = 0;
50985106
@@ -5101,17 +5109,18 @@ static int mvpp2_rx(struct mvpp2_port *port, int rx_todo, · 2 unmodified lines
51015109 if (rx_todo > rx_received)
51025110 rx_todo = rx_received;
51035111
5104− rx_filled = 0;
5105− for (i = 0; i < rx_todo; i++) {
5112+ while (rx_done < rx_todo) {
51065113 struct mvpp2_rx_desc *rx_desc = mvpp2_rxq_next_desc_get(rxq);
51075114 struct mvpp2_bm_pool *bm_pool;
51085115 struct sk_buff *skb;
5116+ dma_addr_t phys_addr;
51095117 u32 bm, rx_status;
51105118 int pool, rx_bytes, err;
51115119
5112− rx_filled++;
5120+ rx_done++;
51135121 rx_status = rx_desc->status;
51145122 rx_bytes = rx_desc->data_size - MVPP2_MH_SIZE;
5123+ phys_addr = rx_desc->buf_phys_addr;
51155124
51165125 bm = mvpp2_bm_cookie_build(rx_desc);
51175126 pool = mvpp2_bm_cookie_pool_get(bm);
@@ -5128,8 +5137,10 @@ static int mvpp2_rx(struct mvpp2_port *port, int rx_todo, · 10 unmodified lines
51285137 * comprised by the RX descriptor.
51295138 */
51305139 if (rx_status & MVPP2_RXD_ERR_SUMMARY) {
5140+ err_drop_frame:
51315141 dev->stats.rx_errors++;
51325142 mvpp2_rx_error(port, rx_desc);
5143+ /* Return the buffer to the pool */
51335144 mvpp2_pool_refill(port, bm, rx_desc->buf_phys_addr,
51345145 rx_desc->buf_cookie);
51355146 continue;
@@ -5137,6 +5148,15 @@ static int mvpp2_rx(struct mvpp2_port *port, int rx_todo, · 1 unmodified line
51375148
51385149 skb = (struct sk_buff *)rx_desc->buf_cookie;
51395150
5151+ err = mvpp2_rx_refill(port, bm_pool, bm, 0);
5152+ if (err) {
5153+ netdev_err(port->dev, "failed to refill BM pools\n");
5154+ goto err_drop_frame;
5155+ }
5156+
5157+ dma_unmap_single(dev->dev.parent, phys_addr,
5158+ bm_pool->buf_size, DMA_FROM_DEVICE);
5159+
51405160 rcvd_pkts++;
51415161 rcvd_bytes += rx_bytes;
51425162 atomic_inc(&bm_pool->in_use);
@@ -5147,12 +5167,6 @@ static int mvpp2_rx(struct mvpp2_port *port, int rx_todo, · 4 unmodified lines
51475167 mvpp2_rx_csum(port, rx_status, skb);
51485168
51495169 napi_gro_receive(&port->napi, skb);
5150−
5151− err = mvpp2_rx_refill(port, bm_pool, bm, 0);
5152− if (err) {
5153− netdev_err(port->dev, "failed to refill BM pools\n");
5154− rx_filled--;
5155− }
51565170 }
51575171
51585172 if (rcvd_pkts) {
@@ -5166,7 +5180,7 @@ static int mvpp2_rx(struct mvpp2_port *port, int rx_todo, · 7 unmodified lines
51665180
51675181 /* Update Rx queue management counters */
51685182 wmb();
5169− mvpp2_rxq_status_update(port, rxq->id, rx_todo, rx_filled);
5183+ mvpp2_rxq_status_update(port, rxq->id, rx_done, rx_done);
51705184
51715185 return rx_todo;
51725186 }
drivers/net/ethernet/mellanox/mlx4/cmd.c+1−1
@@ -1010,7 +1010,7 @@ static int mlx4_MAD_IFC_wrapper(struct mlx4_dev *dev, int slave, · 1009 unmodified lines
10101010 if (!(smp->mgmt_class == IB_MGMT_CLASS_SUBN_LID_ROUTED &&
10111011 smp->method == IB_MGMT_METHOD_GET) || network_view) {
10121012 mlx4_err(dev, "Unprivileged slave %d is trying to execute a Subnet MGMT MAD, class 0x%x, method 0x%x, view=%s for attr 0x%x. Rejecting\n",
1013− slave, smp->method, smp->mgmt_class,
1013+ slave, smp->mgmt_class, smp->method,
10141014 network_view ? "Network" : "Host",
10151015 be16_to_cpu(smp->attr_id));
10161016 return -EPERM;
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c+3−2
@@ -4306,9 +4306,10 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave, · 4305 unmodified lines
43064306 return -EOPNOTSUPP;
43074307
43084308 ctrl = (struct mlx4_net_trans_rule_hw_ctrl *)inbox->buf;
4309− ctrl->port = mlx4_slave_convert_port(dev, slave, ctrl->port);
4310− if (ctrl->port <= 0)
4309+ err = mlx4_slave_convert_port(dev, slave, ctrl->port);
4310+ if (err <= 0)
43114311 return -EINVAL;
4312+ ctrl->port = err;
43124313 qpn = be32_to_cpu(ctrl->qpn) & 0xffffff;
43134314 err = get_res(dev, slave, qpn, RES_QP, &rqp);
43144315 if (err) {
drivers/net/ethernet/qlogic/qed/qed.h+3−0
@@ -299,6 +299,7 @@ struct qed_hwfn { · 298 unmodified lines
299299
300300 /* Flag indicating whether interrupts are enabled or not*/
301301 bool b_int_enabled;
302+ bool b_int_requested;
302303
303304 struct qed_mcp_info *mcp_info;
304305
@@ -491,6 +492,8 @@ u32 qed_unzip_data(struct qed_hwfn *p_hwfn, · 186 unmodified lines
491492 u32 input_len, u8 *input_buf,
492493 u32 max_size, u8 *unzip_buf);
493494
495+int qed_slowpath_irq_req(struct qed_hwfn *hwfn);
496+
494497 #define QED_ETH_INTERFACE_VERSION 300
495498
496499 #endif /* _QED_H */
drivers/net/ethernet/qlogic/qed/qed_dev.c+32−21
@@ -1385,52 +1385,63 @@ err0: · 1384 unmodified lines
13851385 return rc;
13861386 }
13871387
1388−static u32 qed_hw_bar_size(struct qed_dev *cdev,
1389− u8 bar_id)
1388+static u32 qed_hw_bar_size(struct qed_hwfn *p_hwfn,
1389+ u8 bar_id)
13901390 {
1391− u32 size = pci_resource_len(cdev->pdev, (bar_id > 0) ? 2 : 0);
1391+ u32 bar_reg = (bar_id == 0 ? PGLUE_B_REG_PF_BAR0_SIZE
1392+ : PGLUE_B_REG_PF_BAR1_SIZE);
1393+ u32 val = qed_rd(p_hwfn, p_hwfn->p_main_ptt, bar_reg);
13921394
1393− return size / cdev->num_hwfns;
1395+ /* Get the BAR size(in KB) from hardware given val */
1396+ return 1 << (val + 15);
13941397 }
13951398
13961399 int qed_hw_prepare(struct qed_dev *cdev,
13971400 int personality)
13981401 {
1399− int rc, i;
1402+ struct qed_hwfn *p_hwfn = QED_LEADING_HWFN(cdev);
1403+ int rc;
14001404
14011405 /* Store the precompiled init data ptrs */
14021406 qed_init_iro_array(cdev);
14031407
14041408 /* Initialize the first hwfn - will learn number of hwfns */
1405− rc = qed_hw_prepare_single(&cdev->hwfns[0], cdev->regview,
1409+ rc = qed_hw_prepare_single(p_hwfn,
1410+ cdev->regview,
14061411 cdev->doorbells, personality);
14071412 if (rc)
14081413 return rc;
14091414
1410− personality = cdev->hwfns[0].hw_info.personality;
1415+ personality = p_hwfn->hw_info.personality;
14111416
14121417 /* Initialize the rest of the hwfns */
1413− for (i = 1; i < cdev->num_hwfns; i++) {
1418+ if (cdev->num_hwfns > 1) {
14141419 void __iomem *p_regview, *p_doorbell;
1420+ u8 __iomem *addr;
1421+
1422+ /* adjust bar offset for second engine */
1423+ addr = cdev->regview + qed_hw_bar_size(p_hwfn, 0) / 2;
1424+ p_regview = addr;
14151425
1416− p_regview = cdev->regview +
1417− i * qed_hw_bar_size(cdev, 0);
1418− p_doorbell = cdev->doorbells +
1419− i * qed_hw_bar_size(cdev, 1);
1420− rc = qed_hw_prepare_single(&cdev->hwfns[i], p_regview,
1426+ /* adjust doorbell bar offset for second engine */
1427+ addr = cdev->doorbells + qed_hw_bar_size(p_hwfn, 1) / 2;
1428+ p_doorbell = addr;
1429+
1430+ /* prepare second hw function */
1431+ rc = qed_hw_prepare_single(&cdev->hwfns[1], p_regview,
14211432 p_doorbell, personality);
1433+
1434+ /* in case of error, need to free the previously
1435+ * initiliazed hwfn 0.
1436+ */
14221437 if (rc) {
1423− /* Cleanup previously initialized hwfns */
1424− while (--i >= 0) {
1425− qed_init_free(&cdev->hwfns[i]);
1426− qed_mcp_free(&cdev->hwfns[i]);
1427− qed_hw_hwfn_free(&cdev->hwfns[i]);
1428− }
1429− return rc;
1438+ qed_init_free(p_hwfn);
1439+ qed_mcp_free(p_hwfn);
1440+ qed_hw_hwfn_free(p_hwfn);
14301441 }
14311442 }
14321443
1433− return 0;
1444+ return rc;
14341445 }
14351446
14361447 void qed_hw_remove(struct qed_dev *cdev)
drivers/net/ethernet/qlogic/qed/qed_int.c+24−9
@@ -783,22 +783,16 @@ void qed_int_igu_enable_int(struct qed_hwfn *p_hwfn, · 782 unmodified lines
783783 qed_wr(p_hwfn, p_ptt, IGU_REG_PF_CONFIGURATION, igu_pf_conf);
784784 }
785785
786−void qed_int_igu_enable(struct qed_hwfn *p_hwfn,
787− struct qed_ptt *p_ptt,
788− enum qed_int_mode int_mode)
786+int qed_int_igu_enable(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt,
787+ enum qed_int_mode int_mode)
789788 {
790− int i;
791−
792− p_hwfn->b_int_enabled = 1;
789+ int rc, i;
793790
794791 /* Mask non-link attentions */
795792 for (i = 0; i < 9; i++)
796793 qed_wr(p_hwfn, p_ptt,
797794 MISC_REG_AEU_ENABLE1_IGU_OUT_0 + (i << 2), 0);
798795
799− /* Enable interrupt Generation */
800− qed_int_igu_enable_int(p_hwfn, p_ptt, int_mode);
801−
802796 /* Configure AEU signal change to produce attentions for link */
803797 qed_wr(p_hwfn, p_ptt, IGU_REG_LEADING_EDGE_LATCH, 0xfff);
804798 qed_wr(p_hwfn, p_ptt, IGU_REG_TRAILING_EDGE_LATCH, 0xfff);
@@ -808,6 +802,19 @@ void qed_int_igu_enable(struct qed_hwfn *p_hwfn, · 3 unmodified lines
808802
809803 /* Unmask AEU signals toward IGU */
810804 qed_wr(p_hwfn, p_ptt, MISC_REG_AEU_MASK_ATTN_IGU, 0xff);
805+ if ((int_mode != QED_INT_MODE_INTA) || IS_LEAD_HWFN(p_hwfn)) {
806+ rc = qed_slowpath_irq_req(p_hwfn);
807+ if (rc != 0) {
808+ DP_NOTICE(p_hwfn, "Slowpath IRQ request failed\n");
809+ return -EINVAL;
810+ }
811+ p_hwfn->b_int_requested = true;
812+ }
813+ /* Enable interrupt Generation */
814+ qed_int_igu_enable_int(p_hwfn, p_ptt, int_mode);
815+ p_hwfn->b_int_enabled = 1;
816+
817+ return rc;
811818 }
812819
813820 void qed_int_igu_disable_int(struct qed_hwfn *p_hwfn,
@@ -1127,3 +1134,11 @@ int qed_int_get_num_sbs(struct qed_hwfn *p_hwfn, · 313 unmodified lines
11271134
11281135 return info->igu_sb_cnt;
11291136 }
1137+
1138+void qed_int_disable_post_isr_release(struct qed_dev *cdev)
1139+{
1140+ int i;
1141+
1142+ for_each_hwfn(cdev, i)
1143+ cdev->hwfns[i].b_int_requested = false;
1144+}
drivers/net/ethernet/qlogic/qed/qed_int.h+10−5
@@ -169,10 +169,14 @@ int qed_int_get_num_sbs(struct qed_hwfn *p_hwfn, · 168 unmodified lines
169169 int *p_iov_blks);
170170
171171 /**
172− * @file
172+ * @brief qed_int_disable_post_isr_release - performs the cleanup post ISR
173+ * release. The API need to be called after releasing all slowpath IRQs
174+ * of the device.
175+ *
176+ * @param cdev
173177 *
174− * @brief Interrupt handler
175178 */
179+void qed_int_disable_post_isr_release(struct qed_dev *cdev);
176180
177181 #define QED_CAU_DEF_RX_TIMER_RES 0
178182 #define QED_CAU_DEF_TX_TIMER_RES 0
@@ -366,10 +370,11 @@ void qed_int_setup(struct qed_hwfn *p_hwfn, · 187 unmodified lines
366370 * @param p_hwfn
367371 * @param p_ptt
368372 * @param int_mode
373+ *
374+ * @return int
369375 */
370−void qed_int_igu_enable(struct qed_hwfn *p_hwfn,
371− struct qed_ptt *p_ptt,
372− enum qed_int_mode int_mode);
376+int qed_int_igu_enable(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt,
377+ enum qed_int_mode int_mode);
373378
374379 /**
375380 * @brief - Initialize CAU status block entry
drivers/net/ethernet/qlogic/qed/qed_main.c+18−38
@@ -476,41 +476,22 @@ static irqreturn_t qed_single_int(int irq, void *dev_instance) · 475 unmodified lines
476476 return rc;
477477 }
478478
479−static int qed_slowpath_irq_req(struct qed_dev *cdev)
479+int qed_slowpath_irq_req(struct qed_hwfn *hwfn)
480480 {
481− int i = 0, rc = 0;
481+ struct qed_dev *cdev = hwfn->cdev;
482+ int rc = 0;
483+ u8 id;
482484
483485 if (cdev->int_params.out.int_mode == QED_INT_MODE_MSIX) {
484− /* Request all the slowpath MSI-X vectors */
485− for (i = 0; i < cdev->num_hwfns; i++) {
486− snprintf(cdev->hwfns[i].name, NAME_SIZE,
487− "sp-%d-%02x:%02x.%02x",
488− i, cdev->pdev->bus->number,
489− PCI_SLOT(cdev->pdev->devfn),
490− cdev->hwfns[i].abs_pf_id);
491−
492− rc = request_irq(cdev->int_params.msix_table[i].vector,
493− qed_msix_sp_int, 0,
494− cdev->hwfns[i].name,
495− cdev->hwfns[i].sp_dpc);
496− if (rc)
497− break;
498−
499− DP_VERBOSE(&cdev->hwfns[i],
500− (NETIF_MSG_INTR | QED_MSG_SP),
486+ id = hwfn->my_id;
487+ snprintf(hwfn->name, NAME_SIZE, "sp-%d-%02x:%02x.%02x",
488+ id, cdev->pdev->bus->number,
489+ PCI_SLOT(cdev->pdev->devfn), hwfn->abs_pf_id);
490+ rc = request_irq(cdev->int_params.msix_table[id].vector,
491+ qed_msix_sp_int, 0, hwfn->name, hwfn->sp_dpc);
492+ if (!rc)
493+ DP_VERBOSE(hwfn, (NETIF_MSG_INTR | QED_MSG_SP),
501494 "Requested slowpath MSI-X\n");
502− }
503−
504− if (i != cdev->num_hwfns) {
505− /* Free already request MSI-X vectors */
506− for (i--; i >= 0; i--) {
507− unsigned int vec =
508− cdev->int_params.msix_table[i].vector;
509− synchronize_irq(vec);
510− free_irq(cdev->int_params.msix_table[i].vector,
511− cdev->hwfns[i].sp_dpc);
512− }
513− }
514495 } else {
515496 unsigned long flags = 0;
516497
@@ -534,13 +515,17 @@ static void qed_slowpath_irq_free(struct qed_dev *cdev) · 17 unmodified lines
534515
535516 if (cdev->int_params.out.int_mode == QED_INT_MODE_MSIX) {
536517 for_each_hwfn(cdev, i) {
518+ if (!cdev->hwfns[i].b_int_requested)
519+ break;
537520 synchronize_irq(cdev->int_params.msix_table[i].vector);
538521 free_irq(cdev->int_params.msix_table[i].vector,
539522 cdev->hwfns[i].sp_dpc);
540523 }
541524 } else {
542− free_irq(cdev->pdev->irq, cdev);
525+ if (QED_LEADING_HWFN(cdev)->b_int_requested)
526+ free_irq(cdev->pdev->irq, cdev);
543527 }
528+ qed_int_disable_post_isr_release(cdev);
544529 }
545530
546531 static int qed_nic_stop(struct qed_dev *cdev)
@@ -765,16 +750,11 @@ static int qed_slowpath_start(struct qed_dev *cdev, · 218 unmodified lines
765750 if (rc)
766751 goto err1;
767752
768− /* Request the slowpath IRQ */
769− rc = qed_slowpath_irq_req(cdev);
770− if (rc)
771− goto err2;
772−
773753 /* Allocate stream for unzipping */
774754 rc = qed_alloc_stream_mem(cdev);
775755 if (rc) {
776756 DP_NOTICE(cdev, "Failed to allocate stream memory\n");
777− goto err3;
757+ goto err2;
778758 }
779759
780760 /* Start the slowpath */
drivers/net/ethernet/qlogic/qed/qed_reg_addr.h+4−0
@@ -363,4 +363,8 @@ · 362 unmodified lines
363363 0x7 << 0)
364364 #define MCP_REG_NVM_CFG4_FLASH_SIZE_SHIFT \
365365 0
366+#define PGLUE_B_REG_PF_BAR0_SIZE \
367+ 0x2aae60UL
368+#define PGLUE_B_REG_PF_BAR1_SIZE \
369+ 0x2aae64UL
366370 #endif
drivers/net/ethernet/qlogic/qed/qed_sp.h+6−2
@@ -124,8 +124,12 @@ struct qed_spq { · 123 unmodified lines
124124 dma_addr_t p_phys;
125125 struct qed_spq_entry *p_virt;
126126
127− /* Used as index for completions (returns on EQ by FW) */
128− u16 echo_idx;
127+#define SPQ_RING_SIZE \
128+ (CORE_SPQE_PAGE_SIZE_BYTES / sizeof(struct slow_path_element))
129+
130+ /* Bitmap for handling out-of-order completions */
131+ DECLARE_BITMAP(p_comp_bitmap, SPQ_RING_SIZE);
132+ u8 comp_bitmap_idx;
129133
130134 /* Statistics */
131135 u32 unlimited_pending_count;
drivers/net/ethernet/qlogic/qed/qed_spq.c+48−15
@@ -112,8 +112,6 @@ static int · 111 unmodified lines
112112 qed_spq_fill_entry(struct qed_hwfn *p_hwfn,
113113 struct qed_spq_entry *p_ent)
114114 {
115− p_ent->elem.hdr.echo = 0;
116− p_hwfn->p_spq->echo_idx++;
117115 p_ent->flags = 0;
118116
119117 switch (p_ent->comp_mode) {
@@ -195,10 +193,12 @@ static int qed_spq_hw_post(struct qed_hwfn *p_hwfn, · 75 unmodified lines
195193 struct qed_spq *p_spq,
196194 struct qed_spq_entry *p_ent)
197195 {
198− struct qed_chain *p_chain = &p_hwfn->p_spq->chain;
196+ struct qed_chain *p_chain = &p_hwfn->p_spq->chain;
197+ u16 echo = qed_chain_get_prod_idx(p_chain);
199198 struct slow_path_element *elem;
200199 struct core_db_data db;
201200
201+ p_ent->elem.hdr.echo = cpu_to_le16(echo);
202202 elem = qed_chain_produce(p_chain);
203203 if (!elem) {
204204 DP_NOTICE(p_hwfn, "Failed to produce from SPQ chain\n");
@@ -437,7 +437,9 @@ void qed_spq_setup(struct qed_hwfn *p_hwfn) · 232 unmodified lines
437437 p_spq->comp_count = 0;
438438 p_spq->comp_sent_count = 0;
439439 p_spq->unlimited_pending_count = 0;
440− p_spq->echo_idx = 0;
440+
441+ bitmap_zero(p_spq->p_comp_bitmap, SPQ_RING_SIZE);
442+ p_spq->comp_bitmap_idx = 0;
441443
442444 /* SPQ cid, cannot fail */
443445 qed_cxt_acquire_cid(p_hwfn, PROTOCOLID_CORE, &p_spq->cid);
@@ -582,26 +584,32 @@ qed_spq_add_entry(struct qed_hwfn *p_hwfn, · 138 unmodified lines
582584 struct qed_spq *p_spq = p_hwfn->p_spq;
583585
584586 if (p_ent->queue == &p_spq->unlimited_pending) {
585− struct qed_spq_entry *p_en2;
586587
587588 if (list_empty(&p_spq->free_pool)) {
588589 list_add_tail(&p_ent->list, &p_spq->unlimited_pending);
589590 p_spq->unlimited_pending_count++;
590591
591592 return 0;
592− }
593+ } else {
594+ struct qed_spq_entry *p_en2;
593595
594− p_en2 = list_first_entry(&p_spq->free_pool,
595− struct qed_spq_entry,
596− list);
597− list_del(&p_en2->list);
596+ p_en2 = list_first_entry(&p_spq->free_pool,
597+ struct qed_spq_entry,
598+ list);
599+ list_del(&p_en2->list);
600+
601+ /* Copy the ring element physical pointer to the new
602+ * entry, since we are about to override the entire ring
603+ * entry and don't want to lose the pointer.
604+ */
605+ p_ent->elem.data_ptr = p_en2->elem.data_ptr;
598606
599− /* Strcut assignment */
600− *p_en2 = *p_ent;
607+ *p_en2 = *p_ent;
601608
602− kfree(p_ent);
609+ kfree(p_ent);
603610
604− p_ent = p_en2;
611+ p_ent = p_en2;
612+ }
605613 }
606614
607615 /* entry is to be placed in 'pending' queue */
@@ -777,13 +785,38 @@ int qed_spq_completion(struct qed_hwfn *p_hwfn, · 169 unmodified lines
777785 list_for_each_entry_safe(p_ent, tmp, &p_spq->completion_pending,
778786 list) {
779787 if (p_ent->elem.hdr.echo == echo) {
788+ u16 pos = le16_to_cpu(echo) % SPQ_RING_SIZE;
789+
780790 list_del(&p_ent->list);
781791
782− qed_chain_return_produced(&p_spq->chain);
792+ /* Avoid overriding of SPQ entries when getting
793+ * out-of-order completions, by marking the completions
794+ * in a bitmap and increasing the chain consumer only
795+ * for the first successive completed entries.
796+ */
797+ bitmap_set(p_spq->p_comp_bitmap, pos, SPQ_RING_SIZE);
798+
799+ while (test_bit(p_spq->comp_bitmap_idx,
800+ p_spq->p_comp_bitmap)) {
801+ bitmap_clear(p_spq->p_comp_bitmap,
802+ p_spq->comp_bitmap_idx,
803+ SPQ_RING_SIZE);
804+ p_spq->comp_bitmap_idx++;
805+ qed_chain_return_produced(&p_spq->chain);
806+ }
807+
783808 p_spq->comp_count++;
784809 found = p_ent;
785810 break;
786811 }
812+
813+ /* This is relatively uncommon - depends on scenarios
814+ * which have mutliple per-PF sent ramrods.
815+ */
816+ DP_VERBOSE(p_hwfn, QED_MSG_SPQ,
817+ "Got completion for echo %04x - doesn't match echo %04x in completion pending list\n",
818+ le16_to_cpu(echo),
819+ le16_to_cpu(p_ent->elem.hdr.echo));
787820 }
788821
789822 /* Release lock before callback, as callback may post
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c+2−1
@@ -246,7 +246,8 @@ int qlcnic_83xx_check_vnic_state(struct qlcnic_adapter *adapter) · 245 unmodified lines
246246 u32 state;
247247
248248 state = QLCRDX(ahw, QLC_83XX_VNIC_STATE);
249− while (state != QLCNIC_DEV_NPAR_OPER && idc->vnic_wait_limit--) {
249+ while (state != QLCNIC_DEV_NPAR_OPER && idc->vnic_wait_limit) {
250+ idc->vnic_wait_limit--;
250251 msleep(1000);
251252 state = QLCRDX(ahw, QLC_83XX_VNIC_STATE);
252253 }
drivers/net/ethernet/qlogic/qlge/qlge_main.c+3−2
@@ -4211,8 +4211,9 @@ static int ql_change_rx_buffers(struct ql_adapter *qdev) · 4210 unmodified lines
42114211
42124212 /* Wait for an outstanding reset to complete. */
42134213 if (!test_bit(QL_ADAPTER_UP, &qdev->flags)) {
4214− int i = 3;
4215− while (i-- && !test_bit(QL_ADAPTER_UP, &qdev->flags)) {
4214+ int i = 4;
4215+
4216+ while (--i && !test_bit(QL_ADAPTER_UP, &qdev->flags)) {
42164217 netif_err(qdev, ifup, qdev->ndev,
42174218 "Waiting for adapter UP...\n");
42184219 ssleep(1);
drivers/net/ethernet/qualcomm/qca_spi.c+2−3
@@ -736,9 +736,8 @@ qcaspi_netdev_tx_timeout(struct net_device *dev) · 735 unmodified lines
736736 netdev_info(qca->net_dev, "Transmit timeout at %ld, latency %ld\n",
737737 jiffies, jiffies - dev->trans_start);
738738 qca->net_dev->stats.tx_errors++;
739− /* wake the queue if there is room */
740− if (qcaspi_tx_ring_has_space(&qca->txr))
741− netif_wake_queue(dev);
739+ /* Trigger tx queue flush and QCA7000 reset */
740+ qca->sync = QCASPI_SYNC_UNKNOWN;
742741 }
743742
744743 static int
drivers/net/ethernet/renesas/ravb_main.c+4−1
@@ -905,6 +905,9 @@ static int ravb_phy_init(struct net_device *ndev) · 904 unmodified lines
905905 netdev_info(ndev, "limited PHY to 100Mbit/s\n");
906906 }
907907
908+ /* 10BASE is not supported */
909+ phydev->supported &= ~PHY_10BT_FEATURES;
910+
908911 netdev_info(ndev, "attached PHY %d (IRQ %d) to driver %s\n",
909912 phydev->addr, phydev->irq, phydev->drv->name);
910913
@@ -1037,7 +1040,7 @@ static const char ravb_gstrings_stats[][ETH_GSTRING_LEN] = { · 126 unmodified lines
10371040 "rx_queue_1_mcast_packets",
10381041 "rx_queue_1_errors",
10391042 "rx_queue_1_crc_errors",
1040− "rx_queue_1_frame_errors_",
1043+ "rx_queue_1_frame_errors",
10411044 "rx_queue_1_length_errors",
10421045 "rx_queue_1_missed_errors",
10431046 "rx_queue_1_over_errors",
drivers/net/ethernet/renesas/sh_eth.c+41−14
@@ -52,6 +52,8 @@ · 51 unmodified lines
5252 NETIF_MSG_RX_ERR| \
5353 NETIF_MSG_TX_ERR)
5454
55+#define SH_ETH_OFFSET_INVALID ((u16)~0)
56+
5557 #define SH_ETH_OFFSET_DEFAULTS \
5658 [0 ... SH_ETH_MAX_REGISTER_OFFSET - 1] = SH_ETH_OFFSET_INVALID
5759
@@ -404,6 +406,28 @@ static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = { · 346 unmodified lines
404406 static void sh_eth_rcv_snd_disable(struct net_device *ndev);
405407 static struct net_device_stats *sh_eth_get_stats(struct net_device *ndev);
406408
409+static void sh_eth_write(struct net_device *ndev, u32 data, int enum_index)
410+{
411+ struct sh_eth_private *mdp = netdev_priv(ndev);
412+ u16 offset = mdp->reg_offset[enum_index];
413+
414+ if (WARN_ON(offset == SH_ETH_OFFSET_INVALID))
415+ return;
416+
417+ iowrite32(data, mdp->addr + offset);
418+}
419+
420+static u32 sh_eth_read(struct net_device *ndev, int enum_index)
421+{
422+ struct sh_eth_private *mdp = netdev_priv(ndev);
423+ u16 offset = mdp->reg_offset[enum_index];
424+
425+ if (WARN_ON(offset == SH_ETH_OFFSET_INVALID))
426+ return ~0U;
427+
428+ return ioread32(mdp->addr + offset);
429+}
430+
407431 static bool sh_eth_is_gether(struct sh_eth_private *mdp)
408432 {
409433 return mdp->reg_offset == sh_eth_offset_gigabit;
@@ -1172,7 +1196,7 @@ static void sh_eth_ring_format(struct net_device *ndev) · 762 unmodified lines
11721196 break;
11731197 }
11741198 mdp->rx_skbuff[i] = skb;
1175− rxdesc->addr = dma_addr;
1199+ rxdesc->addr = cpu_to_edmac(mdp, dma_addr);
11761200 rxdesc->status = cpu_to_edmac(mdp, RD_RACT | RD_RFP);
11771201
11781202 /* Rx descriptor address set */
@@ -1403,7 +1427,8 @@ static int sh_eth_txfree(struct net_device *ndev) · 224 unmodified lines
14031427 entry, edmac_to_cpu(mdp, txdesc->status));
14041428 /* Free the original skb. */
14051429 if (mdp->tx_skbuff[entry]) {
1406− dma_unmap_single(&ndev->dev, txdesc->addr,
1430+ dma_unmap_single(&ndev->dev,
1431+ edmac_to_cpu(mdp, txdesc->addr),
14071432 txdesc->buffer_length, DMA_TO_DEVICE);
14081433 dev_kfree_skb_irq(mdp->tx_skbuff[entry]);
14091434 mdp->tx_skbuff[entry] = NULL;
@@ -1462,6 +1487,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) · 52 unmodified lines
14621487 if (mdp->cd->shift_rd0)
14631488 desc_status >>= 16;
14641489
1490+ skb = mdp->rx_skbuff[entry];
14651491 if (desc_status & (RD_RFS1 | RD_RFS2 | RD_RFS3 | RD_RFS4 |
14661492 RD_RFS5 | RD_RFS6 | RD_RFS10)) {
14671493 ndev->stats.rx_errors++;
@@ -1477,16 +1503,16 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) · 9 unmodified lines
14771503 ndev->stats.rx_missed_errors++;
14781504 if (desc_status & RD_RFS10)
14791505 ndev->stats.rx_over_errors++;
1480− } else {
1506+ } else if (skb) {
1507+ dma_addr = edmac_to_cpu(mdp, rxdesc->addr);
14811508 if (!mdp->cd->hw_swap)
14821509 sh_eth_soft_swap(
1483− phys_to_virt(ALIGN(rxdesc->addr, 4)),
1510+ phys_to_virt(ALIGN(dma_addr, 4)),
14841511 pkt_len + 2);
1485− skb = mdp->rx_skbuff[entry];
14861512 mdp->rx_skbuff[entry] = NULL;
14871513 if (mdp->cd->rpadir)
14881514 skb_reserve(skb, NET_IP_ALIGN);
1489− dma_unmap_single(&ndev->dev, rxdesc->addr,
1515+ dma_unmap_single(&ndev->dev, dma_addr,
14901516 ALIGN(mdp->rx_buf_sz, 32),
14911517 DMA_FROM_DEVICE);
14921518 skb_put(skb, pkt_len);
@@ -1523,7 +1549,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) · 30 unmodified lines
15231549 mdp->rx_skbuff[entry] = skb;
15241550
15251551 skb_checksum_none_assert(skb);
1526− rxdesc->addr = dma_addr;
1552+ rxdesc->addr = cpu_to_edmac(mdp, dma_addr);
15271553 }
15281554 dma_wmb(); /* RACT bit must be set after all the above writes */
15291555 if (entry >= mdp->num_rx_ring - 1)
@@ -2331,8 +2357,8 @@ static void sh_eth_tx_timeout(struct net_device *ndev) · 801 unmodified lines
23312357 /* Free all the skbuffs in the Rx queue. */
23322358 for (i = 0; i < mdp->num_rx_ring; i++) {
23332359 rxdesc = &mdp->rx_ring[i];
2334− rxdesc->status = 0;
2335− rxdesc->addr = 0xBADF00D0;
2360+ rxdesc->status = cpu_to_edmac(mdp, 0);
2361+ rxdesc->addr = cpu_to_edmac(mdp, 0xBADF00D0);
23362362 dev_kfree_skb(mdp->rx_skbuff[i]);
23372363 mdp->rx_skbuff[i] = NULL;
23382364 }
@@ -2350,6 +2376,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) · 11 unmodified lines
23502376 {
23512377 struct sh_eth_private *mdp = netdev_priv(ndev);
23522378 struct sh_eth_txdesc *txdesc;
2379+ dma_addr_t dma_addr;
23532380 u32 entry;
23542381 unsigned long flags;
23552382
@@ -2372,14 +2399,14 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) · 16 unmodified lines
23722399 txdesc = &mdp->tx_ring[entry];
23732400 /* soft swap. */
23742401 if (!mdp->cd->hw_swap)
2375− sh_eth_soft_swap(phys_to_virt(ALIGN(txdesc->addr, 4)),
2376− skb->len + 2);
2377− txdesc->addr = dma_map_single(&ndev->dev, skb->data, skb->len,
2378− DMA_TO_DEVICE);
2379− if (dma_mapping_error(&ndev->dev, txdesc->addr)) {
2402+ sh_eth_soft_swap(PTR_ALIGN(skb->data, 4), skb->len + 2);
2403+ dma_addr = dma_map_single(&ndev->dev, skb->data, skb->len,
2404+ DMA_TO_DEVICE);
2405+ if (dma_mapping_error(&ndev->dev, dma_addr)) {
23802406 kfree_skb(skb);
23812407 return NETDEV_TX_OK;
23822408 }
2409+ txdesc->addr = cpu_to_edmac(mdp, dma_addr);
23832410 txdesc->buffer_length = skb->len;
23842411
23852412 dma_wmb(); /* TACT bit must be set after all the above writes */
drivers/net/ethernet/renesas/sh_eth.h+0−25
@@ -546,31 +546,6 @@ static inline void sh_eth_soft_swap(char *src, int len) · 545 unmodified lines
546546 #endif
547547 }
548548
549−#define SH_ETH_OFFSET_INVALID ((u16) ~0)
550−
551−static inline void sh_eth_write(struct net_device *ndev, u32 data,
552− int enum_index)
553−{
554− struct sh_eth_private *mdp = netdev_priv(ndev);
555− u16 offset = mdp->reg_offset[enum_index];
556−
557− if (WARN_ON(offset == SH_ETH_OFFSET_INVALID))
558− return;
559−
560− iowrite32(data, mdp->addr + offset);
561−}
562−
563−static inline u32 sh_eth_read(struct net_device *ndev, int enum_index)
564−{
565− struct sh_eth_private *mdp = netdev_priv(ndev);
566− u16 offset = mdp->reg_offset[enum_index];
567−
568− if (WARN_ON(offset == SH_ETH_OFFSET_INVALID))
569− return ~0U;
570−
571− return ioread32(mdp->addr + offset);
572−}
573−
574549 static inline void *sh_eth_tsu_get_offset(struct sh_eth_private *mdp,
575550 int enum_index)
576551 {
drivers/net/ethernet/sfc/ef10.c+12−12
@@ -3299,7 +3299,8 @@ static int efx_ef10_filter_remove_internal(struct efx_nic *efx, · 3298 unmodified lines
32993299
33003300 new_spec.priority = EFX_FILTER_PRI_AUTO;
33013301 new_spec.flags = (EFX_FILTER_FLAG_RX |
3302− EFX_FILTER_FLAG_RX_RSS);
3302+ (efx_rss_enabled(efx) ?
3303+ EFX_FILTER_FLAG_RX_RSS : 0));
33033304 new_spec.dmaq_id = 0;
33043305 new_spec.rss_context = EFX_FILTER_RSS_CONTEXT_DEFAULT;
33053306 rc = efx_ef10_filter_push(efx, &new_spec,
@@ -3921,6 +3922,7 @@ static int efx_ef10_filter_insert_addr_list(struct efx_nic *efx, · 615 unmodified lines
39213922 {
39223923 struct efx_ef10_filter_table *table = efx->filter_state;
39233924 struct efx_ef10_dev_addr *addr_list;
3925+ enum efx_filter_flags filter_flags;
39243926 struct efx_filter_spec spec;
39253927 u8 baddr[ETH_ALEN];
39263928 unsigned int i, j;
@@ -3935,11 +3937,11 @@ static int efx_ef10_filter_insert_addr_list(struct efx_nic *efx, · 8 unmodified lines
39353937 addr_count = table->dev_uc_count;
39363938 }
39373939
3940+ filter_flags = efx_rss_enabled(efx) ? EFX_FILTER_FLAG_RX_RSS : 0;
3941+
39383942 /* Insert/renew filters */
39393943 for (i = 0; i < addr_count; i++) {
3940− efx_filter_init_rx(&spec, EFX_FILTER_PRI_AUTO,
3941− EFX_FILTER_FLAG_RX_RSS,
3942− 0);
3944+ efx_filter_init_rx(&spec, EFX_FILTER_PRI_AUTO, filter_flags, 0);
39433945 efx_filter_set_eth_local(&spec, EFX_FILTER_VID_UNSPEC,
39443946 addr_list[i].addr);
39453947 rc = efx_ef10_filter_insert(efx, &spec, true);
@@ -3968,9 +3970,7 @@ static int efx_ef10_filter_insert_addr_list(struct efx_nic *efx, · 22 unmodified lines
39683970
39693971 if (multicast && rollback) {
39703972 /* Also need an Ethernet broadcast filter */
3971− efx_filter_init_rx(&spec, EFX_FILTER_PRI_AUTO,
3972− EFX_FILTER_FLAG_RX_RSS,
3973− 0);
3973+ efx_filter_init_rx(&spec, EFX_FILTER_PRI_AUTO, filter_flags, 0);
39743974 eth_broadcast_addr(baddr);
39753975 efx_filter_set_eth_local(&spec, EFX_FILTER_VID_UNSPEC, baddr);
39763976 rc = efx_ef10_filter_insert(efx, &spec, true);
@@ -4000,13 +4000,14 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx, bool multicast, · 23 unmodified lines
40004000 {
40014001 struct efx_ef10_filter_table *table = efx->filter_state;
40024002 struct efx_ef10_nic_data *nic_data = efx->nic_data;
4003+ enum efx_filter_flags filter_flags;
40034004 struct efx_filter_spec spec;
40044005 u8 baddr[ETH_ALEN];
40054006 int rc;
40064007
4007− efx_filter_init_rx(&spec, EFX_FILTER_PRI_AUTO,
4008− EFX_FILTER_FLAG_RX_RSS,
4009− 0);
4008+ filter_flags = efx_rss_enabled(efx) ? EFX_FILTER_FLAG_RX_RSS : 0;
4009+
4010+ efx_filter_init_rx(&spec, EFX_FILTER_PRI_AUTO, filter_flags, 0);
40104011
40114012 if (multicast)
40124013 efx_filter_set_mc_def(&spec);
@@ -4023,8 +4024,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx, bool multicast, · 10 unmodified lines
40234024 if (!nic_data->workaround_26807) {
40244025 /* Also need an Ethernet broadcast filter */
40254026 efx_filter_init_rx(&spec, EFX_FILTER_PRI_AUTO,
4026− EFX_FILTER_FLAG_RX_RSS,
4027− 0);
4027+ filter_flags, 0);
40284028 eth_broadcast_addr(baddr);
40294029 efx_filter_set_eth_local(&spec, EFX_FILTER_VID_UNSPEC,
40304030 baddr);
drivers/net/ethernet/sfc/efx.h+5−0
@@ -76,6 +76,11 @@ void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue); · 75 unmodified lines
7676 #define EFX_TXQ_MAX_ENT(efx) (EFX_WORKAROUND_35388(efx) ? \
7777 EFX_MAX_DMAQ_SIZE / 2 : EFX_MAX_DMAQ_SIZE)
7878
79+static inline bool efx_rss_enabled(struct efx_nic *efx)
80+{
81+ return efx->rss_spread > 1;
82+}
83+
7984 /* Filters */
8085
8186 void efx_mac_reconfigure(struct efx_nic *efx);
drivers/net/ethernet/sfc/farch.c+1−1
@@ -2242,7 +2242,7 @@ efx_farch_filter_init_rx_auto(struct efx_nic *efx, · 2241 unmodified lines
22422242 */
22432243 spec->priority = EFX_FILTER_PRI_AUTO;
22442244 spec->flags = (EFX_FILTER_FLAG_RX |
2245− (efx->n_rx_channels > 1 ? EFX_FILTER_FLAG_RX_RSS : 0) |
2245+ (efx_rss_enabled(efx) ? EFX_FILTER_FLAG_RX_RSS : 0) |
22462246 (efx->rx_scatter ? EFX_FILTER_FLAG_RX_SCATTER : 0));
22472247 spec->dmaq_id = 0;
22482248 }
drivers/net/ethernet/sfc/txc43128_phy.c+1−1
@@ -418,7 +418,7 @@ static void txc_reset_logic_mmd(struct efx_nic *efx, int mmd) · 417 unmodified lines
418418
419419 val |= (1 << TXC_GLCMD_LMTSWRST_LBN);
420420 efx_mdio_write(efx, mmd, TXC_GLRGS_GLCMD, val);
421− while (tries--) {
421+ while (--tries) {
422422 val = efx_mdio_read(efx, mmd, TXC_GLRGS_GLCMD);
423423 if (!(val & (1 << TXC_GLCMD_LMTSWRST_LBN)))
424424 break;
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c+5−1
@@ -153,7 +153,11 @@ static int sun7i_gmac_probe(struct platform_device *pdev) · 152 unmodified lines
153153 if (ret)
154154 return ret;
155155
156− return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
156+ ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
157+ if (ret)
158+ sun7i_gmac_exit(pdev, plat_dat->bsp_priv);
159+
160+ return ret;
157161 }
158162
159163 static const struct of_device_id sun7i_dwmac_match[] = {
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c+6−3
@@ -3046,8 +3046,6 @@ int stmmac_suspend(struct net_device *ndev) · 3045 unmodified lines
30463046 priv->hw->dma->stop_tx(priv->ioaddr);
30473047 priv->hw->dma->stop_rx(priv->ioaddr);
30483048
3049− stmmac_clear_descriptors(priv);
3050−
30513049 /* Enable Power down mode by programming the PMT regs */
30523050 if (device_may_wakeup(priv->device)) {
30533051 priv->hw->mac->pmt(priv->hw, priv->wolopts);
@@ -3105,7 +3103,12 @@ int stmmac_resume(struct net_device *ndev) · 51 unmodified lines
31053103
31063104 netif_device_attach(ndev);
31073105
3108− init_dma_desc_rings(ndev, GFP_ATOMIC);
3106+ priv->cur_rx = 0;
3107+ priv->dirty_rx = 0;
3108+ priv->dirty_tx = 0;
3109+ priv->cur_tx = 0;
3110+ stmmac_clear_descriptors(priv);
3111+
31093112 stmmac_hw_setup(ndev, false);
31103113 stmmac_init_tx_coalesce(priv);
31113114 stmmac_set_rx_mode(ndev);
drivers/net/geneve.c+0−2
@@ -967,8 +967,6 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, · 966 unmodified lines
967967 err = udp_tunnel6_xmit_skb(dst, gs6->sock->sk, skb, dev,
968968 &fl6.saddr, &fl6.daddr, prio, ttl,
969969 sport, geneve->dst_port, !udp_csum);
970−
971− iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
972970 return NETDEV_TX_OK;
973971
974972 tx_error:
drivers/net/phy/mdio-mux.c+6−1
@@ -149,9 +149,14 @@ int mdio_mux_init(struct device *dev, · 148 unmodified lines
149149 }
150150 cb->bus_number = v;
151151 cb->parent = pb;
152+
152153 cb->mii_bus = mdiobus_alloc();
154+ if (!cb->mii_bus) {
155+ ret_val = -ENOMEM;
156+ of_node_put(child_bus_node);
157+ break;
158+ }
153159 cb->mii_bus->priv = cb;
154−
155160 cb->mii_bus->irq = cb->phy_irq;
156161 cb->mii_bus->name = "mdio_mux";
157162 snprintf(cb->mii_bus->id, MII_BUS_ID_SIZE, "%x.%x",
drivers/net/phy/micrel.c+11−2
@@ -339,9 +339,18 @@ static int ksz9021_config_init(struct phy_device *phydev) · 338 unmodified lines
339339 {
340340 const struct device *dev = &phydev->dev;
341341 const struct device_node *of_node = dev->of_node;
342+ const struct device *dev_walker;
342343
343− if (!of_node && dev->parent->of_node)
344− of_node = dev->parent->of_node;
344+ /* The Micrel driver has a deprecated option to place phy OF
345+ * properties in the MAC node. Walk up the tree of devices to
346+ * find a device with an OF node.
347+ */
348+ dev_walker = &phydev->dev;
349+ do {
350+ of_node = dev_walker->of_node;
351+ dev_walker = dev_walker->parent;
352+
353+ } while (!of_node && dev_walker);
345354
346355 if (of_node) {
347356 ksz9021_load_values_from_of(phydev, of_node,
drivers/net/ppp/pppoe.c+10−4
@@ -568,6 +568,9 @@ static int pppoe_create(struct net *net, struct socket *sock, int kern) · 567 unmodified lines
568568 sk->sk_family = PF_PPPOX;
569569 sk->sk_protocol = PX_PROTO_OE;
570570
571+ INIT_WORK(&pppox_sk(sk)->proto.pppoe.padt_work,
572+ pppoe_unbind_sock_work);
573+
571574 return 0;
572575 }
573576
@@ -632,8 +635,6 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr, · 58 unmodified lines
632635
633636 lock_sock(sk);
634637
635− INIT_WORK(&po->proto.pppoe.padt_work, pppoe_unbind_sock_work);
636−
637638 error = -EINVAL;
638639 if (sp->sa_protocol != PX_PROTO_OE)
639640 goto end;
@@ -663,8 +664,13 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr, · 23 unmodified lines
663664 po->pppoe_dev = NULL;
664665 }
665666
666− memset(sk_pppox(po) + 1, 0,
667− sizeof(struct pppox_sock) - sizeof(struct sock));
667+ po->pppoe_ifindex = 0;
668+ memset(&po->pppoe_pa, 0, sizeof(po->pppoe_pa));
669+ memset(&po->pppoe_relay, 0, sizeof(po->pppoe_relay));
670+ memset(&po->chan, 0, sizeof(po->chan));
671+ po->next = NULL;
672+ po->num = 0;
673+
668674 sk->sk_state = PPPOX_NONE;
669675 }
670676
drivers/net/ppp/pptp.c+6−0
@@ -419,6 +419,9 @@ static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr, · 418 unmodified lines
419419 struct pptp_opt *opt = &po->proto.pptp;
420420 int error = 0;
421421
422+ if (sockaddr_len < sizeof(struct sockaddr_pppox))
423+ return -EINVAL;
424+
422425 lock_sock(sk);
423426
424427 opt->src_addr = sp->sa_addr.pptp;
@@ -440,6 +443,9 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr, · 15 unmodified lines
440443 struct flowi4 fl4;
441444 int error = 0;
442445
446+ if (sockaddr_len < sizeof(struct sockaddr_pppox))
447+ return -EINVAL;
448+
443449 if (sp->sa_protocol != PX_PROTO_PPTP)
444450 return -EINVAL;
445451
drivers/net/usb/cdc_mbim.c+25−1
@@ -158,7 +158,7 @@ static int cdc_mbim_bind(struct usbnet *dev, struct usb_interface *intf) · 157 unmodified lines
158158 if (!cdc_ncm_comm_intf_is_mbim(intf->cur_altsetting))
159159 goto err;
160160
161− ret = cdc_ncm_bind_common(dev, intf, data_altsetting, 0);
161+ ret = cdc_ncm_bind_common(dev, intf, data_altsetting, dev->driver_info->data);
162162 if (ret)
163163 goto err;
164164
@@ -582,6 +582,26 @@ static const struct driver_info cdc_mbim_info_zlp = { · 417 unmodified lines
582582 .tx_fixup = cdc_mbim_tx_fixup,
583583 };
584584
585+/* The spefication explicitly allows NDPs to be placed anywhere in the
586+ * frame, but some devices fail unless the NDP is placed after the IP
587+ * packets. Using the CDC_NCM_FLAG_NDP_TO_END flags to force this
588+ * behaviour.
589+ *
590+ * Note: The current implementation of this feature restricts each NTB
591+ * to a single NDP, implying that multiplexed sessions cannot share an
592+ * NTB. This might affect performace for multiplexed sessions.
593+ */
594+static const struct driver_info cdc_mbim_info_ndp_to_end = {
595+ .description = "CDC MBIM",
596+ .flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN,
597+ .bind = cdc_mbim_bind,
598+ .unbind = cdc_mbim_unbind,
599+ .manage_power = cdc_mbim_manage_power,
600+ .rx_fixup = cdc_mbim_rx_fixup,
601+ .tx_fixup = cdc_mbim_tx_fixup,
602+ .data = CDC_NCM_FLAG_NDP_TO_END,
603+};
604+
585605 static const struct usb_device_id mbim_devs[] = {
586606 /* This duplicate NCM entry is intentional. MBIM devices can
587607 * be disguised as NCM by default, and this is necessary to
@@ -597,6 +617,10 @@ static const struct usb_device_id mbim_devs[] = { · 9 unmodified lines
597617 { USB_VENDOR_AND_INTERFACE_INFO(0x0bdb, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
598618 .driver_info = (unsigned long)&cdc_mbim_info,
599619 },
620+ /* Huawei E3372 fails unless NDP comes after the IP packets */
621+ { USB_DEVICE_AND_INTERFACE_INFO(0x12d1, 0x157d, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
622+ .driver_info = (unsigned long)&cdc_mbim_info_ndp_to_end,
623+ },
600624 /* default entry */
601625 { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
602626 .driver_info = (unsigned long)&cdc_mbim_info_zlp,
drivers/net/usb/cdc_ncm.c+9−1
@@ -955,10 +955,18 @@ static struct usb_cdc_ncm_ndp16 *cdc_ncm_ndp(struct cdc_ncm_ctx *ctx, struct sk_ · 954 unmodified lines
955955 * NTH16 header as we would normally do. NDP isn't written to the SKB yet, and
956956 * the wNdpIndex field in the header is actually not consistent with reality. It will be later.
957957 */
958− if (ctx->drvflags & CDC_NCM_FLAG_NDP_TO_END)
958+ if (ctx->drvflags & CDC_NCM_FLAG_NDP_TO_END) {
959959 if (ctx->delayed_ndp16->dwSignature == sign)
960960 return ctx->delayed_ndp16;
961961
962+ /* We can only push a single NDP to the end. Return
963+ * NULL to send what we've already got and queue this
964+ * skb for later.
965+ */
966+ else if (ctx->delayed_ndp16->dwSignature)
967+ return NULL;
968+ }
969+
962970 /* follow the chain of NDPs, looking for a match */
963971 while (ndpoffset) {
964972 ndp16 = (struct usb_cdc_ncm_ndp16 *)(skb->data + ndpoffset);
drivers/net/usb/r8152.c+3−18
@@ -3067,17 +3067,6 @@ static int rtl8152_open(struct net_device *netdev) · 3066 unmodified lines
30673067
30683068 mutex_lock(&tp->control);
30693069
3070− /* The WORK_ENABLE may be set when autoresume occurs */
3071− if (test_bit(WORK_ENABLE, &tp->flags)) {
3072− clear_bit(WORK_ENABLE, &tp->flags);
3073− usb_kill_urb(tp->intr_urb);
3074− cancel_delayed_work_sync(&tp->schedule);
3075−
3076− /* disable the tx/rx, if the workqueue has enabled them. */
3077− if (netif_carrier_ok(netdev))
3078− tp->rtl_ops.disable(tp);
3079− }
3080−
30813070 tp->rtl_ops.up(tp);
30823071
30833072 rtl8152_set_speed(tp, AUTONEG_ENABLE,
@@ -3124,12 +3113,6 @@ static int rtl8152_close(struct net_device *netdev) · 40 unmodified lines
31243113 } else {
31253114 mutex_lock(&tp->control);
31263115
3127− /* The autosuspend may have been enabled and wouldn't
3128− * be disable when autoresume occurs, because the
3129− * netif_running() would be false.
3130− */
3131− rtl_runtime_suspend_enable(tp, false);
3132−
31333116 tp->rtl_ops.down(tp);
31343117
31353118 mutex_unlock(&tp->control);
@@ -3512,7 +3495,7 @@ static int rtl8152_resume(struct usb_interface *intf) · 376 unmodified lines
35123495 netif_device_attach(tp->netdev);
35133496 }
35143497
3515− if (netif_running(tp->netdev)) {
3498+ if (netif_running(tp->netdev) && tp->netdev->flags & IFF_UP) {
35163499 if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
35173500 rtl_runtime_suspend_enable(tp, false);
35183501 clear_bit(SELECTIVE_SUSPEND, &tp->flags);
@@ -3532,6 +3515,8 @@ static int rtl8152_resume(struct usb_interface *intf) · 13 unmodified lines
35323515 }
35333516 usb_submit_urb(tp->intr_urb, GFP_KERNEL);
35343517 } else if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
3518+ if (tp->netdev->flags & IFF_UP)
3519+ rtl_runtime_suspend_enable(tp, false);
35353520 clear_bit(SELECTIVE_SUSPEND, &tp->flags);
35363521 }
35373522
drivers/net/virtio_net.c+19−15
@@ -140,6 +140,12 @@ struct virtnet_info { · 139 unmodified lines
140140
141141 /* CPU hot plug notifier */
142142 struct notifier_block nb;
143+
144+ /* Control VQ buffers: protected by the rtnl lock */
145+ struct virtio_net_ctrl_hdr ctrl_hdr;
146+ virtio_net_ctrl_ack ctrl_status;
147+ u8 ctrl_promisc;
148+ u8 ctrl_allmulti;
143149 };
144150
145151 struct padded_vnet_hdr {
@@ -976,31 +982,30 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, · 830 unmodified lines
976982 struct scatterlist *out)
977983 {
978984 struct scatterlist *sgs[4], hdr, stat;
979− struct virtio_net_ctrl_hdr ctrl;
980− virtio_net_ctrl_ack status = ~0;
981985 unsigned out_num = 0, tmp;
982986
983987 /* Caller should know better */
984988 BUG_ON(!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ));
985989
986− ctrl.class = class;
987− ctrl.cmd = cmd;
990+ vi->ctrl_status = ~0;
991+ vi->ctrl_hdr.class = class;
992+ vi->ctrl_hdr.cmd = cmd;
988993 /* Add header */
989− sg_init_one(&hdr, &ctrl, sizeof(ctrl));
994+ sg_init_one(&hdr, &vi->ctrl_hdr, sizeof(vi->ctrl_hdr));
990995 sgs[out_num++] = &hdr;
991996
992997 if (out)
993998 sgs[out_num++] = out;
994999
9951000 /* Add return status. */
996− sg_init_one(&stat, &status, sizeof(status));
1001+ sg_init_one(&stat, &vi->ctrl_status, sizeof(vi->ctrl_status));
9971002 sgs[out_num] = &stat;
9981003
9991004 BUG_ON(out_num + 1 > ARRAY_SIZE(sgs));
10001005 virtqueue_add_sgs(vi->cvq, sgs, out_num, 1, vi, GFP_ATOMIC);
10011006
10021007 if (unlikely(!virtqueue_kick(vi->cvq)))
1003− return status == VIRTIO_NET_OK;
1008+ return vi->ctrl_status == VIRTIO_NET_OK;
10041009
10051010 /* Spin for a response, the kick causes an ioport write, trapping
10061011 * into the hypervisor, so the request should be handled immediately.
@@ -1009,7 +1014,7 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, · 2 unmodified lines
10091014 !virtqueue_is_broken(vi->cvq))
10101015 cpu_relax();
10111016
1012− return status == VIRTIO_NET_OK;
1017+ return vi->ctrl_status == VIRTIO_NET_OK;
10131018 }
10141019
10151020 static int virtnet_set_mac_address(struct net_device *dev, void *p)
@@ -1151,7 +1156,6 @@ static void virtnet_set_rx_mode(struct net_device *dev) · 135 unmodified lines
11511156 {
11521157 struct virtnet_info *vi = netdev_priv(dev);
11531158 struct scatterlist sg[2];
1154− u8 promisc, allmulti;
11551159 struct virtio_net_ctrl_mac *mac_data;
11561160 struct netdev_hw_addr *ha;
11571161 int uc_count;
@@ -1163,22 +1167,22 @@ static void virtnet_set_rx_mode(struct net_device *dev) · 5 unmodified lines
11631167 if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_RX))
11641168 return;
11651169
1166− promisc = ((dev->flags & IFF_PROMISC) != 0);
1167− allmulti = ((dev->flags & IFF_ALLMULTI) != 0);
1170+ vi->ctrl_promisc = ((dev->flags & IFF_PROMISC) != 0);
1171+ vi->ctrl_allmulti = ((dev->flags & IFF_ALLMULTI) != 0);
11681172
1169− sg_init_one(sg, &promisc, sizeof(promisc));
1173+ sg_init_one(sg, &vi->ctrl_promisc, sizeof(vi->ctrl_promisc));
11701174
11711175 if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
11721176 VIRTIO_NET_CTRL_RX_PROMISC, sg))
11731177 dev_warn(&dev->dev, "Failed to %sable promisc mode.\n",
1174− promisc ? "en" : "dis");
1178+ vi->ctrl_promisc ? "en" : "dis");
11751179
1176− sg_init_one(sg, &allmulti, sizeof(allmulti));
1180+ sg_init_one(sg, &vi->ctrl_allmulti, sizeof(vi->ctrl_allmulti));
11771181
11781182 if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
11791183 VIRTIO_NET_CTRL_RX_ALLMULTI, sg))
11801184 dev_warn(&dev->dev, "Failed to %sable allmulti mode.\n",
1181− allmulti ? "en" : "dis");
1185+ vi->ctrl_allmulti ? "en" : "dis");
11821186
11831187 uc_count = netdev_uc_count(dev);
11841188 mc_count = netdev_mc_count(dev);
drivers/net/vxlan.c+59−16
@@ -1158,7 +1158,6 @@ static void vxlan_rcv(struct vxlan_sock *vs, struct sk_buff *skb, · 1157 unmodified lines
11581158 struct pcpu_sw_netstats *stats;
11591159 union vxlan_addr saddr;
11601160 int err = 0;
1161− union vxlan_addr *remote_ip;
11621161
11631162 /* For flow based devices, map all packets to VNI 0 */
11641163 if (vs->flags & VXLAN_F_COLLECT_METADATA)
@@ -1169,7 +1168,6 @@ static void vxlan_rcv(struct vxlan_sock *vs, struct sk_buff *skb, · 4 unmodified lines
11691168 if (!vxlan)
11701169 goto drop;
11711170
1172− remote_ip = &vxlan->default_dst.remote_ip;
11731171 skb_reset_mac_header(skb);
11741172 skb_scrub_packet(skb, !net_eq(vxlan->net, dev_net(vxlan->dev)));
11751173 skb->protocol = eth_type_trans(skb, vxlan->dev);
@@ -1179,8 +1177,8 @@ static void vxlan_rcv(struct vxlan_sock *vs, struct sk_buff *skb, · 3 unmodified lines
11791177 if (ether_addr_equal(eth_hdr(skb)->h_source, vxlan->dev->dev_addr))
11801178 goto drop;
11811179
1182− /* Re-examine inner Ethernet packet */
1183− if (remote_ip->sa.sa_family == AF_INET) {
1180+ /* Get data from the outer IP header */
1181+ if (vxlan_get_sk_family(vs) == AF_INET) {
11841182 oip = ip_hdr(skb);
11851183 saddr.sin.sin_addr.s_addr = oip->saddr;
11861184 saddr.sa.sa_family = AF_INET;
@@ -1848,6 +1846,34 @@ static int vxlan_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *sk · 661 unmodified lines
18481846 !(vxflags & VXLAN_F_UDP_CSUM));
18491847 }
18501848
1849+#if IS_ENABLED(CONFIG_IPV6)
1850+static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan,
1851+ struct sk_buff *skb, int oif,
1852+ const struct in6_addr *daddr,
1853+ struct in6_addr *saddr)
1854+{
1855+ struct dst_entry *ndst;
1856+ struct flowi6 fl6;
1857+ int err;
1858+
1859+ memset(&fl6, 0, sizeof(fl6));
1860+ fl6.flowi6_oif = oif;
1861+ fl6.daddr = *daddr;
1862+ fl6.saddr = vxlan->cfg.saddr.sin6.sin6_addr;
1863+ fl6.flowi6_mark = skb->mark;
1864+ fl6.flowi6_proto = IPPROTO_UDP;
1865+
1866+ err = ipv6_stub->ipv6_dst_lookup(vxlan->net,
1867+ vxlan->vn6_sock->sock->sk,
1868+ &ndst, &fl6);
1869+ if (err < 0)
1870+ return ERR_PTR(err);
1871+
1872+ *saddr = fl6.saddr;
1873+ return ndst;
1874+}
1875+#endif
1876+
18511877 /* Bypass encapsulation if the destination is local */
18521878 static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
18531879 struct vxlan_dev *dst_vxlan)
@@ -2035,21 +2061,17 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, · 181 unmodified lines
20352061 #if IS_ENABLED(CONFIG_IPV6)
20362062 } else {
20372063 struct dst_entry *ndst;
2038− struct flowi6 fl6;
2064+ struct in6_addr saddr;
20392065 u32 rt6i_flags;
20402066
20412067 if (!vxlan->vn6_sock)
20422068 goto drop;
20432069 sk = vxlan->vn6_sock->sock->sk;
20442070
2045− memset(&fl6, 0, sizeof(fl6));
2046− fl6.flowi6_oif = rdst ? rdst->remote_ifindex : 0;
2047− fl6.daddr = dst->sin6.sin6_addr;
2048− fl6.saddr = vxlan->cfg.saddr.sin6.sin6_addr;
2049− fl6.flowi6_mark = skb->mark;
2050− fl6.flowi6_proto = IPPROTO_UDP;
2051−
2052− if (ipv6_stub->ipv6_dst_lookup(vxlan->net, sk, &ndst, &fl6)) {
2071+ ndst = vxlan6_get_route(vxlan, skb,
2072+ rdst ? rdst->remote_ifindex : 0,
2073+ &dst->sin6.sin6_addr, &saddr);
2074+ if (IS_ERR(ndst)) {
20532075 netdev_dbg(dev, "no route to %pI6\n",
20542076 &dst->sin6.sin6_addr);
20552077 dev->stats.tx_carrier_errors++;
@@ -2081,7 +2103,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, · 25 unmodified lines
20812103 }
20822104
20832105 ttl = ttl ? : ip6_dst_hoplimit(ndst);
2084− err = vxlan6_xmit_skb(ndst, sk, skb, dev, &fl6.saddr, &fl6.daddr,
2106+ err = vxlan6_xmit_skb(ndst, sk, skb, dev, &saddr, &dst->sin6.sin6_addr,
20852107 0, ttl, src_port, dst_port, htonl(vni << 8), md,
20862108 !net_eq(vxlan->net, dev_net(vxlan->dev)),
20872109 flags);
@@ -2395,9 +2417,30 @@ static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) · 307 unmodified lines
23952417 vxlan->cfg.port_max, true);
23962418 dport = info->key.tp_dst ? : vxlan->cfg.dst_port;
23972419
2398− if (ip_tunnel_info_af(info) == AF_INET)
2420+ if (ip_tunnel_info_af(info) == AF_INET) {
2421+ if (!vxlan->vn4_sock)
2422+ return -EINVAL;
23992423 return egress_ipv4_tun_info(dev, skb, info, sport, dport);
2400− return -EINVAL;
2424+ } else {
2425+#if IS_ENABLED(CONFIG_IPV6)
2426+ struct dst_entry *ndst;
2427+
2428+ if (!vxlan->vn6_sock)
2429+ return -EINVAL;
2430+ ndst = vxlan6_get_route(vxlan, skb, 0,
2431+ &info->key.u.ipv6.dst,
2432+ &info->key.u.ipv6.src);
2433+ if (IS_ERR(ndst))
2434+ return PTR_ERR(ndst);
2435+ dst_release(ndst);
2436+
2437+ info->key.tp_src = sport;
2438+ info->key.tp_dst = dport;
2439+#else /* !CONFIG_IPV6 */
2440+ return -EPFNOSUPPORT;
2441+#endif
2442+ }
2443+ return 0;
24012444 }
24022445
24032446 static const struct net_device_ops vxlan_netdev_ops = {
drivers/net/xen-netback/netback.c+15−19
@@ -258,18 +258,18 @@ static struct xenvif_rx_meta *get_next_rx_buffer(struct xenvif_queue *queue, · 257 unmodified lines
258258 struct netrx_pending_operations *npo)
259259 {
260260 struct xenvif_rx_meta *meta;
261− struct xen_netif_rx_request *req;
261+ struct xen_netif_rx_request req;
262262
263− req = RING_GET_REQUEST(&queue->rx, queue->rx.req_cons++);
263+ RING_COPY_REQUEST(&queue->rx, queue->rx.req_cons++, &req);
264264
265265 meta = npo->meta + npo->meta_prod++;
266266 meta->gso_type = XEN_NETIF_GSO_TYPE_NONE;
267267 meta->gso_size = 0;
268268 meta->size = 0;
269− meta->id = req->id;
269+ meta->id = req.id;
270270
271271 npo->copy_off = 0;
272− npo->copy_gref = req->gref;
272+ npo->copy_gref = req.gref;
273273
274274 return meta;
275275 }
@@ -424,7 +424,7 @@ static int xenvif_gop_skb(struct sk_buff *skb, · 148 unmodified lines
424424 struct xenvif *vif = netdev_priv(skb->dev);
425425 int nr_frags = skb_shinfo(skb)->nr_frags;
426426 int i;
427− struct xen_netif_rx_request *req;
427+ struct xen_netif_rx_request req;
428428 struct xenvif_rx_meta *meta;
429429 unsigned char *data;
430430 int head = 1;
@@ -443,15 +443,15 @@ static int xenvif_gop_skb(struct sk_buff *skb, · 12 unmodified lines
443443
444444 /* Set up a GSO prefix descriptor, if necessary */
445445 if ((1 << gso_type) & vif->gso_prefix_mask) {
446− req = RING_GET_REQUEST(&queue->rx, queue->rx.req_cons++);
446+ RING_COPY_REQUEST(&queue->rx, queue->rx.req_cons++, &req);
447447 meta = npo->meta + npo->meta_prod++;
448448 meta->gso_type = gso_type;
449449 meta->gso_size = skb_shinfo(skb)->gso_size;
450450 meta->size = 0;
451− meta->id = req->id;
451+ meta->id = req.id;
452452 }
453453
454− req = RING_GET_REQUEST(&queue->rx, queue->rx.req_cons++);
454+ RING_COPY_REQUEST(&queue->rx, queue->rx.req_cons++, &req);
455455 meta = npo->meta + npo->meta_prod++;
456456
457457 if ((1 << gso_type) & vif->gso_mask) {
@@ -463,9 +463,9 @@ static int xenvif_gop_skb(struct sk_buff *skb, · 5 unmodified lines
463463 }
464464
465465 meta->size = 0;
466− meta->id = req->id;
466+ meta->id = req.id;
467467 npo->copy_off = 0;
468− npo->copy_gref = req->gref;
468+ npo->copy_gref = req.gref;
469469
470470 data = skb->data;
471471 while (data < skb_tail_pointer(skb)) {
@@ -679,9 +679,7 @@ static void tx_add_credit(struct xenvif_queue *queue) · 207 unmodified lines
679679 * Allow a burst big enough to transmit a jumbo packet of up to 128kB.
680680 * Otherwise the interface can seize up due to insufficient credit.
681681 */
682− max_burst = RING_GET_REQUEST(&queue->tx, queue->tx.req_cons)->size;
683− max_burst = min(max_burst, 131072UL);
684− max_burst = max(max_burst, queue->credit_bytes);
682+ max_burst = max(131072UL, queue->credit_bytes);
685683
686684 /* Take care that adding a new chunk of credit doesn't wrap to zero. */
687685 max_credit = queue->remaining_credit + queue->credit_bytes;
@@ -711,7 +709,7 @@ static void xenvif_tx_err(struct xenvif_queue *queue, · 23 unmodified lines
711709 spin_unlock_irqrestore(&queue->response_lock, flags);
712710 if (cons == end)
713711 break;
714− txp = RING_GET_REQUEST(&queue->tx, cons++);
712+ RING_COPY_REQUEST(&queue->tx, cons++, txp);
715713 } while (1);
716714 queue->tx.req_cons = cons;
717715 }
@@ -778,8 +776,7 @@ static int xenvif_count_requests(struct xenvif_queue *queue, · 60 unmodified lines
778776 if (drop_err)
779777 txp = &dropped_tx;
780778
781− memcpy(txp, RING_GET_REQUEST(&queue->tx, cons + slots),
782− sizeof(*txp));
779+ RING_COPY_REQUEST(&queue->tx, cons + slots, txp);
783780
784781 /* If the guest submitted a frame >= 64 KiB then
785782 * first->size overflowed and following slots will
@@ -1112,8 +1109,7 @@ static int xenvif_get_extras(struct xenvif_queue *queue, · 326 unmodified lines
11121109 return -EBADR;
11131110 }
11141111
1115− memcpy(&extra, RING_GET_REQUEST(&queue->tx, cons),
1116− sizeof(extra));
1112+ RING_COPY_REQUEST(&queue->tx, cons, &extra);
11171113 if (unlikely(!extra.type ||
11181114 extra.type >= XEN_NETIF_EXTRA_TYPE_MAX)) {
11191115 queue->tx.req_cons = ++cons;
@@ -1322,7 +1318,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, · 202 unmodified lines
13221318
13231319 idx = queue->tx.req_cons;
13241320 rmb(); /* Ensure that we see the request before we copy it. */
1325− memcpy(&txreq, RING_GET_REQUEST(&queue->tx, idx), sizeof(txreq));
1321+ RING_COPY_REQUEST(&queue->tx, idx, &txreq);
13261322
13271323 /* Credit-based scheduling. */
13281324 if (txreq.size > queue->remaining_credit &&
drivers/nvme/host/lightnvm.c+14−12
@@ -271,9 +271,9 @@ static int init_grps(struct nvm_id *nvm_id, struct nvme_nvm_id *nvme_nvm_id) · 270 unmodified lines
271271 return 0;
272272 }
273273
274−static int nvme_nvm_identity(struct request_queue *q, struct nvm_id *nvm_id)
274+static int nvme_nvm_identity(struct nvm_dev *nvmdev, struct nvm_id *nvm_id)
275275 {
276− struct nvme_ns *ns = q->queuedata;
276+ struct nvme_ns *ns = nvmdev->q->queuedata;
277277 struct nvme_dev *dev = ns->dev;
278278 struct nvme_nvm_id *nvme_nvm_id;
279279 struct nvme_nvm_command c = {};
@@ -308,10 +308,10 @@ out: · 28 unmodified lines
308308 return ret;
309309 }
310310
311−static int nvme_nvm_get_l2p_tbl(struct request_queue *q, u64 slba, u32 nlb,
311+static int nvme_nvm_get_l2p_tbl(struct nvm_dev *nvmdev, u64 slba, u32 nlb,
312312 nvm_l2p_update_fn *update_l2p, void *priv)
313313 {
314− struct nvme_ns *ns = q->queuedata;
314+ struct nvme_ns *ns = nvmdev->q->queuedata;
315315 struct nvme_dev *dev = ns->dev;
316316 struct nvme_nvm_command c = {};
317317 u32 len = queue_max_hw_sectors(dev->admin_q) << 9;
@@ -415,10 +415,10 @@ out: · 97 unmodified lines
415415 return ret;
416416 }
417417
418−static int nvme_nvm_set_bb_tbl(struct request_queue *q, struct nvm_rq *rqd,
418+static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct nvm_rq *rqd,
419419 int type)
420420 {
421− struct nvme_ns *ns = q->queuedata;
421+ struct nvme_ns *ns = nvmdev->q->queuedata;
422422 struct nvme_dev *dev = ns->dev;
423423 struct nvme_nvm_command c = {};
424424 int ret = 0;
@@ -455,7 +455,7 @@ static void nvme_nvm_end_io(struct request *rq, int error) · 30 unmodified lines
455455 struct nvm_rq *rqd = rq->end_io_data;
456456 struct nvm_dev *dev = rqd->dev;
457457
458− if (dev->mt->end_io(rqd, error))
458+ if (dev->mt && dev->mt->end_io(rqd, error))
459459 pr_err("nvme: err status: %x result: %lx\n",
460460 rq->errors, (unsigned long)rq->special);
461461
@@ -463,8 +463,9 @@ static void nvme_nvm_end_io(struct request *rq, int error) · 1 unmodified line
463463 blk_mq_free_request(rq);
464464 }
465465
466−static int nvme_nvm_submit_io(struct request_queue *q, struct nvm_rq *rqd)
466+static int nvme_nvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)
467467 {
468+ struct request_queue *q = dev->q;
468469 struct nvme_ns *ns = q->queuedata;
469470 struct request *rq;
470471 struct bio *bio = rqd->bio;
@@ -502,8 +503,9 @@ static int nvme_nvm_submit_io(struct request_queue *q, struct nvm_rq *rqd) · 31 unmodified lines
502503 return 0;
503504 }
504505
505−static int nvme_nvm_erase_block(struct request_queue *q, struct nvm_rq *rqd)
506+static int nvme_nvm_erase_block(struct nvm_dev *dev, struct nvm_rq *rqd)
506507 {
508+ struct request_queue *q = dev->q;
507509 struct nvme_ns *ns = q->queuedata;
508510 struct nvme_nvm_command c = {};
509511
@@ -515,9 +517,9 @@ static int nvme_nvm_erase_block(struct request_queue *q, struct nvm_rq *rqd) · 5 unmodified lines
515517 return nvme_submit_sync_cmd(q, (struct nvme_command *)&c, NULL, 0);
516518 }
517519
518−static void *nvme_nvm_create_dma_pool(struct request_queue *q, char *name)
520+static void *nvme_nvm_create_dma_pool(struct nvm_dev *nvmdev, char *name)
519521 {
520− struct nvme_ns *ns = q->queuedata;
522+ struct nvme_ns *ns = nvmdev->q->queuedata;
521523 struct nvme_dev *dev = ns->dev;
522524
523525 return dma_pool_create(name, dev->dev, PAGE_SIZE, PAGE_SIZE, 0);
@@ -530,7 +532,7 @@ static void nvme_nvm_destroy_dma_pool(void *pool) · 6 unmodified lines
530532 dma_pool_destroy(dma_pool);
531533 }
532534
533−static void *nvme_nvm_dev_dma_alloc(struct request_queue *q, void *pool,
535+static void *nvme_nvm_dev_dma_alloc(struct nvm_dev *dev, void *pool,
534536 gfp_t mem_flags, dma_addr_t *dma_handler)
535537 {
536538 return dma_pool_alloc(pool, mem_flags, dma_handler);
drivers/nvme/host/pci.c+19−1
@@ -2540,8 +2540,17 @@ static void nvme_ns_remove(struct nvme_ns *ns) · 2539 unmodified lines
25402540 {
25412541 bool kill = nvme_io_incapable(ns->dev) && !blk_queue_dying(ns->queue);
25422542
2543− if (kill)
2543+ if (kill) {
25442544 blk_set_queue_dying(ns->queue);
2545+
2546+ /*
2547+ * The controller was shutdown first if we got here through
2548+ * device removal. The shutdown may requeue outstanding
2549+ * requests. These need to be aborted immediately so
2550+ * del_gendisk doesn't block indefinitely for their completion.
2551+ */
2552+ blk_mq_abort_requeue_list(ns->queue);
2553+ }
25452554 if (ns->disk->flags & GENHD_FL_UP)
25462555 del_gendisk(ns->disk);
25472556 if (kill || !blk_queue_dying(ns->queue)) {
@@ -2977,6 +2986,15 @@ static void nvme_dev_remove(struct nvme_dev *dev) · 429 unmodified lines
29772986 {
29782987 struct nvme_ns *ns, *next;
29792988
2989+ if (nvme_io_incapable(dev)) {
2990+ /*
2991+ * If the device is not capable of IO (surprise hot-removal,
2992+ * for example), we need to quiesce prior to deleting the
2993+ * namespaces. This will end outstanding requests and prevent
2994+ * attempts to sync dirty data.
2995+ */
2996+ nvme_dev_shutdown(dev);
2997+ }
29802998 list_for_each_entry_safe(ns, next, &dev->namespaces, list)
29812999 nvme_ns_remove(ns);
29823000 }
drivers/of/address.c+3−2
@@ -485,9 +485,10 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, · 484 unmodified lines
485485 int rone;
486486 u64 offset = OF_BAD_ADDR;
487487
488− /* Normally, an absence of a "ranges" property means we are
488+ /*
489+ * Normally, an absence of a "ranges" property means we are
489490 * crossing a non-translatable boundary, and thus the addresses
490− * below the current not cannot be converted to CPU physical ones.
491+ * below the current cannot be converted to CPU physical ones.
491492 * Unfortunately, while this is very clear in the spec, it's not
492493 * what Apple understood, and they do have things like /uni-n or
493494 * /ht nodes with no "ranges" property and a lot of perfectly
drivers/of/fdt.c+6−1
@@ -13,6 +13,7 @@ · 12 unmodified lines
1313 #include <linux/kernel.h>
1414 #include <linux/initrd.h>
1515 #include <linux/memblock.h>
16+#include <linux/mutex.h>
1617 #include <linux/of.h>
1718 #include <linux/of_fdt.h>
1819 #include <linux/of_reserved_mem.h>
@@ -436,6 +437,8 @@ static void *kernel_tree_alloc(u64 size, u64 align) · 417 unmodified lines
436437 return kzalloc(size, GFP_KERNEL);
437438 }
438439
440+static DEFINE_MUTEX(of_fdt_unflatten_mutex);
441+
439442 /**
440443 * of_fdt_unflatten_tree - create tree of device_nodes from flat blob
441444 *
@@ -447,7 +450,9 @@ static void *kernel_tree_alloc(u64 size, u64 align) · 5 unmodified lines
447450 void of_fdt_unflatten_tree(const unsigned long *blob,
448451 struct device_node **mynodes)
449452 {
453+ mutex_lock(&of_fdt_unflatten_mutex);
450454 __unflatten_device_tree(blob, mynodes, &kernel_tree_alloc);
455+ mutex_unlock(&of_fdt_unflatten_mutex);
451456 }
452457 EXPORT_SYMBOL_GPL(of_fdt_unflatten_tree);
453458
@@ -1041,7 +1046,7 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) · 587 unmodified lines
10411046 int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,
10421047 phys_addr_t size, bool nomap)
10431048 {
1044− pr_err("Reserved memory not supported, ignoring range 0x%pa - 0x%pa%s\n",
1049+ pr_err("Reserved memory not supported, ignoring range %pa - %pa%s\n",
10451050 &base, &size, nomap ? " (nomap)" : "");
10461051 return -ENOSYS;
10471052 }
drivers/of/irq.c+2−1
@@ -53,7 +53,7 @@ EXPORT_SYMBOL_GPL(irq_of_parse_and_map); · 52 unmodified lines
5353 * Returns a pointer to the interrupt parent node, or NULL if the interrupt
5454 * parent could not be determined.
5555 */
56−static struct device_node *of_irq_find_parent(struct device_node *child)
56+struct device_node *of_irq_find_parent(struct device_node *child)
5757 {
5858 struct device_node *p;
5959 const __be32 *parp;
@@ -77,6 +77,7 @@ static struct device_node *of_irq_find_parent(struct device_node *child) · 17 unmodified lines
7777
7878 return p;
7979 }
80+EXPORT_SYMBOL_GPL(of_irq_find_parent);
8081
8182 /**
8283 * of_irq_parse_raw - Low level interrupt tree parsing
drivers/of/of_reserved_mem.c+7−1
@@ -206,7 +206,13 @@ static int __init __rmem_cmp(const void *a, const void *b) · 205 unmodified lines
206206 {
207207 const struct reserved_mem *ra = a, *rb = b;
208208
209− return ra->base - rb->base;
209+ if (ra->base < rb->base)
210+ return -1;
211+
212+ if (ra->base > rb->base)
213+ return 1;
214+
215+ return 0;
210216 }
211217
212218 static void __init __rmem_check_for_overlap(void)
drivers/parisc/iommu-helpers.h+8−7
@@ -104,7 +104,11 @@ iommu_coalesce_chunks(struct ioc *ioc, struct device *dev, · 103 unmodified lines
104104 struct scatterlist *contig_sg; /* contig chunk head */
105105 unsigned long dma_offset, dma_len; /* start/len of DMA stream */
106106 unsigned int n_mappings = 0;
107− unsigned int max_seg_size = dma_get_max_seg_size(dev);
107+ unsigned int max_seg_size = min(dma_get_max_seg_size(dev),
108+ (unsigned)DMA_CHUNK_SIZE);
109+ unsigned int max_seg_boundary = dma_get_seg_boundary(dev) + 1;
110+ if (max_seg_boundary) /* check if the addition above didn't overflow */
111+ max_seg_size = min(max_seg_size, max_seg_boundary);
108112
109113 while (nents > 0) {
110114
@@ -138,14 +142,11 @@ iommu_coalesce_chunks(struct ioc *ioc, struct device *dev, · 27 unmodified lines
138142
139143 /*
140144 ** First make sure current dma stream won't
141− ** exceed DMA_CHUNK_SIZE if we coalesce the
145+ ** exceed max_seg_size if we coalesce the
142146 ** next entry.
143147 */
144− if(unlikely(ALIGN(dma_len + dma_offset + startsg->length,
145− IOVP_SIZE) > DMA_CHUNK_SIZE))
146− break;
147−
148− if (startsg->length + dma_len > max_seg_size)
148+ if (unlikely(ALIGN(dma_len + dma_offset + startsg->length, IOVP_SIZE) >
149+ max_seg_size))
149150 break;
150151
151152 /*
drivers/pci/host/pcie-altera.c+16−7
@@ -55,8 +55,10 @@ · 54 unmodified lines
5555 #define TLP_CFG_DW2(bus, devfn, offset) \
5656 (((bus) << 24) | ((devfn) << 16) | (offset))
5757 #define TLP_REQ_ID(bus, devfn) (((bus) << 8) | (devfn))
58+#define TLP_COMP_STATUS(s) (((s) >> 12) & 7)
5859 #define TLP_HDR_SIZE 3
5960 #define TLP_LOOP 500
61+#define RP_DEVFN 0
6062
6163 #define INTX_NUM 4
6264
@@ -166,34 +168,41 @@ static bool altera_pcie_valid_config(struct altera_pcie *pcie, · 103 unmodified lines
166168
167169 static int tlp_read_packet(struct altera_pcie *pcie, u32 *value)
168170 {
169− u8 loop;
171+ int i;
170172 bool sop = 0;
171173 u32 ctrl;
172174 u32 reg0, reg1;
175+ u32 comp_status = 1;
173176
174177 /*
175178 * Minimum 2 loops to read TLP headers and 1 loop to read data
176179 * payload.
177180 */
178− for (loop = 0; loop < TLP_LOOP; loop++) {
181+ for (i = 0; i < TLP_LOOP; i++) {
179182 ctrl = cra_readl(pcie, RP_RXCPL_STATUS);
180183 if ((ctrl & RP_RXCPL_SOP) || (ctrl & RP_RXCPL_EOP) || sop) {
181184 reg0 = cra_readl(pcie, RP_RXCPL_REG0);
182185 reg1 = cra_readl(pcie, RP_RXCPL_REG1);
183186
184− if (ctrl & RP_RXCPL_SOP)
187+ if (ctrl & RP_RXCPL_SOP) {
185188 sop = true;
189+ comp_status = TLP_COMP_STATUS(reg1);
190+ }
186191
187192 if (ctrl & RP_RXCPL_EOP) {
193+ if (comp_status)
194+ return PCIBIOS_DEVICE_NOT_FOUND;
195+
188196 if (value)
189197 *value = reg0;
198+
190199 return PCIBIOS_SUCCESSFUL;
191200 }
192201 }
193202 udelay(5);
194203 }
195204
196− return -ENOENT;
205+ return PCIBIOS_DEVICE_NOT_FOUND;
197206 }
198207
199208 static void tlp_write_packet(struct altera_pcie *pcie, u32 *headers,
@@ -233,7 +242,7 @@ static int tlp_cfg_dword_read(struct altera_pcie *pcie, u8 bus, u32 devfn, · 33 unmodified lines
233242 else
234243 headers[0] = TLP_CFG_DW0(TLP_FMTTYPE_CFGRD1);
235244
236− headers[1] = TLP_CFG_DW1(TLP_REQ_ID(pcie->root_bus_nr, devfn),
245+ headers[1] = TLP_CFG_DW1(TLP_REQ_ID(pcie->root_bus_nr, RP_DEVFN),
237246 TLP_READ_TAG, byte_en);
238247 headers[2] = TLP_CFG_DW2(bus, devfn, where);
239248
@@ -253,7 +262,7 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn, · 13 unmodified lines
253262 else
254263 headers[0] = TLP_CFG_DW0(TLP_FMTTYPE_CFGWR1);
255264
256− headers[1] = TLP_CFG_DW1(TLP_REQ_ID(pcie->root_bus_nr, devfn),
265+ headers[1] = TLP_CFG_DW1(TLP_REQ_ID(pcie->root_bus_nr, RP_DEVFN),
257266 TLP_WRITE_TAG, byte_en);
258267 headers[2] = TLP_CFG_DW2(bus, devfn, where);
259268
@@ -458,7 +467,7 @@ static int altera_pcie_init_irq_domain(struct altera_pcie *pcie) · 198 unmodified lines
458467 struct device_node *node = dev->of_node;
459468
460469 /* Setup INTx */
461− pcie->irq_domain = irq_domain_add_linear(node, INTX_NUM,
470+ pcie->irq_domain = irq_domain_add_linear(node, INTX_NUM + 1,
462471 &intx_domain_ops, pcie);
463472 if (!pcie->irq_domain) {
464473 dev_err(dev, "Failed to get a INTx IRQ domain\n");
drivers/pci/msi.c+2−2
@@ -54,7 +54,7 @@ static int pci_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) · 53 unmodified lines
5454 struct irq_domain *domain;
5555
5656 domain = pci_msi_get_domain(dev);
57− if (domain)
57+ if (domain && irq_domain_is_hierarchy(domain))
5858 return pci_msi_domain_alloc_irqs(domain, dev, nvec, type);
5959
6060 return arch_setup_msi_irqs(dev, nvec, type);
@@ -65,7 +65,7 @@ static void pci_msi_teardown_msi_irqs(struct pci_dev *dev) · 4 unmodified lines
6565 struct irq_domain *domain;
6666
6767 domain = pci_msi_get_domain(dev);
68− if (domain)
68+ if (domain && irq_domain_is_hierarchy(domain))
6969 pci_msi_domain_free_irqs(domain, dev);
7070 else
7171 arch_teardown_msi_irqs(dev);
drivers/phy/Kconfig+1−0
@@ -233,6 +233,7 @@ config PHY_SUN9I_USB · 232 unmodified lines
233233 tristate "Allwinner sun9i SoC USB PHY driver"
234234 depends on ARCH_SUNXI && HAS_IOMEM && OF
235235 depends on RESET_CONTROLLER
236+ depends on USB_COMMON
236237 select GENERIC_PHY
237238 help
238239 Enable this to support the transceiver that is part of Allwinner
drivers/phy/phy-bcm-cygnus-pcie.c+12−4
@@ -128,6 +128,7 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev) · 127 unmodified lines
128128 struct phy_provider *provider;
129129 struct resource *res;
130130 unsigned cnt = 0;
131+ int ret;
131132
132133 if (of_get_child_count(node) == 0) {
133134 dev_err(dev, "PHY no child node\n");
@@ -154,24 +155,28 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev) · 20 unmodified lines
154155 if (of_property_read_u32(child, "reg", &id)) {
155156 dev_err(dev, "missing reg property for %s\n",
156157 child->name);
157− return -EINVAL;
158+ ret = -EINVAL;
159+ goto put_child;
158160 }
159161
160162 if (id >= MAX_NUM_PHYS) {
161163 dev_err(dev, "invalid PHY id: %u\n", id);
162− return -EINVAL;
164+ ret = -EINVAL;
165+ goto put_child;
163166 }
164167
165168 if (core->phys[id].phy) {
166169 dev_err(dev, "duplicated PHY id: %u\n", id);
167− return -EINVAL;
170+ ret = -EINVAL;
171+ goto put_child;
168172 }
169173
170174 p = &core->phys[id];
171175 p->phy = devm_phy_create(dev, child, &cygnus_pcie_phy_ops);
172176 if (IS_ERR(p->phy)) {
173177 dev_err(dev, "failed to create PHY\n");
174− return PTR_ERR(p->phy);
178+ ret = PTR_ERR(p->phy);
179+ goto put_child;
175180 }
176181
177182 p->core = core;
@@ -191,6 +196,9 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev) · 13 unmodified lines
191196 dev_dbg(dev, "registered %u PCIe PHY(s)\n", cnt);
192197
193198 return 0;
199+put_child:
200+ of_node_put(child);
201+ return ret;
194202 }
195203
196204 static const struct of_device_id cygnus_pcie_phy_match_table[] = {
drivers/phy/phy-berlin-sata.c+14−6
@@ -195,7 +195,7 @@ static int phy_berlin_sata_probe(struct platform_device *pdev) · 194 unmodified lines
195195 struct phy_provider *phy_provider;
196196 struct phy_berlin_priv *priv;
197197 struct resource *res;
198− int i = 0;
198+ int ret, i = 0;
199199 u32 phy_id;
200200
201201 priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -237,22 +237,27 @@ static int phy_berlin_sata_probe(struct platform_device *pdev) · 35 unmodified lines
237237 if (of_property_read_u32(child, "reg", &phy_id)) {
238238 dev_err(dev, "missing reg property in node %s\n",
239239 child->name);
240− return -EINVAL;
240+ ret = -EINVAL;
241+ goto put_child;
241242 }
242243
243244 if (phy_id >= ARRAY_SIZE(phy_berlin_power_down_bits)) {
244245 dev_err(dev, "invalid reg in node %s\n", child->name);
245− return -EINVAL;
246+ ret = -EINVAL;
247+ goto put_child;
246248 }
247249
248250 phy_desc = devm_kzalloc(dev, sizeof(*phy_desc), GFP_KERNEL);
249− if (!phy_desc)
250− return -ENOMEM;
251+ if (!phy_desc) {
252+ ret = -ENOMEM;
253+ goto put_child;
254+ }
251255
252256 phy = devm_phy_create(dev, NULL, &phy_berlin_sata_ops);
253257 if (IS_ERR(phy)) {
254258 dev_err(dev, "failed to create PHY %d\n", phy_id);
255− return PTR_ERR(phy);
259+ ret = PTR_ERR(phy);
260+ goto put_child;
256261 }
257262
258263 phy_desc->phy = phy;
@@ -269,6 +274,9 @@ static int phy_berlin_sata_probe(struct platform_device *pdev) · 10 unmodified lines
269274 phy_provider =
270275 devm_of_phy_provider_register(dev, phy_berlin_sata_phy_xlate);
271276 return PTR_ERR_OR_ZERO(phy_provider);
277+put_child:
278+ of_node_put(child);
279+ return ret;
272280 }
273281
274282 static const struct of_device_id phy_berlin_sata_of_match[] = {
drivers/phy/phy-brcmstb-sata.c+12−5
@@ -140,7 +140,7 @@ static int brcm_sata_phy_probe(struct platform_device *pdev) · 139 unmodified lines
140140 struct brcm_sata_phy *priv;
141141 struct resource *res;
142142 struct phy_provider *provider;
143− int count = 0;
143+ int ret, count = 0;
144144
145145 if (of_get_child_count(dn) == 0)
146146 return -ENODEV;
@@ -163,16 +163,19 @@ static int brcm_sata_phy_probe(struct platform_device *pdev) · 16 unmodified lines
163163 if (of_property_read_u32(child, "reg", &id)) {
164164 dev_err(dev, "missing reg property in node %s\n",
165165 child->name);
166− return -EINVAL;
166+ ret = -EINVAL;
167+ goto put_child;
167168 }
168169
169170 if (id >= MAX_PORTS) {
170171 dev_err(dev, "invalid reg: %u\n", id);
171− return -EINVAL;
172+ ret = -EINVAL;
173+ goto put_child;
172174 }
173175 if (priv->phys[id].phy) {
174176 dev_err(dev, "already registered port %u\n", id);
175− return -EINVAL;
177+ ret = -EINVAL;
178+ goto put_child;
176179 }
177180
178181 port = &priv->phys[id];
@@ -182,7 +185,8 @@ static int brcm_sata_phy_probe(struct platform_device *pdev) · 3 unmodified lines
182185 port->ssc_en = of_property_read_bool(child, "brcm,enable-ssc");
183186 if (IS_ERR(port->phy)) {
184187 dev_err(dev, "failed to create PHY\n");
185− return PTR_ERR(port->phy);
188+ ret = PTR_ERR(port->phy);
189+ goto put_child;
186190 }
187191
188192 phy_set_drvdata(port->phy, port);
@@ -198,6 +202,9 @@ static int brcm_sata_phy_probe(struct platform_device *pdev) · 9 unmodified lines
198202 dev_info(dev, "registered %d port(s)\n", count);
199203
200204 return 0;
205+put_child:
206+ of_node_put(child);
207+ return ret;
201208 }
202209
203210 static struct platform_driver brcm_sata_phy_driver = {
drivers/phy/phy-core.c+15−6
@@ -636,8 +636,9 @@ EXPORT_SYMBOL_GPL(devm_of_phy_get); · 635 unmodified lines
636636 * @np: node containing the phy
637637 * @index: index of the phy
638638 *
639− * Gets the phy using _of_phy_get(), and associates a device with it using
640− * devres. On driver detach, release function is invoked on the devres data,
639+ * Gets the phy using _of_phy_get(), then gets a refcount to it,
640+ * and associates a device with it using devres. On driver detach,
641+ * release function is invoked on the devres data,
641642 * then, devres data is freed.
642643 *
643644 */
@@ -651,13 +652,21 @@ struct phy *devm_of_phy_get_by_index(struct device *dev, struct device_node *np, · 7 unmodified lines
651652 return ERR_PTR(-ENOMEM);
652653
653654 phy = _of_phy_get(np, index);
654− if (!IS_ERR(phy)) {
655− *ptr = phy;
656− devres_add(dev, ptr);
657− } else {
655+ if (IS_ERR(phy)) {
658656 devres_free(ptr);
657+ return phy;
659658 }
660659
660+ if (!try_module_get(phy->ops->owner)) {
661+ devres_free(ptr);
662+ return ERR_PTR(-EPROBE_DEFER);
663+ }
664+
665+ get_device(&phy->dev);
666+
667+ *ptr = phy;
668+ devres_add(dev, ptr);
669+
661670 return phy;
662671 }
663672 EXPORT_SYMBOL_GPL(devm_of_phy_get_by_index);
drivers/phy/phy-miphy28lp.c+11−5
@@ -1226,15 +1226,18 @@ static int miphy28lp_probe(struct platform_device *pdev) · 1225 unmodified lines
12261226
12271227 miphy_phy = devm_kzalloc(&pdev->dev, sizeof(*miphy_phy),
12281228 GFP_KERNEL);
1229− if (!miphy_phy)
1230− return -ENOMEM;
1229+ if (!miphy_phy) {
1230+ ret = -ENOMEM;
1231+ goto put_child;
1232+ }
12311233
12321234 miphy_dev->phys[port] = miphy_phy;
12331235
12341236 phy = devm_phy_create(&pdev->dev, child, &miphy28lp_ops);
12351237 if (IS_ERR(phy)) {
12361238 dev_err(&pdev->dev, "failed to create PHY\n");
1237− return PTR_ERR(phy);
1239+ ret = PTR_ERR(phy);
1240+ goto put_child;
12381241 }
12391242
12401243 miphy_dev->phys[port]->phy = phy;
@@ -1242,11 +1245,11 @@ static int miphy28lp_probe(struct platform_device *pdev) · 1 unmodified line
12421245
12431246 ret = miphy28lp_of_probe(child, miphy_phy);
12441247 if (ret)
1245− return ret;
1248+ goto put_child;
12461249
12471250 ret = miphy28lp_probe_resets(child, miphy_dev->phys[port]);
12481251 if (ret)
1249− return ret;
1252+ goto put_child;
12501253
12511254 phy_set_drvdata(phy, miphy_dev->phys[port]);
12521255 port++;
@@ -1255,6 +1258,9 @@ static int miphy28lp_probe(struct platform_device *pdev) · 2 unmodified lines
12551258
12561259 provider = devm_of_phy_provider_register(&pdev->dev, miphy28lp_xlate);
12571260 return PTR_ERR_OR_ZERO(provider);
1261+put_child:
1262+ of_node_put(child);
1263+ return ret;
12581264 }
12591265
12601266 static const struct of_device_id miphy28lp_of_match[] = {
drivers/phy/phy-miphy365x.c+11−5
@@ -566,22 +566,25 @@ static int miphy365x_probe(struct platform_device *pdev) · 565 unmodified lines
566566
567567 miphy_phy = devm_kzalloc(&pdev->dev, sizeof(*miphy_phy),
568568 GFP_KERNEL);
569− if (!miphy_phy)
570− return -ENOMEM;
569+ if (!miphy_phy) {
570+ ret = -ENOMEM;
571+ goto put_child;
572+ }
571573
572574 miphy_dev->phys[port] = miphy_phy;
573575
574576 phy = devm_phy_create(&pdev->dev, child, &miphy365x_ops);
575577 if (IS_ERR(phy)) {
576578 dev_err(&pdev->dev, "failed to create PHY\n");
577− return PTR_ERR(phy);
579+ ret = PTR_ERR(phy);
580+ goto put_child;
578581 }
579582
580583 miphy_dev->phys[port]->phy = phy;
581584
582585 ret = miphy365x_of_probe(child, miphy_phy);
583586 if (ret)
584− return ret;
587+ goto put_child;
585588
586589 phy_set_drvdata(phy, miphy_dev->phys[port]);
587590
@@ -591,12 +594,15 @@ static int miphy365x_probe(struct platform_device *pdev) · 3 unmodified lines
591594 &miphy_phy->ctrlreg);
592595 if (ret) {
593596 dev_err(&pdev->dev, "No sysconfig offset found\n");
594− return ret;
597+ goto put_child;
595598 }
596599 }
597600
598601 provider = devm_of_phy_provider_register(&pdev->dev, miphy365x_xlate);
599602 return PTR_ERR_OR_ZERO(provider);
603+put_child:
604+ of_node_put(child);
605+ return ret;
600606 }
601607
602608 static const struct of_device_id miphy365x_of_match[] = {
drivers/phy/phy-mt65xx-usb3.c+13−7
@@ -415,7 +415,7 @@ static int mt65xx_u3phy_probe(struct platform_device *pdev) · 414 unmodified lines
415415 struct resource *sif_res;
416416 struct mt65xx_u3phy *u3phy;
417417 struct resource res;
418− int port;
418+ int port, retval;
419419
420420 u3phy = devm_kzalloc(dev, sizeof(*u3phy), GFP_KERNEL);
421421 if (!u3phy)
@@ -447,31 +447,34 @@ static int mt65xx_u3phy_probe(struct platform_device *pdev) · 25 unmodified lines
447447 for_each_child_of_node(np, child_np) {
448448 struct mt65xx_phy_instance *instance;
449449 struct phy *phy;
450− int retval;
451450
452451 instance = devm_kzalloc(dev, sizeof(*instance), GFP_KERNEL);
453− if (!instance)
454− return -ENOMEM;
452+ if (!instance) {
453+ retval = -ENOMEM;
454+ goto put_child;
455+ }
455456
456457 u3phy->phys[port] = instance;
457458
458459 phy = devm_phy_create(dev, child_np, &mt65xx_u3phy_ops);
459460 if (IS_ERR(phy)) {
460461 dev_err(dev, "failed to create phy\n");
461− return PTR_ERR(phy);
462+ retval = PTR_ERR(phy);
463+ goto put_child;
462464 }
463465
464466 retval = of_address_to_resource(child_np, 0, &res);
465467 if (retval) {
466468 dev_err(dev, "failed to get address resource(id-%d)\n",
467469 port);
468− return retval;
470+ goto put_child;
469471 }
470472
471473 instance->port_base = devm_ioremap_resource(&phy->dev, &res);
472474 if (IS_ERR(instance->port_base)) {
473475 dev_err(dev, "failed to remap phy regs\n");
474− return PTR_ERR(instance->port_base);
476+ retval = PTR_ERR(instance->port_base);
477+ goto put_child;
475478 }
476479
477480 instance->phy = phy;
@@ -483,6 +486,9 @@ static int mt65xx_u3phy_probe(struct platform_device *pdev) · 5 unmodified lines
483486 provider = devm_of_phy_provider_register(dev, mt65xx_phy_xlate);
484487
485488 return PTR_ERR_OR_ZERO(provider);
489+put_child:
490+ of_node_put(child_np);
491+ return retval;
486492 }
487493
488494 static const struct of_device_id mt65xx_u3phy_id_table[] = {
drivers/phy/phy-rockchip-usb.c+12−5
@@ -108,13 +108,16 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) · 107 unmodified lines
108108
109109 for_each_available_child_of_node(dev->of_node, child) {
110110 rk_phy = devm_kzalloc(dev, sizeof(*rk_phy), GFP_KERNEL);
111− if (!rk_phy)
112− return -ENOMEM;
111+ if (!rk_phy) {
112+ err = -ENOMEM;
113+ goto put_child;
114+ }
113115
114116 if (of_property_read_u32(child, "reg", &reg_offset)) {
115117 dev_err(dev, "missing reg property in node %s\n",
116118 child->name);
117− return -EINVAL;
119+ err = -EINVAL;
120+ goto put_child;
118121 }
119122
120123 rk_phy->reg_offset = reg_offset;
@@ -127,18 +130,22 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) · 6 unmodified lines
127130 rk_phy->phy = devm_phy_create(dev, child, &ops);
128131 if (IS_ERR(rk_phy->phy)) {
129132 dev_err(dev, "failed to create PHY\n");
130− return PTR_ERR(rk_phy->phy);
133+ err = PTR_ERR(rk_phy->phy);
134+ goto put_child;
131135 }
132136 phy_set_drvdata(rk_phy->phy, rk_phy);
133137
134138 /* only power up usb phy when it use, so disable it when init*/
135139 err = rockchip_usb_phy_power(rk_phy, 1);
136140 if (err)
137− return err;
141+ goto put_child;
138142 }
139143
140144 phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
141145 return PTR_ERR_OR_ZERO(phy_provider);
146+put_child:
147+ of_node_put(child);
148+ return err;
142149 }
143150
144151 static const struct of_device_id rockchip_usb_phy_dt_ids[] = {
drivers/pinctrl/bcm/pinctrl-bcm2835.c+7−6
@@ -342,12 +342,6 @@ static int bcm2835_gpio_get(struct gpio_chip *chip, unsigned offset) · 341 unmodified lines
342342 return bcm2835_gpio_get_bit(pc, GPLEV0, offset);
343343 }
344344
345−static int bcm2835_gpio_direction_output(struct gpio_chip *chip,
346− unsigned offset, int value)
347−{
348− return pinctrl_gpio_direction_output(chip->base + offset);
349−}
350−
351345 static void bcm2835_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
352346 {
353347 struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->dev);
@@ -355,6 +349,13 @@ static void bcm2835_gpio_set(struct gpio_chip *chip, unsigned offset, int value) · 1 unmodified line
355349 bcm2835_gpio_set_bit(pc, value ? GPSET0 : GPCLR0, offset);
356350 }
357351
352+static int bcm2835_gpio_direction_output(struct gpio_chip *chip,
353+ unsigned offset, int value)
354+{
355+ bcm2835_gpio_set(chip, offset, value);
356+ return pinctrl_gpio_direction_output(chip->base + offset);
357+}
358+
358359 static int bcm2835_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
359360 {
360361 struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->dev);
drivers/pinctrl/freescale/pinctrl-vf610.c+1−1
@@ -299,7 +299,7 @@ static const struct pinctrl_pin_desc vf610_pinctrl_pads[] = { · 298 unmodified lines
299299 static struct imx_pinctrl_soc_info vf610_pinctrl_info = {
300300 .pins = vf610_pinctrl_pads,
301301 .npins = ARRAY_SIZE(vf610_pinctrl_pads),
302− .flags = SHARE_MUX_CONF_REG,
302+ .flags = SHARE_MUX_CONF_REG | ZERO_OFFSET_VALID,
303303 };
304304
305305 static const struct of_device_id vf610_pinctrl_of_match[] = {
drivers/pinctrl/intel/pinctrl-broxton.c+1−0
@@ -28,6 +28,7 @@ · 27 unmodified lines
2828 .padcfglock_offset = BXT_PADCFGLOCK, \
2929 .hostown_offset = BXT_HOSTSW_OWN, \
3030 .ie_offset = BXT_GPI_IE, \
31+ .gpp_size = 32, \
3132 .pin_base = (s), \
3233 .npins = ((e) - (s) + 1), \
3334 }
drivers/pinctrl/intel/pinctrl-intel.c+20−21
@@ -25,9 +25,6 @@ · 24 unmodified lines
2525
2626 #include "pinctrl-intel.h"
2727
28−/* Maximum number of pads in each group */
29−#define NPADS_IN_GPP 24
30−
3128 /* Offset from regs */
3229 #define PADBAR 0x00c
3330 #define GPI_IS 0x100
@@ -37,6 +34,7 @@ · 3 unmodified lines
3734 #define PADOWN_BITS 4
3835 #define PADOWN_SHIFT(p) ((p) % 8 * PADOWN_BITS)
3936 #define PADOWN_MASK(p) (0xf << PADOWN_SHIFT(p))
37+#define PADOWN_GPP(p) ((p) / 8)
4038
4139 /* Offset from pad_regs */
4240 #define PADCFG0 0x000
@@ -142,7 +140,7 @@ static void __iomem *intel_get_padcfg(struct intel_pinctrl *pctrl, unsigned pin, · 99 unmodified lines
142140 static bool intel_pad_owned_by_host(struct intel_pinctrl *pctrl, unsigned pin)
143141 {
144142 const struct intel_community *community;
145− unsigned padno, gpp, gpp_offset, offset;
143+ unsigned padno, gpp, offset, group;
146144 void __iomem *padown;
147145
148146 community = intel_get_community(pctrl, pin);
@@ -152,9 +150,9 @@ static bool intel_pad_owned_by_host(struct intel_pinctrl *pctrl, unsigned pin) · 3 unmodified lines
152150 return true;
153151
154152 padno = pin_to_padno(community, pin);
155− gpp = padno / NPADS_IN_GPP;
156− gpp_offset = padno % NPADS_IN_GPP;
157− offset = community->padown_offset + gpp * 16 + (gpp_offset / 8) * 4;
153+ group = padno / community->gpp_size;
154+ gpp = PADOWN_GPP(padno % community->gpp_size);
155+ offset = community->padown_offset + 0x10 * group + gpp * 4;
158156 padown = community->regs + offset;
159157
160158 return !(readl(padown) & PADOWN_MASK(padno));
@@ -173,11 +171,11 @@ static bool intel_pad_acpi_mode(struct intel_pinctrl *pctrl, unsigned pin) · 12 unmodified lines
173171 return false;
174172
175173 padno = pin_to_padno(community, pin);
176− gpp = padno / NPADS_IN_GPP;
174+ gpp = padno / community->gpp_size;
177175 offset = community->hostown_offset + gpp * 4;
178176 hostown = community->regs + offset;
179177
180− return !(readl(hostown) & BIT(padno % NPADS_IN_GPP));
178+ return !(readl(hostown) & BIT(padno % community->gpp_size));
181179 }
182180
183181 static bool intel_pad_locked(struct intel_pinctrl *pctrl, unsigned pin)
@@ -193,7 +191,7 @@ static bool intel_pad_locked(struct intel_pinctrl *pctrl, unsigned pin) · 9 unmodified lines
193191 return false;
194192
195193 padno = pin_to_padno(community, pin);
196− gpp = padno / NPADS_IN_GPP;
194+ gpp = padno / community->gpp_size;
197195
198196 /*
199197 * If PADCFGLOCK and PADCFGLOCKTX bits are both clear for this pad,
@@ -202,12 +200,12 @@ static bool intel_pad_locked(struct intel_pinctrl *pctrl, unsigned pin) · 2 unmodified lines
202200 */
203201 offset = community->padcfglock_offset + gpp * 8;
204202 value = readl(community->regs + offset);
205− if (value & BIT(pin % NPADS_IN_GPP))
203+ if (value & BIT(pin % community->gpp_size))
206204 return true;
207205
208206 offset = community->padcfglock_offset + 4 + gpp * 8;
209207 value = readl(community->regs + offset);
210− if (value & BIT(pin % NPADS_IN_GPP))
208+ if (value & BIT(pin % community->gpp_size))
211209 return true;
212210
213211 return false;
@@ -663,8 +661,8 @@ static void intel_gpio_irq_ack(struct irq_data *d) · 449 unmodified lines
663661 community = intel_get_community(pctrl, pin);
664662 if (community) {
665663 unsigned padno = pin_to_padno(community, pin);
666− unsigned gpp_offset = padno % NPADS_IN_GPP;
667− unsigned gpp = padno / NPADS_IN_GPP;
664+ unsigned gpp_offset = padno % community->gpp_size;
665+ unsigned gpp = padno / community->gpp_size;
668666
669667 writel(BIT(gpp_offset), community->regs + GPI_IS + gpp * 4);
670668 }
@@ -685,8 +683,8 @@ static void intel_gpio_irq_mask_unmask(struct irq_data *d, bool mask) · 14 unmodified lines
685683 community = intel_get_community(pctrl, pin);
686684 if (community) {
687685 unsigned padno = pin_to_padno(community, pin);
688− unsigned gpp_offset = padno % NPADS_IN_GPP;
689− unsigned gpp = padno / NPADS_IN_GPP;
686+ unsigned gpp_offset = padno % community->gpp_size;
687+ unsigned gpp = padno / community->gpp_size;
690688 void __iomem *reg;
691689 u32 value;
692690
@@ -780,8 +778,8 @@ static int intel_gpio_irq_wake(struct irq_data *d, unsigned int on) · 87 unmodified lines
780778 return -EINVAL;
781779
782780 padno = pin_to_padno(community, pin);
783− gpp = padno / NPADS_IN_GPP;
784− gpp_offset = padno % NPADS_IN_GPP;
781+ gpp = padno / community->gpp_size;
782+ gpp_offset = padno % community->gpp_size;
785783
786784 /* Clear the existing wake status */
787785 writel(BIT(gpp_offset), community->regs + GPI_GPE_STS + gpp * 4);
@@ -819,14 +817,14 @@ static irqreturn_t intel_gpio_community_irq_handler(struct intel_pinctrl *pctrl, · 31 unmodified lines
819817 /* Only interrupts that are enabled */
820818 pending &= enabled;
821819
822− for_each_set_bit(gpp_offset, &pending, NPADS_IN_GPP) {
820+ for_each_set_bit(gpp_offset, &pending, community->gpp_size) {
823821 unsigned padno, irq;
824822
825823 /*
826824 * The last group in community can have less pins
827825 * than NPADS_IN_GPP.
828826 */
829− padno = gpp_offset + gpp * NPADS_IN_GPP;
827+ padno = gpp_offset + gpp * community->gpp_size;
830828 if (padno >= community->npins)
831829 break;
832830
@@ -1002,7 +1000,8 @@ int intel_pinctrl_probe(struct platform_device *pdev, · 169 unmodified lines
10021000
10031001 community->regs = regs;
10041002 community->pad_regs = regs + padbar;
1005− community->ngpps = DIV_ROUND_UP(community->npins, NPADS_IN_GPP);
1003+ community->ngpps = DIV_ROUND_UP(community->npins,
1004+ community->gpp_size);
10061005 }
10071006
10081007 irq = platform_get_irq(pdev, 0);
drivers/pinctrl/intel/pinctrl-intel.h+3−0
@@ -55,6 +55,8 @@ struct intel_function { · 54 unmodified lines
5555 * ACPI).
5656 * @ie_offset: Register offset of GPI_IE from @regs.
5757 * @pin_base: Starting pin of pins in this community
58+ * @gpp_size: Maximum number of pads in each group, such as PADCFGLOCK,
59+ * HOSTSW_OWN, GPI_IS, GPI_IE, etc.
5860 * @npins: Number of pins in this community
5961 * @regs: Community specific common registers (reserved for core driver)
6062 * @pad_regs: Community specific pad registers (reserved for core driver)
@@ -68,6 +70,7 @@ struct intel_community { · 7 unmodified lines
6870 unsigned hostown_offset;
6971 unsigned ie_offset;
7072 unsigned pin_base;
73+ unsigned gpp_size;
7174 size_t npins;
7275 void __iomem *regs;
7376 void __iomem *pad_regs;
drivers/pinctrl/intel/pinctrl-sunrisepoint.c+1−0
@@ -30,6 +30,7 @@ · 29 unmodified lines
3030 .padcfglock_offset = SPT_PADCFGLOCK, \
3131 .hostown_offset = SPT_HOSTSW_OWN, \
3232 .ie_offset = SPT_GPI_IE, \
33+ .gpp_size = 24, \
3334 .pin_base = (s), \
3435 .npins = ((e) - (s) + 1), \
3536 }
drivers/powercap/intel_rapl.c+5−2
@@ -1341,10 +1341,13 @@ static int rapl_detect_domains(struct rapl_package *rp, int cpu) · 1340 unmodified lines
13411341
13421342 for (rd = rp->domains; rd < rp->domains + rp->nr_domains; rd++) {
13431343 /* check if the domain is locked by BIOS */
1344− if (rapl_read_data_raw(rd, FW_LOCK, false, &locked)) {
1344+ ret = rapl_read_data_raw(rd, FW_LOCK, false, &locked);
1345+ if (ret)
1346+ return ret;
1347+ if (locked) {
13451348 pr_info("RAPL package %d domain %s locked by BIOS\n",
13461349 rp->id, rd->name);
1347− rd->state |= DOMAIN_STATE_BIOS_LOCKED;
1350+ rd->state |= DOMAIN_STATE_BIOS_LOCKED;
13481351 }
13491352 }
13501353
drivers/rtc/rtc-da9063.c+9−10
@@ -483,24 +483,23 @@ static int da9063_rtc_probe(struct platform_device *pdev) · 482 unmodified lines
483483
484484 platform_set_drvdata(pdev, rtc);
485485
486+ rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, DA9063_DRVNAME_RTC,
487+ &da9063_rtc_ops, THIS_MODULE);
488+ if (IS_ERR(rtc->rtc_dev))
489+ return PTR_ERR(rtc->rtc_dev);
490+
491+ da9063_data_to_tm(data, &rtc->alarm_time, rtc);
492+ rtc->rtc_sync = false;
493+
486494 irq_alarm = platform_get_irq_byname(pdev, "ALARM");
487495 ret = devm_request_threaded_irq(&pdev->dev, irq_alarm, NULL,
488496 da9063_alarm_event,
489497 IRQF_TRIGGER_LOW | IRQF_ONESHOT,
490498 "ALARM", rtc);
491− if (ret) {
499+ if (ret)
492500 dev_err(&pdev->dev, "Failed to request ALARM IRQ %d: %d\n",
493501 irq_alarm, ret);
494− return ret;
495− }
496−
497− rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, DA9063_DRVNAME_RTC,
498− &da9063_rtc_ops, THIS_MODULE);
499− if (IS_ERR(rtc->rtc_dev))
500− return PTR_ERR(rtc->rtc_dev);
501502
502− da9063_data_to_tm(data, &rtc->alarm_time, rtc);
503− rtc->rtc_sync = false;
504503 return ret;
505504 }
506505
drivers/rtc/rtc-rk808.c+44−4
@@ -56,6 +56,42 @@ struct rk808_rtc { · 55 unmodified lines
5656 int irq;
5757 };
5858
59+/*
60+ * The Rockchip calendar used by the RK808 counts November with 31 days. We use
61+ * these translation functions to convert its dates to/from the Gregorian
62+ * calendar used by the rest of the world. We arbitrarily define Jan 1st, 2016
63+ * as the day when both calendars were in sync, and treat all other dates
64+ * relative to that.
65+ * NOTE: Other system software (e.g. firmware) that reads the same hardware must
66+ * implement this exact same conversion algorithm, with the same anchor date.
67+ */
68+static time64_t nov2dec_transitions(struct rtc_time *tm)
69+{
70+ return (tm->tm_year + 1900) - 2016 + (tm->tm_mon + 1 > 11 ? 1 : 0);
71+}
72+
73+static void rockchip_to_gregorian(struct rtc_time *tm)
74+{
75+ /* If it's Nov 31st, rtc_tm_to_time64() will count that like Dec 1st */
76+ time64_t time = rtc_tm_to_time64(tm);
77+ rtc_time64_to_tm(time + nov2dec_transitions(tm) * 86400, tm);
78+}
79+
80+static void gregorian_to_rockchip(struct rtc_time *tm)
81+{
82+ time64_t extra_days = nov2dec_transitions(tm);
83+ time64_t time = rtc_tm_to_time64(tm);
84+ rtc_time64_to_tm(time - extra_days * 86400, tm);
85+
86+ /* Compensate if we went back over Nov 31st (will work up to 2381) */
87+ if (nov2dec_transitions(tm) < extra_days) {
88+ if (tm->tm_mon + 1 == 11)
89+ tm->tm_mday++; /* This may result in 31! */
90+ else
91+ rtc_time64_to_tm(time - (extra_days - 1) * 86400, tm);
92+ }
93+}
94+
5995 /* Read current time and date in RTC */
6096 static int rk808_rtc_readtime(struct device *dev, struct rtc_time *tm)
6197 {
@@ -101,9 +137,10 @@ static int rk808_rtc_readtime(struct device *dev, struct rtc_time *tm) · 39 unmodified lines
101137 tm->tm_mon = (bcd2bin(rtc_data[4] & MONTHS_REG_MSK)) - 1;
102138 tm->tm_year = (bcd2bin(rtc_data[5] & YEARS_REG_MSK)) + 100;
103139 tm->tm_wday = bcd2bin(rtc_data[6] & WEEKS_REG_MSK);
140+ rockchip_to_gregorian(tm);
104141 dev_dbg(dev, "RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
105142 1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
106− tm->tm_wday, tm->tm_hour , tm->tm_min, tm->tm_sec);
143+ tm->tm_wday, tm->tm_hour, tm->tm_min, tm->tm_sec);
107144
108145 return ret;
109146 }
@@ -116,6 +153,10 @@ static int rk808_rtc_set_time(struct device *dev, struct rtc_time *tm) · 6 unmodified lines
116153 u8 rtc_data[NUM_TIME_REGS];
117154 int ret;
118155
156+ dev_dbg(dev, "set RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
157+ 1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
158+ tm->tm_wday, tm->tm_hour, tm->tm_min, tm->tm_sec);
159+ gregorian_to_rockchip(tm);
119160 rtc_data[0] = bin2bcd(tm->tm_sec);
120161 rtc_data[1] = bin2bcd(tm->tm_min);
121162 rtc_data[2] = bin2bcd(tm->tm_hour);
@@ -123,9 +164,6 @@ static int rk808_rtc_set_time(struct device *dev, struct rtc_time *tm) · 1 unmodified line
123164 rtc_data[4] = bin2bcd(tm->tm_mon + 1);
124165 rtc_data[5] = bin2bcd(tm->tm_year - 100);
125166 rtc_data[6] = bin2bcd(tm->tm_wday);
126− dev_dbg(dev, "set RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
127− 1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
128− tm->tm_wday, tm->tm_hour , tm->tm_min, tm->tm_sec);
129167
130168 /* Stop RTC while updating the RTC registers */
131169 ret = regmap_update_bits(rk808->regmap, RK808_RTC_CTRL_REG,
@@ -170,6 +208,7 @@ static int rk808_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) · 38 unmodified lines
170208 alrm->time.tm_mday = bcd2bin(alrm_data[3] & DAYS_REG_MSK);
171209 alrm->time.tm_mon = (bcd2bin(alrm_data[4] & MONTHS_REG_MSK)) - 1;
172210 alrm->time.tm_year = (bcd2bin(alrm_data[5] & YEARS_REG_MSK)) + 100;
211+ rockchip_to_gregorian(&alrm->time);
173212
174213 ret = regmap_read(rk808->regmap, RK808_RTC_INT_REG, &int_reg);
175214 if (ret) {
@@ -227,6 +266,7 @@ static int rk808_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) · 51 unmodified lines
227266 alrm->time.tm_mday, alrm->time.tm_wday, alrm->time.tm_hour,
228267 alrm->time.tm_min, alrm->time.tm_sec);
229268
269+ gregorian_to_rockchip(&alrm->time);
230270 alrm_data[0] = bin2bcd(alrm->time.tm_sec);
231271 alrm_data[1] = bin2bcd(alrm->time.tm_min);
232272 alrm_data[2] = bin2bcd(alrm->time.tm_hour);
drivers/s390/crypto/ap_bus.c+3−1
@@ -599,8 +599,10 @@ static enum ap_wait ap_sm_read(struct ap_device *ap_dev) · 598 unmodified lines
599599 status = ap_sm_recv(ap_dev);
600600 switch (status.response_code) {
601601 case AP_RESPONSE_NORMAL:
602− if (ap_dev->queue_count > 0)
602+ if (ap_dev->queue_count > 0) {
603+ ap_dev->state = AP_STATE_WORKING;
603604 return AP_WAIT_AGAIN;
605+ }
604606 ap_dev->state = AP_STATE_IDLE;
605607 return AP_WAIT_NONE;
606608 case AP_RESPONSE_NO_PENDING_REPLY:
drivers/s390/virtio/virtio_ccw.c+37−25
@@ -984,6 +984,36 @@ static struct virtqueue *virtio_ccw_vq_by_ind(struct virtio_ccw_device *vcdev, · 983 unmodified lines
984984 return vq;
985985 }
986986
987+static void virtio_ccw_check_activity(struct virtio_ccw_device *vcdev,
988+ __u32 activity)
989+{
990+ if (vcdev->curr_io & activity) {
991+ switch (activity) {
992+ case VIRTIO_CCW_DOING_READ_FEAT:
993+ case VIRTIO_CCW_DOING_WRITE_FEAT:
994+ case VIRTIO_CCW_DOING_READ_CONFIG:
995+ case VIRTIO_CCW_DOING_WRITE_CONFIG:
996+ case VIRTIO_CCW_DOING_WRITE_STATUS:
997+ case VIRTIO_CCW_DOING_SET_VQ:
998+ case VIRTIO_CCW_DOING_SET_IND:
999+ case VIRTIO_CCW_DOING_SET_CONF_IND:
1000+ case VIRTIO_CCW_DOING_RESET:
1001+ case VIRTIO_CCW_DOING_READ_VQ_CONF:
1002+ case VIRTIO_CCW_DOING_SET_IND_ADAPTER:
1003+ case VIRTIO_CCW_DOING_SET_VIRTIO_REV:
1004+ vcdev->curr_io &= ~activity;
1005+ wake_up(&vcdev->wait_q);
1006+ break;
1007+ default:
1008+ /* don't know what to do... */
1009+ dev_warn(&vcdev->cdev->dev,
1010+ "Suspicious activity '%08x'\n", activity);
1011+ WARN_ON(1);
1012+ break;
1013+ }
1014+ }
1015+}
1016+
9871017 static void virtio_ccw_int_handler(struct ccw_device *cdev,
9881018 unsigned long intparm,
9891019 struct irb *irb)
@@ -995,6 +1025,12 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev, · 5 unmodified lines
9951025
9961026 if (!vcdev)
9971027 return;
1028+ if (IS_ERR(irb)) {
1029+ vcdev->err = PTR_ERR(irb);
1030+ virtio_ccw_check_activity(vcdev, activity);
1031+ /* Don't poke around indicators, something's wrong. */
1032+ return;
1033+ }
9981034 /* Check if it's a notification from the host. */
9991035 if ((intparm == 0) &&
10001036 (scsw_stctl(&irb->scsw) ==
@@ -1010,31 +1046,7 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev, · 9 unmodified lines
10101046 /* Map everything else to -EIO. */
10111047 vcdev->err = -EIO;
10121048 }
1013− if (vcdev->curr_io & activity) {
1014− switch (activity) {
1015− case VIRTIO_CCW_DOING_READ_FEAT:
1016− case VIRTIO_CCW_DOING_WRITE_FEAT:
1017− case VIRTIO_CCW_DOING_READ_CONFIG:
1018− case VIRTIO_CCW_DOING_WRITE_CONFIG:
1019− case VIRTIO_CCW_DOING_WRITE_STATUS:
1020− case VIRTIO_CCW_DOING_SET_VQ:
1021− case VIRTIO_CCW_DOING_SET_IND:
1022− case VIRTIO_CCW_DOING_SET_CONF_IND:
1023− case VIRTIO_CCW_DOING_RESET:
1024− case VIRTIO_CCW_DOING_READ_VQ_CONF:
1025− case VIRTIO_CCW_DOING_SET_IND_ADAPTER:
1026− case VIRTIO_CCW_DOING_SET_VIRTIO_REV:
1027− vcdev->curr_io &= ~activity;
1028− wake_up(&vcdev->wait_q);
1029− break;
1030− default:
1031− /* don't know what to do... */
1032− dev_warn(&cdev->dev, "Suspicious activity '%08x'\n",
1033− activity);
1034− WARN_ON(1);
1035− break;
1036− }
1037− }
1049+ virtio_ccw_check_activity(vcdev, activity);
10381050 for_each_set_bit(i, &vcdev->indicators,
10391051 sizeof(vcdev->indicators) * BITS_PER_BYTE) {
10401052 /* The bit clear must happen before the vring kick. */
drivers/scsi/scsi_pm.c+10−10
@@ -219,13 +219,13 @@ static int sdev_runtime_suspend(struct device *dev) · 218 unmodified lines
219219 struct scsi_device *sdev = to_scsi_device(dev);
220220 int err = 0;
221221
222− if (pm && pm->runtime_suspend) {
223− err = blk_pre_runtime_suspend(sdev->request_queue);
224− if (err)
225− return err;
222+ err = blk_pre_runtime_suspend(sdev->request_queue);
223+ if (err)
224+ return err;
225+ if (pm && pm->runtime_suspend)
226226 err = pm->runtime_suspend(dev);
227− blk_post_runtime_suspend(sdev->request_queue, err);
228− }
227+ blk_post_runtime_suspend(sdev->request_queue, err);
228+
229229 return err;
230230 }
231231
@@ -248,11 +248,11 @@ static int sdev_runtime_resume(struct device *dev) · 16 unmodified lines
248248 const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
249249 int err = 0;
250250
251− if (pm && pm->runtime_resume) {
252− blk_pre_runtime_resume(sdev->request_queue);
251+ blk_pre_runtime_resume(sdev->request_queue);
252+ if (pm && pm->runtime_resume)
253253 err = pm->runtime_resume(dev);
254− blk_post_runtime_resume(sdev->request_queue, err);
255− }
254+ blk_post_runtime_resume(sdev->request_queue, err);
255+
256256 return err;
257257 }
258258
drivers/scsi/ses.c+28−2
@@ -84,6 +84,7 @@ static void init_device_slot_control(unsigned char *dest_desc, · 83 unmodified lines
8484 static int ses_recv_diag(struct scsi_device *sdev, int page_code,
8585 void *buf, int bufflen)
8686 {
87+ int ret;
8788 unsigned char cmd[] = {
8889 RECEIVE_DIAGNOSTIC,
8990 1, /* Set PCV bit */
@@ -92,9 +93,26 @@ static int ses_recv_diag(struct scsi_device *sdev, int page_code, · 2 unmodified lines
9293 bufflen & 0xff,
9394 0
9495 };
96+ unsigned char recv_page_code;
9597
96− return scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, bufflen,
98+ ret = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, bufflen,
9799 NULL, SES_TIMEOUT, SES_RETRIES, NULL);
100+ if (unlikely(!ret))
101+ return ret;
102+
103+ recv_page_code = ((unsigned char *)buf)[0];
104+
105+ if (likely(recv_page_code == page_code))
106+ return ret;
107+
108+ /* successful diagnostic but wrong page code. This happens to some
109+ * USB devices, just print a message and pretend there was an error */
110+
111+ sdev_printk(KERN_ERR, sdev,
112+ "Wrong diagnostic page; asked for %d got %u\n",
113+ page_code, recv_page_code);
114+
115+ return -EINVAL;
98116 }
99117
100118 static int ses_send_diag(struct scsi_device *sdev, int page_code,
@@ -541,7 +559,15 @@ static void ses_enclosure_data_process(struct enclosure_device *edev, · 440 unmodified lines
541559 if (desc_ptr)
542560 desc_ptr += len;
543561
544− if (addl_desc_ptr)
562+ if (addl_desc_ptr &&
563+ /* only find additional descriptions for specific devices */
564+ (type_ptr[0] == ENCLOSURE_COMPONENT_DEVICE ||
565+ type_ptr[0] == ENCLOSURE_COMPONENT_ARRAY_DEVICE ||
566+ type_ptr[0] == ENCLOSURE_COMPONENT_SAS_EXPANDER ||
567+ /* these elements are optional */
568+ type_ptr[0] == ENCLOSURE_COMPONENT_SCSI_TARGET_PORT ||
569+ type_ptr[0] == ENCLOSURE_COMPONENT_SCSI_INITIATOR_PORT ||
570+ type_ptr[0] == ENCLOSURE_COMPONENT_CONTROLLER_ELECTRONICS))
545571 addl_desc_ptr += addl_desc_ptr[1] + 2;
546572
547573 }
drivers/spi/spi-fsl-dspi.c+6−6
@@ -167,7 +167,7 @@ static inline int is_double_byte_mode(struct fsl_dspi *dspi) · 166 unmodified lines
167167 {
168168 unsigned int val;
169169
170− regmap_read(dspi->regmap, SPI_CTAR(dspi->cs), &val);
170+ regmap_read(dspi->regmap, SPI_CTAR(0), &val);
171171
172172 return ((val & SPI_FRAME_BITS_MASK) == SPI_FRAME_BITS(8)) ? 0 : 1;
173173 }
@@ -257,7 +257,7 @@ static u32 dspi_data_to_pushr(struct fsl_dspi *dspi, int tx_word) · 83 unmodified lines
257257
258258 return SPI_PUSHR_TXDATA(d16) |
259259 SPI_PUSHR_PCS(dspi->cs) |
260− SPI_PUSHR_CTAS(dspi->cs) |
260+ SPI_PUSHR_CTAS(0) |
261261 SPI_PUSHR_CONT;
262262 }
263263
@@ -290,7 +290,7 @@ static int dspi_eoq_write(struct fsl_dspi *dspi) · 26 unmodified lines
290290 */
291291 if (tx_word && (dspi->len == 1)) {
292292 dspi->dataflags |= TRAN_STATE_WORD_ODD_NUM;
293− regmap_update_bits(dspi->regmap, SPI_CTAR(dspi->cs),
293+ regmap_update_bits(dspi->regmap, SPI_CTAR(0),
294294 SPI_FRAME_BITS_MASK, SPI_FRAME_BITS(8));
295295 tx_word = 0;
296296 }
@@ -339,7 +339,7 @@ static int dspi_tcfq_write(struct fsl_dspi *dspi) · 42 unmodified lines
339339
340340 if (tx_word && (dspi->len == 1)) {
341341 dspi->dataflags |= TRAN_STATE_WORD_ODD_NUM;
342− regmap_update_bits(dspi->regmap, SPI_CTAR(dspi->cs),
342+ regmap_update_bits(dspi->regmap, SPI_CTAR(0),
343343 SPI_FRAME_BITS_MASK, SPI_FRAME_BITS(8));
344344 tx_word = 0;
345345 }
@@ -407,7 +407,7 @@ static int dspi_transfer_one_message(struct spi_master *master, · 61 unmodified lines
407407 regmap_update_bits(dspi->regmap, SPI_MCR,
408408 SPI_MCR_CLR_TXF | SPI_MCR_CLR_RXF,
409409 SPI_MCR_CLR_TXF | SPI_MCR_CLR_RXF);
410− regmap_write(dspi->regmap, SPI_CTAR(dspi->cs),
410+ regmap_write(dspi->regmap, SPI_CTAR(0),
411411 dspi->cur_chip->ctar_val);
412412
413413 trans_mode = dspi->devtype_data->trans_mode;
@@ -566,7 +566,7 @@ static irqreturn_t dspi_interrupt(int irq, void *dev_id) · 152 unmodified lines
566566 if (!dspi->len) {
567567 if (dspi->dataflags & TRAN_STATE_WORD_ODD_NUM) {
568568 regmap_update_bits(dspi->regmap,
569− SPI_CTAR(dspi->cs),
569+ SPI_CTAR(0),
570570 SPI_FRAME_BITS_MASK,
571571 SPI_FRAME_BITS(16));
572572 dspi->dataflags &= ~TRAN_STATE_WORD_ODD_NUM;
drivers/spi/spi.c+1−1
@@ -1705,7 +1705,7 @@ struct spi_master *spi_alloc_master(struct device *dev, unsigned size) · 1704 unmodified lines
17051705 master->bus_num = -1;
17061706 master->num_chipselect = 1;
17071707 master->dev.class = &spi_master_class;
1708− master->dev.parent = get_device(dev);
1708+ master->dev.parent = dev;
17091709 spi_master_set_devdata(master, &master[1]);
17101710
17111711 return master;
drivers/spi/spidev.c+1−1
@@ -651,11 +651,11 @@ static int spidev_release(struct inode *inode, struct file *filp) · 650 unmodified lines
651651 kfree(spidev->rx_buffer);
652652 spidev->rx_buffer = NULL;
653653
654+ spin_lock_irq(&spidev->spi_lock);
654655 if (spidev->spi)
655656 spidev->speed_hz = spidev->spi->max_speed_hz;
656657
657658 /* ... after we unbound from the underlying device? */
658− spin_lock_irq(&spidev->spi_lock);
659659 dofree = (spidev->spi == NULL);
660660 spin_unlock_irq(&spidev->spi_lock);
661661
drivers/staging/android/ion/ion_chunk_heap.c+2−2
@@ -81,7 +81,7 @@ static int ion_chunk_heap_allocate(struct ion_heap *heap, · 80 unmodified lines
8181 err:
8282 sg = table->sgl;
8383 for (i -= 1; i >= 0; i--) {
84− gen_pool_free(chunk_heap->pool, sg_phys(sg) & PAGE_MASK,
84+ gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)),
8585 sg->length);
8686 sg = sg_next(sg);
8787 }
@@ -109,7 +109,7 @@ static void ion_chunk_heap_free(struct ion_buffer *buffer) · 21 unmodified lines
109109 DMA_BIDIRECTIONAL);
110110
111111 for_each_sg(table->sgl, sg, table->nents, i) {
112− gen_pool_free(chunk_heap->pool, sg_phys(sg) & PAGE_MASK,
112+ gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)),
113113 sg->length);
114114 }
115115 chunk_heap->allocated -= allocated_size;
drivers/staging/iio/iio_simple_dummy_events.c+1−1
@@ -159,7 +159,7 @@ static irqreturn_t iio_simple_dummy_get_timestamp(int irq, void *private) · 158 unmodified lines
159159 struct iio_dummy_state *st = iio_priv(indio_dev);
160160
161161 st->event_timestamp = iio_get_time_ns();
162− return IRQ_HANDLED;
162+ return IRQ_WAKE_THREAD;
163163 }
164164
165165 /**
drivers/staging/lustre/lustre/obdecho/echo_client.c+11−9
@@ -1270,6 +1270,7 @@ static int · 1269 unmodified lines
12701270 echo_copyout_lsm(struct lov_stripe_md *lsm, void *_ulsm, int ulsm_nob)
12711271 {
12721272 struct lov_stripe_md *ulsm = _ulsm;
1273+ struct lov_oinfo **p;
12731274 int nob, i;
12741275
12751276 nob = offsetof(struct lov_stripe_md, lsm_oinfo[lsm->lsm_stripe_count]);
@@ -1279,9 +1280,10 @@ echo_copyout_lsm(struct lov_stripe_md *lsm, void *_ulsm, int ulsm_nob) · 3 unmodified lines
12791280 if (copy_to_user(ulsm, lsm, sizeof(*ulsm)))
12801281 return -EFAULT;
12811282
1282− for (i = 0; i < lsm->lsm_stripe_count; i++) {
1283− if (copy_to_user(ulsm->lsm_oinfo[i], lsm->lsm_oinfo[i],
1284− sizeof(lsm->lsm_oinfo[0])))
1283+ for (i = 0, p = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++, p++) {
1284+ struct lov_oinfo __user *up;
1285+ if (get_user(up, ulsm->lsm_oinfo + i) ||
1286+ copy_to_user(up, *p, sizeof(struct lov_oinfo)))
12851287 return -EFAULT;
12861288 }
12871289 return 0;
@@ -1289,9 +1291,10 @@ echo_copyout_lsm(struct lov_stripe_md *lsm, void *_ulsm, int ulsm_nob) · 1 unmodified line
12891291
12901292 static int
12911293 echo_copyin_lsm(struct echo_device *ed, struct lov_stripe_md *lsm,
1292− void *ulsm, int ulsm_nob)
1294+ struct lov_stripe_md __user *ulsm, int ulsm_nob)
12931295 {
12941296 struct echo_client_obd *ec = ed->ed_ec;
1297+ struct lov_oinfo **p;
12951298 int i;
12961299
12971300 if (ulsm_nob < sizeof(*lsm))
@@ -1306,11 +1309,10 @@ echo_copyin_lsm(struct echo_device *ed, struct lov_stripe_md *lsm, · 8 unmodified lines
13061309 ((__u64)lsm->lsm_stripe_size * lsm->lsm_stripe_count > ~0UL))
13071310 return -EINVAL;
13081311
1309− for (i = 0; i < lsm->lsm_stripe_count; i++) {
1310− if (copy_from_user(lsm->lsm_oinfo[i],
1311− ((struct lov_stripe_md *)ulsm)-> \
1312− lsm_oinfo[i],
1313− sizeof(lsm->lsm_oinfo[0])))
1312+ for (i = 0, p = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++, p++) {
1313+ struct lov_oinfo __user *up;
1314+ if (get_user(up, ulsm->lsm_oinfo + i) ||
1315+ copy_from_user(*p, up, sizeof(struct lov_oinfo)))
13141316 return -EFAULT;
13151317 }
13161318 return 0;
drivers/tty/n_tty.c+9−13
@@ -2054,13 +2054,13 @@ static int canon_copy_from_read_buf(struct tty_struct *tty, · 2053 unmodified lines
20542054 size_t eol;
20552055 size_t tail;
20562056 int ret, found = 0;
2057− bool eof_push = 0;
20582057
20592058 /* N.B. avoid overrun if nr == 0 */
2060− n = min(*nr, smp_load_acquire(&ldata->canon_head) - ldata->read_tail);
2061− if (!n)
2059+ if (!*nr)
20622060 return 0;
20632061
2062+ n = min(*nr + 1, smp_load_acquire(&ldata->canon_head) - ldata->read_tail);
2063+
20642064 tail = ldata->read_tail & (N_TTY_BUF_SIZE - 1);
20652065 size = min_t(size_t, tail + n, N_TTY_BUF_SIZE);
20662066
@@ -2081,12 +2081,11 @@ static int canon_copy_from_read_buf(struct tty_struct *tty, · 14 unmodified lines
20812081 n = eol - tail;
20822082 if (n > N_TTY_BUF_SIZE)
20832083 n += N_TTY_BUF_SIZE;
2084− n += found;
2085− c = n;
2084+ c = n + found;
20862085
2087− if (found && !ldata->push && read_buf(ldata, eol) == __DISABLED_CHAR) {
2088− n--;
2089− eof_push = !n && ldata->read_tail != ldata->line_start;
2086+ if (!found || read_buf(ldata, eol) != __DISABLED_CHAR) {
2087+ c = min(*nr, c);
2088+ n = c;
20902089 }
20912090
20922091 n_tty_trace("%s: eol:%zu found:%d n:%zu c:%zu size:%zu more:%zu\n",
@@ -2116,7 +2115,7 @@ static int canon_copy_from_read_buf(struct tty_struct *tty, · 23 unmodified lines
21162115 ldata->push = 0;
21172116 tty_audit_push(tty);
21182117 }
2119− return eof_push ? -EAGAIN : 0;
2118+ return 0;
21202119 }
21212120
21222121 extern ssize_t redirected_tty_write(struct file *, const char __user *,
@@ -2273,10 +2272,7 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file, · 150 unmodified lines
22732272
22742273 if (ldata->icanon && !L_EXTPROC(tty)) {
22752274 retval = canon_copy_from_read_buf(tty, &b, &nr);
2276− if (retval == -EAGAIN) {
2277− retval = 0;
2278− continue;
2279− } else if (retval)
2275+ if (retval)
22802276 break;
22812277 } else {
22822278 int uncopied;
drivers/tty/serial/8250/8250_uniphier.c+6−2
@@ -115,12 +115,16 @@ static void uniphier_serial_out(struct uart_port *p, int offset, int value) · 114 unmodified lines
115115 */
116116 static int uniphier_serial_dl_read(struct uart_8250_port *up)
117117 {
118− return readl(up->port.membase + UNIPHIER_UART_DLR);
118+ int offset = UNIPHIER_UART_DLR << up->port.regshift;
119+
120+ return readl(up->port.membase + offset);
119121 }
120122
121123 static void uniphier_serial_dl_write(struct uart_8250_port *up, int value)
122124 {
123− writel(value, up->port.membase + UNIPHIER_UART_DLR);
125+ int offset = UNIPHIER_UART_DLR << up->port.regshift;
126+
127+ writel(value, up->port.membase + offset);
124128 }
125129
126130 static int uniphier_of_serial_setup(struct device *dev, struct uart_port *port,
drivers/tty/serial/earlycon.c+2−0
@@ -115,6 +115,7 @@ static int __init register_earlycon(char *buf, const struct earlycon_id *match) · 114 unmodified lines
115115 if (buf && !parse_options(&early_console_dev, buf))
116116 buf = NULL;
117117
118+ spin_lock_init(&port->lock);
118119 port->uartclk = BASE_BAUD * 16;
119120 if (port->mapbase)
120121 port->membase = earlycon_map(port->mapbase, 64);
@@ -202,6 +203,7 @@ int __init of_setup_earlycon(unsigned long addr, · 81 unmodified lines
202203 int err;
203204 struct uart_port *port = &early_console_dev.port;
204205
206+ spin_lock_init(&port->lock);
205207 port->iotype = UPIO_MEM;
206208 port->mapbase = addr;
207209 port->uartclk = BASE_BAUD * 16;
drivers/tty/serial/sh-sci.c+1−1
@@ -1437,7 +1437,7 @@ static void sci_request_dma(struct uart_port *port) · 1436 unmodified lines
14371437 sg_init_table(sg, 1);
14381438 s->rx_buf[i] = buf;
14391439 sg_dma_address(sg) = dma;
1440− sg->length = s->buf_len_rx;
1440+ sg_dma_len(sg) = s->buf_len_rx;
14411441
14421442 buf += s->buf_len_rx;
14431443 dma += s->buf_len_rx;
drivers/tty/tty_buffer.c+1−1
@@ -450,7 +450,7 @@ receive_buf(struct tty_struct *tty, struct tty_buffer *head, int count) · 449 unmodified lines
450450 count = disc->ops->receive_buf2(tty, p, f, count);
451451 else {
452452 count = min_t(int, count, tty->receive_room);
453− if (count)
453+ if (count && disc->ops->receive_buf)
454454 disc->ops->receive_buf(tty, p, f, count);
455455 }
456456 return count;
drivers/usb/class/cdc-acm.c+5−0
@@ -1838,6 +1838,11 @@ static const struct usb_device_id acm_ids[] = { · 1837 unmodified lines
18381838 },
18391839 #endif
18401840
1841+ /* Exclude Infineon Flash Loader utility */
1842+ { USB_DEVICE(0x058b, 0x0041),
1843+ .driver_info = IGNORE_DEVICE,
1844+ },
1845+
18411846 /* control interfaces without any protocol set */
18421847 { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
18431848 USB_CDC_PROTO_NONE) },
drivers/usb/core/config.c+2−1
@@ -115,7 +115,8 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno, · 114 unmodified lines
115115 USB_SS_MULT(desc->bmAttributes) > 3) {
116116 dev_warn(ddev, "Isoc endpoint has Mult of %d in "
117117 "config %d interface %d altsetting %d ep %d: "
118− "setting to 3\n", desc->bmAttributes + 1,
118+ "setting to 3\n",
119+ USB_SS_MULT(desc->bmAttributes),
119120 cfgno, inum, asnum, ep->desc.bEndpointAddress);
120121 ep->ss_ep_comp.bmAttributes = 2;
121122 }
drivers/usb/core/hub.c+33−11
@@ -124,6 +124,10 @@ struct usb_hub *usb_hub_to_struct_hub(struct usb_device *hdev) · 123 unmodified lines
124124
125125 int usb_device_supports_lpm(struct usb_device *udev)
126126 {
127+ /* Some devices have trouble with LPM */
128+ if (udev->quirks & USB_QUIRK_NO_LPM)
129+ return 0;
130+
127131 /* USB 2.1 (and greater) devices indicate LPM support through
128132 * their USB 2.0 Extended Capabilities BOS descriptor.
129133 */
@@ -1031,10 +1035,20 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) · 901 unmodified lines
10311035 unsigned delay;
10321036
10331037 /* Continue a partial initialization */
1034− if (type == HUB_INIT2)
1035− goto init2;
1036− if (type == HUB_INIT3)
1038+ if (type == HUB_INIT2 || type == HUB_INIT3) {
1039+ device_lock(hub->intfdev);
1040+
1041+ /* Was the hub disconnected while we were waiting? */
1042+ if (hub->disconnected) {
1043+ device_unlock(hub->intfdev);
1044+ kref_put(&hub->kref, hub_release);
1045+ return;
1046+ }
1047+ if (type == HUB_INIT2)
1048+ goto init2;
10371049 goto init3;
1050+ }
1051+ kref_get(&hub->kref);
10381052
10391053 /* The superspeed hub except for root hub has to use Hub Depth
10401054 * value as an offset into the route string to locate the bits
@@ -1232,6 +1246,7 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) · 191 unmodified lines
12321246 queue_delayed_work(system_power_efficient_wq,
12331247 &hub->init_work,
12341248 msecs_to_jiffies(delay));
1249+ device_unlock(hub->intfdev);
12351250 return; /* Continues at init3: below */
12361251 } else {
12371252 msleep(delay);
@@ -1253,6 +1268,11 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) · 15 unmodified lines
12531268 /* Allow autosuspend if it was suppressed */
12541269 if (type <= HUB_INIT3)
12551270 usb_autopm_put_interface_async(to_usb_interface(hub->intfdev));
1271+
1272+ if (type == HUB_INIT2 || type == HUB_INIT3)
1273+ device_unlock(hub->intfdev);
1274+
1275+ kref_put(&hub->kref, hub_release);
12561276 }
12571277
12581278 /* Implement the continuations for the delays above */
@@ -4512,6 +4532,8 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, · 3253 unmodified lines
45124532 goto fail;
45134533 }
45144534
4535+ usb_detect_quirks(udev);
4536+
45154537 if (udev->wusb == 0 && le16_to_cpu(udev->descriptor.bcdUSB) >= 0x0201) {
45164538 retval = usb_get_bos_descriptor(udev);
45174539 if (!retval) {
@@ -4710,7 +4732,6 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, · 192 unmodified lines
47104732 if (status < 0)
47114733 goto loop;
47124734
4713− usb_detect_quirks(udev);
47144735 if (udev->quirks & USB_QUIRK_DELAY_INIT)
47154736 msleep(1000);
47164737
@@ -5326,9 +5347,6 @@ static int usb_reset_and_verify_device(struct usb_device *udev) · 609 unmodified lines
53265347 if (udev->usb2_hw_lpm_enabled == 1)
53275348 usb_set_usb2_hardware_lpm(udev, 0);
53285349
5329− bos = udev->bos;
5330− udev->bos = NULL;
5331−
53325350 /* Disable LPM and LTM while we reset the device and reinstall the alt
53335351 * settings. Device-initiated LPM settings, and system exit latency
53345352 * settings are cleared when the device is reset, so we have to set
@@ -5337,15 +5355,18 @@ static int usb_reset_and_verify_device(struct usb_device *udev) · 2 unmodified lines
53375355 ret = usb_unlocked_disable_lpm(udev);
53385356 if (ret) {
53395357 dev_err(&udev->dev, "%s Failed to disable LPM\n.", __func__);
5340− goto re_enumerate;
5358+ goto re_enumerate_no_bos;
53415359 }
53425360 ret = usb_disable_ltm(udev);
53435361 if (ret) {
53445362 dev_err(&udev->dev, "%s Failed to disable LTM\n.",
53455363 __func__);
5346− goto re_enumerate;
5364+ goto re_enumerate_no_bos;
53475365 }
53485366
5367+ bos = udev->bos;
5368+ udev->bos = NULL;
5369+
53495370 for (i = 0; i < SET_CONFIG_TRIES; ++i) {
53505371
53515372 /* ep0 maxpacket size may change; let the HCD know about it.
@@ -5442,10 +5463,11 @@ done: · 90 unmodified lines
54425463 return 0;
54435464
54445465 re_enumerate:
5445− /* LPM state doesn't matter when we're about to destroy the device. */
5446− hub_port_logical_disconnect(parent_hub, port1);
54475466 usb_release_bos_descriptor(udev);
54485467 udev->bos = bos;
5468+re_enumerate_no_bos:
5469+ /* LPM state doesn't matter when we're about to destroy the device. */
5470+ hub_port_logical_disconnect(parent_hub, port1);
54495471 return -ENODEV;
54505472 }
54515473
drivers/usb/core/port.c+2−2
@@ -206,7 +206,7 @@ static int link_peers(struct usb_port *left, struct usb_port *right) · 205 unmodified lines
206206 else
207207 method = "default";
208208
209− pr_warn("usb: failed to peer %s and %s by %s (%s:%s) (%s:%s)\n",
209+ pr_debug("usb: failed to peer %s and %s by %s (%s:%s) (%s:%s)\n",
210210 dev_name(&left->dev), dev_name(&right->dev), method,
211211 dev_name(&left->dev),
212212 lpeer ? dev_name(&lpeer->dev) : "none",
@@ -265,7 +265,7 @@ static void link_peers_report(struct usb_port *left, struct usb_port *right) · 52 unmodified lines
265265 if (rc == 0) {
266266 dev_dbg(&left->dev, "peered to %s\n", dev_name(&right->dev));
267267 } else {
268− dev_warn(&left->dev, "failed to peer to %s (%d)\n",
268+ dev_dbg(&left->dev, "failed to peer to %s (%d)\n",
269269 dev_name(&right->dev), rc);
270270 pr_warn_once("usb: port power management may be unreliable\n");
271271 usb_port_block_power_off = 1;
drivers/usb/core/quirks.c+9−0
@@ -125,6 +125,9 @@ static const struct usb_device_id usb_quirk_list[] = { · 124 unmodified lines
125125 { USB_DEVICE(0x04f3, 0x016f), .driver_info =
126126 USB_QUIRK_DEVICE_QUALIFIER },
127127
128+ { USB_DEVICE(0x04f3, 0x21b8), .driver_info =
129+ USB_QUIRK_DEVICE_QUALIFIER },
130+
128131 /* Roland SC-8820 */
129132 { USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },
130133
@@ -199,6 +202,12 @@ static const struct usb_device_id usb_quirk_list[] = { · 68 unmodified lines
199202 { USB_DEVICE(0x1a0a, 0x0200), .driver_info =
200203 USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL },
201204
205+ /* Blackmagic Design Intensity Shuttle */
206+ { USB_DEVICE(0x1edb, 0xbd3b), .driver_info = USB_QUIRK_NO_LPM },
207+
208+ /* Blackmagic Design UltraStudio SDI */
209+ { USB_DEVICE(0x1edb, 0xbd4f), .driver_info = USB_QUIRK_NO_LPM },
210+
202211 { } /* terminating entry must be last */
203212 };
204213
drivers/usb/dwc2/platform.c+53−28
@@ -125,9 +125,11 @@ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg) · 124 unmodified lines
125125 if (ret)
126126 return ret;
127127
128− ret = clk_prepare_enable(hsotg->clk);
129− if (ret)
130− return ret;
128+ if (hsotg->clk) {
129+ ret = clk_prepare_enable(hsotg->clk);
130+ if (ret)
131+ return ret;
132+ }
131133
132134 if (hsotg->uphy)
133135 ret = usb_phy_init(hsotg->uphy);
@@ -175,7 +177,8 @@ static int __dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) · 41 unmodified lines
175177 if (ret)
176178 return ret;
177179
178− clk_disable_unprepare(hsotg->clk);
180+ if (hsotg->clk)
181+ clk_disable_unprepare(hsotg->clk);
179182
180183 ret = regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies),
181184 hsotg->supplies);
@@ -212,14 +215,41 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) · 30 unmodified lines
212215 */
213216 hsotg->phy = devm_phy_get(hsotg->dev, "usb2-phy");
214217 if (IS_ERR(hsotg->phy)) {
215− hsotg->phy = NULL;
218+ ret = PTR_ERR(hsotg->phy);
219+ switch (ret) {
220+ case -ENODEV:
221+ case -ENOSYS:
222+ hsotg->phy = NULL;
223+ break;
224+ case -EPROBE_DEFER:
225+ return ret;
226+ default:
227+ dev_err(hsotg->dev, "error getting phy %d\n", ret);
228+ return ret;
229+ }
230+ }
231+
232+ if (!hsotg->phy) {
216233 hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2);
217− if (IS_ERR(hsotg->uphy))
218− hsotg->uphy = NULL;
219− else
220− hsotg->plat = dev_get_platdata(hsotg->dev);
234+ if (IS_ERR(hsotg->uphy)) {
235+ ret = PTR_ERR(hsotg->uphy);
236+ switch (ret) {
237+ case -ENODEV:
238+ case -ENXIO:
239+ hsotg->uphy = NULL;
240+ break;
241+ case -EPROBE_DEFER:
242+ return ret;
243+ default:
244+ dev_err(hsotg->dev, "error getting usb phy %d\n",
245+ ret);
246+ return ret;
247+ }
248+ }
221249 }
222250
251+ hsotg->plat = dev_get_platdata(hsotg->dev);
252+
223253 if (hsotg->phy) {
224254 /*
225255 * If using the generic PHY framework, check if the PHY bus
@@ -229,11 +259,6 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) · 3 unmodified lines
229259 hsotg->phyif = GUSBCFG_PHYIF8;
230260 }
231261
232− if (!hsotg->phy && !hsotg->uphy && !hsotg->plat) {
233− dev_err(hsotg->dev, "no platform data or transceiver defined\n");
234− return -EPROBE_DEFER;
235− }
236−
237262 /* Clock */
238263 hsotg->clk = devm_clk_get(hsotg->dev, "otg");
239264 if (IS_ERR(hsotg->clk)) {
@@ -342,20 +367,6 @@ static int dwc2_driver_probe(struct platform_device *dev) · 102 unmodified lines
342367 if (retval)
343368 return retval;
344369
345− irq = platform_get_irq(dev, 0);
346− if (irq < 0) {
347− dev_err(&dev->dev, "missing IRQ resource\n");
348− return irq;
349− }
350−
351− dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
352− irq);
353− retval = devm_request_irq(hsotg->dev, irq,
354− dwc2_handle_common_intr, IRQF_SHARED,
355− dev_name(hsotg->dev), hsotg);
356− if (retval)
357− return retval;
358−
359370 res = platform_get_resource(dev, IORESOURCE_MEM, 0);
360371 hsotg->regs = devm_ioremap_resource(&dev->dev, res);
361372 if (IS_ERR(hsotg->regs))
@@ -390,6 +401,20 @@ static int dwc2_driver_probe(struct platform_device *dev) · 28 unmodified lines
390401
391402 dwc2_set_all_params(hsotg->core_params, -1);
392403
404+ irq = platform_get_irq(dev, 0);
405+ if (irq < 0) {
406+ dev_err(&dev->dev, "missing IRQ resource\n");
407+ return irq;
408+ }
409+
410+ dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
411+ irq);
412+ retval = devm_request_irq(hsotg->dev, irq,
413+ dwc2_handle_common_intr, IRQF_SHARED,
414+ dev_name(hsotg->dev), hsotg);
415+ if (retval)
416+ return retval;
417+
393418 retval = dwc2_lowlevel_hw_enable(hsotg);
394419 if (retval)
395420 return retval;
drivers/usb/dwc3/gadget.c+1−0
@@ -1078,6 +1078,7 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req) · 1077 unmodified lines
10781078 * little bit faster.
10791079 */
10801080 if (!usb_endpoint_xfer_isoc(dep->endpoint.desc) &&
1081+ !usb_endpoint_xfer_int(dep->endpoint.desc) &&
10811082 !(dep->flags & DWC3_EP_BUSY)) {
10821083 ret = __dwc3_gadget_kick_transfer(dep, 0, true);
10831084 goto out;
drivers/usb/gadget/function/f_fs.c+3−3
@@ -423,7 +423,7 @@ static ssize_t __ffs_ep0_read_events(struct ffs_data *ffs, char __user *buf, · 422 unmodified lines
423423 spin_unlock_irq(&ffs->ev.waitq.lock);
424424 mutex_unlock(&ffs->mutex);
425425
426− return unlikely(__copy_to_user(buf, events, size)) ? -EFAULT : size;
426+ return unlikely(copy_to_user(buf, events, size)) ? -EFAULT : size;
427427 }
428428
429429 static ssize_t ffs_ep0_read(struct file *file, char __user *buf,
@@ -513,7 +513,7 @@ static ssize_t ffs_ep0_read(struct file *file, char __user *buf, · 83 unmodified lines
513513
514514 /* unlocks spinlock */
515515 ret = __ffs_ep0_queue_wait(ffs, data, len);
516− if (likely(ret > 0) && unlikely(__copy_to_user(buf, data, len)))
516+ if (likely(ret > 0) && unlikely(copy_to_user(buf, data, len)))
517517 ret = -EFAULT;
518518 goto done_mutex;
519519
@@ -3493,7 +3493,7 @@ static char *ffs_prepare_buffer(const char __user *buf, size_t len) · 2973 unmodified lines
34933493 if (unlikely(!data))
34943494 return ERR_PTR(-ENOMEM);
34953495
3496− if (unlikely(__copy_from_user(data, buf, len))) {
3496+ if (unlikely(copy_from_user(data, buf, len))) {
34973497 kfree(data);
34983498 return ERR_PTR(-EFAULT);
34993499 }
drivers/usb/gadget/function/f_midi.c+2−1
@@ -370,6 +370,7 @@ static int f_midi_set_alt(struct usb_function *f, unsigned intf, unsigned alt) · 369 unmodified lines
370370 if (err) {
371371 ERROR(midi, "%s queue req: %d\n",
372372 midi->out_ep->name, err);
373+ free_ep_req(midi->out_ep, req);
373374 }
374375 }
375376
@@ -545,7 +546,7 @@ static void f_midi_transmit(struct f_midi *midi, struct usb_request *req) · 169 unmodified lines
545546 }
546547 }
547548
548− if (req->length > 0) {
549+ if (req->length > 0 && ep->enabled) {
549550 int err;
550551
551552 err = usb_ep_queue(ep, req, GFP_ATOMIC);
drivers/usb/gadget/function/uvc_configfs.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #define UVC_ATTR(prefix, cname, aname) \
2121 static struct configfs_attribute prefix##attr_##cname = { \
2222 .ca_name = __stringify(aname), \
23− .ca_mode = S_IRUGO, \
23+ .ca_mode = S_IRUGO | S_IWUGO, \
2424 .ca_owner = THIS_MODULE, \
2525 .show = prefix##cname##_show, \
2626 .store = prefix##cname##_store, \
drivers/usb/gadget/udc/pxa27x_udc.c+3−0
@@ -2536,6 +2536,9 @@ static int pxa_udc_suspend(struct platform_device *_dev, pm_message_t state) · 2535 unmodified lines
25362536 udc->pullup_resume = udc->pullup_on;
25372537 dplus_pullup(udc, 0);
25382538
2539+ if (udc->driver)
2540+ udc->driver->disconnect(&udc->gadget);
2541+
25392542 return 0;
25402543 }
25412544
drivers/usb/host/ohci-at91.c+5−6
@@ -473,6 +473,8 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) · 472 unmodified lines
473473 if (!pdata)
474474 return -ENOMEM;
475475
476+ pdev->dev.platform_data = pdata;
477+
476478 if (!of_property_read_u32(np, "num-ports", &ports))
477479 pdata->ports = ports;
478480
@@ -483,6 +485,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) · 4 unmodified lines
483485 */
484486 if (i >= pdata->ports) {
485487 pdata->vbus_pin[i] = -EINVAL;
488+ pdata->overcurrent_pin[i] = -EINVAL;
486489 continue;
487490 }
488491
@@ -513,10 +516,8 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) · 24 unmodified lines
513516 }
514517
515518 at91_for_each_port(i) {
516− if (i >= pdata->ports) {
517− pdata->overcurrent_pin[i] = -EINVAL;
518− continue;
519− }
519+ if (i >= pdata->ports)
520+ break;
520521
521522 pdata->overcurrent_pin[i] =
522523 of_get_named_gpio_flags(np, "atmel,oc-gpio", i, &flags);
@@ -552,8 +553,6 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) · 29 unmodified lines
552553 }
553554 }
554555
555− pdev->dev.platform_data = pdata;
556−
557556 device_init_wakeup(&pdev->dev, 1);
558557 return usb_hcd_at91_probe(&ohci_at91_hc_driver, pdev);
559558 }
drivers/usb/host/whci/qset.c+4−0
@@ -377,6 +377,10 @@ static int qset_fill_page_list(struct whc *whc, struct whc_std *std, gfp_t mem_f · 376 unmodified lines
377377 if (std->pl_virt == NULL)
378378 return -ENOMEM;
379379 std->dma_addr = dma_map_single(whc->wusbhc.dev, std->pl_virt, pl_len, DMA_TO_DEVICE);
380+ if (dma_mapping_error(whc->wusbhc.dev, std->dma_addr)) {
381+ kfree(std->pl_virt);
382+ return -EFAULT;
383+ }
380384
381385 for (p = 0; p < std->num_pointers; p++) {
382386 std->pl_virt[p].buf_ptr = cpu_to_le64(dma_addr);
drivers/usb/host/xhci-hub.c+42−5
@@ -733,8 +733,30 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd, · 732 unmodified lines
733733 if ((raw_port_status & PORT_RESET) ||
734734 !(raw_port_status & PORT_PE))
735735 return 0xffffffff;
736− if (time_after_eq(jiffies,
737− bus_state->resume_done[wIndex])) {
736+ /* did port event handler already start resume timing? */
737+ if (!bus_state->resume_done[wIndex]) {
738+ /* If not, maybe we are in a host initated resume? */
739+ if (test_bit(wIndex, &bus_state->resuming_ports)) {
740+ /* Host initated resume doesn't time the resume
741+ * signalling using resume_done[].
742+ * It manually sets RESUME state, sleeps 20ms
743+ * and sets U0 state. This should probably be
744+ * changed, but not right now.
745+ */
746+ } else {
747+ /* port resume was discovered now and here,
748+ * start resume timing
749+ */
750+ unsigned long timeout = jiffies +
751+ msecs_to_jiffies(USB_RESUME_TIMEOUT);
752+
753+ set_bit(wIndex, &bus_state->resuming_ports);
754+ bus_state->resume_done[wIndex] = timeout;
755+ mod_timer(&hcd->rh_timer, timeout);
756+ }
757+ /* Has resume been signalled for USB_RESUME_TIME yet? */
758+ } else if (time_after_eq(jiffies,
759+ bus_state->resume_done[wIndex])) {
738760 int time_left;
739761
740762 xhci_dbg(xhci, "Resume USB2 port %d\n",
@@ -775,13 +797,26 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd, · 34 unmodified lines
775797 } else {
776798 /*
777799 * The resume has been signaling for less than
778− * 20ms. Report the port status as SUSPEND,
779− * let the usbcore check port status again
780− * and clear resume signaling later.
800+ * USB_RESUME_TIME. Report the port status as SUSPEND,
801+ * let the usbcore check port status again and clear
802+ * resume signaling later.
781803 */
782804 status |= USB_PORT_STAT_SUSPEND;
783805 }
784806 }
807+ /*
808+ * Clear stale usb2 resume signalling variables in case port changed
809+ * state during resume signalling. For example on error
810+ */
811+ if ((bus_state->resume_done[wIndex] ||
812+ test_bit(wIndex, &bus_state->resuming_ports)) &&
813+ (raw_port_status & PORT_PLS_MASK) != XDEV_U3 &&
814+ (raw_port_status & PORT_PLS_MASK) != XDEV_RESUME) {
815+ bus_state->resume_done[wIndex] = 0;
816+ clear_bit(wIndex, &bus_state->resuming_ports);
817+ }
818+
819+
785820 if ((raw_port_status & PORT_PLS_MASK) == XDEV_U0 &&
786821 (raw_port_status & PORT_POWER)) {
787822 if (bus_state->suspended_ports & (1 << wIndex)) {
@@ -1115,6 +1150,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, · 327 unmodified lines
11151150 if ((temp & PORT_PE) == 0)
11161151 goto error;
11171152
1153+ set_bit(wIndex, &bus_state->resuming_ports);
11181154 xhci_set_link_state(xhci, port_array, wIndex,
11191155 XDEV_RESUME);
11201156 spin_unlock_irqrestore(&xhci->lock, flags);
@@ -1122,6 +1158,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, · 1 unmodified line
11221158 spin_lock_irqsave(&xhci->lock, flags);
11231159 xhci_set_link_state(xhci, port_array, wIndex,
11241160 XDEV_U0);
1161+ clear_bit(wIndex, &bus_state->resuming_ports);
11251162 }
11261163 bus_state->port_c_suspend |= 1 << wIndex;
11271164
drivers/usb/host/xhci-pci.c+6−2
@@ -188,10 +188,14 @@ static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) · 187 unmodified lines
188188 0xb7, 0x0c, 0x34, 0xac, 0x01, 0xe9, 0xbf, 0x45,
189189 0xb7, 0xe6, 0x2b, 0x34, 0xec, 0x93, 0x1e, 0x23,
190190 };
191− acpi_evaluate_dsm(ACPI_HANDLE(&dev->dev), intel_dsm_uuid, 3, 1, NULL);
191+ union acpi_object *obj;
192+
193+ obj = acpi_evaluate_dsm(ACPI_HANDLE(&dev->dev), intel_dsm_uuid, 3, 1,
194+ NULL);
195+ ACPI_FREE(obj);
192196 }
193197 #else
194− static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
198+static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
195199 #endif /* CONFIG_ACPI */
196200
197201 /* called during probe() after chip reset completes */
drivers/usb/host/xhci-ring.c+2−1
@@ -1583,7 +1583,8 @@ static void handle_port_status(struct xhci_hcd *xhci, · 1582 unmodified lines
15831583 */
15841584 bogus_port_status = true;
15851585 goto cleanup;
1586− } else {
1586+ } else if (!test_bit(faked_port_index,
1587+ &bus_state->resuming_ports)) {
15871588 xhci_dbg(xhci, "resume HS port %d\n", port_id);
15881589 bus_state->resume_done[faked_port_index] = jiffies +
15891590 msecs_to_jiffies(USB_RESUME_TIMEOUT);
drivers/usb/host/xhci.c+8−0
@@ -4778,8 +4778,16 @@ int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, · 4777 unmodified lines
47784778 ctrl_ctx->add_flags |= cpu_to_le32(SLOT_FLAG);
47794779 slot_ctx = xhci_get_slot_ctx(xhci, config_cmd->in_ctx);
47804780 slot_ctx->dev_info |= cpu_to_le32(DEV_HUB);
4781+ /*
4782+ * refer to section 6.2.2: MTT should be 0 for full speed hub,
4783+ * but it may be already set to 1 when setup an xHCI virtual
4784+ * device, so clear it anyway.
4785+ */
47814786 if (tt->multi)
47824787 slot_ctx->dev_info |= cpu_to_le32(DEV_MTT);
4788+ else if (hdev->speed == USB_SPEED_FULL)
4789+ slot_ctx->dev_info &= cpu_to_le32(~DEV_MTT);
4790+
47834791 if (xhci->hci_version > 0x95) {
47844792 xhci_dbg(xhci, "xHCI version %x needs hub "
47854793 "TT think time and number of ports\n",
drivers/usb/musb/Kconfig+1−1
@@ -159,7 +159,7 @@ config USB_TI_CPPI_DMA · 158 unmodified lines
159159
160160 config USB_TI_CPPI41_DMA
161161 bool 'TI CPPI 4.1 (AM335x)'
162− depends on ARCH_OMAP
162+ depends on ARCH_OMAP && DMADEVICES
163163 select TI_CPPI41
164164
165165 config USB_TUSB_OMAP_DMA
drivers/usb/musb/musb_core.c+7−1
@@ -2017,7 +2017,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) · 2016 unmodified lines
20172017 /* We need musb_read/write functions initialized for PM */
20182018 pm_runtime_use_autosuspend(musb->controller);
20192019 pm_runtime_set_autosuspend_delay(musb->controller, 200);
2020− pm_runtime_irq_safe(musb->controller);
20212020 pm_runtime_enable(musb->controller);
20222021
20232022 /* The musb_platform_init() call:
@@ -2095,6 +2094,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) · 71 unmodified lines
20952094 #ifndef CONFIG_MUSB_PIO_ONLY
20962095 if (!musb->ops->dma_init || !musb->ops->dma_exit) {
20972096 dev_err(dev, "DMA controller not set\n");
2097+ status = -ENODEV;
20982098 goto fail2;
20992099 }
21002100 musb_dma_controller_create = musb->ops->dma_init;
@@ -2218,6 +2218,12 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) · 117 unmodified lines
22182218
22192219 pm_runtime_put(musb->controller);
22202220
2221+ /*
2222+ * For why this is currently needed, see commit 3e43a0725637
2223+ * ("usb: musb: core: add pm_runtime_irq_safe()")
2224+ */
2225+ pm_runtime_irq_safe(musb->controller);
2226+
22212227 return 0;
22222228
22232229 fail5:
drivers/usb/phy/phy-msm-usb.c+3−3
@@ -1506,7 +1506,6 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg) · 1505 unmodified lines
15061506 {
15071507 struct msm_otg_platform_data *pdata;
15081508 struct extcon_dev *ext_id, *ext_vbus;
1509− const struct of_device_id *id;
15101509 struct device_node *node = pdev->dev.of_node;
15111510 struct property *prop;
15121511 int len, ret, words;
@@ -1518,8 +1517,9 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg) · 5 unmodified lines
15181517
15191518 motg->pdata = pdata;
15201519
1521− id = of_match_device(msm_otg_dt_match, &pdev->dev);
1522− pdata->phy_type = (enum msm_usb_phy_type) id->data;
1520+ pdata->phy_type = (enum msm_usb_phy_type)of_device_get_match_data(&pdev->dev);
1521+ if (!pdata->phy_type)
1522+ return 1;
15231523
15241524 motg->link_rst = devm_reset_control_get(&pdev->dev, "link");
15251525 if (IS_ERR(motg->link_rst))
drivers/usb/phy/phy-mxs-usb.c+5−0
@@ -143,12 +143,17 @@ static const struct mxs_phy_data imx6sx_phy_data = { · 142 unmodified lines
143143 .flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS,
144144 };
145145
146+static const struct mxs_phy_data imx6ul_phy_data = {
147+ .flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS,
148+};
149+
146150 static const struct of_device_id mxs_phy_dt_ids[] = {
147151 { .compatible = "fsl,imx6sx-usbphy", .data = &imx6sx_phy_data, },
148152 { .compatible = "fsl,imx6sl-usbphy", .data = &imx6sl_phy_data, },
149153 { .compatible = "fsl,imx6q-usbphy", .data = &imx6q_phy_data, },
150154 { .compatible = "fsl,imx23-usbphy", .data = &imx23_phy_data, },
151155 { .compatible = "fsl,vf610-usbphy", .data = &vf610_phy_data, },
156+ { .compatible = "fsl,imx6ul-usbphy", .data = &imx6ul_phy_data, },
152157 { /* sentinel */ }
153158 };
154159 MODULE_DEVICE_TABLE(of, mxs_phy_dt_ids);
drivers/usb/renesas_usbhs/mod_gadget.c+9−2
@@ -131,7 +131,8 @@ static void __usbhsg_queue_pop(struct usbhsg_uep *uep, · 130 unmodified lines
131131 struct device *dev = usbhsg_gpriv_to_dev(gpriv);
132132 struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
133133
134− dev_dbg(dev, "pipe %d : queue pop\n", usbhs_pipe_number(pipe));
134+ if (pipe)
135+ dev_dbg(dev, "pipe %d : queue pop\n", usbhs_pipe_number(pipe));
135136
136137 ureq->req.status = status;
137138 spin_unlock(usbhs_priv_to_lock(priv));
@@ -685,7 +686,13 @@ static int usbhsg_ep_dequeue(struct usb_ep *ep, struct usb_request *req) · 547 unmodified lines
685686 struct usbhsg_request *ureq = usbhsg_req_to_ureq(req);
686687 struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
687688
688− usbhs_pkt_pop(pipe, usbhsg_ureq_to_pkt(ureq));
689+ if (pipe)
690+ usbhs_pkt_pop(pipe, usbhsg_ureq_to_pkt(ureq));
691+
692+ /*
693+ * To dequeue a request, this driver should call the usbhsg_queue_pop()
694+ * even if the pipe is NULL.
695+ */
689696 usbhsg_queue_pop(uep, ureq, -ECONNRESET);
690697
691698 return 0;
drivers/usb/serial/cp210x.c+0−1
@@ -132,7 +132,6 @@ static const struct usb_device_id id_table[] = { · 131 unmodified lines
132132 { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
133133 { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
134134 { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
135− { USB_DEVICE(0x10C4, 0xEA80) }, /* Silicon Labs factory default */
136135 { USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */
137136 { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */
138137 { USB_DEVICE(0x10C4, 0xF002) }, /* Elan Digital Systems USBwave12 */
drivers/usb/serial/ipaq.c+2−1
@@ -531,7 +531,8 @@ static int ipaq_open(struct tty_struct *tty, · 530 unmodified lines
531531 * through. Since this has a reasonably high failure rate, we retry
532532 * several times.
533533 */
534− while (retries--) {
534+ while (retries) {
535+ retries--;
535536 result = usb_control_msg(serial->dev,
536537 usb_sndctrlpipe(serial->dev, 0), 0x22, 0x21,
537538 0x1, 0, NULL, 0, 100);
drivers/usb/serial/usb-serial-simple.c+1−0
@@ -53,6 +53,7 @@ DEVICE(funsoft, FUNSOFT_IDS); · 52 unmodified lines
5353
5454 /* Infineon Flashloader driver */
5555 #define FLASHLOADER_IDS() \
56+ { USB_DEVICE_INTERFACE_CLASS(0x058b, 0x0041, USB_CLASS_CDC_DATA) }, \
5657 { USB_DEVICE(0x8087, 0x0716) }
5758 DEVICE(flashloader, FLASHLOADER_IDS);
5859
drivers/usb/storage/uas.c+4−0
@@ -796,6 +796,10 @@ static int uas_slave_configure(struct scsi_device *sdev) · 795 unmodified lines
796796 if (devinfo->flags & US_FL_NO_REPORT_OPCODES)
797797 sdev->no_report_opcodes = 1;
798798
799+ /* A few buggy USB-ATA bridges don't understand FUA */
800+ if (devinfo->flags & US_FL_BROKEN_FUA)
801+ sdev->broken_fua = 1;
802+
799803 scsi_change_queue_depth(sdev, devinfo->qdepth - 2);
800804 return 0;
801805 }
drivers/usb/storage/unusual_devs.h+1−1
@@ -1987,7 +1987,7 @@ UNUSUAL_DEV( 0x14cd, 0x6600, 0x0201, 0x0201, · 1986 unmodified lines
19871987 US_FL_IGNORE_RESIDUE ),
19881988
19891989 /* Reported by Michael Büsch <m@bues.ch> */
1990−UNUSUAL_DEV( 0x152d, 0x0567, 0x0114, 0x0114,
1990+UNUSUAL_DEV( 0x152d, 0x0567, 0x0114, 0x0116,
19911991 "JMicron",
19921992 "USB to ATA/ATAPI Bridge",
19931993 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
drivers/usb/storage/unusual_uas.h+1−1
@@ -132,7 +132,7 @@ UNUSUAL_DEV(0x152d, 0x0567, 0x0000, 0x9999, · 131 unmodified lines
132132 "JMicron",
133133 "JMS567",
134134 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
135− US_FL_NO_REPORT_OPCODES),
135+ US_FL_BROKEN_FUA | US_FL_NO_REPORT_OPCODES),
136136
137137 /* Reported-by: Hans de Goede <hdegoede@redhat.com> */
138138 UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999,
drivers/vfio/Kconfig+0−15
@@ -31,21 +31,6 @@ menuconfig VFIO · 30 unmodified lines
3131
3232 If you don't know what to do here, say N.
3333
34−menuconfig VFIO_NOIOMMU
35− bool "VFIO No-IOMMU support"
36− depends on VFIO
37− help
38− VFIO is built on the ability to isolate devices using the IOMMU.
39− Only with an IOMMU can userspace access to DMA capable devices be
40− considered secure. VFIO No-IOMMU mode enables IOMMU groups for
41− devices without IOMMU backing for the purpose of re-using the VFIO
42− infrastructure in a non-secure mode. Use of this mode will result
43− in an unsupportable kernel and will therefore taint the kernel.
44− Device assignment to virtual machines is also not possible with
45− this mode since there is no IOMMU to provide DMA translation.
46−
47− If you don't know what to do here, say N.
48−
4934 source "drivers/vfio/pci/Kconfig"
5035 source "drivers/vfio/platform/Kconfig"
5136 source "virt/lib/Kconfig"
drivers/vfio/pci/vfio_pci.c+5−5
@@ -940,13 +940,13 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) · 939 unmodified lines
940940 if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL)
941941 return -EINVAL;
942942
943− group = vfio_iommu_group_get(&pdev->dev);
943+ group = iommu_group_get(&pdev->dev);
944944 if (!group)
945945 return -EINVAL;
946946
947947 vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
948948 if (!vdev) {
949− vfio_iommu_group_put(group, &pdev->dev);
949+ iommu_group_put(group);
950950 return -ENOMEM;
951951 }
952952
@@ -957,7 +957,7 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) · 4 unmodified lines
957957
958958 ret = vfio_add_group_dev(&pdev->dev, &vfio_pci_ops, vdev);
959959 if (ret) {
960− vfio_iommu_group_put(group, &pdev->dev);
960+ iommu_group_put(group);
961961 kfree(vdev);
962962 return ret;
963963 }
@@ -993,7 +993,7 @@ static void vfio_pci_remove(struct pci_dev *pdev) · 29 unmodified lines
993993 if (!vdev)
994994 return;
995995
996− vfio_iommu_group_put(pdev->dev.iommu_group, &pdev->dev);
996+ iommu_group_put(pdev->dev.iommu_group);
997997 kfree(vdev);
998998
999999 if (vfio_pci_is_vga(pdev)) {
@@ -1035,7 +1035,7 @@ static pci_ers_result_t vfio_pci_aer_err_detected(struct pci_dev *pdev, · 35 unmodified lines
10351035 return PCI_ERS_RESULT_CAN_RECOVER;
10361036 }
10371037
1038−static struct pci_error_handlers vfio_err_handlers = {
1038+static const struct pci_error_handlers vfio_err_handlers = {
10391039 .error_detected = vfio_pci_aer_err_detected,
10401040 };
10411041
drivers/vfio/platform/vfio_platform.c+0−1
@@ -92,7 +92,6 @@ static struct platform_driver vfio_platform_driver = { · 91 unmodified lines
9292 .remove = vfio_platform_remove,
9393 .driver = {
9494 .name = "vfio-platform",
95− .owner = THIS_MODULE,
9695 },
9796 };
9897
drivers/vfio/platform/vfio_platform_common.c+1−4
@@ -51,13 +51,10 @@ static vfio_platform_reset_fn_t vfio_platform_lookup_reset(const char *compat, · 50 unmodified lines
5151
5252 static void vfio_platform_get_reset(struct vfio_platform_device *vdev)
5353 {
54− char modname[256];
55−
5654 vdev->reset = vfio_platform_lookup_reset(vdev->compat,
5755 &vdev->reset_module);
5856 if (!vdev->reset) {
59− snprintf(modname, 256, "vfio-reset:%s", vdev->compat);
60− request_module(modname);
57+ request_module("vfio-reset:%s", vdev->compat);
6158 vdev->reset = vfio_platform_lookup_reset(vdev->compat,
6259 &vdev->reset_module);
6360 }
drivers/vfio/vfio.c+7−181
@@ -62,7 +62,6 @@ struct vfio_container { · 61 unmodified lines
6262 struct rw_semaphore group_lock;
6363 struct vfio_iommu_driver *iommu_driver;
6464 void *iommu_data;
65− bool noiommu;
6665 };
6766
6867 struct vfio_unbound_dev {
@@ -85,7 +84,6 @@ struct vfio_group { · 16 unmodified lines
8584 struct list_head unbound_list;
8685 struct mutex unbound_lock;
8786 atomic_t opened;
88− bool noiommu;
8987 };
9088
9189 struct vfio_device {
@@ -97,147 +95,6 @@ struct vfio_device { · 5 unmodified lines
9795 void *device_data;
9896 };
9997
100−#ifdef CONFIG_VFIO_NOIOMMU
101−static bool noiommu __read_mostly;
102−module_param_named(enable_unsafe_noiommu_support,
103− noiommu, bool, S_IRUGO | S_IWUSR);
104−MODULE_PARM_DESC(enable_unsafe_noiommu_mode, "Enable UNSAFE, no-IOMMU mode. This mode provides no device isolation, no DMA translation, no host kernel protection, cannot be used for device assignment to virtual machines, requires RAWIO permissions, and will taint the kernel. If you do not know what this is for, step away. (default: false)");
105−#endif
106−
107−/*
108− * vfio_iommu_group_{get,put} are only intended for VFIO bus driver probe
109− * and remove functions, any use cases other than acquiring the first
110− * reference for the purpose of calling vfio_add_group_dev() or removing
111− * that symmetric reference after vfio_del_group_dev() should use the raw
112− * iommu_group_{get,put} functions. In particular, vfio_iommu_group_put()
113− * removes the device from the dummy group and cannot be nested.
114− */
115−struct iommu_group *vfio_iommu_group_get(struct device *dev)
116−{
117− struct iommu_group *group;
118− int __maybe_unused ret;
119−
120− group = iommu_group_get(dev);
121−
122−#ifdef CONFIG_VFIO_NOIOMMU
123− /*
124− * With noiommu enabled, an IOMMU group will be created for a device
125− * that doesn't already have one and doesn't have an iommu_ops on their
126− * bus. We use iommu_present() again in the main code to detect these
127− * fake groups.
128− */
129− if (group || !noiommu || iommu_present(dev->bus))
130− return group;
131−
132− group = iommu_group_alloc();
133− if (IS_ERR(group))
134− return NULL;
135−
136− iommu_group_set_name(group, "vfio-noiommu");
137− ret = iommu_group_add_device(group, dev);
138− iommu_group_put(group);
139− if (ret)
140− return NULL;
141−
142− /*
143− * Where to taint? At this point we've added an IOMMU group for a
144− * device that is not backed by iommu_ops, therefore any iommu_
145− * callback using iommu_ops can legitimately Oops. So, while we may
146− * be about to give a DMA capable device to a user without IOMMU
147− * protection, which is clearly taint-worthy, let's go ahead and do
148− * it here.
149− */
150− add_taint(TAINT_USER, LOCKDEP_STILL_OK);
151− dev_warn(dev, "Adding kernel taint for vfio-noiommu group on device\n");
152−#endif
153−
154− return group;
155−}
156−EXPORT_SYMBOL_GPL(vfio_iommu_group_get);
157−
158−void vfio_iommu_group_put(struct iommu_group *group, struct device *dev)
159−{
160−#ifdef CONFIG_VFIO_NOIOMMU
161− if (!iommu_present(dev->bus))
162− iommu_group_remove_device(dev);
163−#endif
164−
165− iommu_group_put(group);
166−}
167−EXPORT_SYMBOL_GPL(vfio_iommu_group_put);
168−
169−#ifdef CONFIG_VFIO_NOIOMMU
170−static void *vfio_noiommu_open(unsigned long arg)
171−{
172− if (arg != VFIO_NOIOMMU_IOMMU)
173− return ERR_PTR(-EINVAL);
174− if (!capable(CAP_SYS_RAWIO))
175− return ERR_PTR(-EPERM);
176−
177− return NULL;
178−}
179−
180−static void vfio_noiommu_release(void *iommu_data)
181−{
182−}
183−
184−static long vfio_noiommu_ioctl(void *iommu_data,
185− unsigned int cmd, unsigned long arg)
186−{
187− if (cmd == VFIO_CHECK_EXTENSION)
188− return arg == VFIO_NOIOMMU_IOMMU ? 1 : 0;
189−
190− return -ENOTTY;
191−}
192−
193−static int vfio_iommu_present(struct device *dev, void *unused)
194−{
195− return iommu_present(dev->bus) ? 1 : 0;
196−}
197−
198−static int vfio_noiommu_attach_group(void *iommu_data,
199− struct iommu_group *iommu_group)
200−{
201− return iommu_group_for_each_dev(iommu_group, NULL,
202− vfio_iommu_present) ? -EINVAL : 0;
203−}
204−
205−static void vfio_noiommu_detach_group(void *iommu_data,
206− struct iommu_group *iommu_group)
207−{
208−}
209−
210−static struct vfio_iommu_driver_ops vfio_noiommu_ops = {
211− .name = "vfio-noiommu",
212− .owner = THIS_MODULE,
213− .open = vfio_noiommu_open,
214− .release = vfio_noiommu_release,
215− .ioctl = vfio_noiommu_ioctl,
216− .attach_group = vfio_noiommu_attach_group,
217− .detach_group = vfio_noiommu_detach_group,
218−};
219−
220−static struct vfio_iommu_driver vfio_noiommu_driver = {
221− .ops = &vfio_noiommu_ops,
222−};
223−
224−/*
225− * Wrap IOMMU drivers, the noiommu driver is the one and only driver for
226− * noiommu groups (and thus containers) and not available for normal groups.
227− */
228−#define vfio_for_each_iommu_driver(con, pos) \
229− for (pos = con->noiommu ? &vfio_noiommu_driver : \
230− list_first_entry(&vfio.iommu_drivers_list, \
231− struct vfio_iommu_driver, vfio_next); \
232− (con->noiommu ? pos != NULL : \
233− &pos->vfio_next != &vfio.iommu_drivers_list); \
234− pos = con->noiommu ? NULL : list_next_entry(pos, vfio_next))
235−#else
236−#define vfio_for_each_iommu_driver(con, pos) \
237− list_for_each_entry(pos, &vfio.iommu_drivers_list, vfio_next)
238−#endif
239−
240−
24198 /**
24299 * IOMMU driver registration
243100 */
@@ -342,8 +199,7 @@ static void vfio_group_unlock_and_free(struct vfio_group *group) · 98 unmodified lines
342199 /**
343200 * Group objects - create, release, get, put, search
344201 */
345−static struct vfio_group *vfio_create_group(struct iommu_group *iommu_group,
346− bool noiommu)
202+static struct vfio_group *vfio_create_group(struct iommu_group *iommu_group)
347203 {
348204 struct vfio_group *group, *tmp;
349205 struct device *dev;
@@ -361,7 +217,6 @@ static struct vfio_group *vfio_create_group(struct iommu_group *iommu_group, · 11 unmodified lines
361217 atomic_set(&group->container_users, 0);
362218 atomic_set(&group->opened, 0);
363219 group->iommu_group = iommu_group;
364− group->noiommu = noiommu;
365220
366221 group->nb.notifier_call = vfio_iommu_group_notifier;
367222
@@ -397,8 +252,7 @@ static struct vfio_group *vfio_create_group(struct iommu_group *iommu_group, · 29 unmodified lines
397252
398253 dev = device_create(vfio.class, NULL,
399254 MKDEV(MAJOR(vfio.group_devt), minor),
400− group, "%s%d", noiommu ? "noiommu-" : "",
401− iommu_group_id(iommu_group));
255+ group, "%d", iommu_group_id(iommu_group));
402256 if (IS_ERR(dev)) {
403257 vfio_free_group_minor(minor);
404258 vfio_group_unlock_and_free(group);
@@ -682,7 +536,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev) · 277 unmodified lines
682536 return 0;
683537
684538 /* TODO Prevent device auto probing */
685− WARN("Device %s added to live group %d!\n", dev_name(dev),
539+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
686540 iommu_group_id(group->iommu_group));
687541
688542 return 0;
@@ -786,8 +640,7 @@ int vfio_add_group_dev(struct device *dev, · 97 unmodified lines
786640
787641 group = vfio_group_get_from_iommu(iommu_group);
788642 if (!group) {
789− group = vfio_create_group(iommu_group,
790− !iommu_present(dev->bus));
643+ group = vfio_create_group(iommu_group);
791644 if (IS_ERR(group)) {
792645 iommu_group_put(iommu_group);
793646 return PTR_ERR(group);
@@ -999,7 +852,8 @@ static long vfio_ioctl_check_extension(struct vfio_container *container, · 205 unmodified lines
999852 */
1000853 if (!driver) {
1001854 mutex_lock(&vfio.iommu_drivers_lock);
1002− vfio_for_each_iommu_driver(container, driver) {
855+ list_for_each_entry(driver, &vfio.iommu_drivers_list,
856+ vfio_next) {
1003857 if (!try_module_get(driver->ops->owner))
1004858 continue;
1005859
@@ -1068,7 +922,7 @@ static long vfio_ioctl_set_iommu(struct vfio_container *container, · 62 unmodified lines
1068922 }
1069923
1070924 mutex_lock(&vfio.iommu_drivers_lock);
1071− vfio_for_each_iommu_driver(container, driver) {
925+ list_for_each_entry(driver, &vfio.iommu_drivers_list, vfio_next) {
1072926 void *data;
1073927
1074928 if (!try_module_get(driver->ops->owner))
@@ -1333,9 +1187,6 @@ static int vfio_group_set_container(struct vfio_group *group, int container_fd) · 258 unmodified lines
13331187 if (atomic_read(&group->container_users))
13341188 return -EINVAL;
13351189
1336− if (group->noiommu && !capable(CAP_SYS_RAWIO))
1337− return -EPERM;
1338−
13391190 f = fdget(container_fd);
13401191 if (!f.file)
13411192 return -EBADF;
@@ -1351,13 +1202,6 @@ static int vfio_group_set_container(struct vfio_group *group, int container_fd) · 9 unmodified lines
13511202
13521203 down_write(&container->group_lock);
13531204
1354− /* Real groups and fake groups cannot mix */
1355− if (!list_empty(&container->group_list) &&
1356− container->noiommu != group->noiommu) {
1357− ret = -EPERM;
1358− goto unlock_out;
1359− }
1360−
13611205 driver = container->iommu_driver;
13621206 if (driver) {
13631207 ret = driver->ops->attach_group(container->iommu_data,
@@ -1367,7 +1211,6 @@ static int vfio_group_set_container(struct vfio_group *group, int container_fd) · 3 unmodified lines
13671211 }
13681212
13691213 group->container = container;
1370− container->noiommu = group->noiommu;
13711214 list_add(&group->container_next, &container->group_list);
13721215
13731216 /* Get a reference on the container and mark a user within the group */
@@ -1398,9 +1241,6 @@ static int vfio_group_get_device_fd(struct vfio_group *group, char *buf) · 24 unmodified lines
13981241 !group->container->iommu_driver || !vfio_group_viable(group))
13991242 return -EINVAL;
14001243
1401− if (group->noiommu && !capable(CAP_SYS_RAWIO))
1402− return -EPERM;
1403−
14041244 device = vfio_device_get_from_name(group, buf);
14051245 if (!device)
14061246 return -ENODEV;
@@ -1443,10 +1283,6 @@ static int vfio_group_get_device_fd(struct vfio_group *group, char *buf) · 36 unmodified lines
14431283
14441284 fd_install(ret, filep);
14451285
1446− if (group->noiommu)
1447− dev_warn(device->dev, "vfio-noiommu device opened by user "
1448− "(%s:%d)\n", current->comm, task_pid_nr(current));
1449−
14501286 return ret;
14511287 }
14521288
@@ -1535,11 +1371,6 @@ static int vfio_group_fops_open(struct inode *inode, struct file *filep) · 82 unmodified lines
15351371 if (!group)
15361372 return -ENODEV;
15371373
1538− if (group->noiommu && !capable(CAP_SYS_RAWIO)) {
1539− vfio_group_put(group);
1540− return -EPERM;
1541− }
1542−
15431374 /* Do we need multiple instances of the group open? Seems not. */
15441375 opened = atomic_cmpxchg(&group->opened, 0, 1);
15451376 if (opened) {
@@ -1702,11 +1533,6 @@ struct vfio_group *vfio_group_get_external_user(struct file *filep) · 156 unmodified lines
17021533 if (!atomic_inc_not_zero(&group->container_users))
17031534 return ERR_PTR(-EINVAL);
17041535
1705− if (group->noiommu) {
1706− atomic_dec(&group->container_users);
1707− return ERR_PTR(-EPERM);
1708− }
1709−
17101536 if (!group->container->iommu_driver ||
17111537 !vfio_group_viable(group)) {
17121538 atomic_dec(&group->container_users);
drivers/vhost/vhost.c+4−4
@@ -819,7 +819,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp) · 818 unmodified lines
819819 BUILD_BUG_ON(__alignof__ *vq->used > VRING_USED_ALIGN_SIZE);
820820 if ((a.avail_user_addr & (VRING_AVAIL_ALIGN_SIZE - 1)) ||
821821 (a.used_user_addr & (VRING_USED_ALIGN_SIZE - 1)) ||
822− (a.log_guest_addr & (sizeof(u64) - 1))) {
822+ (a.log_guest_addr & (VRING_USED_ALIGN_SIZE - 1))) {
823823 r = -EINVAL;
824824 break;
825825 }
@@ -1369,7 +1369,7 @@ int vhost_get_vq_desc(struct vhost_virtqueue *vq, · 543 unmodified lines
13691369 /* Grab the next descriptor number they're advertising, and increment
13701370 * the index we've seen. */
13711371 if (unlikely(__get_user(ring_head,
1372− &vq->avail->ring[last_avail_idx % vq->num]))) {
1372+ &vq->avail->ring[last_avail_idx & (vq->num - 1)]))) {
13731373 vq_err(vq, "Failed to read head: idx %d address %p\n",
13741374 last_avail_idx,
13751375 &vq->avail->ring[last_avail_idx % vq->num]);
@@ -1489,7 +1489,7 @@ static int __vhost_add_used_n(struct vhost_virtqueue *vq, · 113 unmodified lines
14891489 u16 old, new;
14901490 int start;
14911491
1492− start = vq->last_used_idx % vq->num;
1492+ start = vq->last_used_idx & (vq->num - 1);
14931493 used = vq->used->ring + start;
14941494 if (count == 1) {
14951495 if (__put_user(heads[0].id, &used->id)) {
@@ -1531,7 +1531,7 @@ int vhost_add_used_n(struct vhost_virtqueue *vq, struct vring_used_elem *heads, · 35 unmodified lines
15311531 {
15321532 int start, n, r;
15331533
1534− start = vq->last_used_idx % vq->num;
1534+ start = vq->last_used_idx & (vq->num - 1);
15351535 n = vq->num - start;
15361536 if (n < count) {
15371537 r = __vhost_add_used_n(vq, heads, n);
drivers/video/fbdev/fsl-diu-fb.c+12−1
@@ -479,7 +479,10 @@ static enum fsl_diu_monitor_port fsl_diu_name_to_port(const char *s) · 478 unmodified lines
479479 port = FSL_DIU_PORT_DLVDS;
480480 }
481481
482− return diu_ops.valid_monitor_port(port);
482+ if (diu_ops.valid_monitor_port)
483+ port = diu_ops.valid_monitor_port(port);
484+
485+ return port;
483486 }
484487
485488 /*
@@ -1915,6 +1918,14 @@ static int __init fsl_diu_init(void) · 1429 unmodified lines
19151918 #else
19161919 monitor_port = fsl_diu_name_to_port(monitor_string);
19171920 #endif
1921+
1922+ /*
1923+ * Must to verify set_pixel_clock. If not implement on platform,
1924+ * then that means that there is no platform support for the DIU.
1925+ */
1926+ if (!diu_ops.set_pixel_clock)
1927+ return -ENODEV;
1928+
19181929 pr_info("Freescale Display Interface Unit (DIU) framebuffer driver\n");
19191930
19201931 #ifdef CONFIG_NOT_COHERENT_CACHE
drivers/video/fbdev/omap2/dss/venc.c+12−0
@@ -275,6 +275,12 @@ const struct omap_video_timings omap_dss_pal_timings = { · 274 unmodified lines
275275 .vbp = 41,
276276
277277 .interlace = true,
278+
279+ .hsync_level = OMAPDSS_SIG_ACTIVE_LOW,
280+ .vsync_level = OMAPDSS_SIG_ACTIVE_LOW,
281+ .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
282+ .de_level = OMAPDSS_SIG_ACTIVE_HIGH,
283+ .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
278284 };
279285 EXPORT_SYMBOL(omap_dss_pal_timings);
280286
@@ -290,6 +296,12 @@ const struct omap_video_timings omap_dss_ntsc_timings = { · 9 unmodified lines
290296 .vbp = 31,
291297
292298 .interlace = true,
299+
300+ .hsync_level = OMAPDSS_SIG_ACTIVE_LOW,
301+ .vsync_level = OMAPDSS_SIG_ACTIVE_LOW,
302+ .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
303+ .de_level = OMAPDSS_SIG_ACTIVE_HIGH,
304+ .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
293305 };
294306 EXPORT_SYMBOL(omap_dss_ntsc_timings);
295307
drivers/virtio/virtio.c+1−0
@@ -412,6 +412,7 @@ static int virtio_init(void) · 411 unmodified lines
412412 static void __exit virtio_exit(void)
413413 {
414414 bus_unregister(&virtio_bus);
415+ ida_destroy(&virtio_index_ida);
415416 }
416417 core_initcall(virtio_init);
417418 module_exit(virtio_exit);
drivers/virtio/virtio_ring.c+35−13
@@ -80,6 +80,12 @@ struct vring_virtqueue { · 79 unmodified lines
8080 /* Last used index we've seen. */
8181 u16 last_used_idx;
8282
83+ /* Last written value to avail->flags */
84+ u16 avail_flags_shadow;
85+
86+ /* Last written value to avail->idx in guest byte order */
87+ u16 avail_idx_shadow;
88+
8389 /* How to notify other side. FIXME: commonalize hcalls! */
8490 bool (*notify)(struct virtqueue *vq);
8591
@@ -109,7 +115,7 @@ static struct vring_desc *alloc_indirect(struct virtqueue *_vq, · 23 unmodified lines
109115 * otherwise virt_to_phys will give us bogus addresses in the
110116 * virtqueue.
111117 */
112− gfp &= ~(__GFP_HIGHMEM | __GFP_HIGH);
118+ gfp &= ~__GFP_HIGHMEM;
113119
114120 desc = kmalloc(total_sg * sizeof(struct vring_desc), gfp);
115121 if (!desc)
@@ -235,13 +241,14 @@ static inline int virtqueue_add(struct virtqueue *_vq, · 119 unmodified lines
235241
236242 /* Put entry in available array (but don't update avail->idx until they
237243 * do sync). */
238− avail = virtio16_to_cpu(_vq->vdev, vq->vring.avail->idx) & (vq->vring.num - 1);
244+ avail = vq->avail_idx_shadow & (vq->vring.num - 1);
239245 vq->vring.avail->ring[avail] = cpu_to_virtio16(_vq->vdev, head);
240246
241247 /* Descriptors and available array need to be set before we expose the
242248 * new available array entries. */
243249 virtio_wmb(vq->weak_barriers);
244− vq->vring.avail->idx = cpu_to_virtio16(_vq->vdev, virtio16_to_cpu(_vq->vdev, vq->vring.avail->idx) + 1);
250+ vq->avail_idx_shadow++;
251+ vq->vring.avail->idx = cpu_to_virtio16(_vq->vdev, vq->avail_idx_shadow);
245252 vq->num_added++;
246253
247254 pr_debug("Added buffer head %i to %p\n", head, vq);
@@ -354,8 +361,8 @@ bool virtqueue_kick_prepare(struct virtqueue *_vq) · 106 unmodified lines
354361 * event. */
355362 virtio_mb(vq->weak_barriers);
356363
357− old = virtio16_to_cpu(_vq->vdev, vq->vring.avail->idx) - vq->num_added;
358− new = virtio16_to_cpu(_vq->vdev, vq->vring.avail->idx);
364+ old = vq->avail_idx_shadow - vq->num_added;
365+ new = vq->avail_idx_shadow;
359366 vq->num_added = 0;
360367
361368 #ifdef DEBUG
@@ -510,7 +517,7 @@ void *virtqueue_get_buf(struct virtqueue *_vq, unsigned int *len) · 148 unmodified lines
510517 /* If we expect an interrupt for the next entry, tell host
511518 * by writing event index and flush out the write before
512519 * the read in the next get_buf call. */
513− if (!(vq->vring.avail->flags & cpu_to_virtio16(_vq->vdev, VRING_AVAIL_F_NO_INTERRUPT))) {
520+ if (!(vq->avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT)) {
514521 vring_used_event(&vq->vring) = cpu_to_virtio16(_vq->vdev, vq->last_used_idx);
515522 virtio_mb(vq->weak_barriers);
516523 }
@@ -537,7 +544,11 @@ void virtqueue_disable_cb(struct virtqueue *_vq) · 20 unmodified lines
537544 {
538545 struct vring_virtqueue *vq = to_vvq(_vq);
539546
540− vq->vring.avail->flags |= cpu_to_virtio16(_vq->vdev, VRING_AVAIL_F_NO_INTERRUPT);
547+ if (!(vq->avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT)) {
548+ vq->avail_flags_shadow |= VRING_AVAIL_F_NO_INTERRUPT;
549+ vq->vring.avail->flags = cpu_to_virtio16(_vq->vdev, vq->avail_flags_shadow);
550+ }
551+
541552 }
542553 EXPORT_SYMBOL_GPL(virtqueue_disable_cb);
543554
@@ -565,7 +576,10 @@ unsigned virtqueue_enable_cb_prepare(struct virtqueue *_vq) · 21 unmodified lines
565576 /* Depending on the VIRTIO_RING_F_EVENT_IDX feature, we need to
566577 * either clear the flags bit or point the event index at the next
567578 * entry. Always do both to keep code simple. */
568− vq->vring.avail->flags &= cpu_to_virtio16(_vq->vdev, ~VRING_AVAIL_F_NO_INTERRUPT);
579+ if (vq->avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT) {
580+ vq->avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT;
581+ vq->vring.avail->flags = cpu_to_virtio16(_vq->vdev, vq->avail_flags_shadow);
582+ }
569583 vring_used_event(&vq->vring) = cpu_to_virtio16(_vq->vdev, last_used_idx = vq->last_used_idx);
570584 END_USE(vq);
571585 return last_used_idx;
@@ -633,9 +647,12 @@ bool virtqueue_enable_cb_delayed(struct virtqueue *_vq) · 61 unmodified lines
633647 /* Depending on the VIRTIO_RING_F_USED_EVENT_IDX feature, we need to
634648 * either clear the flags bit or point the event index at the next
635649 * entry. Always do both to keep code simple. */
636− vq->vring.avail->flags &= cpu_to_virtio16(_vq->vdev, ~VRING_AVAIL_F_NO_INTERRUPT);
650+ if (vq->avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT) {
651+ vq->avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT;
652+ vq->vring.avail->flags = cpu_to_virtio16(_vq->vdev, vq->avail_flags_shadow);
653+ }
637654 /* TODO: tune this threshold */
638− bufs = (u16)(virtio16_to_cpu(_vq->vdev, vq->vring.avail->idx) - vq->last_used_idx) * 3 / 4;
655+ bufs = (u16)(vq->avail_idx_shadow - vq->last_used_idx) * 3 / 4;
639656 vring_used_event(&vq->vring) = cpu_to_virtio16(_vq->vdev, vq->last_used_idx + bufs);
640657 virtio_mb(vq->weak_barriers);
641658 if (unlikely((u16)(virtio16_to_cpu(_vq->vdev, vq->vring.used->idx) - vq->last_used_idx) > bufs)) {
@@ -670,7 +687,8 @@ void *virtqueue_detach_unused_buf(struct virtqueue *_vq) · 28 unmodified lines
670687 /* detach_buf clears data, so grab it now. */
671688 buf = vq->data[i];
672689 detach_buf(vq, i);
673− vq->vring.avail->idx = cpu_to_virtio16(_vq->vdev, virtio16_to_cpu(_vq->vdev, vq->vring.avail->idx) - 1);
690+ vq->avail_idx_shadow--;
691+ vq->vring.avail->idx = cpu_to_virtio16(_vq->vdev, vq->avail_idx_shadow);
674692 END_USE(vq);
675693 return buf;
676694 }
@@ -735,6 +753,8 @@ struct virtqueue *vring_new_virtqueue(unsigned int index, · 58 unmodified lines
735753 vq->weak_barriers = weak_barriers;
736754 vq->broken = false;
737755 vq->last_used_idx = 0;
756+ vq->avail_flags_shadow = 0;
757+ vq->avail_idx_shadow = 0;
738758 vq->num_added = 0;
739759 list_add_tail(&vq->vq.list, &vdev->vqs);
740760 #ifdef DEBUG
@@ -746,8 +766,10 @@ struct virtqueue *vring_new_virtqueue(unsigned int index, · 5 unmodified lines
746766 vq->event = virtio_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX);
747767
748768 /* No callback? Tell other side not to bother us. */
749− if (!callback)
750− vq->vring.avail->flags |= cpu_to_virtio16(vdev, VRING_AVAIL_F_NO_INTERRUPT);
769+ if (!callback) {
770+ vq->avail_flags_shadow |= VRING_AVAIL_F_NO_INTERRUPT;
771+ vq->vring.avail->flags = cpu_to_virtio16(vdev, vq->avail_flags_shadow);
772+ }
751773
752774 /* Put everything in free lists. */
753775 vq->free_head = 0;
drivers/xen/events/events_fifo.c+18−5
@@ -281,7 +281,8 @@ static void handle_irq_for_port(unsigned port) · 280 unmodified lines
281281
282282 static void consume_one_event(unsigned cpu,
283283 struct evtchn_fifo_control_block *control_block,
284− unsigned priority, unsigned long *ready)
284+ unsigned priority, unsigned long *ready,
285+ bool drop)
285286 {
286287 struct evtchn_fifo_queue *q = &per_cpu(cpu_queue, cpu);
287288 uint32_t head;
@@ -313,13 +314,17 @@ static void consume_one_event(unsigned cpu, · 25 unmodified lines
313314 if (head == 0)
314315 clear_bit(priority, ready);
315316
316− if (evtchn_fifo_is_pending(port) && !evtchn_fifo_is_masked(port))
317− handle_irq_for_port(port);
317+ if (evtchn_fifo_is_pending(port) && !evtchn_fifo_is_masked(port)) {
318+ if (unlikely(drop))
319+ pr_warn("Dropping pending event for port %u\n", port);
320+ else
321+ handle_irq_for_port(port);
322+ }
318323
319324 q->head[priority] = head;
320325 }
321326
322−static void evtchn_fifo_handle_events(unsigned cpu)
327+static void __evtchn_fifo_handle_events(unsigned cpu, bool drop)
323328 {
324329 struct evtchn_fifo_control_block *control_block;
325330 unsigned long ready;
@@ -331,11 +336,16 @@ static void evtchn_fifo_handle_events(unsigned cpu) · 5 unmodified lines
331336
332337 while (ready) {
333338 q = find_first_bit(&ready, EVTCHN_FIFO_MAX_QUEUES);
334− consume_one_event(cpu, control_block, q, &ready);
339+ consume_one_event(cpu, control_block, q, &ready, drop);
335340 ready |= xchg(&control_block->ready, 0);
336341 }
337342 }
338343
344+static void evtchn_fifo_handle_events(unsigned cpu)
345+{
346+ __evtchn_fifo_handle_events(cpu, false);
347+}
348+
339349 static void evtchn_fifo_resume(void)
340350 {
341351 unsigned cpu;
@@ -420,6 +430,9 @@ static int evtchn_fifo_cpu_notification(struct notifier_block *self, · 78 unmodified lines
420430 if (!per_cpu(cpu_control_block, cpu))
421431 ret = evtchn_fifo_alloc_control_block(cpu);
422432 break;
433+ case CPU_DEAD:
434+ __evtchn_fifo_handle_events(cpu, true);
435+ break;
423436 default:
424437 break;
425438 }
drivers/xen/xen-pciback/pciback.h+1−0
@@ -37,6 +37,7 @@ struct xen_pcibk_device { · 36 unmodified lines
3737 struct xen_pci_sharedinfo *sh_info;
3838 unsigned long flags;
3939 struct work_struct op_work;
40+ struct xen_pci_op op;
4041 };
4142
4243 struct xen_pcibk_dev_data {
drivers/xen/xen-pciback/pciback_ops.c+60−15
@@ -70,6 +70,13 @@ static void xen_pcibk_control_isr(struct pci_dev *dev, int reset) · 69 unmodified lines
7070 enable ? "enable" : "disable");
7171
7272 if (enable) {
73+ /*
74+ * The MSI or MSI-X should not have an IRQ handler. Otherwise
75+ * if the guest terminates we BUG_ON in free_msi_irqs.
76+ */
77+ if (dev->msi_enabled || dev->msix_enabled)
78+ goto out;
79+
7380 rc = request_irq(dev_data->irq,
7481 xen_pcibk_guest_interrupt, IRQF_SHARED,
7582 dev_data->irq_name, dev);
@@ -144,7 +151,12 @@ int xen_pcibk_enable_msi(struct xen_pcibk_device *pdev, · 68 unmodified lines
144151 if (unlikely(verbose_request))
145152 printk(KERN_DEBUG DRV_NAME ": %s: enable MSI\n", pci_name(dev));
146153
147− status = pci_enable_msi(dev);
154+ if (dev->msi_enabled)
155+ status = -EALREADY;
156+ else if (dev->msix_enabled)
157+ status = -ENXIO;
158+ else
159+ status = pci_enable_msi(dev);
148160
149161 if (status) {
150162 pr_warn_ratelimited("%s: error enabling MSI for guest %u: err %d\n",
@@ -173,20 +185,23 @@ static · 22 unmodified lines
173185 int xen_pcibk_disable_msi(struct xen_pcibk_device *pdev,
174186 struct pci_dev *dev, struct xen_pci_op *op)
175187 {
176− struct xen_pcibk_dev_data *dev_data;
177−
178188 if (unlikely(verbose_request))
179189 printk(KERN_DEBUG DRV_NAME ": %s: disable MSI\n",
180190 pci_name(dev));
181− pci_disable_msi(dev);
182191
192+ if (dev->msi_enabled) {
193+ struct xen_pcibk_dev_data *dev_data;
194+
195+ pci_disable_msi(dev);
196+
197+ dev_data = pci_get_drvdata(dev);
198+ if (dev_data)
199+ dev_data->ack_intr = 1;
200+ }
183201 op->value = dev->irq ? xen_pirq_from_irq(dev->irq) : 0;
184202 if (unlikely(verbose_request))
185203 printk(KERN_DEBUG DRV_NAME ": %s: MSI: %d\n", pci_name(dev),
186204 op->value);
187− dev_data = pci_get_drvdata(dev);
188− if (dev_data)
189− dev_data->ack_intr = 1;
190205 return 0;
191206 }
192207
@@ -197,13 +212,26 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev, · 4 unmodified lines
197212 struct xen_pcibk_dev_data *dev_data;
198213 int i, result;
199214 struct msix_entry *entries;
215+ u16 cmd;
200216
201217 if (unlikely(verbose_request))
202218 printk(KERN_DEBUG DRV_NAME ": %s: enable MSI-X\n",
203219 pci_name(dev));
220+
204221 if (op->value > SH_INFO_MAX_VEC)
205222 return -EINVAL;
206223
224+ if (dev->msix_enabled)
225+ return -EALREADY;
226+
227+ /*
228+ * PCI_COMMAND_MEMORY must be enabled, otherwise we may not be able
229+ * to access the BARs where the MSI-X entries reside.
230+ */
231+ pci_read_config_word(dev, PCI_COMMAND, &cmd);
232+ if (dev->msi_enabled || !(cmd & PCI_COMMAND_MEMORY))
233+ return -ENXIO;
234+
207235 entries = kmalloc(op->value * sizeof(*entries), GFP_KERNEL);
208236 if (entries == NULL)
209237 return -ENOMEM;
@@ -245,23 +273,27 @@ static · 35 unmodified lines
245273 int xen_pcibk_disable_msix(struct xen_pcibk_device *pdev,
246274 struct pci_dev *dev, struct xen_pci_op *op)
247275 {
248− struct xen_pcibk_dev_data *dev_data;
249276 if (unlikely(verbose_request))
250277 printk(KERN_DEBUG DRV_NAME ": %s: disable MSI-X\n",
251278 pci_name(dev));
252− pci_disable_msix(dev);
253279
280+ if (dev->msix_enabled) {
281+ struct xen_pcibk_dev_data *dev_data;
282+
283+ pci_disable_msix(dev);
284+
285+ dev_data = pci_get_drvdata(dev);
286+ if (dev_data)
287+ dev_data->ack_intr = 1;
288+ }
254289 /*
255290 * SR-IOV devices (which don't have any legacy IRQ) have
256291 * an undefined IRQ value of zero.
257292 */
258293 op->value = dev->irq ? xen_pirq_from_irq(dev->irq) : 0;
259294 if (unlikely(verbose_request))
260− printk(KERN_DEBUG DRV_NAME ": %s: MSI-X: %d\n", pci_name(dev),
261− op->value);
262− dev_data = pci_get_drvdata(dev);
263− if (dev_data)
264− dev_data->ack_intr = 1;
295+ printk(KERN_DEBUG DRV_NAME ": %s: MSI-X: %d\n",
296+ pci_name(dev), op->value);
265297 return 0;
266298 }
267299 #endif
@@ -298,9 +330,11 @@ void xen_pcibk_do_op(struct work_struct *data) · 30 unmodified lines
298330 container_of(data, struct xen_pcibk_device, op_work);
299331 struct pci_dev *dev;
300332 struct xen_pcibk_dev_data *dev_data = NULL;
301− struct xen_pci_op *op = &pdev->sh_info->op;
333+ struct xen_pci_op *op = &pdev->op;
302334 int test_intx = 0;
303335
336+ *op = pdev->sh_info->op;
337+ barrier();
304338 dev = xen_pcibk_get_pci_dev(pdev, op->domain, op->bus, op->devfn);
305339
306340 if (dev == NULL)
@@ -342,6 +376,17 @@ void xen_pcibk_do_op(struct work_struct *data) · 35 unmodified lines
342376 if ((dev_data->enable_intx != test_intx))
343377 xen_pcibk_control_isr(dev, 0 /* no reset */);
344378 }
379+ pdev->sh_info->op.err = op->err;
380+ pdev->sh_info->op.value = op->value;
381+#ifdef CONFIG_PCI_MSI
382+ if (op->cmd == XEN_PCI_OP_enable_msix && op->err == 0) {
383+ unsigned int i;
384+
385+ for (i = 0; i < op->value; i++)
386+ pdev->sh_info->op.msix_entries[i].vector =
387+ op->msix_entries[i].vector;
388+ }
389+#endif
345390 /* Tell the driver domain that we're done. */
346391 wmb();
347392 clear_bit(_XEN_PCIF_active, (unsigned long *)&pdev->sh_info->flags);
drivers/xen/xen-pciback/xenbus.c+3−1
@@ -44,7 +44,6 @@ static struct xen_pcibk_device *alloc_pdev(struct xenbus_device *xdev) · 43 unmodified lines
4444 dev_dbg(&xdev->dev, "allocated pdev @ 0x%p\n", pdev);
4545
4646 pdev->xdev = xdev;
47− dev_set_drvdata(&xdev->dev, pdev);
4847
4948 mutex_init(&pdev->dev_lock);
5049
@@ -58,6 +57,9 @@ static struct xen_pcibk_device *alloc_pdev(struct xenbus_device *xdev) · 7 unmodified lines
5857 kfree(pdev);
5958 pdev = NULL;
6059 }
60+
61+ dev_set_drvdata(&xdev->dev, pdev);
62+
6163 out:
6264 return pdev;
6365 }
drivers/xen/xen-scsiback.c+1−1
@@ -726,7 +726,7 @@ static int scsiback_do_cmd_fn(struct vscsibk_info *info) · 725 unmodified lines
726726 if (!pending_req)
727727 return 1;
728728
729− ring_req = *RING_GET_REQUEST(ring, rc);
729+ RING_COPY_REQUEST(ring, rc, &ring_req);
730730 ring->req_cons = ++rc;
731731
732732 err = prepare_pending_reqs(info, &ring_req, pending_req);
fs/9p/vfs_inode.c+2−2
@@ -451,9 +451,9 @@ void v9fs_evict_inode(struct inode *inode) · 450 unmodified lines
451451 {
452452 struct v9fs_inode *v9inode = V9FS_I(inode);
453453
454− truncate_inode_pages_final(inode->i_mapping);
454+ truncate_inode_pages_final(&inode->i_data);
455455 clear_inode(inode);
456− filemap_fdatawrite(inode->i_mapping);
456+ filemap_fdatawrite(&inode->i_data);
457457
458458 v9fs_cache_inode_put_cookie(inode);
459459 /* clunk the fid stashed in writeback_fid */
fs/block_dev.c+6−3
@@ -1523,11 +1523,14 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part) · 1522 unmodified lines
15231523 WARN_ON_ONCE(bdev->bd_holders);
15241524 sync_blockdev(bdev);
15251525 kill_bdev(bdev);
1526+
1527+ bdev_write_inode(bdev);
15261528 /*
1527− * ->release can cause the queue to disappear, so flush all
1528− * dirty data before.
1529+ * Detaching bdev inode from its wb in __destroy_inode()
1530+ * is too late: the queue which embeds its bdi (along with
1531+ * root wb) can be gone as soon as we put_disk() below.
15291532 */
1530− bdev_write_inode(bdev);
1533+ inode_detach_wb(bdev->bd_inode);
15311534 }
15321535 if (bdev->bd_contains == bdev) {
15331536 if (disk->fops->release)
fs/btrfs/extent-tree.c+7−3
@@ -10480,11 +10480,15 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info) · 10479 unmodified lines
1048010480 * until transaction commit to do the actual discard.
1048110481 */
1048210482 if (trimming) {
10483− WARN_ON(!list_empty(&block_group->bg_list));
10484− spin_lock(&trans->transaction->deleted_bgs_lock);
10483+ spin_lock(&fs_info->unused_bgs_lock);
10484+ /*
10485+ * A concurrent scrub might have added us to the list
10486+ * fs_info->unused_bgs, so use a list_move operation
10487+ * to add the block group to the deleted_bgs list.
10488+ */
1048510489 list_move(&block_group->bg_list,
1048610490 &trans->transaction->deleted_bgs);
10487− spin_unlock(&trans->transaction->deleted_bgs_lock);
10491+ spin_unlock(&fs_info->unused_bgs_lock);
1048810492 btrfs_get_block_group(block_group);
1048910493 }
1049010494 end_trans:
fs/btrfs/file.c+14−4
@@ -1291,7 +1291,8 @@ out: · 1290 unmodified lines
12911291 * on error we return an unlocked page and the error value
12921292 * on success we return a locked page and 0
12931293 */
1294−static int prepare_uptodate_page(struct page *page, u64 pos,
1294+static int prepare_uptodate_page(struct inode *inode,
1295+ struct page *page, u64 pos,
12951296 bool force_uptodate)
12961297 {
12971298 int ret = 0;
@@ -1306,6 +1307,10 @@ static int prepare_uptodate_page(struct page *page, u64 pos, · 8 unmodified lines
13061307 unlock_page(page);
13071308 return -EIO;
13081309 }
1310+ if (page->mapping != inode->i_mapping) {
1311+ unlock_page(page);
1312+ return -EAGAIN;
1313+ }
13091314 }
13101315 return 0;
13111316 }
@@ -1324,6 +1329,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages, · 12 unmodified lines
13241329 int faili;
13251330
13261331 for (i = 0; i < num_pages; i++) {
1332+again:
13271333 pages[i] = find_or_create_page(inode->i_mapping, index + i,
13281334 mask | __GFP_WRITE);
13291335 if (!pages[i]) {
@@ -1333,13 +1339,17 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages, · 3 unmodified lines
13331339 }
13341340
13351341 if (i == 0)
1336− err = prepare_uptodate_page(pages[i], pos,
1342+ err = prepare_uptodate_page(inode, pages[i], pos,
13371343 force_uptodate);
1338− if (i == num_pages - 1)
1339− err = prepare_uptodate_page(pages[i],
1344+ if (!err && i == num_pages - 1)
1345+ err = prepare_uptodate_page(inode, pages[i],
13401346 pos + write_bytes, false);
13411347 if (err) {
13421348 page_cache_release(pages[i]);
1349+ if (err == -EAGAIN) {
1350+ err = 0;
1351+ goto again;
1352+ }
13431353 faili = i - 1;
13441354 goto fail;
13451355 }
fs/btrfs/free-space-cache.c+6−4
@@ -891,7 +891,7 @@ out: · 890 unmodified lines
891891 spin_unlock(&block_group->lock);
892892 ret = 0;
893893
894− btrfs_warn(fs_info, "failed to load free space cache for block group %llu, rebuild it now",
894+ btrfs_warn(fs_info, "failed to load free space cache for block group %llu, rebuilding it now",
895895 block_group->key.objectid);
896896 }
897897
@@ -2972,7 +2972,7 @@ setup_cluster_bitmap(struct btrfs_block_group_cache *block_group, · 2074 unmodified lines
29722972 u64 cont1_bytes, u64 min_bytes)
29732973 {
29742974 struct btrfs_free_space_ctl *ctl = block_group->free_space_ctl;
2975− struct btrfs_free_space *entry;
2975+ struct btrfs_free_space *entry = NULL;
29762976 int ret = -ENOSPC;
29772977 u64 bitmap_offset = offset_to_bitmap(ctl, offset);
29782978
@@ -2983,8 +2983,10 @@ setup_cluster_bitmap(struct btrfs_block_group_cache *block_group, · 4 unmodified lines
29832983 * The bitmap that covers offset won't be in the list unless offset
29842984 * is just its start offset.
29852985 */
2986− entry = list_first_entry(bitmaps, struct btrfs_free_space, list);
2987− if (entry->offset != bitmap_offset) {
2986+ if (!list_empty(bitmaps))
2987+ entry = list_first_entry(bitmaps, struct btrfs_free_space, list);
2988+
2989+ if (!entry || entry->offset != bitmap_offset) {
29882990 entry = tree_search_offset(ctl, bitmap_offset, 1, 0);
29892991 if (entry && list_empty(&entry->list))
29902992 list_add(&entry->list, bitmaps);
fs/btrfs/transaction.c+0−1
@@ -274,7 +274,6 @@ loop: · 273 unmodified lines
274274 cur_trans->num_dirty_bgs = 0;
275275 spin_lock_init(&cur_trans->dirty_bgs_lock);
276276 INIT_LIST_HEAD(&cur_trans->deleted_bgs);
277− spin_lock_init(&cur_trans->deleted_bgs_lock);
278277 spin_lock_init(&cur_trans->dropped_roots_lock);
279278 list_add_tail(&cur_trans->list, &fs_info->trans_list);
280279 extent_io_tree_init(&cur_trans->dirty_pages,
fs/btrfs/transaction.h+1−1
@@ -77,8 +77,8 @@ struct btrfs_transaction { · 76 unmodified lines
7777 */
7878 struct mutex cache_write_mutex;
7979 spinlock_t dirty_bgs_lock;
80+ /* Protected by spin lock fs_info->unused_bgs_lock. */
8081 struct list_head deleted_bgs;
81− spinlock_t deleted_bgs_lock;
8282 spinlock_t dropped_roots_lock;
8383 struct btrfs_delayed_ref_root delayed_refs;
8484 int aborted;
fs/btrfs/volumes.c+1−2
@@ -3548,12 +3548,11 @@ again: · 3547 unmodified lines
35483548
35493549 ret = btrfs_force_chunk_alloc(trans, chunk_root,
35503550 BTRFS_BLOCK_GROUP_DATA);
3551+ btrfs_end_transaction(trans, chunk_root);
35513552 if (ret < 0) {
35523553 mutex_unlock(&fs_info->delete_unused_bgs_mutex);
35533554 goto error;
35543555 }
3555−
3556− btrfs_end_transaction(trans, chunk_root);
35573556 chunk_reserved = 1;
35583557 }
35593558
fs/cifs/inode.c+3−3
@@ -1831,11 +1831,11 @@ cifs_invalidate_mapping(struct inode *inode) · 1830 unmodified lines
18311831 * @word: long word containing the bit lock
18321832 */
18331833 static int
1834−cifs_wait_bit_killable(struct wait_bit_key *key)
1834+cifs_wait_bit_killable(struct wait_bit_key *key, int mode)
18351835 {
1836− if (fatal_signal_pending(current))
1837− return -ERESTARTSYS;
18381836 freezable_schedule_unsafe();
1837+ if (signal_pending_state(mode, current))
1838+ return -ERESTARTSYS;
18391839 return 0;
18401840 }
18411841
fs/direct-io.c+1−0
@@ -1175,6 +1175,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, · 1174 unmodified lines
11751175 if (dio->flags & DIO_LOCKING)
11761176 mutex_unlock(&inode->i_mutex);
11771177 kmem_cache_free(dio_cache, dio);
1178+ retval = 0;
11781179 goto out;
11791180 }
11801181
fs/exofs/inode.c+1−4
@@ -592,10 +592,7 @@ static struct page *__r4w_get_page(void *priv, u64 offset, bool *uptodate) · 591 unmodified lines
592592 }
593593 unlock_page(page);
594594 }
595− if (PageDirty(page) || PageWriteback(page))
596− *uptodate = true;
597− else
598− *uptodate = PageUptodate(page);
595+ *uptodate = PageUptodate(page);
599596 EXOFS_DBGMSG2("index=0x%lx uptodate=%d\n", index, *uptodate);
600597 return page;
601598 } else {
fs/ext4/crypto.c+1−1
@@ -389,7 +389,7 @@ int ext4_encrypted_zeroout(struct inode *inode, struct ext4_extent *ex) · 388 unmodified lines
389389 struct ext4_crypto_ctx *ctx;
390390 struct page *ciphertext_page = NULL;
391391 struct bio *bio;
392− ext4_lblk_t lblk = ex->ee_block;
392+ ext4_lblk_t lblk = le32_to_cpu(ex->ee_block);
393393 ext4_fsblk_t pblk = ext4_ext_pblock(ex);
394394 unsigned int len = ext4_ext_get_actual_len(ex);
395395 int ret, err = 0;
fs/ext4/ext4.h+44−7
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #include <linux/seqlock.h>
2727 #include <linux/mutex.h>
2828 #include <linux/timer.h>
29+#include <linux/version.h>
2930 #include <linux/wait.h>
3031 #include <linux/blockgroup_lock.h>
3132 #include <linux/percpu_counter.h>
@@ -727,19 +728,55 @@ struct move_extent { · 695 unmodified lines
727728 <= (EXT4_GOOD_OLD_INODE_SIZE + \
728729 (einode)->i_extra_isize)) \
729730
731+/*
732+ * We use an encoding that preserves the times for extra epoch "00":
733+ *
734+ * extra msb of adjust for signed
735+ * epoch 32-bit 32-bit tv_sec to
736+ * bits time decoded 64-bit tv_sec 64-bit tv_sec valid time range
737+ * 0 0 1 -0x80000000..-0x00000001 0x000000000 1901-12-13..1969-12-31
738+ * 0 0 0 0x000000000..0x07fffffff 0x000000000 1970-01-01..2038-01-19
739+ * 0 1 1 0x080000000..0x0ffffffff 0x100000000 2038-01-19..2106-02-07
740+ * 0 1 0 0x100000000..0x17fffffff 0x100000000 2106-02-07..2174-02-25
741+ * 1 0 1 0x180000000..0x1ffffffff 0x200000000 2174-02-25..2242-03-16
742+ * 1 0 0 0x200000000..0x27fffffff 0x200000000 2242-03-16..2310-04-04
743+ * 1 1 1 0x280000000..0x2ffffffff 0x300000000 2310-04-04..2378-04-22
744+ * 1 1 0 0x300000000..0x37fffffff 0x300000000 2378-04-22..2446-05-10
745+ *
746+ * Note that previous versions of the kernel on 64-bit systems would
747+ * incorrectly use extra epoch bits 1,1 for dates between 1901 and
748+ * 1970. e2fsck will correct this, assuming that it is run on the
749+ * affected filesystem before 2242.
750+ */
751+
730752 static inline __le32 ext4_encode_extra_time(struct timespec *time)
731753 {
732− return cpu_to_le32((sizeof(time->tv_sec) > 4 ?
733− (time->tv_sec >> 32) & EXT4_EPOCH_MASK : 0) |
734− ((time->tv_nsec << EXT4_EPOCH_BITS) & EXT4_NSEC_MASK));
754+ u32 extra = sizeof(time->tv_sec) > 4 ?
755+ ((time->tv_sec - (s32)time->tv_sec) >> 32) & EXT4_EPOCH_MASK : 0;
756+ return cpu_to_le32(extra | (time->tv_nsec << EXT4_EPOCH_BITS));
735757 }
736758
737759 static inline void ext4_decode_extra_time(struct timespec *time, __le32 extra)
738760 {
739− if (sizeof(time->tv_sec) > 4)
740− time->tv_sec |= (__u64)(le32_to_cpu(extra) & EXT4_EPOCH_MASK)
741− << 32;
742− time->tv_nsec = (le32_to_cpu(extra) & EXT4_NSEC_MASK) >> EXT4_EPOCH_BITS;
761+ if (unlikely(sizeof(time->tv_sec) > 4 &&
762+ (extra & cpu_to_le32(EXT4_EPOCH_MASK)))) {
763+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
764+ /* Handle legacy encoding of pre-1970 dates with epoch
765+ * bits 1,1. We assume that by kernel version 4.20,
766+ * everyone will have run fsck over the affected
767+ * filesystems to correct the problem. (This
768+ * backwards compatibility may be removed before this
769+ * time, at the discretion of the ext4 developers.)
770+ */
771+ u64 extra_bits = le32_to_cpu(extra) & EXT4_EPOCH_MASK;
772+ if (extra_bits == 3 && ((time->tv_sec) & 0x80000000) != 0)
773+ extra_bits = 0;
774+ time->tv_sec += extra_bits << 32;
775+#else
776+ time->tv_sec += (u64)(le32_to_cpu(extra) & EXT4_EPOCH_MASK) << 32;
777+#endif
778+ }
779+ time->tv_nsec = (le32_to_cpu(extra) & EXT4_NSEC_MASK) >> EXT4_EPOCH_BITS;
743780 }
744781
745782 #define EXT4_INODE_SET_XTIME(xtime, inode, raw_inode) \
fs/ext4/symlink.c+1−1
@@ -52,7 +52,7 @@ static const char *ext4_encrypted_follow_link(struct dentry *dentry, void **cook · 51 unmodified lines
5252 /* Symlink is encrypted */
5353 sd = (struct ext4_encrypted_symlink_data *)caddr;
5454 cstr.name = sd->encrypted_path;
55− cstr.len = le32_to_cpu(sd->len);
55+ cstr.len = le16_to_cpu(sd->len);
5656 if ((cstr.len +
5757 sizeof(struct ext4_encrypted_symlink_data) - 1) >
5858 max_size) {
fs/ext4/sysfs.c+1−1
@@ -358,7 +358,7 @@ static int name##_open(struct inode *inode, struct file *file) \ · 357 unmodified lines
358358 return single_open(file, ext4_seq_##name##_show, PDE_DATA(inode)); \
359359 } \
360360 \
361−const struct file_operations ext4_seq_##name##_fops = { \
361+static const struct file_operations ext4_seq_##name##_fops = { \
362362 .owner = THIS_MODULE, \
363363 .open = name##_open, \
364364 .read = seq_read, \
fs/fuse/cuse.c+2−0
@@ -549,6 +549,8 @@ static int cuse_channel_release(struct inode *inode, struct file *file) · 548 unmodified lines
549549 unregister_chrdev_region(cc->cdev->dev, 1);
550550 cdev_del(cc->cdev);
551551 }
552+ /* Base reference is now owned by "fud" */
553+ fuse_conn_put(&cc->fc);
552554
553555 rc = fuse_dev_release(inode, file); /* puts the base reference */
554556
fs/fuse/file.c+1−1
@@ -1049,6 +1049,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req, · 1048 unmodified lines
10491049 tmp = iov_iter_copy_from_user_atomic(page, ii, offset, bytes);
10501050 flush_dcache_page(page);
10511051
1052+ iov_iter_advance(ii, tmp);
10521053 if (!tmp) {
10531054 unlock_page(page);
10541055 page_cache_release(page);
@@ -1061,7 +1062,6 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req, · 6 unmodified lines
10611062 req->page_descs[req->num_pages].length = tmp;
10621063 req->num_pages++;
10631064
1064− iov_iter_advance(ii, tmp);
10651065 count += tmp;
10661066 pos += tmp;
10671067 offset += tmp;
fs/jbd2/transaction.c+9−3
@@ -1009,7 +1009,8 @@ out: · 1008 unmodified lines
10091009 }
10101010
10111011 /* Fast check whether buffer is already attached to the required transaction */
1012−static bool jbd2_write_access_granted(handle_t *handle, struct buffer_head *bh)
1012+static bool jbd2_write_access_granted(handle_t *handle, struct buffer_head *bh,
1013+ bool undo)
10131014 {
10141015 struct journal_head *jh;
10151016 bool ret = false;
@@ -1036,6 +1037,9 @@ static bool jbd2_write_access_granted(handle_t *handle, struct buffer_head *bh) · 20 unmodified lines
10361037 jh = READ_ONCE(bh->b_private);
10371038 if (!jh)
10381039 goto out;
1040+ /* For undo access buffer must have data copied */
1041+ if (undo && !jh->b_committed_data)
1042+ goto out;
10391043 if (jh->b_transaction != handle->h_transaction &&
10401044 jh->b_next_transaction != handle->h_transaction)
10411045 goto out;
@@ -1073,7 +1077,7 @@ int jbd2_journal_get_write_access(handle_t *handle, struct buffer_head *bh) · 31 unmodified lines
10731077 struct journal_head *jh;
10741078 int rc;
10751079
1076− if (jbd2_write_access_granted(handle, bh))
1080+ if (jbd2_write_access_granted(handle, bh, false))
10771081 return 0;
10781082
10791083 jh = jbd2_journal_add_journal_head(bh);
@@ -1210,7 +1214,7 @@ int jbd2_journal_get_undo_access(handle_t *handle, struct buffer_head *bh) · 130 unmodified lines
12101214 char *committed_data = NULL;
12111215
12121216 JBUFFER_TRACE(jh, "entry");
1213− if (jbd2_write_access_granted(handle, bh))
1217+ if (jbd2_write_access_granted(handle, bh, true))
12141218 return 0;
12151219
12161220 jh = jbd2_journal_add_journal_head(bh);
@@ -2152,6 +2156,7 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh, · 935 unmodified lines
21522156
21532157 if (!buffer_dirty(bh)) {
21542158 /* bdflush has written it. We can drop it now */
2159+ __jbd2_journal_remove_checkpoint(jh);
21552160 goto zap_buffer;
21562161 }
21572162
@@ -2181,6 +2186,7 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh, · 23 unmodified lines
21812186 /* The orphan record's transaction has
21822187 * committed. We can cleanse this buffer */
21832188 clear_buffer_jbddirty(bh);
2189+ __jbd2_journal_remove_checkpoint(jh);
21842190 goto zap_buffer;
21852191 }
21862192 }
fs/nfs/callback_xdr.c+2−5
@@ -78,8 +78,7 @@ static __be32 *read_buf(struct xdr_stream *xdr, int nbytes) · 77 unmodified lines
7878
7979 p = xdr_inline_decode(xdr, nbytes);
8080 if (unlikely(p == NULL))
81− printk(KERN_WARNING "NFS: NFSv4 callback reply buffer overflowed "
82− "or truncated request.\n");
81+ printk(KERN_WARNING "NFS: NFSv4 callback reply buffer overflowed!\n");
8382 return p;
8483 }
8584
@@ -890,7 +889,6 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r · 804 unmodified lines
890889 struct cb_compound_hdr_arg hdr_arg = { 0 };
891890 struct cb_compound_hdr_res hdr_res = { NULL };
892891 struct xdr_stream xdr_in, xdr_out;
893− struct xdr_buf *rq_arg = &rqstp->rq_arg;
894892 __be32 *p, status;
895893 struct cb_process_state cps = {
896894 .drc_status = 0,
@@ -902,8 +900,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r · 5 unmodified lines
902900
903901 dprintk("%s: start\n", __func__);
904902
905− rq_arg->len = rq_arg->head[0].iov_len + rq_arg->page_len;
906− xdr_init_decode(&xdr_in, rq_arg, rq_arg->head[0].iov_base);
903+ xdr_init_decode(&xdr_in, &rqstp->rq_arg, rqstp->rq_arg.head[0].iov_base);
907904
908905 p = (__be32*)((char *)rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len);
909906 xdr_init_encode(&xdr_out, &rqstp->rq_res, p);
fs/nfs/inode.c+3−3
@@ -75,11 +75,11 @@ nfs_fattr_to_ino_t(struct nfs_fattr *fattr) · 74 unmodified lines
7575 * nfs_wait_bit_killable - helper for functions that are sleeping on bit locks
7676 * @word: long word containing the bit lock
7777 */
78−int nfs_wait_bit_killable(struct wait_bit_key *key)
78+int nfs_wait_bit_killable(struct wait_bit_key *key, int mode)
7979 {
80− if (fatal_signal_pending(current))
81− return -ERESTARTSYS;
8280 freezable_schedule_unsafe();
81+ if (signal_pending_state(mode, current))
82+ return -ERESTARTSYS;
8383 return 0;
8484 }
8585 EXPORT_SYMBOL_GPL(nfs_wait_bit_killable);
fs/nfs/internal.h+1−1
@@ -379,7 +379,7 @@ extern int nfs_drop_inode(struct inode *); · 378 unmodified lines
379379 extern void nfs_clear_inode(struct inode *);
380380 extern void nfs_evict_inode(struct inode *);
381381 void nfs_zap_acl_cache(struct inode *inode);
382−extern int nfs_wait_bit_killable(struct wait_bit_key *key);
382+extern int nfs_wait_bit_killable(struct wait_bit_key *key, int mode);
383383
384384 /* super.c */
385385 extern const struct super_operations nfs_sops;
fs/nfs/objlayout/objio_osd.c+1−4
@@ -476,10 +476,7 @@ static struct page *__r4w_get_page(void *priv, u64 offset, bool *uptodate) · 475 unmodified lines
476476 }
477477 unlock_page(page);
478478 }
479− if (PageDirty(page) || PageWriteback(page))
480− *uptodate = true;
481− else
482− *uptodate = PageUptodate(page);
479+ *uptodate = PageUptodate(page);
483480 dprintk("%s: index=0x%lx uptodate=%d\n", __func__, index, *uptodate);
484481 return page;
485482 }
fs/nfs/pagelist.c+1−1
@@ -129,7 +129,7 @@ __nfs_iocounter_wait(struct nfs_io_counter *c) · 128 unmodified lines
129129 set_bit(NFS_IO_INPROGRESS, &c->flags);
130130 if (atomic_read(&c->io_count) == 0)
131131 break;
132− ret = nfs_wait_bit_killable(&q.key);
132+ ret = nfs_wait_bit_killable(&q.key, TASK_KILLABLE);
133133 } while (atomic_read(&c->io_count) != 0 && !ret);
134134 finish_wait(wq, &q.wait);
135135 return ret;
fs/nfs/pnfs.c+2−2
@@ -1466,11 +1466,11 @@ static bool pnfs_within_mdsthreshold(struct nfs_open_context *ctx, · 1465 unmodified lines
14661466 }
14671467
14681468 /* stop waiting if someone clears NFS_LAYOUT_RETRY_LAYOUTGET bit. */
1469−static int pnfs_layoutget_retry_bit_wait(struct wait_bit_key *key)
1469+static int pnfs_layoutget_retry_bit_wait(struct wait_bit_key *key, int mode)
14701470 {
14711471 if (!test_bit(NFS_LAYOUT_RETRY_LAYOUTGET, key->flags))
14721472 return 1;
1473− return nfs_wait_bit_killable(key);
1473+ return nfs_wait_bit_killable(key, mode);
14741474 }
14751475
14761476 static bool pnfs_prepare_to_retry_layoutget(struct pnfs_layout_hdr *lo)
fs/nfsd/nfs4layouts.c+1−1
@@ -616,6 +616,7 @@ nfsd4_cb_layout_prepare(struct nfsd4_callback *cb) · 615 unmodified lines
616616
617617 mutex_lock(&ls->ls_mutex);
618618 nfs4_inc_and_copy_stateid(&ls->ls_recall_sid, &ls->ls_stid);
619+ mutex_unlock(&ls->ls_mutex);
619620 }
620621
621622 static int
@@ -659,7 +660,6 @@ nfsd4_cb_layout_release(struct nfsd4_callback *cb) · 37 unmodified lines
659660
660661 trace_layout_recall_release(&ls->ls_stid.sc_stateid);
661662
662− mutex_unlock(&ls->ls_mutex);
663663 nfsd4_return_all_layouts(ls, &reaplist);
664664 nfsd4_free_layouts(&reaplist);
665665 nfs4_put_stid(&ls->ls_stid);
fs/ocfs2/namei.c+1−3
@@ -367,13 +367,11 @@ static int ocfs2_mknod(struct inode *dir, · 366 unmodified lines
367367 goto leave;
368368 }
369369
370− status = posix_acl_create(dir, &mode, &default_acl, &acl);
370+ status = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
371371 if (status) {
372372 mlog_errno(status);
373373 goto leave;
374374 }
375− /* update inode->i_mode after mask with "umask". */
376− inode->i_mode = mode;
377375
378376 handle = ocfs2_start_trans(osb, ocfs2_mknod_credits(osb->sb,
379377 S_ISDIR(mode),
fs/proc/base.c+1−0
@@ -2494,6 +2494,7 @@ static ssize_t proc_coredump_filter_write(struct file *file, · 2493 unmodified lines
24942494 mm = get_task_mm(task);
24952495 if (!mm)
24962496 goto out_no_mm;
2497+ ret = 0;
24972498
24982499 for (i = 0, mask = 1; i < MMF_DUMP_FILTER_BITS; i++, mask <<= 1) {
24992500 if (val & mask)
include/asm-generic/tlb.h+1−1
@@ -5,7 +5,7 @@ · 4 unmodified lines
55 * Copyright 2001 Red Hat, Inc.
66 * Based on code from mm/memory.c Copyright Linus Torvalds and others.
77 *
8− * Copyright 2011 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
8+ * Copyright 2011 Red Hat, Inc., Peter Zijlstra
99 *
1010 * This program is free software; you can redistribute it and/or
1111 * modify it under the terms of the GNU General Public License
include/linux/bitops.h+1−1
@@ -107,7 +107,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift) · 106 unmodified lines
107107 */
108108 static inline __u32 rol32(__u32 word, unsigned int shift)
109109 {
110− return (word << shift) | (word >> (32 - shift));
110+ return (word << shift) | (word >> ((-shift) & 31));
111111 }
112112
113113 /**
include/linux/cgroup-defs.h+3−10
@@ -90,7 +90,6 @@ enum { · 89 unmodified lines
9090 */
9191 struct cgroup_file {
9292 /* do not access any fields from outside cgroup core */
93− struct list_head node; /* anchored at css->files */
9493 struct kernfs_node *kn;
9594 };
9695
@@ -134,9 +133,6 @@ struct cgroup_subsys_state { · 37 unmodified lines
134133 */
135134 u64 serial_nr;
136135
137− /* all cgroup_files associated with this css */
138− struct list_head files;
139−
140136 /* percpu_ref killing and RCU release */
141137 struct rcu_head rcu_head;
142138 struct work_struct destroy_work;
@@ -426,12 +422,9 @@ struct cgroup_subsys { · 283 unmodified lines
426422 void (*css_reset)(struct cgroup_subsys_state *css);
427423 void (*css_e_css_changed)(struct cgroup_subsys_state *css);
428424
429− int (*can_attach)(struct cgroup_subsys_state *css,
430− struct cgroup_taskset *tset);
431− void (*cancel_attach)(struct cgroup_subsys_state *css,
432− struct cgroup_taskset *tset);
433− void (*attach)(struct cgroup_subsys_state *css,
434− struct cgroup_taskset *tset);
425+ int (*can_attach)(struct cgroup_taskset *tset);
426+ void (*cancel_attach)(struct cgroup_taskset *tset);
427+ void (*attach)(struct cgroup_taskset *tset);
435428 int (*can_fork)(struct task_struct *task, void **priv_p);
436429 void (*cancel_fork)(struct task_struct *task, void *priv);
437430 void (*fork)(struct task_struct *task, void *priv);
include/linux/cgroup.h+23−24
@@ -88,6 +88,7 @@ int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from); · 87 unmodified lines
8888 int cgroup_add_dfl_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
8989 int cgroup_add_legacy_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
9090 int cgroup_rm_cftypes(struct cftype *cfts);
91+void cgroup_file_notify(struct cgroup_file *cfile);
9192
9293 char *task_cgroup_path(struct task_struct *task, char *buf, size_t buflen);
9394 int cgroupstats_build(struct cgroupstats *stats, struct dentry *dentry);
@@ -119,8 +120,10 @@ struct cgroup_subsys_state *css_rightmost_descendant(struct cgroup_subsys_state · 25 unmodified lines
119120 struct cgroup_subsys_state *css_next_descendant_post(struct cgroup_subsys_state *pos,
120121 struct cgroup_subsys_state *css);
121122
122−struct task_struct *cgroup_taskset_first(struct cgroup_taskset *tset);
123−struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset);
123+struct task_struct *cgroup_taskset_first(struct cgroup_taskset *tset,
124+ struct cgroup_subsys_state **dst_cssp);
125+struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset,
126+ struct cgroup_subsys_state **dst_cssp);
124127
125128 void css_task_iter_start(struct cgroup_subsys_state *css,
126129 struct css_task_iter *it);
@@ -235,30 +238,39 @@ void css_task_iter_end(struct css_task_iter *it); · 108 unmodified lines
235238 /**
236239 * cgroup_taskset_for_each - iterate cgroup_taskset
237240 * @task: the loop cursor
241+ * @dst_css: the destination css
238242 * @tset: taskset to iterate
239243 *
240244 * @tset may contain multiple tasks and they may belong to multiple
241− * processes. When there are multiple tasks in @tset, if a task of a
242− * process is in @tset, all tasks of the process are in @tset. Also, all
243− * are guaranteed to share the same source and destination csses.
245+ * processes.
246+ *
247+ * On the v2 hierarchy, there may be tasks from multiple processes and they
248+ * may not share the source or destination csses.
249+ *
250+ * On traditional hierarchies, when there are multiple tasks in @tset, if a
251+ * task of a process is in @tset, all tasks of the process are in @tset.
252+ * Also, all are guaranteed to share the same source and destination csses.
244253 *
245254 * Iteration is not in any specific order.
246255 */
247−#define cgroup_taskset_for_each(task, tset) \
248− for ((task) = cgroup_taskset_first((tset)); (task); \
249− (task) = cgroup_taskset_next((tset)))
256+#define cgroup_taskset_for_each(task, dst_css, tset) \
257+ for ((task) = cgroup_taskset_first((tset), &(dst_css)); \
258+ (task); \
259+ (task) = cgroup_taskset_next((tset), &(dst_css)))
250260
251261 /**
252262 * cgroup_taskset_for_each_leader - iterate group leaders in a cgroup_taskset
253263 * @leader: the loop cursor
264+ * @dst_css: the destination css
254265 * @tset: takset to iterate
255266 *
256267 * Iterate threadgroup leaders of @tset. For single-task migrations, @tset
257268 * may not contain any.
258269 */
259−#define cgroup_taskset_for_each_leader(leader, tset) \
260− for ((leader) = cgroup_taskset_first((tset)); (leader); \
261− (leader) = cgroup_taskset_next((tset))) \
270+#define cgroup_taskset_for_each_leader(leader, dst_css, tset) \
271+ for ((leader) = cgroup_taskset_first((tset), &(dst_css)); \
272+ (leader); \
273+ (leader) = cgroup_taskset_next((tset), &(dst_css))) \
262274 if ((leader) != (leader)->group_leader) \
263275 ; \
264276 else
@@ -516,19 +528,6 @@ static inline void pr_cont_cgroup_path(struct cgroup *cgrp) · 251 unmodified lines
516528 pr_cont_kernfs_path(cgrp->kn);
517529 }
518530
519−/**
520− * cgroup_file_notify - generate a file modified event for a cgroup_file
521− * @cfile: target cgroup_file
522− *
523− * @cfile must have been obtained by setting cftype->file_offset.
524− */
525−static inline void cgroup_file_notify(struct cgroup_file *cfile)
526−{
527− /* might not have been created due to one of the CFTYPE selector flags */
528− if (cfile->kn)
529− kernfs_notify(cfile->kn);
530−}
531−
532531 #else /* !CONFIG_CGROUPS */
533532
534533 struct cgroup_subsys_state;
include/linux/enclosure.h+4−0
@@ -29,7 +29,11 @@ · 28 unmodified lines
2929 /* A few generic types ... taken from ses-2 */
3030 enum enclosure_component_type {
3131 ENCLOSURE_COMPONENT_DEVICE = 0x01,
32+ ENCLOSURE_COMPONENT_CONTROLLER_ELECTRONICS = 0x07,
33+ ENCLOSURE_COMPONENT_SCSI_TARGET_PORT = 0x14,
34+ ENCLOSURE_COMPONENT_SCSI_INITIATOR_PORT = 0x15,
3235 ENCLOSURE_COMPONENT_ARRAY_DEVICE = 0x17,
36+ ENCLOSURE_COMPONENT_SAS_EXPANDER = 0x18,
3337 };
3438
3539 /* ses-2 common element status */
include/linux/irqchip/arm-gic-v3.h+1−0
@@ -330,6 +330,7 @@ struct rdists { · 329 unmodified lines
330330 };
331331
332332 struct irq_domain;
333+struct device_node;
333334 int its_cpu_init(void);
334335 int its_init(struct device_node *node, struct rdists *rdists,
335336 struct irq_domain *domain);
include/linux/jump_label.h+1−1
@@ -5,7 +5,7 @@ · 4 unmodified lines
55 * Jump label support
66 *
77 * Copyright (C) 2009-2012 Jason Baron <jbaron@redhat.com>
8− * Copyright (C) 2011-2012 Peter Zijlstra <pzijlstr@redhat.com>
8+ * Copyright (C) 2011-2012 Red Hat, Inc., Peter Zijlstra
99 *
1010 * DEPRECATED API:
1111 *
include/linux/kmemleak.h+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525
2626 #ifdef CONFIG_DEBUG_KMEMLEAK
2727
28−extern void kmemleak_init(void) __ref;
28+extern void kmemleak_init(void) __init;
2929 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
3030 gfp_t gfp) __ref;
3131 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size,
include/linux/libata.h+1−0
@@ -210,6 +210,7 @@ enum { · 209 unmodified lines
210210 ATA_FLAG_SLAVE_POSS = (1 << 0), /* host supports slave dev */
211211 /* (doesn't imply presence) */
212212 ATA_FLAG_SATA = (1 << 1),
213+ ATA_FLAG_NO_LOG_PAGE = (1 << 5), /* do not issue log page read */
213214 ATA_FLAG_NO_ATAPI = (1 << 6), /* No ATAPI support */
214215 ATA_FLAG_PIO_DMA = (1 << 7), /* PIO cmds via DMA */
215216 ATA_FLAG_PIO_LBA48 = (1 << 8), /* Host DMA engine is LBA28 only */
include/linux/lightnvm.h+14−7
@@ -50,9 +50,16 @@ enum { · 49 unmodified lines
5050 NVM_IO_DUAL_ACCESS = 0x1,
5151 NVM_IO_QUAD_ACCESS = 0x2,
5252
53+ /* NAND Access Modes */
5354 NVM_IO_SUSPEND = 0x80,
5455 NVM_IO_SLC_MODE = 0x100,
5556 NVM_IO_SCRAMBLE_DISABLE = 0x200,
57+
58+ /* Block Types */
59+ NVM_BLK_T_FREE = 0x0,
60+ NVM_BLK_T_BAD = 0x1,
61+ NVM_BLK_T_DEV = 0x2,
62+ NVM_BLK_T_HOST = 0x4,
5663 };
5764
5865 struct nvm_id_group {
@@ -176,17 +183,17 @@ struct nvm_block; · 117 unmodified lines
176183
177184 typedef int (nvm_l2p_update_fn)(u64, u32, __le64 *, void *);
178185 typedef int (nvm_bb_update_fn)(struct ppa_addr, int, u8 *, void *);
179−typedef int (nvm_id_fn)(struct request_queue *, struct nvm_id *);
180−typedef int (nvm_get_l2p_tbl_fn)(struct request_queue *, u64, u32,
186+typedef int (nvm_id_fn)(struct nvm_dev *, struct nvm_id *);
187+typedef int (nvm_get_l2p_tbl_fn)(struct nvm_dev *, u64, u32,
181188 nvm_l2p_update_fn *, void *);
182189 typedef int (nvm_op_bb_tbl_fn)(struct nvm_dev *, struct ppa_addr, int,
183190 nvm_bb_update_fn *, void *);
184−typedef int (nvm_op_set_bb_fn)(struct request_queue *, struct nvm_rq *, int);
185−typedef int (nvm_submit_io_fn)(struct request_queue *, struct nvm_rq *);
186−typedef int (nvm_erase_blk_fn)(struct request_queue *, struct nvm_rq *);
187−typedef void *(nvm_create_dma_pool_fn)(struct request_queue *, char *);
191+typedef int (nvm_op_set_bb_fn)(struct nvm_dev *, struct nvm_rq *, int);
192+typedef int (nvm_submit_io_fn)(struct nvm_dev *, struct nvm_rq *);
193+typedef int (nvm_erase_blk_fn)(struct nvm_dev *, struct nvm_rq *);
194+typedef void *(nvm_create_dma_pool_fn)(struct nvm_dev *, char *);
188195 typedef void (nvm_destroy_dma_pool_fn)(void *);
189−typedef void *(nvm_dev_dma_alloc_fn)(struct request_queue *, void *, gfp_t,
196+typedef void *(nvm_dev_dma_alloc_fn)(struct nvm_dev *, void *, gfp_t,
190197 dma_addr_t *);
191198 typedef void (nvm_dev_dma_free_fn)(void *, void*, dma_addr_t);
192199
include/linux/lockdep.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
22 * Runtime locking correctness validator
33 *
44 * Copyright (C) 2006,2007 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
5− * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
5+ * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra
66 *
77 * see Documentation/locking/lockdep-design.txt for more details.
88 */
include/linux/mlx4/device.h+11−0
@@ -426,6 +426,17 @@ enum { · 425 unmodified lines
426426 MLX4_MAX_FAST_REG_PAGES = 511,
427427 };
428428
429+enum {
430+ /*
431+ * Max wqe size for rdma read is 512 bytes, so this
432+ * limits our max_sge_rd as the wqe needs to fit:
433+ * - ctrl segment (16 bytes)
434+ * - rdma segment (16 bytes)
435+ * - scatter elements (16 bytes each)
436+ */
437+ MLX4_MAX_SGE_RD = (512 - 16 - 16) / 16
438+};
439+
429440 enum {
430441 MLX4_DEV_PMC_SUBTYPE_GUID_INFO = 0x14,
431442 MLX4_DEV_PMC_SUBTYPE_PORT_INFO = 0x15,
include/linux/mmdebug.h+1−0
@@ -1,6 +1,7 @@
11 #ifndef LINUX_MM_DEBUG_H
22 #define LINUX_MM_DEBUG_H 1
33
4+#include <linux/bug.h>
45 #include <linux/stringify.h>
56
67 struct page;
include/linux/netdevice.h+1−1
@@ -2084,7 +2084,7 @@ struct pcpu_sw_netstats { · 2083 unmodified lines
20842084 })
20852085
20862086 #define netdev_alloc_pcpu_stats(type) \
2087− __netdev_alloc_pcpu_stats(type, GFP_KERNEL);
2087+ __netdev_alloc_pcpu_stats(type, GFP_KERNEL)
20882088
20892089 #include <linux/notifier.h>
20902090
include/linux/netfilter/nfnetlink.h+1−1
@@ -14,7 +14,7 @@ struct nfnl_callback { · 13 unmodified lines
1414 int (*call_rcu)(struct sock *nl, struct sk_buff *skb,
1515 const struct nlmsghdr *nlh,
1616 const struct nlattr * const cda[]);
17− int (*call_batch)(struct sock *nl, struct sk_buff *skb,
17+ int (*call_batch)(struct net *net, struct sock *nl, struct sk_buff *skb,
1818 const struct nlmsghdr *nlh,
1919 const struct nlattr * const cda[]);
2020 const struct nla_policy *policy; /* netlink attribute policy */
include/linux/of_irq.h+12−7
@@ -46,12 +46,14 @@ extern int of_irq_get(struct device_node *dev, int index); · 45 unmodified lines
4646 extern int of_irq_get_byname(struct device_node *dev, const char *name);
4747 extern int of_irq_to_resource_table(struct device_node *dev,
4848 struct resource *res, int nr_irqs);
49+extern struct device_node *of_irq_find_parent(struct device_node *child);
4950 extern struct irq_domain *of_msi_get_domain(struct device *dev,
5051 struct device_node *np,
5152 enum irq_domain_bus_token token);
5253 extern struct irq_domain *of_msi_map_get_device_domain(struct device *dev,
5354 u32 rid);
5455 extern void of_msi_configure(struct device *dev, struct device_node *np);
56+u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in);
5557 #else
5658 static inline int of_irq_count(struct device_node *dev)
5759 {
@@ -70,6 +72,11 @@ static inline int of_irq_to_resource_table(struct device_node *dev, · 12 unmodified lines
7072 {
7173 return 0;
7274 }
75+static inline void *of_irq_find_parent(struct device_node *child)
76+{
77+ return NULL;
78+}
79+
7380 static inline struct irq_domain *of_msi_get_domain(struct device *dev,
7481 struct device_node *np,
7582 enum irq_domain_bus_token token)
@@ -84,6 +91,11 @@ static inline struct irq_domain *of_msi_map_get_device_domain(struct device *dev · 8 unmodified lines
8491 static inline void of_msi_configure(struct device *dev, struct device_node *np)
8592 {
8693 }
94+static inline u32 of_msi_map_rid(struct device *dev,
95+ struct device_node *msi_np, u32 rid_in)
96+{
97+ return rid_in;
98+}
8799 #endif
88100
89101 #if defined(CONFIG_OF_IRQ) || defined(CONFIG_SPARC)
@@ -93,7 +105,6 @@ static inline void of_msi_configure(struct device *dev, struct device_node *np) · 3 unmodified lines
93105 * so declare it here regardless of the CONFIG_OF_IRQ setting.
94106 */
95107 extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);
96−u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in);
97108
98109 #else /* !CONFIG_OF && !CONFIG_SPARC */
99110 static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
@@ -101,12 +112,6 @@ static inline unsigned int irq_of_parse_and_map(struct device_node *dev, · 1 unmodified line
101112 {
102113 return 0;
103114 }
104−
105−static inline u32 of_msi_map_rid(struct device *dev,
106− struct device_node *msi_np, u32 rid_in)
107−{
108− return rid_in;
109−}
110115 #endif /* !CONFIG_OF */
111116
112117 #endif /* __OF_IRQ_H */
include/linux/perf_event.h+4−2
@@ -697,9 +697,11 @@ struct perf_cgroup { · 696 unmodified lines
697697 * if there is no cgroup event for the current CPU context.
698698 */
699699 static inline struct perf_cgroup *
700−perf_cgroup_from_task(struct task_struct *task)
700+perf_cgroup_from_task(struct task_struct *task, struct perf_event_context *ctx)
701701 {
702− return container_of(task_css(task, perf_event_cgrp_id),
702+ return container_of(task_css_check(task, perf_event_cgrp_id,
703+ ctx ? lockdep_is_held(&ctx->lock)
704+ : true),
703705 struct perf_cgroup, css);
704706 }
705707 #endif /* CONFIG_CGROUP_PERF */
include/linux/platform_data/edma.h+1−1
@@ -72,7 +72,7 @@ struct edma_soc_info { · 71 unmodified lines
7272 struct edma_rsv_info *rsv;
7373
7474 /* List of channels allocated for memcpy, terminated with -1 */
75− s16 *memcpy_channels;
75+ s32 *memcpy_channels;
7676
7777 s8 (*queue_priority_mapping)[2];
7878 const s16 (*xbar_chans)[2];
include/linux/proportions.h+1−1
@@ -1,7 +1,7 @@
11 /*
22 * FLoating proportions
33 *
4− * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
4+ * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra
55 *
66 * This file contains the public data structure and API definitions.
77 */
include/linux/qed/common_hsi.h+2−0
@@ -9,6 +9,8 @@ · 8 unmodified lines
99 #ifndef __COMMON_HSI__
1010 #define __COMMON_HSI__
1111
12+#define CORE_SPQE_PAGE_SIZE_BYTES 4096
13+
1214 #define FW_MAJOR_VERSION 8
1315 #define FW_MINOR_VERSION 4
1416 #define FW_REVISION_VERSION 2
include/linux/qed/qed_chain.h+2−1
@@ -111,7 +111,8 @@ static inline u16 qed_chain_get_elem_left(struct qed_chain *p_chain) · 110 unmodified lines
111111 used = ((u32)0x10000u + (u32)(p_chain->prod_idx)) -
112112 (u32)p_chain->cons_idx;
113113 if (p_chain->mode == QED_CHAIN_MODE_NEXT_PTR)
114− used -= (used / p_chain->elem_per_page);
114+ used -= p_chain->prod_idx / p_chain->elem_per_page -
115+ p_chain->cons_idx / p_chain->elem_per_page;
115116
116117 return p_chain->capacity - used;
117118 }
include/linux/rhashtable.h+11−7
@@ -19,6 +19,7 @@ · 18 unmodified lines
1919
2020 #include <linux/atomic.h>
2121 #include <linux/compiler.h>
22+#include <linux/err.h>
2223 #include <linux/errno.h>
2324 #include <linux/jhash.h>
2425 #include <linux/list_nulls.h>
@@ -339,10 +340,11 @@ static inline int lockdep_rht_bucket_is_held(const struct bucket_table *tbl, · 314 unmodified lines
339340 int rhashtable_init(struct rhashtable *ht,
340341 const struct rhashtable_params *params);
341342
342−int rhashtable_insert_slow(struct rhashtable *ht, const void *key,
343− struct rhash_head *obj,
344− struct bucket_table *old_tbl);
345−int rhashtable_insert_rehash(struct rhashtable *ht);
343+struct bucket_table *rhashtable_insert_slow(struct rhashtable *ht,
344+ const void *key,
345+ struct rhash_head *obj,
346+ struct bucket_table *old_tbl);
347+int rhashtable_insert_rehash(struct rhashtable *ht, struct bucket_table *tbl);
346348
347349 int rhashtable_walk_init(struct rhashtable *ht, struct rhashtable_iter *iter);
348350 void rhashtable_walk_exit(struct rhashtable_iter *iter);
@@ -598,9 +600,11 @@ restart: · 249 unmodified lines
598600
599601 new_tbl = rht_dereference_rcu(tbl->future_tbl, ht);
600602 if (unlikely(new_tbl)) {
601− err = rhashtable_insert_slow(ht, key, obj, new_tbl);
602− if (err == -EAGAIN)
603+ tbl = rhashtable_insert_slow(ht, key, obj, new_tbl);
604+ if (!IS_ERR_OR_NULL(tbl))
603605 goto slow_path;
606+
607+ err = PTR_ERR(tbl);
604608 goto out;
605609 }
606610
@@ -611,7 +615,7 @@ restart: · 4 unmodified lines
611615 if (unlikely(rht_grow_above_100(ht, tbl))) {
612616 slow_path:
613617 spin_unlock_bh(lock);
614− err = rhashtable_insert_rehash(ht);
618+ err = rhashtable_insert_rehash(ht, tbl);
615619 rcu_read_unlock();
616620 if (err)
617621 return err;
include/linux/stop_machine.h+3−3
@@ -99,7 +99,7 @@ static inline int try_stop_cpus(const struct cpumask *cpumask, · 98 unmodified lines
9999 * grabbing every spinlock (and more). So the "read" side to such a
100100 * lock is anything which disables preemption.
101101 */
102−#if defined(CONFIG_STOP_MACHINE) && defined(CONFIG_SMP)
102+#if defined(CONFIG_SMP) || defined(CONFIG_HOTPLUG_CPU)
103103
104104 /**
105105 * stop_machine: freeze the machine on all CPUs and run this function
@@ -118,7 +118,7 @@ int stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus); · 12 unmodified lines
118118
119119 int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data,
120120 const struct cpumask *cpus);
121−#else /* CONFIG_STOP_MACHINE && CONFIG_SMP */
121+#else /* CONFIG_SMP || CONFIG_HOTPLUG_CPU */
122122
123123 static inline int stop_machine(cpu_stop_fn_t fn, void *data,
124124 const struct cpumask *cpus)
@@ -137,5 +137,5 @@ static inline int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data, · 12 unmodified lines
137137 return stop_machine(fn, data, cpus);
138138 }
139139
140−#endif /* CONFIG_STOP_MACHINE && CONFIG_SMP */
140+#endif /* CONFIG_SMP || CONFIG_HOTPLUG_CPU */
141141 #endif /* _LINUX_STOP_MACHINE */
include/linux/uprobes.h+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121 * Authors:
2222 * Srikar Dronamraju
2323 * Jim Keniston
24− * Copyright (C) 2011-2012 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
24+ * Copyright (C) 2011-2012 Red Hat, Inc., Peter Zijlstra
2525 */
2626
2727 #include <linux/errno.h>
include/linux/usb/quirks.h+3−0
@@ -47,4 +47,7 @@ · 46 unmodified lines
4747 /* device generates spurious wakeup, ignore remote wakeup capability */
4848 #define USB_QUIRK_IGNORE_REMOTE_WAKEUP BIT(9)
4949
50+/* device can't handle Link Power Management */
51+#define USB_QUIRK_NO_LPM BIT(10)
52+
5053 #endif /* __LINUX_USB_QUIRKS_H */
include/linux/vfio.h+0−3
@@ -44,9 +44,6 @@ struct vfio_device_ops { · 43 unmodified lines
4444 void (*request)(void *device_data, unsigned int count);
4545 };
4646
47−extern struct iommu_group *vfio_iommu_group_get(struct device *dev);
48−extern void vfio_iommu_group_put(struct iommu_group *group, struct device *dev);
49−
5047 extern int vfio_add_group_dev(struct device *dev,
5148 const struct vfio_device_ops *ops,
5249 void *device_data);
include/linux/wait.h+5−5
@@ -145,7 +145,7 @@ __remove_wait_queue(wait_queue_head_t *head, wait_queue_t *old) · 144 unmodified lines
145145 list_del(&old->task_list);
146146 }
147147
148−typedef int wait_bit_action_f(struct wait_bit_key *);
148+typedef int wait_bit_action_f(struct wait_bit_key *, int mode);
149149 void __wake_up(wait_queue_head_t *q, unsigned int mode, int nr, void *key);
150150 void __wake_up_locked_key(wait_queue_head_t *q, unsigned int mode, void *key);
151151 void __wake_up_sync_key(wait_queue_head_t *q, unsigned int mode, int nr, void *key);
@@ -960,10 +960,10 @@ int wake_bit_function(wait_queue_t *wait, unsigned mode, int sync, void *key); · 808 unmodified lines
960960 } while (0)
961961
962962
963−extern int bit_wait(struct wait_bit_key *);
964−extern int bit_wait_io(struct wait_bit_key *);
965−extern int bit_wait_timeout(struct wait_bit_key *);
966−extern int bit_wait_io_timeout(struct wait_bit_key *);
963+extern int bit_wait(struct wait_bit_key *, int);
964+extern int bit_wait_io(struct wait_bit_key *, int);
965+extern int bit_wait_timeout(struct wait_bit_key *, int);
966+extern int bit_wait_io_timeout(struct wait_bit_key *, int);
967967
968968 /**
969969 * wait_on_bit - wait for a bit to be cleared
include/net/dst.h+33−0
@@ -322,6 +322,39 @@ static inline void skb_dst_force(struct sk_buff *skb) · 321 unmodified lines
322322 }
323323 }
324324
325+/**
326+ * dst_hold_safe - Take a reference on a dst if possible
327+ * @dst: pointer to dst entry
328+ *
329+ * This helper returns false if it could not safely
330+ * take a reference on a dst.
331+ */
332+static inline bool dst_hold_safe(struct dst_entry *dst)
333+{
334+ if (dst->flags & DST_NOCACHE)
335+ return atomic_inc_not_zero(&dst->__refcnt);
336+ dst_hold(dst);
337+ return true;
338+}
339+
340+/**
341+ * skb_dst_force_safe - makes sure skb dst is refcounted
342+ * @skb: buffer
343+ *
344+ * If dst is not yet refcounted and not destroyed, grab a ref on it.
345+ */
346+static inline void skb_dst_force_safe(struct sk_buff *skb)
347+{
348+ if (skb_dst_is_noref(skb)) {
349+ struct dst_entry *dst = skb_dst(skb);
350+
351+ if (!dst_hold_safe(dst))
352+ dst = NULL;
353+
354+ skb->_skb_refdst = (unsigned long)dst;
355+ }
356+}
357+
325358
326359 /**
327360 * __skb_tunnel_rx - prepare skb for rx reinsert
include/net/inet_sock.h+23−4
@@ -210,18 +210,37 @@ struct inet_sock { · 209 unmodified lines
210210 #define IP_CMSG_ORIGDSTADDR BIT(6)
211211 #define IP_CMSG_CHECKSUM BIT(7)
212212
213−/* SYNACK messages might be attached to request sockets.
213+/**
214+ * sk_to_full_sk - Access to a full socket
215+ * @sk: pointer to a socket
216+ *
217+ * SYNACK messages might be attached to request sockets.
214218 * Some places want to reach the listener in this case.
215219 */
216−static inline struct sock *skb_to_full_sk(const struct sk_buff *skb)
220+static inline struct sock *sk_to_full_sk(struct sock *sk)
217221 {
218− struct sock *sk = skb->sk;
219−
222+#ifdef CONFIG_INET
220223 if (sk && sk->sk_state == TCP_NEW_SYN_RECV)
221224 sk = inet_reqsk(sk)->rsk_listener;
225+#endif
226+ return sk;
227+}
228+
229+/* sk_to_full_sk() variant with a const argument */
230+static inline const struct sock *sk_const_to_full_sk(const struct sock *sk)
231+{
232+#ifdef CONFIG_INET
233+ if (sk && sk->sk_state == TCP_NEW_SYN_RECV)
234+ sk = ((const struct request_sock *)sk)->rsk_listener;
235+#endif
222236 return sk;
223237 }
224238
239+static inline struct sock *skb_to_full_sk(const struct sk_buff *skb)
240+{
241+ return sk_to_full_sk(skb->sk);
242+}
243+
225244 static inline struct inet_sock *inet_sk(const struct sock *sk)
226245 {
227246 return (struct inet_sock *)sk;
include/net/inetpeer.h+1−0
@@ -78,6 +78,7 @@ void inet_initpeers(void) __init; · 77 unmodified lines
7878 static inline void inetpeer_set_addr_v4(struct inetpeer_addr *iaddr, __be32 ip)
7979 {
8080 iaddr->a4.addr = ip;
81+ iaddr->a4.vif = 0;
8182 iaddr->family = AF_INET;
8283 }
8384
include/net/sctp/structs.h+2−1
@@ -1493,7 +1493,8 @@ struct sctp_association { · 1492 unmodified lines
14931493 * : SACK's are not delayed (see Section 6).
14941494 */
14951495 __u8 sack_needed:1, /* Do we need to sack the peer? */
1496− sack_generation:1;
1496+ sack_generation:1,
1497+ zero_window_announced:1;
14971498 __u32 sack_cnt;
14981499
14991500 __u32 adaptation_ind; /* Adaptation Code point. */
include/net/sock.h+5−2
@@ -388,7 +388,7 @@ struct sock { · 387 unmodified lines
388388 struct socket_wq *sk_wq_raw;
389389 };
390390 #ifdef CONFIG_XFRM
391− struct xfrm_policy *sk_policy[2];
391+ struct xfrm_policy __rcu *sk_policy[2];
392392 #endif
393393 struct dst_entry *sk_rx_dst;
394394 struct dst_entry __rcu *sk_dst_cache;
@@ -404,6 +404,7 @@ struct sock { · 9 unmodified lines
404404 sk_userlocks : 4,
405405 sk_protocol : 8,
406406 sk_type : 16;
407+#define SK_PROTOCOL_MAX U8_MAX
407408 kmemcheck_bitfield_end(flags);
408409 int sk_wmem_queued;
409410 gfp_t sk_allocation;
@@ -740,6 +741,8 @@ enum sock_flags { · 330 unmodified lines
740741 SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */
741742 };
742743
744+#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE))
745+
743746 static inline void sock_copy_flags(struct sock *nsk, struct sock *osk)
744747 {
745748 nsk->sk_flags = osk->sk_flags;
@@ -814,7 +817,7 @@ void sk_stream_write_space(struct sock *sk); · 68 unmodified lines
814817 static inline void __sk_add_backlog(struct sock *sk, struct sk_buff *skb)
815818 {
816819 /* dont let skb dst not refcounted, we are going to leave rcu lock */
817− skb_dst_force(skb);
820+ skb_dst_force_safe(skb);
818821
819822 if (!sk->sk_backlog.tail)
820823 sk->sk_backlog.head = skb;
include/net/vxlan.h+1−1
@@ -79,7 +79,7 @@ struct vxlanhdr { · 78 unmodified lines
7979 };
8080
8181 /* VXLAN header flags. */
82−#define VXLAN_HF_RCO BIT(24)
82+#define VXLAN_HF_RCO BIT(21)
8383 #define VXLAN_HF_VNI BIT(27)
8484 #define VXLAN_HF_GBP BIT(31)
8585
include/net/xfrm.h+16−9
@@ -548,6 +548,7 @@ struct xfrm_policy { · 547 unmodified lines
548548 u16 family;
549549 struct xfrm_sec_ctx *security;
550550 struct xfrm_tmpl xfrm_vec[XFRM_MAX_DEPTH];
551+ struct rcu_head rcu;
551552 };
552553
553554 static inline struct net *xp_net(const struct xfrm_policy *xp)
@@ -1141,12 +1142,14 @@ static inline int xfrm6_route_forward(struct sk_buff *skb) · 587 unmodified lines
11411142 return xfrm_route_forward(skb, AF_INET6);
11421143 }
11431144
1144−int __xfrm_sk_clone_policy(struct sock *sk);
1145+int __xfrm_sk_clone_policy(struct sock *sk, const struct sock *osk);
11451146
1146−static inline int xfrm_sk_clone_policy(struct sock *sk)
1147+static inline int xfrm_sk_clone_policy(struct sock *sk, const struct sock *osk)
11471148 {
1148− if (unlikely(sk->sk_policy[0] || sk->sk_policy[1]))
1149− return __xfrm_sk_clone_policy(sk);
1149+ sk->sk_policy[0] = NULL;
1150+ sk->sk_policy[1] = NULL;
1151+ if (unlikely(osk->sk_policy[0] || osk->sk_policy[1]))
1152+ return __xfrm_sk_clone_policy(sk, osk);
11501153 return 0;
11511154 }
11521155
@@ -1154,12 +1157,16 @@ int xfrm_policy_delete(struct xfrm_policy *pol, int dir); · 1 unmodified line
11541157
11551158 static inline void xfrm_sk_free_policy(struct sock *sk)
11561159 {
1157− if (unlikely(sk->sk_policy[0] != NULL)) {
1158− xfrm_policy_delete(sk->sk_policy[0], XFRM_POLICY_MAX);
1160+ struct xfrm_policy *pol;
1161+
1162+ pol = rcu_dereference_protected(sk->sk_policy[0], 1);
1163+ if (unlikely(pol != NULL)) {
1164+ xfrm_policy_delete(pol, XFRM_POLICY_MAX);
11591165 sk->sk_policy[0] = NULL;
11601166 }
1161− if (unlikely(sk->sk_policy[1] != NULL)) {
1162− xfrm_policy_delete(sk->sk_policy[1], XFRM_POLICY_MAX+1);
1167+ pol = rcu_dereference_protected(sk->sk_policy[1], 1);
1168+ if (unlikely(pol != NULL)) {
1169+ xfrm_policy_delete(pol, XFRM_POLICY_MAX+1);
11631170 sk->sk_policy[1] = NULL;
11641171 }
11651172 }
@@ -1169,7 +1176,7 @@ void xfrm_garbage_collect(struct net *net); · 3 unmodified lines
11691176 #else
11701177
11711178 static inline void xfrm_sk_free_policy(struct sock *sk) {}
1172−static inline int xfrm_sk_clone_policy(struct sock *sk) { return 0; }
1179+static inline int xfrm_sk_clone_policy(struct sock *sk, const struct sock *osk) { return 0; }
11731180 static inline int xfrm6_route_forward(struct sk_buff *skb) { return 1; }
11741181 static inline int xfrm4_route_forward(struct sk_buff *skb) { return 1; }
11751182 static inline int xfrm6_policy_check(struct sock *sk, int dir, struct sk_buff *skb)
include/rdma/ib_mad.h+2−0
@@ -237,6 +237,8 @@ struct ib_vendor_mad { · 236 unmodified lines
237237 u8 data[IB_MGMT_VENDOR_DATA];
238238 };
239239
240+#define IB_MGMT_CLASSPORTINFO_ATTR_ID cpu_to_be16(0x0001)
241+
240242 struct ib_class_port_info {
241243 u8 base_version;
242244 u8 class_version;
include/rdma/ib_verbs.h+1−0
@@ -1271,6 +1271,7 @@ struct ib_uobject { · 1270 unmodified lines
12711271 int id; /* index into kernel idr */
12721272 struct kref ref;
12731273 struct rw_semaphore mutex; /* protects .live */
1274+ struct rcu_head rcu; /* kfree_rcu() overhead */
12741275 int live;
12751276 };
12761277
include/sound/hda_register.h+3−0
@@ -93,6 +93,9 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; · 92 unmodified lines
9393 #define AZX_REG_HSW_EM4 0x100c
9494 #define AZX_REG_HSW_EM5 0x1010
9595
96+/* Skylake/Broxton display HD-A controller Extended Mode registers */
97+#define AZX_REG_SKL_EM4L 0x1040
98+
9699 /* PCI space */
97100 #define AZX_PCIREG_TCSEL 0x44
98101
include/uapi/linux/Kbuild+1−0
@@ -186,6 +186,7 @@ header-y += if_tunnel.h · 185 unmodified lines
186186 header-y += if_vlan.h
187187 header-y += if_x25.h
188188 header-y += igmp.h
189+header-y += ila.h
189190 header-y += in6.h
190191 header-y += inet_diag.h
191192 header-y += in.h
include/uapi/linux/openvswitch.h+1−1
@@ -628,7 +628,7 @@ struct ovs_action_hash { · 627 unmodified lines
628628 * @OVS_CT_ATTR_MARK: u32 value followed by u32 mask. For each bit set in the
629629 * mask, the corresponding bit in the value is copied to the connection
630630 * tracking mark field in the connection.
631− * @OVS_CT_ATTR_LABEL: %OVS_CT_LABELS_LEN value followed by %OVS_CT_LABELS_LEN
631+ * @OVS_CT_ATTR_LABELS: %OVS_CT_LABELS_LEN value followed by %OVS_CT_LABELS_LEN
632632 * mask. For each bit set in the mask, the corresponding bit in the value is
633633 * copied to the connection tracking label field in the connection.
634634 * @OVS_CT_ATTR_HELPER: variable length string defining conntrack ALG.
include/uapi/linux/vfio.h+0−7
@@ -38,13 +38,6 @@ · 37 unmodified lines
3838
3939 #define VFIO_SPAPR_TCE_v2_IOMMU 7
4040
41−/*
42− * The No-IOMMU IOMMU offers no translation or isolation for devices and
43− * supports no ioctls outside of VFIO_CHECK_EXTENSION. Use of VFIO's No-IOMMU
44− * code will taint the host kernel and should be used with extreme caution.
45− */
46−#define VFIO_NOIOMMU_IOMMU 8
47−
4841 /*
4942 * The IOCTL interface is designed for extensibility by embedding the
5043 * structure length (argsz) and flags into structures passed between
include/xen/interface/io/ring.h+14−0
@@ -181,6 +181,20 @@ struct __name##_back_ring { \ · 180 unmodified lines
181181 #define RING_GET_REQUEST(_r, _idx) \
182182 (&((_r)->sring->ring[((_idx) & (RING_SIZE(_r) - 1))].req))
183183
184+/*
185+ * Get a local copy of a request.
186+ *
187+ * Use this in preference to RING_GET_REQUEST() so all processing is
188+ * done on a local copy that cannot be modified by the other end.
189+ *
190+ * Note that https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58145 may cause this
191+ * to be ineffective where _req is a struct which consists of only bitfields.
192+ */
193+#define RING_COPY_REQUEST(_r, _idx, _req) do { \
194+ /* Use volatile to force the copy into _req. */ \
195+ *(_req) = *(volatile typeof(_req))RING_GET_REQUEST(_r, _idx); \
196+} while (0)
197+
184198 #define RING_GET_RESPONSE(_r, _idx) \
185199 (&((_r)->sring->ring[((_idx) & (RING_SIZE(_r) - 1))].rsp))
186200
init/Kconfig+0−7
@@ -2030,13 +2030,6 @@ config INIT_ALL_POSSIBLE · 2029 unmodified lines
20302030 it was better to provide this option than to break all the archs
20312031 and have several arch maintainers pursuing me down dark alleys.
20322032
2033−config STOP_MACHINE
2034− bool
2035− default y
2036− depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
2037− help
2038− Need stop_machine() primitive.
2039−
20402033 source "block/Kconfig"
20412034
20422035 config PREEMPT_NOTIFIERS
kernel/cgroup.c+78−21
@@ -97,6 +97,12 @@ static DEFINE_SPINLOCK(css_set_lock); · 96 unmodified lines
9797 */
9898 static DEFINE_SPINLOCK(cgroup_idr_lock);
9999
100+/*
101+ * Protects cgroup_file->kn for !self csses. It synchronizes notifications
102+ * against file removal/re-creation across css hiding.
103+ */
104+static DEFINE_SPINLOCK(cgroup_file_kn_lock);
105+
100106 /*
101107 * Protects cgroup_subsys->release_agent_path. Modifying it also requires
102108 * cgroup_mutex. Reading requires either cgroup_mutex or this spinlock.
@@ -754,9 +760,11 @@ static void put_css_set_locked(struct css_set *cset) · 651 unmodified lines
754760 if (!atomic_dec_and_test(&cset->refcount))
755761 return;
756762
757− /* This css_set is dead. unlink it and release cgroup refcounts */
758− for_each_subsys(ss, ssid)
763+ /* This css_set is dead. unlink it and release cgroup and css refs */
764+ for_each_subsys(ss, ssid) {
759765 list_del(&cset->e_cset_node[ssid]);
766+ css_put(cset->subsys[ssid]);
767+ }
760768 hash_del(&cset->hlist);
761769 css_set_count--;
762770
@@ -1056,9 +1064,13 @@ static struct css_set *find_css_set(struct css_set *old_cset, · 293 unmodified lines
10561064 key = css_set_hash(cset->subsys);
10571065 hash_add(css_set_table, &cset->hlist, key);
10581066
1059− for_each_subsys(ss, ssid)
1067+ for_each_subsys(ss, ssid) {
1068+ struct cgroup_subsys_state *css = cset->subsys[ssid];
1069+
10601070 list_add_tail(&cset->e_cset_node[ssid],
1061− &cset->subsys[ssid]->cgroup->e_csets[ssid]);
1071+ &css->cgroup->e_csets[ssid]);
1072+ css_get(css);
1073+ }
10621074
10631075 spin_unlock_bh(&css_set_lock);
10641076
@@ -1393,6 +1405,16 @@ static void cgroup_rm_file(struct cgroup *cgrp, const struct cftype *cft) · 328 unmodified lines
13931405 char name[CGROUP_FILE_NAME_MAX];
13941406
13951407 lockdep_assert_held(&cgroup_mutex);
1408+
1409+ if (cft->file_offset) {
1410+ struct cgroup_subsys_state *css = cgroup_css(cgrp, cft->ss);
1411+ struct cgroup_file *cfile = (void *)css + cft->file_offset;
1412+
1413+ spin_lock_irq(&cgroup_file_kn_lock);
1414+ cfile->kn = NULL;
1415+ spin_unlock_irq(&cgroup_file_kn_lock);
1416+ }
1417+
13961418 kernfs_remove_by_name(cgrp->kn, cgroup_file_name(cgrp, cft, name));
13971419 }
13981420
@@ -1856,7 +1878,6 @@ static void init_cgroup_housekeeping(struct cgroup *cgrp) · 457 unmodified lines
18561878
18571879 INIT_LIST_HEAD(&cgrp->self.sibling);
18581880 INIT_LIST_HEAD(&cgrp->self.children);
1859− INIT_LIST_HEAD(&cgrp->self.files);
18601881 INIT_LIST_HEAD(&cgrp->cset_links);
18611882 INIT_LIST_HEAD(&cgrp->pidlists);
18621883 mutex_init(&cgrp->pidlist_mutex);
@@ -2216,6 +2237,9 @@ struct cgroup_taskset { · 353 unmodified lines
22162237 struct list_head src_csets;
22172238 struct list_head dst_csets;
22182239
2240+ /* the subsys currently being processed */
2241+ int ssid;
2242+
22192243 /*
22202244 * Fields for cgroup_taskset_*() iteration.
22212245 *
@@ -2278,25 +2302,29 @@ static void cgroup_taskset_add(struct task_struct *task, · 56 unmodified lines
22782302 /**
22792303 * cgroup_taskset_first - reset taskset and return the first task
22802304 * @tset: taskset of interest
2305+ * @dst_cssp: output variable for the destination css
22812306 *
22822307 * @tset iteration is initialized and the first task is returned.
22832308 */
2284−struct task_struct *cgroup_taskset_first(struct cgroup_taskset *tset)
2309+struct task_struct *cgroup_taskset_first(struct cgroup_taskset *tset,
2310+ struct cgroup_subsys_state **dst_cssp)
22852311 {
22862312 tset->cur_cset = list_first_entry(tset->csets, struct css_set, mg_node);
22872313 tset->cur_task = NULL;
22882314
2289− return cgroup_taskset_next(tset);
2315+ return cgroup_taskset_next(tset, dst_cssp);
22902316 }
22912317
22922318 /**
22932319 * cgroup_taskset_next - iterate to the next task in taskset
22942320 * @tset: taskset of interest
2321+ * @dst_cssp: output variable for the destination css
22952322 *
22962323 * Return the next task in @tset. Iteration must have been initialized
22972324 * with cgroup_taskset_first().
22982325 */
2299−struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset)
2326+struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset,
2327+ struct cgroup_subsys_state **dst_cssp)
23002328 {
23012329 struct css_set *cset = tset->cur_cset;
23022330 struct task_struct *task = tset->cur_task;
@@ -2311,6 +2339,18 @@ struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset) · 8 unmodified lines
23112339 if (&task->cg_list != &cset->mg_tasks) {
23122340 tset->cur_cset = cset;
23132341 tset->cur_task = task;
2342+
2343+ /*
2344+ * This function may be called both before and
2345+ * after cgroup_taskset_migrate(). The two cases
2346+ * can be distinguished by looking at whether @cset
2347+ * has its ->mg_dst_cset set.
2348+ */
2349+ if (cset->mg_dst_cset)
2350+ *dst_cssp = cset->mg_dst_cset->subsys[tset->ssid];
2351+ else
2352+ *dst_cssp = cset->subsys[tset->ssid];
2353+
23142354 return task;
23152355 }
23162356
@@ -2346,7 +2386,8 @@ static int cgroup_taskset_migrate(struct cgroup_taskset *tset, · 29 unmodified lines
23462386 /* check that we can legitimately attach to the cgroup */
23472387 for_each_e_css(css, i, dst_cgrp) {
23482388 if (css->ss->can_attach) {
2349− ret = css->ss->can_attach(css, tset);
2389+ tset->ssid = i;
2390+ ret = css->ss->can_attach(tset);
23502391 if (ret) {
23512392 failed_css = css;
23522393 goto out_cancel_attach;
@@ -2379,9 +2420,12 @@ static int cgroup_taskset_migrate(struct cgroup_taskset *tset, · 26 unmodified lines
23792420 */
23802421 tset->csets = &tset->dst_csets;
23812422
2382− for_each_e_css(css, i, dst_cgrp)
2383− if (css->ss->attach)
2384− css->ss->attach(css, tset);
2423+ for_each_e_css(css, i, dst_cgrp) {
2424+ if (css->ss->attach) {
2425+ tset->ssid = i;
2426+ css->ss->attach(tset);
2427+ }
2428+ }
23852429
23862430 ret = 0;
23872431 goto out_release_tset;
@@ -2390,8 +2434,10 @@ out_cancel_attach: · 2 unmodified lines
23902434 for_each_e_css(css, i, dst_cgrp) {
23912435 if (css == failed_css)
23922436 break;
2393− if (css->ss->cancel_attach)
2394− css->ss->cancel_attach(css, tset);
2437+ if (css->ss->cancel_attach) {
2438+ tset->ssid = i;
2439+ css->ss->cancel_attach(tset);
2440+ }
23952441 }
23962442 out_release_tset:
23972443 spin_lock_bh(&css_set_lock);
@@ -3313,9 +3359,9 @@ static int cgroup_add_file(struct cgroup_subsys_state *css, struct cgroup *cgrp, · 915 unmodified lines
33133359 if (cft->file_offset) {
33143360 struct cgroup_file *cfile = (void *)css + cft->file_offset;
33153361
3316− kernfs_get(kn);
3362+ spin_lock_irq(&cgroup_file_kn_lock);
33173363 cfile->kn = kn;
3318− list_add(&cfile->node, &css->files);
3364+ spin_unlock_irq(&cgroup_file_kn_lock);
33193365 }
33203366
33213367 return 0;
@@ -3552,6 +3598,22 @@ int cgroup_add_legacy_cftypes(struct cgroup_subsys *ss, struct cftype *cfts) · 230 unmodified lines
35523598 return cgroup_add_cftypes(ss, cfts);
35533599 }
35543600
3601+/**
3602+ * cgroup_file_notify - generate a file modified event for a cgroup_file
3603+ * @cfile: target cgroup_file
3604+ *
3605+ * @cfile must have been obtained by setting cftype->file_offset.
3606+ */
3607+void cgroup_file_notify(struct cgroup_file *cfile)
3608+{
3609+ unsigned long flags;
3610+
3611+ spin_lock_irqsave(&cgroup_file_kn_lock, flags);
3612+ if (cfile->kn)
3613+ kernfs_notify(cfile->kn);
3614+ spin_unlock_irqrestore(&cgroup_file_kn_lock, flags);
3615+}
3616+
35553617 /**
35563618 * cgroup_task_count - count the number of tasks in a cgroup.
35573619 * @cgrp: the cgroup in question
@@ -4613,13 +4675,9 @@ static void css_free_work_fn(struct work_struct *work) · 1055 unmodified lines
46134675 container_of(work, struct cgroup_subsys_state, destroy_work);
46144676 struct cgroup_subsys *ss = css->ss;
46154677 struct cgroup *cgrp = css->cgroup;
4616− struct cgroup_file *cfile;
46174678
46184679 percpu_ref_exit(&css->refcnt);
46194680
4620− list_for_each_entry(cfile, &css->files, node)
4621− kernfs_put(cfile->kn);
4622−
46234681 if (ss) {
46244682 /* css free path */
46254683 int id = css->id;
@@ -4724,7 +4782,6 @@ static void init_and_link_css(struct cgroup_subsys_state *css, · 98 unmodified lines
47244782 css->ss = ss;
47254783 INIT_LIST_HEAD(&css->sibling);
47264784 INIT_LIST_HEAD(&css->children);
4727− INIT_LIST_HEAD(&css->files);
47284785 css->serial_nr = css_serial_nr_next++;
47294786
47304787 if (cgroup_parent(cgrp)) {
kernel/cgroup_freezer.c+10−13
@@ -155,12 +155,10 @@ static void freezer_css_free(struct cgroup_subsys_state *css) · 154 unmodified lines
155155 * @freezer->lock. freezer_attach() makes the new tasks conform to the
156156 * current state and all following state changes can see the new tasks.
157157 */
158−static void freezer_attach(struct cgroup_subsys_state *new_css,
159− struct cgroup_taskset *tset)
158+static void freezer_attach(struct cgroup_taskset *tset)
160159 {
161− struct freezer *freezer = css_freezer(new_css);
162160 struct task_struct *task;
163− bool clear_frozen = false;
161+ struct cgroup_subsys_state *new_css;
164162
165163 mutex_lock(&freezer_mutex);
166164
@@ -174,22 +172,21 @@ static void freezer_attach(struct cgroup_subsys_state *new_css, · 7 unmodified lines
174172 * current state before executing the following - !frozen tasks may
175173 * be visible in a FROZEN cgroup and frozen tasks in a THAWED one.
176174 */
177− cgroup_taskset_for_each(task, tset) {
175+ cgroup_taskset_for_each(task, new_css, tset) {
176+ struct freezer *freezer = css_freezer(new_css);
177+
178178 if (!(freezer->state & CGROUP_FREEZING)) {
179179 __thaw_task(task);
180180 } else {
181181 freeze_task(task);
182− freezer->state &= ~CGROUP_FROZEN;
183− clear_frozen = true;
182+ /* clear FROZEN and propagate upwards */
183+ while (freezer && (freezer->state & CGROUP_FROZEN)) {
184+ freezer->state &= ~CGROUP_FROZEN;
185+ freezer = parent_freezer(freezer);
186+ }
184187 }
185188 }
186189
187− /* propagate FROZEN clearing upwards */
188− while (clear_frozen && (freezer = parent_freezer(freezer))) {
189− freezer->state &= ~CGROUP_FROZEN;
190− clear_frozen = freezer->state & CGROUP_FREEZING;
191− }
192−
193190 mutex_unlock(&freezer_mutex);
194191 }
195192
kernel/cgroup_pids.c+20−57
@@ -106,7 +106,7 @@ static void pids_uncharge(struct pids_cgroup *pids, int num) · 105 unmodified lines
106106 {
107107 struct pids_cgroup *p;
108108
109− for (p = pids; p; p = parent_pids(p))
109+ for (p = pids; parent_pids(p); p = parent_pids(p))
110110 pids_cancel(p, num);
111111 }
112112
@@ -123,7 +123,7 @@ static void pids_charge(struct pids_cgroup *pids, int num) · 10 unmodified lines
123123 {
124124 struct pids_cgroup *p;
125125
126− for (p = pids; p; p = parent_pids(p))
126+ for (p = pids; parent_pids(p); p = parent_pids(p))
127127 atomic64_add(num, &p->counter);
128128 }
129129
@@ -140,7 +140,7 @@ static int pids_try_charge(struct pids_cgroup *pids, int num) · 10 unmodified lines
140140 {
141141 struct pids_cgroup *p, *q;
142142
143− for (p = pids; p; p = parent_pids(p)) {
143+ for (p = pids; parent_pids(p); p = parent_pids(p)) {
144144 int64_t new = atomic64_add_return(num, &p->counter);
145145
146146 /*
@@ -162,13 +162,13 @@ revert: · 15 unmodified lines
162162 return -EAGAIN;
163163 }
164164
165−static int pids_can_attach(struct cgroup_subsys_state *css,
166− struct cgroup_taskset *tset)
165+static int pids_can_attach(struct cgroup_taskset *tset)
167166 {
168− struct pids_cgroup *pids = css_pids(css);
169167 struct task_struct *task;
168+ struct cgroup_subsys_state *dst_css;
170169
171− cgroup_taskset_for_each(task, tset) {
170+ cgroup_taskset_for_each(task, dst_css, tset) {
171+ struct pids_cgroup *pids = css_pids(dst_css);
172172 struct cgroup_subsys_state *old_css;
173173 struct pids_cgroup *old_pids;
174174
@@ -187,13 +187,13 @@ static int pids_can_attach(struct cgroup_subsys_state *css, · 12 unmodified lines
187187 return 0;
188188 }
189189
190−static void pids_cancel_attach(struct cgroup_subsys_state *css,
191− struct cgroup_taskset *tset)
190+static void pids_cancel_attach(struct cgroup_taskset *tset)
192191 {
193− struct pids_cgroup *pids = css_pids(css);
194192 struct task_struct *task;
193+ struct cgroup_subsys_state *dst_css;
195194
196− cgroup_taskset_for_each(task, tset) {
195+ cgroup_taskset_for_each(task, dst_css, tset) {
196+ struct pids_cgroup *pids = css_pids(dst_css);
197197 struct cgroup_subsys_state *old_css;
198198 struct pids_cgroup *old_pids;
199199
@@ -205,65 +205,28 @@ static void pids_cancel_attach(struct cgroup_subsys_state *css, · 5 unmodified lines
205205 }
206206 }
207207
208+/*
209+ * task_css_check(true) in pids_can_fork() and pids_cancel_fork() relies
210+ * on threadgroup_change_begin() held by the copy_process().
211+ */
208212 static int pids_can_fork(struct task_struct *task, void **priv_p)
209213 {
210214 struct cgroup_subsys_state *css;
211215 struct pids_cgroup *pids;
212− int err;
213216
214− /*
215− * Use the "current" task_css for the pids subsystem as the tentative
216− * css. It is possible we will charge the wrong hierarchy, in which
217− * case we will forcefully revert/reapply the charge on the right
218− * hierarchy after it is committed to the task proper.
219− */
220− css = task_get_css(current, pids_cgrp_id);
217+ css = task_css_check(current, pids_cgrp_id, true);
221218 pids = css_pids(css);
222−
223− err = pids_try_charge(pids, 1);
224− if (err)
225− goto err_css_put;
226−
227− *priv_p = css;
228− return 0;
229−
230−err_css_put:
231− css_put(css);
232− return err;
219+ return pids_try_charge(pids, 1);
233220 }
234221
235222 static void pids_cancel_fork(struct task_struct *task, void *priv)
236−{
237− struct cgroup_subsys_state *css = priv;
238− struct pids_cgroup *pids = css_pids(css);
239−
240− pids_uncharge(pids, 1);
241− css_put(css);
242−}
243−
244−static void pids_fork(struct task_struct *task, void *priv)
245223 {
246224 struct cgroup_subsys_state *css;
247− struct cgroup_subsys_state *old_css = priv;
248225 struct pids_cgroup *pids;
249− struct pids_cgroup *old_pids = css_pids(old_css);
250226
251− css = task_get_css(task, pids_cgrp_id);
227+ css = task_css_check(current, pids_cgrp_id, true);
252228 pids = css_pids(css);
253−
254− /*
255− * If the association has changed, we have to revert and reapply the
256− * charge/uncharge on the wrong hierarchy to the current one. Since
257− * the association can only change due to an organisation event, its
258− * okay for us to ignore the limit in this case.
259− */
260− if (pids != old_pids) {
261− pids_uncharge(old_pids, 1);
262− pids_charge(pids, 1);
263− }
264−
265− css_put(css);
266− css_put(old_css);
229+ pids_uncharge(pids, 1);
267230 }
268231
269232 static void pids_free(struct task_struct *task)
@@ -335,6 +298,7 @@ static struct cftype pids_files[] = { · 65 unmodified lines
335298 {
336299 .name = "current",
337300 .read_s64 = pids_current_read,
301+ .flags = CFTYPE_NOT_ON_ROOT,
338302 },
339303 { } /* terminate */
340304 };
@@ -346,7 +310,6 @@ struct cgroup_subsys pids_cgrp_subsys = { · 5 unmodified lines
346310 .cancel_attach = pids_cancel_attach,
347311 .can_fork = pids_can_fork,
348312 .cancel_fork = pids_cancel_fork,
349− .fork = pids_fork,
350313 .free = pids_free,
351314 .legacy_cftypes = pids_files,
352315 .dfl_cftypes = pids_files,
kernel/cpuset.c+21−12
@@ -1429,15 +1429,16 @@ static int fmeter_getrate(struct fmeter *fmp) · 1428 unmodified lines
14291429 static struct cpuset *cpuset_attach_old_cs;
14301430
14311431 /* Called by cgroups to determine if a cpuset is usable; cpuset_mutex held */
1432−static int cpuset_can_attach(struct cgroup_subsys_state *css,
1433− struct cgroup_taskset *tset)
1432+static int cpuset_can_attach(struct cgroup_taskset *tset)
14341433 {
1435− struct cpuset *cs = css_cs(css);
1434+ struct cgroup_subsys_state *css;
1435+ struct cpuset *cs;
14361436 struct task_struct *task;
14371437 int ret;
14381438
14391439 /* used later by cpuset_attach() */
1440− cpuset_attach_old_cs = task_cs(cgroup_taskset_first(tset));
1440+ cpuset_attach_old_cs = task_cs(cgroup_taskset_first(tset, &css));
1441+ cs = css_cs(css);
14411442
14421443 mutex_lock(&cpuset_mutex);
14431444
@@ -1447,7 +1448,7 @@ static int cpuset_can_attach(struct cgroup_subsys_state *css, · 3 unmodified lines
14471448 (cpumask_empty(cs->cpus_allowed) || nodes_empty(cs->mems_allowed)))
14481449 goto out_unlock;
14491450
1450− cgroup_taskset_for_each(task, tset) {
1451+ cgroup_taskset_for_each(task, css, tset) {
14511452 ret = task_can_attach(task, cs->cpus_allowed);
14521453 if (ret)
14531454 goto out_unlock;
@@ -1467,9 +1468,14 @@ out_unlock: · 13 unmodified lines
14671468 return ret;
14681469 }
14691470
1470−static void cpuset_cancel_attach(struct cgroup_subsys_state *css,
1471− struct cgroup_taskset *tset)
1471+static void cpuset_cancel_attach(struct cgroup_taskset *tset)
14721472 {
1473+ struct cgroup_subsys_state *css;
1474+ struct cpuset *cs;
1475+
1476+ cgroup_taskset_first(tset, &css);
1477+ cs = css_cs(css);
1478+
14731479 mutex_lock(&cpuset_mutex);
14741480 css_cs(css)->attach_in_progress--;
14751481 mutex_unlock(&cpuset_mutex);
@@ -1482,16 +1488,19 @@ static void cpuset_cancel_attach(struct cgroup_subsys_state *css, · 6 unmodified lines
14821488 */
14831489 static cpumask_var_t cpus_attach;
14841490
1485−static void cpuset_attach(struct cgroup_subsys_state *css,
1486− struct cgroup_taskset *tset)
1491+static void cpuset_attach(struct cgroup_taskset *tset)
14871492 {
14881493 /* static buf protected by cpuset_mutex */
14891494 static nodemask_t cpuset_attach_nodemask_to;
14901495 struct task_struct *task;
14911496 struct task_struct *leader;
1492− struct cpuset *cs = css_cs(css);
1497+ struct cgroup_subsys_state *css;
1498+ struct cpuset *cs;
14931499 struct cpuset *oldcs = cpuset_attach_old_cs;
14941500
1501+ cgroup_taskset_first(tset, &css);
1502+ cs = css_cs(css);
1503+
14951504 mutex_lock(&cpuset_mutex);
14961505
14971506 /* prepare for attach */
@@ -1502,7 +1511,7 @@ static void cpuset_attach(struct cgroup_subsys_state *css, · 4 unmodified lines
15021511
15031512 guarantee_online_mems(cs, &cpuset_attach_nodemask_to);
15041513
1505− cgroup_taskset_for_each(task, tset) {
1514+ cgroup_taskset_for_each(task, css, tset) {
15061515 /*
15071516 * can_attach beforehand should guarantee that this doesn't
15081517 * fail. TODO: have a better way to handle failure here
@@ -1518,7 +1527,7 @@ static void cpuset_attach(struct cgroup_subsys_state *css, · 9 unmodified lines
15181527 * sleep and should be moved outside migration path proper.
15191528 */
15201529 cpuset_attach_nodemask_to = cs->effective_mems;
1521− cgroup_taskset_for_each_leader(leader, tset) {
1530+ cgroup_taskset_for_each_leader(leader, css, tset) {
15221531 struct mm_struct *mm = get_task_mm(leader);
15231532
15241533 if (mm) {
kernel/events/callchain.c+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 *
44 * Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
55 * Copyright (C) 2008-2011 Red Hat, Inc., Ingo Molnar
6− * Copyright (C) 2008-2011 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
6+ * Copyright (C) 2008-2011 Red Hat, Inc., Peter Zijlstra
77 * Copyright � 2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com>
88 *
99 * For licensing details see kernel-base/COPYING
kernel/events/core.c+64−26
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 *
44 * Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
55 * Copyright (C) 2008-2011 Red Hat, Inc., Ingo Molnar
6− * Copyright (C) 2008-2011 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
6+ * Copyright (C) 2008-2011 Red Hat, Inc., Peter Zijlstra
77 * Copyright © 2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com>
88 *
99 * For licensing details see kernel-base/COPYING
@@ -435,7 +435,7 @@ static inline void update_cgrp_time_from_event(struct perf_event *event) · 425 unmodified lines
435435 if (!is_cgroup_event(event))
436436 return;
437437
438− cgrp = perf_cgroup_from_task(current);
438+ cgrp = perf_cgroup_from_task(current, event->ctx);
439439 /*
440440 * Do not update time when cgroup is not active
441441 */
@@ -458,7 +458,7 @@ perf_cgroup_set_timestamp(struct task_struct *task, · 16 unmodified lines
458458 if (!task || !ctx->nr_cgroups)
459459 return;
460460
461− cgrp = perf_cgroup_from_task(task);
461+ cgrp = perf_cgroup_from_task(task, ctx);
462462 info = this_cpu_ptr(cgrp->info);
463463 info->timestamp = ctx->timestamp;
464464 }
@@ -489,7 +489,6 @@ static void perf_cgroup_switch(struct task_struct *task, int mode) · 24 unmodified lines
489489 * we reschedule only in the presence of cgroup
490490 * constrained events.
491491 */
492− rcu_read_lock();
493492
494493 list_for_each_entry_rcu(pmu, &pmus, entry) {
495494 cpuctx = this_cpu_ptr(pmu->pmu_cpu_context);
@@ -522,8 +521,10 @@ static void perf_cgroup_switch(struct task_struct *task, int mode) · 26 unmodified lines
522521 * set cgrp before ctxsw in to allow
523522 * event_filter_match() to not have to pass
524523 * task around
524+ * we pass the cpuctx->ctx to perf_cgroup_from_task()
525+ * because cgorup events are only per-cpu
525526 */
526− cpuctx->cgrp = perf_cgroup_from_task(task);
527+ cpuctx->cgrp = perf_cgroup_from_task(task, &cpuctx->ctx);
527528 cpu_ctx_sched_in(cpuctx, EVENT_ALL, task);
528529 }
529530 perf_pmu_enable(cpuctx->ctx.pmu);
@@ -531,8 +532,6 @@ static void perf_cgroup_switch(struct task_struct *task, int mode) · 1 unmodified line
531532 }
532533 }
533534
534− rcu_read_unlock();
535−
536535 local_irq_restore(flags);
537536 }
538537
@@ -542,17 +541,20 @@ static inline void perf_cgroup_sched_out(struct task_struct *task, · 3 unmodified lines
542541 struct perf_cgroup *cgrp1;
543542 struct perf_cgroup *cgrp2 = NULL;
544543
544+ rcu_read_lock();
545545 /*
546546 * we come here when we know perf_cgroup_events > 0
547+ * we do not need to pass the ctx here because we know
548+ * we are holding the rcu lock
547549 */
548− cgrp1 = perf_cgroup_from_task(task);
550+ cgrp1 = perf_cgroup_from_task(task, NULL);
549551
550552 /*
551553 * next is NULL when called from perf_event_enable_on_exec()
552554 * that will systematically cause a cgroup_switch()
553555 */
554556 if (next)
555− cgrp2 = perf_cgroup_from_task(next);
557+ cgrp2 = perf_cgroup_from_task(next, NULL);
556558
557559 /*
558560 * only schedule out current cgroup events if we know
@@ -561,6 +563,8 @@ static inline void perf_cgroup_sched_out(struct task_struct *task, · 2 unmodified lines
561563 */
562564 if (cgrp1 != cgrp2)
563565 perf_cgroup_switch(task, PERF_CGROUP_SWOUT);
566+
567+ rcu_read_unlock();
564568 }
565569
566570 static inline void perf_cgroup_sched_in(struct task_struct *prev,
@@ -569,13 +573,16 @@ static inline void perf_cgroup_sched_in(struct task_struct *prev, · 2 unmodified lines
569573 struct perf_cgroup *cgrp1;
570574 struct perf_cgroup *cgrp2 = NULL;
571575
576+ rcu_read_lock();
572577 /*
573578 * we come here when we know perf_cgroup_events > 0
579+ * we do not need to pass the ctx here because we know
580+ * we are holding the rcu lock
574581 */
575− cgrp1 = perf_cgroup_from_task(task);
582+ cgrp1 = perf_cgroup_from_task(task, NULL);
576583
577584 /* prev can never be NULL */
578− cgrp2 = perf_cgroup_from_task(prev);
585+ cgrp2 = perf_cgroup_from_task(prev, NULL);
579586
580587 /*
581588 * only need to schedule in cgroup events if we are changing
@@ -584,6 +591,8 @@ static inline void perf_cgroup_sched_in(struct task_struct *prev, · 2 unmodified lines
584591 */
585592 if (cgrp1 != cgrp2)
586593 perf_cgroup_switch(task, PERF_CGROUP_SWIN);
594+
595+ rcu_read_unlock();
587596 }
588597
589598 static inline int perf_cgroup_connect(int fd, struct perf_event *event,
@@ -4216,7 +4225,14 @@ retry: · 3626 unmodified lines
42164225 goto retry;
42174226 }
42184227
4219− __perf_event_period(&pe);
4228+ if (event->attr.freq) {
4229+ event->attr.sample_freq = value;
4230+ } else {
4231+ event->attr.sample_period = value;
4232+ event->hw.sample_period = value;
4233+ }
4234+
4235+ local64_set(&event->hw.period_left, 0);
42204236 raw_spin_unlock_irq(&ctx->lock);
42214237
42224238 return 0;
@@ -5666,6 +5682,17 @@ perf_event_aux_ctx(struct perf_event_context *ctx, · 1443 unmodified lines
56665682 }
56675683 }
56685684
5685+static void
5686+perf_event_aux_task_ctx(perf_event_aux_output_cb output, void *data,
5687+ struct perf_event_context *task_ctx)
5688+{
5689+ rcu_read_lock();
5690+ preempt_disable();
5691+ perf_event_aux_ctx(task_ctx, output, data);
5692+ preempt_enable();
5693+ rcu_read_unlock();
5694+}
5695+
56695696 static void
56705697 perf_event_aux(perf_event_aux_output_cb output, void *data,
56715698 struct perf_event_context *task_ctx)
@@ -5675,14 +5702,23 @@ perf_event_aux(perf_event_aux_output_cb output, void *data, · 3 unmodified lines
56755702 struct pmu *pmu;
56765703 int ctxn;
56775704
5705+ /*
5706+ * If we have task_ctx != NULL we only notify
5707+ * the task context itself. The task_ctx is set
5708+ * only for EXIT events before releasing task
5709+ * context.
5710+ */
5711+ if (task_ctx) {
5712+ perf_event_aux_task_ctx(output, data, task_ctx);
5713+ return;
5714+ }
5715+
56785716 rcu_read_lock();
56795717 list_for_each_entry_rcu(pmu, &pmus, entry) {
56805718 cpuctx = get_cpu_ptr(pmu->pmu_cpu_context);
56815719 if (cpuctx->unique_pmu != pmu)
56825720 goto next;
56835721 perf_event_aux_ctx(&cpuctx->ctx, output, data);
5684− if (task_ctx)
5685− goto next;
56865722 ctxn = pmu->task_ctx_nr;
56875723 if (ctxn < 0)
56885724 goto next;
@@ -5692,12 +5728,6 @@ perf_event_aux(perf_event_aux_output_cb output, void *data, · 3 unmodified lines
56925728 next:
56935729 put_cpu_ptr(pmu->pmu_cpu_context);
56945730 }
5695−
5696− if (task_ctx) {
5697− preempt_disable();
5698− perf_event_aux_ctx(task_ctx, output, data);
5699− preempt_enable();
5700− }
57015731 rcu_read_unlock();
57025732 }
57035733
@@ -8787,10 +8817,8 @@ static void perf_event_exit_task_context(struct task_struct *child, int ctxn) · 3083 unmodified lines
87878817 struct perf_event_context *child_ctx, *clone_ctx = NULL;
87888818 unsigned long flags;
87898819
8790− if (likely(!child->perf_event_ctxp[ctxn])) {
8791− perf_event_task(child, NULL, 0);
8820+ if (likely(!child->perf_event_ctxp[ctxn]))
87928821 return;
8793− }
87948822
87958823 local_irq_save(flags);
87968824 /*
@@ -8874,6 +8902,14 @@ void perf_event_exit_task(struct task_struct *child) · 77 unmodified lines
88748902
88758903 for_each_task_context_nr(ctxn)
88768904 perf_event_exit_task_context(child, ctxn);
8905+
8906+ /*
8907+ * The perf_event_exit_task_context calls perf_event_task
8908+ * with child's task_ctx, which generates EXIT events for
8909+ * child contexts and sets child->perf_event_ctxp[] to NULL.
8910+ * At this point we need to send EXIT events to cpu contexts.
8911+ */
8912+ perf_event_task(child, NULL, 0);
88778913 }
88788914
88798915 static void perf_free_event(struct perf_event *event,
@@ -9452,16 +9488,18 @@ static void perf_cgroup_css_free(struct cgroup_subsys_state *css) · 572 unmodified lines
94529488 static int __perf_cgroup_move(void *info)
94539489 {
94549490 struct task_struct *task = info;
9491+ rcu_read_lock();
94559492 perf_cgroup_switch(task, PERF_CGROUP_SWOUT | PERF_CGROUP_SWIN);
9493+ rcu_read_unlock();
94569494 return 0;
94579495 }
94589496
9459−static void perf_cgroup_attach(struct cgroup_subsys_state *css,
9460− struct cgroup_taskset *tset)
9497+static void perf_cgroup_attach(struct cgroup_taskset *tset)
94619498 {
94629499 struct task_struct *task;
9500+ struct cgroup_subsys_state *css;
94639501
9464− cgroup_taskset_for_each(task, tset)
9502+ cgroup_taskset_for_each(task, css, tset)
94659503 task_function_call(task, __perf_cgroup_move, task);
94669504 }
94679505
kernel/events/ring_buffer.c+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 *
44 * Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
55 * Copyright (C) 2008-2011 Red Hat, Inc., Ingo Molnar
6− * Copyright (C) 2008-2011 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
6+ * Copyright (C) 2008-2011 Red Hat, Inc., Peter Zijlstra
77 * Copyright © 2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com>
88 *
99 * For licensing details see kernel-base/COPYING
kernel/events/uprobes.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 * Authors:
2020 * Srikar Dronamraju
2121 * Jim Keniston
22− * Copyright (C) 2011-2012 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
22+ * Copyright (C) 2011-2012 Red Hat, Inc., Peter Zijlstra
2323 */
2424
2525 #include <linux/kernel.h>
kernel/fork.c+3−6
@@ -1368,8 +1368,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, · 1367 unmodified lines
13681368 p->real_start_time = ktime_get_boot_ns();
13691369 p->io_context = NULL;
13701370 p->audit_context = NULL;
1371− if (clone_flags & CLONE_THREAD)
1372− threadgroup_change_begin(current);
1371+ threadgroup_change_begin(current);
13731372 cgroup_fork(p);
13741373 #ifdef CONFIG_NUMA
13751374 p->mempolicy = mpol_dup(p->mempolicy);
@@ -1610,8 +1609,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, · 234 unmodified lines
16101609
16111610 proc_fork_connector(p);
16121611 cgroup_post_fork(p, cgrp_ss_priv);
1613− if (clone_flags & CLONE_THREAD)
1614− threadgroup_change_end(current);
1612+ threadgroup_change_end(current);
16151613 perf_event_fork(p);
16161614
16171615 trace_task_newtask(p, clone_flags);
@@ -1652,8 +1650,7 @@ bad_fork_cleanup_policy: · 34 unmodified lines
16521650 mpol_put(p->mempolicy);
16531651 bad_fork_cleanup_threadgroup_lock:
16541652 #endif
1655− if (clone_flags & CLONE_THREAD)
1656− threadgroup_change_end(current);
1653+ threadgroup_change_end(current);
16571654 delayacct_tsk_free(p);
16581655 bad_fork_cleanup_count:
16591656 atomic_dec(&p->cred->user->processes);
kernel/irq_work.c+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (C) 2010 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
2+ * Copyright (C) 2010 Red Hat, Inc., Peter Zijlstra
33 *
44 * Provides a framework for enqueueing and running callbacks from hardirq
55 * context. The enqueueing is NMI-safe.
kernel/jump_label.c+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
22 * jump label support
33 *
44 * Copyright (C) 2009 Jason Baron <jbaron@redhat.com>
5− * Copyright (C) 2011 Peter Zijlstra <pzijlstr@redhat.com>
5+ * Copyright (C) 2011 Peter Zijlstra
66 *
77 */
88 #include <linux/memory.h>
kernel/locking/lockdep.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 * Started by Ingo Molnar:
77 *
88 * Copyright (C) 2006,2007 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
9− * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
9+ * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra
1010 *
1111 * this code maps all the lock dependencies as they occur in a live kernel
1212 * and will warn about the following classes of locking bugs:
kernel/locking/lockdep_proc.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 * Started by Ingo Molnar:
77 *
88 * Copyright (C) 2006,2007 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
9− * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
9+ * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra
1010 *
1111 * Code for /proc/lockdep and /proc/lockdep_stats:
1212 *
kernel/locking/osq_lock.c+5−3
@@ -93,10 +93,12 @@ bool osq_lock(struct optimistic_spin_queue *lock) · 92 unmodified lines
9393 node->cpu = curr;
9494
9595 /*
96− * ACQUIRE semantics, pairs with corresponding RELEASE
97− * in unlock() uncontended, or fastpath.
96+ * We need both ACQUIRE (pairs with corresponding RELEASE in
97+ * unlock() uncontended, or fastpath) and RELEASE (to publish
98+ * the node fields we just initialised) semantics when updating
99+ * the lock tail.
98100 */
99− old = atomic_xchg_acquire(&lock->tail, curr);
101+ old = atomic_xchg(&lock->tail, curr);
100102 if (old == OSQ_UNLOCKED_VAL)
101103 return true;
102104
kernel/sched/clock.c+1−1
@@ -1,7 +1,7 @@
11 /*
22 * sched_clock for unstable cpu clocks
33 *
4− * Copyright (C) 2008 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
4+ * Copyright (C) 2008 Red Hat, Inc., Peter Zijlstra
55 *
66 * Updates and enhancements:
77 * Copyright (C) 2008 Red Hat, Inc. Steven Rostedt <srostedt@redhat.com>
kernel/sched/core.c+6−6
@@ -8241,12 +8241,12 @@ static void cpu_cgroup_fork(struct task_struct *task, void *private) · 8240 unmodified lines
82418241 sched_move_task(task);
82428242 }
82438243
8244−static int cpu_cgroup_can_attach(struct cgroup_subsys_state *css,
8245− struct cgroup_taskset *tset)
8244+static int cpu_cgroup_can_attach(struct cgroup_taskset *tset)
82468245 {
82478246 struct task_struct *task;
8247+ struct cgroup_subsys_state *css;
82488248
8249− cgroup_taskset_for_each(task, tset) {
8249+ cgroup_taskset_for_each(task, css, tset) {
82508250 #ifdef CONFIG_RT_GROUP_SCHED
82518251 if (!sched_rt_can_attach(css_tg(css), task))
82528252 return -EINVAL;
@@ -8259,12 +8259,12 @@ static int cpu_cgroup_can_attach(struct cgroup_subsys_state *css, · 6 unmodified lines
82598259 return 0;
82608260 }
82618261
8262−static void cpu_cgroup_attach(struct cgroup_subsys_state *css,
8263− struct cgroup_taskset *tset)
8262+static void cpu_cgroup_attach(struct cgroup_taskset *tset)
82648263 {
82658264 struct task_struct *task;
8265+ struct cgroup_subsys_state *css;
82668266
8267− cgroup_taskset_for_each(task, tset)
8267+ cgroup_taskset_for_each(task, css, tset)
82688268 sched_move_task(task);
82698269 }
82708270
kernel/sched/fair.c+1−1
@@ -17,7 +17,7 @@ · 16 unmodified lines
1717 * Copyright (C) 2007, Thomas Gleixner <tglx@linutronix.de>
1818 *
1919 * Adaptive scheduling granularity, math enhancements by Peter Zijlstra
20− * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
20+ * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra
2121 */
2222
2323 #include <linux/latencytop.h>
kernel/sched/wait.c+10−10
@@ -392,7 +392,7 @@ __wait_on_bit(wait_queue_head_t *wq, struct wait_bit_queue *q, · 391 unmodified lines
392392 do {
393393 prepare_to_wait(wq, &q->wait, mode);
394394 if (test_bit(q->key.bit_nr, q->key.flags))
395− ret = (*action)(&q->key);
395+ ret = (*action)(&q->key, mode);
396396 } while (test_bit(q->key.bit_nr, q->key.flags) && !ret);
397397 finish_wait(wq, &q->wait);
398398 return ret;
@@ -431,7 +431,7 @@ __wait_on_bit_lock(wait_queue_head_t *wq, struct wait_bit_queue *q, · 32 unmodified lines
431431 prepare_to_wait_exclusive(wq, &q->wait, mode);
432432 if (!test_bit(q->key.bit_nr, q->key.flags))
433433 continue;
434− ret = action(&q->key);
434+ ret = action(&q->key, mode);
435435 if (!ret)
436436 continue;
437437 abort_exclusive_wait(wq, &q->wait, mode, &q->key);
@@ -581,43 +581,43 @@ void wake_up_atomic_t(atomic_t *p) · 143 unmodified lines
581581 }
582582 EXPORT_SYMBOL(wake_up_atomic_t);
583583
584−__sched int bit_wait(struct wait_bit_key *word)
584+__sched int bit_wait(struct wait_bit_key *word, int mode)
585585 {
586586 schedule();
587− if (signal_pending(current))
587+ if (signal_pending_state(mode, current))
588588 return -EINTR;
589589 return 0;
590590 }
591591 EXPORT_SYMBOL(bit_wait);
592592
593−__sched int bit_wait_io(struct wait_bit_key *word)
593+__sched int bit_wait_io(struct wait_bit_key *word, int mode)
594594 {
595595 io_schedule();
596− if (signal_pending(current))
596+ if (signal_pending_state(mode, current))
597597 return -EINTR;
598598 return 0;
599599 }
600600 EXPORT_SYMBOL(bit_wait_io);
601601
602−__sched int bit_wait_timeout(struct wait_bit_key *word)
602+__sched int bit_wait_timeout(struct wait_bit_key *word, int mode)
603603 {
604604 unsigned long now = READ_ONCE(jiffies);
605605 if (time_after_eq(now, word->timeout))
606606 return -EAGAIN;
607607 schedule_timeout(word->timeout - now);
608− if (signal_pending(current))
608+ if (signal_pending_state(mode, current))
609609 return -EINTR;
610610 return 0;
611611 }
612612 EXPORT_SYMBOL_GPL(bit_wait_timeout);
613613
614−__sched int bit_wait_io_timeout(struct wait_bit_key *word)
614+__sched int bit_wait_io_timeout(struct wait_bit_key *word, int mode)
615615 {
616616 unsigned long now = READ_ONCE(jiffies);
617617 if (time_after_eq(now, word->timeout))
618618 return -EAGAIN;
619619 io_schedule_timeout(word->timeout - now);
620− if (signal_pending(current))
620+ if (signal_pending_state(mode, current))
621621 return -EINTR;
622622 return 0;
623623 }
kernel/stop_machine.c+2−2
@@ -531,7 +531,7 @@ static int __init cpu_stop_init(void) · 530 unmodified lines
531531 }
532532 early_initcall(cpu_stop_init);
533533
534−#ifdef CONFIG_STOP_MACHINE
534+#if defined(CONFIG_SMP) || defined(CONFIG_HOTPLUG_CPU)
535535
536536 static int __stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus)
537537 {
@@ -631,4 +631,4 @@ int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data, · 93 unmodified lines
631631 return ret ?: done.ret;
632632 }
633633
634−#endif /* CONFIG_STOP_MACHINE */
634+#endif /* CONFIG_SMP || CONFIG_HOTPLUG_CPU */
kernel/trace/trace_event_perf.c+1−1
@@ -1,7 +1,7 @@
11 /*
22 * trace event based perf event profiling/tracing
33 *
4− * Copyright (C) 2009 Red Hat Inc, Peter Zijlstra <pzijlstr@redhat.com>
4+ * Copyright (C) 2009 Red Hat Inc, Peter Zijlstra
55 * Copyright (C) 2009-2010 Frederic Weisbecker <fweisbec@gmail.com>
66 */
77
lib/btree.c+1−1
@@ -5,7 +5,7 @@ · 4 unmodified lines
55 *
66 * Copyright (c) 2007-2008 Joern Engel <joern@logfs.org>
77 * Bits and pieces stolen from Peter Zijlstra's code, which is
8− * Copyright 2007, Red Hat Inc. Peter Zijlstra <pzijlstr@redhat.com>
8+ * Copyright 2007, Red Hat Inc. Peter Zijlstra
99 * GPLv2
1010 *
1111 * see http://programming.kicks-ass.net/kernel-patches/vma_lookup/btree.patch
lib/dma-debug.c+2−2
@@ -1464,7 +1464,7 @@ void debug_dma_alloc_coherent(struct device *dev, size_t size, · 1463 unmodified lines
14641464 entry->type = dma_debug_coherent;
14651465 entry->dev = dev;
14661466 entry->pfn = page_to_pfn(virt_to_page(virt));
1467− entry->offset = (size_t) virt & PAGE_MASK;
1467+ entry->offset = (size_t) virt & ~PAGE_MASK;
14681468 entry->size = size;
14691469 entry->dev_addr = dma_addr;
14701470 entry->direction = DMA_BIDIRECTIONAL;
@@ -1480,7 +1480,7 @@ void debug_dma_free_coherent(struct device *dev, size_t size, · 9 unmodified lines
14801480 .type = dma_debug_coherent,
14811481 .dev = dev,
14821482 .pfn = page_to_pfn(virt_to_page(virt)),
1483− .offset = (size_t) virt & PAGE_MASK,
1483+ .offset = (size_t) virt & ~PAGE_MASK,
14841484 .dev_addr = addr,
14851485 .size = size,
14861486 .direction = DMA_BIDIRECTIONAL,
lib/proportions.c+1−1
@@ -1,7 +1,7 @@
11 /*
22 * Floating proportions
33 *
4− * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
4+ * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra
55 *
66 * Description:
77 *
lib/rhashtable.c+40−27
@@ -389,33 +389,31 @@ static bool rhashtable_check_elasticity(struct rhashtable *ht, · 388 unmodified lines
389389 return false;
390390 }
391391
392−int rhashtable_insert_rehash(struct rhashtable *ht)
392+int rhashtable_insert_rehash(struct rhashtable *ht,
393+ struct bucket_table *tbl)
393394 {
394395 struct bucket_table *old_tbl;
395396 struct bucket_table *new_tbl;
396− struct bucket_table *tbl;
397397 unsigned int size;
398398 int err;
399399
400400 old_tbl = rht_dereference_rcu(ht->tbl, ht);
401− tbl = rhashtable_last_table(ht, old_tbl);
402401
403402 size = tbl->size;
404403
404+ err = -EBUSY;
405+
405406 if (rht_grow_above_75(ht, tbl))
406407 size *= 2;
407408 /* Do not schedule more than one rehash */
408409 else if (old_tbl != tbl)
409− return -EBUSY;
410+ goto fail;
411+
412+ err = -ENOMEM;
410413
411414 new_tbl = bucket_table_alloc(ht, size, GFP_ATOMIC);
412− if (new_tbl == NULL) {
413− /* Schedule async resize/rehash to try allocation
414− * non-atomic context.
415− */
416− schedule_work(&ht->run_work);
417− return -ENOMEM;
418− }
415+ if (new_tbl == NULL)
416+ goto fail;
419417
420418 err = rhashtable_rehash_attach(ht, tbl, new_tbl);
421419 if (err) {
@@ -426,12 +424,24 @@ int rhashtable_insert_rehash(struct rhashtable *ht) · 4 unmodified lines
426424 schedule_work(&ht->run_work);
427425
428426 return err;
427+
428+fail:
429+ /* Do not fail the insert if someone else did a rehash. */
430+ if (likely(rcu_dereference_raw(tbl->future_tbl)))
431+ return 0;
432+
433+ /* Schedule async rehash to retry allocation in process context. */
434+ if (err == -ENOMEM)
435+ schedule_work(&ht->run_work);
436+
437+ return err;
429438 }
430439 EXPORT_SYMBOL_GPL(rhashtable_insert_rehash);
431440
432−int rhashtable_insert_slow(struct rhashtable *ht, const void *key,
433− struct rhash_head *obj,
434− struct bucket_table *tbl)
441+struct bucket_table *rhashtable_insert_slow(struct rhashtable *ht,
442+ const void *key,
443+ struct rhash_head *obj,
444+ struct bucket_table *tbl)
435445 {
436446 struct rhash_head *head;
437447 unsigned int hash;
@@ -467,7 +477,12 @@ int rhashtable_insert_slow(struct rhashtable *ht, const void *key, · 29 unmodified lines
467477 exit:
468478 spin_unlock(rht_bucket_lock(tbl, hash));
469479
470− return err;
480+ if (err == 0)
481+ return NULL;
482+ else if (err == -EAGAIN)
483+ return tbl;
484+ else
485+ return ERR_PTR(err);
471486 }
472487 EXPORT_SYMBOL_GPL(rhashtable_insert_slow);
473488
@@ -503,10 +518,10 @@ int rhashtable_walk_init(struct rhashtable *ht, struct rhashtable_iter *iter) · 29 unmodified lines
503518 if (!iter->walker)
504519 return -ENOMEM;
505520
506− mutex_lock(&ht->mutex);
521+ spin_lock(&ht->lock);
507522 iter->walker->tbl = rht_dereference(ht->tbl, ht);
508523 list_add(&iter->walker->list, &iter->walker->tbl->walkers);
509− mutex_unlock(&ht->mutex);
524+ spin_unlock(&ht->lock);
510525
511526 return 0;
512527 }
@@ -520,10 +535,10 @@ EXPORT_SYMBOL_GPL(rhashtable_walk_init); · 7 unmodified lines
520535 */
521536 void rhashtable_walk_exit(struct rhashtable_iter *iter)
522537 {
523− mutex_lock(&iter->ht->mutex);
538+ spin_lock(&iter->ht->lock);
524539 if (iter->walker->tbl)
525540 list_del(&iter->walker->list);
526− mutex_unlock(&iter->ht->mutex);
541+ spin_unlock(&iter->ht->lock);
527542 kfree(iter->walker);
528543 }
529544 EXPORT_SYMBOL_GPL(rhashtable_walk_exit);
@@ -547,14 +562,12 @@ int rhashtable_walk_start(struct rhashtable_iter *iter) · 17 unmodified lines
547562 {
548563 struct rhashtable *ht = iter->ht;
549564
550− mutex_lock(&ht->mutex);
565+ rcu_read_lock();
551566
567+ spin_lock(&ht->lock);
552568 if (iter->walker->tbl)
553569 list_del(&iter->walker->list);
554−
555− rcu_read_lock();
556−
557− mutex_unlock(&ht->mutex);
570+ spin_unlock(&ht->lock);
558571
559572 if (!iter->walker->tbl) {
560573 iter->walker->tbl = rht_dereference_rcu(ht->tbl, ht);
@@ -723,9 +736,6 @@ int rhashtable_init(struct rhashtable *ht, · 162 unmodified lines
723736 if (params->nulls_base && params->nulls_base < (1U << RHT_BASE_SHIFT))
724737 return -EINVAL;
725738
726− if (params->nelem_hint)
727− size = rounded_hashtable_size(params);
728−
729739 memset(ht, 0, sizeof(*ht));
730740 mutex_init(&ht->mutex);
731741 spin_lock_init(&ht->lock);
@@ -745,6 +755,9 @@ int rhashtable_init(struct rhashtable *ht, · 13 unmodified lines
745755
746756 ht->p.min_size = max(ht->p.min_size, HASH_MIN_SIZE);
747757
758+ if (params->nelem_hint)
759+ size = rounded_hashtable_size(&ht->p);
760+
748761 /* The maximum (not average) chain length grows with the
749762 * size of the hash table, at a rate of (log N)/(log log N).
750763 * The value of 16 is selected so that even if the hash
mm/backing-dev.c+16−3
@@ -957,8 +957,9 @@ EXPORT_SYMBOL(congestion_wait); · 956 unmodified lines
957957 * jiffies for either a BDI to exit congestion of the given @sync queue
958958 * or a write to complete.
959959 *
960− * In the absence of zone congestion, cond_resched() is called to yield
961− * the processor if necessary but otherwise does not sleep.
960+ * In the absence of zone congestion, a short sleep or a cond_resched is
961+ * performed to yield the processor and to allow other subsystems to make
962+ * a forward progress.
962963 *
963964 * The return value is 0 if the sleep is for the full timeout. Otherwise,
964965 * it is the number of jiffies that were still remaining when the function
@@ -978,7 +979,19 @@ long wait_iff_congested(struct zone *zone, int sync, long timeout) · 13 unmodified lines
978979 */
979980 if (atomic_read(&nr_wb_congested[sync]) == 0 ||
980981 !test_bit(ZONE_CONGESTED, &zone->flags)) {
981− cond_resched();
982+
983+ /*
984+ * Memory allocation/reclaim might be called from a WQ
985+ * context and the current implementation of the WQ
986+ * concurrency control doesn't recognize that a particular
987+ * WQ is congested if the worker thread is looping without
988+ * ever sleeping. Therefore we have to do a short sleep
989+ * here rather than calling cond_resched().
990+ */
991+ if (current->flags & PF_WQ_WORKER)
992+ schedule_timeout(1);
993+ else
994+ cond_resched();
982995
983996 /* In case we scheduled, work out time remaining */
984997 ret = timeout - (jiffies - start);
mm/hugetlb.c+20−7
@@ -372,8 +372,10 @@ retry_locked: · 371 unmodified lines
372372 spin_unlock(&resv->lock);
373373
374374 trg = kmalloc(sizeof(*trg), GFP_KERNEL);
375− if (!trg)
375+ if (!trg) {
376+ kfree(nrg);
376377 return -ENOMEM;
378+ }
377379
378380 spin_lock(&resv->lock);
379381 list_add(&trg->link, &resv->region_cache);
@@ -483,8 +485,16 @@ static long region_del(struct resv_map *resv, long f, long t) · 103 unmodified lines
483485 retry:
484486 spin_lock(&resv->lock);
485487 list_for_each_entry_safe(rg, trg, head, link) {
486− if (rg->to <= f)
488+ /*
489+ * Skip regions before the range to be deleted. file_region
490+ * ranges are normally of the form [from, to). However, there
491+ * may be a "placeholder" entry in the map which is of the form
492+ * (from, to) with from == to. Check for placeholder entries
493+ * at the beginning of the range to be deleted.
494+ */
495+ if (rg->to <= f && (rg->to != rg->from || rg->to != f))
487496 continue;
497+
488498 if (rg->from >= t)
489499 break;
490500
@@ -1886,7 +1896,10 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, · 1395 unmodified lines
18861896 page = __alloc_buddy_huge_page_with_mpol(h, vma, addr);
18871897 if (!page)
18881898 goto out_uncharge_cgroup;
1889−
1899+ if (!avoid_reserve && vma_has_reserves(vma, gbl_chg)) {
1900+ SetPagePrivate(page);
1901+ h->resv_huge_pages--;
1902+ }
18901903 spin_lock(&hugetlb_lock);
18911904 list_move(&page->lru, &h->hugepage_activelist);
18921905 /* Fall through */
@@ -3693,12 +3706,12 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, · 1800 unmodified lines
36933706 } else if (unlikely(is_hugetlb_entry_hwpoisoned(entry)))
36943707 return VM_FAULT_HWPOISON_LARGE |
36953708 VM_FAULT_SET_HINDEX(hstate_index(h));
3709+ } else {
3710+ ptep = huge_pte_alloc(mm, address, huge_page_size(h));
3711+ if (!ptep)
3712+ return VM_FAULT_OOM;
36963713 }
36973714
3698− ptep = huge_pte_alloc(mm, address, huge_page_size(h));
3699− if (!ptep)
3700− return VM_FAULT_OOM;
3701−
37023715 mapping = vma->vm_file->f_mapping;
37033716 idx = vma_hugecache_offset(h, vma, address);
37043717
mm/memcontrol.c+25−24
@@ -2128,7 +2128,7 @@ done_restock: · 2127 unmodified lines
21282128 */
21292129 do {
21302130 if (page_counter_read(&memcg->memory) > memcg->high) {
2131− current->memcg_nr_pages_over_high += nr_pages;
2131+ current->memcg_nr_pages_over_high += batch;
21322132 set_notify_resume(current);
21332133 break;
21342134 }
@@ -4779,23 +4779,18 @@ static void mem_cgroup_clear_mc(void) · 2644 unmodified lines
47794779 spin_unlock(&mc.lock);
47804780 }
47814781
4782−static int mem_cgroup_can_attach(struct cgroup_subsys_state *css,
4783− struct cgroup_taskset *tset)
4782+static int mem_cgroup_can_attach(struct cgroup_taskset *tset)
47844783 {
4785− struct mem_cgroup *memcg = mem_cgroup_from_css(css);
4784+ struct cgroup_subsys_state *css;
4785+ struct mem_cgroup *memcg;
47864786 struct mem_cgroup *from;
47874787 struct task_struct *leader, *p;
47884788 struct mm_struct *mm;
47894789 unsigned long move_flags;
47904790 int ret = 0;
47914791
4792− /*
4793− * We are now commited to this value whatever it is. Changes in this
4794− * tunable will only affect upcoming migrations, not the current one.
4795− * So we need to save it, and keep it going.
4796− */
4797− move_flags = READ_ONCE(memcg->move_charge_at_immigrate);
4798− if (!move_flags)
4792+ /* charge immigration isn't supported on the default hierarchy */
4793+ if (cgroup_subsys_on_dfl(memory_cgrp_subsys))
47994794 return 0;
48004795
48014796 /*
@@ -4805,13 +4800,23 @@ static int mem_cgroup_can_attach(struct cgroup_subsys_state *css, · 3 unmodified lines
48054800 * multiple.
48064801 */
48074802 p = NULL;
4808− cgroup_taskset_for_each_leader(leader, tset) {
4803+ cgroup_taskset_for_each_leader(leader, css, tset) {
48094804 WARN_ON_ONCE(p);
48104805 p = leader;
4806+ memcg = mem_cgroup_from_css(css);
48114807 }
48124808 if (!p)
48134809 return 0;
48144810
4811+ /*
4812+ * We are now commited to this value whatever it is. Changes in this
4813+ * tunable will only affect upcoming migrations, not the current one.
4814+ * So we need to save it, and keep it going.
4815+ */
4816+ move_flags = READ_ONCE(memcg->move_charge_at_immigrate);
4817+ if (!move_flags)
4818+ return 0;
4819+
48154820 from = mem_cgroup_from_task(p);
48164821
48174822 VM_BUG_ON(from == memcg);
@@ -4842,8 +4847,7 @@ static int mem_cgroup_can_attach(struct cgroup_subsys_state *css, · 24 unmodified lines
48424847 return ret;
48434848 }
48444849
4845−static void mem_cgroup_cancel_attach(struct cgroup_subsys_state *css,
4846− struct cgroup_taskset *tset)
4850+static void mem_cgroup_cancel_attach(struct cgroup_taskset *tset)
48474851 {
48484852 if (mc.to)
48494853 mem_cgroup_clear_mc();
@@ -4985,10 +4989,10 @@ retry: · 135 unmodified lines
49854989 atomic_dec(&mc.from->moving_account);
49864990 }
49874991
4988−static void mem_cgroup_move_task(struct cgroup_subsys_state *css,
4989− struct cgroup_taskset *tset)
4992+static void mem_cgroup_move_task(struct cgroup_taskset *tset)
49904993 {
4991− struct task_struct *p = cgroup_taskset_first(tset);
4994+ struct cgroup_subsys_state *css;
4995+ struct task_struct *p = cgroup_taskset_first(tset, &css);
49924996 struct mm_struct *mm = get_task_mm(p);
49934997
49944998 if (mm) {
@@ -5000,17 +5004,14 @@ static void mem_cgroup_move_task(struct cgroup_subsys_state *css, · 5 unmodified lines
50005004 mem_cgroup_clear_mc();
50015005 }
50025006 #else /* !CONFIG_MMU */
5003−static int mem_cgroup_can_attach(struct cgroup_subsys_state *css,
5004− struct cgroup_taskset *tset)
5007+static int mem_cgroup_can_attach(struct cgroup_taskset *tset)
50055008 {
50065009 return 0;
50075010 }
5008−static void mem_cgroup_cancel_attach(struct cgroup_subsys_state *css,
5009− struct cgroup_taskset *tset)
5011+static void mem_cgroup_cancel_attach(struct cgroup_taskset *tset)
50105012 {
50115013 }
5012−static void mem_cgroup_move_task(struct cgroup_subsys_state *css,
5013− struct cgroup_taskset *tset)
5014+static void mem_cgroup_move_task(struct cgroup_taskset *tset)
50145015 {
50155016 }
50165017 #endif
@@ -5511,11 +5512,11 @@ void mem_cgroup_uncharge_list(struct list_head *page_list) · 494 unmodified lines
55115512 * mem_cgroup_replace_page - migrate a charge to another page
55125513 * @oldpage: currently charged page
55135514 * @newpage: page to transfer the charge to
5514− * @lrucare: either or both pages might be on the LRU already
55155515 *
55165516 * Migrate the charge from @oldpage to @newpage.
55175517 *
55185518 * Both pages must be locked, @newpage->mapping must be set up.
5519+ * Either or both pages might be on the LRU already.
55195520 */
55205521 void mem_cgroup_replace_page(struct page *oldpage, struct page *newpage)
55215522 {
mm/oom_kill.c+2−0
@@ -608,6 +608,8 @@ void oom_kill_process(struct oom_control *oc, struct task_struct *p, · 607 unmodified lines
608608 continue;
609609 if (unlikely(p->flags & PF_KTHREAD))
610610 continue;
611+ if (is_global_init(p))
612+ continue;
611613 if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN)
612614 continue;
613615
mm/page-writeback.c+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
22 * mm/page-writeback.c
33 *
44 * Copyright (C) 2002, Linus Torvalds.
5− * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
5+ * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra
66 *
77 * Contains functions related to writing back dirty pages at the
88 * address_space level.
mm/page_alloc.c+2−1
@@ -3647,8 +3647,9 @@ static void show_migration_types(unsigned char type) · 3646 unmodified lines
36473647 {
36483648 static const char types[MIGRATE_TYPES] = {
36493649 [MIGRATE_UNMOVABLE] = 'U',
3650− [MIGRATE_RECLAIMABLE] = 'E',
36513650 [MIGRATE_MOVABLE] = 'M',
3651+ [MIGRATE_RECLAIMABLE] = 'E',
3652+ [MIGRATE_HIGHATOMIC] = 'H',
36523653 #ifdef CONFIG_CMA
36533654 [MIGRATE_CMA] = 'C',
36543655 #endif
mm/shmem.c+14−20
@@ -843,14 +843,14 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) · 842 unmodified lines
843843 list_add_tail(&info->swaplist, &shmem_swaplist);
844844
845845 if (add_to_swap_cache(page, swap, GFP_ATOMIC) == 0) {
846− swap_shmem_alloc(swap);
847− shmem_delete_from_page_cache(page, swp_to_radix_entry(swap));
848−
849846 spin_lock(&info->lock);
850− info->swapped++;
851847 shmem_recalc_inode(inode);
848+ info->swapped++;
852849 spin_unlock(&info->lock);
853850
851+ swap_shmem_alloc(swap);
852+ shmem_delete_from_page_cache(page, swp_to_radix_entry(swap));
853+
854854 mutex_unlock(&shmem_swaplist_mutex);
855855 BUG_ON(page_mapped(page));
856856 swap_writepage(page, wbc);
@@ -1078,7 +1078,7 @@ repeat: · 221 unmodified lines
10781078 if (sgp != SGP_WRITE && sgp != SGP_FALLOC &&
10791079 ((loff_t)index << PAGE_CACHE_SHIFT) >= i_size_read(inode)) {
10801080 error = -EINVAL;
1081− goto failed;
1081+ goto unlock;
10821082 }
10831083
10841084 if (page && sgp == SGP_WRITE)
@@ -1246,11 +1246,15 @@ clear: · 161 unmodified lines
12461246 /* Perhaps the file has been truncated since we checked */
12471247 if (sgp != SGP_WRITE && sgp != SGP_FALLOC &&
12481248 ((loff_t)index << PAGE_CACHE_SHIFT) >= i_size_read(inode)) {
1249+ if (alloced) {
1250+ ClearPageDirty(page);
1251+ delete_from_page_cache(page);
1252+ spin_lock(&info->lock);
1253+ shmem_recalc_inode(inode);
1254+ spin_unlock(&info->lock);
1255+ }
12491256 error = -EINVAL;
1250− if (alloced)
1251− goto trunc;
1252− else
1253− goto failed;
1257+ goto unlock;
12541258 }
12551259 *pagep = page;
12561260 return 0;
@@ -1258,23 +1262,13 @@ clear: · 1 unmodified line
12581262 /*
12591263 * Error recovery.
12601264 */
1261−trunc:
1262− info = SHMEM_I(inode);
1263− ClearPageDirty(page);
1264− delete_from_page_cache(page);
1265− spin_lock(&info->lock);
1266− info->alloced--;
1267− inode->i_blocks -= BLOCKS_PER_PAGE;
1268− spin_unlock(&info->lock);
12691265 decused:
1270− sbinfo = SHMEM_SB(inode->i_sb);
12711266 if (sbinfo->max_blocks)
12721267 percpu_counter_add(&sbinfo->used_blocks, -1);
12731268 unacct:
12741269 shmem_unacct_blocks(info->flags, 1);
12751270 failed:
1276− if (swap.val && error != -EINVAL &&
1277− !shmem_confirm_swap(mapping, index, swap))
1271+ if (swap.val && !shmem_confirm_swap(mapping, index, swap))
12781272 error = -EEXIST;
12791273 unlock:
12801274 if (page) {
mm/vmstat.c+5−3
@@ -921,8 +921,8 @@ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat, · 920 unmodified lines
921921 #ifdef CONFIG_PROC_FS
922922 static char * const migratetype_names[MIGRATE_TYPES] = {
923923 "Unmovable",
924− "Reclaimable",
925924 "Movable",
925+ "Reclaimable",
926926 "HighAtomic",
927927 #ifdef CONFIG_CMA
928928 "CMA",
@@ -1379,6 +1379,7 @@ static const struct file_operations proc_vmstat_file_operations = { · 450 unmodified lines
13791379 #endif /* CONFIG_PROC_FS */
13801380
13811381 #ifdef CONFIG_SMP
1382+static struct workqueue_struct *vmstat_wq;
13821383 static DEFINE_PER_CPU(struct delayed_work, vmstat_work);
13831384 int sysctl_stat_interval __read_mostly = HZ;
13841385 static cpumask_var_t cpu_stat_off;
@@ -1391,7 +1392,7 @@ static void vmstat_update(struct work_struct *w) · 6 unmodified lines
13911392 * to occur in the future. Keep on running the
13921393 * update worker thread.
13931394 */
1394− schedule_delayed_work_on(smp_processor_id(),
1395+ queue_delayed_work_on(smp_processor_id(), vmstat_wq,
13951396 this_cpu_ptr(&vmstat_work),
13961397 round_jiffies_relative(sysctl_stat_interval));
13971398 } else {
@@ -1460,7 +1461,7 @@ static void vmstat_shepherd(struct work_struct *w) · 62 unmodified lines
14601461 if (need_update(cpu) &&
14611462 cpumask_test_and_clear_cpu(cpu, cpu_stat_off))
14621463
1463− schedule_delayed_work_on(cpu,
1464+ queue_delayed_work_on(cpu, vmstat_wq,
14641465 &per_cpu(vmstat_work, cpu), 0);
14651466
14661467 put_online_cpus();
@@ -1549,6 +1550,7 @@ static int __init setup_vmstat(void) · 82 unmodified lines
15491550
15501551 start_shepherd_timer();
15511552 cpu_notifier_register_done();
1553+ vmstat_wq = alloc_workqueue("vmstat", WQ_FREEZABLE|WQ_MEM_RECLAIM, 0);
15521554 #endif
15531555 #ifdef CONFIG_PROC_FS
15541556 proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
mm/zswap.c+3−3
@@ -541,6 +541,7 @@ static struct zswap_pool *zswap_pool_last_get(void) · 540 unmodified lines
541541 return last;
542542 }
543543
544+/* type and compressor must be null-terminated */
544545 static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor)
545546 {
546547 struct zswap_pool *pool;
@@ -548,10 +549,9 @@ static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor) · 1 unmodified line
548549 assert_spin_locked(&zswap_pools_lock);
549550
550551 list_for_each_entry_rcu(pool, &zswap_pools, list) {
551− if (strncmp(pool->tfm_name, compressor, sizeof(pool->tfm_name)))
552+ if (strcmp(pool->tfm_name, compressor))
552553 continue;
553− if (strncmp(zpool_get_type(pool->zpool), type,
554− sizeof(zswap_zpool_type)))
554+ if (strcmp(zpool_get_type(pool->zpool), type))
555555 continue;
556556 /* if we can't get it, it's about to be destroyed */
557557 if (!zswap_pool_get(pool))
net/ax25/af_ax25.c+3−0
@@ -805,6 +805,9 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol, · 804 unmodified lines
805805 struct sock *sk;
806806 ax25_cb *ax25;
807807
808+ if (protocol < 0 || protocol > SK_PROTOCOL_MAX)
809+ return -EINVAL;
810+
808811 if (!net_eq(net, &init_net))
809812 return -EAFNOSUPPORT;
810813
net/batman-adv/distributed-arp-table.c+4−1
@@ -566,6 +566,7 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) · 565 unmodified lines
566566 int select;
567567 batadv_dat_addr_t last_max = BATADV_DAT_ADDR_MAX, ip_key;
568568 struct batadv_dat_candidate *res;
569+ struct batadv_dat_entry dat;
569570
570571 if (!bat_priv->orig_hash)
571572 return NULL;
@@ -575,7 +576,9 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) · 3 unmodified lines
575576 if (!res)
576577 return NULL;
577578
578− ip_key = (batadv_dat_addr_t)batadv_hash_dat(&ip_dst,
579+ dat.ip = ip_dst;
580+ dat.vid = 0;
581+ ip_key = (batadv_dat_addr_t)batadv_hash_dat(&dat,
579582 BATADV_DAT_ADDR_MAX);
580583
581584 batadv_dbg(BATADV_DBG_DAT, bat_priv,
net/batman-adv/routing.c+15−4
@@ -836,6 +836,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, · 835 unmodified lines
836836 u8 *orig_addr;
837837 struct batadv_orig_node *orig_node = NULL;
838838 int check, hdr_size = sizeof(*unicast_packet);
839+ enum batadv_subtype subtype;
839840 bool is4addr;
840841
841842 unicast_packet = (struct batadv_unicast_packet *)skb->data;
@@ -863,10 +864,20 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, · 21 unmodified lines
863864 /* packet for me */
864865 if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) {
865866 if (is4addr) {
866− batadv_dat_inc_counter(bat_priv,
867− unicast_4addr_packet->subtype);
868− orig_addr = unicast_4addr_packet->src;
869− orig_node = batadv_orig_hash_find(bat_priv, orig_addr);
867+ subtype = unicast_4addr_packet->subtype;
868+ batadv_dat_inc_counter(bat_priv, subtype);
869+
870+ /* Only payload data should be considered for speedy
871+ * join. For example, DAT also uses unicast 4addr
872+ * types, but those packets should not be considered
873+ * for speedy join, since the clients do not actually
874+ * reside at the sending originator.
875+ */
876+ if (subtype == BATADV_P_DATA) {
877+ orig_addr = unicast_4addr_packet->src;
878+ orig_node = batadv_orig_hash_find(bat_priv,
879+ orig_addr);
880+ }
870881 }
871882
872883 if (batadv_dat_snoop_incoming_arp_request(bat_priv, skb,
net/batman-adv/translation-table.c+12−4
@@ -68,13 +68,15 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv, · 67 unmodified lines
6868 unsigned short vid, const char *message,
6969 bool roaming);
7070
71−/* returns 1 if they are the same mac addr */
71+/* returns 1 if they are the same mac addr and vid */
7272 static int batadv_compare_tt(const struct hlist_node *node, const void *data2)
7373 {
7474 const void *data1 = container_of(node, struct batadv_tt_common_entry,
7575 hash_entry);
76+ const struct batadv_tt_common_entry *tt1 = data1;
77+ const struct batadv_tt_common_entry *tt2 = data2;
7678
77− return batadv_compare_eth(data1, data2);
79+ return (tt1->vid == tt2->vid) && batadv_compare_eth(data1, data2);
7880 }
7981
8082 /**
@@ -1427,9 +1429,15 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, · 1346 unmodified lines
14271429 }
14281430
14291431 /* if the client was temporary added before receiving the first
1430− * OGM announcing it, we have to clear the TEMP flag
1432+ * OGM announcing it, we have to clear the TEMP flag. Also,
1433+ * remove the previous temporary orig node and re-add it
1434+ * if required. If the orig entry changed, the new one which
1435+ * is a non-temporary entry is preferred.
14311436 */
1432− common->flags &= ~BATADV_TT_CLIENT_TEMP;
1437+ if (common->flags & BATADV_TT_CLIENT_TEMP) {
1438+ batadv_tt_global_del_orig_list(tt_global_entry);
1439+ common->flags &= ~BATADV_TT_CLIENT_TEMP;
1440+ }
14331441
14341442 /* the change can carry possible "attribute" flags like the
14351443 * TT_CLIENT_WIFI, therefore they have to be copied in the
net/bluetooth/sco.c+3−0
@@ -526,6 +526,9 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, · 525 unmodified lines
526526 if (!addr || addr->sa_family != AF_BLUETOOTH)
527527 return -EINVAL;
528528
529+ if (addr_len < sizeof(struct sockaddr_sco))
530+ return -EINVAL;
531+
529532 lock_sock(sk);
530533
531534 if (sk->sk_state != BT_OPEN) {
net/core/netclassid_cgroup.c+4−2
@@ -81,9 +81,11 @@ static void update_classid(struct cgroup_subsys_state *css, void *v) · 80 unmodified lines
8181 css_task_iter_end(&it);
8282 }
8383
84−static void cgrp_attach(struct cgroup_subsys_state *css,
85− struct cgroup_taskset *tset)
84+static void cgrp_attach(struct cgroup_taskset *tset)
8685 {
86+ struct cgroup_subsys_state *css;
87+
88+ cgroup_taskset_first(tset, &css);
8789 update_classid(css,
8890 (void *)(unsigned long)css_cls_state(css)->classid);
8991 }
net/core/netprio_cgroup.c+5−4
@@ -218,13 +218,14 @@ static int update_netprio(const void *v, struct file *file, unsigned n) · 217 unmodified lines
218218 return 0;
219219 }
220220
221−static void net_prio_attach(struct cgroup_subsys_state *css,
222− struct cgroup_taskset *tset)
221+static void net_prio_attach(struct cgroup_taskset *tset)
223222 {
224223 struct task_struct *p;
225− void *v = (void *)(unsigned long)css->cgroup->id;
224+ struct cgroup_subsys_state *css;
225+
226+ cgroup_taskset_for_each(p, css, tset) {
227+ void *v = (void *)(unsigned long)css->cgroup->id;
226228
227− cgroup_taskset_for_each(p, tset) {
228229 task_lock(p);
229230 iterate_fd(p->files, 0, update_netprio, v);
230231 task_unlock(p);
net/core/skbuff.c+3−2
@@ -3643,7 +3643,8 @@ static void __skb_complete_tx_timestamp(struct sk_buff *skb, · 3642 unmodified lines
36433643 serr->ee.ee_info = tstype;
36443644 if (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID) {
36453645 serr->ee.ee_data = skb_shinfo(skb)->tskey;
3646− if (sk->sk_protocol == IPPROTO_TCP)
3646+ if (sk->sk_protocol == IPPROTO_TCP &&
3647+ sk->sk_type == SOCK_STREAM)
36473648 serr->ee.ee_data -= sk->sk_tskey;
36483649 }
36493650
@@ -4268,7 +4269,7 @@ static struct sk_buff *skb_reorder_vlan_header(struct sk_buff *skb) · 618 unmodified lines
42684269 return NULL;
42694270 }
42704271
4271− memmove(skb->data - ETH_HLEN, skb->data - skb->mac_len,
4272+ memmove(skb->data - ETH_HLEN, skb->data - skb->mac_len - VLAN_HLEN,
42724273 2 * ETH_ALEN);
42734274 skb->mac_header += VLAN_HLEN;
42744275 return skb;
net/core/sock.c+3−4
@@ -433,8 +433,6 @@ static bool sock_needs_netstamp(const struct sock *sk) · 432 unmodified lines
433433 }
434434 }
435435
436−#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE))
437−
438436 static void sock_disable_timestamp(struct sock *sk, unsigned long flags)
439437 {
440438 if (sk->sk_flags & flags) {
@@ -874,7 +872,8 @@ set_rcvbuf: · 433 unmodified lines
874872
875873 if (val & SOF_TIMESTAMPING_OPT_ID &&
876874 !(sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID)) {
877− if (sk->sk_protocol == IPPROTO_TCP) {
875+ if (sk->sk_protocol == IPPROTO_TCP &&
876+ sk->sk_type == SOCK_STREAM) {
878877 if (sk->sk_state != TCP_ESTABLISHED) {
879878 ret = -EINVAL;
880879 break;
@@ -1552,7 +1551,7 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) · 671 unmodified lines
15521551 */
15531552 is_charged = sk_filter_charge(newsk, filter);
15541553
1555− if (unlikely(!is_charged || xfrm_sk_clone_policy(newsk))) {
1554+ if (unlikely(!is_charged || xfrm_sk_clone_policy(newsk, sk))) {
15561555 /* It is still raw copy of parent, so invalidate
15571556 * destructor and make plain sk_free() */
15581557 newsk->sk_destruct = NULL;
net/decnet/af_decnet.c+3−0
@@ -678,6 +678,9 @@ static int dn_create(struct net *net, struct socket *sock, int protocol, · 677 unmodified lines
678678 {
679679 struct sock *sk;
680680
681+ if (protocol < 0 || protocol > SK_PROTOCOL_MAX)
682+ return -EINVAL;
683+
681684 if (!net_eq(net, &init_net))
682685 return -EAFNOSUPPORT;
683686
net/ipv4/af_inet.c+3−0
@@ -257,6 +257,9 @@ static int inet_create(struct net *net, struct socket *sock, int protocol, · 256 unmodified lines
257257 int try_loading_module = 0;
258258 int err;
259259
260+ if (protocol < 0 || protocol >= IPPROTO_MAX)
261+ return -EINVAL;
262+
260263 sock->state = SS_UNCONNECTED;
261264
262265 /* Look for the requested type/protocol pair. */
net/ipv4/fib_frontend.c+9−0
@@ -1155,6 +1155,7 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event, · 1154 unmodified lines
11551155 static int fib_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)
11561156 {
11571157 struct net_device *dev = netdev_notifier_info_to_dev(ptr);
1158+ struct netdev_notifier_changeupper_info *info;
11581159 struct in_device *in_dev;
11591160 struct net *net = dev_net(dev);
11601161 unsigned int flags;
@@ -1193,6 +1194,14 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo · 32 unmodified lines
11931194 case NETDEV_CHANGEMTU:
11941195 rt_cache_flush(net);
11951196 break;
1197+ case NETDEV_CHANGEUPPER:
1198+ info = ptr;
1199+ /* flush all routes if dev is linked to or unlinked from
1200+ * an L3 master device (e.g., VRF)
1201+ */
1202+ if (info->upper_dev && netif_is_l3_master(info->upper_dev))
1203+ fib_disable_ip(dev, NETDEV_DOWN, true);
1204+ break;
11961205 }
11971206 return NOTIFY_DONE;
11981207 }
net/ipv4/fou.c+2−1
@@ -24,6 +24,7 @@ struct fou { · 23 unmodified lines
2424 u16 type;
2525 struct udp_offload udp_offloads;
2626 struct list_head list;
27+ struct rcu_head rcu;
2728 };
2829
2930 #define FOU_F_REMCSUM_NOPARTIAL BIT(0)
@@ -417,7 +418,7 @@ static void fou_release(struct fou *fou) · 387 unmodified lines
417418 list_del(&fou->list);
418419 udp_tunnel_sock_release(sock);
419420
420− kfree(fou);
421+ kfree_rcu(fou, rcu);
421422 }
422423
423424 static int fou_encap_init(struct sock *sk, struct fou *fou, struct fou_cfg *cfg)
net/ipv4/netfilter/Kconfig+1−0
@@ -60,6 +60,7 @@ config NFT_REJECT_IPV4 · 59 unmodified lines
6060
6161 config NFT_DUP_IPV4
6262 tristate "IPv4 nf_tables packet duplication support"
63+ depends on !NF_CONNTRACK || NF_CONNTRACK
6364 select NF_DUP_IPV4
6465 help
6566 This module enables IPv4 packet duplication support for nf_tables.
net/ipv4/tcp_ipv4.c+2−3
@@ -1493,7 +1493,7 @@ bool tcp_prequeue(struct sock *sk, struct sk_buff *skb) · 1492 unmodified lines
14931493 if (likely(sk->sk_rx_dst))
14941494 skb_dst_drop(skb);
14951495 else
1496− skb_dst_force(skb);
1496+ skb_dst_force_safe(skb);
14971497
14981498 __skb_queue_tail(&tp->ucopy.prequeue, skb);
14991499 tp->ucopy.memory += skb->truesize;
@@ -1721,8 +1721,7 @@ void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) · 221 unmodified lines
17211721 {
17221722 struct dst_entry *dst = skb_dst(skb);
17231723
1724− if (dst) {
1725− dst_hold(dst);
1724+ if (dst && dst_hold_safe(dst)) {
17261725 sk->sk_rx_dst = dst;
17271726 inet_sk(sk)->rx_dst_ifindex = skb->skb_iif;
17281727 }
net/ipv4/tcp_output.c+12−11
@@ -3150,7 +3150,7 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn) · 3149 unmodified lines
31503150 {
31513151 struct tcp_sock *tp = tcp_sk(sk);
31523152 struct tcp_fastopen_request *fo = tp->fastopen_req;
3153− int syn_loss = 0, space, err = 0, copied;
3153+ int syn_loss = 0, space, err = 0;
31543154 unsigned long last_syn_loss = 0;
31553155 struct sk_buff *syn_data;
31563156
@@ -3188,17 +3188,18 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn) · 31 unmodified lines
31883188 goto fallback;
31893189 syn_data->ip_summed = CHECKSUM_PARTIAL;
31903190 memcpy(syn_data->cb, syn->cb, sizeof(syn->cb));
3191− copied = copy_from_iter(skb_put(syn_data, space), space,
3192− &fo->data->msg_iter);
3193− if (unlikely(!copied)) {
3194− kfree_skb(syn_data);
3195− goto fallback;
3196− }
3197− if (copied != space) {
3198− skb_trim(syn_data, copied);
3199− space = copied;
3191+ if (space) {
3192+ int copied = copy_from_iter(skb_put(syn_data, space), space,
3193+ &fo->data->msg_iter);
3194+ if (unlikely(!copied)) {
3195+ kfree_skb(syn_data);
3196+ goto fallback;
3197+ }
3198+ if (copied != space) {
3199+ skb_trim(syn_data, copied);
3200+ space = copied;
3201+ }
32003202 }
3201−
32023203 /* No more data pending in inet_wait_for_connect() */
32033204 if (space == fo->size)
32043205 fo->data = NULL;
net/ipv6/addrconf.c+7−1
@@ -350,6 +350,12 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev) · 349 unmodified lines
350350 setup_timer(&ndev->rs_timer, addrconf_rs_timer,
351351 (unsigned long)ndev);
352352 memcpy(&ndev->cnf, dev_net(dev)->ipv6.devconf_dflt, sizeof(ndev->cnf));
353+
354+ if (ndev->cnf.stable_secret.initialized)
355+ ndev->addr_gen_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;
356+ else
357+ ndev->addr_gen_mode = IN6_ADDR_GEN_MODE_EUI64;
358+
353359 ndev->cnf.mtu6 = dev->mtu;
354360 ndev->cnf.sysctl = NULL;
355361 ndev->nd_parms = neigh_parms_alloc(dev, &nd_tbl);
@@ -2455,7 +2461,7 @@ ok: · 2099 unmodified lines
24552461 #ifdef CONFIG_IPV6_OPTIMISTIC_DAD
24562462 if (in6_dev->cnf.optimistic_dad &&
24572463 !net->ipv6.devconf_all->forwarding && sllao)
2458− addr_flags = IFA_F_OPTIMISTIC;
2464+ addr_flags |= IFA_F_OPTIMISTIC;
24592465 #endif
24602466
24612467 /* Do not allow to create too much of autoconfigured
net/ipv6/af_inet6.c+3−0
@@ -109,6 +109,9 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol, · 108 unmodified lines
109109 int try_loading_module = 0;
110110 int err;
111111
112+ if (protocol < 0 || protocol >= IPPROTO_MAX)
113+ return -EINVAL;
114+
112115 /* Look for the requested type/protocol pair. */
113116 lookup_protocol:
114117 err = -ESOCKTNOSUPPORT;
net/ipv6/ip6_gre.c+3−5
@@ -1571,13 +1571,11 @@ static int ip6gre_changelink(struct net_device *dev, struct nlattr *tb[], · 1570 unmodified lines
15711571 return -EEXIST;
15721572 } else {
15731573 t = nt;
1574−
1575− ip6gre_tunnel_unlink(ign, t);
1576− ip6gre_tnl_change(t, &p, !tb[IFLA_MTU]);
1577− ip6gre_tunnel_link(ign, t);
1578− netdev_state_change(dev);
15791574 }
15801575
1576+ ip6gre_tunnel_unlink(ign, t);
1577+ ip6gre_tnl_change(t, &p, !tb[IFLA_MTU]);
1578+ ip6gre_tunnel_link(ign, t);
15811579 return 0;
15821580 }
15831581
net/ipv6/netfilter/Kconfig+1−0
@@ -49,6 +49,7 @@ config NFT_REJECT_IPV6 · 48 unmodified lines
4949
5050 config NFT_DUP_IPV6
5151 tristate "IPv6 nf_tables packet duplication support"
52+ depends on !NF_CONNTRACK || NF_CONNTRACK
5253 select NF_DUP_IPV6
5354 help
5455 This module enables IPv6 packet duplication support for nf_tables.
net/ipv6/tcp_ipv6.c+1−2
@@ -93,10 +93,9 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) · 92 unmodified lines
9393 {
9494 struct dst_entry *dst = skb_dst(skb);
9595
96− if (dst) {
96+ if (dst && dst_hold_safe(dst)) {
9797 const struct rt6_info *rt = (const struct rt6_info *)dst;
9898
99− dst_hold(dst);
10099 sk->sk_rx_dst = dst;
101100 inet_sk(sk)->rx_dst_ifindex = skb->skb_iif;
102101 inet6_sk(sk)->rx_dst_cookie = rt6_get_cookie(rt);
net/irda/af_irda.c+3−0
@@ -1086,6 +1086,9 @@ static int irda_create(struct net *net, struct socket *sock, int protocol, · 1085 unmodified lines
10861086 struct sock *sk;
10871087 struct irda_sock *self;
10881088
1089+ if (protocol < 0 || protocol > SK_PROTOCOL_MAX)
1090+ return -EINVAL;
1091+
10891092 if (net != &init_net)
10901093 return -EAFNOSUPPORT;
10911094
net/mac80211/cfg.c+1−2
@@ -1169,8 +1169,7 @@ static int sta_apply_parameters(struct ieee80211_local *local, · 1168 unmodified lines
11691169 * rc isn't initialized here yet, so ignore it
11701170 */
11711171 __ieee80211_vht_handle_opmode(sdata, sta,
1172− params->opmode_notif,
1173− band, false);
1172+ params->opmode_notif, band);
11741173 }
11751174
11761175 if (ieee80211_vif_is_mesh(&sdata->vif))
net/mac80211/ieee80211_i.h+2−2
@@ -1709,10 +1709,10 @@ enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta); · 1708 unmodified lines
17091709 void ieee80211_sta_set_rx_nss(struct sta_info *sta);
17101710 u32 __ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata,
17111711 struct sta_info *sta, u8 opmode,
1712− enum ieee80211_band band, bool nss_only);
1712+ enum ieee80211_band band);
17131713 void ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata,
17141714 struct sta_info *sta, u8 opmode,
1715− enum ieee80211_band band, bool nss_only);
1715+ enum ieee80211_band band);
17161716 void ieee80211_apply_vhtcap_overrides(struct ieee80211_sub_if_data *sdata,
17171717 struct ieee80211_sta_vht_cap *vht_cap);
17181718 void ieee80211_get_vht_mask_from_cap(__le16 vht_cap,
net/mac80211/mlme.c+11−6
@@ -1379,21 +1379,26 @@ static u32 ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata, · 1378 unmodified lines
13791379 */
13801380 if (has_80211h_pwr &&
13811381 (!has_cisco_pwr || pwr_level_80211h <= pwr_level_cisco)) {
1382+ new_ap_level = pwr_level_80211h;
1383+
1384+ if (sdata->ap_power_level == new_ap_level)
1385+ return 0;
1386+
13821387 sdata_dbg(sdata,
13831388 "Limiting TX power to %d (%d - %d) dBm as advertised by %pM\n",
13841389 pwr_level_80211h, chan_pwr, pwr_reduction_80211h,
13851390 sdata->u.mgd.bssid);
1386− new_ap_level = pwr_level_80211h;
13871391 } else { /* has_cisco_pwr is always true here. */
1392+ new_ap_level = pwr_level_cisco;
1393+
1394+ if (sdata->ap_power_level == new_ap_level)
1395+ return 0;
1396+
13881397 sdata_dbg(sdata,
13891398 "Limiting TX power to %d dBm as advertised by %pM\n",
13901399 pwr_level_cisco, sdata->u.mgd.bssid);
1391− new_ap_level = pwr_level_cisco;
13921400 }
13931401
1394− if (sdata->ap_power_level == new_ap_level)
1395− return 0;
1396−
13971402 sdata->ap_power_level = new_ap_level;
13981403 if (__ieee80211_recalc_txpower(sdata))
13991404 return BSS_CHANGED_TXPOWER;
@@ -3575,7 +3580,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, · 2175 unmodified lines
35753580
35763581 if (sta && elems.opmode_notif)
35773582 ieee80211_vht_handle_opmode(sdata, sta, *elems.opmode_notif,
3578− rx_status->band, true);
3583+ rx_status->band);
35793584 mutex_unlock(&local->sta_mtx);
35803585
35813586 changed |= ieee80211_handle_pwr_constr(sdata, chan, mgmt,
net/mac80211/rx.c+1−2
@@ -2736,8 +2736,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) · 2735 unmodified lines
27362736 opmode = mgmt->u.action.u.vht_opmode_notif.operating_mode;
27372737
27382738 ieee80211_vht_handle_opmode(rx->sdata, rx->sta,
2739− opmode, status->band,
2740− false);
2739+ opmode, status->band);
27412740 goto handled;
27422741 }
27432742 default:
net/mac80211/util.c+63−50
@@ -1641,6 +1641,29 @@ void ieee80211_stop_device(struct ieee80211_local *local) · 1640 unmodified lines
16411641 drv_stop(local);
16421642 }
16431643
1644+static void ieee80211_flush_completed_scan(struct ieee80211_local *local,
1645+ bool aborted)
1646+{
1647+ /* It's possible that we don't handle the scan completion in
1648+ * time during suspend, so if it's still marked as completed
1649+ * here, queue the work and flush it to clean things up.
1650+ * Instead of calling the worker function directly here, we
1651+ * really queue it to avoid potential races with other flows
1652+ * scheduling the same work.
1653+ */
1654+ if (test_bit(SCAN_COMPLETED, &local->scanning)) {
1655+ /* If coming from reconfiguration failure, abort the scan so
1656+ * we don't attempt to continue a partial HW scan - which is
1657+ * possible otherwise if (e.g.) the 2.4 GHz portion was the
1658+ * completed scan, and a 5 GHz portion is still pending.
1659+ */
1660+ if (aborted)
1661+ set_bit(SCAN_ABORTED, &local->scanning);
1662+ ieee80211_queue_delayed_work(&local->hw, &local->scan_work, 0);
1663+ flush_delayed_work(&local->scan_work);
1664+ }
1665+}
1666+
16441667 static void ieee80211_handle_reconfig_failure(struct ieee80211_local *local)
16451668 {
16461669 struct ieee80211_sub_if_data *sdata;
@@ -1660,6 +1683,8 @@ static void ieee80211_handle_reconfig_failure(struct ieee80211_local *local) · 13 unmodified lines
16601683 local->suspended = false;
16611684 local->in_reconfig = false;
16621685
1686+ ieee80211_flush_completed_scan(local, true);
1687+
16631688 /* scheduled scan clearly can't be running any more, but tell
16641689 * cfg80211 and clear local state
16651690 */
@@ -1698,6 +1723,27 @@ static void ieee80211_assign_chanctx(struct ieee80211_local *local, · 32 unmodified lines
16981723 mutex_unlock(&local->chanctx_mtx);
16991724 }
17001725
1726+static void ieee80211_reconfig_stations(struct ieee80211_sub_if_data *sdata)
1727+{
1728+ struct ieee80211_local *local = sdata->local;
1729+ struct sta_info *sta;
1730+
1731+ /* add STAs back */
1732+ mutex_lock(&local->sta_mtx);
1733+ list_for_each_entry(sta, &local->sta_list, list) {
1734+ enum ieee80211_sta_state state;
1735+
1736+ if (!sta->uploaded || sta->sdata != sdata)
1737+ continue;
1738+
1739+ for (state = IEEE80211_STA_NOTEXIST;
1740+ state < sta->sta_state; state++)
1741+ WARN_ON(drv_sta_state(local, sta->sdata, sta, state,
1742+ state + 1));
1743+ }
1744+ mutex_unlock(&local->sta_mtx);
1745+}
1746+
17011747 int ieee80211_reconfig(struct ieee80211_local *local)
17021748 {
17031749 struct ieee80211_hw *hw = &local->hw;
@@ -1833,50 +1879,11 @@ int ieee80211_reconfig(struct ieee80211_local *local) · 129 unmodified lines
18331879 WARN_ON(drv_add_chanctx(local, ctx));
18341880 mutex_unlock(&local->chanctx_mtx);
18351881
1836− list_for_each_entry(sdata, &local->interfaces, list) {
1837− if (!ieee80211_sdata_running(sdata))
1838− continue;
1839− ieee80211_assign_chanctx(local, sdata);
1840− }
1841−
18421882 sdata = rtnl_dereference(local->monitor_sdata);
18431883 if (sdata && ieee80211_sdata_running(sdata))
18441884 ieee80211_assign_chanctx(local, sdata);
18451885 }
18461886
1847− /* add STAs back */
1848− mutex_lock(&local->sta_mtx);
1849− list_for_each_entry(sta, &local->sta_list, list) {
1850− enum ieee80211_sta_state state;
1851−
1852− if (!sta->uploaded)
1853− continue;
1854−
1855− /* AP-mode stations will be added later */
1856− if (sta->sdata->vif.type == NL80211_IFTYPE_AP)
1857− continue;
1858−
1859− for (state = IEEE80211_STA_NOTEXIST;
1860− state < sta->sta_state; state++)
1861− WARN_ON(drv_sta_state(local, sta->sdata, sta, state,
1862− state + 1));
1863− }
1864− mutex_unlock(&local->sta_mtx);
1865−
1866− /* reconfigure tx conf */
1867− if (hw->queues >= IEEE80211_NUM_ACS) {
1868− list_for_each_entry(sdata, &local->interfaces, list) {
1869− if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
1870− sdata->vif.type == NL80211_IFTYPE_MONITOR ||
1871− !ieee80211_sdata_running(sdata))
1872− continue;
1873−
1874− for (i = 0; i < IEEE80211_NUM_ACS; i++)
1875− drv_conf_tx(local, sdata, i,
1876− &sdata->tx_conf[i]);
1877− }
1878− }
1879−
18801887 /* reconfigure hardware */
18811888 ieee80211_hw_config(local, ~0);
18821889
@@ -1889,6 +1896,22 @@ int ieee80211_reconfig(struct ieee80211_local *local) · 6 unmodified lines
18891896 if (!ieee80211_sdata_running(sdata))
18901897 continue;
18911898
1899+ ieee80211_assign_chanctx(local, sdata);
1900+
1901+ switch (sdata->vif.type) {
1902+ case NL80211_IFTYPE_AP_VLAN:
1903+ case NL80211_IFTYPE_MONITOR:
1904+ break;
1905+ default:
1906+ ieee80211_reconfig_stations(sdata);
1907+ /* fall through */
1908+ case NL80211_IFTYPE_AP: /* AP stations are handled later */
1909+ for (i = 0; i < IEEE80211_NUM_ACS; i++)
1910+ drv_conf_tx(local, sdata, i,
1911+ &sdata->tx_conf[i]);
1912+ break;
1913+ }
1914+
18921915 /* common change flags for all interface types */
18931916 changed = BSS_CHANGED_ERP_CTS_PROT |
18941917 BSS_CHANGED_ERP_PREAMBLE |
@@ -2074,17 +2097,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) · 179 unmodified lines
20742097 mb();
20752098 local->resuming = false;
20762099
2077− /* It's possible that we don't handle the scan completion in
2078− * time during suspend, so if it's still marked as completed
2079− * here, queue the work and flush it to clean things up.
2080− * Instead of calling the worker function directly here, we
2081− * really queue it to avoid potential races with other flows
2082− * scheduling the same work.
2083− */
2084− if (test_bit(SCAN_COMPLETED, &local->scanning)) {
2085− ieee80211_queue_delayed_work(&local->hw, &local->scan_work, 0);
2086− flush_delayed_work(&local->scan_work);
2087− }
2100+ ieee80211_flush_completed_scan(local, false);
20882101
20892102 if (local->open_count && !reconfig_due_to_wowlan)
20902103 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
net/mac80211/vht.c+3−7
@@ -378,7 +378,7 @@ void ieee80211_sta_set_rx_nss(struct sta_info *sta) · 377 unmodified lines
378378
379379 u32 __ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata,
380380 struct sta_info *sta, u8 opmode,
381− enum ieee80211_band band, bool nss_only)
381+ enum ieee80211_band band)
382382 {
383383 struct ieee80211_local *local = sdata->local;
384384 struct ieee80211_supported_band *sband;
@@ -401,9 +401,6 @@ u32 __ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata, · 16 unmodified lines
401401 changed |= IEEE80211_RC_NSS_CHANGED;
402402 }
403403
404− if (nss_only)
405− return changed;
406−
407404 switch (opmode & IEEE80211_OPMODE_NOTIF_CHANWIDTH_MASK) {
408405 case IEEE80211_OPMODE_NOTIF_CHANWIDTH_20MHZ:
409406 sta->cur_max_bandwidth = IEEE80211_STA_RX_BW_20;
@@ -430,13 +427,12 @@ u32 __ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata, · 20 unmodified lines
430427
431428 void ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata,
432429 struct sta_info *sta, u8 opmode,
433− enum ieee80211_band band, bool nss_only)
430+ enum ieee80211_band band)
434431 {
435432 struct ieee80211_local *local = sdata->local;
436433 struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
437434
438− u32 changed = __ieee80211_vht_handle_opmode(sdata, sta, opmode,
439− band, nss_only);
435+ u32 changed = __ieee80211_vht_handle_opmode(sdata, sta, opmode, band);
440436
441437 if (changed > 0)
442438 rate_control_rate_update(local, sband, sta, changed);
net/mpls/af_mpls.c+31−12
@@ -27,6 +27,8 @@ · 26 unmodified lines
2727 */
2828 #define MAX_MP_SELECT_LABELS 4
2929
30+#define MPLS_NEIGH_TABLE_UNSPEC (NEIGH_LINK_TABLE + 1)
31+
3032 static int zero = 0;
3133 static int label_limit = (1 << 20) - 1;
3234
@@ -317,7 +319,13 @@ static int mpls_forward(struct sk_buff *skb, struct net_device *dev, · 284 unmodified lines
317319 }
318320 }
319321
320− err = neigh_xmit(nh->nh_via_table, out_dev, mpls_nh_via(rt, nh), skb);
322+ /* If via wasn't specified then send out using device address */
323+ if (nh->nh_via_table == MPLS_NEIGH_TABLE_UNSPEC)
324+ err = neigh_xmit(NEIGH_LINK_TABLE, out_dev,
325+ out_dev->dev_addr, skb);
326+ else
327+ err = neigh_xmit(nh->nh_via_table, out_dev,
328+ mpls_nh_via(rt, nh), skb);
321329 if (err)
322330 net_dbg_ratelimited("%s: packet transmission failed: %d\n",
323331 __func__, err);
@@ -534,6 +542,10 @@ static int mpls_nh_assign_dev(struct net *net, struct mpls_route *rt, · 210 unmodified lines
534542 if (!mpls_dev_get(dev))
535543 goto errout;
536544
545+ if ((nh->nh_via_table == NEIGH_LINK_TABLE) &&
546+ (dev->addr_len != nh->nh_via_alen))
547+ goto errout;
548+
537549 RCU_INIT_POINTER(nh->nh_dev, dev);
538550
539551 return 0;
@@ -592,10 +604,14 @@ static int mpls_nh_build(struct net *net, struct mpls_route *rt, · 52 unmodified lines
592604 goto errout;
593605 }
594606
595− err = nla_get_via(via, &nh->nh_via_alen, &nh->nh_via_table,
596− __mpls_nh_via(rt, nh));
597− if (err)
598− goto errout;
607+ if (via) {
608+ err = nla_get_via(via, &nh->nh_via_alen, &nh->nh_via_table,
609+ __mpls_nh_via(rt, nh));
610+ if (err)
611+ goto errout;
612+ } else {
613+ nh->nh_via_table = MPLS_NEIGH_TABLE_UNSPEC;
614+ }
599615
600616 err = mpls_nh_assign_dev(net, rt, nh, oif);
601617 if (err)
@@ -677,9 +693,6 @@ static int mpls_nh_build_multi(struct mpls_route_config *cfg, · 75 unmodified lines
677693 nla_newdst = nla_find(attrs, attrlen, RTA_NEWDST);
678694 }
679695
680− if (!nla_via)
681− goto errout;
682−
683696 err = mpls_nh_build(cfg->rc_nlinfo.nl_net, rt, nh,
684697 rtnh->rtnh_ifindex, nla_via,
685698 nla_newdst);
@@ -1118,6 +1131,7 @@ static int rtm_to_route_config(struct sk_buff *skb, struct nlmsghdr *nlh, · 432 unmodified lines
11181131
11191132 cfg->rc_label = LABEL_NOT_SPECIFIED;
11201133 cfg->rc_protocol = rtm->rtm_protocol;
1134+ cfg->rc_via_table = MPLS_NEIGH_TABLE_UNSPEC;
11211135 cfg->rc_nlflags = nlh->nlmsg_flags;
11221136 cfg->rc_nlinfo.portid = NETLINK_CB(skb).portid;
11231137 cfg->rc_nlinfo.nlh = nlh;
@@ -1231,7 +1245,8 @@ static int mpls_dump_route(struct sk_buff *skb, u32 portid, u32 seq, int event, · 107 unmodified lines
12311245 nla_put_labels(skb, RTA_NEWDST, nh->nh_labels,
12321246 nh->nh_label))
12331247 goto nla_put_failure;
1234− if (nla_put_via(skb, nh->nh_via_table, mpls_nh_via(rt, nh),
1248+ if (nh->nh_via_table != MPLS_NEIGH_TABLE_UNSPEC &&
1249+ nla_put_via(skb, nh->nh_via_table, mpls_nh_via(rt, nh),
12351250 nh->nh_via_alen))
12361251 goto nla_put_failure;
12371252 dev = rtnl_dereference(nh->nh_dev);
@@ -1257,7 +1272,8 @@ static int mpls_dump_route(struct sk_buff *skb, u32 portid, u32 seq, int event, · 19 unmodified lines
12571272 nh->nh_labels,
12581273 nh->nh_label))
12591274 goto nla_put_failure;
1260− if (nla_put_via(skb, nh->nh_via_table,
1275+ if (nh->nh_via_table != MPLS_NEIGH_TABLE_UNSPEC &&
1276+ nla_put_via(skb, nh->nh_via_table,
12611277 mpls_nh_via(rt, nh),
12621278 nh->nh_via_alen))
12631279 goto nla_put_failure;
@@ -1319,7 +1335,8 @@ static inline size_t lfib_nlmsg_size(struct mpls_route *rt) · 55 unmodified lines
13191335
13201336 if (nh->nh_dev)
13211337 payload += nla_total_size(4); /* RTA_OIF */
1322− payload += nla_total_size(2 + nh->nh_via_alen); /* RTA_VIA */
1338+ if (nh->nh_via_table != MPLS_NEIGH_TABLE_UNSPEC) /* RTA_VIA */
1339+ payload += nla_total_size(2 + nh->nh_via_alen);
13231340 if (nh->nh_labels) /* RTA_NEWDST */
13241341 payload += nla_total_size(nh->nh_labels * 4);
13251342 } else {
@@ -1328,7 +1345,9 @@ static inline size_t lfib_nlmsg_size(struct mpls_route *rt) · 2 unmodified lines
13281345
13291346 for_nexthops(rt) {
13301347 nhsize += nla_total_size(sizeof(struct rtnexthop));
1331− nhsize += nla_total_size(2 + nh->nh_via_alen);
1348+ /* RTA_VIA */
1349+ if (nh->nh_via_table != MPLS_NEIGH_TABLE_UNSPEC)
1350+ nhsize += nla_total_size(2 + nh->nh_via_alen);
13321351 if (nh->nh_labels)
13331352 nhsize += nla_total_size(nh->nh_labels * 4);
13341353 } endfor_nexthops(rt);
net/mpls/mpls_iptunnel.c+2−2
@@ -54,10 +54,10 @@ int mpls_output(struct net *net, struct sock *sk, struct sk_buff *skb) · 53 unmodified lines
5454 unsigned int ttl;
5555
5656 /* Obtain the ttl */
57− if (skb->protocol == htons(ETH_P_IP)) {
57+ if (dst->ops->family == AF_INET) {
5858 ttl = ip_hdr(skb)->ttl;
5959 rt = (struct rtable *)dst;
60− } else if (skb->protocol == htons(ETH_P_IPV6)) {
60+ } else if (dst->ops->family == AF_INET6) {
6161 ttl = ipv6_hdr(skb)->hop_limit;
6262 rt6 = (struct rt6_info *)dst;
6363 } else {
net/netfilter/nf_tables_api.c+47−52
@@ -89,6 +89,7 @@ nf_tables_afinfo_lookup(struct net *net, int family, bool autoload) · 88 unmodified lines
8989 }
9090
9191 static void nft_ctx_init(struct nft_ctx *ctx,
92+ struct net *net,
9293 const struct sk_buff *skb,
9394 const struct nlmsghdr *nlh,
9495 struct nft_af_info *afi,
@@ -96,7 +97,7 @@ static void nft_ctx_init(struct nft_ctx *ctx, · 1 unmodified line
9697 struct nft_chain *chain,
9798 const struct nlattr * const *nla)
9899 {
99− ctx->net = sock_net(skb->sk);
100+ ctx->net = net;
100101 ctx->afi = afi;
101102 ctx->table = table;
102103 ctx->chain = chain;
@@ -672,15 +673,14 @@ err: · 569 unmodified lines
672673 return ret;
673674 }
674675
675−static int nf_tables_newtable(struct sock *nlsk, struct sk_buff *skb,
676− const struct nlmsghdr *nlh,
676+static int nf_tables_newtable(struct net *net, struct sock *nlsk,
677+ struct sk_buff *skb, const struct nlmsghdr *nlh,
677678 const struct nlattr * const nla[])
678679 {
679680 const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
680681 const struct nlattr *name;
681682 struct nft_af_info *afi;
682683 struct nft_table *table;
683− struct net *net = sock_net(skb->sk);
684684 int family = nfmsg->nfgen_family;
685685 u32 flags = 0;
686686 struct nft_ctx ctx;
@@ -706,7 +706,7 @@ static int nf_tables_newtable(struct sock *nlsk, struct sk_buff *skb, · 19 unmodified lines
706706 if (nlh->nlmsg_flags & NLM_F_REPLACE)
707707 return -EOPNOTSUPP;
708708
709− nft_ctx_init(&ctx, skb, nlh, afi, table, NULL, nla);
709+ nft_ctx_init(&ctx, net, skb, nlh, afi, table, NULL, nla);
710710 return nf_tables_updtable(&ctx);
711711 }
712712
@@ -730,7 +730,7 @@ static int nf_tables_newtable(struct sock *nlsk, struct sk_buff *skb, · 17 unmodified lines
730730 INIT_LIST_HEAD(&table->sets);
731731 table->flags = flags;
732732
733− nft_ctx_init(&ctx, skb, nlh, afi, table, NULL, nla);
733+ nft_ctx_init(&ctx, net, skb, nlh, afi, table, NULL, nla);
734734 err = nft_trans_table_add(&ctx, NFT_MSG_NEWTABLE);
735735 if (err < 0)
736736 goto err3;
@@ -810,18 +810,17 @@ out: · 73 unmodified lines
810810 return err;
811811 }
812812
813−static int nf_tables_deltable(struct sock *nlsk, struct sk_buff *skb,
814− const struct nlmsghdr *nlh,
813+static int nf_tables_deltable(struct net *net, struct sock *nlsk,
814+ struct sk_buff *skb, const struct nlmsghdr *nlh,
815815 const struct nlattr * const nla[])
816816 {
817817 const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
818818 struct nft_af_info *afi;
819819 struct nft_table *table;
820− struct net *net = sock_net(skb->sk);
821820 int family = nfmsg->nfgen_family;
822821 struct nft_ctx ctx;
823822
824− nft_ctx_init(&ctx, skb, nlh, NULL, NULL, NULL, nla);
823+ nft_ctx_init(&ctx, net, skb, nlh, NULL, NULL, NULL, nla);
825824 if (family == AF_UNSPEC || nla[NFTA_TABLE_NAME] == NULL)
826825 return nft_flush(&ctx, family);
827826
@@ -1221,8 +1220,8 @@ static void nf_tables_chain_destroy(struct nft_chain *chain) · 393 unmodified lines
12211220 }
12221221 }
12231222
1224−static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb,
1225− const struct nlmsghdr *nlh,
1223+static int nf_tables_newchain(struct net *net, struct sock *nlsk,
1224+ struct sk_buff *skb, const struct nlmsghdr *nlh,
12261225 const struct nlattr * const nla[])
12271226 {
12281227 const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
@@ -1232,7 +1231,6 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb, · 3 unmodified lines
12321231 struct nft_chain *chain;
12331232 struct nft_base_chain *basechain = NULL;
12341233 struct nlattr *ha[NFTA_HOOK_MAX + 1];
1235− struct net *net = sock_net(skb->sk);
12361234 int family = nfmsg->nfgen_family;
12371235 struct net_device *dev = NULL;
12381236 u8 policy = NF_ACCEPT;
@@ -1313,7 +1311,7 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb, · 74 unmodified lines
13131311 return PTR_ERR(stats);
13141312 }
13151313
1316− nft_ctx_init(&ctx, skb, nlh, afi, table, chain, nla);
1314+ nft_ctx_init(&ctx, net, skb, nlh, afi, table, chain, nla);
13171315 trans = nft_trans_alloc(&ctx, NFT_MSG_NEWCHAIN,
13181316 sizeof(struct nft_trans_chain));
13191317 if (trans == NULL) {
@@ -1461,7 +1459,7 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb, · 141 unmodified lines
14611459 if (err < 0)
14621460 goto err1;
14631461
1464− nft_ctx_init(&ctx, skb, nlh, afi, table, chain, nla);
1462+ nft_ctx_init(&ctx, net, skb, nlh, afi, table, chain, nla);
14651463 err = nft_trans_chain_add(&ctx, NFT_MSG_NEWCHAIN);
14661464 if (err < 0)
14671465 goto err2;
@@ -1476,15 +1474,14 @@ err1: · 8 unmodified lines
14761474 return err;
14771475 }
14781476
1479−static int nf_tables_delchain(struct sock *nlsk, struct sk_buff *skb,
1480− const struct nlmsghdr *nlh,
1477+static int nf_tables_delchain(struct net *net, struct sock *nlsk,
1478+ struct sk_buff *skb, const struct nlmsghdr *nlh,
14811479 const struct nlattr * const nla[])
14821480 {
14831481 const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
14841482 struct nft_af_info *afi;
14851483 struct nft_table *table;
14861484 struct nft_chain *chain;
1487− struct net *net = sock_net(skb->sk);
14881485 int family = nfmsg->nfgen_family;
14891486 struct nft_ctx ctx;
14901487
@@ -1506,7 +1503,7 @@ static int nf_tables_delchain(struct sock *nlsk, struct sk_buff *skb, · 15 unmodified lines
15061503 if (chain->use > 0)
15071504 return -EBUSY;
15081505
1509− nft_ctx_init(&ctx, skb, nlh, afi, table, chain, nla);
1506+ nft_ctx_init(&ctx, net, skb, nlh, afi, table, chain, nla);
15101507
15111508 return nft_delchain(&ctx);
15121509 }
@@ -2010,13 +2007,12 @@ static void nf_tables_rule_destroy(const struct nft_ctx *ctx, · 497 unmodified lines
20102007
20112008 static struct nft_expr_info *info;
20122009
2013−static int nf_tables_newrule(struct sock *nlsk, struct sk_buff *skb,
2014− const struct nlmsghdr *nlh,
2010+static int nf_tables_newrule(struct net *net, struct sock *nlsk,
2011+ struct sk_buff *skb, const struct nlmsghdr *nlh,
20152012 const struct nlattr * const nla[])
20162013 {
20172014 const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
20182015 struct nft_af_info *afi;
2019− struct net *net = sock_net(skb->sk);
20202016 struct nft_table *table;
20212017 struct nft_chain *chain;
20222018 struct nft_rule *rule, *old_rule = NULL;
@@ -2075,7 +2071,7 @@ static int nf_tables_newrule(struct sock *nlsk, struct sk_buff *skb, · 52 unmodified lines
20752071 return PTR_ERR(old_rule);
20762072 }
20772073
2078− nft_ctx_init(&ctx, skb, nlh, afi, table, chain, nla);
2074+ nft_ctx_init(&ctx, net, skb, nlh, afi, table, chain, nla);
20792075
20802076 n = 0;
20812077 size = 0;
@@ -2176,13 +2172,12 @@ err1: · 94 unmodified lines
21762172 return err;
21772173 }
21782174
2179−static int nf_tables_delrule(struct sock *nlsk, struct sk_buff *skb,
2180− const struct nlmsghdr *nlh,
2175+static int nf_tables_delrule(struct net *net, struct sock *nlsk,
2176+ struct sk_buff *skb, const struct nlmsghdr *nlh,
21812177 const struct nlattr * const nla[])
21822178 {
21832179 const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
21842180 struct nft_af_info *afi;
2185− struct net *net = sock_net(skb->sk);
21862181 struct nft_table *table;
21872182 struct nft_chain *chain = NULL;
21882183 struct nft_rule *rule;
@@ -2205,7 +2200,7 @@ static int nf_tables_delrule(struct sock *nlsk, struct sk_buff *skb, · 16 unmodified lines
22052200 return PTR_ERR(chain);
22062201 }
22072202
2208− nft_ctx_init(&ctx, skb, nlh, afi, table, chain, nla);
2203+ nft_ctx_init(&ctx, net, skb, nlh, afi, table, chain, nla);
22092204
22102205 if (chain) {
22112206 if (nla[NFTA_RULE_HANDLE]) {
@@ -2344,12 +2339,11 @@ static const struct nla_policy nft_set_desc_policy[NFTA_SET_DESC_MAX + 1] = { · 132 unmodified lines
23442339 [NFTA_SET_DESC_SIZE] = { .type = NLA_U32 },
23452340 };
23462341
2347−static int nft_ctx_init_from_setattr(struct nft_ctx *ctx,
2342+static int nft_ctx_init_from_setattr(struct nft_ctx *ctx, struct net *net,
23482343 const struct sk_buff *skb,
23492344 const struct nlmsghdr *nlh,
23502345 const struct nlattr * const nla[])
23512346 {
2352− struct net *net = sock_net(skb->sk);
23532347 const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
23542348 struct nft_af_info *afi = NULL;
23552349 struct nft_table *table = NULL;
@@ -2371,7 +2365,7 @@ static int nft_ctx_init_from_setattr(struct nft_ctx *ctx, · 15 unmodified lines
23712365 return -ENOENT;
23722366 }
23732367
2374− nft_ctx_init(ctx, skb, nlh, afi, table, NULL, nla);
2368+ nft_ctx_init(ctx, net, skb, nlh, afi, table, NULL, nla);
23752369 return 0;
23762370 }
23772371
@@ -2623,6 +2617,7 @@ static int nf_tables_getset(struct sock *nlsk, struct sk_buff *skb, · 245 unmodified lines
26232617 const struct nlmsghdr *nlh,
26242618 const struct nlattr * const nla[])
26252619 {
2620+ struct net *net = sock_net(skb->sk);
26262621 const struct nft_set *set;
26272622 struct nft_ctx ctx;
26282623 struct sk_buff *skb2;
@@ -2630,7 +2625,7 @@ static int nf_tables_getset(struct sock *nlsk, struct sk_buff *skb, · 1 unmodified line
26302625 int err;
26312626
26322627 /* Verify existence before starting dump */
2633− err = nft_ctx_init_from_setattr(&ctx, skb, nlh, nla);
2628+ err = nft_ctx_init_from_setattr(&ctx, net, skb, nlh, nla);
26342629 if (err < 0)
26352630 return err;
26362631
@@ -2693,14 +2688,13 @@ static int nf_tables_set_desc_parse(const struct nft_ctx *ctx, · 56 unmodified lines
26932688 return 0;
26942689 }
26952690
2696−static int nf_tables_newset(struct sock *nlsk, struct sk_buff *skb,
2697− const struct nlmsghdr *nlh,
2691+static int nf_tables_newset(struct net *net, struct sock *nlsk,
2692+ struct sk_buff *skb, const struct nlmsghdr *nlh,
26982693 const struct nlattr * const nla[])
26992694 {
27002695 const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
27012696 const struct nft_set_ops *ops;
27022697 struct nft_af_info *afi;
2703− struct net *net = sock_net(skb->sk);
27042698 struct nft_table *table;
27052699 struct nft_set *set;
27062700 struct nft_ctx ctx;
@@ -2798,7 +2792,7 @@ static int nf_tables_newset(struct sock *nlsk, struct sk_buff *skb, · 91 unmodified lines
27982792 if (IS_ERR(table))
27992793 return PTR_ERR(table);
28002794
2801− nft_ctx_init(&ctx, skb, nlh, afi, table, NULL, nla);
2795+ nft_ctx_init(&ctx, net, skb, nlh, afi, table, NULL, nla);
28022796
28032797 set = nf_tables_set_lookup(table, nla[NFTA_SET_NAME]);
28042798 if (IS_ERR(set)) {
@@ -2882,8 +2876,8 @@ static void nf_tables_set_destroy(const struct nft_ctx *ctx, struct nft_set *set · 77 unmodified lines
28822876 nft_set_destroy(set);
28832877 }
28842878
2885−static int nf_tables_delset(struct sock *nlsk, struct sk_buff *skb,
2886− const struct nlmsghdr *nlh,
2879+static int nf_tables_delset(struct net *net, struct sock *nlsk,
2880+ struct sk_buff *skb, const struct nlmsghdr *nlh,
28872881 const struct nlattr * const nla[])
28882882 {
28892883 const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
@@ -2896,7 +2890,7 @@ static int nf_tables_delset(struct sock *nlsk, struct sk_buff *skb, · 6 unmodified lines
28962890 if (nla[NFTA_SET_TABLE] == NULL)
28972891 return -EINVAL;
28982892
2899− err = nft_ctx_init_from_setattr(&ctx, skb, nlh, nla);
2893+ err = nft_ctx_init_from_setattr(&ctx, net, skb, nlh, nla);
29002894 if (err < 0)
29012895 return err;
29022896
@@ -3024,7 +3018,7 @@ static const struct nla_policy nft_set_elem_list_policy[NFTA_SET_ELEM_LIST_MAX + · 121 unmodified lines
30243018 [NFTA_SET_ELEM_LIST_SET_ID] = { .type = NLA_U32 },
30253019 };
30263020
3027−static int nft_ctx_init_from_elemattr(struct nft_ctx *ctx,
3021+static int nft_ctx_init_from_elemattr(struct nft_ctx *ctx, struct net *net,
30283022 const struct sk_buff *skb,
30293023 const struct nlmsghdr *nlh,
30303024 const struct nlattr * const nla[],
@@ -3033,7 +3027,6 @@ static int nft_ctx_init_from_elemattr(struct nft_ctx *ctx, · 2 unmodified lines
30333027 const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
30343028 struct nft_af_info *afi;
30353029 struct nft_table *table;
3036− struct net *net = sock_net(skb->sk);
30373030
30383031 afi = nf_tables_afinfo_lookup(net, nfmsg->nfgen_family, false);
30393032 if (IS_ERR(afi))
@@ -3045,7 +3038,7 @@ static int nft_ctx_init_from_elemattr(struct nft_ctx *ctx, · 5 unmodified lines
30453038 if (!trans && (table->flags & NFT_TABLE_INACTIVE))
30463039 return -ENOENT;
30473040
3048− nft_ctx_init(ctx, skb, nlh, afi, table, NULL, nla);
3041+ nft_ctx_init(ctx, net, skb, nlh, afi, table, NULL, nla);
30493042 return 0;
30503043 }
30513044
@@ -3135,6 +3128,7 @@ static int nf_tables_dump_setelem(const struct nft_ctx *ctx, · 83 unmodified lines
31353128
31363129 static int nf_tables_dump_set(struct sk_buff *skb, struct netlink_callback *cb)
31373130 {
3131+ struct net *net = sock_net(skb->sk);
31383132 const struct nft_set *set;
31393133 struct nft_set_dump_args args;
31403134 struct nft_ctx ctx;
@@ -3150,8 +3144,8 @@ static int nf_tables_dump_set(struct sk_buff *skb, struct netlink_callback *cb) · 9 unmodified lines
31503144 if (err < 0)
31513145 return err;
31523146
3153− err = nft_ctx_init_from_elemattr(&ctx, cb->skb, cb->nlh, (void *)nla,
3154− false);
3147+ err = nft_ctx_init_from_elemattr(&ctx, net, cb->skb, cb->nlh,
3148+ (void *)nla, false);
31553149 if (err < 0)
31563150 return err;
31573151
@@ -3212,11 +3206,12 @@ static int nf_tables_getsetelem(struct sock *nlsk, struct sk_buff *skb, · 54 unmodified lines
32123206 const struct nlmsghdr *nlh,
32133207 const struct nlattr * const nla[])
32143208 {
3209+ struct net *net = sock_net(skb->sk);
32153210 const struct nft_set *set;
32163211 struct nft_ctx ctx;
32173212 int err;
32183213
3219− err = nft_ctx_init_from_elemattr(&ctx, skb, nlh, nla, false);
3214+ err = nft_ctx_init_from_elemattr(&ctx, net, skb, nlh, nla, false);
32203215 if (err < 0)
32213216 return err;
32223217
@@ -3528,11 +3523,10 @@ err1: · 305 unmodified lines
35283523 return err;
35293524 }
35303525
3531−static int nf_tables_newsetelem(struct sock *nlsk, struct sk_buff *skb,
3532− const struct nlmsghdr *nlh,
3526+static int nf_tables_newsetelem(struct net *net, struct sock *nlsk,
3527+ struct sk_buff *skb, const struct nlmsghdr *nlh,
35333528 const struct nlattr * const nla[])
35343529 {
3535− struct net *net = sock_net(skb->sk);
35363530 const struct nlattr *attr;
35373531 struct nft_set *set;
35383532 struct nft_ctx ctx;
@@ -3541,7 +3535,7 @@ static int nf_tables_newsetelem(struct sock *nlsk, struct sk_buff *skb, · 2 unmodified lines
35413535 if (nla[NFTA_SET_ELEM_LIST_ELEMENTS] == NULL)
35423536 return -EINVAL;
35433537
3544− err = nft_ctx_init_from_elemattr(&ctx, skb, nlh, nla, true);
3538+ err = nft_ctx_init_from_elemattr(&ctx, net, skb, nlh, nla, true);
35453539 if (err < 0)
35463540 return err;
35473541
@@ -3623,8 +3617,8 @@ err1: · 75 unmodified lines
36233617 return err;
36243618 }
36253619
3626−static int nf_tables_delsetelem(struct sock *nlsk, struct sk_buff *skb,
3627− const struct nlmsghdr *nlh,
3620+static int nf_tables_delsetelem(struct net *net, struct sock *nlsk,
3621+ struct sk_buff *skb, const struct nlmsghdr *nlh,
36283622 const struct nlattr * const nla[])
36293623 {
36303624 const struct nlattr *attr;
@@ -3635,7 +3629,7 @@ static int nf_tables_delsetelem(struct sock *nlsk, struct sk_buff *skb, · 4 unmodified lines
36353629 if (nla[NFTA_SET_ELEM_LIST_ELEMENTS] == NULL)
36363630 return -EINVAL;
36373631
3638− err = nft_ctx_init_from_elemattr(&ctx, skb, nlh, nla, false);
3632+ err = nft_ctx_init_from_elemattr(&ctx, net, skb, nlh, nla, false);
36393633 if (err < 0)
36403634 return err;
36413635
@@ -4030,7 +4024,8 @@ static int nf_tables_abort(struct sk_buff *skb) · 388 unmodified lines
40304024 struct nft_trans *trans, *next;
40314025 struct nft_trans_elem *te;
40324026
4033− list_for_each_entry_safe(trans, next, &net->nft.commit_list, list) {
4027+ list_for_each_entry_safe_reverse(trans, next, &net->nft.commit_list,
4028+ list) {
40344029 switch (trans->msg_type) {
40354030 case NFT_MSG_NEWTABLE:
40364031 if (nft_trans_table_update(trans)) {
net/netfilter/nfnetlink.c+1−3
@@ -295,8 +295,6 @@ replay: · 294 unmodified lines
295295 if (!skb)
296296 return netlink_ack(oskb, nlh, -ENOMEM);
297297
298− skb->sk = oskb->sk;
299−
300298 nfnl_lock(subsys_id);
301299 ss = rcu_dereference_protected(table[subsys_id].subsys,
302300 lockdep_is_held(&table[subsys_id].mutex));
@@ -381,7 +379,7 @@ replay: · 78 unmodified lines
381379 goto ack;
382380
383381 if (nc->call_batch) {
384− err = nc->call_batch(net->nfnl, skb, nlh,
382+ err = nc->call_batch(net, net->nfnl, skb, nlh,
385383 (const struct nlattr **)cda);
386384 }
387385
net/netfilter/nfnetlink_queue.c+6−3
@@ -365,8 +365,9 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, · 364 unmodified lines
365365 break;
366366 }
367367
368+ nfnl_ct = rcu_dereference(nfnl_ct_hook);
369+
368370 if (queue->flags & NFQA_CFG_F_CONNTRACK) {
369− nfnl_ct = rcu_dereference(nfnl_ct_hook);
370371 if (nfnl_ct != NULL) {
371372 ct = nfnl_ct->get_ct(entskb, &ctinfo);
372373 if (ct != NULL)
@@ -1064,9 +1065,10 @@ nfqnl_recv_verdict(struct sock *ctnl, struct sk_buff *skb, · 691 unmodified lines
10641065 if (entry == NULL)
10651066 return -ENOENT;
10661067
1068+ /* rcu lock already held from nfnl->call_rcu. */
1069+ nfnl_ct = rcu_dereference(nfnl_ct_hook);
1070+
10671071 if (nfqa[NFQA_CT]) {
1068− /* rcu lock already held from nfnl->call_rcu. */
1069− nfnl_ct = rcu_dereference(nfnl_ct_hook);
10701072 if (nfnl_ct != NULL)
10711073 ct = nfqnl_ct_parse(nfnl_ct, nlh, nfqa, entry, &ctinfo);
10721074 }
@@ -1417,6 +1419,7 @@ static int __init nfnetlink_queue_init(void) · 344 unmodified lines
14171419
14181420 cleanup_netlink_notifier:
14191421 netlink_unregister_notifier(&nfqnl_rtnl_notifier);
1422+ unregister_pernet_subsys(&nfnl_queue_net_ops);
14201423 out:
14211424 return status;
14221425 }
net/openvswitch/conntrack.c+13−3
@@ -53,6 +53,8 @@ struct ovs_conntrack_info { · 52 unmodified lines
5353 struct md_labels labels;
5454 };
5555
56+static void __ovs_ct_free_action(struct ovs_conntrack_info *ct_info);
57+
5658 static u16 key_to_nfproto(const struct sw_flow_key *key)
5759 {
5860 switch (ntohs(key->eth.type)) {
@@ -141,6 +143,7 @@ static void __ovs_ct_update_key(struct sw_flow_key *key, u8 state, · 82 unmodified lines
141143 * previously sent the packet to conntrack via the ct action.
142144 */
143145 static void ovs_ct_update_key(const struct sk_buff *skb,
146+ const struct ovs_conntrack_info *info,
144147 struct sw_flow_key *key, bool post_ct)
145148 {
146149 const struct nf_conntrack_zone *zone = &nf_ct_zone_dflt;
@@ -158,13 +161,15 @@ static void ovs_ct_update_key(const struct sk_buff *skb, · 11 unmodified lines
158161 zone = nf_ct_zone(ct);
159162 } else if (post_ct) {
160163 state = OVS_CS_F_TRACKED | OVS_CS_F_INVALID;
164+ if (info)
165+ zone = &info->zone;
161166 }
162167 __ovs_ct_update_key(key, state, zone, ct);
163168 }
164169
165170 void ovs_ct_fill_key(const struct sk_buff *skb, struct sw_flow_key *key)
166171 {
167− ovs_ct_update_key(skb, key, false);
172+ ovs_ct_update_key(skb, NULL, key, false);
168173 }
169174
170175 int ovs_ct_put_key(const struct sw_flow_key *key, struct sk_buff *skb)
@@ -418,7 +423,7 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key, · 247 unmodified lines
418423 }
419424 }
420425
421− ovs_ct_update_key(skb, key, true);
426+ ovs_ct_update_key(skb, info, key, true);
422427
423428 return 0;
424429 }
@@ -708,7 +713,7 @@ int ovs_ct_copy_action(struct net *net, const struct nlattr *attr, · 283 unmodified lines
708713 nf_conntrack_get(&ct_info.ct->ct_general);
709714 return 0;
710715 err_free_ct:
711− nf_conntrack_free(ct_info.ct);
716+ __ovs_ct_free_action(&ct_info);
712717 return err;
713718 }
714719
@@ -750,6 +755,11 @@ void ovs_ct_free_action(const struct nlattr *a) · 35 unmodified lines
750755 {
751756 struct ovs_conntrack_info *ct_info = nla_data(a);
752757
758+ __ovs_ct_free_action(ct_info);
759+}
760+
761+static void __ovs_ct_free_action(struct ovs_conntrack_info *ct_info)
762+{
753763 if (ct_info->helper)
754764 module_put(ct_info->helper->me);
755765 if (ct_info->ct)
net/rfkill/core.c+3−3
@@ -49,7 +49,6 @@ · 48 unmodified lines
4949 struct rfkill {
5050 spinlock_t lock;
5151
52− const char *name;
5352 enum rfkill_type type;
5453
5554 unsigned long state;
@@ -73,6 +72,7 @@ struct rfkill { · 17 unmodified lines
7372 struct delayed_work poll_work;
7473 struct work_struct uevent_work;
7574 struct work_struct sync_work;
75+ char name[];
7676 };
7777 #define to_rfkill(d) container_of(d, struct rfkill, dev)
7878
@@ -876,14 +876,14 @@ struct rfkill * __must_check rfkill_alloc(const char *name, · 797 unmodified lines
876876 if (WARN_ON(type == RFKILL_TYPE_ALL || type >= NUM_RFKILL_TYPES))
877877 return NULL;
878878
879− rfkill = kzalloc(sizeof(*rfkill), GFP_KERNEL);
879+ rfkill = kzalloc(sizeof(*rfkill) + strlen(name) + 1, GFP_KERNEL);
880880 if (!rfkill)
881881 return NULL;
882882
883883 spin_lock_init(&rfkill->lock);
884884 INIT_LIST_HEAD(&rfkill->node);
885885 rfkill->type = type;
886− rfkill->name = name;
886+ strcpy(rfkill->name, name);
887887 rfkill->ops = ops;
888888 rfkill->data = ops_data;
889889
net/sched/sch_api.c+1−1
@@ -950,7 +950,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, · 949 unmodified lines
950950 }
951951 lockdep_set_class(qdisc_lock(sch), &qdisc_tx_lock);
952952 if (!netif_is_multiqueue(dev))
953− sch->flags |= TCQ_F_ONETXQUEUE | TCQ_F_NOPARENT;
953+ sch->flags |= TCQ_F_ONETXQUEUE;
954954 }
955955
956956 sch->handle = handle;
net/sctp/ipv6.c+9−2
@@ -323,14 +323,13 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, · 322 unmodified lines
323323 }
324324 }
325325 }
326− rcu_read_unlock();
327−
328326 if (baddr) {
329327 fl6->saddr = baddr->v6.sin6_addr;
330328 fl6->fl6_sport = baddr->v6.sin6_port;
331329 final_p = fl6_update_dst(fl6, rcu_dereference(np->opt), &final);
332330 dst = ip6_dst_lookup_flow(sk, fl6, final_p);
333331 }
332+ rcu_read_unlock();
334333
335334 out:
336335 if (!IS_ERR_OR_NULL(dst)) {
@@ -642,6 +641,7 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk, · 305 unmodified lines
642641 struct sock *newsk;
643642 struct ipv6_pinfo *newnp, *np = inet6_sk(sk);
644643 struct sctp6_sock *newsctp6sk;
644+ struct ipv6_txoptions *opt;
645645
646646 newsk = sk_alloc(sock_net(sk), PF_INET6, GFP_KERNEL, sk->sk_prot, 0);
647647 if (!newsk)
@@ -661,6 +661,13 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk, · 13 unmodified lines
661661
662662 memcpy(newnp, np, sizeof(struct ipv6_pinfo));
663663
664+ rcu_read_lock();
665+ opt = rcu_dereference(np->opt);
666+ if (opt)
667+ opt = ipv6_dup_options(newsk, opt);
668+ RCU_INIT_POINTER(newnp->opt, opt);
669+ rcu_read_unlock();
670+
664671 /* Initialize sk's sport, dport, rcv_saddr and daddr for getsockname()
665672 * and getpeername().
666673 */
net/sctp/outqueue.c+2−0
@@ -324,6 +324,7 @@ int sctp_outq_tail(struct sctp_outq *q, struct sctp_chunk *chunk) · 323 unmodified lines
324324 sctp_cname(SCTP_ST_CHUNK(chunk->chunk_hdr->type)) :
325325 "illegal chunk");
326326
327+ sctp_chunk_hold(chunk);
327328 sctp_outq_tail_data(q, chunk);
328329 if (chunk->chunk_hdr->flags & SCTP_DATA_UNORDERED)
329330 SCTP_INC_STATS(net, SCTP_MIB_OUTUNORDERCHUNKS);
@@ -1251,6 +1252,7 @@ int sctp_outq_sack(struct sctp_outq *q, struct sctp_chunk *chunk) · 921 unmodified lines
12511252 */
12521253
12531254 sack_a_rwnd = ntohl(sack->a_rwnd);
1255+ asoc->peer.zero_window_announced = !sack_a_rwnd;
12541256 outstanding = q->outstanding_bytes;
12551257
12561258 if (outstanding < sack_a_rwnd)
net/sctp/sm_make_chunk.c+2−2
@@ -1652,7 +1652,7 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep, · 1651 unmodified lines
16521652
16531653 /* Set an expiration time for the cookie. */
16541654 cookie->c.expiration = ktime_add(asoc->cookie_life,
1655− ktime_get());
1655+ ktime_get_real());
16561656
16571657 /* Copy the peer's init packet. */
16581658 memcpy(&cookie->c.peer_init[0], init_chunk->chunk_hdr,
@@ -1780,7 +1780,7 @@ no_hmac: · 121 unmodified lines
17801780 if (sock_flag(ep->base.sk, SOCK_TIMESTAMP))
17811781 kt = skb_get_ktime(skb);
17821782 else
1783− kt = ktime_get();
1783+ kt = ktime_get_real();
17841784
17851785 if (!asoc && ktime_before(bear_cookie->expiration, kt)) {
17861786 /*
net/sctp/sm_statefuns.c+2−1
@@ -5412,7 +5412,8 @@ sctp_disposition_t sctp_sf_do_6_3_3_rtx(struct net *net, · 5411 unmodified lines
54125412 SCTP_INC_STATS(net, SCTP_MIB_T3_RTX_EXPIREDS);
54135413
54145414 if (asoc->overall_error_count >= asoc->max_retrans) {
5415− if (asoc->state == SCTP_STATE_SHUTDOWN_PENDING) {
5415+ if (asoc->peer.zero_window_announced &&
5416+ asoc->state == SCTP_STATE_SHUTDOWN_PENDING) {
54165417 /*
54175418 * We are here likely because the receiver had its rwnd
54185419 * closed for a while and we have not been able to
net/sctp/socket.c+6−6
@@ -1952,8 +1952,6 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len) · 1951 unmodified lines
19521952
19531953 /* Now send the (possibly) fragmented message. */
19541954 list_for_each_entry(chunk, &datamsg->chunks, frag_list) {
1955− sctp_chunk_hold(chunk);
1956−
19571955 /* Do accounting for the write space. */
19581956 sctp_set_owner_w(chunk);
19591957
@@ -1966,15 +1964,13 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len) · 6 unmodified lines
19661964 * breaks.
19671965 */
19681966 err = sctp_primitive_SEND(net, asoc, datamsg);
1967+ sctp_datamsg_put(datamsg);
19691968 /* Did the lower layer accept the chunk? */
1970− if (err) {
1971− sctp_datamsg_free(datamsg);
1969+ if (err)
19721970 goto out_free;
1973− }
19741971
19751972 pr_debug("%s: we sent primitively\n", __func__);
19761973
1977− sctp_datamsg_put(datamsg);
19781974 err = msg_len;
19791975
19801976 if (unlikely(wait_connect)) {
@@ -7167,6 +7163,7 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk, · 5186 unmodified lines
71677163 newsk->sk_type = sk->sk_type;
71687164 newsk->sk_bound_dev_if = sk->sk_bound_dev_if;
71697165 newsk->sk_flags = sk->sk_flags;
7166+ newsk->sk_tsflags = sk->sk_tsflags;
71707167 newsk->sk_no_check_tx = sk->sk_no_check_tx;
71717168 newsk->sk_no_check_rx = sk->sk_no_check_rx;
71727169 newsk->sk_reuse = sk->sk_reuse;
@@ -7199,6 +7196,9 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk, · 26 unmodified lines
71997196 newinet->mc_ttl = 1;
72007197 newinet->mc_index = 0;
72017198 newinet->mc_list = NULL;
7199+
7200+ if (newsk->sk_flags & SK_FLAGS_TIMESTAMP)
7201+ net_enable_timestamp();
72027202 }
72037203
72047204 static inline void sctp_copy_descendant(struct sock *sk_to,
net/socket.c+1−0
@@ -1695,6 +1695,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size, · 1694 unmodified lines
16951695 msg.msg_name = addr ? (struct sockaddr *)&address : NULL;
16961696 /* We assume all kernel code knows the size of sockaddr_storage */
16971697 msg.msg_namelen = 0;
1698+ msg.msg_iocb = NULL;
16981699 if (sock->file->f_flags & O_NONBLOCK)
16991700 flags |= MSG_DONTWAIT;
17001701 err = sock_recvmsg(sock, &msg, iov_iter_count(&msg.msg_iter), flags);
net/sunrpc/backchannel_rqst.c+0−8
@@ -353,20 +353,12 @@ void xprt_complete_bc_request(struct rpc_rqst *req, uint32_t copied) · 352 unmodified lines
353353 {
354354 struct rpc_xprt *xprt = req->rq_xprt;
355355 struct svc_serv *bc_serv = xprt->bc_serv;
356− struct xdr_buf *rq_rcv_buf = &req->rq_rcv_buf;
357356
358357 spin_lock(&xprt->bc_pa_lock);
359358 list_del(&req->rq_bc_pa_list);
360359 xprt_dec_alloc_count(xprt, 1);
361360 spin_unlock(&xprt->bc_pa_lock);
362361
363− if (copied <= rq_rcv_buf->head[0].iov_len) {
364− rq_rcv_buf->head[0].iov_len = copied;
365− rq_rcv_buf->page_len = 0;
366− } else {
367− rq_rcv_buf->page_len = copied - rq_rcv_buf->head[0].iov_len;
368− }
369−
370362 req->rq_private_buf.len = copied;
371363 set_bit(RPC_BC_PA_IN_USE, &req->rq_bc_pa_state);
372364
net/sunrpc/sched.c+3−3
@@ -250,11 +250,11 @@ void rpc_destroy_wait_queue(struct rpc_wait_queue *queue) · 249 unmodified lines
250250 }
251251 EXPORT_SYMBOL_GPL(rpc_destroy_wait_queue);
252252
253−static int rpc_wait_bit_killable(struct wait_bit_key *key)
253+static int rpc_wait_bit_killable(struct wait_bit_key *key, int mode)
254254 {
255− if (fatal_signal_pending(current))
256− return -ERESTARTSYS;
257255 freezable_schedule_unsafe();
256+ if (signal_pending_state(mode, current))
257+ return -ERESTARTSYS;
258258 return 0;
259259 }
260260
net/sunrpc/svc.c+12−0
@@ -1363,7 +1363,19 @@ bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req, · 1362 unmodified lines
13631363 memcpy(&rqstp->rq_addr, &req->rq_xprt->addr, rqstp->rq_addrlen);
13641364 memcpy(&rqstp->rq_arg, &req->rq_rcv_buf, sizeof(rqstp->rq_arg));
13651365 memcpy(&rqstp->rq_res, &req->rq_snd_buf, sizeof(rqstp->rq_res));
1366+
1367+ /* Adjust the argument buffer length */
13661368 rqstp->rq_arg.len = req->rq_private_buf.len;
1369+ if (rqstp->rq_arg.len <= rqstp->rq_arg.head[0].iov_len) {
1370+ rqstp->rq_arg.head[0].iov_len = rqstp->rq_arg.len;
1371+ rqstp->rq_arg.page_len = 0;
1372+ } else if (rqstp->rq_arg.len <= rqstp->rq_arg.head[0].iov_len +
1373+ rqstp->rq_arg.page_len)
1374+ rqstp->rq_arg.page_len = rqstp->rq_arg.len -
1375+ rqstp->rq_arg.head[0].iov_len;
1376+ else
1377+ rqstp->rq_arg.len = rqstp->rq_arg.head[0].iov_len +
1378+ rqstp->rq_arg.page_len;
13671379
13681380 /* reset result send buffer "put" position */
13691381 resv->iov_len = 0;
net/unix/af_unix.c+3−10
@@ -2256,14 +2256,7 @@ static int unix_stream_read_generic(struct unix_stream_read_state *state) · 2255 unmodified lines
22562256 /* Lock the socket to prevent queue disordering
22572257 * while sleeps in memcpy_tomsg
22582258 */
2259− err = mutex_lock_interruptible(&u->readlock);
2260− if (unlikely(err)) {
2261− /* recvmsg() in non blocking mode is supposed to return -EAGAIN
2262− * sk_rcvtimeo is not honored by mutex_lock_interruptible()
2263− */
2264− err = noblock ? -EAGAIN : -ERESTARTSYS;
2265− goto out;
2266− }
2259+ mutex_lock(&u->readlock);
22672260
22682261 if (flags & MSG_PEEK)
22692262 skip = sk_peek_offset(sk, flags);
@@ -2307,12 +2300,12 @@ again: · 37 unmodified lines
23072300 timeo = unix_stream_data_wait(sk, timeo, last,
23082301 last_len);
23092302
2310− if (signal_pending(current) ||
2311− mutex_lock_interruptible(&u->readlock)) {
2303+ if (signal_pending(current)) {
23122304 err = sock_intr_errno(timeo);
23132305 goto out;
23142306 }
23152307
2308+ mutex_lock(&u->readlock);
23162309 continue;
23172310 unlock:
23182311 unix_state_unlock(sk);
net/wireless/nl80211.c+4−1
@@ -7941,8 +7941,10 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info) · 7940 unmodified lines
79417941 if (nla_get_flag(info->attrs[NL80211_ATTR_USE_RRM])) {
79427942 if (!(rdev->wiphy.features &
79437943 NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES) ||
7944− !(rdev->wiphy.features & NL80211_FEATURE_QUIET))
7944+ !(rdev->wiphy.features & NL80211_FEATURE_QUIET)) {
7945+ kzfree(connkeys);
79457946 return -EINVAL;
7947+ }
79467948 connect.flags |= ASSOC_REQ_USE_RRM;
79477949 }
79487950
@@ -9503,6 +9505,7 @@ static int nl80211_set_wowlan(struct sk_buff *skb, struct genl_info *info) · 1554 unmodified lines
95039505 if (new_triggers.tcp && new_triggers.tcp->sock)
95049506 sock_release(new_triggers.tcp->sock);
95059507 kfree(new_triggers.tcp);
9508+ kfree(new_triggers.nd_config);
95069509 return err;
95079510 }
95089511 #endif
net/wireless/reg.c+4−1
@@ -3029,6 +3029,7 @@ int set_regdom(const struct ieee80211_regdomain *rd, · 3028 unmodified lines
30293029 break;
30303030 default:
30313031 WARN(1, "invalid initiator %d\n", lr->initiator);
3032+ kfree(rd);
30323033 return -EINVAL;
30333034 }
30343035
@@ -3221,8 +3222,10 @@ int __init regulatory_init(void) · 186 unmodified lines
32213222 /* We always try to get an update for the static regdomain */
32223223 err = regulatory_hint_core(cfg80211_world_regdom->alpha2);
32233224 if (err) {
3224− if (err == -ENOMEM)
3225+ if (err == -ENOMEM) {
3226+ platform_device_unregister(reg_pdev);
32253227 return err;
3228+ }
32263229 /*
32273230 * N.B. kobject_uevent_env() can fail mainly for when we're out
32283231 * memory which is handled and propagated appropriately above
net/xfrm/xfrm_policy.c+36−14
@@ -303,6 +303,14 @@ struct xfrm_policy *xfrm_policy_alloc(struct net *net, gfp_t gfp) · 302 unmodified lines
303303 }
304304 EXPORT_SYMBOL(xfrm_policy_alloc);
305305
306+static void xfrm_policy_destroy_rcu(struct rcu_head *head)
307+{
308+ struct xfrm_policy *policy = container_of(head, struct xfrm_policy, rcu);
309+
310+ security_xfrm_policy_free(policy->security);
311+ kfree(policy);
312+}
313+
306314 /* Destroy xfrm_policy: descendant resources must be released to this moment. */
307315
308316 void xfrm_policy_destroy(struct xfrm_policy *policy)
@@ -312,8 +320,7 @@ void xfrm_policy_destroy(struct xfrm_policy *policy) · 3 unmodified lines
312320 if (del_timer(&policy->timer) || del_timer(&policy->polq.hold_timer))
313321 BUG();
314322
315− security_xfrm_policy_free(policy->security);
316− kfree(policy);
323+ call_rcu(&policy->rcu, xfrm_policy_destroy_rcu);
317324 }
318325 EXPORT_SYMBOL(xfrm_policy_destroy);
319326
@@ -1214,8 +1221,10 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir, · 894 unmodified lines
12141221 struct xfrm_policy *pol;
12151222 struct net *net = sock_net(sk);
12161223
1224+ rcu_read_lock();
12171225 read_lock_bh(&net->xfrm.xfrm_policy_lock);
1218− if ((pol = sk->sk_policy[dir]) != NULL) {
1226+ pol = rcu_dereference(sk->sk_policy[dir]);
1227+ if (pol != NULL) {
12191228 bool match = xfrm_selector_match(&pol->selector, fl,
12201229 sk->sk_family);
12211230 int err = 0;
@@ -1239,6 +1248,7 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir, · 17 unmodified lines
12391248 }
12401249 out:
12411250 read_unlock_bh(&net->xfrm.xfrm_policy_lock);
1251+ rcu_read_unlock();
12421252 return pol;
12431253 }
12441254
@@ -1307,13 +1317,14 @@ int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol) · 62 unmodified lines
13071317 #endif
13081318
13091319 write_lock_bh(&net->xfrm.xfrm_policy_lock);
1310− old_pol = sk->sk_policy[dir];
1311− sk->sk_policy[dir] = pol;
1320+ old_pol = rcu_dereference_protected(sk->sk_policy[dir],
1321+ lockdep_is_held(&net->xfrm.xfrm_policy_lock));
13121322 if (pol) {
13131323 pol->curlft.add_time = get_seconds();
13141324 pol->index = xfrm_gen_index(net, XFRM_POLICY_MAX+dir, 0);
13151325 xfrm_sk_policy_link(pol, dir);
13161326 }
1327+ rcu_assign_pointer(sk->sk_policy[dir], pol);
13171328 if (old_pol) {
13181329 if (pol)
13191330 xfrm_policy_requeue(old_pol, pol);
@@ -1361,17 +1372,26 @@ static struct xfrm_policy *clone_policy(const struct xfrm_policy *old, int dir) · 41 unmodified lines
13611372 return newp;
13621373 }
13631374
1364−int __xfrm_sk_clone_policy(struct sock *sk)
1375+int __xfrm_sk_clone_policy(struct sock *sk, const struct sock *osk)
13651376 {
1366− struct xfrm_policy *p0 = sk->sk_policy[0],
1367− *p1 = sk->sk_policy[1];
1377+ const struct xfrm_policy *p;
1378+ struct xfrm_policy *np;
1379+ int i, ret = 0;
13681380
1369− sk->sk_policy[0] = sk->sk_policy[1] = NULL;
1370− if (p0 && (sk->sk_policy[0] = clone_policy(p0, 0)) == NULL)
1371− return -ENOMEM;
1372− if (p1 && (sk->sk_policy[1] = clone_policy(p1, 1)) == NULL)
1373− return -ENOMEM;
1374− return 0;
1381+ rcu_read_lock();
1382+ for (i = 0; i < 2; i++) {
1383+ p = rcu_dereference(osk->sk_policy[i]);
1384+ if (p) {
1385+ np = clone_policy(p, i);
1386+ if (unlikely(!np)) {
1387+ ret = -ENOMEM;
1388+ break;
1389+ }
1390+ rcu_assign_pointer(sk->sk_policy[i], np);
1391+ }
1392+ }
1393+ rcu_read_unlock();
1394+ return ret;
13751395 }
13761396
13771397 static int
@@ -2198,6 +2218,7 @@ struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, · 820 unmodified lines
21982218 xdst = NULL;
21992219 route = NULL;
22002220
2221+ sk = sk_const_to_full_sk(sk);
22012222 if (sk && sk->sk_policy[XFRM_POLICY_OUT]) {
22022223 num_pols = 1;
22032224 pols[0] = xfrm_sk_policy_lookup(sk, XFRM_POLICY_OUT, fl);
@@ -2477,6 +2498,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, · 273 unmodified lines
24772498 }
24782499
24792500 pol = NULL;
2501+ sk = sk_to_full_sk(sk);
24802502 if (sk && sk->sk_policy[dir]) {
24812503 pol = xfrm_sk_policy_lookup(sk, dir, &fl);
24822504 if (IS_ERR(pol)) {
scripts/link-vmlinux.sh+1−1
@@ -62,7 +62,7 @@ vmlinux_link() · 61 unmodified lines
6262 -Wl,--start-group \
6363 ${KBUILD_VMLINUX_MAIN} \
6464 -Wl,--end-group \
65− -lutil ${1}
65+ -lutil -lrt ${1}
6666 rm -f linux
6767 fi
6868 }
sound/pci/hda/hda_intel.c+23−0
@@ -355,6 +355,8 @@ enum { · 354 unmodified lines
355355 ((pci)->device == 0x0d0c) || \
356356 ((pci)->device == 0x160c))
357357
358+#define IS_BROXTON(pci) ((pci)->device == 0x5a98)
359+
358360 static char *driver_short_names[] = {
359361 [AZX_DRIVER_ICH] = "HDA Intel",
360362 [AZX_DRIVER_PCH] = "HDA Intel PCH",
@@ -506,15 +508,36 @@ static void azx_init_pci(struct azx *chip) · 145 unmodified lines
506508 }
507509 }
508510
511+/*
512+ * In BXT-P A0, HD-Audio DMA requests is later than expected,
513+ * and makes an audio stream sensitive to system latencies when
514+ * 24/32 bits are playing.
515+ * Adjusting threshold of DMA fifo to force the DMA request
516+ * sooner to improve latency tolerance at the expense of power.
517+ */
518+static void bxt_reduce_dma_latency(struct azx *chip)
519+{
520+ u32 val;
521+
522+ val = azx_readl(chip, SKL_EM4L);
523+ val &= (0x3 << 20);
524+ azx_writel(chip, SKL_EM4L, val);
525+}
526+
509527 static void hda_intel_init_chip(struct azx *chip, bool full_reset)
510528 {
511529 struct hdac_bus *bus = azx_bus(chip);
530+ struct pci_dev *pci = chip->pci;
512531
513532 if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
514533 snd_hdac_set_codec_wakeup(bus, true);
515534 azx_init_chip(chip, full_reset);
516535 if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
517536 snd_hdac_set_codec_wakeup(bus, false);
537+
538+ /* reduce dma latency to avoid noise */
539+ if (IS_BROXTON(pci))
540+ bxt_reduce_dma_latency(chip);
518541 }
519542
520543 /* calculate runtime delay from LPIB */
sound/pci/hda/patch_ca0132.c+2−1
@@ -778,7 +778,8 @@ static const struct hda_pintbl alienware_pincfgs[] = { · 777 unmodified lines
778778 };
779779
780780 static const struct snd_pci_quirk ca0132_quirks[] = {
781− SND_PCI_QUIRK(0x1028, 0x0685, "Alienware 15", QUIRK_ALIENWARE),
781+ SND_PCI_QUIRK(0x1028, 0x0685, "Alienware 15 2015", QUIRK_ALIENWARE),
782+ SND_PCI_QUIRK(0x1028, 0x0688, "Alienware 17 2015", QUIRK_ALIENWARE),
782783 {}
783784 };
784785
sound/pci/hda/patch_realtek.c+55−7
@@ -111,6 +111,7 @@ struct alc_spec { · 110 unmodified lines
111111 void (*power_hook)(struct hda_codec *codec);
112112 #endif
113113 void (*shutup)(struct hda_codec *codec);
114+ void (*reboot_notify)(struct hda_codec *codec);
114115
115116 int init_amp;
116117 int codec_variant; /* flag for other variants */
@@ -773,6 +774,25 @@ static inline void alc_shutup(struct hda_codec *codec) · 656 unmodified lines
773774 snd_hda_shutup_pins(codec);
774775 }
775776
777+static void alc_reboot_notify(struct hda_codec *codec)
778+{
779+ struct alc_spec *spec = codec->spec;
780+
781+ if (spec && spec->reboot_notify)
782+ spec->reboot_notify(codec);
783+ else
784+ alc_shutup(codec);
785+}
786+
787+/* power down codec to D3 at reboot/shutdown; set as reboot_notify ops */
788+static void alc_d3_at_reboot(struct hda_codec *codec)
789+{
790+ snd_hda_codec_set_power_to_all(codec, codec->core.afg, AC_PWRST_D3);
791+ snd_hda_codec_write(codec, codec->core.afg, 0,
792+ AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
793+ msleep(10);
794+}
795+
776796 #define alc_free snd_hda_gen_free
777797
778798 #ifdef CONFIG_PM
@@ -818,7 +838,7 @@ static const struct hda_codec_ops alc_patch_ops = { · 39 unmodified lines
818838 .suspend = alc_suspend,
819839 .check_power_status = snd_hda_gen_check_power_status,
820840 #endif
821− .reboot_notify = alc_shutup,
841+ .reboot_notify = alc_reboot_notify,
822842 };
823843
824844
@@ -4198,6 +4218,8 @@ static void alc_fixup_tpt440_dock(struct hda_codec *codec, · 3373 unmodified lines
41984218 struct alc_spec *spec = codec->spec;
41994219
42004220 if (action == HDA_FIXUP_ACT_PRE_PROBE) {
4221+ spec->shutup = alc_no_shutup; /* reduce click noise */
4222+ spec->reboot_notify = alc_d3_at_reboot; /* reduce noise */
42014223 spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;
42024224 codec->power_save_node = 0; /* avoid click noises */
42034225 snd_hda_apply_pincfgs(codec, pincfgs);
@@ -4578,6 +4600,7 @@ enum { · 374 unmodified lines
45784600 ALC255_FIXUP_HEADSET_MODE_NO_HP_MIC,
45794601 ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,
45804602 ALC292_FIXUP_TPT440_DOCK,
4603+ ALC292_FIXUP_TPT440,
45814604 ALC283_FIXUP_BXBT2807_MIC,
45824605 ALC255_FIXUP_DELL_WMI_MIC_MUTE_LED,
45834606 ALC282_FIXUP_ASPIRE_V5_PINS,
@@ -4593,9 +4616,11 @@ enum { · 9 unmodified lines
45934616 ALC288_FIXUP_DISABLE_AAMIX,
45944617 ALC292_FIXUP_DELL_E7X,
45954618 ALC292_FIXUP_DISABLE_AAMIX,
4619+ ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK,
45964620 ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,
45974621 ALC275_FIXUP_DELL_XPS,
45984622 ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE,
4623+ ALC293_FIXUP_LENOVO_SPK_NOISE,
45994624 };
46004625
46014626 static const struct hda_fixup alc269_fixups[] = {
@@ -5050,6 +5075,12 @@ static const struct hda_fixup alc269_fixups[] = { · 448 unmodified lines
50505075 .chained = true,
50515076 .chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST
50525077 },
5078+ [ALC292_FIXUP_TPT440] = {
5079+ .type = HDA_FIXUP_FUNC,
5080+ .v.func = alc_fixup_disable_aamix,
5081+ .chained = true,
5082+ .chain_id = ALC292_FIXUP_TPT440_DOCK,
5083+ },
50535084 [ALC283_FIXUP_BXBT2807_MIC] = {
50545085 .type = HDA_FIXUP_PINS,
50555086 .v.pins = (const struct hda_pintbl[]) {
@@ -5149,6 +5180,12 @@ static const struct hda_fixup alc269_fixups[] = { · 93 unmodified lines
51495180 .chained = true,
51505181 .chain_id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE
51515182 },
5183+ [ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK] = {
5184+ .type = HDA_FIXUP_FUNC,
5185+ .v.func = alc_fixup_disable_aamix,
5186+ .chained = true,
5187+ .chain_id = ALC293_FIXUP_DELL1_MIC_NO_PRESENCE
5188+ },
51525189 [ALC292_FIXUP_DELL_E7X] = {
51535190 .type = HDA_FIXUP_FUNC,
51545191 .v.func = alc_fixup_dell_xps13,
@@ -5187,6 +5224,12 @@ static const struct hda_fixup alc269_fixups[] = { · 32 unmodified lines
51875224 .chained = true,
51885225 .chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE
51895226 },
5227+ [ALC293_FIXUP_LENOVO_SPK_NOISE] = {
5228+ .type = HDA_FIXUP_FUNC,
5229+ .v.func = alc_fixup_disable_aamix,
5230+ .chained = true,
5231+ .chain_id = ALC269_FIXUP_THINKPAD_ACPI
5232+ },
51905233 };
51915234
51925235 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -5221,11 +5264,11 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { · 28 unmodified lines
52215264 SND_PCI_QUIRK(0x1028, 0x06c7, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
52225265 SND_PCI_QUIRK(0x1028, 0x06d9, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
52235266 SND_PCI_QUIRK(0x1028, 0x06da, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
5224− SND_PCI_QUIRK(0x1028, 0x06db, "Dell", ALC292_FIXUP_DISABLE_AAMIX),
5225− SND_PCI_QUIRK(0x1028, 0x06dd, "Dell", ALC292_FIXUP_DISABLE_AAMIX),
5226− SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC292_FIXUP_DISABLE_AAMIX),
5227− SND_PCI_QUIRK(0x1028, 0x06df, "Dell", ALC292_FIXUP_DISABLE_AAMIX),
5228− SND_PCI_QUIRK(0x1028, 0x06e0, "Dell", ALC292_FIXUP_DISABLE_AAMIX),
5267+ SND_PCI_QUIRK(0x1028, 0x06db, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),
5268+ SND_PCI_QUIRK(0x1028, 0x06dd, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),
5269+ SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),
5270+ SND_PCI_QUIRK(0x1028, 0x06df, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),
5271+ SND_PCI_QUIRK(0x1028, 0x06e0, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),
52295272 SND_PCI_QUIRK(0x1028, 0x0704, "Dell XPS 13", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),
52305273 SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
52315274 SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
@@ -5325,15 +5368,17 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { · 93 unmodified lines
53255368 SND_PCI_QUIRK(0x17aa, 0x21fb, "Thinkpad T430s", ALC269_FIXUP_LENOVO_DOCK),
53265369 SND_PCI_QUIRK(0x17aa, 0x2203, "Thinkpad X230 Tablet", ALC269_FIXUP_LENOVO_DOCK),
53275370 SND_PCI_QUIRK(0x17aa, 0x2208, "Thinkpad T431s", ALC269_FIXUP_LENOVO_DOCK),
5328− SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad T440s", ALC292_FIXUP_TPT440_DOCK),
5371+ SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad T440s", ALC292_FIXUP_TPT440),
53295372 SND_PCI_QUIRK(0x17aa, 0x220e, "Thinkpad T440p", ALC292_FIXUP_TPT440_DOCK),
53305373 SND_PCI_QUIRK(0x17aa, 0x2210, "Thinkpad T540p", ALC292_FIXUP_TPT440_DOCK),
53315374 SND_PCI_QUIRK(0x17aa, 0x2211, "Thinkpad W541", ALC292_FIXUP_TPT440_DOCK),
53325375 SND_PCI_QUIRK(0x17aa, 0x2212, "Thinkpad T440", ALC292_FIXUP_TPT440_DOCK),
53335376 SND_PCI_QUIRK(0x17aa, 0x2214, "Thinkpad X240", ALC292_FIXUP_TPT440_DOCK),
53345377 SND_PCI_QUIRK(0x17aa, 0x2215, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
5378+ SND_PCI_QUIRK(0x17aa, 0x2218, "Thinkpad X1 Carbon 2nd", ALC292_FIXUP_TPT440_DOCK),
53355379 SND_PCI_QUIRK(0x17aa, 0x2223, "ThinkPad T550", ALC292_FIXUP_TPT440_DOCK),
53365380 SND_PCI_QUIRK(0x17aa, 0x2226, "ThinkPad X250", ALC292_FIXUP_TPT440_DOCK),
5381+ SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC293_FIXUP_LENOVO_SPK_NOISE),
53375382 SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
53385383 SND_PCI_QUIRK(0x17aa, 0x3978, "IdeaPad Y410P", ALC269_FIXUP_NO_SHUTUP),
53395384 SND_PCI_QUIRK(0x17aa, 0x5013, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
@@ -5343,6 +5388,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { · 3 unmodified lines
53435388 SND_PCI_QUIRK(0x17aa, 0x5034, "Thinkpad T450", ALC292_FIXUP_TPT440_DOCK),
53445389 SND_PCI_QUIRK(0x17aa, 0x5036, "Thinkpad T450s", ALC292_FIXUP_TPT440_DOCK),
53455390 SND_PCI_QUIRK(0x17aa, 0x503c, "Thinkpad L450", ALC292_FIXUP_TPT440_DOCK),
5391+ SND_PCI_QUIRK(0x17aa, 0x504b, "Thinkpad", ALC293_FIXUP_LENOVO_SPK_NOISE),
53465392 SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
53475393 SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),
53485394 SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
@@ -5423,6 +5469,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { · 74 unmodified lines
54235469 {.id = ALC283_FIXUP_CHROME_BOOK, .name = "alc283-dac-wcaps"},
54245470 {.id = ALC283_FIXUP_SENSE_COMBO_JACK, .name = "alc283-sense-combo"},
54255471 {.id = ALC292_FIXUP_TPT440_DOCK, .name = "tpt440-dock"},
5472+ {.id = ALC292_FIXUP_TPT440, .name = "tpt440"},
54265473 {}
54275474 };
54285475
@@ -6409,6 +6456,7 @@ static const struct hda_fixup alc662_fixups[] = { · 980 unmodified lines
64096456 static const struct snd_pci_quirk alc662_fixup_tbl[] = {
64106457 SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_FIXUP_ASUS_MODE2),
64116458 SND_PCI_QUIRK(0x1025, 0x022f, "Acer Aspire One", ALC662_FIXUP_INV_DMIC),
6459+ SND_PCI_QUIRK(0x1025, 0x0241, "Packard Bell DOTS", ALC662_FIXUP_INV_DMIC),
64126460 SND_PCI_QUIRK(0x1025, 0x0308, "Acer Aspire 8942G", ALC662_FIXUP_ASPIRE),
64136461 SND_PCI_QUIRK(0x1025, 0x031c, "Gateway NV79", ALC662_FIXUP_SKU_IGNORE),
64146462 SND_PCI_QUIRK(0x1025, 0x0349, "eMachines eM250", ALC662_FIXUP_INV_DMIC),
sound/pci/rme96.c+26−15
@@ -741,10 +741,11 @@ snd_rme96_playback_setrate(struct rme96 *rme96, · 740 unmodified lines
741741 {
742742 /* change to/from double-speed: reset the DAC (if available) */
743743 snd_rme96_reset_dac(rme96);
744+ return 1; /* need to restore volume */
744745 } else {
745746 writel(rme96->wcreg, rme96->iobase + RME96_IO_CONTROL_REGISTER);
747+ return 0;
746748 }
747− return 0;
748749 }
749750
750751 static int
@@ -980,6 +981,7 @@ snd_rme96_playback_hw_params(struct snd_pcm_substream *substream, · 229 unmodified lines
980981 struct rme96 *rme96 = snd_pcm_substream_chip(substream);
981982 struct snd_pcm_runtime *runtime = substream->runtime;
982983 int err, rate, dummy;
984+ bool apply_dac_volume = false;
983985
984986 runtime->dma_area = (void __force *)(rme96->iobase +
985987 RME96_IO_PLAY_BUFFER);
@@ -993,24 +995,26 @@ snd_rme96_playback_hw_params(struct snd_pcm_substream *substream, · 7 unmodified lines
993995 {
994996 /* slave clock */
995997 if ((int)params_rate(params) != rate) {
996− spin_unlock_irq(&rme96->lock);
997− return -EIO;
998− }
999− } else if ((err = snd_rme96_playback_setrate(rme96, params_rate(params))) < 0) {
1000− spin_unlock_irq(&rme96->lock);
1001− return err;
1002− }
1003− if ((err = snd_rme96_playback_setformat(rme96, params_format(params))) < 0) {
1004− spin_unlock_irq(&rme96->lock);
1005− return err;
998+ err = -EIO;
999+ goto error;
1000+ }
1001+ } else {
1002+ err = snd_rme96_playback_setrate(rme96, params_rate(params));
1003+ if (err < 0)
1004+ goto error;
1005+ apply_dac_volume = err > 0; /* need to restore volume later? */
10061006 }
1007+
1008+ err = snd_rme96_playback_setformat(rme96, params_format(params));
1009+ if (err < 0)
1010+ goto error;
10071011 snd_rme96_setframelog(rme96, params_channels(params), 1);
10081012 if (rme96->capture_periodsize != 0) {
10091013 if (params_period_size(params) << rme96->playback_frlog !=
10101014 rme96->capture_periodsize)
10111015 {
1012− spin_unlock_irq(&rme96->lock);
1013− return -EBUSY;
1016+ err = -EBUSY;
1017+ goto error;
10141018 }
10151019 }
10161020 rme96->playback_periodsize =
@@ -1021,9 +1025,16 @@ snd_rme96_playback_hw_params(struct snd_pcm_substream *substream, · 4 unmodified lines
10211025 rme96->wcreg &= ~(RME96_WCR_PRO | RME96_WCR_DOLBY | RME96_WCR_EMP);
10221026 writel(rme96->wcreg |= rme96->wcreg_spdif_stream, rme96->iobase + RME96_IO_CONTROL_REGISTER);
10231027 }
1028+
1029+ err = 0;
1030+ error:
10241031 spin_unlock_irq(&rme96->lock);
1025−
1026− return 0;
1032+ if (apply_dac_volume) {
1033+ usleep_range(3000, 10000);
1034+ snd_rme96_apply_dac_volume(rme96);
1035+ }
1036+
1037+ return err;
10271038 }
10281039
10291040 static int
sound/usb/mixer.c+2−0
@@ -1354,6 +1354,8 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, · 1353 unmodified lines
13541354 }
13551355 }
13561356
1357+ snd_usb_mixer_fu_apply_quirk(state->mixer, cval, unitid, kctl);
1358+
13571359 range = (cval->max - cval->min) / cval->res;
13581360 /*
13591361 * Are there devices with volume range more than 255? I use a bit more
sound/usb/mixer_maps.c+0−12
@@ -348,13 +348,6 @@ static struct usbmix_name_map bose_companion5_map[] = { · 347 unmodified lines
348348 { 0 } /* terminator */
349349 };
350350
351−/* Dragonfly DAC 1.2, the dB conversion factor is 1 instead of 256 */
352−static struct usbmix_dB_map dragonfly_1_2_dB = {0, 5000};
353−static struct usbmix_name_map dragonfly_1_2_map[] = {
354− { 7, NULL, .dB = &dragonfly_1_2_dB },
355− { 0 } /* terminator */
356−};
357−
358351 /*
359352 * Control map entries
360353 */
@@ -470,11 +463,6 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { · 109 unmodified lines
470463 .id = USB_ID(0x05a7, 0x1020),
471464 .map = bose_companion5_map,
472465 },
473− {
474− /* Dragonfly DAC 1.2 */
475− .id = USB_ID(0x21b4, 0x0081),
476− .map = dragonfly_1_2_map,
477− },
478466 { 0 } /* terminator */
479467 };
480468
sound/usb/mixer_quirks.c+37−0
@@ -37,6 +37,7 @@ · 36 unmodified lines
3737 #include <sound/control.h>
3838 #include <sound/hwdep.h>
3939 #include <sound/info.h>
40+#include <sound/tlv.h>
4041
4142 #include "usbaudio.h"
4243 #include "mixer.h"
@@ -1825,3 +1826,39 @@ void snd_usb_mixer_rc_memory_change(struct usb_mixer_interface *mixer, · 1782 unmodified lines
18251826 }
18261827 }
18271828
1829+static void snd_dragonfly_quirk_db_scale(struct usb_mixer_interface *mixer,
1830+ struct snd_kcontrol *kctl)
1831+{
1832+ /* Approximation using 10 ranges based on output measurement on hw v1.2.
1833+ * This seems close to the cubic mapping e.g. alsamixer uses. */
1834+ static const DECLARE_TLV_DB_RANGE(scale,
1835+ 0, 1, TLV_DB_MINMAX_ITEM(-5300, -4970),
1836+ 2, 5, TLV_DB_MINMAX_ITEM(-4710, -4160),
1837+ 6, 7, TLV_DB_MINMAX_ITEM(-3884, -3710),
1838+ 8, 14, TLV_DB_MINMAX_ITEM(-3443, -2560),
1839+ 15, 16, TLV_DB_MINMAX_ITEM(-2475, -2324),
1840+ 17, 19, TLV_DB_MINMAX_ITEM(-2228, -2031),
1841+ 20, 26, TLV_DB_MINMAX_ITEM(-1910, -1393),
1842+ 27, 31, TLV_DB_MINMAX_ITEM(-1322, -1032),
1843+ 32, 40, TLV_DB_MINMAX_ITEM(-968, -490),
1844+ 41, 50, TLV_DB_MINMAX_ITEM(-441, 0),
1845+ );
1846+
1847+ usb_audio_info(mixer->chip, "applying DragonFly dB scale quirk\n");
1848+ kctl->tlv.p = scale;
1849+ kctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;
1850+ kctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK;
1851+}
1852+
1853+void snd_usb_mixer_fu_apply_quirk(struct usb_mixer_interface *mixer,
1854+ struct usb_mixer_elem_info *cval, int unitid,
1855+ struct snd_kcontrol *kctl)
1856+{
1857+ switch (mixer->chip->usb_id) {
1858+ case USB_ID(0x21b4, 0x0081): /* AudioQuest DragonFly */
1859+ if (unitid == 7 && cval->min == 0 && cval->max == 50)
1860+ snd_dragonfly_quirk_db_scale(mixer, kctl);
1861+ break;
1862+ }
1863+}
1864+
sound/usb/mixer_quirks.h+4−0
@@ -9,5 +9,9 @@ void snd_emuusb_set_samplerate(struct snd_usb_audio *chip, · 8 unmodified lines
99 void snd_usb_mixer_rc_memory_change(struct usb_mixer_interface *mixer,
1010 int unitid);
1111
12+void snd_usb_mixer_fu_apply_quirk(struct usb_mixer_interface *mixer,
13+ struct usb_mixer_elem_info *cval, int unitid,
14+ struct snd_kcontrol *kctl);
15+
1216 #endif /* SND_USB_MIXER_QUIRKS_H */
1317
sound/usb/quirks.c+1−0
@@ -1125,6 +1125,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) · 1124 unmodified lines
11251125 case USB_ID(0x045E, 0x0779): /* MS Lifecam HD-3000 */
11261126 case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
11271127 case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */
1128+ case USB_ID(0x21B4, 0x0081): /* AudioQuest DragonFly */
11281129 return true;
11291130 }
11301131 return false;
tools/virtio/linux/kernel.h+6−0
@@ -110,4 +110,10 @@ static inline void free_page(unsigned long addr) · 109 unmodified lines
110110 (void) (&_min1 == &_min2); \
111111 _min1 < _min2 ? _min1 : _min2; })
112112
113+/* TODO: empty stubs for now. Broken but enough for virtio_ring.c */
114+#define list_add_tail(a, b) do {} while (0)
115+#define list_del(a) do {} while (0)
116+#define list_for_each_entry(a, b, c) while (0)
117+/* end of stubs */
118+
113119 #endif /* KERNEL_H */
tools/virtio/linux/virtio.h+0−6
@@ -3,12 +3,6 @@ · 2 unmodified lines
33 #include <linux/scatterlist.h>
44 #include <linux/kernel.h>
55
6−/* TODO: empty stubs for now. Broken but enough for virtio_ring.c */
7−#define list_add_tail(a, b) do {} while (0)
8−#define list_del(a) do {} while (0)
9−#define list_for_each_entry(a, b, c) while (0)
10−/* end of stubs */
11−
126 struct virtio_device {
137 void *dev;
148 u64 features;
tools/virtio/linux/virtio_config.h+13−7
@@ -40,33 +40,39 @@ static inline void __virtio_clear_bit(struct virtio_device *vdev, · 39 unmodified lines
4040 #define virtio_has_feature(dev, feature) \
4141 (__virtio_test_bit((dev), feature))
4242
43+static inline bool virtio_is_little_endian(struct virtio_device *vdev)
44+{
45+ return virtio_has_feature(vdev, VIRTIO_F_VERSION_1) ||
46+ virtio_legacy_is_little_endian();
47+}
48+
49+/* Memory accessors */
4350 static inline u16 virtio16_to_cpu(struct virtio_device *vdev, __virtio16 val)
4451 {
45− return __virtio16_to_cpu(virtio_has_feature(vdev, VIRTIO_F_VERSION_1), val);
52+ return __virtio16_to_cpu(virtio_is_little_endian(vdev), val);
4653 }
4754
4855 static inline __virtio16 cpu_to_virtio16(struct virtio_device *vdev, u16 val)
4956 {
50− return __cpu_to_virtio16(virtio_has_feature(vdev, VIRTIO_F_VERSION_1), val);
57+ return __cpu_to_virtio16(virtio_is_little_endian(vdev), val);
5158 }
5259
5360 static inline u32 virtio32_to_cpu(struct virtio_device *vdev, __virtio32 val)
5461 {
55− return __virtio32_to_cpu(virtio_has_feature(vdev, VIRTIO_F_VERSION_1), val);
62+ return __virtio32_to_cpu(virtio_is_little_endian(vdev), val);
5663 }
5764
5865 static inline __virtio32 cpu_to_virtio32(struct virtio_device *vdev, u32 val)
5966 {
60− return __cpu_to_virtio32(virtio_has_feature(vdev, VIRTIO_F_VERSION_1), val);
67+ return __cpu_to_virtio32(virtio_is_little_endian(vdev), val);
6168 }
6269
6370 static inline u64 virtio64_to_cpu(struct virtio_device *vdev, __virtio64 val)
6471 {
65− return __virtio64_to_cpu(virtio_has_feature(vdev, VIRTIO_F_VERSION_1), val);
72+ return __virtio64_to_cpu(virtio_is_little_endian(vdev), val);
6673 }
6774
6875 static inline __virtio64 cpu_to_virtio64(struct virtio_device *vdev, u64 val)
6976 {
70− return __cpu_to_virtio64(virtio_has_feature(vdev, VIRTIO_F_VERSION_1), val);
77+ return __cpu_to_virtio64(virtio_is_little_endian(vdev), val);
7178 }
72−
virt/kvm/arm/vgic.c+1−1
@@ -1114,7 +1114,7 @@ bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, struct irq_phys_map *map) · 1113 unmodified lines
11141114 return true;
11151115 }
11161116
1117− return dist_active_irq(vcpu);
1117+ return vgic_irq_is_active(vcpu, map->virt_irq);
11181118 }
11191119
11201120 /*

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t