History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 12 years ago

Commit eb84d6b2 parents 97a13e5 d030671694 files · +6360 −3445Browse files

Unified · Split

694 files
  1. Documentation/SubmittingPatches +1 −0
  2. Documentation/devicetree/bindings/input/atmel,maxtouch.txt +11 −0
  3. Documentation/devicetree/bindings/mfd/tc3589x.txt +107 −0
  4. Documentation/devicetree/bindings/mtd/gpmc-nand.txt +1 −1
  5. Documentation/devicetree/bindings/net/stmmac.txt +4 −0
  6. Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt +1 −1
  7. Documentation/devicetree/bindings/regulator/tps65090.txt +2 −2
  8. Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt +1 −1
  9. Documentation/dma-buf-sharing.txt +8 −6
  10. Documentation/filesystems/nfs/nfs-rdma.txt +9 −7
  11. Documentation/filesystems/seq_file.txt +33 −0
  12. Documentation/gpio/consumer.txt +23 −1
  13. Documentation/i2c/dev-interface +5 −5
  14. Documentation/kdump/kdump.txt +33 −3
  15. Documentation/misc-devices/lis3lv02d +1 −1
  16. Documentation/power/regulator/consumer.txt +4 −3
  17. Documentation/power/regulator/design.txt +4 −4
  18. Documentation/power/regulator/machine.txt +2 −2
  19. Documentation/power/regulator/overview.txt +3 −3
  20. Documentation/power/regulator/regulator.txt +3 −3
  21. Documentation/this_cpu_ops.txt +171 −42
  22. Documentation/x86/tlb.txt +1 −1
  23. MAINTAINERS +28 −3
  24. Makefile +1 −1
  25. arch/alpha/include/asm/io.h +8 −4
  26. arch/alpha/include/asm/unistd.h +1 −1
  27. arch/alpha/include/uapi/asm/unistd.h +3 −0
  28. arch/alpha/kernel/systbls.S +3 −0
  29. arch/arc/mm/cache_arc700.c +2 −1
  30. arch/arm/Kconfig +0 −2
  31. arch/arm/boot/dts/am4372.dtsi +2 −2
  32. arch/arm/boot/dts/am437x-gp-evm.dts +2 −4
  33. arch/arm/boot/dts/am43x-epos-evm.dts +4 −5
  34. arch/arm/boot/dts/at91rm9200.dtsi +1 −1
  35. arch/arm/boot/dts/at91sam9g20.dtsi +1 −0
  36. arch/arm/boot/dts/dra7-evm.dts +36 −11
  37. arch/arm/boot/dts/dra7.dtsi +8 −8
  38. arch/arm/boot/dts/exynos4412-odroid-common.dtsi +13 −0
  39. arch/arm/boot/dts/imx53-qsrb.dts +8 −0
  40. arch/arm/boot/dts/imx53.dtsi +1 −1
  41. arch/arm/boot/dts/imx6dl-hummingboard.dts +3 −1
  42. arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts +2 −1
  43. arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +14 −5
  44. arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi +1 −1
  45. arch/arm/boot/dts/imx6sx-pinfunc.h +13 −13
  46. arch/arm/boot/dts/omap3-beagle.dts +1 −0
  47. arch/arm/boot/dts/omap3-n900.dts +1 −1
  48. arch/arm/boot/dts/omap3430-sdp.dts +1 −1
  49. arch/arm/boot/dts/omap3xxx-clocks.dtsi +1 −0
  50. arch/arm/boot/dts/omap54xx-clocks.dtsi +10 −6
  51. arch/arm/boot/dts/r8a7791-koelsch.dts +0 −7
  52. arch/arm/boot/dts/rk3066a-bqcurie2.dts +2 −0
  53. arch/arm/boot/dts/rk3188-radxarock.dts +2 −0
  54. arch/arm/boot/dts/ste-snowball.dts +0 −1
  55. arch/arm/boot/dts/sun6i-a31.dtsi +8 −0
  56. arch/arm/boot/dts/tegra30-apalis.dtsi +10 −1
  57. arch/arm/boot/dts/tegra30-colibri.dtsi +10 −1
  58. arch/arm/boot/dts/twl6030.dtsi +0 −4
  59. arch/arm/boot/dts/vf610-twr.dts +1 −1
  60. arch/arm/common/edma.c +5 −4
  61. arch/arm/include/asm/cacheflush.h +0 −1
  62. arch/arm/include/asm/cputype.h +2 −1
  63. arch/arm/include/asm/elf.h +1 −0
  64. arch/arm/include/asm/smp_plat.h +15 −0
  65. arch/arm/kernel/entry-header.S +15 −14
  66. arch/arm/kernel/module.c +1 −0
  67. arch/arm/kvm/handle_exit.c +2 −0
  68. arch/arm/kvm/init.S +4 −0
  69. arch/arm/mach-at91/board-dt-rm9200.c +10 −1
  70. arch/arm/mach-bcm/Makefile +0 −1
  71. arch/arm/mach-bcm/brcmstb.h +0 −19
  72. arch/arm/mach-bcm/headsmp-brcmstb.S +0 −33
  73. arch/arm/mach-bcm/platsmp-brcmstb.c +0 −363
  74. arch/arm/mach-exynos/mcpm-exynos.c +0 −1
  75. arch/arm/mach-imx/Kconfig +0 −2
  76. arch/arm/mach-imx/Makefile +2 −0
  77. arch/arm/mach-imx/clk-imx6q.c +8 −2
  78. arch/arm/mach-imx/suspend-imx6.S +2 −0
  79. arch/arm/mach-omap2/board-flash.c +1 −1
  80. arch/arm/mach-omap2/gpmc-nand.c +2 −1
  81. arch/arm/mach-omap2/gpmc.c +8 −6
  82. arch/arm/mach-omap2/id.c +1 −1
  83. arch/arm/mach-omap2/omap_device.c +1 −1
  84. arch/arm/mach-omap2/omap_hwmod.c +7 −0
  85. arch/arm/mach-omap2/omap_hwmod_7xx_data.c +20 −2
  86. arch/arm/mach-omap2/soc.h +6 −0
  87. arch/arm/mach-shmobile/Kconfig +2 −0
  88. arch/arm/mach-shmobile/clock-r8a7790.c +2 −2
  89. arch/arm/mach-shmobile/clock-r8a7791.c +1 −1
  90. arch/arm/mach-shmobile/clock-sh73a0.c +1 −1
  91. arch/arm/mach-vexpress/spc.c +11 −3
  92. arch/arm/mm/abort-ev6.S +0 −6
  93. arch/arm/mm/abort-ev7.S +0 −6
  94. arch/arm64/crypto/sha2-ce-glue.c +0 −1
  95. arch/arm64/include/asm/hw_breakpoint.h +0 −1
  96. arch/arm64/include/asm/processor.h +1 −1
  97. arch/arm64/include/asm/ptrace.h +1 −1
  98. arch/arm64/kernel/efi.c +2 −0
  99. arch/arm64/kernel/fpsimd.c +1 −0
  100. arch/arm64/kernel/head.S +0 −4
  101. arch/arm64/kernel/perf_regs.c +6 −0
  102. arch/arm64/kernel/ptrace.c +9 −4
  103. arch/arm64/kernel/setup.c +22 −18
  104. arch/arm64/kvm/handle_exit.c +2 −0
  105. arch/arm64/kvm/hyp-init.S +4 −0
  106. arch/hexagon/mm/cache.c +1 −0
  107. arch/ia64/Kconfig +0 −2
  108. arch/m68k/Kconfig +0 −2
  109. arch/m68k/include/asm/unistd.h +1 −1
  110. arch/m68k/include/uapi/asm/unistd.h +2 −0
  111. arch/m68k/kernel/syscalltable.S +2 −0
  112. arch/mips/Kconfig +0 −2
  113. arch/mips/alchemy/devboards/db1200.c +1 −5
  114. arch/mips/bcm47xx/setup.c +11 −2
  115. arch/mips/cavium-octeon/setup.c +13 −6
  116. arch/mips/include/asm/eva.h +43 −0
  117. arch/mips/include/asm/gic.h +1 −1
  118. arch/mips/include/asm/irq.h +2 −0
  119. arch/mips/include/asm/mach-malta/kernel-entry-init.h +16 −6
  120. arch/mips/include/asm/mach-netlogic/topology.h +0 −7
  121. arch/mips/include/asm/pgtable.h +3 −5
  122. arch/mips/include/asm/syscall.h +5 −3
  123. arch/mips/kernel/cps-vec.S +4 −0
  124. arch/mips/kernel/perf_event_mipsxx.c +1 −1
  125. arch/mips/kernel/scall64-o32.S +8 −4
  126. arch/mips/loongson/loongson-3/cop2-ex.c +4 −4
  127. arch/mips/loongson/loongson-3/numa.c +0 −2
  128. arch/mips/mm/cache.c +19 −8
  129. arch/mips/mti-malta/malta-memory.c +10 −4
  130. arch/mips/pmcs-msp71xx/msp_irq.c +1 −1
  131. arch/powerpc/Kconfig +0 −2
  132. arch/powerpc/kvm/book3s_64_mmu_hv.c +2 −2
  133. arch/s390/Kconfig +0 −2
  134. arch/s390/include/asm/pgtable.h +4 −2
  135. arch/s390/include/uapi/asm/unistd.h +4 −1
  136. arch/s390/kernel/compat_wrapper.c +3 −0
  137. arch/s390/kernel/ipl.c +7 −0
  138. arch/s390/kernel/setup.c +19 −0
  139. arch/s390/kernel/syscalls.S +3 −0
  140. arch/s390/kvm/kvm-s390.c +0 −13
  141. arch/s390/mm/pgtable.c +10 −0
  142. arch/sh/Kconfig +3 −2
  143. arch/sh/mm/cache.c +1 −0
  144. arch/tile/Kconfig +0 −2
  145. arch/tile/kernel/smp.c +1 −0
  146. arch/unicore32/kernel/signal.c +5 −4
  147. arch/x86/Kbuild +1 −3
  148. arch/x86/Kconfig +14 −4
  149. arch/x86/Makefile +2 −4
  150. arch/x86/include/asm/io_apic.h +2 −0
  151. arch/x86/include/asm/pgtable.h +7 −2
  152. arch/x86/kernel/Makefile +1 −1
  153. arch/x86/kernel/apic/io_apic.c +26 −1
  154. arch/x86/kernel/crash.c +2 −4
  155. arch/x86/kernel/entry_32.S +1 −1
  156. arch/x86/kernel/irqinit.c +1 −1
  157. arch/x86/kernel/machine_kexec_64.c +11 −0
  158. arch/x86/kernel/time.c +2 −0
  159. arch/x86/mm/tlb.c +8 −2
  160. arch/x86/pci/intel_mid_pci.c +1 −1
  161. arch/x86/pci/irq.c +1 −1
  162. arch/x86/purgatory/Makefile +2 −4
  163. arch/xtensa/Kconfig +75 −17
  164. arch/xtensa/Makefile +2 −5
  165. arch/xtensa/boot/dts/kc705.dts +4 −1
  166. arch/xtensa/configs/common_defconfig +0 −1
  167. arch/xtensa/configs/iss_defconfig +1 −2
  168. arch/xtensa/configs/s6105_defconfig +0 −1
  169. arch/xtensa/include/asm/cacheflush.h +2 −0
  170. arch/xtensa/include/asm/fixmap.h +26 −4
  171. arch/xtensa/include/asm/highmem.h +38 −2
  172. arch/xtensa/include/asm/page.h +12 −2
  173. arch/xtensa/include/asm/pgtable.h +6 −1
  174. arch/xtensa/include/asm/uaccess.h +5 −0
  175. arch/xtensa/include/uapi/asm/ioctls.h +10 −9
  176. arch/xtensa/include/uapi/asm/unistd.h +4 −1
  177. arch/xtensa/kernel/align.S +81 −47
  178. arch/xtensa/kernel/entry.S +42 −12
  179. arch/xtensa/kernel/pci-dma.c +6 −6
  180. arch/xtensa/kernel/smp.c +1 −0
  181. arch/xtensa/kernel/traps.c +1 −4
  182. arch/xtensa/kernel/vectors.S +7 −1
  183. arch/xtensa/kernel/vmlinux.lds.S +2 −2
  184. arch/xtensa/mm/cache.c +68 −9
  185. arch/xtensa/mm/highmem.c +31 −10
  186. arch/xtensa/mm/misc.S +52 −64
  187. arch/xtensa/mm/mmu.c +22 −16
  188. block/bio-integrity.c +1 −1
  189. block/blk-core.c +0 −1
  190. block/blk-mq.c +22 −14
  191. block/cfq-iosched.c +16 −3
  192. block/scsi_ioctl.c +27 −13
  193. crypto/asymmetric_keys/public_key.c +1 −0
  194. crypto/asymmetric_keys/verify_pefile.c +33 −16
  195. drivers/acpi/acpi_lpss.c +17 −0
  196. drivers/acpi/acpica/nsprepkg.c +39 −0
  197. drivers/acpi/ec.c +22 −3
  198. drivers/acpi/pci_irq.c +4 −0
  199. drivers/acpi/processor_idle.c +2 −2
  200. drivers/acpi/scan.c +19 −13
  201. drivers/acpi/video.c +43 −2
  202. drivers/ata/ahci.c +22 −0
  203. drivers/ata/ahci_tegra.c +10 −4
  204. drivers/ata/ahci_xgene.c +47 −14
  205. drivers/ata/ata_piix.c +8 −0
  206. drivers/ata/pata_jmicron.c +12 −0
  207. drivers/base/regmap/internal.h +3 −0
  208. drivers/base/regmap/regcache-rbtree.c +3 −6
  209. drivers/base/regmap/regcache.c +1 −1
  210. drivers/base/regmap/regmap-debugfs.c +3 −0
  211. drivers/base/regmap/regmap.c +1 −1
  212. drivers/bcma/host_pci.c +1 −0
  213. drivers/block/brd.c +5 −1
  214. drivers/block/xsysace.c +0 −1
  215. drivers/block/zram/zram_drv.c +7 −3
  216. drivers/block/zram/zram_drv.h +1 −1
  217. drivers/bus/arm-ccn.c +26 −27
  218. drivers/cpufreq/intel_pstate.c +2 −5
  219. drivers/cpufreq/s5pv210-cpufreq.c +1 −1
  220. drivers/cpuidle/cpuidle-big_little.c +3 −10
  221. drivers/dma-buf/fence.c +1 −1
  222. drivers/firmware/efi/vars.c +4 −4
  223. drivers/gpio/devres.c +1 −1
  224. drivers/gpio/gpio-bt8xx.c +0 −3
  225. drivers/gpio/gpio-lynxpoint.c +18 −0
  226. drivers/gpio/gpio-zynq.c +28 −8
  227. drivers/gpio/gpiolib-of.c +1 −3
  228. drivers/gpu/drm/ast/ast_tables.h +1 −0
  229. drivers/gpu/drm/drm_crtc.c +2 −1
  230. drivers/gpu/drm/i915/i915_drv.c +33 −0
  231. drivers/gpu/drm/i915/i915_drv.h +2 −1
  232. drivers/gpu/drm/i915/i915_irq.c +12 −21
  233. drivers/gpu/drm/i915/intel_bios.c +1 −1
  234. drivers/gpu/drm/i915/intel_crt.c +7 −2
  235. drivers/gpu/drm/i915/intel_display.c +45 −28
  236. drivers/gpu/drm/i915/intel_dp.c +65 −23
  237. drivers/gpu/drm/i915/intel_drv.h +7 −2
  238. drivers/gpu/drm/i915/intel_lvds.c +1 −1
  239. drivers/gpu/drm/i915/intel_panel.c +4 −4
  240. drivers/gpu/drm/i915/intel_tv.c +13 −4
  241. drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +2 −0
  242. drivers/gpu/drm/msm/msm_drv.c +1 −2
  243. drivers/gpu/drm/msm/msm_fbdev.c +1 −1
  244. drivers/gpu/drm/msm/msm_iommu.c +2 −2
  245. drivers/gpu/drm/nouveau/core/core/parent.c +2 −2
  246. drivers/gpu/drm/radeon/Makefile +1 −1
  247. drivers/gpu/drm/radeon/ci_dpm.c +3 −0
  248. drivers/gpu/drm/radeon/cik.c +49 −20
  249. drivers/gpu/drm/radeon/cik_sdma.c +3 −3
  250. drivers/gpu/drm/radeon/evergreen.c +2 −2
  251. drivers/gpu/drm/radeon/evergreen_dma.c +1 −1
  252. drivers/gpu/drm/radeon/kv_dpm.c +7 −4
  253. drivers/gpu/drm/radeon/ni.c +10 −3
  254. drivers/gpu/drm/radeon/r100.c +4 −4
  255. drivers/gpu/drm/radeon/r200.c +1 −1
  256. drivers/gpu/drm/radeon/r300.c +1 −1
  257. drivers/gpu/drm/radeon/r420.c +2 −2
  258. drivers/gpu/drm/radeon/r600.c +30 −22
  259. drivers/gpu/drm/radeon/r600_dma.c +3 −3
  260. drivers/gpu/drm/radeon/r600d.h +1 −0
  261. drivers/gpu/drm/radeon/radeon.h +8 −3
  262. drivers/gpu/drm/radeon/radeon_cs.c +5 −4
  263. drivers/gpu/drm/radeon/radeon_device.c +32 −2
  264. drivers/gpu/drm/radeon/radeon_drv.c +4 −0
  265. drivers/gpu/drm/radeon/radeon_ib.c +3 −2
  266. drivers/gpu/drm/radeon/radeon_pm.c +6 −10
  267. drivers/gpu/drm/radeon/radeon_ring.c +11 −9
  268. drivers/gpu/drm/radeon/radeon_semaphore.c +1 −1
  269. drivers/gpu/drm/radeon/radeon_test.c +9 −9
  270. drivers/gpu/drm/radeon/radeon_uvd.c +1 −1
  271. drivers/gpu/drm/radeon/radeon_vce.c +3 −3
  272. drivers/gpu/drm/radeon/radeon_vm.c +7 −3
  273. drivers/gpu/drm/radeon/rv515.c +1 −1
  274. drivers/gpu/drm/radeon/rv770.c +8 −15
  275. drivers/gpu/drm/radeon/rv770_dma.c +1 −1
  276. drivers/gpu/drm/radeon/si.c +27 −13
  277. drivers/gpu/drm/radeon/si_dma.c +1 −1
  278. drivers/gpu/drm/radeon/trinity_dpm.c +15 −9
  279. drivers/gpu/drm/radeon/uvd_v1_0.c +2 −2
  280. drivers/gpu/drm/sti/Kconfig +1 −0
  281. drivers/gpu/drm/sti/sti_drm_drv.c +2 −2
  282. drivers/gpu/drm/sti/sti_hda.c +5 −5
  283. drivers/gpu/drm/sti/sti_hdmi.c +5 −5
  284. drivers/gpu/drm/sti/sti_tvout.c +3 −3
  285. drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +5 −6
  286. drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +2 −1
  287. drivers/hid/hid-logitech-dj.c +25 −18
  288. drivers/hid/hid-logitech-dj.h +1 −0
  289. drivers/hid/hid-magicmouse.c +10 −0
  290. drivers/hid/hid-picolcd_core.c +6 −0
  291. drivers/hwmon/ds1621.c +1 −0
  292. drivers/i2c/busses/i2c-at91.c +26 −6
  293. drivers/i2c/busses/i2c-mv64xxx.c +1 −2
  294. drivers/i2c/busses/i2c-rcar.c +31 −6
  295. drivers/i2c/busses/i2c-rk3x.c +4 −0
  296. drivers/infiniband/hw/mlx4/main.c +30 −0
  297. drivers/infiniband/hw/mlx4/qp.c +7 −1
  298. drivers/input/input-mt.c +18 −12
  299. drivers/input/mouse/alps.c +2 −2
  300. drivers/input/mouse/elantech.c +128 −9
  301. drivers/input/mouse/elantech.h +3 −0
  302. drivers/input/serio/i8042-sparcio.h +2 −1
  303. drivers/leds/led-class.c +7 −7
  304. drivers/leds/led-core.c +5 −6
  305. drivers/md/dm-crypt.c +19 −6
  306. drivers/mfd/ab8500-core.c +1 −1
  307. drivers/mfd/htc-i2cpld.c +1 −1
  308. drivers/mfd/omap-usb-host.c +1 −1
  309. drivers/mfd/twl4030-power.c +10 −10
  310. drivers/misc/mei/client.c +1 −0
  311. drivers/misc/mei/nfc.c +5 −6
  312. drivers/mtd/chips/cfi_cmdset_0002.c +4 −0
  313. drivers/mtd/nand/omap2.c +12 −4
  314. drivers/net/ethernet/3com/3c59x.c +4 −4
  315. drivers/net/ethernet/aeroflex/greth.c +48 −38
  316. drivers/net/ethernet/aeroflex/greth.h +1 −1
  317. drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c +4 −4
  318. drivers/net/ethernet/amd/xgbe/xgbe-dev.c +121 −88
  319. drivers/net/ethernet/amd/xgbe/xgbe-drv.c +2 −0
  320. drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c +4 −3
  321. drivers/net/ethernet/amd/xgbe/xgbe-main.c +1 −1
  322. drivers/net/ethernet/amd/xgbe/xgbe.h +4 −0
  323. drivers/net/ethernet/apm/xgene/Kconfig +1 −0
  324. drivers/net/ethernet/broadcom/Kconfig +1 −1
  325. drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h +6 −1
  326. drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +41 −33
  327. drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h +3 −2
  328. drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +39 −18
  329. drivers/net/ethernet/broadcom/cnic.c +2 −2
  330. drivers/net/ethernet/broadcom/tg3.c +16 −0
  331. drivers/net/ethernet/broadcom/tg3.h +1 −0
  332. drivers/net/ethernet/brocade/bna/bnad.c +4 −3
  333. drivers/net/ethernet/calxeda/Kconfig +1 −0
  334. drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +11 −5
  335. drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +67 −12
  336. drivers/net/ethernet/chelsio/cxgb4/t4_regs.h +2 −0
  337. drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h +4 −0
  338. drivers/net/ethernet/ibm/ehea/ehea_main.c +1 −1
  339. drivers/net/ethernet/intel/e1000/e1000_main.c +11 −8
  340. drivers/net/ethernet/intel/e1000e/netdev.c +9 −12
  341. drivers/net/ethernet/intel/i40e/i40e_txrx.c +1 −1
  342. drivers/net/ethernet/intel/i40evf/i40e_txrx.c +1 −1
  343. drivers/net/ethernet/marvell/mvneta.c +5 −3
  344. drivers/net/ethernet/mellanox/mlx4/en_netdev.c +2 −29
  345. drivers/net/ethernet/mellanox/mlx4/mcg.c +38 −0
  346. drivers/net/ethernet/moxa/moxart_ether.c +19 −15
  347. drivers/net/ethernet/nxp/lpc_eth.c +3 −0
  348. drivers/net/ethernet/qlogic/qlge/qlge_main.c +3 −2
  349. drivers/net/ethernet/renesas/Kconfig +1 −0
  350. drivers/net/ethernet/stmicro/stmmac/chain_mode.c +10 −4
  351. drivers/net/ethernet/stmicro/stmmac/common.h +7 −6
  352. drivers/net/ethernet/stmicro/stmmac/dwmac1000.h +1 −1
  353. drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +5 −1
  354. drivers/net/ethernet/stmicro/stmmac/mmc.h +1 −1
  355. drivers/net/ethernet/stmicro/stmmac/mmc_core.c +1 −1
  356. drivers/net/ethernet/stmicro/stmmac/ring_mode.c +11 −4
  357. drivers/net/ethernet/stmicro/stmmac/stmmac.h +8 −1
  358. drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +1 −1
  359. drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +106 −36
  360. drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +1 −0
  361. drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h +0 −2
  362. drivers/net/fddi/skfp/h/skfbi.h +0 −5
  363. drivers/net/phy/phy.c +9 −9
  364. drivers/net/vmxnet3/vmxnet3_drv.c +8 −7
  365. drivers/net/vmxnet3/vmxnet3_int.h +2 −2
  366. drivers/net/wireless/at76c50x-usb.c +1 −2
  367. drivers/net/wireless/ath/ath9k/spectral.c +1 −1
  368. drivers/net/wireless/iwlwifi/Kconfig +0 −2
  369. drivers/net/wireless/iwlwifi/dvm/rxon.c +12 −0
  370. drivers/net/wireless/iwlwifi/iwl-7000.c +2 −2
  371. drivers/net/wireless/iwlwifi/iwl-8000.c +1 −1
  372. drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c +1 −1
  373. drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +1 −0
  374. drivers/net/xen-netback/interface.c +3 −3
  375. drivers/pci/host/Kconfig +1 −1
  376. drivers/pinctrl/nomadik/pinctrl-abx500.c +1 −2
  377. drivers/pinctrl/pinctrl-at91.c +2 −2
  378. drivers/pinctrl/pinctrl-rockchip.c +9 −6
  379. drivers/pinctrl/pinctrl-tegra-xusb.c +3 −2
  380. drivers/pinctrl/samsung/pinctrl-exynos.c +63 −6
  381. drivers/pinctrl/samsung/pinctrl-samsung.h +1 −0
  382. drivers/pinctrl/sh-pfc/pfc-r8a7791.c +4 −4
  383. drivers/platform/x86/ideapad-laptop.c +2 −29
  384. drivers/platform/x86/toshiba_acpi.c +20 −7
  385. drivers/powercap/intel_rapl.c +4 −4
  386. drivers/rtc/rtc-s5m.c +14 −7
  387. drivers/s390/char/con3215.c +17 −3
  388. drivers/s390/char/sclp_tty.c +1 −1
  389. drivers/s390/net/qeth_core.h +1 −0
  390. drivers/s390/net/qeth_core_main.c +15 −1
  391. drivers/s390/net/qeth_l2_sys.c +1 −6
  392. drivers/scsi/scsi_lib.c +0 −1
  393. drivers/sh/Makefile +1 −2
  394. drivers/sh/intc/Kconfig +5 −1
  395. drivers/spi/spi-au1550.c +1 −1
  396. drivers/spi/spi-davinci.c +8 −8
  397. drivers/spi/spi-dw-pci.c +2 −0
  398. drivers/spi/spi-dw.c +1 −1
  399. drivers/spi/spi-omap2-mcspi.c +2 −1
  400. drivers/spi/spi-pxa2xx.c +1 −0
  401. drivers/spi/spi-rockchip.c +2 −2
  402. drivers/spi/spi-rspi.c +58 −36
  403. drivers/spi/spi-sh-msiof.c +38 −33
  404. drivers/spi/spi.c +1 −0
  405. drivers/ssb/b43_pci_bridge.c +1 −0
  406. drivers/staging/Kconfig +0 −2
  407. drivers/staging/Makefile +0 −1
  408. drivers/staging/android/logger.c +4 −1
  409. drivers/staging/et131x/et131x.c +27 −41
  410. drivers/staging/lustre/lustre/libcfs/workitem.c +1 −0
  411. drivers/staging/lustre/lustre/obdclass/class_obd.c +1 −1
  412. drivers/staging/rtl8188eu/os_dep/usb_intf.c +2 −0
  413. drivers/thunderbolt/path.c +20 −1
  414. drivers/usb/Kconfig +2 −0
  415. drivers/usb/Makefile +2 −0
  416. drivers/usb/core/hub.c +10 −6
  417. drivers/usb/dwc2/gadget.c +1 −1
  418. drivers/usb/dwc3/dwc3-omap.c +1 −1
  419. drivers/usb/gadget/Makefile +1 −1
  420. drivers/usb/gadget/function/Makefile +2 −2
  421. drivers/usb/gadget/function/u_ether.c +0 −3
  422. drivers/usb/gadget/function/uvc_video.c +3 −0
  423. drivers/usb/gadget/legacy/Makefile +3 −3
  424. drivers/usb/gadget/legacy/dbgp.c +2 −0
  425. drivers/usb/gadget/legacy/inode.c +1 −1
  426. drivers/usb/gadget/udc/Kconfig +2 −1
  427. drivers/usb/gadget/udc/atmel_usba_udc.c +1 −1
  428. drivers/usb/gadget/udc/fusb300_udc.c +6 −2
  429. drivers/usb/gadget/udc/pch_udc.c +19 −3
  430. drivers/usb/gadget/udc/r8a66597-udc.c +2 −2
  431. drivers/usb/host/ehci-hub.c +1 −1
  432. drivers/usb/host/xhci-pci.c +9 −0
  433. drivers/usb/host/xhci-ring.c +41 −63
  434. drivers/usb/host/xhci.c +3 −0
  435. drivers/usb/misc/sisusbvga/sisusb.c +1 −0
  436. drivers/usb/musb/ux500_dma.c +1 −1
  437. drivers/usb/phy/phy-gpio-vbus-usb.c +1 −3
  438. drivers/usb/phy/phy-msm-usb.c +2 −2
  439. drivers/usb/phy/phy-samsung-usb.h +1 −1
  440. drivers/usb/phy/phy.c +3 −0
  441. drivers/usb/serial/ftdi_sio.c +3 −0
  442. drivers/usb/serial/ftdi_sio_ids.h +7 −0
  443. drivers/usb/serial/option.c +28 −3
  444. drivers/usb/serial/pl2303.c +1 −0
  445. drivers/usb/serial/pl2303.h +1 −0
  446. drivers/usb/serial/usb-serial.c +27 −10
  447. drivers/usb/serial/whiteheat.c +6 −1
  448. drivers/usb/serial/zte_ev.c +0 −20
  449. drivers/usb/storage/unusual_devs.h +6 −0
  450. drivers/usb/usbip/Kconfig +0 −0
  451. drivers/usb/usbip/Makefile +0 −0
  452. drivers/usb/usbip/README +0 −0
  453. drivers/usb/usbip/stub.h +0 −0
  454. drivers/usb/usbip/stub_dev.c +0 −27
  455. drivers/usb/usbip/stub_main.c +0 −0
  456. drivers/usb/usbip/stub_rx.c +0 −0
  457. drivers/usb/usbip/stub_tx.c +0 −0
  458. drivers/usb/usbip/usbip_common.c +0 −0
  459. drivers/usb/usbip/usbip_common.h +1 −1
  460. drivers/usb/usbip/usbip_event.c +0 −0
  461. drivers/usb/usbip/usbip_protocol.txt +0 −0
  462. drivers/usb/usbip/vhci.h +0 −0
  463. drivers/usb/usbip/vhci_hcd.c +0 −0
  464. drivers/usb/usbip/vhci_rx.c +0 −0
  465. drivers/usb/usbip/vhci_sysfs.c +0 −0
  466. drivers/usb/usbip/vhci_tx.c +0 −0
  467. drivers/usb/wusbcore/wa-xfer.c +1 −2
  468. drivers/video/backlight/pwm_bl.c +1 −0
  469. drivers/video/fbdev/amba-clcd.c +18 −5
  470. drivers/video/fbdev/atmel_lcdfb.c +2 −0
  471. drivers/video/fbdev/chipsfb.c +1 −1
  472. drivers/video/fbdev/da8xx-fb.c +1 −1
  473. drivers/video/of_display_timing.c +1 −0
  474. fs/aio.c +85 −5
  475. fs/btrfs/async-thread.c +36 −8
  476. fs/btrfs/async-thread.h +27 −1
  477. fs/btrfs/delayed-inode.c +2 −2
  478. fs/btrfs/disk-io.c +31 −25
  479. fs/btrfs/extent-tree.c +6 −17
  480. fs/btrfs/extent_io.c +3 −2
  481. fs/btrfs/file.c +12 −5
  482. fs/btrfs/inode.c +89 −20
  483. fs/btrfs/ioctl.c +2 −34
  484. fs/btrfs/ordered-data.c +1 −0
  485. fs/btrfs/qgroup.c +2 −1
  486. fs/btrfs/raid56.c +6 −3
  487. fs/btrfs/reada.c +2 −1
  488. fs/btrfs/scrub.c +19 −6
  489. fs/btrfs/sysfs.c +1 −1
  490. fs/btrfs/tree-log.c +13 −4
  491. fs/btrfs/volumes.c +60 −5
  492. fs/ext4/ext4.h +17 −1
  493. fs/ext4/extents.c +44 −44
  494. fs/ext4/inode.c +16 −28
  495. fs/ext4/mballoc.c +5 −0
  496. fs/ext4/namei.c +51 −5
  497. fs/ext4/super.c +3 −2
  498. fs/f2fs/Kconfig +2 −2
  499. fs/f2fs/checkpoint.c +51 −29
  500. fs/f2fs/data.c +14 −5
  501. fs/f2fs/debug.c +2 −2
  502. fs/f2fs/dir.c +3 −3
  503. fs/f2fs/f2fs.h +14 −12
  504. fs/f2fs/file.c +38 −22
  505. fs/f2fs/gc.c +4 −4
  506. fs/f2fs/gc.h +1 −1
  507. fs/f2fs/hash.c +4 −3
  508. fs/f2fs/inline.c +23 −15
  509. fs/f2fs/namei.c +6 −17
  510. fs/f2fs/node.c +37 −43
  511. fs/f2fs/recovery.c +22 −8
  512. fs/f2fs/segment.c +2 −51
  513. fs/f2fs/segment.h +1 −1
  514. fs/f2fs/super.c +23 −9
  515. fs/f2fs/xattr.c +1 −1
  516. fs/jbd2/commit.c +12 −9
  517. fs/jbd2/journal.c +37 −19
  518. fs/jbd2/recovery.c +20 −13
  519. fs/jbd2/revoke.c +3 −3
  520. fs/locks.c +1 −1
  521. fs/namespace.c +9 −1
  522. fs/nfs/nfs3acl.c +4 −1
  523. fs/nfs/nfs4proc.c +17 −9
  524. fs/nfs/pagelist.c +59 −25
  525. fs/nfs/write.c +17 −4
  526. fs/ocfs2/cluster/quorum.c +11 −2
  527. fs/ocfs2/cluster/tcp.c +39 −6
  528. fs/ocfs2/cluster/tcp.h +1 −0
  529. fs/ocfs2/ioctl.c +43 −86
  530. fs/pnode.c +1 −0
  531. fs/sync.c +1 −1
  532. fs/ufs/inode.c +2 −5
  533. fs/ufs/namei.c +6 −8
  534. fs/xfs/libxfs/xfs_bmap.c +10 −8
  535. fs/xfs/xfs_aops.c +61 −0
  536. fs/xfs/xfs_bmap_util.c +20 −0
  537. fs/xfs/xfs_file.c +23 −4
  538. include/acpi/acpi_bus.h +0 −1
  539. include/drm/drm_pciids.h +7 −0
  540. include/linux/blk-mq.h +3 −4
  541. include/linux/f2fs_fs.h +13 −3
  542. include/linux/ftrace.h +11 −3
  543. include/linux/gpio/consumer.h +62 −47
  544. include/linux/jbd2.h +25 −5
  545. include/linux/leds.h +2 −1
  546. include/linux/mlx4/device.h +3 −0
  547. include/linux/mtd/nand.h +1 −1
  548. include/linux/netdevice.h +2 −2
  549. include/linux/netfilter.h +3 −2
  550. include/linux/nfs_page.h +1 −0
  551. include/linux/platform_data/mtd-nand-omap2.h +11 −2
  552. include/linux/pm_domain.h +1 −1
  553. include/linux/regulator/driver.h +2 −0
  554. include/linux/regulator/machine.h +1 −0
  555. include/linux/seqno-fence.h +1 −0
  556. include/linux/spi/spi.h +7 −0
  557. include/linux/tick.h +1 −6
  558. include/net/bluetooth/hci_core.h +2 −0
  559. include/net/netns/ieee802154_6lowpan.h +0 −1
  560. include/net/regulatory.h +1 −1
  561. include/net/sctp/sctp.h +13 −0
  562. include/net/sock.h +1 −3
  563. include/net/wimax.h +1 −1
  564. include/sound/soc.h +1 −1
  565. include/trace/events/irq.h +2 −2
  566. include/uapi/drm/radeon_drm.h +1 −0
  567. include/uapi/linux/usbip.h +0 −0
  568. include/uapi/linux/xattr.h +1 −1
  569. kernel/cgroup.c +33 −14
  570. kernel/compat.c +21 −3
  571. kernel/events/core.c +22 −1
  572. kernel/irq/chip.c +1 −0
  573. kernel/kexec.c +11 −0
  574. kernel/kprobes.c +12 −1
  575. kernel/power/power.h +1 −0
  576. kernel/power/suspend.c +1 −1
  577. kernel/power/suspend_test.c +19 −12
  578. kernel/rcu/tree.h +1 −1
  579. kernel/rcu/tree_plugin.h +11 −11
  580. kernel/resource.c +4 −7
  581. kernel/time/tick-sched.c +14 −0
  582. kernel/time/timekeeping.c +3 −2
  583. kernel/trace/ftrace.c +157 −89
  584. kernel/trace/ring_buffer.c +15 −1
  585. lib/Kconfig.debug +10 −1
  586. lib/assoc_array.c +1 −1
  587. mm/hugetlb_cgroup.c +1 −1
  588. mm/memblock.c +1 −2
  589. mm/memcontrol.c +78 −25
  590. mm/memory.c +3 −4
  591. mm/percpu-vm.c +16 −6
  592. mm/percpu.c +2 −0
  593. mm/pgtable-generic.c +1 −1
  594. mm/zbud.c +1 −0
  595. mm/zpool.c +1 −1
  596. mm/zsmalloc.c +1 −0
  597. net/bluetooth/hci_conn.c +8 −0
  598. net/bluetooth/hci_core.c +12 −2
  599. net/bluetooth/hci_event.c +15 −2
  600. net/core/datagram.c +1 −1
  601. net/core/dev.c +71 −6
  602. net/core/gen_estimator.c +1 −1
  603. net/core/gen_stats.c +1 −1
  604. net/core/skbuff.c +2 −2
  605. net/core/sock.c +18 −16
  606. net/ieee802154/6lowpan_rtnl.c +2 −2
  607. net/ieee802154/reassembly.c +3 −12
  608. net/ipv4/netfilter/Kconfig +55 −47
  609. net/ipv4/netfilter/Makefile +1 −1
  610. net/ipv6/addrconf.c +10 −19
  611. net/ipv6/anycast.c +10 −0
  612. net/ipv6/mcast.c +14 −0
  613. net/ipv6/netfilter/Kconfig +20 −8
  614. net/ipv6/netfilter/Makefile +1 −1
  615. net/l2tp/l2tp_ppp.c +2 −1
  616. net/mac80211/chan.c +2 −0
  617. net/mac80211/debugfs_sta.c +1 −1
  618. net/mac80211/iface.c +2 −2
  619. net/mac80211/mesh_plink.c +6 −1
  620. net/mac80211/mlme.c +1 −2
  621. net/mac80211/sta_info.c +5 −2
  622. net/mac802154/wpan.c +5 −1
  623. net/netfilter/Kconfig +12 −2
  624. net/netfilter/Makefile +1 −1
  625. net/netfilter/core.c +3 −3
  626. net/netfilter/ipvs/ip_vs_core.c +1 −1
  627. net/netfilter/ipvs/ip_vs_xmit.c +16 −4
  628. net/netfilter/xt_cgroup.c +1 −1
  629. net/openvswitch/datapath.c +8 −3
  630. net/rfkill/rfkill-gpio.c +1 −0
  631. net/sctp/socket.c +1 −1
  632. net/socket.c +2 −3
  633. scripts/checkpatch.pl +2 −2
  634. scripts/kernel-doc +1 −0
  635. security/keys/key.c +2 −2
  636. security/tomoyo/realpath.c +3 −2
  637. sound/core/info.c +2 −2
  638. sound/core/pcm_misc.c +2 −2
  639. sound/firewire/amdtp.c +10 −1
  640. sound/firewire/amdtp.h +1 −0
  641. sound/firewire/dice.c +20 −9
  642. sound/pci/ctxfi/ct20k1reg.h +1 −3
  643. sound/pci/hda/ca0132_regs.h +1 −1
  644. sound/pci/hda/patch_conexant.c +8 −1
  645. sound/pci/hda/patch_realtek.c +20 −0
  646. sound/soc/codecs/cs4265.c +6 −6
  647. sound/soc/codecs/da732x.h +1 −1
  648. sound/soc/codecs/rt5640.c +1 −0
  649. sound/soc/codecs/rt5677.c +4 −4
  650. sound/soc/generic/simple-card.c +8 −0
  651. sound/soc/omap/omap-twl4030.c +1 −1
  652. sound/soc/sh/rcar/gen.c +1 −1
  653. sound/soc/soc-core.c +1 −1
  654. sound/soc/tegra/tegra_asoc_utils.h +1 −1
  655. tools/testing/selftests/ipc/Makefile +3 −3
  656. tools/testing/selftests/kcmp/Makefile +3 −3
  657. tools/testing/selftests/memfd/Makefile +5 −5
  658. tools/usb/usbip/.gitignore +0 −0
  659. tools/usb/usbip/AUTHORS +0 −0
  660. tools/usb/usbip/COPYING +0 −0
  661. tools/usb/usbip/INSTALL +0 −0
  662. tools/usb/usbip/Makefile.am +0 −0
  663. tools/usb/usbip/README +0 −0
  664. tools/usb/usbip/autogen.sh +0 −0
  665. tools/usb/usbip/cleanup.sh +0 −0
  666. tools/usb/usbip/configure.ac +0 −0
  667. tools/usb/usbip/doc/usbip.8 +0 −0
  668. tools/usb/usbip/doc/usbipd.8 +0 −0
  669. tools/usb/usbip/libsrc/Makefile.am +0 −0
  670. tools/usb/usbip/libsrc/list.h +0 −0
  671. tools/usb/usbip/libsrc/names.c +0 −0
  672. tools/usb/usbip/libsrc/names.h +0 −0
  673. tools/usb/usbip/libsrc/sysfs_utils.c +0 −0
  674. tools/usb/usbip/libsrc/sysfs_utils.h +0 −0
  675. tools/usb/usbip/libsrc/usbip_common.c +0 −0
  676. tools/usb/usbip/libsrc/usbip_common.h +0 −0
  677. tools/usb/usbip/libsrc/usbip_host_driver.c +0 −0
  678. tools/usb/usbip/libsrc/usbip_host_driver.h +0 −0
  679. tools/usb/usbip/libsrc/vhci_driver.c +0 −0
  680. tools/usb/usbip/libsrc/vhci_driver.h +0 −0
  681. tools/usb/usbip/src/Makefile.am +0 −0
  682. tools/usb/usbip/src/usbip.c +0 −0
  683. tools/usb/usbip/src/usbip.h +0 −0
  684. tools/usb/usbip/src/usbip_attach.c +0 −0
  685. tools/usb/usbip/src/usbip_bind.c +0 −0
  686. tools/usb/usbip/src/usbip_detach.c +0 −0
  687. tools/usb/usbip/src/usbip_list.c +0 −0
  688. tools/usb/usbip/src/usbip_network.c +0 −0
  689. tools/usb/usbip/src/usbip_network.h +0 −0
  690. tools/usb/usbip/src/usbip_port.c +0 −0
  691. tools/usb/usbip/src/usbip_unbind.c +0 −0
  692. tools/usb/usbip/src/usbipd.c +0 −0
  693. tools/usb/usbip/src/utils.c +0 −0
  694. tools/usb/usbip/src/utils.h +0 −0
Documentation/SubmittingPatches+1−0
@@ -794,6 +794,7 @@ Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer". · 793 unmodified lines
794794 <http://www.kroah.com/log/linux/maintainer-03.html>
795795 <http://www.kroah.com/log/linux/maintainer-04.html>
796796 <http://www.kroah.com/log/linux/maintainer-05.html>
797+ <http://www.kroah.com/log/linux/maintainer-06.html>
797798
798799 NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
799800 <https://lkml.org/lkml/2005/7/11/336>
Documentation/devicetree/bindings/input/atmel,maxtouch.txt+11−0
@@ -15,6 +15,17 @@ Optional properties for main touchpad device: · 14 unmodified lines
1515 keycode generated by each GPIO. Linux keycodes are defined in
1616 <dt-bindings/input/input.h>.
1717
18+- linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages
19+ on GPIO bit changes. An array of up to 8 entries can be provided
20+ indicating the Linux keycode mapped to each bit of the status byte,
21+ starting at the LSB. Linux keycodes are defined in
22+ <dt-bindings/input/input.h>.
23+
24+ Note: the numbering of the GPIOs and the bit they start at varies between
25+ maXTouch devices. You must either refer to the documentation, or
26+ experiment to determine which bit corresponds to which input. Use
27+ KEY_RESERVED for unused padding values.
28+
1829 Example:
1930
2031 touch@4b {
Documentation/devicetree/bindings/mfd/tc3589x.txt+107−0
@@ -0,0 +1,107 @@
1+* Toshiba TC3589x multi-purpose expander
2+
3+The Toshiba TC3589x series are I2C-based MFD devices which may expose the
4+following built-in devices: gpio, keypad, rotator (vibrator), PWM (for
5+e.g. LEDs or vibrators) The included models are:
6+
7+- TC35890
8+- TC35892
9+- TC35893
10+- TC35894
11+- TC35895
12+- TC35896
13+
14+Required properties:
15+ - compatible : must be "toshiba,tc35890", "toshiba,tc35892", "toshiba,tc35893",
16+ "toshiba,tc35894", "toshiba,tc35895" or "toshiba,tc35896"
17+ - reg : I2C address of the device
18+ - interrupt-parent : specifies which IRQ controller we're connected to
19+ - interrupts : the interrupt on the parent the controller is connected to
20+ - interrupt-controller : marks the device node as an interrupt controller
21+ - #interrupt-cells : should be <1>, the first cell is the IRQ offset on this
22+ TC3589x interrupt controller.
23+
24+Optional nodes:
25+
26+- GPIO
27+ This GPIO module inside the TC3589x has 24 (TC35890, TC35892) or 20
28+ (other models) GPIO lines.
29+ - compatible : must be "toshiba,tc3589x-gpio"
30+ - interrupts : interrupt on the parent, which must be the tc3589x MFD device
31+ - interrupt-controller : marks the device node as an interrupt controller
32+ - #interrupt-cells : should be <2>, the first cell is the IRQ offset on this
33+ TC3589x GPIO interrupt controller, the second cell is the interrupt flags
34+ in accordance with <dt-bindings/interrupt-controller/irq.h>. The following
35+ flags are valid:
36+ - IRQ_TYPE_LEVEL_LOW
37+ - IRQ_TYPE_LEVEL_HIGH
38+ - IRQ_TYPE_EDGE_RISING
39+ - IRQ_TYPE_EDGE_FALLING
40+ - IRQ_TYPE_EDGE_BOTH
41+ - gpio-controller : marks the device node as a GPIO controller
42+ - #gpio-cells : should be <2>, the first cell is the GPIO offset on this
43+ GPIO controller, the second cell is the flags.
44+
45+- Keypad
46+ This keypad is the same on all variants, supporting up to 96 different
47+ keys. The linux-specific properties are modeled on those already existing
48+ in other input drivers.
49+ - compatible : must be "toshiba,tc3589x-keypad"
50+ - debounce-delay-ms : debounce interval in milliseconds
51+ - keypad,num-rows : number of rows in the matrix, see
52+ bindings/input/matrix-keymap.txt
53+ - keypad,num-columns : number of columns in the matrix, see
54+ bindings/input/matrix-keymap.txt
55+ - linux,keymap: the definition can be found in
56+ bindings/input/matrix-keymap.txt
57+ - linux,no-autorepeat: do no enable autorepeat feature.
58+ - linux,wakeup: use any event on keypad as wakeup event.
59+
60+Example:
61+
62+tc35893@44 {
63+ compatible = "toshiba,tc35893";
64+ reg = <0x44>;
65+ interrupt-parent = <&gpio6>;
66+ interrupts = <26 IRQ_TYPE_EDGE_RISING>;
67+
68+ interrupt-controller;
69+ #interrupt-cells = <1>;
70+
71+ tc3589x_gpio {
72+ compatible = "toshiba,tc3589x-gpio";
73+ interrupts = <0>;
74+
75+ interrupt-controller;
76+ #interrupt-cells = <2>;
77+ gpio-controller;
78+ #gpio-cells = <2>;
79+ };
80+ tc3589x_keypad {
81+ compatible = "toshiba,tc3589x-keypad";
82+ interrupts = <6>;
83+ debounce-delay-ms = <4>;
84+ keypad,num-columns = <8>;
85+ keypad,num-rows = <8>;
86+ linux,no-autorepeat;
87+ linux,wakeup;
88+ linux,keymap = <0x0301006b
89+ 0x04010066
90+ 0x06040072
91+ 0x040200d7
92+ 0x0303006a
93+ 0x0205000e
94+ 0x0607008b
95+ 0x0500001c
96+ 0x0403000b
97+ 0x03040034
98+ 0x05020067
99+ 0x0305006c
100+ 0x040500e7
101+ 0x0005009e
102+ 0x06020073
103+ 0x01030039
104+ 0x07060069
105+ 0x050500d9>;
106+ };
107+};
Documentation/devicetree/bindings/mtd/gpmc-nand.txt+1−1
@@ -22,7 +22,7 @@ Optional properties: · 21 unmodified lines
2222 width of 8 is assumed.
2323
2424 - ti,nand-ecc-opt: A string setting the ECC layout to use. One of:
25− "sw" <deprecated> use "ham1" instead
25+ "sw" 1-bit Hamming ecc code via software
2626 "hw" <deprecated> use "ham1" instead
2727 "hw-romcode" <deprecated> use "ham1" instead
2828 "ham1" 1-bit Hamming ecc code
Documentation/devicetree/bindings/net/stmmac.txt+4−0
@@ -39,6 +39,10 @@ Optional properties: · 38 unmodified lines
3939 further clocks may be specified in derived bindings.
4040 - clock-names: One name for each entry in the clocks property, the
4141 first one should be "stmmaceth".
42+- clk_ptp_ref: this is the PTP reference clock; in case of the PTP is
43+ available this clock is used for programming the Timestamp Addend Register.
44+ If not passed then the system clock will be used and this is fine on some
45+ platforms.
4246
4347 Examples:
4448
Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt+1−1
@@ -62,7 +62,7 @@ Example: · 61 unmodified lines
6262 #gpio-cells = <2>;
6363 interrupt-controller;
6464 #interrupt-cells = <2>;
65− interrupts = <0 32 0x4>;
65+ interrupts = <0 16 0x4>;
6666
6767 pinctrl-names = "default";
6868 pinctrl-0 = <&gsbi5_uart_default>;
Documentation/devicetree/bindings/regulator/tps65090.txt+2−2
@@ -45,8 +45,8 @@ Example: · 44 unmodified lines
4545 infet5-supply = <&some_reg>;
4646 infet6-supply = <&some_reg>;
4747 infet7-supply = <&some_reg>;
48− vsys_l1-supply = <&some_reg>;
49− vsys_l2-supply = <&some_reg>;
48+ vsys-l1-supply = <&some_reg>;
49+ vsys-l2-supply = <&some_reg>;
5050
5151 regulators {
5252 dcdc1 {
Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt+1−1
@@ -1,7 +1,7 @@
11 ADI AXI-SPDIF controller
22
33 Required properties:
4− - compatible : Must be "adi,axi-spdif-1.00.a"
4+ - compatible : Must be "adi,axi-spdif-tx-1.00.a"
55 - reg : Must contain SPDIF core's registers location and length
66 - clocks : Pairs of phandle and specifier referencing the controller's clocks.
77 The controller expects two clocks, the clock used for the AXI interface and
Documentation/dma-buf-sharing.txt+8−6
@@ -56,10 +56,10 @@ The dma_buf buffer sharing API usage contains the following steps: · 55 unmodified lines
5656 size_t size, int flags,
5757 const char *exp_name)
5858
59− If this succeeds, dma_buf_export allocates a dma_buf structure, and returns a
60− pointer to the same. It also associates an anonymous file with this buffer,
61− so it can be exported. On failure to allocate the dma_buf object, it returns
62− NULL.
59+ If this succeeds, dma_buf_export_named allocates a dma_buf structure, and
60+ returns a pointer to the same. It also associates an anonymous file with this
61+ buffer, so it can be exported. On failure to allocate the dma_buf object,
62+ it returns NULL.
6363
6464 'exp_name' is the name of exporter - to facilitate information while
6565 debugging.
@@ -76,7 +76,7 @@ The dma_buf buffer sharing API usage contains the following steps: · 10 unmodified lines
7676 drivers and/or processes.
7777
7878 Interface:
79− int dma_buf_fd(struct dma_buf *dmabuf)
79+ int dma_buf_fd(struct dma_buf *dmabuf, int flags)
8080
8181 This API installs an fd for the anonymous file associated with this buffer;
8282 returns either 'fd', or error.
@@ -157,7 +157,9 @@ to request use of buffer for allocation. · 74 unmodified lines
157157 "dma_buf->ops->" indirection from the users of this interface.
158158
159159 In struct dma_buf_ops, unmap_dma_buf is defined as
160− void (*unmap_dma_buf)(struct dma_buf_attachment *, struct sg_table *);
160+ void (*unmap_dma_buf)(struct dma_buf_attachment *,
161+ struct sg_table *,
162+ enum dma_data_direction);
161163
162164 unmap_dma_buf signifies the end-of-DMA for the attachment provided. Like
163165 map_dma_buf, this API also must be implemented by the exporter.
Documentation/filesystems/nfs/nfs-rdma.txt+9−7
@@ -138,9 +138,9 @@ Installation · 137 unmodified lines
138138 - Build, install, reboot
139139
140140 The NFS/RDMA code will be enabled automatically if NFS and RDMA
141− are turned on. The NFS/RDMA client and server are configured via the hidden
142− SUNRPC_XPRT_RDMA config option that depends on SUNRPC and INFINIBAND. The
143− value of SUNRPC_XPRT_RDMA will be:
141+ are turned on. The NFS/RDMA client and server are configured via the
142+ SUNRPC_XPRT_RDMA_CLIENT and SUNRPC_XPRT_RDMA_SERVER config options that both
143+ depend on SUNRPC and INFINIBAND. The default value of both options will be:
144144
145145 - N if either SUNRPC or INFINIBAND are N, in this case the NFS/RDMA client
146146 and server will not be built
@@ -235,8 +235,9 @@ NFS/RDMA Setup · 88 unmodified lines
235235
236236 - Start the NFS server
237237
238− If the NFS/RDMA server was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in
239− kernel config), load the RDMA transport module:
238+ If the NFS/RDMA server was built as a module
239+ (CONFIG_SUNRPC_XPRT_RDMA_SERVER=m in kernel config), load the RDMA
240+ transport module:
240241
241242 $ modprobe svcrdma
242243
@@ -255,8 +256,9 @@ NFS/RDMA Setup · 12 unmodified lines
255256
256257 - On the client system
257258
258− If the NFS/RDMA client was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in
259− kernel config), load the RDMA client module:
259+ If the NFS/RDMA client was built as a module
260+ (CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m in kernel config), load the RDMA client
261+ module:
260262
261263 $ modprobe xprtrdma.ko
262264
Documentation/filesystems/seq_file.txt+33−0
@@ -235,6 +235,39 @@ be used for more than one file, you can store an arbitrary pointer in the · 234 unmodified lines
235235 private field of the seq_file structure; that value can then be retrieved
236236 by the iterator functions.
237237
238+There is also a wrapper function to seq_open() called seq_open_private(). It
239+kmallocs a zero filled block of memory and stores a pointer to it in the
240+private field of the seq_file structure, returning 0 on success. The
241+block size is specified in a third parameter to the function, e.g.:
242+
243+ static int ct_open(struct inode *inode, struct file *file)
244+ {
245+ return seq_open_private(file, &ct_seq_ops,
246+ sizeof(struct mystruct));
247+ }
248+
249+There is also a variant function, __seq_open_private(), which is functionally
250+identical except that, if successful, it returns the pointer to the allocated
251+memory block, allowing further initialisation e.g.:
252+
253+ static int ct_open(struct inode *inode, struct file *file)
254+ {
255+ struct mystruct *p =
256+ __seq_open_private(file, &ct_seq_ops, sizeof(*p));
257+
258+ if (!p)
259+ return -ENOMEM;
260+
261+ p->foo = bar; /* initialize my stuff */
262+ ...
263+ p->baz = true;
264+
265+ return 0;
266+ }
267+
268+A corresponding close function, seq_release_private() is available which
269+frees the memory allocated in the corresponding open.
270+
238271 The other operations of interest - read(), llseek(), and release() - are
239272 all implemented by the seq_file code itself. So a virtual file's
240273 file_operations structure will look like:
Documentation/gpio/consumer.txt+23−1
@@ -53,7 +53,20 @@ with IS_ERR() (they will never return a NULL pointer). -ENOENT will be returned · 52 unmodified lines
5353 if and only if no GPIO has been assigned to the device/function/index triplet,
5454 other error codes are used for cases where a GPIO has been assigned but an error
5555 occurred while trying to acquire it. This is useful to discriminate between mere
56−errors and an absence of GPIO for optional GPIO parameters.
56+errors and an absence of GPIO for optional GPIO parameters. For the common
57+pattern where a GPIO is optional, the gpiod_get_optional() and
58+gpiod_get_index_optional() functions can be used. These functions return NULL
59+instead of -ENOENT if no GPIO has been assigned to the requested function:
60+
61+
62+ struct gpio_desc *gpiod_get_optional(struct device *dev,
63+ const char *con_id,
64+ enum gpiod_flags flags)
65+
66+ struct gpio_desc *gpiod_get_index_optional(struct device *dev,
67+ const char *con_id,
68+ unsigned int index,
69+ enum gpiod_flags flags)
5770
5871 Device-managed variants of these functions are also defined:
5972
@@ -65,6 +78,15 @@ Device-managed variants of these functions are also defined: · 5 unmodified lines
6578 unsigned int idx,
6679 enum gpiod_flags flags)
6780
81+ struct gpio_desc *devm_gpiod_get_optional(struct device *dev,
82+ const char *con_id,
83+ enum gpiod_flags flags)
84+
85+ struct gpio_desc * devm_gpiod_get_index_optional(struct device *dev,
86+ const char *con_id,
87+ unsigned int index,
88+ enum gpiod_flags flags)
89+
6890 A GPIO descriptor can be disposed of using the gpiod_put() function:
6991
7092 void gpiod_put(struct gpio_desc *desc)
Documentation/i2c/dev-interface+5−5
@@ -57,12 +57,12 @@ Well, you are all set up now. You can now use SMBus commands or plain · 56 unmodified lines
5757 I2C to communicate with your device. SMBus commands are preferred if
5858 the device supports them. Both are illustrated below.
5959
60− __u8 register = 0x10; /* Device register to access */
60+ __u8 reg = 0x10; /* Device register to access */
6161 __s32 res;
6262 char buf[10];
6363
6464 /* Using SMBus commands */
65− res = i2c_smbus_read_word_data(file, register);
65+ res = i2c_smbus_read_word_data(file, reg);
6666 if (res < 0) {
6767 /* ERROR HANDLING: i2c transaction failed */
6868 } else {
@@ -70,11 +70,11 @@ the device supports them. Both are illustrated below. · 1 unmodified line
7070 }
7171
7272 /* Using I2C Write, equivalent of
73− i2c_smbus_write_word_data(file, register, 0x6543) */
74− buf[0] = register;
73+ i2c_smbus_write_word_data(file, reg, 0x6543) */
74+ buf[0] = reg;
7575 buf[1] = 0x43;
7676 buf[2] = 0x65;
77− if (write(file, buf, 3) ! =3) {
77+ if (write(file, buf, 3) != 3) {
7878 /* ERROR HANDLING: i2c transaction failed */
7979 }
8080
Documentation/kdump/kdump.txt+33−3
@@ -18,7 +18,7 @@ memory image to a dump file on the local disk, or across the network to · 17 unmodified lines
1818 a remote system.
1919
2020 Kdump and kexec are currently supported on the x86, x86_64, ppc64, ia64,
21−and s390x architectures.
21+s390x and arm architectures.
2222
2323 When the system kernel boots, it reserves a small section of memory for
2424 the dump-capture kernel. This ensures that ongoing Direct Memory Access
@@ -112,7 +112,7 @@ There are two possible methods of using Kdump. · 87 unmodified lines
112112 2) Or use the system kernel binary itself as dump-capture kernel and there is
113113 no need to build a separate dump-capture kernel. This is possible
114114 only with the architectures which support a relocatable kernel. As
115− of today, i386, x86_64, ppc64 and ia64 architectures support relocatable
115+ of today, i386, x86_64, ppc64, ia64 and arm architectures support relocatable
116116 kernel.
117117
118118 Building a relocatable kernel is advantageous from the point of view that
@@ -241,6 +241,13 @@ Dump-capture kernel config options (Arch Dependent, ia64) · 122 unmodified lines
241241 kernel will be aligned to 64Mb, so if the start address is not then
242242 any space below the alignment point will be wasted.
243243
244+Dump-capture kernel config options (Arch Dependent, arm)
245+----------------------------------------------------------
246+
247+- To use a relocatable kernel,
248+ Enable "AUTO_ZRELADDR" support under "Boot" options:
249+
250+ AUTO_ZRELADDR=y
244251
245252 Extended crashkernel syntax
246253 ===========================
@@ -256,6 +263,10 @@ The syntax is: · 9 unmodified lines
256263 crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
257264 range=start-[end]
258265
266+Please note, on arm, the offset is required.
267+ crashkernel=<range1>:<size1>[,<range2>:<size2>,...]@offset
268+ range=start-[end]
269+
259270 'start' is inclusive and 'end' is exclusive.
260271
261272 For example:
@@ -296,6 +307,12 @@ Boot into System Kernel · 34 unmodified lines
296307 on the memory consumption of the kdump system. In general this is not
297308 dependent on the memory size of the production system.
298309
310+ On arm, use "crashkernel=Y@X". Note that the start address of the kernel
311+ will be aligned to 128MiB (0x08000000), so if the start address is not then
312+ any space below the alignment point may be overwritten by the dump-capture kernel,
313+ which means it is possible that the vmcore is not that precise as expected.
314+
315+
299316 Load the Dump-capture Kernel
300317 ============================
301318
@@ -315,7 +332,8 @@ For ia64: · 13 unmodified lines
315332 - Use vmlinux or vmlinuz.gz
316333 For s390x:
317334 - Use image or bzImage
318−
335+For arm:
336+ - Use zImage
319337
320338 If you are using a uncompressed vmlinux image then use following command
321339 to load dump-capture kernel.
@@ -331,6 +349,15 @@ to load dump-capture kernel. · 9 unmodified lines
331349 --initrd=<initrd-for-dump-capture-kernel> \
332350 --append="root=<root-dev> <arch-specific-options>"
333351
352+If you are using a compressed zImage, then use following command
353+to load dump-capture kernel.
354+
355+ kexec --type zImage -p <dump-capture-kernel-bzImage> \
356+ --initrd=<initrd-for-dump-capture-kernel> \
357+ --dtb=<dtb-for-dump-capture-kernel> \
358+ --append="root=<root-dev> <arch-specific-options>"
359+
360+
334361 Please note, that --args-linux does not need to be specified for ia64.
335362 It is planned to make this a no-op on that architecture, but for now
336363 it should be omitted
@@ -347,6 +374,9 @@ For ppc64: · 10 unmodified lines
347374 For s390x:
348375 "1 maxcpus=1 cgroup_disable=memory"
349376
377+For arm:
378+ "1 maxcpus=1 reset_devices"
379+
350380 Notes on loading the dump-capture kernel:
351381
352382 * By default, the ELF headers are stored in ELF64 format to support
Documentation/misc-devices/lis3lv02d+1−1
@@ -59,7 +59,7 @@ acts similar to /dev/rtc and reacts on free-fall interrupts received · 58 unmodified lines
5959 from the device. It supports blocking operations, poll/select and
6060 fasync operation modes. You must read 1 bytes from the device. The
6161 result is number of free-fall interrupts since the last successful
62−read (or 255 if number of interrupts would not fit). See the hpfall.c
62+read (or 255 if number of interrupts would not fit). See the freefall.c
6363 file for an example on using the device.
6464
6565
Documentation/power/regulator/consumer.txt+4−3
@@ -143,8 +143,9 @@ This will cause the core to recalculate the total load on the regulator (based · 142 unmodified lines
143143 on all its consumers) and change operating mode (if necessary and permitted)
144144 to best match the current operating load.
145145
146−The load_uA value can be determined from the consumers datasheet. e.g.most
147−datasheets have tables showing the max current consumed in certain situations.
146+The load_uA value can be determined from the consumer's datasheet. e.g. most
147+datasheets have tables showing the maximum current consumed in certain
148+situations.
148149
149150 Most consumers will use indirect operating mode control since they have no
150151 knowledge of the regulator or whether the regulator is shared with other
@@ -173,7 +174,7 @@ Consumers can register interest in regulator events by calling :- · 22 unmodified lines
173174 int regulator_register_notifier(struct regulator *regulator,
174175 struct notifier_block *nb);
175176
176−Consumers can uregister interest by calling :-
177+Consumers can unregister interest by calling :-
177178
178179 int regulator_unregister_notifier(struct regulator *regulator,
179180 struct notifier_block *nb);
Documentation/power/regulator/design.txt+4−4
@@ -9,14 +9,14 @@ Safety · 8 unmodified lines
99
1010 - Errors in regulator configuration can have very serious consequences
1111 for the system, potentially including lasting hardware damage.
12− - It is not possible to automatically determine the power confugration
12+ - It is not possible to automatically determine the power configuration
1313 of the system - software-equivalent variants of the same chip may
14− have different power requirments, and not all components with power
14+ have different power requirements, and not all components with power
1515 requirements are visible to software.
1616
1717 => The API should make no changes to the hardware state unless it has
18− specific knowledge that these changes are safe to do perform on
19− this particular system.
18+ specific knowledge that these changes are safe to perform on this
19+ particular system.
2020
2121 Consumer use cases
2222 ------------------
Documentation/power/regulator/machine.txt+2−2
@@ -11,7 +11,7 @@ Consider the following machine :- · 10 unmodified lines
1111 +-> [Consumer B @ 3.3V]
1212
1313 The drivers for consumers A & B must be mapped to the correct regulator in
14−order to control their power supply. This mapping can be achieved in machine
14+order to control their power supplies. This mapping can be achieved in machine
1515 initialisation code by creating a struct regulator_consumer_supply for
1616 each regulator.
1717
@@ -39,7 +39,7 @@ to the 'Vcc' supply for Consumer A. · 21 unmodified lines
3939
4040 Constraints can now be registered by defining a struct regulator_init_data
4141 for each regulator power domain. This structure also maps the consumers
42−to their supply regulator :-
42+to their supply regulators :-
4343
4444 static struct regulator_init_data regulator1_data = {
4545 .constraints = {
Documentation/power/regulator/overview.txt+3−3
@@ -36,11 +36,11 @@ Some terms used in this document:- · 35 unmodified lines
3636 Consumers can be classified into two types:-
3737
3838 Static: consumer does not change its supply voltage or
39− current limit. It only needs to enable or disable it's
39+ current limit. It only needs to enable or disable its
4040 power supply. Its supply voltage is set by the hardware,
4141 bootloader, firmware or kernel board initialisation code.
4242
43− Dynamic: consumer needs to change it's supply voltage or
43+ Dynamic: consumer needs to change its supply voltage or
4444 current limit to meet operation demands.
4545
4646
@@ -156,7 +156,7 @@ relevant to non SoC devices and is split into the following four interfaces:- · 109 unmodified lines
156156 This interface is for machine specific code and allows the creation of
157157 voltage/current domains (with constraints) for each regulator. It can
158158 provide regulator constraints that will prevent device damage through
159− overvoltage or over current caused by buggy client drivers. It also
159+ overvoltage or overcurrent caused by buggy client drivers. It also
160160 allows the creation of a regulator tree whereby some regulators are
161161 supplied by others (similar to a clock tree).
162162
Documentation/power/regulator/regulator.txt+3−3
@@ -13,7 +13,7 @@ Drivers can register a regulator by calling :- · 12 unmodified lines
1313 struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
1414 const struct regulator_config *config);
1515
16−This will register the regulators capabilities and operations to the regulator
16+This will register the regulator's capabilities and operations to the regulator
1717 core.
1818
1919 Regulators can be unregistered by calling :-
@@ -23,8 +23,8 @@ void regulator_unregister(struct regulator_dev *rdev); · 3 unmodified lines
2323
2424 Regulator Events
2525 ================
26−Regulators can send events (e.g. over temp, under voltage, etc) to consumer
27−drivers by calling :-
26+Regulators can send events (e.g. overtemperature, undervoltage, etc) to
27+consumer drivers by calling :-
2828
2929 int regulator_notifier_call_chain(struct regulator_dev *rdev,
3030 unsigned long event, void *data);
Documentation/this_cpu_ops.txt+171−42
@@ -2,26 +2,26 @@ this_cpu operations · 1 unmodified line
22 -------------------
33
44 this_cpu operations are a way of optimizing access to per cpu
5−variables associated with the *currently* executing processor through
6−the use of segment registers (or a dedicated register where the cpu
7−permanently stored the beginning of the per cpu area for a specific
8−processor).
5+variables associated with the *currently* executing processor. This is
6+done through the use of segment registers (or a dedicated register where
7+the cpu permanently stored the beginning of the per cpu area for a
8+specific processor).
99
10−The this_cpu operations add a per cpu variable offset to the processor
11−specific percpu base and encode that operation in the instruction
10+this_cpu operations add a per cpu variable offset to the processor
11+specific per cpu base and encode that operation in the instruction
1212 operating on the per cpu variable.
1313
14−This means there are no atomicity issues between the calculation of
14+This means that there are no atomicity issues between the calculation of
1515 the offset and the operation on the data. Therefore it is not
16−necessary to disable preempt or interrupts to ensure that the
16+necessary to disable preemption or interrupts to ensure that the
1717 processor is not changed between the calculation of the address and
1818 the operation on the data.
1919
2020 Read-modify-write operations are of particular interest. Frequently
2121 processors have special lower latency instructions that can operate
22−without the typical synchronization overhead but still provide some
23−sort of relaxed atomicity guarantee. The x86 for example can execute
24−RMV (Read Modify Write) instructions like inc/dec/cmpxchg without the
22+without the typical synchronization overhead, but still provide some
23+sort of relaxed atomicity guarantees. The x86, for example, can execute
24+RMW (Read Modify Write) instructions like inc/dec/cmpxchg without the
2525 lock prefix and the associated latency penalty.
2626
2727 Access to the variable without the lock prefix is not synchronized but
@@ -30,6 +30,38 @@ data specific to the currently executing processor. Only the current · 2 unmodified lines
3030 processor should be accessing that variable and therefore there are no
3131 concurrency issues with other processors in the system.
3232
33+Please note that accesses by remote processors to a per cpu area are
34+exceptional situations and may impact performance and/or correctness
35+(remote write operations) of local RMW operations via this_cpu_*.
36+
37+The main use of the this_cpu operations has been to optimize counter
38+operations.
39+
40+The following this_cpu() operations with implied preemption protection
41+are defined. These operations can be used without worrying about
42+preemption and interrupts.
43+
44+ this_cpu_add()
45+ this_cpu_read(pcp)
46+ this_cpu_write(pcp, val)
47+ this_cpu_add(pcp, val)
48+ this_cpu_and(pcp, val)
49+ this_cpu_or(pcp, val)
50+ this_cpu_add_return(pcp, val)
51+ this_cpu_xchg(pcp, nval)
52+ this_cpu_cmpxchg(pcp, oval, nval)
53+ this_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
54+ this_cpu_sub(pcp, val)
55+ this_cpu_inc(pcp)
56+ this_cpu_dec(pcp)
57+ this_cpu_sub_return(pcp, val)
58+ this_cpu_inc_return(pcp)
59+ this_cpu_dec_return(pcp)
60+
61+
62+Inner working of this_cpu operations
63+------------------------------------
64+
3365 On x86 the fs: or the gs: segment registers contain the base of the
3466 per cpu area. It is then possible to simply use the segment override
3567 to relocate a per cpu relative address to the proper per cpu area for
@@ -48,22 +80,21 @@ results in a single instruction · 12 unmodified lines
4880 mov ax, gs:[x]
4981
5082 instead of a sequence of calculation of the address and then a fetch
51−from that address which occurs with the percpu operations. Before
83+from that address which occurs with the per cpu operations. Before
5284 this_cpu_ops such sequence also required preempt disable/enable to
5385 prevent the kernel from moving the thread to a different processor
5486 while the calculation is performed.
5587
56−The main use of the this_cpu operations has been to optimize counter
57−operations.
88+Consider the following this_cpu operation:
5889
5990 this_cpu_inc(x)
6091
61−results in the following single instruction (no lock prefix!)
92+The above results in the following single instruction (no lock prefix!)
6293
6394 inc gs:[x]
6495
6596 instead of the following operations required if there is no segment
66−register.
97+register:
6798
6899 int *y;
69100 int cpu;
@@ -73,10 +104,10 @@ register. · 3 unmodified lines
73104 (*y)++;
74105 put_cpu();
75106
76−Note that these operations can only be used on percpu data that is
107+Note that these operations can only be used on per cpu data that is
77108 reserved for a specific processor. Without disabling preemption in the
78109 surrounding code this_cpu_inc() will only guarantee that one of the
79−percpu counters is correctly incremented. However, there is no
110+per cpu counters is correctly incremented. However, there is no
80111 guarantee that the OS will not move the process directly before or
81112 after the this_cpu instruction is executed. In general this means that
82113 the value of the individual counters for each processor are
@@ -86,9 +117,9 @@ that is of interest. · 3 unmodified lines
86117 Per cpu variables are used for performance reasons. Bouncing cache
87118 lines can be avoided if multiple processors concurrently go through
88119 the same code paths. Since each processor has its own per cpu
89−variables no concurrent cacheline updates take place. The price that
120+variables no concurrent cache line updates take place. The price that
90121 has to be paid for this optimization is the need to add up the per cpu
91−counters when the value of the counter is needed.
122+counters when the value of a counter is needed.
92123
93124
94125 Special operations:
@@ -100,33 +131,39 @@ Takes the offset of a per cpu variable (&x !) and returns the address · 5 unmodified lines
100131 of the per cpu variable that belongs to the currently executing
101132 processor. this_cpu_ptr avoids multiple steps that the common
102133 get_cpu/put_cpu sequence requires. No processor number is
103−available. Instead the offset of the local per cpu area is simply
104−added to the percpu offset.
134+available. Instead, the offset of the local per cpu area is simply
135+added to the per cpu offset.
105136
137+Note that this operation is usually used in a code segment when
138+preemption has been disabled. The pointer is then used to
139+access local per cpu data in a critical section. When preemption
140+is re-enabled this pointer is usually no longer useful since it may
141+no longer point to per cpu data of the current processor.
106142
107143
108144 Per cpu variables and offsets
109145 -----------------------------
110146
111−Per cpu variables have *offsets* to the beginning of the percpu
147+Per cpu variables have *offsets* to the beginning of the per cpu
112148 area. They do not have addresses although they look like that in the
113149 code. Offsets cannot be directly dereferenced. The offset must be
114−added to a base pointer of a percpu area of a processor in order to
150+added to a base pointer of a per cpu area of a processor in order to
115151 form a valid address.
116152
117153 Therefore the use of x or &x outside of the context of per cpu
118154 operations is invalid and will generally be treated like a NULL
119155 pointer dereference.
120156
121−In the context of per cpu operations
157+ DEFINE_PER_CPU(int, x);
122158
123− x is a per cpu variable. Most this_cpu operations take a cpu
124− variable.
159+In the context of per cpu operations the above implies that x is a per
160+cpu variable. Most this_cpu operations take a cpu variable.
125161
126− &x is the *offset* a per cpu variable. this_cpu_ptr() takes
127− the offset of a per cpu variable which makes this look a bit
128− strange.
162+ int __percpu *p = &x;
129163
164+&x and hence p is the *offset* of a per cpu variable. this_cpu_ptr()
165+takes the offset of a per cpu variable which makes this look a bit
166+strange.
130167
131168
132169 Operations on a field of a per cpu structure
@@ -152,7 +189,7 @@ If we have an offset to struct s: · 19 unmodified lines
152189
153190 struct s __percpu *ps = &p;
154191
155− z = this_cpu_dec(ps->m);
192+ this_cpu_dec(ps->m);
156193
157194 z = this_cpu_inc_return(ps->n);
158195
@@ -172,29 +209,52 @@ if we do not make use of this_cpu ops later to manipulate fields: · 13 unmodified lines
172209 Variants of this_cpu ops
173210 -------------------------
174211
175−this_cpu ops are interrupt safe. Some architecture do not support
212+this_cpu ops are interrupt safe. Some architectures do not support
176213 these per cpu local operations. In that case the operation must be
177214 replaced by code that disables interrupts, then does the operations
178−that are guaranteed to be atomic and then reenable interrupts. Doing
215+that are guaranteed to be atomic and then re-enable interrupts. Doing
179216 so is expensive. If there are other reasons why the scheduler cannot
180217 change the processor we are executing on then there is no reason to
181−disable interrupts. For that purpose the __this_cpu operations are
182−provided. For example.
183−
184− __this_cpu_inc(x);
185−
186−Will increment x and will not fallback to code that disables
218+disable interrupts. For that purpose the following __this_cpu operations
219+are provided.
220+
221+These operations have no guarantee against concurrent interrupts or
222+preemption. If a per cpu variable is not used in an interrupt context
223+and the scheduler cannot preempt, then they are safe. If any interrupts
224+still occur while an operation is in progress and if the interrupt too
225+modifies the variable, then RMW actions can not be guaranteed to be
226+safe.
227+
228+ __this_cpu_add()
229+ __this_cpu_read(pcp)
230+ __this_cpu_write(pcp, val)
231+ __this_cpu_add(pcp, val)
232+ __this_cpu_and(pcp, val)
233+ __this_cpu_or(pcp, val)
234+ __this_cpu_add_return(pcp, val)
235+ __this_cpu_xchg(pcp, nval)
236+ __this_cpu_cmpxchg(pcp, oval, nval)
237+ __this_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
238+ __this_cpu_sub(pcp, val)
239+ __this_cpu_inc(pcp)
240+ __this_cpu_dec(pcp)
241+ __this_cpu_sub_return(pcp, val)
242+ __this_cpu_inc_return(pcp)
243+ __this_cpu_dec_return(pcp)
244+
245+
246+Will increment x and will not fall-back to code that disables
187247 interrupts on platforms that cannot accomplish atomicity through
188248 address relocation and a Read-Modify-Write operation in the same
189249 instruction.
190250
191251
192−
193252 &this_cpu_ptr(pp)->n vs this_cpu_ptr(&pp->n)
194253 --------------------------------------------
195254
196255 The first operation takes the offset and forms an address and then
197−adds the offset of the n field.
256+adds the offset of the n field. This may result in two add
257+instructions emitted by the compiler.
198258
199259 The second one first adds the two offsets and then does the
200260 relocation. IMHO the second form looks cleaner and has an easier time
@@ -202,4 +262,73 @@ with (). The second form also is consistent with the way · 1 unmodified line
202262 this_cpu_read() and friends are used.
203263
204264
205−Christoph Lameter, April 3rd, 2013
265+Remote access to per cpu data
266+------------------------------
267+
268+Per cpu data structures are designed to be used by one cpu exclusively.
269+If you use the variables as intended, this_cpu_ops() are guaranteed to
270+be "atomic" as no other CPU has access to these data structures.
271+
272+There are special cases where you might need to access per cpu data
273+structures remotely. It is usually safe to do a remote read access
274+and that is frequently done to summarize counters. Remote write access
275+something which could be problematic because this_cpu ops do not
276+have lock semantics. A remote write may interfere with a this_cpu
277+RMW operation.
278+
279+Remote write accesses to percpu data structures are highly discouraged
280+unless absolutely necessary. Please consider using an IPI to wake up
281+the remote CPU and perform the update to its per cpu area.
282+
283+To access per-cpu data structure remotely, typically the per_cpu_ptr()
284+function is used:
285+
286+
287+ DEFINE_PER_CPU(struct data, datap);
288+
289+ struct data *p = per_cpu_ptr(&datap, cpu);
290+
291+This makes it explicit that we are getting ready to access a percpu
292+area remotely.
293+
294+You can also do the following to convert the datap offset to an address
295+
296+ struct data *p = this_cpu_ptr(&datap);
297+
298+but, passing of pointers calculated via this_cpu_ptr to other cpus is
299+unusual and should be avoided.
300+
301+Remote access are typically only for reading the status of another cpus
302+per cpu data. Write accesses can cause unique problems due to the
303+relaxed synchronization requirements for this_cpu operations.
304+
305+One example that illustrates some concerns with write operations is
306+the following scenario that occurs because two per cpu variables
307+share a cache-line but the relaxed synchronization is applied to
308+only one process updating the cache-line.
309+
310+Consider the following example
311+
312+
313+ struct test {
314+ atomic_t a;
315+ int b;
316+ };
317+
318+ DEFINE_PER_CPU(struct test, onecacheline);
319+
320+There is some concern about what would happen if the field 'a' is updated
321+remotely from one processor and the local processor would use this_cpu ops
322+to update field b. Care should be taken that such simultaneous accesses to
323+data within the same cache line are avoided. Also costly synchronization
324+may be necessary. IPIs are generally recommended in such scenarios instead
325+of a remote write to the per cpu area of another processor.
326+
327+Even in cases where the remote writes are rare, please bear in
328+mind that a remote write will evict the cache line from the processor
329+that most likely will access it. If the processor wakes up and finds a
330+missing local cache line of a per cpu area, its performance and hence
331+the wake up times will be affected.
332+
333+Christoph Lameter, August 4th, 2014
334+Pranith Kumar, Aug 2nd, 2014
Documentation/x86/tlb.txt+1−1
@@ -35,7 +35,7 @@ invlpg instruction (or instructions _near_ it) show up high in · 34 unmodified lines
3535 profiles. If you believe that individual invalidations being
3636 called too often, you can lower the tunable:
3737
38− /sys/debug/kernel/x86/tlb_single_page_flush_ceiling
38+ /sys/kernel/debug/x86/tlb_single_page_flush_ceiling
3939
4040 This will cause us to do the global flush for more cases.
4141 Lowering it to 0 will disable the use of the individual flushes.
MAINTAINERS+28−3
@@ -1277,9 +1277,15 @@ F: drivers/scsi/arm/ · 1276 unmodified lines
12771277 ARM/Rockchip SoC support
12781278 M: Heiko Stuebner <heiko@sntech.de>
12791279 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1280+L: linux-rockchip@lists.infradead.org
12801281 S: Maintained
1282+F: arch/arm/boot/dts/rk3*
12811283 F: arch/arm/mach-rockchip/
1284+F: drivers/clk/rockchip/
1285+F: drivers/i2c/busses/i2c-rk3x.c
12821286 F: drivers/*/*rockchip*
1287+F: drivers/*/*/*rockchip*
1288+F: sound/soc/rockchip/
12831289
12841290 ARM/SAMSUNG ARM ARCHITECTURES
12851291 M: Ben Dooks <ben-linux@fluff.org>
@@ -2065,7 +2071,7 @@ S: Supported · 779 unmodified lines
20652071 F: drivers/scsi/bnx2i/
20662072
20672073 BROADCOM KONA GPIO DRIVER
2068−M: Markus Mayer <markus.mayer@linaro.org>
2074+M: Ray Jui <rjui@broadcom.com>
20692075 L: bcm-kernel-feedback-list@broadcom.com
20702076 S: Supported
20712077 F: drivers/gpio/gpio-bcm-kona.c
@@ -3121,6 +3127,17 @@ F: include/linux/host1x.h · 1049 unmodified lines
31213127 F: include/uapi/drm/tegra_drm.h
31223128 F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
31233129
3130+DRM DRIVERS FOR RENESAS
3131+M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
3132+L: dri-devel@lists.freedesktop.org
3133+L: linux-sh@vger.kernel.org
3134+T: git git://people.freedesktop.org/~airlied/linux
3135+S: Supported
3136+F: drivers/gpu/drm/rcar-du/
3137+F: drivers/gpu/drm/shmobile/
3138+F: include/linux/platform_data/rcar-du.h
3139+F: include/linux/platform_data/shmob_drm.h
3140+
31243141 DSBR100 USB FM RADIO DRIVER
31253142 M: Alexey Klimov <klimov.linux@gmail.com>
31263143 L: linux-media@vger.kernel.org
@@ -9545,6 +9562,14 @@ S: Maintained · 6418 unmodified lines
95459562 F: Documentation/usb/ohci.txt
95469563 F: drivers/usb/host/ohci*
95479564
9565+USB OVER IP DRIVER
9566+M: Valentina Manea <valentina.manea.m@gmail.com>
9567+M: Shuah Khan <shuah.kh@samsung.com>
9568+L: linux-usb@vger.kernel.org
9569+S: Maintained
9570+F: drivers/usb/usbip/
9571+F: tools/usb/usbip/
9572+
95489573 USB PEGASUS DRIVER
95499574 M: Petko Manolov <petkan@nucleusys.com>
95509575 L: linux-usb@vger.kernel.org
@@ -10045,9 +10070,9 @@ F: Documentation/x86/ · 494 unmodified lines
1004510070 F: arch/x86/
1004610071
1004710072 X86 PLATFORM DRIVERS
10048−M: Matthew Garrett <matthew.garrett@nebula.com>
10073+M: Darren Hart <dvhart@infradead.org>
1004910074 L: platform-driver-x86@vger.kernel.org
10050−T: git git://cavan.codon.org.uk/platform-drivers-x86.git
10075+T: git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git
1005110076 S: Maintained
1005210077 F: drivers/platform/x86/
1005310078
Makefile+1−1
@@ -1,7 +1,7 @@
11 VERSION = 3
22 PATCHLEVEL = 17
33 SUBLEVEL = 0
4−EXTRAVERSION = -rc1
4+EXTRAVERSION = -rc4
55 NAME = Shuffling Zombie Juror
66
77 # *DOCUMENTATION*
arch/alpha/include/asm/io.h+8−4
@@ -500,10 +500,14 @@ extern inline void writeq(u64 b, volatile void __iomem *addr) · 499 unmodified lines
500500 #define outb_p outb
501501 #define outw_p outw
502502 #define outl_p outl
503−#define readb_relaxed(addr) __raw_readb(addr)
504−#define readw_relaxed(addr) __raw_readw(addr)
505−#define readl_relaxed(addr) __raw_readl(addr)
506−#define readq_relaxed(addr) __raw_readq(addr)
503+#define readb_relaxed(addr) __raw_readb(addr)
504+#define readw_relaxed(addr) __raw_readw(addr)
505+#define readl_relaxed(addr) __raw_readl(addr)
506+#define readq_relaxed(addr) __raw_readq(addr)
507+#define writeb_relaxed(b, addr) __raw_writeb(b, addr)
508+#define writew_relaxed(b, addr) __raw_writew(b, addr)
509+#define writel_relaxed(b, addr) __raw_writel(b, addr)
510+#define writeq_relaxed(b, addr) __raw_writeq(b, addr)
507511
508512 #define mmiowb()
509513
arch/alpha/include/asm/unistd.h+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33
44 #include <uapi/asm/unistd.h>
55
6−#define NR_SYSCALLS 508
6+#define NR_SYSCALLS 511
77
88 #define __ARCH_WANT_OLD_READDIR
99 #define __ARCH_WANT_STAT64
arch/alpha/include/uapi/asm/unistd.h+3−0
@@ -469,5 +469,8 @@ · 468 unmodified lines
469469 #define __NR_process_vm_writev 505
470470 #define __NR_kcmp 506
471471 #define __NR_finit_module 507
472+#define __NR_sched_setattr 508
473+#define __NR_sched_getattr 509
474+#define __NR_renameat2 510
472475
473476 #endif /* _UAPI_ALPHA_UNISTD_H */
arch/alpha/kernel/systbls.S+3−0
@@ -526,6 +526,9 @@ sys_call_table: · 525 unmodified lines
526526 .quad sys_process_vm_writev /* 505 */
527527 .quad sys_kcmp
528528 .quad sys_finit_module
529+ .quad sys_sched_setattr
530+ .quad sys_sched_getattr
531+ .quad sys_renameat2 /* 510 */
529532
530533 .size sys_call_table, . - sys_call_table
531534 .type sys_call_table, @object
arch/arc/mm/cache_arc700.c+2−1
@@ -427,7 +427,7 @@ struct ic_inv_args { · 426 unmodified lines
427427
428428 static void __ic_line_inv_vaddr_helper(void *info)
429429 {
430− struct ic_inv *ic_inv_args = (struct ic_inv_args *) info;
430+ struct ic_inv_args *ic_inv = info;
431431
432432 __ic_line_inv_vaddr_local(ic_inv->paddr, ic_inv->vaddr, ic_inv->sz);
433433 }
@@ -581,6 +581,7 @@ void flush_icache_range(unsigned long kstart, unsigned long kend) · 147 unmodified lines
581581 tot_sz -= sz;
582582 }
583583 }
584+EXPORT_SYMBOL(flush_icache_range);
584585
585586 /*
586587 * General purpose helper to make I and D cache lines consistent.
arch/arm/Kconfig+0−2
@@ -1983,8 +1983,6 @@ config XIP_PHYS_ADDR · 1982 unmodified lines
19831983 config KEXEC
19841984 bool "Kexec system call (EXPERIMENTAL)"
19851985 depends on (!SMP || PM_SLEEP_SMP)
1986− select CRYPTO
1987− select CRYPTO_SHA256
19881986 help
19891987 kexec is a system call that implements the ability to shutdown your
19901988 current kernel, and to start another kernel. It is like a reboot
arch/arm/boot/dts/am4372.dtsi+2−2
@@ -804,7 +804,7 @@ · 803 unmodified lines
804804
805805 usb1: usb@48390000 {
806806 compatible = "synopsys,dwc3";
807− reg = <0x48390000 0x17000>;
807+ reg = <0x48390000 0x10000>;
808808 interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
809809 phys = <&usb2_phy1>;
810810 phy-names = "usb2-phy";
@@ -826,7 +826,7 @@ · 15 unmodified lines
826826
827827 usb2: usb@483d0000 {
828828 compatible = "synopsys,dwc3";
829− reg = <0x483d0000 0x17000>;
829+ reg = <0x483d0000 0x10000>;
830830 interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
831831 phys = <&usb2_phy2>;
832832 phy-names = "usb2-phy";
arch/arm/boot/dts/am437x-gp-evm.dts+2−4
@@ -260,7 +260,7 @@ · 259 unmodified lines
260260 status = "okay";
261261 pinctrl-names = "default";
262262 pinctrl-0 = <&i2c0_pins>;
263− clock-frequency = <400000>;
263+ clock-frequency = <100000>;
264264
265265 tps65218: tps65218@24 {
266266 reg = <0x24>;
@@ -424,7 +424,7 @@ · 157 unmodified lines
424424 ranges = <0 0 0 0x01000000>; /* minimum GPMC partition = 16MB */
425425 nand@0,0 {
426426 reg = <0 0 4>; /* device IO registers */
427− ti,nand-ecc-opt = "bch8";
427+ ti,nand-ecc-opt = "bch16";
428428 ti,elm-id = <&elm>;
429429 nand-bus-width = <8>;
430430 gpmc,device-width = <1>;
@@ -443,8 +443,6 @@ · 12 unmodified lines
443443 gpmc,rd-cycle-ns = <40>;
444444 gpmc,wr-cycle-ns = <40>;
445445 gpmc,wait-pin = <0>;
446− gpmc,wait-on-read;
447− gpmc,wait-on-write;
448446 gpmc,bus-turnaround-ns = <0>;
449447 gpmc,cycle2cycle-delay-ns = <0>;
450448 gpmc,clk-activation-ns = <0>;
arch/arm/boot/dts/am43x-epos-evm.dts+4−5
@@ -435,13 +435,13 @@ · 434 unmodified lines
435435 };
436436
437437 &gpmc {
438− status = "okay";
438+ status = "okay"; /* Disable QSPI when enabling GPMC (NAND) */
439439 pinctrl-names = "default";
440440 pinctrl-0 = <&nand_flash_x8>;
441441 ranges = <0 0 0x08000000 0x10000000>; /* CS0: NAND */
442442 nand@0,0 {
443443 reg = <0 0 0>; /* CS0, offset 0 */
444− ti,nand-ecc-opt = "bch8";
444+ ti,nand-ecc-opt = "bch16";
445445 ti,elm-id = <&elm>;
446446 nand-bus-width = <8>;
447447 gpmc,device-width = <1>;
@@ -459,8 +459,7 @@ · 11 unmodified lines
459459 gpmc,access-ns = <30>; /* tCEA + 4*/
460460 gpmc,rd-cycle-ns = <40>;
461461 gpmc,wr-cycle-ns = <40>;
462− gpmc,wait-on-read = "true";
463− gpmc,wait-on-write = "true";
462+ gpmc,wait-pin = <0>;
464463 gpmc,bus-turnaround-ns = <0>;
465464 gpmc,cycle2cycle-delay-ns = <0>;
466465 gpmc,clk-activation-ns = <0>;
@@ -557,7 +556,7 @@ · 90 unmodified lines
557556 };
558557
559558 &qspi {
560− status = "okay";
559+ status = "disabled"; /* Disable GPMC (NAND) when enabling QSPI */
561560 pinctrl-names = "default";
562561 pinctrl-0 = <&qspi1_default>;
563562
arch/arm/boot/dts/at91rm9200.dtsi+1−1
@@ -149,7 +149,7 @@ · 148 unmodified lines
149149 usb: usbck {
150150 compatible = "atmel,at91rm9200-clk-usb";
151151 #clock-cells = <0>;
152− atmel,clk-divisors = <1 2>;
152+ atmel,clk-divisors = <1 2 0 0>;
153153 clocks = <&pllb>;
154154 };
155155
arch/arm/boot/dts/at91sam9g20.dtsi+1−0
@@ -40,6 +40,7 @@ · 39 unmodified lines
4040 };
4141
4242 pllb: pllbck {
43+ compatible = "atmel,at91sam9g20-clk-pllb";
4344 atmel,clk-input-range = <2000000 32000000>;
4445 atmel,pll-clk-output-ranges = <30000000 100000000 0 0>;
4546 };
arch/arm/boot/dts/dra7-evm.dts+36−11
@@ -8,6 +8,7 @@ · 7 unmodified lines
88 /dts-v1/;
99
1010 #include "dra74x.dtsi"
11+#include <dt-bindings/gpio/gpio.h>
1112
1213 / {
1314 model = "TI DRA742";
@@ -24,9 +25,29 @@ · 10 unmodified lines
2425 regulator-min-microvolt = <3300000>;
2526 regulator-max-microvolt = <3300000>;
2627 };
28+
29+ vtt_fixed: fixedregulator-vtt {
30+ compatible = "regulator-fixed";
31+ regulator-name = "vtt_fixed";
32+ regulator-min-microvolt = <1350000>;
33+ regulator-max-microvolt = <1350000>;
34+ regulator-always-on;
35+ regulator-boot-on;
36+ enable-active-high;
37+ gpio = <&gpio7 11 GPIO_ACTIVE_HIGH>;
38+ };
2739 };
2840
2941 &dra7_pmx_core {
42+ pinctrl-names = "default";
43+ pinctrl-0 = <&vtt_pin>;
44+
45+ vtt_pin: pinmux_vtt_pin {
46+ pinctrl-single,pins = <
47+ 0x3b4 (PIN_OUTPUT | MUX_MODE14) /* spi1_cs1.gpio7_11 */
48+ >;
49+ };
50+
3051 i2c1_pins: pinmux_i2c1_pins {
3152 pinctrl-single,pins = <
3253 0x400 (PIN_INPUT | MUX_MODE0) /* i2c1_sda */
@@ -43,20 +64,19 @@ · 10 unmodified lines
4364
4465 i2c3_pins: pinmux_i2c3_pins {
4566 pinctrl-single,pins = <
46− 0x410 (PIN_INPUT | MUX_MODE0) /* i2c3_sda */
47− 0x414 (PIN_INPUT | MUX_MODE0) /* i2c3_scl */
67+ 0x288 (PIN_INPUT | MUX_MODE9) /* gpio6_14.i2c3_sda */
68+ 0x28c (PIN_INPUT | MUX_MODE9) /* gpio6_15.i2c3_scl */
4869 >;
4970 };
5071
5172 mcspi1_pins: pinmux_mcspi1_pins {
5273 pinctrl-single,pins = <
53− 0x3a4 (PIN_INPUT | MUX_MODE0) /* spi2_clk */
54− 0x3a8 (PIN_INPUT | MUX_MODE0) /* spi2_d1 */
55− 0x3ac (PIN_INPUT | MUX_MODE0) /* spi2_d0 */
56− 0x3b0 (PIN_INPUT_SLEW | MUX_MODE0) /* spi2_cs0 */
57− 0x3b4 (PIN_INPUT_SLEW | MUX_MODE0) /* spi2_cs1 */
58− 0x3b8 (PIN_INPUT_SLEW | MUX_MODE6) /* spi2_cs2 */
59− 0x3bc (PIN_INPUT_SLEW | MUX_MODE6) /* spi2_cs3 */
74+ 0x3a4 (PIN_INPUT | MUX_MODE0) /* spi1_sclk */
75+ 0x3a8 (PIN_INPUT | MUX_MODE0) /* spi1_d1 */
76+ 0x3ac (PIN_INPUT | MUX_MODE0) /* spi1_d0 */
77+ 0x3b0 (PIN_INPUT_SLEW | MUX_MODE0) /* spi1_cs0 */
78+ 0x3b8 (PIN_INPUT_SLEW | MUX_MODE6) /* spi1_cs2.hdmi1_hpd */
79+ 0x3bc (PIN_INPUT_SLEW | MUX_MODE6) /* spi1_cs3.hdmi1_cec */
6080 >;
6181 };
6282
@@ -284,7 +304,7 @@ · 221 unmodified lines
284304 status = "okay";
285305 pinctrl-names = "default";
286306 pinctrl-0 = <&i2c3_pins>;
287− clock-frequency = <3400000>;
307+ clock-frequency = <400000>;
288308 };
289309
290310 &mcspi1 {
@@ -483,7 +503,7 @@ · 192 unmodified lines
483503 reg = <0x001c0000 0x00020000>;
484504 };
485505 partition@7 {
486− label = "NAND.u-boot-env";
506+ label = "NAND.u-boot-env.backup1";
487507 reg = <0x001e0000 0x00020000>;
488508 };
489509 partition@8 {
@@ -504,3 +524,8 @@ · 14 unmodified lines
504524 &usb2_phy2 {
505525 phy-supply = <&ldousb_reg>;
506526 };
527+
528+&gpio7 {
529+ ti,no-reset-on-init;
530+ ti,no-idle-on-init;
531+};
arch/arm/boot/dts/dra7.dtsi+8−8
@@ -245,7 +245,7 @@ · 244 unmodified lines
245245 gpio-controller;
246246 #gpio-cells = <2>;
247247 interrupt-controller;
248− #interrupt-cells = <1>;
248+ #interrupt-cells = <2>;
249249 };
250250
251251 gpio2: gpio@48055000 {
@@ -256,7 +256,7 @@ · 4 unmodified lines
256256 gpio-controller;
257257 #gpio-cells = <2>;
258258 interrupt-controller;
259− #interrupt-cells = <1>;
259+ #interrupt-cells = <2>;
260260 };
261261
262262 gpio3: gpio@48057000 {
@@ -267,7 +267,7 @@ · 4 unmodified lines
267267 gpio-controller;
268268 #gpio-cells = <2>;
269269 interrupt-controller;
270− #interrupt-cells = <1>;
270+ #interrupt-cells = <2>;
271271 };
272272
273273 gpio4: gpio@48059000 {
@@ -278,7 +278,7 @@ · 4 unmodified lines
278278 gpio-controller;
279279 #gpio-cells = <2>;
280280 interrupt-controller;
281− #interrupt-cells = <1>;
281+ #interrupt-cells = <2>;
282282 };
283283
284284 gpio5: gpio@4805b000 {
@@ -289,7 +289,7 @@ · 4 unmodified lines
289289 gpio-controller;
290290 #gpio-cells = <2>;
291291 interrupt-controller;
292− #interrupt-cells = <1>;
292+ #interrupt-cells = <2>;
293293 };
294294
295295 gpio6: gpio@4805d000 {
@@ -300,7 +300,7 @@ · 4 unmodified lines
300300 gpio-controller;
301301 #gpio-cells = <2>;
302302 interrupt-controller;
303− #interrupt-cells = <1>;
303+ #interrupt-cells = <2>;
304304 };
305305
306306 gpio7: gpio@48051000 {
@@ -311,7 +311,7 @@ · 4 unmodified lines
311311 gpio-controller;
312312 #gpio-cells = <2>;
313313 interrupt-controller;
314− #interrupt-cells = <1>;
314+ #interrupt-cells = <2>;
315315 };
316316
317317 gpio8: gpio@48053000 {
@@ -322,7 +322,7 @@ · 4 unmodified lines
322322 gpio-controller;
323323 #gpio-cells = <2>;
324324 interrupt-controller;
325− #interrupt-cells = <1>;
325+ #interrupt-cells = <2>;
326326 };
327327
328328 uart1: serial@4806a000 {
arch/arm/boot/dts/exynos4412-odroid-common.dtsi+13−0
@@ -134,6 +134,8 @@ · 133 unmodified lines
134134 i2c@13860000 {
135135 pinctrl-0 = <&i2c0_bus>;
136136 pinctrl-names = "default";
137+ samsung,i2c-sda-delay = <100>;
138+ samsung,i2c-max-bus-freq = <400000>;
137139 status = "okay";
138140
139141 usb3503: usb3503@08 {
@@ -148,6 +150,10 @@ · 8 unmodified lines
148150
149151 max77686: pmic@09 {
150152 compatible = "maxim,max77686";
153+ interrupt-parent = <&gpx3>;
154+ interrupts = <2 0>;
155+ pinctrl-names = "default";
156+ pinctrl-0 = <&max77686_irq>;
151157 reg = <0x09>;
152158 #clock-cells = <1>;
153159
@@ -368,4 +374,11 @@ · 214 unmodified lines
368374 samsung,pins = "gpx1-3";
369375 samsung,pin-pud = <0>;
370376 };
377+
378+ max77686_irq: max77686-irq {
379+ samsung,pins = "gpx3-2";
380+ samsung,pin-function = <0>;
381+ samsung,pin-pud = <0>;
382+ samsung,pin-drv = <0>;
383+ };
371384 };
arch/arm/boot/dts/imx53-qsrb.dts+8−0
@@ -28,6 +28,12 @@ · 27 unmodified lines
2828 MX53_PAD_CSI0_DAT9__I2C1_SCL 0x400001ec
2929 >;
3030 };
31+
32+ pinctrl_pmic: pmicgrp {
33+ fsl,pins = <
34+ MX53_PAD_CSI0_DAT5__GPIO5_23 0x1e4 /* IRQ */
35+ >;
36+ };
3137 };
3238 };
3339
@@ -38,6 +44,8 @@ · 4 unmodified lines
3844
3945 pmic: mc34708@8 {
4046 compatible = "fsl,mc34708";
47+ pinctrl-names = "default";
48+ pinctrl-0 = <&pinctrl_pmic>;
4149 reg = <0x08>;
4250 interrupt-parent = <&gpio5>;
4351 interrupts = <23 0x8>;
arch/arm/boot/dts/imx53.dtsi+1−1
@@ -731,7 +731,7 @@ · 730 unmodified lines
731731 compatible = "fsl,imx53-vpu";
732732 reg = <0x63ff4000 0x1000>;
733733 interrupts = <9>;
734− clocks = <&clks IMX5_CLK_VPU_GATE>,
734+ clocks = <&clks IMX5_CLK_VPU_REFERENCE_GATE>,
735735 <&clks IMX5_CLK_VPU_GATE>;
736736 clock-names = "per", "ahb";
737737 resets = <&src 1>;
arch/arm/boot/dts/imx6dl-hummingboard.dts+3−1
@@ -58,7 +58,7 @@ · 57 unmodified lines
5858
5959 sound-spdif {
6060 compatible = "fsl,imx-audio-spdif";
61− model = "imx-spdif";
61+ model = "On-board SPDIF";
6262 /* IMX6 doesn't implement this yet */
6363 spdif-controller = <&spdif>;
6464 spdif-out;
@@ -181,11 +181,13 @@ · 116 unmodified lines
181181 };
182182
183183 &usbh1 {
184+ disable-over-current;
184185 vbus-supply = <&reg_usbh1_vbus>;
185186 status = "okay";
186187 };
187188
188189 &usbotg {
190+ disable-over-current;
189191 pinctrl-names = "default";
190192 pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;
191193 vbus-supply = <&reg_usbotg_vbus>;
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts+2−1
@@ -119,7 +119,7 @@ · 118 unmodified lines
119119 pinctrl-names = "default";
120120 pinctrl-0 = <&pinctrl_enet>;
121121 phy-mode = "rgmii";
122− phy-reset-gpios = <&gpio3 23 0>;
122+ phy-reset-gpios = <&gpio1 25 0>;
123123 phy-supply = <&vgen2_1v2_eth>;
124124 status = "okay";
125125 };
@@ -339,6 +339,7 @@ · 213 unmodified lines
339339 MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
340340 MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
341341 MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
342+ MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x1b0b0
342343 MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
343344 >;
344345 };
arch/arm/boot/dts/imx6qdl-cubox-i.dtsi+14−5
@@ -61,7 +61,7 @@ · 60 unmodified lines
6161
6262 sound-spdif {
6363 compatible = "fsl,imx-audio-spdif";
64− model = "imx-spdif";
64+ model = "Integrated SPDIF";
6565 /* IMX6 doesn't implement this yet */
6666 spdif-controller = <&spdif>;
6767 spdif-out;
@@ -130,16 +130,23 @@ · 62 unmodified lines
130130 fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;
131131 };
132132
133+ pinctrl_cubox_i_usbh1: cubox-i-usbh1 {
134+ fsl,pins = <MX6QDL_PAD_GPIO_3__USB_H1_OC 0x1b0b0>;
135+ };
136+
133137 pinctrl_cubox_i_usbh1_vbus: cubox-i-usbh1-vbus {
134138 fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x4001b0b0>;
135139 };
136140
137− pinctrl_cubox_i_usbotg_id: cubox-i-usbotg-id {
141+ pinctrl_cubox_i_usbotg: cubox-i-usbotg {
138142 /*
139− * The Cubox-i pulls this low, but as it's pointless
143+ * The Cubox-i pulls ID low, but as it's pointless
140144 * leaving it as a pull-up, even if it is just 10uA.
141145 */
142− fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
146+ fsl,pins = <
147+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059
148+ MX6QDL_PAD_KEY_COL4__USB_OTG_OC 0x1b0b0
149+ >;
143150 };
144151
145152 pinctrl_cubox_i_usbotg_vbus: cubox-i-usbotg-vbus {
@@ -173,13 +180,15 @@ · 27 unmodified lines
173180 };
174181
175182 &usbh1 {
183+ pinctrl-names = "default";
184+ pinctrl-0 = <&pinctrl_cubox_i_usbh1>;
176185 vbus-supply = <&reg_usbh1_vbus>;
177186 status = "okay";
178187 };
179188
180189 &usbotg {
181190 pinctrl-names = "default";
182− pinctrl-0 = <&pinctrl_cubox_i_usbotg_id>;
191+ pinctrl-0 = <&pinctrl_cubox_i_usbotg>;
183192 vbus-supply = <&reg_usbotg_vbus>;
184193 status = "okay";
185194 };
arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi+1−1
@@ -17,7 +17,7 @@ · 16 unmodified lines
1717 enet {
1818 pinctrl_microsom_enet_ar8035: microsom-enet-ar8035 {
1919 fsl,pins = <
20− MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
20+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b8b0
2121 MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
2222 /* AR8035 reset */
2323 MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x130b0
arch/arm/boot/dts/imx6sx-pinfunc.h+13−13
@@ -78,7 +78,7 @@ · 77 unmodified lines
7878 #define MX6SX_PAD_GPIO1_IO07__USDHC2_WP 0x0030 0x0378 0x0870 0x1 0x1
7979 #define MX6SX_PAD_GPIO1_IO07__ENET2_MDIO 0x0030 0x0378 0x0770 0x2 0x0
8080 #define MX6SX_PAD_GPIO1_IO07__AUDMUX_MCLK 0x0030 0x0378 0x0000 0x3 0x0
81−#define MX6SX_PAD_GPIO1_IO07__UART1_CTS_B 0x0030 0x0378 0x082C 0x4 0x1
81+#define MX6SX_PAD_GPIO1_IO07__UART1_CTS_B 0x0030 0x0378 0x0000 0x4 0x0
8282 #define MX6SX_PAD_GPIO1_IO07__GPIO1_IO_7 0x0030 0x0378 0x0000 0x5 0x0
8383 #define MX6SX_PAD_GPIO1_IO07__SRC_EARLY_RESET 0x0030 0x0378 0x0000 0x6 0x0
8484 #define MX6SX_PAD_GPIO1_IO07__DCIC2_OUT 0x0030 0x0378 0x0000 0x7 0x0
@@ -96,7 +96,7 @@ · 11 unmodified lines
9696 #define MX6SX_PAD_GPIO1_IO09__WDOG2_WDOG_B 0x0038 0x0380 0x0000 0x1 0x0
9797 #define MX6SX_PAD_GPIO1_IO09__SDMA_EXT_EVENT_1 0x0038 0x0380 0x0820 0x2 0x0
9898 #define MX6SX_PAD_GPIO1_IO09__CCM_OUT0 0x0038 0x0380 0x0000 0x3 0x0
99−#define MX6SX_PAD_GPIO1_IO09__UART2_CTS_B 0x0038 0x0380 0x0834 0x4 0x1
99+#define MX6SX_PAD_GPIO1_IO09__UART2_CTS_B 0x0038 0x0380 0x0000 0x4 0x0
100100 #define MX6SX_PAD_GPIO1_IO09__GPIO1_IO_9 0x0038 0x0380 0x0000 0x5 0x0
101101 #define MX6SX_PAD_GPIO1_IO09__SRC_INT_BOOT 0x0038 0x0380 0x0000 0x6 0x0
102102 #define MX6SX_PAD_GPIO1_IO09__OBSERVE_MUX_OUT_4 0x0038 0x0380 0x0000 0x7 0x0
@@ -213,7 +213,7 @@ · 110 unmodified lines
213213 #define MX6SX_PAD_CSI_DATA07__ESAI_TX3_RX2 0x0068 0x03B0 0x079C 0x1 0x1
214214 #define MX6SX_PAD_CSI_DATA07__I2C4_SDA 0x0068 0x03B0 0x07C4 0x2 0x2
215215 #define MX6SX_PAD_CSI_DATA07__KPP_ROW_7 0x0068 0x03B0 0x07DC 0x3 0x0
216−#define MX6SX_PAD_CSI_DATA07__UART6_CTS_B 0x0068 0x03B0 0x0854 0x4 0x1
216+#define MX6SX_PAD_CSI_DATA07__UART6_CTS_B 0x0068 0x03B0 0x0000 0x4 0x0
217217 #define MX6SX_PAD_CSI_DATA07__GPIO1_IO_21 0x0068 0x03B0 0x0000 0x5 0x0
218218 #define MX6SX_PAD_CSI_DATA07__WEIM_DATA_16 0x0068 0x03B0 0x0000 0x6 0x0
219219 #define MX6SX_PAD_CSI_DATA07__DCIC1_OUT 0x0068 0x03B0 0x0000 0x7 0x0
@@ -254,7 +254,7 @@ · 34 unmodified lines
254254 #define MX6SX_PAD_CSI_VSYNC__CSI1_VSYNC 0x0078 0x03C0 0x0708 0x0 0x0
255255 #define MX6SX_PAD_CSI_VSYNC__ESAI_TX5_RX0 0x0078 0x03C0 0x07A4 0x1 0x1
256256 #define MX6SX_PAD_CSI_VSYNC__AUDMUX_AUD6_RXD 0x0078 0x03C0 0x0674 0x2 0x1
257−#define MX6SX_PAD_CSI_VSYNC__UART4_CTS_B 0x0078 0x03C0 0x0844 0x3 0x3
257+#define MX6SX_PAD_CSI_VSYNC__UART4_CTS_B 0x0078 0x03C0 0x0000 0x3 0x0
258258 #define MX6SX_PAD_CSI_VSYNC__MQS_RIGHT 0x0078 0x03C0 0x0000 0x4 0x0
259259 #define MX6SX_PAD_CSI_VSYNC__GPIO1_IO_25 0x0078 0x03C0 0x0000 0x5 0x0
260260 #define MX6SX_PAD_CSI_VSYNC__WEIM_DATA_24 0x0078 0x03C0 0x0000 0x6 0x0
@@ -352,7 +352,7 @@ · 91 unmodified lines
352352 #define MX6SX_PAD_ENET2_TX_CLK__ENET2_TX_CLK 0x00A0 0x03E8 0x0000 0x0 0x0
353353 #define MX6SX_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x00A0 0x03E8 0x076C 0x1 0x1
354354 #define MX6SX_PAD_ENET2_TX_CLK__I2C3_SDA 0x00A0 0x03E8 0x07BC 0x2 0x1
355−#define MX6SX_PAD_ENET2_TX_CLK__UART1_CTS_B 0x00A0 0x03E8 0x082C 0x3 0x3
355+#define MX6SX_PAD_ENET2_TX_CLK__UART1_CTS_B 0x00A0 0x03E8 0x0000 0x3 0x0
356356 #define MX6SX_PAD_ENET2_TX_CLK__MLB_CLK 0x00A0 0x03E8 0x07E8 0x4 0x1
357357 #define MX6SX_PAD_ENET2_TX_CLK__GPIO2_IO_9 0x00A0 0x03E8 0x0000 0x5 0x0
358358 #define MX6SX_PAD_ENET2_TX_CLK__USB_OTG2_PWR 0x00A0 0x03E8 0x0000 0x6 0x0
@@ -404,7 +404,7 @@ · 45 unmodified lines
404404 #define MX6SX_PAD_KEY_COL4__SAI2_RX_BCLK 0x00B4 0x03FC 0x0808 0x7 0x0
405405 #define MX6SX_PAD_KEY_ROW0__KPP_ROW_0 0x00B8 0x0400 0x0000 0x0 0x0
406406 #define MX6SX_PAD_KEY_ROW0__USDHC3_WP 0x00B8 0x0400 0x0000 0x1 0x0
407−#define MX6SX_PAD_KEY_ROW0__UART6_CTS_B 0x00B8 0x0400 0x0854 0x2 0x3
407+#define MX6SX_PAD_KEY_ROW0__UART6_CTS_B 0x00B8 0x0400 0x0000 0x2 0x0
408408 #define MX6SX_PAD_KEY_ROW0__ECSPI1_MOSI 0x00B8 0x0400 0x0718 0x3 0x0
409409 #define MX6SX_PAD_KEY_ROW0__AUDMUX_AUD5_TXD 0x00B8 0x0400 0x0660 0x4 0x0
410410 #define MX6SX_PAD_KEY_ROW0__GPIO2_IO_15 0x00B8 0x0400 0x0000 0x5 0x0
@@ -423,7 +423,7 @@ · 12 unmodified lines
423423 #define MX6SX_PAD_KEY_ROW1__M4_NMI 0x00BC 0x0404 0x0000 0x8 0x0
424424 #define MX6SX_PAD_KEY_ROW2__KPP_ROW_2 0x00C0 0x0408 0x0000 0x0 0x0
425425 #define MX6SX_PAD_KEY_ROW2__USDHC4_WP 0x00C0 0x0408 0x0878 0x1 0x1
426−#define MX6SX_PAD_KEY_ROW2__UART5_CTS_B 0x00C0 0x0408 0x084C 0x2 0x3
426+#define MX6SX_PAD_KEY_ROW2__UART5_CTS_B 0x00C0 0x0408 0x0000 0x2 0x0
427427 #define MX6SX_PAD_KEY_ROW2__CAN1_RX 0x00C0 0x0408 0x068C 0x3 0x1
428428 #define MX6SX_PAD_KEY_ROW2__CANFD_RX1 0x00C0 0x0408 0x0694 0x4 0x1
429429 #define MX6SX_PAD_KEY_ROW2__GPIO2_IO_17 0x00C0 0x0408 0x0000 0x5 0x0
@@ -815,7 +815,7 @@ · 385 unmodified lines
815815 #define MX6SX_PAD_NAND_DATA05__RAWNAND_DATA05 0x0164 0x04AC 0x0000 0x0 0x0
816816 #define MX6SX_PAD_NAND_DATA05__USDHC2_DATA5 0x0164 0x04AC 0x0000 0x1 0x0
817817 #define MX6SX_PAD_NAND_DATA05__QSPI2_B_DQS 0x0164 0x04AC 0x0000 0x2 0x0
818−#define MX6SX_PAD_NAND_DATA05__UART3_CTS_B 0x0164 0x04AC 0x083C 0x3 0x1
818+#define MX6SX_PAD_NAND_DATA05__UART3_CTS_B 0x0164 0x04AC 0x0000 0x3 0x0
819819 #define MX6SX_PAD_NAND_DATA05__AUDMUX_AUD4_RXC 0x0164 0x04AC 0x064C 0x4 0x0
820820 #define MX6SX_PAD_NAND_DATA05__GPIO4_IO_9 0x0164 0x04AC 0x0000 0x5 0x0
821821 #define MX6SX_PAD_NAND_DATA05__WEIM_AD_5 0x0164 0x04AC 0x0000 0x6 0x0
@@ -957,7 +957,7 @@ · 135 unmodified lines
957957 #define MX6SX_PAD_QSPI1A_SS1_B__SIM_M_HADDR_12 0x019C 0x04E4 0x0000 0x7 0x0
958958 #define MX6SX_PAD_QSPI1A_SS1_B__SDMA_DEBUG_PC_3 0x019C 0x04E4 0x0000 0x9 0x0
959959 #define MX6SX_PAD_QSPI1B_DATA0__QSPI1_B_DATA_0 0x01A0 0x04E8 0x0000 0x0 0x0
960−#define MX6SX_PAD_QSPI1B_DATA0__UART3_CTS_B 0x01A0 0x04E8 0x083C 0x1 0x4
960+#define MX6SX_PAD_QSPI1B_DATA0__UART3_CTS_B 0x01A0 0x04E8 0x0000 0x1 0x0
961961 #define MX6SX_PAD_QSPI1B_DATA0__ECSPI3_MOSI 0x01A0 0x04E8 0x0738 0x2 0x1
962962 #define MX6SX_PAD_QSPI1B_DATA0__ESAI_RX_FS 0x01A0 0x04E8 0x0778 0x3 0x2
963963 #define MX6SX_PAD_QSPI1B_DATA0__CSI1_DATA_22 0x01A0 0x04E8 0x06F4 0x4 0x1
@@ -1236,7 +1236,7 @@ · 272 unmodified lines
12361236 #define MX6SX_PAD_SD1_DATA2__AUDMUX_AUD5_TXFS 0x0230 0x0578 0x0670 0x1 0x1
12371237 #define MX6SX_PAD_SD1_DATA2__PWM3_OUT 0x0230 0x0578 0x0000 0x2 0x0
12381238 #define MX6SX_PAD_SD1_DATA2__GPT_COMPARE2 0x0230 0x0578 0x0000 0x3 0x0
1239−#define MX6SX_PAD_SD1_DATA2__UART2_CTS_B 0x0230 0x0578 0x0834 0x4 0x2
1239+#define MX6SX_PAD_SD1_DATA2__UART2_CTS_B 0x0230 0x0578 0x0000 0x4 0x0
12401240 #define MX6SX_PAD_SD1_DATA2__GPIO6_IO_4 0x0230 0x0578 0x0000 0x5 0x0
12411241 #define MX6SX_PAD_SD1_DATA2__ECSPI4_RDY 0x0230 0x0578 0x0000 0x6 0x0
12421242 #define MX6SX_PAD_SD1_DATA2__CCM_OUT0 0x0230 0x0578 0x0000 0x7 0x0
@@ -1315,7 +1315,7 @@ · 72 unmodified lines
13151315 #define MX6SX_PAD_SD2_DATA3__VADC_CLAMP_CURRENT_3 0x024C 0x0594 0x0000 0x8 0x0
13161316 #define MX6SX_PAD_SD2_DATA3__MMDC_DEBUG_31 0x024C 0x0594 0x0000 0x9 0x0
13171317 #define MX6SX_PAD_SD3_CLK__USDHC3_CLK 0x0250 0x0598 0x0000 0x0 0x0
1318−#define MX6SX_PAD_SD3_CLK__UART4_CTS_B 0x0250 0x0598 0x0844 0x1 0x0
1318+#define MX6SX_PAD_SD3_CLK__UART4_CTS_B 0x0250 0x0598 0x0000 0x1 0x0
13191319 #define MX6SX_PAD_SD3_CLK__ECSPI4_SCLK 0x0250 0x0598 0x0740 0x2 0x0
13201320 #define MX6SX_PAD_SD3_CLK__AUDMUX_AUD6_RXFS 0x0250 0x0598 0x0680 0x3 0x0
13211321 #define MX6SX_PAD_SD3_CLK__LCDIF2_VSYNC 0x0250 0x0598 0x0000 0x4 0x0
@@ -1409,7 +1409,7 @@ · 87 unmodified lines
14091409 #define MX6SX_PAD_SD3_DATA7__USDHC3_DATA7 0x0274 0x05BC 0x0000 0x0 0x0
14101410 #define MX6SX_PAD_SD3_DATA7__CAN1_RX 0x0274 0x05BC 0x068C 0x1 0x0
14111411 #define MX6SX_PAD_SD3_DATA7__CANFD_RX1 0x0274 0x05BC 0x0694 0x2 0x0
1412−#define MX6SX_PAD_SD3_DATA7__UART3_CTS_B 0x0274 0x05BC 0x083C 0x3 0x3
1412+#define MX6SX_PAD_SD3_DATA7__UART3_CTS_B 0x0274 0x05BC 0x0000 0x3 0x0
14131413 #define MX6SX_PAD_SD3_DATA7__LCDIF2_DATA_5 0x0274 0x05BC 0x0000 0x4 0x0
14141414 #define MX6SX_PAD_SD3_DATA7__GPIO7_IO_9 0x0274 0x05BC 0x0000 0x5 0x0
14151415 #define MX6SX_PAD_SD3_DATA7__ENET1_1588_EVENT0_IN 0x0274 0x05BC 0x0000 0x6 0x0
@@ -1510,7 +1510,7 @@ · 94 unmodified lines
15101510 #define MX6SX_PAD_SD4_DATA6__SDMA_DEBUG_EVENT_CHANNEL_1 0x0298 0x05E0 0x0000 0x9 0x0
15111511 #define MX6SX_PAD_SD4_DATA7__USDHC4_DATA7 0x029C 0x05E4 0x0000 0x0 0x0
15121512 #define MX6SX_PAD_SD4_DATA7__RAWNAND_DATA08 0x029C 0x05E4 0x0000 0x1 0x0
1513−#define MX6SX_PAD_SD4_DATA7__UART5_CTS_B 0x029C 0x05E4 0x084C 0x2 0x1
1513+#define MX6SX_PAD_SD4_DATA7__UART5_CTS_B 0x029C 0x05E4 0x0000 0x2 0x0
15141514 #define MX6SX_PAD_SD4_DATA7__ECSPI3_SS0 0x029C 0x05E4 0x073C 0x3 0x0
15151515 #define MX6SX_PAD_SD4_DATA7__LCDIF2_DATA_15 0x029C 0x05E4 0x0000 0x4 0x0
15161516 #define MX6SX_PAD_SD4_DATA7__GPIO6_IO_21 0x029C 0x05E4 0x0000 0x5 0x0
arch/arm/boot/dts/omap3-beagle.dts+1−0
@@ -292,6 +292,7 @@ · 291 unmodified lines
292292 &uart3 {
293293 pinctrl-names = "default";
294294 pinctrl-0 = <&uart3_pins>;
295+ interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;
295296 };
296297
297298 &gpio1 {
arch/arm/boot/dts/omap3-n900.dts+1−1
@@ -353,7 +353,7 @@ · 352 unmodified lines
353353 };
354354
355355 twl_power: power {
356− compatible = "ti,twl4030-power-n900";
356+ compatible = "ti,twl4030-power-n900", "ti,twl4030-power-idle-osc-off";
357357 ti,use_poweroff;
358358 };
359359 };
arch/arm/boot/dts/omap3430-sdp.dts+1−1
@@ -107,7 +107,7 @@ · 106 unmodified lines
107107 #address-cells = <1>;
108108 #size-cells = <1>;
109109 reg = <1 0 0x08000000>;
110− ti,nand-ecc-opt = "ham1";
110+ ti,nand-ecc-opt = "sw";
111111 nand-bus-width = <8>;
112112 gpmc,cs-on-ns = <0>;
113113 gpmc,cs-rd-off-ns = <36>;
arch/arm/boot/dts/omap3xxx-clocks.dtsi+1−0
@@ -467,6 +467,7 @@ · 466 unmodified lines
467467 ti,bit-shift = <0x1e>;
468468 reg = <0x0d00>;
469469 ti,set-bit-to-disable;
470+ ti,set-rate-parent;
470471 };
471472
472473 dpll4_m6_ck: dpll4_m6_ck {
arch/arm/boot/dts/omap54xx-clocks.dtsi+10−6
@@ -367,10 +367,12 @@ · 366 unmodified lines
367367
368368 l3_iclk_div: l3_iclk_div {
369369 #clock-cells = <0>;
370− compatible = "fixed-factor-clock";
370+ compatible = "ti,divider-clock";
371+ ti,max-div = <2>;
372+ ti,bit-shift = <4>;
373+ reg = <0x100>;
371374 clocks = <&dpll_core_h12x2_ck>;
372− clock-mult = <1>;
373− clock-div = <1>;
375+ ti,index-power-of-two;
374376 };
375377
376378 gpu_l3_iclk: gpu_l3_iclk {
@@ -383,10 +385,12 @@ · 6 unmodified lines
383385
384386 l4_root_clk_div: l4_root_clk_div {
385387 #clock-cells = <0>;
386− compatible = "fixed-factor-clock";
388+ compatible = "ti,divider-clock";
389+ ti,max-div = <2>;
390+ ti,bit-shift = <8>;
391+ reg = <0x100>;
387392 clocks = <&l3_iclk_div>;
388− clock-mult = <1>;
389− clock-div = <1>;
393+ ti,index-power-of-two;
390394 };
391395
392396 slimbus1_slimbus_clk: slimbus1_slimbus_clk {
arch/arm/boot/dts/r8a7791-koelsch.dts+0−7
@@ -275,11 +275,6 @@ · 274 unmodified lines
275275 renesas,function = "msiof0";
276276 };
277277
278− i2c6_pins: i2c6 {
279− renesas,groups = "i2c6";
280− renesas,function = "i2c6";
281− };
282−
283278 usb0_pins: usb0 {
284279 renesas,groups = "usb0";
285280 renesas,function = "usb0";
@@ -420,8 +415,6 @@ · 134 unmodified lines
420415 };
421416
422417 &i2c6 {
423− pinctrl-names = "default";
424− pinctrl-0 = <&i2c6_pins>;
425418 status = "okay";
426419 clock-frequency = <100000>;
427420
arch/arm/boot/dts/rk3066a-bqcurie2.dts+2−0
@@ -149,6 +149,8 @@ · 148 unmodified lines
149149 &mmc0 { /* sdmmc */
150150 num-slots = <1>;
151151 status = "okay";
152+ pinctrl-names = "default";
153+ pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
152154 vmmc-supply = <&vcc_sd0>;
153155
154156 slot@0 {
arch/arm/boot/dts/rk3188-radxarock.dts+2−0
@@ -179,6 +179,8 @@ · 178 unmodified lines
179179 &mmc0 {
180180 num-slots = <1>;
181181 status = "okay";
182+ pinctrl-names = "default";
183+ pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
182184 vmmc-supply = <&vcc_sd0>;
183185
184186 slot@0 {
arch/arm/boot/dts/ste-snowball.dts+0−1
@@ -116,7 +116,6 @@ · 115 unmodified lines
116116 msp2: msp@80117000 {
117117 pinctrl-names = "default";
118118 pinctrl-0 = <&msp2_default_mode>;
119− status = "okay";
120119 };
121120
122121 msp3: msp@80125000 {
arch/arm/boot/dts/sun6i-a31.dtsi+8−0
@@ -660,6 +660,8 @@ · 659 unmodified lines
660660 clock-frequency = <100000>;
661661 resets = <&apb2_rst 0>;
662662 status = "disabled";
663+ #address-cells = <1>;
664+ #size-cells = <0>;
663665 };
664666
665667 i2c1: i2c@01c2b000 {
@@ -670,6 +672,8 @@ · 4 unmodified lines
670672 clock-frequency = <100000>;
671673 resets = <&apb2_rst 1>;
672674 status = "disabled";
675+ #address-cells = <1>;
676+ #size-cells = <0>;
673677 };
674678
675679 i2c2: i2c@01c2b400 {
@@ -680,6 +684,8 @@ · 4 unmodified lines
680684 clock-frequency = <100000>;
681685 resets = <&apb2_rst 2>;
682686 status = "disabled";
687+ #address-cells = <1>;
688+ #size-cells = <0>;
683689 };
684690
685691 i2c3: i2c@01c2b800 {
@@ -690,6 +696,8 @@ · 4 unmodified lines
690696 clock-frequency = <100000>;
691697 resets = <&apb2_rst 3>;
692698 status = "disabled";
699+ #address-cells = <1>;
700+ #size-cells = <0>;
693701 };
694702
695703 gmac: ethernet@01c30000 {
arch/arm/boot/dts/tegra30-apalis.dtsi+10−1
@@ -423,7 +423,7 @@ · 422 unmodified lines
423423 vcc4-supply = <&sys_3v3_reg>;
424424 vcc5-supply = <&sys_3v3_reg>;
425425 vcc6-supply = <&vio_reg>;
426− vcc7-supply = <&sys_5v0_reg>;
426+ vcc7-supply = <&charge_pump_5v0_reg>;
427427 vccio-supply = <&sys_3v3_reg>;
428428
429429 regulators {
@@ -674,5 +674,14 @@ · 244 unmodified lines
674674 regulator-max-microvolt = <3300000>;
675675 regulator-always-on;
676676 };
677+
678+ charge_pump_5v0_reg: regulator@101 {
679+ compatible = "regulator-fixed";
680+ reg = <101>;
681+ regulator-name = "5v0";
682+ regulator-min-microvolt = <5000000>;
683+ regulator-max-microvolt = <5000000>;
684+ regulator-always-on;
685+ };
677686 };
678687 };
arch/arm/boot/dts/tegra30-colibri.dtsi+10−1
@@ -201,7 +201,7 @@ · 200 unmodified lines
201201 vcc4-supply = <&sys_3v3_reg>;
202202 vcc5-supply = <&sys_3v3_reg>;
203203 vcc6-supply = <&vio_reg>;
204− vcc7-supply = <&sys_5v0_reg>;
204+ vcc7-supply = <&charge_pump_5v0_reg>;
205205 vccio-supply = <&sys_3v3_reg>;
206206
207207 regulators {
@@ -373,5 +373,14 @@ · 165 unmodified lines
373373 regulator-max-microvolt = <3300000>;
374374 regulator-always-on;
375375 };
376+
377+ charge_pump_5v0_reg: regulator@101 {
378+ compatible = "regulator-fixed";
379+ reg = <101>;
380+ regulator-name = "5v0";
381+ regulator-min-microvolt = <5000000>;
382+ regulator-max-microvolt = <5000000>;
383+ regulator-always-on;
384+ };
376385 };
377386 };
arch/arm/boot/dts/twl6030.dtsi+0−4
@@ -83,10 +83,6 @@ · 82 unmodified lines
8383 regulator-always-on;
8484 };
8585
86− clk32kg: regulator-clk32kg {
87− compatible = "ti,twl6030-clk32kg";
88− };
89−
9086 twl_usb_comparator: usb-comparator {
9187 compatible = "ti,twl6030-usb";
9288 interrupts = <4>, <10>;
arch/arm/boot/dts/vf610-twr.dts+1−1
@@ -168,7 +168,7 @@ · 167 unmodified lines
168168 };
169169
170170 pinctrl_esdhc1: esdhc1grp {
171− fsl,fsl,pins = <
171+ fsl,pins = <
172172 VF610_PAD_PTA24__ESDHC1_CLK 0x31ef
173173 VF610_PAD_PTA25__ESDHC1_CMD 0x31ef
174174 VF610_PAD_PTA26__ESDHC1_DAT0 0x31ef
arch/arm/common/edma.c+5−4
@@ -1443,14 +1443,14 @@ void edma_assign_channel_eventq(unsigned channel, enum dma_event_q eventq_no) · 1442 unmodified lines
14431443 EXPORT_SYMBOL(edma_assign_channel_eventq);
14441444
14451445 static int edma_setup_from_hw(struct device *dev, struct edma_soc_info *pdata,
1446− struct edma *edma_cc)
1446+ struct edma *edma_cc, int cc_id)
14471447 {
14481448 int i;
14491449 u32 value, cccfg;
14501450 s8 (*queue_priority_map)[2];
14511451
14521452 /* Decode the eDMA3 configuration from CCCFG register */
1453− cccfg = edma_read(0, EDMA_CCCFG);
1453+ cccfg = edma_read(cc_id, EDMA_CCCFG);
14541454
14551455 value = GET_NUM_REGN(cccfg);
14561456 edma_cc->num_region = BIT(value);
@@ -1464,7 +1464,8 @@ static int edma_setup_from_hw(struct device *dev, struct edma_soc_info *pdata, · 7 unmodified lines
14641464 value = GET_NUM_EVQUE(cccfg);
14651465 edma_cc->num_tc = value + 1;
14661466
1467− dev_dbg(dev, "eDMA3 HW configuration (cccfg: 0x%08x):\n", cccfg);
1467+ dev_dbg(dev, "eDMA3 CC%d HW configuration (cccfg: 0x%08x):\n", cc_id,
1468+ cccfg);
14681469 dev_dbg(dev, "num_region: %u\n", edma_cc->num_region);
14691470 dev_dbg(dev, "num_channel: %u\n", edma_cc->num_channels);
14701471 dev_dbg(dev, "num_slot: %u\n", edma_cc->num_slots);
@@ -1684,7 +1685,7 @@ static int edma_probe(struct platform_device *pdev) · 213 unmodified lines
16841685 return -ENOMEM;
16851686
16861687 /* Get eDMA3 configuration from IP */
1687− ret = edma_setup_from_hw(dev, info[j], edma_cc[j]);
1688+ ret = edma_setup_from_hw(dev, info[j], edma_cc[j], j);
16881689 if (ret)
16891690 return ret;
16901691
arch/arm/include/asm/cacheflush.h+0−1
@@ -472,7 +472,6 @@ static inline void __sync_cache_range_r(volatile void *p, size_t size) · 471 unmodified lines
472472 "mcr p15, 0, r0, c1, c0, 0 @ set SCTLR \n\t" \
473473 "isb \n\t" \
474474 "bl v7_flush_dcache_"__stringify(level)" \n\t" \
475− "clrex \n\t" \
476475 "mrc p15, 0, r0, c1, c0, 1 @ get ACTLR \n\t" \
477476 "bic r0, r0, #(1 << 6) @ disable local coherency \n\t" \
478477 "mcr p15, 0, r0, c1, c0, 1 @ set ACTLR \n\t" \
arch/arm/include/asm/cputype.h+2−1
@@ -74,6 +74,7 @@ · 73 unmodified lines
7474 #define ARM_CPU_PART_CORTEX_A12 0x4100c0d0
7575 #define ARM_CPU_PART_CORTEX_A17 0x4100c0e0
7676 #define ARM_CPU_PART_CORTEX_A15 0x4100c0f0
77+#define ARM_CPU_PART_MASK 0xff00fff0
7778
7879 #define ARM_CPU_XSCALE_ARCH_MASK 0xe000
7980 #define ARM_CPU_XSCALE_ARCH_V1 0x2000
@@ -179,7 +180,7 @@ static inline unsigned int __attribute_const__ read_cpuid_implementor(void) · 99 unmodified lines
179180 */
180181 static inline unsigned int __attribute_const__ read_cpuid_part(void)
181182 {
182− return read_cpuid_id() & 0xff00fff0;
183+ return read_cpuid_id() & ARM_CPU_PART_MASK;
183184 }
184185
185186 static inline unsigned int __attribute_const__ __deprecated read_cpuid_part_number(void)
arch/arm/include/asm/elf.h+1−0
@@ -50,6 +50,7 @@ typedef struct user_fp elf_fpregset_t; · 49 unmodified lines
5050 #define R_ARM_ABS32 2
5151 #define R_ARM_CALL 28
5252 #define R_ARM_JUMP24 29
53+#define R_ARM_TARGET1 38
5354 #define R_ARM_V4BX 40
5455 #define R_ARM_PREL31 42
5556 #define R_ARM_MOVW_ABS_NC 43
arch/arm/include/asm/smp_plat.h+15−0
@@ -8,6 +8,7 @@ · 7 unmodified lines
88 #include <linux/cpumask.h>
99 #include <linux/err.h>
1010
11+#include <asm/cpu.h>
1112 #include <asm/cputype.h>
1213
1314 /*
@@ -25,6 +26,20 @@ static inline bool is_smp(void) · 11 unmodified lines
2526 #endif
2627 }
2728
29+/**
30+ * smp_cpuid_part() - return part id for a given cpu
31+ * @cpu: logical cpu id.
32+ *
33+ * Return: part id of logical cpu passed as argument.
34+ */
35+static inline unsigned int smp_cpuid_part(int cpu)
36+{
37+ struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpu);
38+
39+ return is_smp() ? cpu_info->cpuid & ARM_CPU_PART_MASK :
40+ read_cpuid_part();
41+}
42+
2843 /* all SMP configurations have the extended CPUID registers */
2944 #ifndef CONFIG_MMU
3045 #define tlb_ops_need_broadcast() 0
arch/arm/kernel/entry-header.S+15−14
@@ -208,26 +208,21 @@ · 207 unmodified lines
208208 #endif
209209 .endif
210210 msr spsr_cxsf, \rpsr
211−#if defined(CONFIG_CPU_V6)
212− ldr r0, [sp]
213− strex r1, r2, [sp] @ clear the exclusive monitor
214− ldmib sp, {r1 - pc}^ @ load r1 - pc, cpsr
215−#elif defined(CONFIG_CPU_32v6K)
216− clrex @ clear the exclusive monitor
217− ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr
218−#else
219− ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr
211+#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
212+ @ We must avoid clrex due to Cortex-A15 erratum #830321
213+ sub r0, sp, #4 @ uninhabited address
214+ strex r1, r2, [r0] @ clear the exclusive monitor
220215 #endif
216+ ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr
221217 .endm
222218
223219 .macro restore_user_regs, fast = 0, offset = 0
224220 ldr r1, [sp, #\offset + S_PSR] @ get calling cpsr
225221 ldr lr, [sp, #\offset + S_PC]! @ get pc
226222 msr spsr_cxsf, r1 @ save in spsr_svc
227−#if defined(CONFIG_CPU_V6)
223+#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
224+ @ We must avoid clrex due to Cortex-A15 erratum #830321
228225 strex r1, r2, [sp] @ clear the exclusive monitor
229−#elif defined(CONFIG_CPU_32v6K)
230− clrex @ clear the exclusive monitor
231226 #endif
232227 .if \fast
233228 ldmdb sp, {r1 - lr}^ @ get calling r1 - lr
@@ -261,7 +256,10 @@ · 27 unmodified lines
261256 .endif
262257 ldr lr, [sp, #S_SP] @ top of the stack
263258 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
264− clrex @ clear the exclusive monitor
259+
260+ @ We must avoid clrex due to Cortex-A15 erratum #830321
261+ strex r2, r1, [sp, #S_LR] @ clear the exclusive monitor
262+
265263 stmdb lr!, {r0, r1, \rpsr} @ calling lr and rfe context
266264 ldmia sp, {r0 - r12}
267265 mov sp, lr
@@ -282,13 +280,16 @@ · 14 unmodified lines
282280 .endm
283281 #else /* ifdef CONFIG_CPU_V7M */
284282 .macro restore_user_regs, fast = 0, offset = 0
285− clrex @ clear the exclusive monitor
286283 mov r2, sp
287284 load_user_sp_lr r2, r3, \offset + S_SP @ calling sp, lr
288285 ldr r1, [sp, #\offset + S_PSR] @ get calling cpsr
289286 ldr lr, [sp, #\offset + S_PC] @ get pc
290287 add sp, sp, #\offset + S_SP
291288 msr spsr_cxsf, r1 @ save in spsr_svc
289+
290+ @ We must avoid clrex due to Cortex-A15 erratum #830321
291+ strex r1, r2, [sp] @ clear the exclusive monitor
292+
292293 .if \fast
293294 ldmdb sp, {r1 - r12} @ get calling r1 - r12
294295 .else
arch/arm/kernel/module.c+1−0
@@ -91,6 +91,7 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, · 90 unmodified lines
9191 break;
9292
9393 case R_ARM_ABS32:
94+ case R_ARM_TARGET1:
9495 *(u32 *)loc += sym->st_value;
9596 break;
9697
arch/arm/kvm/handle_exit.c+2−0
@@ -93,6 +93,8 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) · 92 unmodified lines
9393 else
9494 kvm_vcpu_block(vcpu);
9595
96+ kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));
97+
9698 return 1;
9799 }
98100
arch/arm/kvm/init.S+4−0
@@ -99,6 +99,10 @@ __do_hyp_init: · 98 unmodified lines
9999 mrc p15, 0, r0, c10, c2, 1
100100 mcr p15, 4, r0, c10, c2, 1
101101
102+ @ Invalidate the stale TLBs from Bootloader
103+ mcr p15, 4, r0, c8, c7, 0 @ TLBIALLH
104+ dsb ish
105+
102106 @ Set the HSCTLR to:
103107 @ - ARM/THUMB exceptions: Kernel config (Thumb-2 kernel)
104108 @ - Endianness: Kernel config
arch/arm/mach-at91/board-dt-rm9200.c+10−1
@@ -14,6 +14,7 @@ · 13 unmodified lines
1414 #include <linux/gpio.h>
1515 #include <linux/of.h>
1616 #include <linux/of_irq.h>
17+#include <linux/clk-provider.h>
1718
1819 #include <asm/setup.h>
1920 #include <asm/irq.h>
@@ -35,13 +36,21 @@ static void __init at91rm9200_dt_init_irq(void) · 15 unmodified lines
3536 of_irq_init(irq_of_match);
3637 }
3738
39+static void __init at91rm9200_dt_timer_init(void)
40+{
41+#if defined(CONFIG_COMMON_CLK)
42+ of_clk_init(NULL);
43+#endif
44+ at91rm9200_timer_init();
45+}
46+
3847 static const char *at91rm9200_dt_board_compat[] __initdata = {
3948 "atmel,at91rm9200",
4049 NULL
4150 };
4251
4352 DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)")
44− .init_time = at91rm9200_timer_init,
53+ .init_time = at91rm9200_dt_timer_init,
4554 .map_io = at91_map_io,
4655 .handle_irq = at91_aic_handle_irq,
4756 .init_early = at91rm9200_dt_initialize,
arch/arm/mach-bcm/Makefile+0−1
@@ -36,5 +36,4 @@ obj-$(CONFIG_ARCH_BCM_5301X) += bcm_5301x.o · 35 unmodified lines
3636
3737 ifeq ($(CONFIG_ARCH_BRCMSTB),y)
3838 obj-y += brcmstb.o
39−obj-$(CONFIG_SMP) += headsmp-brcmstb.o platsmp-brcmstb.o
4039 endif
arch/arm/mach-bcm/brcmstb.h+0−19
@@ -1,19 +0,0 @@
1−/*
2− * Copyright (C) 2013-2014 Broadcom Corporation
3− *
4− * This program is free software; you can redistribute it and/or
5− * modify it under the terms of the GNU General Public License as
6− * published by the Free Software Foundation version 2.
7− *
8− * This program is distributed "as is" WITHOUT ANY WARRANTY of any
9− * kind, whether express or implied; without even the implied warranty
10− * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− */
13−
14−#ifndef __BRCMSTB_H__
15−#define __BRCMSTB_H__
16−
17−void brcmstb_secondary_startup(void);
18−
19−#endif /* __BRCMSTB_H__ */
arch/arm/mach-bcm/headsmp-brcmstb.S+0−33
@@ -1,33 +0,0 @@
1−/*
2− * SMP boot code for secondary CPUs
3− * Based on arch/arm/mach-tegra/headsmp.S
4− *
5− * Copyright (C) 2010 NVIDIA, Inc.
6− * Copyright (C) 2013-2014 Broadcom Corporation
7− *
8− * This program is free software; you can redistribute it and/or
9− * modify it under the terms of the GNU General Public License as
10− * published by the Free Software Foundation version 2.
11− *
12− * This program is distributed "as is" WITHOUT ANY WARRANTY of any
13− * kind, whether express or implied; without even the implied warranty
14− * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15− * GNU General Public License for more details.
16− */
17−
18−#include <asm/assembler.h>
19−#include <linux/linkage.h>
20−#include <linux/init.h>
21−
22− .section ".text.head", "ax"
23−
24−ENTRY(brcmstb_secondary_startup)
25− /*
26− * Ensure CPU is in a sane state by disabling all IRQs and switching
27− * into SVC mode.
28− */
29− setmode PSR_I_BIT | PSR_F_BIT | SVC_MODE, r0
30−
31− bl v7_invalidate_l1
32− b secondary_startup
33−ENDPROC(brcmstb_secondary_startup)
arch/arm/mach-bcm/platsmp-brcmstb.c+0−363
@@ -1,363 +0,0 @@
1−/*
2− * Broadcom STB CPU SMP and hotplug support for ARM
3− *
4− * Copyright (C) 2013-2014 Broadcom Corporation
5− *
6− * This program is free software; you can redistribute it and/or
7− * modify it under the terms of the GNU General Public License as
8− * published by the Free Software Foundation version 2.
9− *
10− * This program is distributed "as is" WITHOUT ANY WARRANTY of any
11− * kind, whether express or implied; without even the implied warranty
12− * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13− * GNU General Public License for more details.
14− */
15−
16−#include <linux/delay.h>
17−#include <linux/errno.h>
18−#include <linux/init.h>
19−#include <linux/io.h>
20−#include <linux/of_address.h>
21−#include <linux/of_platform.h>
22−#include <linux/printk.h>
23−#include <linux/regmap.h>
24−#include <linux/smp.h>
25−#include <linux/mfd/syscon.h>
26−#include <linux/spinlock.h>
27−
28−#include <asm/cacheflush.h>
29−#include <asm/cp15.h>
30−#include <asm/mach-types.h>
31−#include <asm/smp_plat.h>
32−
33−#include "brcmstb.h"
34−
35−enum {
36− ZONE_MAN_CLKEN_MASK = BIT(0),
37− ZONE_MAN_RESET_CNTL_MASK = BIT(1),
38− ZONE_MAN_MEM_PWR_MASK = BIT(4),
39− ZONE_RESERVED_1_MASK = BIT(5),
40− ZONE_MAN_ISO_CNTL_MASK = BIT(6),
41− ZONE_MANUAL_CONTROL_MASK = BIT(7),
42− ZONE_PWR_DN_REQ_MASK = BIT(9),
43− ZONE_PWR_UP_REQ_MASK = BIT(10),
44− ZONE_BLK_RST_ASSERT_MASK = BIT(12),
45− ZONE_PWR_OFF_STATE_MASK = BIT(25),
46− ZONE_PWR_ON_STATE_MASK = BIT(26),
47− ZONE_DPG_PWR_STATE_MASK = BIT(28),
48− ZONE_MEM_PWR_STATE_MASK = BIT(29),
49− ZONE_RESET_STATE_MASK = BIT(31),
50− CPU0_PWR_ZONE_CTRL_REG = 1,
51− CPU_RESET_CONFIG_REG = 2,
52−};
53−
54−static void __iomem *cpubiuctrl_block;
55−static void __iomem *hif_cont_block;
56−static u32 cpu0_pwr_zone_ctrl_reg;
57−static u32 cpu_rst_cfg_reg;
58−static u32 hif_cont_reg;
59−
60−#ifdef CONFIG_HOTPLUG_CPU
61−static DEFINE_PER_CPU_ALIGNED(int, per_cpu_sw_state);
62−
63−static int per_cpu_sw_state_rd(u32 cpu)
64−{
65− sync_cache_r(SHIFT_PERCPU_PTR(&per_cpu_sw_state, per_cpu_offset(cpu)));
66− return per_cpu(per_cpu_sw_state, cpu);
67−}
68−
69−static void per_cpu_sw_state_wr(u32 cpu, int val)
70−{
71− per_cpu(per_cpu_sw_state, cpu) = val;
72− dmb();
73− sync_cache_w(SHIFT_PERCPU_PTR(&per_cpu_sw_state, per_cpu_offset(cpu)));
74− dsb_sev();
75−}
76−#else
77−static inline void per_cpu_sw_state_wr(u32 cpu, int val) { }
78−#endif
79−
80−static void __iomem *pwr_ctrl_get_base(u32 cpu)
81−{
82− void __iomem *base = cpubiuctrl_block + cpu0_pwr_zone_ctrl_reg;
83− base += (cpu_logical_map(cpu) * 4);
84− return base;
85−}
86−
87−static u32 pwr_ctrl_rd(u32 cpu)
88−{
89− void __iomem *base = pwr_ctrl_get_base(cpu);
90− return readl_relaxed(base);
91−}
92−
93−static void pwr_ctrl_wr(u32 cpu, u32 val)
94−{
95− void __iomem *base = pwr_ctrl_get_base(cpu);
96− writel(val, base);
97−}
98−
99−static void cpu_rst_cfg_set(u32 cpu, int set)
100−{
101− u32 val;
102− val = readl_relaxed(cpubiuctrl_block + cpu_rst_cfg_reg);
103− if (set)
104− val |= BIT(cpu_logical_map(cpu));
105− else
106− val &= ~BIT(cpu_logical_map(cpu));
107− writel_relaxed(val, cpubiuctrl_block + cpu_rst_cfg_reg);
108−}
109−
110−static void cpu_set_boot_addr(u32 cpu, unsigned long boot_addr)
111−{
112− const int reg_ofs = cpu_logical_map(cpu) * 8;
113− writel_relaxed(0, hif_cont_block + hif_cont_reg + reg_ofs);
114− writel_relaxed(boot_addr, hif_cont_block + hif_cont_reg + 4 + reg_ofs);
115−}
116−
117−static void brcmstb_cpu_boot(u32 cpu)
118−{
119− pr_info("SMP: Booting CPU%d...\n", cpu);
120−
121− /*
122− * set the reset vector to point to the secondary_startup
123− * routine
124− */
125− cpu_set_boot_addr(cpu, virt_to_phys(brcmstb_secondary_startup));
126−
127− /* unhalt the cpu */
128− cpu_rst_cfg_set(cpu, 0);
129−}
130−
131−static void brcmstb_cpu_power_on(u32 cpu)
132−{
133− /*
134− * The secondary cores power was cut, so we must go through
135− * power-on initialization.
136− */
137− u32 tmp;
138−
139− pr_info("SMP: Powering up CPU%d...\n", cpu);
140−
141− /* Request zone power up */
142− pwr_ctrl_wr(cpu, ZONE_PWR_UP_REQ_MASK);
143−
144− /* Wait for the power up FSM to complete */
145− do {
146− tmp = pwr_ctrl_rd(cpu);
147− } while (!(tmp & ZONE_PWR_ON_STATE_MASK));
148−
149− per_cpu_sw_state_wr(cpu, 1);
150−}
151−
152−static int brcmstb_cpu_get_power_state(u32 cpu)
153−{
154− int tmp = pwr_ctrl_rd(cpu);
155− return (tmp & ZONE_RESET_STATE_MASK) ? 0 : 1;
156−}
157−
158−#ifdef CONFIG_HOTPLUG_CPU
159−
160−static void brcmstb_cpu_die(u32 cpu)
161−{
162− v7_exit_coherency_flush(all);
163−
164− /* Prevent all interrupts from reaching this CPU. */
165− arch_local_irq_disable();
166−
167− /*
168− * Final full barrier to ensure everything before this instruction has
169− * quiesced.
170− */
171− isb();
172− dsb();
173−
174− per_cpu_sw_state_wr(cpu, 0);
175−
176− /* Sit and wait to die */
177− wfi();
178−
179− /* We should never get here... */
180− panic("Spurious interrupt on CPU %d received!\n", cpu);
181−}
182−
183−static int brcmstb_cpu_kill(u32 cpu)
184−{
185− u32 tmp;
186−
187− pr_info("SMP: Powering down CPU%d...\n", cpu);
188−
189− while (per_cpu_sw_state_rd(cpu))
190− ;
191−
192− /* Program zone reset */
193− pwr_ctrl_wr(cpu, ZONE_RESET_STATE_MASK | ZONE_BLK_RST_ASSERT_MASK |
194− ZONE_PWR_DN_REQ_MASK);
195−
196− /* Verify zone reset */
197− tmp = pwr_ctrl_rd(cpu);
198− if (!(tmp & ZONE_RESET_STATE_MASK))
199− pr_err("%s: Zone reset bit for CPU %d not asserted!\n",
200− __func__, cpu);
201−
202− /* Wait for power down */
203− do {
204− tmp = pwr_ctrl_rd(cpu);
205− } while (!(tmp & ZONE_PWR_OFF_STATE_MASK));
206−
207− /* Settle-time from Broadcom-internal DVT reference code */
208− udelay(7);
209−
210− /* Assert reset on the CPU */
211− cpu_rst_cfg_set(cpu, 1);
212−
213− return 1;
214−}
215−
216−#endif /* CONFIG_HOTPLUG_CPU */
217−
218−static int __init setup_hifcpubiuctrl_regs(struct device_node *np)
219−{
220− int rc = 0;
221− char *name;
222− struct device_node *syscon_np = NULL;
223−
224− name = "syscon-cpu";
225−
226− syscon_np = of_parse_phandle(np, name, 0);
227− if (!syscon_np) {
228− pr_err("can't find phandle %s\n", name);
229− rc = -EINVAL;
230− goto cleanup;
231− }
232−
233− cpubiuctrl_block = of_iomap(syscon_np, 0);
234− if (!cpubiuctrl_block) {
235− pr_err("iomap failed for cpubiuctrl_block\n");
236− rc = -EINVAL;
237− goto cleanup;
238− }
239−
240− rc = of_property_read_u32_index(np, name, CPU0_PWR_ZONE_CTRL_REG,
241− &cpu0_pwr_zone_ctrl_reg);
242− if (rc) {
243− pr_err("failed to read 1st entry from %s property (%d)\n", name,
244− rc);
245− rc = -EINVAL;
246− goto cleanup;
247− }
248−
249− rc = of_property_read_u32_index(np, name, CPU_RESET_CONFIG_REG,
250− &cpu_rst_cfg_reg);
251− if (rc) {
252− pr_err("failed to read 2nd entry from %s property (%d)\n", name,
253− rc);
254− rc = -EINVAL;
255− goto cleanup;
256− }
257−
258−cleanup:
259− if (syscon_np)
260− of_node_put(syscon_np);
261−
262− return rc;
263−}
264−
265−static int __init setup_hifcont_regs(struct device_node *np)
266−{
267− int rc = 0;
268− char *name;
269− struct device_node *syscon_np = NULL;
270−
271− name = "syscon-cont";
272−
273− syscon_np = of_parse_phandle(np, name, 0);
274− if (!syscon_np) {
275− pr_err("can't find phandle %s\n", name);
276− rc = -EINVAL;
277− goto cleanup;
278− }
279−
280− hif_cont_block = of_iomap(syscon_np, 0);
281− if (!hif_cont_block) {
282− pr_err("iomap failed for hif_cont_block\n");
283− rc = -EINVAL;
284− goto cleanup;
285− }
286−
287− /* offset is at top of hif_cont_block */
288− hif_cont_reg = 0;
289−
290−cleanup:
291− if (syscon_np)
292− of_node_put(syscon_np);
293−
294− return rc;
295−}
296−
297−static void __init brcmstb_cpu_ctrl_setup(unsigned int max_cpus)
298−{
299− int rc;
300− struct device_node *np;
301− char *name;
302−
303− name = "brcm,brcmstb-smpboot";
304− np = of_find_compatible_node(NULL, NULL, name);
305− if (!np) {
306− pr_err("can't find compatible node %s\n", name);
307− return;
308− }
309−
310− rc = setup_hifcpubiuctrl_regs(np);
311− if (rc)
312− return;
313−
314− rc = setup_hifcont_regs(np);
315− if (rc)
316− return;
317−}
318−
319−static DEFINE_SPINLOCK(boot_lock);
320−
321−static void brcmstb_secondary_init(unsigned int cpu)
322−{
323− /*
324− * Synchronise with the boot thread.
325− */
326− spin_lock(&boot_lock);
327− spin_unlock(&boot_lock);
328−}
329−
330−static int brcmstb_boot_secondary(unsigned int cpu, struct task_struct *idle)
331−{
332− /*
333− * set synchronisation state between this boot processor
334− * and the secondary one
335− */
336− spin_lock(&boot_lock);
337−
338− /* Bring up power to the core if necessary */
339− if (brcmstb_cpu_get_power_state(cpu) == 0)
340− brcmstb_cpu_power_on(cpu);
341−
342− brcmstb_cpu_boot(cpu);
343−
344− /*
345− * now the secondary core is starting up let it run its
346− * calibrations, then wait for it to finish
347− */
348− spin_unlock(&boot_lock);
349−
350− return 0;
351−}
352−
353−static struct smp_operations brcmstb_smp_ops __initdata = {
354− .smp_prepare_cpus = brcmstb_cpu_ctrl_setup,
355− .smp_secondary_init = brcmstb_secondary_init,
356− .smp_boot_secondary = brcmstb_boot_secondary,
357−#ifdef CONFIG_HOTPLUG_CPU
358− .cpu_kill = brcmstb_cpu_kill,
359− .cpu_die = brcmstb_cpu_die,
360−#endif
361−};
362−
363−CPU_METHOD_OF_DECLARE(brcmstb_smp, "brcm,brahma-b15", &brcmstb_smp_ops);
arch/arm/mach-exynos/mcpm-exynos.c+0−1
@@ -43,7 +43,6 @@ · 42 unmodified lines
4343 "mcr p15, 0, r0, c1, c0, 0 @ set SCTLR\n\t" \
4444 "isb\n\t"\
4545 "bl v7_flush_dcache_"__stringify(level)"\n\t" \
46− "clrex\n\t"\
4746 "mrc p15, 0, r0, c1, c0, 1 @ get ACTLR\n\t" \
4847 "bic r0, r0, #(1 << 6) @ disable local coherency\n\t" \
4948 /* Dummy Load of a device register to avoid Erratum 799270 */ \
arch/arm/mach-imx/Kconfig+0−2
@@ -85,7 +85,6 @@ config SOC_IMX25 · 84 unmodified lines
8585
8686 config SOC_IMX27
8787 bool
88− select ARCH_HAS_OPP
8988 select CPU_ARM926T
9089 select IMX_HAVE_IOMUX_V1
9190 select MXC_AVIC
@@ -659,7 +658,6 @@ comment "Device tree only" · 567 unmodified lines
659658
660659 config SOC_IMX5
661660 bool
662− select ARCH_HAS_OPP
663661 select HAVE_IMX_SRC
664662 select MXC_TZIC
665663
arch/arm/mach-imx/Makefile+2−0
@@ -93,9 +93,11 @@ obj-$(CONFIG_HAVE_IMX_ANATOP) += anatop.o · 92 unmodified lines
9393 obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
9494 obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o
9595 obj-$(CONFIG_HAVE_IMX_SRC) += src.o
96+ifdef CONFIG_SOC_IMX6
9697 AFLAGS_headsmp.o :=-Wa,-march=armv7-a
9798 obj-$(CONFIG_SMP) += headsmp.o platsmp.o
9899 obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
100+endif
99101 obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o
100102 obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o
101103 obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o mach-imx6sx.o
arch/arm/mach-imx/clk-imx6q.c+8−2
@@ -194,6 +194,10 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) · 193 unmodified lines
194194 clk[IMX6QDL_CLK_PLL3_80M] = imx_clk_fixed_factor("pll3_80m", "pll3_usb_otg", 1, 6);
195195 clk[IMX6QDL_CLK_PLL3_60M] = imx_clk_fixed_factor("pll3_60m", "pll3_usb_otg", 1, 8);
196196 clk[IMX6QDL_CLK_TWD] = imx_clk_fixed_factor("twd", "arm", 1, 2);
197+ if (cpu_is_imx6dl()) {
198+ clk[IMX6QDL_CLK_GPU2D_AXI] = imx_clk_fixed_factor("gpu2d_axi", "mmdc_ch0_axi_podf", 1, 1);
199+ clk[IMX6QDL_CLK_GPU3D_AXI] = imx_clk_fixed_factor("gpu3d_axi", "mmdc_ch0_axi_podf", 1, 1);
200+ }
197201
198202 clk[IMX6QDL_CLK_PLL4_POST_DIV] = clk_register_divider_table(NULL, "pll4_post_div", "pll4_audio", CLK_SET_RATE_PARENT, base + 0x70, 19, 2, 0, post_div_table, &imx_ccm_lock);
199203 clk[IMX6QDL_CLK_PLL4_AUDIO_DIV] = clk_register_divider(NULL, "pll4_audio_div", "pll4_post_div", CLK_SET_RATE_PARENT, base + 0x170, 15, 1, 0, &imx_ccm_lock);
@@ -217,8 +221,10 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) · 17 unmodified lines
217221 clk[IMX6QDL_CLK_ESAI_SEL] = imx_clk_mux("esai_sel", base + 0x20, 19, 2, audio_sels, ARRAY_SIZE(audio_sels));
218222 clk[IMX6QDL_CLK_ASRC_SEL] = imx_clk_mux("asrc_sel", base + 0x30, 7, 2, audio_sels, ARRAY_SIZE(audio_sels));
219223 clk[IMX6QDL_CLK_SPDIF_SEL] = imx_clk_mux("spdif_sel", base + 0x30, 20, 2, audio_sels, ARRAY_SIZE(audio_sels));
220− clk[IMX6QDL_CLK_GPU2D_AXI] = imx_clk_mux("gpu2d_axi", base + 0x18, 0, 1, gpu_axi_sels, ARRAY_SIZE(gpu_axi_sels));
221− clk[IMX6QDL_CLK_GPU3D_AXI] = imx_clk_mux("gpu3d_axi", base + 0x18, 1, 1, gpu_axi_sels, ARRAY_SIZE(gpu_axi_sels));
224+ if (cpu_is_imx6q()) {
225+ clk[IMX6QDL_CLK_GPU2D_AXI] = imx_clk_mux("gpu2d_axi", base + 0x18, 0, 1, gpu_axi_sels, ARRAY_SIZE(gpu_axi_sels));
226+ clk[IMX6QDL_CLK_GPU3D_AXI] = imx_clk_mux("gpu3d_axi", base + 0x18, 1, 1, gpu_axi_sels, ARRAY_SIZE(gpu_axi_sels));
227+ }
222228 clk[IMX6QDL_CLK_GPU2D_CORE_SEL] = imx_clk_mux("gpu2d_core_sel", base + 0x18, 16, 2, gpu2d_core_sels, ARRAY_SIZE(gpu2d_core_sels));
223229 clk[IMX6QDL_CLK_GPU3D_CORE_SEL] = imx_clk_mux("gpu3d_core_sel", base + 0x18, 4, 2, gpu3d_core_sels, ARRAY_SIZE(gpu3d_core_sels));
224230 clk[IMX6QDL_CLK_GPU3D_SHADER_SEL] = imx_clk_mux("gpu3d_shader_sel", base + 0x18, 8, 2, gpu3d_shader_sels, ARRAY_SIZE(gpu3d_shader_sels));
arch/arm/mach-imx/suspend-imx6.S+2−0
@@ -173,6 +173,8 @@ ENTRY(imx6_suspend) · 172 unmodified lines
173173 ldr r6, [r11, #0x0]
174174 ldr r11, [r0, #PM_INFO_MX6Q_GPC_V_OFFSET]
175175 ldr r6, [r11, #0x0]
176+ ldr r11, [r0, #PM_INFO_MX6Q_IOMUXC_V_OFFSET]
177+ ldr r6, [r11, #0x0]
176178
177179 /* use r11 to store the IO address */
178180 ldr r11, [r0, #PM_INFO_MX6Q_SRC_V_OFFSET]
arch/arm/mach-omap2/board-flash.c+1−1
@@ -142,7 +142,7 @@ __init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs, · 141 unmodified lines
142142 board_nand_data.nr_parts = nr_parts;
143143 board_nand_data.devsize = nand_type;
144144
145− board_nand_data.ecc_opt = OMAP_ECC_HAM1_CODE_HW;
145+ board_nand_data.ecc_opt = OMAP_ECC_HAM1_CODE_SW;
146146 gpmc_nand_init(&board_nand_data, gpmc_t);
147147 }
148148 #endif /* CONFIG_MTD_NAND_OMAP2 || CONFIG_MTD_NAND_OMAP2_MODULE */
arch/arm/mach-omap2/gpmc-nand.c+2−1
@@ -49,7 +49,8 @@ static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt) · 48 unmodified lines
4949 return 0;
5050
5151 /* legacy platforms support only HAM1 (1-bit Hamming) ECC scheme */
52− if (ecc_opt == OMAP_ECC_HAM1_CODE_HW)
52+ if (ecc_opt == OMAP_ECC_HAM1_CODE_HW ||
53+ ecc_opt == OMAP_ECC_HAM1_CODE_SW)
5354 return 1;
5455 else
5556 return 0;
arch/arm/mach-omap2/gpmc.c+8−6
@@ -1207,8 +1207,7 @@ int gpmc_cs_program_settings(int cs, struct gpmc_settings *p) · 1206 unmodified lines
12071207 }
12081208 }
12091209
1210− if ((p->wait_on_read || p->wait_on_write) &&
1211− (p->wait_pin > gpmc_nr_waitpins)) {
1210+ if (p->wait_pin > gpmc_nr_waitpins) {
12121211 pr_err("%s: invalid wait-pin (%d)\n", __func__, p->wait_pin);
12131212 return -EINVAL;
12141213 }
@@ -1288,8 +1287,8 @@ void gpmc_read_settings_dt(struct device_node *np, struct gpmc_settings *p) · 73 unmodified lines
12881287 p->wait_on_write = of_property_read_bool(np,
12891288 "gpmc,wait-on-write");
12901289 if (!p->wait_on_read && !p->wait_on_write)
1291− pr_warn("%s: read/write wait monitoring not enabled!\n",
1292− __func__);
1290+ pr_debug("%s: rd/wr wait monitoring not enabled!\n",
1291+ __func__);
12931292 }
12941293 }
12951294
@@ -1403,8 +1402,11 @@ static int gpmc_probe_nand_child(struct platform_device *pdev, · 107 unmodified lines
14031402 pr_err("%s: ti,nand-ecc-opt not found\n", __func__);
14041403 return -ENODEV;
14051404 }
1406− if (!strcmp(s, "ham1") || !strcmp(s, "sw") ||
1407− !strcmp(s, "hw") || !strcmp(s, "hw-romcode"))
1405+
1406+ if (!strcmp(s, "sw"))
1407+ gpmc_nand_data->ecc_opt = OMAP_ECC_HAM1_CODE_SW;
1408+ else if (!strcmp(s, "ham1") ||
1409+ !strcmp(s, "hw") || !strcmp(s, "hw-romcode"))
14081410 gpmc_nand_data->ecc_opt =
14091411 OMAP_ECC_HAM1_CODE_HW;
14101412 else if (!strcmp(s, "bch4"))
arch/arm/mach-omap2/id.c+1−1
@@ -663,7 +663,7 @@ void __init dra7xxx_check_revision(void) · 662 unmodified lines
663663
664664 default:
665665 /* Unknown default to latest silicon rev as default*/
666− pr_warn("%s: unknown idcode=0x%08x (hawkeye=0x%08x,rev=0x%d)\n",
666+ pr_warn("%s: unknown idcode=0x%08x (hawkeye=0x%08x,rev=0x%x)\n",
667667 __func__, idcode, hawkeye, rev);
668668 omap_revision = DRA752_REV_ES1_1;
669669 }
arch/arm/mach-omap2/omap_device.c+1−1
@@ -56,7 +56,7 @@ static void _add_clkdev(struct omap_device *od, const char *clk_alias, · 55 unmodified lines
5656
5757 r = clk_get_sys(dev_name(&od->pdev->dev), clk_alias);
5858 if (!IS_ERR(r)) {
59− dev_warn(&od->pdev->dev,
59+ dev_dbg(&od->pdev->dev,
6060 "alias %s already exists\n", clk_alias);
6161 clk_put(r);
6262 return;
arch/arm/mach-omap2/omap_hwmod.c+7−0
@@ -2185,6 +2185,8 @@ static int _enable(struct omap_hwmod *oh) · 2184 unmodified lines
21852185 oh->mux->pads_dynamic))) {
21862186 omap_hwmod_mux(oh->mux, _HWMOD_STATE_ENABLED);
21872187 _reconfigure_io_chain();
2188+ } else if (oh->flags & HWMOD_FORCE_MSTANDBY) {
2189+ _reconfigure_io_chain();
21882190 }
21892191
21902192 _add_initiator_dep(oh, mpu_oh);
@@ -2291,6 +2293,8 @@ static int _idle(struct omap_hwmod *oh) · 100 unmodified lines
22912293 if (oh->mux && oh->mux->pads_dynamic) {
22922294 omap_hwmod_mux(oh->mux, _HWMOD_STATE_IDLE);
22932295 _reconfigure_io_chain();
2296+ } else if (oh->flags & HWMOD_FORCE_MSTANDBY) {
2297+ _reconfigure_io_chain();
22942298 }
22952299
22962300 oh->_state = _HWMOD_STATE_IDLE;
@@ -3345,6 +3349,9 @@ int __init omap_hwmod_register_links(struct omap_hwmod_ocp_if **ois) · 1048 unmodified lines
33453349 if (!ois)
33463350 return 0;
33473351
3352+ if (ois[0] == NULL) /* Empty list */
3353+ return 0;
3354+
33483355 if (!linkspace) {
33493356 if (_alloc_linkspace(ois)) {
33503357 pr_err("omap_hwmod: could not allocate link space\n");
arch/arm/mach-omap2/omap_hwmod_7xx_data.c+20−2
@@ -35,6 +35,7 @@ · 34 unmodified lines
3535 #include "i2c.h"
3636 #include "mmc.h"
3737 #include "wd_timer.h"
38+#include "soc.h"
3839
3940 /* Base offset for all DRA7XX interrupts external to MPUSS */
4041 #define DRA7XX_IRQ_GIC_START 32
@@ -3261,7 +3262,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { · 3220 unmodified lines
32613262 &dra7xx_l4_per3__usb_otg_ss1,
32623263 &dra7xx_l4_per3__usb_otg_ss2,
32633264 &dra7xx_l4_per3__usb_otg_ss3,
3264− &dra7xx_l4_per3__usb_otg_ss4,
32653265 &dra7xx_l3_main_1__vcp1,
32663266 &dra7xx_l4_per2__vcp1,
32673267 &dra7xx_l3_main_1__vcp2,
@@ -3270,8 +3270,26 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { · 2 unmodified lines
32703270 NULL,
32713271 };
32723272
3273+static struct omap_hwmod_ocp_if *dra74x_hwmod_ocp_ifs[] __initdata = {
3274+ &dra7xx_l4_per3__usb_otg_ss4,
3275+ NULL,
3276+};
3277+
3278+static struct omap_hwmod_ocp_if *dra72x_hwmod_ocp_ifs[] __initdata = {
3279+ NULL,
3280+};
3281+
32733282 int __init dra7xx_hwmod_init(void)
32743283 {
3284+ int ret;
3285+
32753286 omap_hwmod_init();
3276− return omap_hwmod_register_links(dra7xx_hwmod_ocp_ifs);
3287+ ret = omap_hwmod_register_links(dra7xx_hwmod_ocp_ifs);
3288+
3289+ if (!ret && soc_is_dra74x())
3290+ return omap_hwmod_register_links(dra74x_hwmod_ocp_ifs);
3291+ else if (!ret && soc_is_dra72x())
3292+ return omap_hwmod_register_links(dra72x_hwmod_ocp_ifs);
3293+
3294+ return ret;
32773295 }
arch/arm/mach-omap2/soc.h+6−0
@@ -245,6 +245,8 @@ IS_AM_SUBCLASS(437x, 0x437) · 244 unmodified lines
245245 #define soc_is_omap54xx() 0
246246 #define soc_is_omap543x() 0
247247 #define soc_is_dra7xx() 0
248+#define soc_is_dra74x() 0
249+#define soc_is_dra72x() 0
248250
249251 #if defined(MULTI_OMAP2)
250252 # if defined(CONFIG_ARCH_OMAP2)
@@ -393,7 +395,11 @@ IS_OMAP_TYPE(3430, 0x3430) · 142 unmodified lines
393395
394396 #if defined(CONFIG_SOC_DRA7XX)
395397 #undef soc_is_dra7xx
398+#undef soc_is_dra74x
399+#undef soc_is_dra72x
396400 #define soc_is_dra7xx() (of_machine_is_compatible("ti,dra7"))
401+#define soc_is_dra74x() (of_machine_is_compatible("ti,dra74"))
402+#define soc_is_dra72x() (of_machine_is_compatible("ti,dra72"))
397403 #endif
398404
399405 /* Various silicon revisions for omap2 */
arch/arm/mach-shmobile/Kconfig+2−0
@@ -75,6 +75,7 @@ config ARCH_SH7372 · 74 unmodified lines
7575 select ARM_CPU_SUSPEND if PM || CPU_IDLE
7676 select CPU_V7
7777 select SH_CLK_CPG
78+ select SH_INTC
7879 select SYS_SUPPORTS_SH_CMT
7980 select SYS_SUPPORTS_SH_TMU
8081
@@ -85,6 +86,7 @@ config ARCH_SH73A0 · 4 unmodified lines
8586 select CPU_V7
8687 select I2C
8788 select SH_CLK_CPG
89+ select SH_INTC
8890 select RENESAS_INTC_IRQPIN
8991 select SYS_SUPPORTS_SH_CMT
9092 select SYS_SUPPORTS_SH_TMU
arch/arm/mach-shmobile/clock-r8a7790.c+2−2
@@ -183,8 +183,8 @@ enum { · 182 unmodified lines
183183
184184 static struct clk div4_clks[DIV4_NR] = {
185185 [DIV4_SDH] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 8, 0x0dff, CLK_ENABLE_ON_INIT),
186− [DIV4_SD0] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 4, 0x1de0, CLK_ENABLE_ON_INIT),
187− [DIV4_SD1] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 0, 0x1de0, CLK_ENABLE_ON_INIT),
186+ [DIV4_SD0] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 4, 0x1df0, CLK_ENABLE_ON_INIT),
187+ [DIV4_SD1] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 0, 0x1df0, CLK_ENABLE_ON_INIT),
188188 };
189189
190190 /* DIV6 clocks */
arch/arm/mach-shmobile/clock-r8a7791.c+1−1
@@ -152,7 +152,7 @@ enum { · 151 unmodified lines
152152
153153 static struct clk div4_clks[DIV4_NR] = {
154154 [DIV4_SDH] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 8, 0x0dff, CLK_ENABLE_ON_INIT),
155− [DIV4_SD0] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 4, 0x1de0, CLK_ENABLE_ON_INIT),
155+ [DIV4_SD0] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 4, 0x1df0, CLK_ENABLE_ON_INIT),
156156 };
157157
158158 /* DIV6 clocks */
arch/arm/mach-shmobile/clock-sh73a0.c+1−1
@@ -644,7 +644,7 @@ static struct clk_lookup lookups[] = { · 643 unmodified lines
644644 CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */
645645 CLKDEV_DEV_ID("e6cb0000.serial", &mstp_clks[MSTP207]), /* SCIFA5 */
646646 CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */
647− CLKDEV_DEV_ID("0xe6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */
647+ CLKDEV_DEV_ID("e6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */
648648 CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */
649649 CLKDEV_DEV_ID("e6c40000.serial", &mstp_clks[MSTP204]), /* SCIFA0 */
650650 CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]), /* SCIFA1 */
arch/arm/mach-vexpress/spc.c+11−3
@@ -426,9 +426,15 @@ static int ve_spc_populate_opps(uint32_t cluster) · 425 unmodified lines
426426
427427 static int ve_init_opp_table(struct device *cpu_dev)
428428 {
429− int cluster = topology_physical_package_id(cpu_dev->id);
430− int idx, ret = 0, max_opp = info->num_opps[cluster];
431− struct ve_spc_opp *opps = info->opps[cluster];
429+ int cluster;
430+ int idx, ret = 0, max_opp;
431+ struct ve_spc_opp *opps;
432+
433+ cluster = topology_physical_package_id(cpu_dev->id);
434+ cluster = cluster < 0 ? 0 : cluster;
435+
436+ max_opp = info->num_opps[cluster];
437+ opps = info->opps[cluster];
432438
433439 for (idx = 0; idx < max_opp; idx++, opps++) {
434440 ret = dev_pm_opp_add(cpu_dev, opps->freq * 1000, opps->u_volt);
@@ -537,6 +543,8 @@ static struct clk *ve_spc_clk_register(struct device *cpu_dev) · 102 unmodified lines
537543 spc->hw.init = &init;
538544 spc->cluster = topology_physical_package_id(cpu_dev->id);
539545
546+ spc->cluster = spc->cluster < 0 ? 0 : spc->cluster;
547+
540548 init.name = dev_name(cpu_dev);
541549 init.ops = &clk_spc_ops;
542550 init.flags = CLK_IS_ROOT | CLK_GET_RATE_NOCACHE;
arch/arm/mm/abort-ev6.S+0−6
@@ -17,12 +17,6 @@ · 16 unmodified lines
1717 */
1818 .align 5
1919 ENTRY(v6_early_abort)
20−#ifdef CONFIG_CPU_V6
21− sub r1, sp, #4 @ Get unused stack location
22− strex r0, r1, [r1] @ Clear the exclusive monitor
23−#elif defined(CONFIG_CPU_32v6K)
24− clrex
25−#endif
2620 mrc p15, 0, r1, c5, c0, 0 @ get FSR
2721 mrc p15, 0, r0, c6, c0, 0 @ get FAR
2822 /*
arch/arm/mm/abort-ev7.S+0−6
@@ -13,12 +13,6 @@ · 12 unmodified lines
1313 */
1414 .align 5
1515 ENTRY(v7_early_abort)
16− /*
17− * The effect of data aborts on on the exclusive access monitor are
18− * UNPREDICTABLE. Do a CLREX to clear the state
19− */
20− clrex
21−
2216 mrc p15, 0, r1, c5, c0, 0 @ get FSR
2317 mrc p15, 0, r0, c6, c0, 0 @ get FAR
2418
arch/arm64/crypto/sha2-ce-glue.c+0−1
@@ -150,7 +150,6 @@ static void sha2_finup(struct shash_desc *desc, const u8 *data, · 149 unmodified lines
150150 kernel_neon_begin_partial(28);
151151 sha2_ce_transform(blocks, data, sctx->state, NULL, len);
152152 kernel_neon_end();
153− data += blocks * SHA256_BLOCK_SIZE;
154153 }
155154
156155 static int sha224_finup(struct shash_desc *desc, const u8 *data,
arch/arm64/include/asm/hw_breakpoint.h+0−1
@@ -79,7 +79,6 @@ static inline void decode_ctrl_reg(u32 reg, · 78 unmodified lines
7979 */
8080 #define ARM_MAX_BRP 16
8181 #define ARM_MAX_WRP 16
82−#define ARM_MAX_HBP_SLOTS (ARM_MAX_BRP + ARM_MAX_WRP)
8382
8483 /* Virtual debug register bases. */
8584 #define AARCH64_DBG_REG_BVR 0
arch/arm64/include/asm/processor.h+1−1
@@ -139,7 +139,7 @@ extern struct task_struct *cpu_switch_to(struct task_struct *prev, · 138 unmodified lines
139139 ((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)
140140
141141 #define KSTK_EIP(tsk) ((unsigned long)task_pt_regs(tsk)->pc)
142−#define KSTK_ESP(tsk) ((unsigned long)task_pt_regs(tsk)->sp)
142+#define KSTK_ESP(tsk) user_stack_pointer(task_pt_regs(tsk))
143143
144144 /*
145145 * Prefetching support
arch/arm64/include/asm/ptrace.h+1−1
@@ -137,7 +137,7 @@ struct pt_regs { · 136 unmodified lines
137137 (!((regs)->pstate & PSR_F_BIT))
138138
139139 #define user_stack_pointer(regs) \
140− (!compat_user_mode(regs)) ? ((regs)->sp) : ((regs)->compat_sp)
140+ (!compat_user_mode(regs) ? (regs)->sp : (regs)->compat_sp)
141141
142142 static inline unsigned long regs_return_value(struct pt_regs *regs)
143143 {
arch/arm64/kernel/efi.c+2−0
@@ -465,6 +465,8 @@ static int __init arm64_enter_virtual_mode(void) · 464 unmodified lines
465465 efi_native_runtime_setup();
466466 set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
467467
468+ efi.runtime_version = efi.systab->hdr.revision;
469+
468470 return 0;
469471
470472 err_unmap:
arch/arm64/kernel/fpsimd.c+1−0
@@ -270,6 +270,7 @@ static int fpsimd_cpu_pm_notifier(struct notifier_block *self, · 269 unmodified lines
270270 case CPU_PM_ENTER:
271271 if (current->mm && !test_thread_flag(TIF_FOREIGN_FPSTATE))
272272 fpsimd_save_state(&current->thread.fpsimd_state);
273+ this_cpu_write(fpsimd_last_state, NULL);
273274 break;
274275 case CPU_PM_EXIT:
275276 if (current->mm)
arch/arm64/kernel/head.S+0−4
@@ -373,10 +373,6 @@ ENTRY(__boot_cpu_mode) · 372 unmodified lines
373373 .long 0
374374 .popsection
375375
376− .align 3
377−2: .quad .
378− .quad PAGE_OFFSET
379−
380376 #ifdef CONFIG_SMP
381377 .align 3
382378 1: .quad .
arch/arm64/kernel/perf_regs.c+6−0
@@ -24,6 +24,12 @@ u64 perf_reg_value(struct pt_regs *regs, int idx) · 23 unmodified lines
2424 return regs->compat_lr;
2525 }
2626
27+ if ((u32)idx == PERF_REG_ARM64_SP)
28+ return regs->sp;
29+
30+ if ((u32)idx == PERF_REG_ARM64_PC)
31+ return regs->pc;
32+
2733 return regs->regs[idx];
2834 }
2935
arch/arm64/kernel/ptrace.c+9−4
@@ -87,7 +87,8 @@ static void ptrace_hbptriggered(struct perf_event *bp, · 86 unmodified lines
8787 break;
8888 }
8989 }
90− for (i = ARM_MAX_BRP; i < ARM_MAX_HBP_SLOTS && !bp; ++i) {
90+
91+ for (i = 0; i < ARM_MAX_WRP; ++i) {
9192 if (current->thread.debug.hbp_watch[i] == bp) {
9293 info.si_errno = -((i << 1) + 1);
9394 break;
@@ -662,8 +663,10 @@ static int compat_gpr_get(struct task_struct *target, · 568 unmodified lines
662663 kbuf += sizeof(reg);
663664 } else {
664665 ret = copy_to_user(ubuf, &reg, sizeof(reg));
665− if (ret)
666+ if (ret) {
667+ ret = -EFAULT;
666668 break;
669+ }
667670
668671 ubuf += sizeof(reg);
669672 }
@@ -701,8 +704,10 @@ static int compat_gpr_set(struct task_struct *target, · 31 unmodified lines
701704 kbuf += sizeof(reg);
702705 } else {
703706 ret = copy_from_user(&reg, ubuf, sizeof(reg));
704− if (ret)
705− return ret;
707+ if (ret) {
708+ ret = -EFAULT;
709+ break;
710+ }
706711
707712 ubuf += sizeof(reg);
708713 }
arch/arm64/kernel/setup.c+22−18
@@ -78,6 +78,7 @@ unsigned int compat_elf_hwcap2 __read_mostly; · 77 unmodified lines
7878 #endif
7979
8080 static const char *cpu_name;
81+static const char *machine_name;
8182 phys_addr_t __fdt_pointer __initdata;
8283
8384 /*
@@ -309,6 +310,8 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys) · 225 unmodified lines
309310 while (true)
310311 cpu_relax();
311312 }
313+
314+ machine_name = of_flat_dt_get_machine_name();
312315 }
313316
314317 /*
@@ -447,21 +450,10 @@ static int c_show(struct seq_file *m, void *v) · 132 unmodified lines
447450 {
448451 int i;
449452
450− /*
451− * Dump out the common processor features in a single line. Userspace
452− * should read the hwcaps with getauxval(AT_HWCAP) rather than
453− * attempting to parse this.
454− */
455− seq_puts(m, "features\t:");
456− for (i = 0; hwcap_str[i]; i++)
457− if (elf_hwcap & (1 << i))
458− seq_printf(m, " %s", hwcap_str[i]);
459− seq_puts(m, "\n\n");
453+ seq_printf(m, "Processor\t: %s rev %d (%s)\n",
454+ cpu_name, read_cpuid_id() & 15, ELF_PLATFORM);
460455
461456 for_each_online_cpu(i) {
462− struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);
463− u32 midr = cpuinfo->reg_midr;
464−
465457 /*
466458 * glibc reads /proc/cpuinfo to determine the number of
467459 * online processors, looking for lines beginning with
@@ -470,13 +462,25 @@ static int c_show(struct seq_file *m, void *v) · 2 unmodified lines
470462 #ifdef CONFIG_SMP
471463 seq_printf(m, "processor\t: %d\n", i);
472464 #endif
473− seq_printf(m, "implementer\t: 0x%02x\n",
474− MIDR_IMPLEMENTOR(midr));
475− seq_printf(m, "variant\t\t: 0x%x\n", MIDR_VARIANT(midr));
476− seq_printf(m, "partnum\t\t: 0x%03x\n", MIDR_PARTNUM(midr));
477− seq_printf(m, "revision\t: 0x%x\n\n", MIDR_REVISION(midr));
478465 }
479466
467+ /* dump out the processor features */
468+ seq_puts(m, "Features\t: ");
469+
470+ for (i = 0; hwcap_str[i]; i++)
471+ if (elf_hwcap & (1 << i))
472+ seq_printf(m, "%s ", hwcap_str[i]);
473+
474+ seq_printf(m, "\nCPU implementer\t: 0x%02x\n", read_cpuid_id() >> 24);
475+ seq_printf(m, "CPU architecture: AArch64\n");
476+ seq_printf(m, "CPU variant\t: 0x%x\n", (read_cpuid_id() >> 20) & 15);
477+ seq_printf(m, "CPU part\t: 0x%03x\n", (read_cpuid_id() >> 4) & 0xfff);
478+ seq_printf(m, "CPU revision\t: %d\n", read_cpuid_id() & 15);
479+
480+ seq_puts(m, "\n");
481+
482+ seq_printf(m, "Hardware\t: %s\n", machine_name);
483+
480484 return 0;
481485 }
482486
arch/arm64/kvm/handle_exit.c+2−0
@@ -66,6 +66,8 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) · 65 unmodified lines
6666 else
6767 kvm_vcpu_block(vcpu);
6868
69+ kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));
70+
6971 return 1;
7072 }
7173
arch/arm64/kvm/hyp-init.S+4−0
@@ -80,6 +80,10 @@ __do_hyp_init: · 79 unmodified lines
8080 msr mair_el2, x4
8181 isb
8282
83+ /* Invalidate the stale TLBs from Bootloader */
84+ tlbi alle2
85+ dsb sy
86+
8387 mrs x4, sctlr_el2
8488 and x4, x4, #SCTLR_EL2_EE // preserve endianness of EL2
8589 ldr x5, =SCTLR_EL2_FLAGS
arch/hexagon/mm/cache.c+1−0
@@ -68,6 +68,7 @@ void flush_icache_range(unsigned long start, unsigned long end) · 67 unmodified lines
6868 );
6969 local_irq_restore(flags);
7070 }
71+EXPORT_SYMBOL(flush_icache_range);
7172
7273 void hexagon_clean_dcache_range(unsigned long start, unsigned long end)
7374 {
arch/ia64/Kconfig+0−2
@@ -549,8 +549,6 @@ source "drivers/sn/Kconfig" · 548 unmodified lines
549549 config KEXEC
550550 bool "kexec system call"
551551 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
552− select CRYPTO
553− select CRYPTO_SHA256
554552 help
555553 kexec is a system call that implements the ability to shutdown your
556554 current kernel, and to start another kernel. It is like a reboot
arch/m68k/Kconfig+0−2
@@ -91,8 +91,6 @@ config MMU_SUN3 · 90 unmodified lines
9191 config KEXEC
9292 bool "kexec system call"
9393 depends on M68KCLASSIC
94− select CRYPTO
95− select CRYPTO_SHA256
9694 help
9795 kexec is a system call that implements the ability to shutdown your
9896 current kernel, and to start another kernel. It is like a reboot
arch/m68k/include/asm/unistd.h+1−1
@@ -4,7 +4,7 @@ · 3 unmodified lines
44 #include <uapi/asm/unistd.h>
55
66
7−#define NR_syscalls 352
7+#define NR_syscalls 354
88
99 #define __ARCH_WANT_OLD_READDIR
1010 #define __ARCH_WANT_OLD_STAT
arch/m68k/include/uapi/asm/unistd.h+2−0
@@ -357,5 +357,7 @@ · 356 unmodified lines
357357 #define __NR_sched_setattr 349
358358 #define __NR_sched_getattr 350
359359 #define __NR_renameat2 351
360+#define __NR_getrandom 352
361+#define __NR_memfd_create 353
360362
361363 #endif /* _UAPI_ASM_M68K_UNISTD_H_ */
arch/m68k/kernel/syscalltable.S+2−0
@@ -372,4 +372,6 @@ ENTRY(sys_call_table) · 371 unmodified lines
372372 .long sys_sched_setattr
373373 .long sys_sched_getattr /* 350 */
374374 .long sys_renameat2
375+ .long sys_getrandom
376+ .long sys_memfd_create
375377
arch/mips/Kconfig+0−2
@@ -2396,8 +2396,6 @@ source "kernel/Kconfig.preempt" · 2395 unmodified lines
23962396
23972397 config KEXEC
23982398 bool "Kexec system call"
2399− select CRYPTO
2400− select CRYPTO_SHA256
24012399 help
24022400 kexec is a system call that implements the ability to shutdown your
24032401 current kernel, and to start another kernel. It is like a reboot
arch/mips/alchemy/devboards/db1200.c+1−5
@@ -847,6 +847,7 @@ int __init db1200_dev_setup(void) · 846 unmodified lines
847847 pr_warn("DB1200: cant get I2C close to 50MHz\n");
848848 else
849849 clk_set_rate(c, pfc);
850+ clk_prepare_enable(c);
850851 clk_put(c);
851852 }
852853
@@ -922,11 +923,6 @@ int __init db1200_dev_setup(void) · 69 unmodified lines
922923 }
923924
924925 /* Audio PSC clock is supplied externally. (FIXME: platdata!!) */
925− c = clk_get(NULL, "psc1_intclk");
926− if (!IS_ERR(c)) {
927− clk_prepare_enable(c);
928− clk_put(c);
929− }
930926 __raw_writel(PSC_SEL_CLK_SERCLK,
931927 (void __iomem *)KSEG1ADDR(AU1550_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET);
932928 wmb();
arch/mips/bcm47xx/setup.c+11−2
@@ -59,12 +59,21 @@ static void bcm47xx_machine_restart(char *command) · 58 unmodified lines
5959 switch (bcm47xx_bus_type) {
6060 #ifdef CONFIG_BCM47XX_SSB
6161 case BCM47XX_BUS_TYPE_SSB:
62− ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 3);
62+ if (bcm47xx_bus.ssb.chip_id == 0x4785)
63+ write_c0_diag4(1 << 22);
64+ ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 1);
65+ if (bcm47xx_bus.ssb.chip_id == 0x4785) {
66+ __asm__ __volatile__(
67+ ".set\tmips3\n\t"
68+ "sync\n\t"
69+ "wait\n\t"
70+ ".set\tmips0");
71+ }
6372 break;
6473 #endif
6574 #ifdef CONFIG_BCM47XX_BCMA
6675 case BCM47XX_BUS_TYPE_BCMA:
67− bcma_chipco_watchdog_timer_set(&bcm47xx_bus.bcma.bus.drv_cc, 3);
76+ bcma_chipco_watchdog_timer_set(&bcm47xx_bus.bcma.bus.drv_cc, 1);
6877 break;
6978 #endif
7079 }
arch/mips/cavium-octeon/setup.c+13−6
@@ -263,7 +263,6 @@ static uint64_t crashk_size, crashk_base; · 262 unmodified lines
263263 static int octeon_uart;
264264
265265 extern asmlinkage void handle_int(void);
266−extern asmlinkage void plat_irq_dispatch(void);
267266
268267 /**
269268 * Return non zero if we are currently running in the Octeon simulator
@@ -458,6 +457,18 @@ static void octeon_halt(void) · 188 unmodified lines
458457 octeon_kill_core(NULL);
459458 }
460459
460+static char __read_mostly octeon_system_type[80];
461+
462+static int __init init_octeon_system_type(void)
463+{
464+ snprintf(octeon_system_type, sizeof(octeon_system_type), "%s (%s)",
465+ cvmx_board_type_to_string(octeon_bootinfo->board_type),
466+ octeon_model_get_string(read_c0_prid()));
467+
468+ return 0;
469+}
470+early_initcall(init_octeon_system_type);
471+
461472 /**
462473 * Return a string representing the system type
463474 *
@@ -465,11 +476,7 @@ static void octeon_halt(void) · 1 unmodified line
465476 */
466477 const char *octeon_board_type_string(void)
467478 {
468− static char name[80];
469− sprintf(name, "%s (%s)",
470− cvmx_board_type_to_string(octeon_bootinfo->board_type),
471− octeon_model_get_string(read_c0_prid()));
472− return name;
479+ return octeon_system_type;
473480 }
474481
475482 const char *get_system_type(void)
arch/mips/include/asm/eva.h+43−0
@@ -0,0 +1,43 @@
1+/*
2+ * This file is subject to the terms and conditions of the GNU General Public
3+ * License. See the file "COPYING" in the main directory of this archive
4+ * for more details.
5+ *
6+ * Copyright (C) 2014, Imagination Technologies Ltd.
7+ *
8+ * EVA functions for generic code
9+ */
10+
11+#ifndef _ASM_EVA_H
12+#define _ASM_EVA_H
13+
14+#include <kernel-entry-init.h>
15+
16+#ifdef __ASSEMBLY__
17+
18+#ifdef CONFIG_EVA
19+
20+/*
21+ * EVA early init code
22+ *
23+ * Platforms must define their own 'platform_eva_init' macro in
24+ * their kernel-entry-init.h header. This macro usually does the
25+ * platform specific configuration of the segmentation registers,
26+ * and it is normally called from assembly code.
27+ *
28+ */
29+
30+.macro eva_init
31+platform_eva_init
32+.endm
33+
34+#else
35+
36+.macro eva_init
37+.endm
38+
39+#endif /* CONFIG_EVA */
40+
41+#endif /* __ASSEMBLY__ */
42+
43+#endif
arch/mips/include/asm/gic.h+1−1
@@ -49,7 +49,7 @@ · 48 unmodified lines
4949 #endif
5050 #define GICBIS(reg, mask, bits) \
5151 do { u32 data; \
52− GICREAD((reg), data); \
52+ GICREAD(reg, data); \
5353 data &= ~(mask); \
5454 data |= ((bits) & (mask)); \
5555 GICWRITE((reg), data); \
arch/mips/include/asm/irq.h+2−0
@@ -26,6 +26,8 @@ static inline int irq_canonicalize(int irq) · 25 unmodified lines
2626 #define irq_canonicalize(irq) (irq) /* Sane hardware, sane code ... */
2727 #endif
2828
29+asmlinkage void plat_irq_dispatch(void);
30+
2931 extern void do_IRQ(unsigned int irq);
3032
3133 extern void arch_init_irq(void);
arch/mips/include/asm/mach-malta/kernel-entry-init.h+16−6
@@ -10,14 +10,15 @@ · 9 unmodified lines
1010 #ifndef __ASM_MACH_MIPS_KERNEL_ENTRY_INIT_H
1111 #define __ASM_MACH_MIPS_KERNEL_ENTRY_INIT_H
1212
13+#include <asm/regdef.h>
14+#include <asm/mipsregs.h>
15+
1316 /*
1417 * Prepare segments for EVA boot:
1518 *
1619 * This is in case the processor boots in legacy configuration
1720 * (SI_EVAReset is de-asserted and CONFIG5.K == 0)
1821 *
19− * On entry, t1 is loaded with CP0_CONFIG
20− *
2122 * ========================= Mappings =============================
2223 * Virtual memory Physical memory Mapping
2324 * 0x00000000 - 0x7fffffff 0x80000000 - 0xfffffffff MUSUK (kuseg)
@@ -30,12 +31,20 @@ · 6 unmodified lines
3031 *
3132 *
3233 * Lowmem is expanded to 2GB
34+ *
35+ * The following code uses the t0, t1, t2 and ra registers without
36+ * previously preserving them.
37+ *
3338 */
34− .macro eva_entry
39+ .macro platform_eva_init
40+
41+ .set push
42+ .set reorder
3543 /*
3644 * Get Config.K0 value and use it to program
3745 * the segmentation registers
3846 */
47+ mfc0 t1, CP0_CONFIG
3948 andi t1, 0x7 /* CCA */
4049 move t2, t1
4150 ins t2, t1, 16, 3
@@ -77,6 +86,8 @@ · 35 unmodified lines
7786 mtc0 t0, $16, 5
7887 sync
7988 jal mips_ihb
89+
90+ .set pop
8091 .endm
8192
8293 .macro kernel_entry_setup
@@ -95,7 +106,7 @@ · 12 unmodified lines
95106 sll t0, t0, 6 /* SC bit */
96107 bgez t0, 9f
97108
98− eva_entry
109+ platform_eva_init
99110 b 0f
100111 9:
101112 /* Assume we came from YAMON... */
@@ -127,8 +138,7 @@ nonsc_processor: · 25 unmodified lines
127138 #ifdef CONFIG_EVA
128139 sync
129140 ehb
130− mfc0 t1, CP0_CONFIG
131− eva_entry
141+ platform_eva_init
132142 #endif
133143 .endm
134144
arch/mips/include/asm/mach-netlogic/topology.h+0−7
@@ -10,13 +10,6 @@ · 9 unmodified lines
1010
1111 #include <asm/mach-netlogic/multi-node.h>
1212
13−#ifdef CONFIG_SMP
14−#define topology_physical_package_id(cpu) cpu_to_node(cpu)
15−#define topology_core_id(cpu) (cpu_logical_map(cpu) / NLM_THREADS_PER_CORE)
16−#define topology_thread_cpumask(cpu) (&cpu_sibling_map[cpu])
17−#define topology_core_cpumask(cpu) cpumask_of_node(cpu_to_node(cpu))
18−#endif
19−
2013 #include <asm-generic/topology.h>
2114
2215 #endif /* _ASM_MACH_NETLOGIC_TOPOLOGY_H */
arch/mips/include/asm/pgtable.h+3−5
@@ -122,6 +122,9 @@ do { \ · 121 unmodified lines
122122 } \
123123 } while(0)
124124
125+extern void set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep,
126+ pte_t pteval);
127+
125128 #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32)
126129
127130 #define pte_none(pte) (!(((pte).pte_low | (pte).pte_high) & ~_PAGE_GLOBAL))
@@ -145,7 +148,6 @@ static inline void set_pte(pte_t *ptep, pte_t pte) · 17 unmodified lines
145148 }
146149 }
147150 }
148−#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval)
149151
150152 static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
151153 {
@@ -183,7 +185,6 @@ static inline void set_pte(pte_t *ptep, pte_t pteval) · 31 unmodified lines
183185 }
184186 #endif
185187 }
186−#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval)
187188
188189 static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
189190 {
@@ -390,15 +391,12 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) · 200 unmodified lines
390391
391392 extern void __update_tlb(struct vm_area_struct *vma, unsigned long address,
392393 pte_t pte);
393−extern void __update_cache(struct vm_area_struct *vma, unsigned long address,
394− pte_t pte);
395394
396395 static inline void update_mmu_cache(struct vm_area_struct *vma,
397396 unsigned long address, pte_t *ptep)
398397 {
399398 pte_t pte = *ptep;
400399 __update_tlb(vma, address, pte);
401− __update_cache(vma, address, pte);
402400 }
403401
404402 static inline void update_mmu_cache_pmd(struct vm_area_struct *vma,
arch/mips/include/asm/syscall.h+5−3
@@ -131,10 +131,12 @@ static inline int syscall_get_arch(void) · 130 unmodified lines
131131 {
132132 int arch = EM_MIPS;
133133 #ifdef CONFIG_64BIT
134− if (!test_thread_flag(TIF_32BIT_REGS))
134+ if (!test_thread_flag(TIF_32BIT_REGS)) {
135135 arch |= __AUDIT_ARCH_64BIT;
136− if (test_thread_flag(TIF_32BIT_ADDR))
137− arch |= __AUDIT_ARCH_CONVENTION_MIPS64_N32;
136+ /* N32 sets only TIF_32BIT_ADDR */
137+ if (test_thread_flag(TIF_32BIT_ADDR))
138+ arch |= __AUDIT_ARCH_CONVENTION_MIPS64_N32;
139+ }
138140 #endif
139141 #if defined(__LITTLE_ENDIAN)
140142 arch |= __AUDIT_ARCH_LE;
arch/mips/kernel/cps-vec.S+4−0
@@ -13,6 +13,7 @@ · 12 unmodified lines
1313 #include <asm/asm-offsets.h>
1414 #include <asm/asmmacro.h>
1515 #include <asm/cacheops.h>
16+#include <asm/eva.h>
1617 #include <asm/mipsregs.h>
1718 #include <asm/mipsmtregs.h>
1819 #include <asm/pm.h>
@@ -166,6 +167,9 @@ dcache_done: · 147 unmodified lines
166167 1: jal mips_cps_core_init
167168 nop
168169
170+ /* Do any EVA initialization if necessary */
171+ eva_init
172+
169173 /*
170174 * Boot any other VPEs within this core that should be online, and
171175 * deactivate this VPE if it should be offline.
arch/mips/kernel/perf_event_mipsxx.c+1−1
@@ -558,7 +558,7 @@ static int mipspmu_get_irq(void) · 557 unmodified lines
558558 if (mipspmu.irq >= 0) {
559559 /* Request my own irq handler. */
560560 err = request_irq(mipspmu.irq, mipsxx_pmu_handle_irq,
561− IRQF_PERCPU | IRQF_NOBALANCING,
561+ IRQF_PERCPU | IRQF_NOBALANCING | IRQF_NO_THREAD,
562562 "mips_perf_pmu", NULL);
563563 if (err) {
564564 pr_warning("Unable to request IRQ%d for MIPS "
arch/mips/kernel/scall64-o32.S+8−4
@@ -113,15 +113,19 @@ trace_a_syscall: · 112 unmodified lines
113113 move s0, t2 # Save syscall pointer
114114 move a0, sp
115115 /*
116− * syscall number is in v0 unless we called syscall(__NR_###)
116+ * absolute syscall number is in v0 unless we called syscall(__NR_###)
117117 * where the real syscall number is in a0
118118 * note: NR_syscall is the first O32 syscall but the macro is
119119 * only defined when compiling with -mabi=32 (CONFIG_32BIT)
120120 * therefore __NR_O32_Linux is used (4000)
121121 */
122− addiu a1, v0, __NR_O32_Linux
123− bnez v0, 1f /* __NR_syscall at offset 0 */
124− lw a1, PT_R4(sp)
122+ .set push
123+ .set reorder
124+ subu t1, v0, __NR_O32_Linux
125+ move a1, v0
126+ bnez t1, 1f /* __NR_syscall at offset 0 */
127+ lw a1, PT_R4(sp) /* Arg1 for __NR_syscall case */
128+ .set pop
125129
126130 1: jal syscall_trace_enter
127131
arch/mips/loongson/loongson-3/cop2-ex.c+4−4
@@ -22,13 +22,13 @@ · 21 unmodified lines
2222 static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action,
2323 void *data)
2424 {
25− int fpu_enabled;
25+ int fpu_owned;
2626 int fr = !test_thread_flag(TIF_32BIT_FPREGS);
2727
2828 switch (action) {
2929 case CU2_EXCEPTION:
3030 preempt_disable();
31− fpu_enabled = read_c0_status() & ST0_CU1;
31+ fpu_owned = __is_fpu_owner();
3232 if (!fr)
3333 set_c0_status(ST0_CU1 | ST0_CU2);
3434 else
@@ -39,8 +39,8 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action, · 4 unmodified lines
3939 KSTK_STATUS(current) |= ST0_FR;
4040 else
4141 KSTK_STATUS(current) &= ~ST0_FR;
42− /* If FPU is enabled, we needn't init or restore fp */
43− if(!fpu_enabled) {
42+ /* If FPU is owned, we needn't init or restore fp */
43+ if (!fpu_owned) {
4444 set_thread_flag(TIF_USEDFPU);
4545 if (!used_math()) {
4646 _init_fpu();
arch/mips/loongson/loongson-3/numa.c+0−2
@@ -24,8 +24,6 @@ · 23 unmodified lines
2424 #include <asm/page.h>
2525 #include <asm/pgalloc.h>
2626 #include <asm/sections.h>
27−#include <linux/bootmem.h>
28−#include <linux/init.h>
2927 #include <linux/irq.h>
3028 #include <asm/bootinfo.h>
3129 #include <asm/mc146818-time.h>
arch/mips/mm/cache.c+19−8
@@ -119,25 +119,36 @@ void __flush_anon_page(struct page *page, unsigned long vmaddr) · 118 unmodified lines
119119
120120 EXPORT_SYMBOL(__flush_anon_page);
121121
122−void __update_cache(struct vm_area_struct *vma, unsigned long address,
123− pte_t pte)
122+static void mips_flush_dcache_from_pte(pte_t pteval, unsigned long address)
124123 {
125124 struct page *page;
126− unsigned long pfn, addr;
127− int exec = (vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc;
125+ unsigned long pfn = pte_pfn(pteval);
128126
129− pfn = pte_pfn(pte);
130127 if (unlikely(!pfn_valid(pfn)))
131128 return;
129+
132130 page = pfn_to_page(pfn);
133131 if (page_mapping(page) && Page_dcache_dirty(page)) {
134− addr = (unsigned long) page_address(page);
135− if (exec || pages_do_alias(addr, address & PAGE_MASK))
136− flush_data_cache_page(addr);
132+ unsigned long page_addr = (unsigned long) page_address(page);
133+
134+ if (!cpu_has_ic_fills_f_dc ||
135+ pages_do_alias(page_addr, address & PAGE_MASK))
136+ flush_data_cache_page(page_addr);
137137 ClearPageDcacheDirty(page);
138138 }
139139 }
140140
141+void set_pte_at(struct mm_struct *mm, unsigned long addr,
142+ pte_t *ptep, pte_t pteval)
143+{
144+ if (cpu_has_dc_aliases || !cpu_has_ic_fills_f_dc) {
145+ if (pte_present(pteval))
146+ mips_flush_dcache_from_pte(pteval, addr);
147+ }
148+
149+ set_pte(ptep, pteval);
150+}
151+
141152 unsigned long _page_cachable_default;
142153 EXPORT_SYMBOL(_page_cachable_default);
143154
arch/mips/mti-malta/malta-memory.c+10−4
@@ -35,13 +35,19 @@ fw_memblock_t * __init fw_getmdesc(int eva) · 34 unmodified lines
3535 /* otherwise look in the environment */
3636
3737 memsize_str = fw_getenv("memsize");
38− if (memsize_str)
39− tmp = kstrtol(memsize_str, 0, &memsize);
38+ if (memsize_str) {
39+ tmp = kstrtoul(memsize_str, 0, &memsize);
40+ if (tmp)
41+ pr_warn("Failed to read the 'memsize' env variable.\n");
42+ }
4043 if (eva) {
4144 /* Look for ememsize for EVA */
4245 ememsize_str = fw_getenv("ememsize");
43− if (ememsize_str)
44− tmp = kstrtol(ememsize_str, 0, &ememsize);
46+ if (ememsize_str) {
47+ tmp = kstrtoul(ememsize_str, 0, &ememsize);
48+ if (tmp)
49+ pr_warn("Failed to read the 'ememsize' env variable.\n");
50+ }
4551 }
4652 if (!memsize && !ememsize) {
4753 pr_warn("memsize not set in YAMON, set to default (32Mb)\n");
arch/mips/pmcs-msp71xx/msp_irq.c+1−1
@@ -51,7 +51,7 @@ static inline void sec_int_dispatch(void) { do_IRQ(MSP_INT_SEC); } · 50 unmodified lines
5151 * the range 40-71.
5252 */
5353
54−asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
54+asmlinkage void plat_irq_dispatch(void)
5555 {
5656 u32 pending;
5757
arch/powerpc/Kconfig+0−2
@@ -399,8 +399,6 @@ config PPC64_SUPPORTS_MEMORY_FAILURE · 398 unmodified lines
399399 config KEXEC
400400 bool "kexec system call"
401401 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
402− select CRYPTO
403− select CRYPTO_SHA256
404402 help
405403 kexec is a system call that implements the ability to shutdown your
406404 current kernel, and to start another kernel. It is like a reboot
arch/powerpc/kvm/book3s_64_mmu_hv.c+2−2
@@ -62,10 +62,10 @@ long kvmppc_alloc_hpt(struct kvm *kvm, u32 *htab_orderp) · 61 unmodified lines
6262 }
6363
6464 kvm->arch.hpt_cma_alloc = 0;
65− page = kvm_alloc_hpt(1 << (order - PAGE_SHIFT));
65+ page = kvm_alloc_hpt(1ul << (order - PAGE_SHIFT));
6666 if (page) {
6767 hpt = (unsigned long)pfn_to_kaddr(page_to_pfn(page));
68− memset((void *)hpt, 0, (1 << order));
68+ memset((void *)hpt, 0, (1ul << order));
6969 kvm->arch.hpt_cma_alloc = 1;
7070 }
7171
arch/s390/Kconfig+0−2
@@ -48,8 +48,6 @@ config ARCH_SUPPORTS_DEBUG_PAGEALLOC · 47 unmodified lines
4848
4949 config KEXEC
5050 def_bool y
51− select CRYPTO
52− select CRYPTO_SHA256
5351
5452 config AUDIT_ARCH
5553 def_bool y
arch/s390/include/asm/pgtable.h+4−2
@@ -1127,7 +1127,7 @@ static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, · 1126 unmodified lines
11271127 unsigned long addr, pte_t *ptep)
11281128 {
11291129 pgste_t pgste;
1130− pte_t pte;
1130+ pte_t pte, oldpte;
11311131 int young;
11321132
11331133 if (mm_has_pgste(vma->vm_mm)) {
@@ -1135,12 +1135,13 @@ static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, · 1 unmodified line
11351135 pgste = pgste_ipte_notify(vma->vm_mm, ptep, pgste);
11361136 }
11371137
1138− pte = *ptep;
1138+ oldpte = pte = *ptep;
11391139 ptep_flush_direct(vma->vm_mm, addr, ptep);
11401140 young = pte_young(pte);
11411141 pte = pte_mkold(pte);
11421142
11431143 if (mm_has_pgste(vma->vm_mm)) {
1144+ pgste = pgste_update_all(&oldpte, pgste, vma->vm_mm);
11441145 pgste = pgste_set_pte(ptep, pgste, pte);
11451146 pgste_set_unlock(ptep, pgste);
11461147 } else
@@ -1330,6 +1331,7 @@ static inline int ptep_set_access_flags(struct vm_area_struct *vma, · 183 unmodified lines
13301331 ptep_flush_direct(vma->vm_mm, address, ptep);
13311332
13321333 if (mm_has_pgste(vma->vm_mm)) {
1334+ pgste_set_key(ptep, pgste, entry, vma->vm_mm);
13331335 pgste = pgste_set_pte(ptep, pgste, entry);
13341336 pgste_set_unlock(ptep, pgste);
13351337 } else
arch/s390/include/uapi/asm/unistd.h+4−1
@@ -283,7 +283,10 @@ · 282 unmodified lines
283283 #define __NR_sched_setattr 345
284284 #define __NR_sched_getattr 346
285285 #define __NR_renameat2 347
286−#define NR_syscalls 348
286+#define __NR_seccomp 348
287+#define __NR_getrandom 349
288+#define __NR_memfd_create 350
289+#define NR_syscalls 351
287290
288291 /*
289292 * There are some system calls that are not present on 64 bit, some
arch/s390/kernel/compat_wrapper.c+3−0
@@ -214,3 +214,6 @@ COMPAT_SYSCALL_WRAP3(finit_module, int, fd, const char __user *, uargs, int, fla · 213 unmodified lines
214214 COMPAT_SYSCALL_WRAP3(sched_setattr, pid_t, pid, struct sched_attr __user *, attr, unsigned int, flags);
215215 COMPAT_SYSCALL_WRAP4(sched_getattr, pid_t, pid, struct sched_attr __user *, attr, unsigned int, size, unsigned int, flags);
216216 COMPAT_SYSCALL_WRAP5(renameat2, int, olddfd, const char __user *, oldname, int, newdfd, const char __user *, newname, unsigned int, flags);
217+COMPAT_SYSCALL_WRAP3(seccomp, unsigned int, op, unsigned int, flags, const char __user *, uargs)
218+COMPAT_SYSCALL_WRAP3(getrandom, char __user *, buf, size_t, count, unsigned int, flags)
219+COMPAT_SYSCALL_WRAP2(memfd_create, const char __user *, uname, unsigned int, flags)
arch/s390/kernel/ipl.c+7−0
@@ -2060,6 +2060,13 @@ void s390_reset_system(void (*func)(void *), void *data) · 2059 unmodified lines
20602060 S390_lowcore.program_new_psw.addr =
20612061 PSW_ADDR_AMODE | (unsigned long) s390_base_pgm_handler;
20622062
2063+ /*
2064+ * Clear subchannel ID and number to signal new kernel that no CCW or
2065+ * SCSI IPL has been done (for kexec and kdump)
2066+ */
2067+ S390_lowcore.subchannel_id = 0;
2068+ S390_lowcore.subchannel_nr = 0;
2069+
20632070 /* Store status at absolute zero */
20642071 store_status();
20652072
arch/s390/kernel/setup.c+19−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include <linux/stddef.h>
2525 #include <linux/unistd.h>
2626 #include <linux/ptrace.h>
27+#include <linux/random.h>
2728 #include <linux/user.h>
2829 #include <linux/tty.h>
2930 #include <linux/ioport.h>
@@ -61,6 +62,7 @@ · 31 unmodified lines
6162 #include <asm/diag.h>
6263 #include <asm/os_info.h>
6364 #include <asm/sclp.h>
65+#include <asm/sysinfo.h>
6466 #include "entry.h"
6567
6668 /*
@@ -766,6 +768,7 @@ static void __init setup_hwcaps(void) · 699 unmodified lines
766768 #endif
767769
768770 get_cpu_id(&cpu_id);
771+ add_device_randomness(&cpu_id, sizeof(cpu_id));
769772 switch (cpu_id.machine) {
770773 case 0x9672:
771774 #if !defined(CONFIG_64BIT)
@@ -803,6 +806,19 @@ static void __init setup_hwcaps(void) · 31 unmodified lines
803806 }
804807 }
805808
809+/*
810+ * Add system information as device randomness
811+ */
812+static void __init setup_randomness(void)
813+{
814+ struct sysinfo_3_2_2 *vmms;
815+
816+ vmms = (struct sysinfo_3_2_2 *) alloc_page(GFP_KERNEL);
817+ if (vmms && stsi(vmms, 3, 2, 2) == 0 && vmms->count)
818+ add_device_randomness(&vmms, vmms->count);
819+ free_page((unsigned long) vmms);
820+}
821+
806822 /*
807823 * Setup function called from init/main.c just after the banner
808824 * was printed.
@@ -901,6 +917,9 @@ void __init setup_arch(char **cmdline_p) · 92 unmodified lines
901917
902918 /* Setup zfcpdump support */
903919 setup_zfcpdump();
920+
921+ /* Add system specific data to the random pool */
922+ setup_randomness();
904923 }
905924
906925 #ifdef CONFIG_32BIT
arch/s390/kernel/syscalls.S+3−0
@@ -356,3 +356,6 @@ SYSCALL(sys_finit_module,sys_finit_module,compat_sys_finit_module) · 355 unmodified lines
356356 SYSCALL(sys_sched_setattr,sys_sched_setattr,compat_sys_sched_setattr) /* 345 */
357357 SYSCALL(sys_sched_getattr,sys_sched_getattr,compat_sys_sched_getattr)
358358 SYSCALL(sys_renameat2,sys_renameat2,compat_sys_renameat2)
359+SYSCALL(sys_seccomp,sys_seccomp,compat_sys_seccomp)
360+SYSCALL(sys_getrandom,sys_getrandom,compat_sys_getrandom)
361+SYSCALL(sys_memfd_create,sys_memfd_create,compat_sys_memfd_create) /* 350 */
arch/s390/kvm/kvm-s390.c+0−13
@@ -1317,19 +1317,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) · 1316 unmodified lines
13171317 return -EINVAL;
13181318 }
13191319
1320− switch (kvm_run->exit_reason) {
1321− case KVM_EXIT_S390_SIEIC:
1322− case KVM_EXIT_UNKNOWN:
1323− case KVM_EXIT_INTR:
1324− case KVM_EXIT_S390_RESET:
1325− case KVM_EXIT_S390_UCONTROL:
1326− case KVM_EXIT_S390_TSCH:
1327− case KVM_EXIT_DEBUG:
1328− break;
1329− default:
1330− BUG();
1331− }
1332−
13331320 vcpu->arch.sie_block->gpsw.mask = kvm_run->psw_mask;
13341321 vcpu->arch.sie_block->gpsw.addr = kvm_run->psw_addr;
13351322 if (kvm_run->kvm_dirty_regs & KVM_SYNC_PREFIX) {
arch/s390/mm/pgtable.c+10−0
@@ -986,11 +986,21 @@ int set_guest_storage_key(struct mm_struct *mm, unsigned long addr, · 985 unmodified lines
986986 pte_t *ptep;
987987
988988 down_read(&mm->mmap_sem);
989+retry:
989990 ptep = get_locked_pte(current->mm, addr, &ptl);
990991 if (unlikely(!ptep)) {
991992 up_read(&mm->mmap_sem);
992993 return -EFAULT;
993994 }
995+ if (!(pte_val(*ptep) & _PAGE_INVALID) &&
996+ (pte_val(*ptep) & _PAGE_PROTECT)) {
997+ pte_unmap_unlock(*ptep, ptl);
998+ if (fixup_user_fault(current, mm, addr, FAULT_FLAG_WRITE)) {
999+ up_read(&mm->mmap_sem);
1000+ return -EFAULT;
1001+ }
1002+ goto retry;
1003+ }
9941004
9951005 new = old = pgste_get_lock(ptep);
9961006 pgste_val(new) &= ~(PGSTE_GR_BIT | PGSTE_GC_BIT |
arch/sh/Kconfig+3−2
@@ -172,6 +172,7 @@ menu "System type" · 171 unmodified lines
172172 #
173173 config CPU_SH2
174174 bool
175+ select SH_INTC
175176
176177 config CPU_SH2A
177178 bool
@@ -182,6 +183,7 @@ config CPU_SH3 · 4 unmodified lines
182183 bool
183184 select CPU_HAS_INTEVT
184185 select CPU_HAS_SR_RB
186+ select SH_INTC
185187 select SYS_SUPPORTS_SH_TMU
186188
187189 config CPU_SH4
@@ -189,6 +191,7 @@ config CPU_SH4 · 1 unmodified line
189191 select CPU_HAS_INTEVT
190192 select CPU_HAS_SR_RB
191193 select CPU_HAS_FPU if !CPU_SH4AL_DSP
194+ select SH_INTC
192195 select SYS_SUPPORTS_SH_TMU
193196 select SYS_SUPPORTS_HUGETLBFS if MMU
194197
@@ -595,8 +598,6 @@ source kernel/Kconfig.hz · 400 unmodified lines
595598 config KEXEC
596599 bool "kexec system call (EXPERIMENTAL)"
597600 depends on SUPERH32 && MMU
598− select CRYPTO
599− select CRYPTO_SHA256
600601 help
601602 kexec is a system call that implements the ability to shutdown your
602603 current kernel, and to start another kernel. It is like a reboot
arch/sh/mm/cache.c+1−0
@@ -229,6 +229,7 @@ void flush_icache_range(unsigned long start, unsigned long end) · 228 unmodified lines
229229
230230 cacheop_on_each_cpu(local_flush_icache_range, (void *)&data, 1);
231231 }
232+EXPORT_SYMBOL(flush_icache_range);
232233
233234 void flush_icache_page(struct vm_area_struct *vma, struct page *page)
234235 {
arch/tile/Kconfig+0−2
@@ -191,8 +191,6 @@ source "kernel/Kconfig.hz" · 190 unmodified lines
191191
192192 config KEXEC
193193 bool "kexec system call"
194− select CRYPTO
195− select CRYPTO_SHA256
196194 ---help---
197195 kexec is a system call that implements the ability to shutdown your
198196 current kernel, and to start another kernel. It is like a reboot
arch/tile/kernel/smp.c+1−0
@@ -183,6 +183,7 @@ void flush_icache_range(unsigned long start, unsigned long end) · 182 unmodified lines
183183 preempt_enable();
184184 }
185185 }
186+EXPORT_SYMBOL(flush_icache_range);
186187
187188
188189 /* Called when smp_send_reschedule() triggers IRQ_RESCHEDULE. */
arch/unicore32/kernel/signal.c+5−4
@@ -254,7 +254,8 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set, · 253 unmodified lines
254254
255255 err |= setup_sigframe(frame, regs, set);
256256 if (err == 0)
257− err |= setup_return(regs, &ksig->ka, frame->retcode, frame, usig);
257+ err |= setup_return(regs, &ksig->ka, frame->retcode, frame,
258+ ksig->sig);
258259
259260 return err;
260261 }
@@ -276,7 +277,8 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, · 15 unmodified lines
276277 err |= __save_altstack(&frame->sig.uc.uc_stack, regs->UCreg_sp);
277278 err |= setup_sigframe(&frame->sig, regs, set);
278279 if (err == 0)
279− err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame, usig);
280+ err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame,
281+ ksig->sig);
280282
281283 if (err == 0) {
282284 /*
@@ -303,7 +305,6 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs, · 20 unmodified lines
303305 int syscall)
304306 {
305307 struct thread_info *thread = current_thread_info();
306− struct task_struct *tsk = current;
307308 sigset_t *oldset = sigmask_to_save();
308309 int usig = ksig->sig;
309310 int ret;
@@ -373,7 +374,7 @@ static void do_signal(struct pt_regs *regs, int syscall) · 63 unmodified lines
373374 if (!user_mode(regs))
374375 return;
375376
376− if (get_signsl(&ksig)) {
377+ if (get_signal(&ksig)) {
377378 handle_signal(&ksig, regs, syscall);
378379 return;
379380 }
arch/x86/Kbuild+1−3
@@ -17,6 +17,4 @@ obj-$(CONFIG_IA32_EMULATION) += ia32/ · 16 unmodified lines
1717 obj-y += platform/
1818 obj-y += net/
1919
20−ifeq ($(CONFIG_X86_64),y)
21−obj-$(CONFIG_KEXEC) += purgatory/
22−endif
20+obj-$(CONFIG_KEXEC_FILE) += purgatory/
arch/x86/Kconfig+14−4
@@ -1585,9 +1585,6 @@ source kernel/Kconfig.hz · 1584 unmodified lines
15851585
15861586 config KEXEC
15871587 bool "kexec system call"
1588− select BUILD_BIN2C
1589− select CRYPTO
1590− select CRYPTO_SHA256
15911588 ---help---
15921589 kexec is a system call that implements the ability to shutdown your
15931590 current kernel, and to start another kernel. It is like a reboot
@@ -1602,9 +1599,22 @@ config KEXEC · 8 unmodified lines
16021599 interface is strongly in flux, so no good recommendation can be
16031600 made.
16041601
1602+config KEXEC_FILE
1603+ bool "kexec file based system call"
1604+ select BUILD_BIN2C
1605+ depends on KEXEC
1606+ depends on X86_64
1607+ depends on CRYPTO=y
1608+ depends on CRYPTO_SHA256=y
1609+ ---help---
1610+ This is new version of kexec system call. This system call is
1611+ file based and takes file descriptors as system call argument
1612+ for kernel and initramfs as opposed to list of segments as
1613+ accepted by previous system call.
1614+
16051615 config KEXEC_VERIFY_SIG
16061616 bool "Verify kernel signature during kexec_file_load() syscall"
1607− depends on KEXEC
1617+ depends on KEXEC_FILE
16081618 ---help---
16091619 This option makes kernel signature verification mandatory for
16101620 kexec_file_load() syscall. If kernel is signature can not be
arch/x86/Makefile+2−4
@@ -184,11 +184,8 @@ archheaders: · 183 unmodified lines
184184 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
185185
186186 archprepare:
187−ifeq ($(CONFIG_KEXEC),y)
188−# Build only for 64bit. No loaders for 32bit yet.
189− ifeq ($(CONFIG_X86_64),y)
187+ifeq ($(CONFIG_KEXEC_FILE),y)
190188 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
191− endif
192189 endif
193190
194191 ###
@@ -254,6 +251,7 @@ archclean: · 59 unmodified lines
254251 $(Q)rm -rf $(objtree)/arch/x86_64
255252 $(Q)$(MAKE) $(clean)=$(boot)
256253 $(Q)$(MAKE) $(clean)=arch/x86/tools
254+ $(Q)$(MAKE) $(clean)=arch/x86/purgatory
257255
258256 PHONY += kvmconfig
259257 kvmconfig:
arch/x86/include/asm/io_apic.h+2−0
@@ -227,6 +227,8 @@ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned · 226 unmodified lines
227227
228228 extern void io_apic_eoi(unsigned int apic, unsigned int vector);
229229
230+extern bool mp_should_keep_irq(struct device *dev);
231+
230232 #else /* !CONFIG_X86_IO_APIC */
231233
232234 #define io_apic_assign_pci_irqs 0
arch/x86/include/asm/pgtable.h+7−2
@@ -131,8 +131,13 @@ static inline int pte_exec(pte_t pte) · 130 unmodified lines
131131
132132 static inline int pte_special(pte_t pte)
133133 {
134− return (pte_flags(pte) & (_PAGE_PRESENT|_PAGE_SPECIAL)) ==
135− (_PAGE_PRESENT|_PAGE_SPECIAL);
134+ /*
135+ * See CONFIG_NUMA_BALANCING pte_numa in include/asm-generic/pgtable.h.
136+ * On x86 we have _PAGE_BIT_NUMA == _PAGE_BIT_GLOBAL+1 ==
137+ * __PAGE_BIT_SOFTW1 == _PAGE_BIT_SPECIAL.
138+ */
139+ return (pte_flags(pte) & _PAGE_SPECIAL) &&
140+ (pte_flags(pte) & (_PAGE_PRESENT|_PAGE_PROTNONE));
136141 }
137142
138143 static inline unsigned long pte_pfn(pte_t pte)
arch/x86/kernel/Makefile+1−1
@@ -71,6 +71,7 @@ obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o · 70 unmodified lines
7171 obj-$(CONFIG_X86_TSC) += trace_clock.o
7272 obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o
7373 obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o
74+obj-$(CONFIG_KEXEC_FILE) += kexec-bzimage64.o
7475 obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o
7576 obj-y += kprobes/
7677 obj-$(CONFIG_MODULES) += module.o
@@ -118,5 +119,4 @@ ifeq ($(CONFIG_X86_64),y) · 41 unmodified lines
118119
119120 obj-$(CONFIG_PCI_MMCONFIG) += mmconf-fam10h_64.o
120121 obj-y += vsmp_64.o
121− obj-$(CONFIG_KEXEC) += kexec-bzimage64.o
122122 endif
arch/x86/kernel/apic/io_apic.c+26−1
@@ -1070,6 +1070,11 @@ static int mp_map_pin_to_irq(u32 gsi, int idx, int ioapic, int pin, · 1069 unmodified lines
10701070 }
10711071
10721072 if (flags & IOAPIC_MAP_ALLOC) {
1073+ /* special handling for legacy IRQs */
1074+ if (irq < nr_legacy_irqs() && info->count == 1 &&
1075+ mp_irqdomain_map(domain, irq, pin) != 0)
1076+ irq = -1;
1077+
10731078 if (irq > 0)
10741079 info->count++;
10751080 else if (info->count == 0)
@@ -3896,7 +3901,15 @@ int mp_irqdomain_map(struct irq_domain *domain, unsigned int virq, · 2820 unmodified lines
38963901 info->polarity = 1;
38973902 }
38983903 info->node = NUMA_NO_NODE;
3899− info->set = 1;
3904+
3905+ /*
3906+ * setup_IO_APIC_irqs() programs all legacy IRQs with default
3907+ * trigger and polarity attributes. Don't set the flag for that
3908+ * case so the first legacy IRQ user could reprogram the pin
3909+ * with real trigger and polarity attributes.
3910+ */
3911+ if (virq >= nr_legacy_irqs() || info->count)
3912+ info->set = 1;
39003913 }
39013914 set_io_apic_irq_attr(&attr, ioapic, hwirq, info->trigger,
39023915 info->polarity);
@@ -3946,6 +3959,18 @@ int mp_set_gsi_attr(u32 gsi, int trigger, int polarity, int node) · 43 unmodified lines
39463959 return ret;
39473960 }
39483961
3962+bool mp_should_keep_irq(struct device *dev)
3963+{
3964+ if (dev->power.is_prepared)
3965+ return true;
3966+#ifdef CONFIG_PM_RUNTIME
3967+ if (dev->power.runtime_status == RPM_SUSPENDING)
3968+ return true;
3969+#endif
3970+
3971+ return false;
3972+}
3973+
39493974 /* Enable IOAPIC early just for system timer */
39503975 void __init pre_init_apic_IRQ0(void)
39513976 {
arch/x86/kernel/crash.c+2−4
@@ -182,8 +182,7 @@ void native_machine_crash_shutdown(struct pt_regs *regs) · 181 unmodified lines
182182 crash_save_cpu(regs, safe_smp_processor_id());
183183 }
184184
185−#ifdef CONFIG_X86_64
186−
185+#ifdef CONFIG_KEXEC_FILE
187186 static int get_nr_ram_ranges_callback(unsigned long start_pfn,
188187 unsigned long nr_pfn, void *arg)
189188 {
@@ -696,5 +695,4 @@ int crash_load_segments(struct kimage *image) · 506 unmodified lines
696695
697696 return ret;
698697 }
699−
700−#endif /* CONFIG_X86_64 */
698+#endif /* CONFIG_KEXEC_FILE */
arch/x86/kernel/entry_32.S+1−1
@@ -683,7 +683,7 @@ END(syscall_badsys) · 682 unmodified lines
683683 sysenter_badsys:
684684 movl $-ENOSYS,%eax
685685 jmp sysenter_after_call
686−END(syscall_badsys)
686+END(sysenter_badsys)
687687 CFI_ENDPROC
688688
689689 .macro FIXUP_ESPFIX_STACK
arch/x86/kernel/irqinit.c+1−1
@@ -203,7 +203,7 @@ void __init native_init_IRQ(void) · 202 unmodified lines
203203 set_intr_gate(i, interrupt[i - FIRST_EXTERNAL_VECTOR]);
204204 }
205205
206− if (!acpi_ioapic && !of_ioapic)
206+ if (!acpi_ioapic && !of_ioapic && nr_legacy_irqs())
207207 setup_irq(2, &irq2);
208208
209209 #ifdef CONFIG_X86_32
arch/x86/kernel/machine_kexec_64.c+11−0
@@ -25,9 +25,11 @@ · 24 unmodified lines
2525 #include <asm/debugreg.h>
2626 #include <asm/kexec-bzimage64.h>
2727
28+#ifdef CONFIG_KEXEC_FILE
2829 static struct kexec_file_ops *kexec_file_loaders[] = {
2930 &kexec_bzImage64_ops,
3031 };
32+#endif
3133
3234 static void free_transition_pgtable(struct kimage *image)
3335 {
@@ -178,6 +180,7 @@ static void load_segments(void) · 144 unmodified lines
178180 );
179181 }
180182
183+#ifdef CONFIG_KEXEC_FILE
181184 /* Update purgatory as needed after various image segments have been prepared */
182185 static int arch_update_purgatory(struct kimage *image)
183186 {
@@ -209,6 +212,12 @@ static int arch_update_purgatory(struct kimage *image) · 25 unmodified lines
209212
210213 return ret;
211214 }
215+#else /* !CONFIG_KEXEC_FILE */
216+static inline int arch_update_purgatory(struct kimage *image)
217+{
218+ return 0;
219+}
220+#endif /* CONFIG_KEXEC_FILE */
212221
213222 int machine_kexec_prepare(struct kimage *image)
214223 {
@@ -329,6 +338,7 @@ void arch_crash_save_vmcoreinfo(void) · 114 unmodified lines
329338
330339 /* arch-dependent functionality related to kexec file-based syscall */
331340
341+#ifdef CONFIG_KEXEC_FILE
332342 int arch_kexec_kernel_image_probe(struct kimage *image, void *buf,
333343 unsigned long buf_len)
334344 {
@@ -522,3 +532,4 @@ overflow: · 187 unmodified lines
522532 (int)ELF64_R_TYPE(rel[i].r_info), value);
523533 return -ENOEXEC;
524534 }
535+#endif /* CONFIG_KEXEC_FILE */
arch/x86/kernel/time.c+2−0
@@ -68,6 +68,8 @@ static struct irqaction irq0 = { · 67 unmodified lines
6868
6969 void __init setup_default_timer_irq(void)
7070 {
71+ if (!nr_legacy_irqs())
72+ return;
7173 setup_irq(0, &irq0);
7274 }
7375
arch/x86/mm/tlb.c+8−2
@@ -49,7 +49,13 @@ void leave_mm(int cpu) · 48 unmodified lines
4949 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
5050 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
5151 load_cr3(swapper_pg_dir);
52− trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
52+ /*
53+ * This gets called in the idle path where RCU
54+ * functions differently. Tracing normally
55+ * uses RCU, so we have to call the tracepoint
56+ * specially here.
57+ */
58+ trace_tlb_flush_rcuidle(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
5359 }
5460 }
5561 EXPORT_SYMBOL_GPL(leave_mm);
@@ -174,7 +180,7 @@ void flush_tlb_current_task(void) · 118 unmodified lines
174180 *
175181 * This is in units of pages.
176182 */
177−unsigned long tlb_single_page_flush_ceiling = 33;
183+static unsigned long tlb_single_page_flush_ceiling __read_mostly = 33;
178184
179185 void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
180186 unsigned long end, unsigned long vmflag)
arch/x86/pci/intel_mid_pci.c+1−1
@@ -229,7 +229,7 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev) · 228 unmodified lines
229229
230230 static void intel_mid_pci_irq_disable(struct pci_dev *dev)
231231 {
232− if (!dev->dev.power.is_prepared && dev->irq > 0)
232+ if (!mp_should_keep_irq(&dev->dev) && dev->irq > 0)
233233 mp_unmap_irq(dev->irq);
234234 }
235235
arch/x86/pci/irq.c+1−1
@@ -1256,7 +1256,7 @@ static int pirq_enable_irq(struct pci_dev *dev) · 1255 unmodified lines
12561256
12571257 static void pirq_disable_irq(struct pci_dev *dev)
12581258 {
1259− if (io_apic_assign_pci_irqs && !dev->dev.power.is_prepared &&
1259+ if (io_apic_assign_pci_irqs && !mp_should_keep_irq(&dev->dev) &&
12601260 dev->irq) {
12611261 mp_unmap_irq(dev->irq);
12621262 dev->irq = 0;
arch/x86/purgatory/Makefile+2−4
@@ -11,6 +11,7 @@ targets += purgatory.ro · 10 unmodified lines
1111 # sure how to relocate those. Like kexec-tools, use custom flags.
1212
1313 KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes -fno-zero-initialized-in-bss -fno-builtin -ffreestanding -c -MD -Os -mcmodel=large
14+KBUILD_CFLAGS += -m$(BITS)
1415
1516 $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
1617 $(call if_changed,ld)
@@ -24,7 +25,4 @@ $(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE · 7 unmodified lines
2425 $(call if_changed,bin2c)
2526
2627
27−# No loaders for 32bits yet.
28−ifeq ($(CONFIG_X86_64),y)
29− obj-$(CONFIG_KEXEC) += kexec-purgatory.o
30−endif
28+obj-$(CONFIG_KEXEC_FILE) += kexec-purgatory.o
arch/xtensa/Kconfig+75−17
@@ -4,24 +4,23 @@ config ZONE_DMA · 3 unmodified lines
44 config XTENSA
55 def_bool y
66 select ARCH_WANT_FRAME_POINTERS
7− select HAVE_IDE
8− select GENERIC_ATOMIC64
9− select GENERIC_CLOCKEVENTS
10− select VIRT_TO_BUS
11− select GENERIC_IRQ_SHOW
12− select GENERIC_SCHED_CLOCK
13− select MODULES_USE_ELF_RELA
14− select GENERIC_PCI_IOMAP
157 select ARCH_WANT_IPC_PARSE_VERSION
168 select ARCH_WANT_OPTIONAL_GPIOLIB
179 select BUILDTIME_EXTABLE_SORT
1810 select CLONE_BACKWARDS
19− select IRQ_DOMAIN
20− select HAVE_OPROFILE
11+ select COMMON_CLK
12+ select GENERIC_ATOMIC64
13+ select GENERIC_CLOCKEVENTS
14+ select GENERIC_IRQ_SHOW
15+ select GENERIC_PCI_IOMAP
16+ select GENERIC_SCHED_CLOCK
2117 select HAVE_FUNCTION_TRACER
2218 select HAVE_IRQ_TIME_ACCOUNTING
19+ select HAVE_OPROFILE
2320 select HAVE_PERF_EVENTS
24− select COMMON_CLK
21+ select IRQ_DOMAIN
22+ select MODULES_USE_ELF_RELA
23+ select VIRT_TO_BUS
2524 help
2625 Xtensa processors are 32-bit RISC machines designed by Tensilica
2726 primarily for embedded systems. These processors are both
@@ -62,7 +61,9 @@ config TRACE_IRQFLAGS_SUPPORT · 34 unmodified lines
6261 def_bool y
6362
6463 config MMU
65− def_bool n
64+ bool
65+ default n if !XTENSA_VARIANT_CUSTOM
66+ default XTENSA_VARIANT_MMU if XTENSA_VARIANT_CUSTOM
6667
6768 config VARIANT_IRQ_SWITCH
6869 def_bool n
@@ -102,8 +103,40 @@ config XTENSA_VARIANT_S6000 · 33 unmodified lines
102103 select VARIANT_IRQ_SWITCH
103104 select ARCH_REQUIRE_GPIOLIB
104105 select XTENSA_CALIBRATE_CCOUNT
106+
107+config XTENSA_VARIANT_CUSTOM
108+ bool "Custom Xtensa processor configuration"
109+ select MAY_HAVE_SMP
110+ select HAVE_XTENSA_GPIO32
111+ help
112+ Select this variant to use a custom Xtensa processor configuration.
113+ You will be prompted for a processor variant CORENAME.
105114 endchoice
106115
116+config XTENSA_VARIANT_CUSTOM_NAME
117+ string "Xtensa Processor Custom Core Variant Name"
118+ depends on XTENSA_VARIANT_CUSTOM
119+ help
120+ Provide the name of a custom Xtensa processor variant.
121+ This CORENAME selects arch/xtensa/variant/CORENAME.
122+ Dont forget you have to select MMU if you have one.
123+
124+config XTENSA_VARIANT_NAME
125+ string
126+ default "dc232b" if XTENSA_VARIANT_DC232B
127+ default "dc233c" if XTENSA_VARIANT_DC233C
128+ default "fsf" if XTENSA_VARIANT_FSF
129+ default "s6000" if XTENSA_VARIANT_S6000
130+ default XTENSA_VARIANT_CUSTOM_NAME if XTENSA_VARIANT_CUSTOM
131+
132+config XTENSA_VARIANT_MMU
133+ bool "Core variant has a Full MMU (TLB, Pages, Protection, etc)"
134+ depends on XTENSA_VARIANT_CUSTOM
135+ default y
136+ help
137+ Build a Conventional Kernel with full MMU support,
138+ ie: it supports a TLB with auto-loading, page protection.
139+
107140 config XTENSA_UNALIGNED_USER
108141 bool "Unaligned memory access in use space"
109142 help
@@ -156,13 +189,9 @@ config HOTPLUG_CPU · 46 unmodified lines
156189
157190 Say N if you want to disable CPU hotplug.
158191
159−config MATH_EMULATION
160− bool "Math emulation"
161− help
162− Can we use information of configuration file?
163−
164192 config INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
165193 bool "Initialize Xtensa MMU inside the Linux kernel code"
194+ depends on MMU
166195 default y
167196 help
168197 Earlier version initialized the MMU in the exception vector
@@ -192,6 +221,7 @@ config INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX · 23 unmodified lines
192221
193222 config HIGHMEM
194223 bool "High Memory Support"
224+ depends on MMU
195225 help
196226 Linux can use the full amount of RAM in the system by
197227 default. However, the default MMUv2 setup only maps the
@@ -208,6 +238,32 @@ config HIGHMEM · 10 unmodified lines
208238
209239 If unsure, say Y.
210240
241+config FAST_SYSCALL_XTENSA
242+ bool "Enable fast atomic syscalls"
243+ default n
244+ help
245+ fast_syscall_xtensa is a syscall that can make atomic operations
246+ on UP kernel when processor has no s32c1i support.
247+
248+ This syscall is deprecated. It may have issues when called with
249+ invalid arguments. It is provided only for backwards compatibility.
250+ Only enable it if your userspace software requires it.
251+
252+ If unsure, say N.
253+
254+config FAST_SYSCALL_SPILL_REGISTERS
255+ bool "Enable spill registers syscall"
256+ default n
257+ help
258+ fast_syscall_spill_registers is a syscall that spills all active
259+ register windows of a calling userspace task onto its stack.
260+
261+ This syscall is deprecated. It may have issues when called with
262+ invalid arguments. It is provided only for backwards compatibility.
263+ Only enable it if your userspace software requires it.
264+
265+ If unsure, say N.
266+
211267 endmenu
212268
213269 config XTENSA_CALIBRATE_CCOUNT
@@ -250,12 +306,14 @@ config XTENSA_PLATFORM_ISS · 36 unmodified lines
250306
251307 config XTENSA_PLATFORM_XT2000
252308 bool "XT2000"
309+ select HAVE_IDE
253310 help
254311 XT2000 is the name of Tensilica's feature-rich emulation platform.
255312 This hardware is capable of running a full Linux distribution.
256313
257314 config XTENSA_PLATFORM_S6105
258315 bool "S6105"
316+ select HAVE_IDE
259317 select SERIAL_CONSOLE
260318 select NO_IOPORT_MAP
261319
arch/xtensa/Makefile+2−5
@@ -4,6 +4,7 @@ · 3 unmodified lines
44 # for more details.
55 #
66 # Copyright (C) 2001 - 2005 Tensilica Inc.
7+# Copyright (C) 2014 Cadence Design Systems Inc.
78 #
89 # This file is included by the global makefile so that you can add your own
910 # architecture-specific flags and dependencies. Remember to do have actions
@@ -13,11 +14,7 @@ · 3 unmodified lines
1314 # Core configuration.
1415 # (Use VAR=<xtensa_config> to use another default compiler.)
1516
16−variant-$(CONFIG_XTENSA_VARIANT_FSF) := fsf
17−variant-$(CONFIG_XTENSA_VARIANT_DC232B) := dc232b
18−variant-$(CONFIG_XTENSA_VARIANT_DC233C) := dc233c
19−variant-$(CONFIG_XTENSA_VARIANT_S6000) := s6000
20−variant-$(CONFIG_XTENSA_VARIANT_LINUX_CUSTOM) := custom
17+variant-y := $(patsubst "%",%,$(CONFIG_XTENSA_VARIANT_NAME))
2118
2219 VARIANT = $(variant-y)
2320 export VARIANT
arch/xtensa/boot/dts/kc705.dts+4−1
@@ -4,8 +4,11 @@ · 3 unmodified lines
44
55 / {
66 compatible = "cdns,xtensa-kc705";
7+ chosen {
8+ bootargs = "earlycon=uart8250,mmio32,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000";
9+ };
710 memory@0 {
811 device_type = "memory";
9− reg = <0x00000000 0x08000000>;
12+ reg = <0x00000000 0x38000000>;
1013 };
1114 };
arch/xtensa/configs/common_defconfig+0−1
@@ -66,7 +66,6 @@ CONFIG_XTENSA_ARCH_LINUX_BE=y · 65 unmodified lines
6666 CONFIG_MMU=y
6767 # CONFIG_XTENSA_UNALIGNED_USER is not set
6868 # CONFIG_PREEMPT is not set
69−# CONFIG_MATH_EMULATION is not set
7069 # CONFIG_HIGHMEM is not set
7170
7271 #
arch/xtensa/configs/iss_defconfig+1−2
@@ -146,7 +146,6 @@ CONFIG_XTENSA_VARIANT_FSF=y · 145 unmodified lines
146146 # CONFIG_XTENSA_VARIANT_S6000 is not set
147147 # CONFIG_XTENSA_UNALIGNED_USER is not set
148148 # CONFIG_PREEMPT is not set
149−# CONFIG_MATH_EMULATION is not set
150149 CONFIG_XTENSA_CALIBRATE_CCOUNT=y
151150 CONFIG_SERIAL_CONSOLE=y
152151 CONFIG_XTENSA_ISS_NETWORK=y
@@ -308,7 +307,7 @@ CONFIG_MISC_DEVICES=y · 155 unmodified lines
308307 # EEPROM support
309308 #
310309 # CONFIG_EEPROM_93CX6 is not set
311−CONFIG_HAVE_IDE=y
310+# CONFIG_HAVE_IDE is not set
312311 # CONFIG_IDE is not set
313312
314313 #
arch/xtensa/configs/s6105_defconfig+0−1
@@ -109,7 +109,6 @@ CONFIG_VARIANT_IRQ_SWITCH=y · 108 unmodified lines
109109 CONFIG_XTENSA_VARIANT_S6000=y
110110 # CONFIG_XTENSA_UNALIGNED_USER is not set
111111 CONFIG_PREEMPT=y
112−# CONFIG_MATH_EMULATION is not set
113112 # CONFIG_HIGHMEM is not set
114113 CONFIG_XTENSA_CALIBRATE_CCOUNT=y
115114 CONFIG_SERIAL_CONSOLE=y
arch/xtensa/include/asm/cacheflush.h+2−0
@@ -37,6 +37,7 @@ · 36 unmodified lines
3737 * specials for cache aliasing:
3838 *
3939 * __flush_invalidate_dcache_page_alias(vaddr,paddr)
40+ * __invalidate_dcache_page_alias(vaddr,paddr)
4041 * __invalidate_icache_page_alias(vaddr,paddr)
4142 */
4243
@@ -62,6 +63,7 @@ extern void __flush_invalidate_dcache_range(unsigned long, unsigned long); · 19 unmodified lines
6263
6364 #if defined(CONFIG_MMU) && (DCACHE_WAY_SIZE > PAGE_SIZE)
6465 extern void __flush_invalidate_dcache_page_alias(unsigned long, unsigned long);
66+extern void __invalidate_dcache_page_alias(unsigned long, unsigned long);
6567 #else
6668 static inline void __flush_invalidate_dcache_page_alias(unsigned long virt,
6769 unsigned long phys) { }
arch/xtensa/include/asm/fixmap.h+26−4
@@ -23,8 +23,8 @@ · 22 unmodified lines
2323 * Here we define all the compile-time 'special' virtual
2424 * addresses. The point is to have a constant address at
2525 * compile time, but to set the physical address only
26− * in the boot process. We allocate these special addresses
27− * from the end of the consistent memory region backwards.
26+ * in the boot process. We allocate these special addresses
27+ * from the start of the consistent memory region upwards.
2828 * Also this lets us do fail-safe vmalloc(), we
2929 * can guarantee that these special addresses and
3030 * vmalloc()-ed addresses never overlap.
@@ -38,7 +38,8 @@ enum fixed_addresses { · 7 unmodified lines
3838 #ifdef CONFIG_HIGHMEM
3939 /* reserved pte's for temporary kernel mappings */
4040 FIX_KMAP_BEGIN,
41− FIX_KMAP_END = FIX_KMAP_BEGIN + (KM_TYPE_NR * NR_CPUS) - 1,
41+ FIX_KMAP_END = FIX_KMAP_BEGIN +
42+ (KM_TYPE_NR * NR_CPUS * DCACHE_N_COLORS) - 1,
4243 #endif
4344 __end_of_fixed_addresses
4445 };
@@ -47,7 +48,28 @@ enum fixed_addresses { · 2 unmodified lines
4748 #define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
4849 #define FIXADDR_START ((FIXADDR_TOP - FIXADDR_SIZE) & PMD_MASK)
4950
50−#include <asm-generic/fixmap.h>
51+#define __fix_to_virt(x) (FIXADDR_START + ((x) << PAGE_SHIFT))
52+#define __virt_to_fix(x) (((x) - FIXADDR_START) >> PAGE_SHIFT)
53+
54+#ifndef __ASSEMBLY__
55+/*
56+ * 'index to address' translation. If anyone tries to use the idx
57+ * directly without translation, we catch the bug with a NULL-deference
58+ * kernel oops. Illegal ranges of incoming indices are caught too.
59+ */
60+static __always_inline unsigned long fix_to_virt(const unsigned int idx)
61+{
62+ BUILD_BUG_ON(idx >= __end_of_fixed_addresses);
63+ return __fix_to_virt(idx);
64+}
65+
66+static inline unsigned long virt_to_fix(const unsigned long vaddr)
67+{
68+ BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);
69+ return __virt_to_fix(vaddr);
70+}
71+
72+#endif
5173
5274 #define kmap_get_fixmap_pte(vaddr) \
5375 pte_offset_kernel( \
arch/xtensa/include/asm/highmem.h+38−2
@@ -12,19 +12,55 @@ · 11 unmodified lines
1212 #ifndef _XTENSA_HIGHMEM_H
1313 #define _XTENSA_HIGHMEM_H
1414
15+#include <linux/wait.h>
1516 #include <asm/cacheflush.h>
1617 #include <asm/fixmap.h>
1718 #include <asm/kmap_types.h>
1819 #include <asm/pgtable.h>
1920
20−#define PKMAP_BASE (FIXADDR_START - PMD_SIZE)
21−#define LAST_PKMAP PTRS_PER_PTE
21+#define PKMAP_BASE ((FIXADDR_START - \
22+ (LAST_PKMAP + 1) * PAGE_SIZE) & PMD_MASK)
23+#define LAST_PKMAP (PTRS_PER_PTE * DCACHE_N_COLORS)
2224 #define LAST_PKMAP_MASK (LAST_PKMAP - 1)
2325 #define PKMAP_NR(virt) (((virt) - PKMAP_BASE) >> PAGE_SHIFT)
2426 #define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT))
2527
2628 #define kmap_prot PAGE_KERNEL
2729
30+#if DCACHE_WAY_SIZE > PAGE_SIZE
31+#define get_pkmap_color get_pkmap_color
32+static inline int get_pkmap_color(struct page *page)
33+{
34+ return DCACHE_ALIAS(page_to_phys(page));
35+}
36+
37+extern unsigned int last_pkmap_nr_arr[];
38+
39+static inline unsigned int get_next_pkmap_nr(unsigned int color)
40+{
41+ last_pkmap_nr_arr[color] =
42+ (last_pkmap_nr_arr[color] + DCACHE_N_COLORS) & LAST_PKMAP_MASK;
43+ return last_pkmap_nr_arr[color] + color;
44+}
45+
46+static inline int no_more_pkmaps(unsigned int pkmap_nr, unsigned int color)
47+{
48+ return pkmap_nr < DCACHE_N_COLORS;
49+}
50+
51+static inline int get_pkmap_entries_count(unsigned int color)
52+{
53+ return LAST_PKMAP / DCACHE_N_COLORS;
54+}
55+
56+extern wait_queue_head_t pkmap_map_wait_arr[];
57+
58+static inline wait_queue_head_t *get_pkmap_wait_queue_head(unsigned int color)
59+{
60+ return pkmap_map_wait_arr + color;
61+}
62+#endif
63+
2864 extern pte_t *pkmap_page_table;
2965
3066 void *kmap_high(struct page *page);
arch/xtensa/include/asm/page.h+12−2
@@ -78,7 +78,9 @@ · 77 unmodified lines
7878 # define DCACHE_ALIAS_EQ(a,b) ((((a) ^ (b)) & DCACHE_ALIAS_MASK) == 0)
7979 #else
8080 # define DCACHE_ALIAS_ORDER 0
81+# define DCACHE_ALIAS(a) ((void)(a), 0)
8182 #endif
83+#define DCACHE_N_COLORS (1 << DCACHE_ALIAS_ORDER)
8284
8385 #if ICACHE_WAY_SIZE > PAGE_SIZE
8486 # define ICACHE_ALIAS_ORDER (ICACHE_WAY_SHIFT - PAGE_SHIFT)
@@ -134,6 +136,7 @@ static inline __attribute_const__ int get_order(unsigned long size) · 49 unmodified lines
134136 #endif
135137
136138 struct page;
139+struct vm_area_struct;
137140 extern void clear_page(void *page);
138141 extern void copy_page(void *to, void *from);
139142
@@ -143,8 +146,15 @@ extern void copy_page(void *to, void *from); · 3 unmodified lines
143146 */
144147
145148 #if DCACHE_WAY_SIZE > PAGE_SIZE
146−extern void clear_user_page(void*, unsigned long, struct page*);
147−extern void copy_user_page(void*, void*, unsigned long, struct page*);
149+extern void clear_page_alias(void *vaddr, unsigned long paddr);
150+extern void copy_page_alias(void *to, void *from,
151+ unsigned long to_paddr, unsigned long from_paddr);
152+
153+#define clear_user_highpage clear_user_highpage
154+void clear_user_highpage(struct page *page, unsigned long vaddr);
155+#define __HAVE_ARCH_COPY_USER_HIGHPAGE
156+void copy_user_highpage(struct page *to, struct page *from,
157+ unsigned long vaddr, struct vm_area_struct *vma);
148158 #else
149159 # define clear_user_page(page, vaddr, pg) clear_page(page)
150160 # define copy_user_page(to, from, vaddr, pg) copy_page(to, from)
arch/xtensa/include/asm/pgtable.h+6−1
@@ -67,7 +67,12 @@ · 66 unmodified lines
6767 #define VMALLOC_START 0xC0000000
6868 #define VMALLOC_END 0xC7FEFFFF
6969 #define TLBTEMP_BASE_1 0xC7FF0000
70−#define TLBTEMP_BASE_2 0xC7FF8000
70+#define TLBTEMP_BASE_2 (TLBTEMP_BASE_1 + DCACHE_WAY_SIZE)
71+#if 2 * DCACHE_WAY_SIZE > ICACHE_WAY_SIZE
72+#define TLBTEMP_SIZE (2 * DCACHE_WAY_SIZE)
73+#else
74+#define TLBTEMP_SIZE ICACHE_WAY_SIZE
75+#endif
7176
7277 /*
7378 * For the Xtensa architecture, the PTE layout is as follows:
arch/xtensa/include/asm/uaccess.h+5−0
@@ -52,7 +52,12 @@ · 51 unmodified lines
5252 */
5353 .macro get_fs ad, sp
5454 GET_CURRENT(\ad,\sp)
55+#if THREAD_CURRENT_DS > 1020
56+ addi \ad, \ad, TASK_THREAD
57+ l32i \ad, \ad, THREAD_CURRENT_DS - TASK_THREAD
58+#else
5559 l32i \ad, \ad, THREAD_CURRENT_DS
60+#endif
5661 .endm
5762
5863 /*
arch/xtensa/include/uapi/asm/ioctls.h+10−9
@@ -28,17 +28,17 @@ · 27 unmodified lines
2828 #define TCSETSW 0x5403
2929 #define TCSETSF 0x5404
3030
31−#define TCGETA _IOR('t', 23, struct termio)
32−#define TCSETA _IOW('t', 24, struct termio)
33−#define TCSETAW _IOW('t', 25, struct termio)
34−#define TCSETAF _IOW('t', 28, struct termio)
31+#define TCGETA 0x80127417 /* _IOR('t', 23, struct termio) */
32+#define TCSETA 0x40127418 /* _IOW('t', 24, struct termio) */
33+#define TCSETAW 0x40127419 /* _IOW('t', 25, struct termio) */
34+#define TCSETAF 0x4012741C /* _IOW('t', 28, struct termio) */
3535
3636 #define TCSBRK _IO('t', 29)
3737 #define TCXONC _IO('t', 30)
3838 #define TCFLSH _IO('t', 31)
3939
40−#define TIOCSWINSZ _IOW('t', 103, struct winsize)
41−#define TIOCGWINSZ _IOR('t', 104, struct winsize)
40+#define TIOCSWINSZ 0x40087467 /* _IOW('t', 103, struct winsize) */
41+#define TIOCGWINSZ 0x80087468 /* _IOR('t', 104, struct winsize) */
4242 #define TIOCSTART _IO('t', 110) /* start output, like ^Q */
4343 #define TIOCSTOP _IO('t', 111) /* stop output, like ^S */
4444 #define TIOCOUTQ _IOR('t', 115, int) /* output queue size */
@@ -88,7 +88,6 @@ · 43 unmodified lines
8888 #define TIOCSETD _IOW('T', 35, int)
8989 #define TIOCGETD _IOR('T', 36, int)
9090 #define TCSBRKP _IOW('T', 37, int) /* Needed for POSIX tcsendbreak()*/
91−#define TIOCTTYGSTRUCT _IOR('T', 38, struct tty_struct) /* For debugging only*/
9291 #define TIOCSBRK _IO('T', 39) /* BSD compatibility */
9392 #define TIOCCBRK _IO('T', 40) /* BSD compatibility */
9493 #define TIOCGSID _IOR('T', 41, pid_t) /* Return the session ID of FD*/
@@ -114,8 +113,10 @@ · 19 unmodified lines
114113 #define TIOCSERGETLSR _IOR('T', 89, unsigned int) /* Get line status reg. */
115114 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
116115 # define TIOCSER_TEMT 0x01 /* Transmitter physically empty */
117−#define TIOCSERGETMULTI _IOR('T', 90, struct serial_multiport_struct) /* Get multiport config */
118−#define TIOCSERSETMULTI _IOW('T', 91, struct serial_multiport_struct) /* Set multiport config */
116+#define TIOCSERGETMULTI 0x80a8545a /* Get multiport config */
117+ /* _IOR('T', 90, struct serial_multiport_struct) */
118+#define TIOCSERSETMULTI 0x40a8545b /* Set multiport config */
119+ /* _IOW('T', 91, struct serial_multiport_struct) */
119120
120121 #define TIOCMIWAIT _IO('T', 92) /* wait for a change on serial input line(s) */
121122 #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
arch/xtensa/include/uapi/asm/unistd.h+4−1
@@ -739,7 +739,10 @@ __SYSCALL(334, sys_sched_setattr, 2) · 738 unmodified lines
739739 #define __NR_sched_getattr 335
740740 __SYSCALL(335, sys_sched_getattr, 3)
741741
742−#define __NR_syscall_count 336
742+#define __NR_renameat2 336
743+__SYSCALL(336, sys_renameat2, 5)
744+
745+#define __NR_syscall_count 337
743746
744747 /*
745748 * sysxtensa syscall handler
arch/xtensa/kernel/align.S+81−47
@@ -8,6 +8,7 @@ · 7 unmodified lines
88 * this archive for more details.
99 *
1010 * Copyright (C) 2001 - 2005 Tensilica, Inc.
11+ * Copyright (C) 2014 Cadence Design Systems Inc.
1112 *
1213 * Rewritten by Chris Zankel <chris@zankel.net>
1314 *
@@ -174,6 +175,10 @@ ENTRY(fast_unaligned) · 160 unmodified lines
174175 s32i a0, a2, PT_AREG2
175176 s32i a3, a2, PT_AREG3
176177
178+ rsr a3, excsave1
179+ movi a4, fast_unaligned_fixup
180+ s32i a4, a3, EXC_TABLE_FIXUP
181+
177182 /* Keep value of SAR in a0 */
178183
179184 rsr a0, sar
@@ -225,10 +230,6 @@ ENTRY(fast_unaligned) · 45 unmodified lines
225230 addx8 a5, a6, a5
226231 jx a5 # jump into table
227232
228− /* Invalid instruction, CRITICAL! */
229−.Linvalid_instruction_load:
230− j .Linvalid_instruction
231−
232233 /* Load: Load memory address. */
233234
234235 .Lload: movi a3, ~3
@@ -272,18 +273,6 @@ ENTRY(fast_unaligned) · 37 unmodified lines
272273 /* Set target register. */
273274
274275 1:
275−
276−#if XCHAL_HAVE_LOOPS
277− rsr a5, lend # check if we reached LEND
278− bne a7, a5, 1f
279− rsr a5, lcount # and LCOUNT != 0
280− beqz a5, 1f
281− addi a5, a5, -1 # decrement LCOUNT and set
282− rsr a7, lbeg # set PC to LBEGIN
283− wsr a5, lcount
284−#endif
285−
286−1: wsr a7, epc1 # skip load instruction
287276 extui a4, a4, INSN_T, 4 # extract target register
288277 movi a5, .Lload_table
289278 addx8 a4, a4, a5
@@ -326,6 +315,35 @@ ENTRY(fast_unaligned) · 36 unmodified lines
326315 mov a3, a14 ; _j 1f; .align 8
327316 mov a3, a15 ; _j 1f; .align 8
328317
318+ /* We cannot handle this exception. */
319+
320+ .extern _kernel_exception
321+.Linvalid_instruction_load:
322+.Linvalid_instruction_store:
323+
324+ movi a4, 0
325+ rsr a3, excsave1
326+ s32i a4, a3, EXC_TABLE_FIXUP
327+
328+ /* Restore a4...a8 and SAR, set SP, and jump to default exception. */
329+
330+ l32i a8, a2, PT_AREG8
331+ l32i a7, a2, PT_AREG7
332+ l32i a6, a2, PT_AREG6
333+ l32i a5, a2, PT_AREG5
334+ l32i a4, a2, PT_AREG4
335+ wsr a0, sar
336+ mov a1, a2
337+
338+ rsr a0, ps
339+ bbsi.l a0, PS_UM_BIT, 2f # jump if user mode
340+
341+ movi a0, _kernel_exception
342+ jx a0
343+
344+2: movi a0, _user_exception
345+ jx a0
346+
329347 1: # a7: instruction pointer, a4: instruction, a3: value
330348
331349 movi a6, 0 # mask: ffffffff:00000000
@@ -353,17 +371,6 @@ ENTRY(fast_unaligned) · 21 unmodified lines
353371 /* Get memory address */
354372
355373 1:
356−#if XCHAL_HAVE_LOOPS
357− rsr a4, lend # check if we reached LEND
358− bne a7, a4, 1f
359− rsr a4, lcount # and LCOUNT != 0
360− beqz a4, 1f
361− addi a4, a4, -1 # decrement LCOUNT and set
362− rsr a7, lbeg # set PC to LBEGIN
363− wsr a4, lcount
364−#endif
365−
366−1: wsr a7, epc1 # skip store instruction
367374 movi a4, ~3
368375 and a4, a4, a8 # align memory address
369376
@@ -375,25 +382,25 @@ ENTRY(fast_unaligned) · 5 unmodified lines
375382 #endif
376383
377384 __ssa8r a8
378− __src_b a7, a5, a6 # lo-mask F..F0..0 (BE) 0..0F..F (LE)
385+ __src_b a8, a5, a6 # lo-mask F..F0..0 (BE) 0..0F..F (LE)
379386 __src_b a6, a6, a5 # hi-mask 0..0F..F (BE) F..F0..0 (LE)
380387 #ifdef UNALIGNED_USER_EXCEPTION
381388 l32e a5, a4, -8
382389 #else
383390 l32i a5, a4, 0 # load lower address word
384391 #endif
385− and a5, a5, a7 # mask
386− __sh a7, a3 # shift value
387− or a5, a5, a7 # or with original value
392+ and a5, a5, a8 # mask
393+ __sh a8, a3 # shift value
394+ or a5, a5, a8 # or with original value
388395 #ifdef UNALIGNED_USER_EXCEPTION
389396 s32e a5, a4, -8
390− l32e a7, a4, -4
397+ l32e a8, a4, -4
391398 #else
392399 s32i a5, a4, 0 # store
393− l32i a7, a4, 4 # same for upper address word
400+ l32i a8, a4, 4 # same for upper address word
394401 #endif
395402 __sl a5, a3
396− and a6, a7, a6
403+ and a6, a8, a6
397404 or a6, a6, a5
398405 #ifdef UNALIGNED_USER_EXCEPTION
399406 s32e a6, a4, -4
@@ -401,9 +408,27 @@ ENTRY(fast_unaligned) · 1 unmodified line
401408 s32i a6, a4, 4
402409 #endif
403410
404− /* Done. restore stack and return */
405−
406411 .Lexit:
412+#if XCHAL_HAVE_LOOPS
413+ rsr a4, lend # check if we reached LEND
414+ bne a7, a4, 1f
415+ rsr a4, lcount # and LCOUNT != 0
416+ beqz a4, 1f
417+ addi a4, a4, -1 # decrement LCOUNT and set
418+ rsr a7, lbeg # set PC to LBEGIN
419+ wsr a4, lcount
420+#endif
421+
422+1: wsr a7, epc1 # skip emulated instruction
423+
424+ /* Update icount if we're single-stepping in userspace. */
425+ rsr a4, icountlevel
426+ beqz a4, 1f
427+ bgeui a4, LOCKLEVEL + 1, 1f
428+ rsr a4, icount
429+ addi a4, a4, 1
430+ wsr a4, icount
431+1:
407432 movi a4, 0
408433 rsr a3, excsave1
409434 s32i a4, a3, EXC_TABLE_FIXUP
@@ -424,31 +449,40 @@ ENTRY(fast_unaligned) · 14 unmodified lines
424449 l32i a2, a2, PT_AREG2
425450 rfe
426451
427− /* We cannot handle this exception. */
452+ENDPROC(fast_unaligned)
428453
429− .extern _kernel_exception
430−.Linvalid_instruction_store:
431−.Linvalid_instruction:
454+ENTRY(fast_unaligned_fixup)
432455
433− /* Restore a4...a8 and SAR, set SP, and jump to default exception. */
456+ l32i a2, a3, EXC_TABLE_DOUBLE_SAVE
457+ wsr a3, excsave1
434458
435459 l32i a8, a2, PT_AREG8
436460 l32i a7, a2, PT_AREG7
437461 l32i a6, a2, PT_AREG6
438462 l32i a5, a2, PT_AREG5
439463 l32i a4, a2, PT_AREG4
464+ l32i a0, a2, PT_AREG2
465+ xsr a0, depc # restore depc and a0
440466 wsr a0, sar
441− mov a1, a2
467+
468+ rsr a0, exccause
469+ s32i a0, a2, PT_DEPC # mark as a regular exception
442470
443471 rsr a0, ps
444− bbsi.l a2, PS_UM_BIT, 1f # jump if user mode
472+ bbsi.l a0, PS_UM_BIT, 1f # jump if user mode
445473
446− movi a0, _kernel_exception
474+ rsr a0, exccause
475+ addx4 a0, a0, a3 # find entry in table
476+ l32i a0, a0, EXC_TABLE_FAST_KERNEL # load handler
477+ l32i a3, a2, PT_AREG3
447478 jx a0
448−
449−1: movi a0, _user_exception
479+1:
480+ rsr a0, exccause
481+ addx4 a0, a0, a3 # find entry in table
482+ l32i a0, a0, EXC_TABLE_FAST_USER # load handler
483+ l32i a3, a2, PT_AREG3
450484 jx a0
451485
452−ENDPROC(fast_unaligned)
486+ENDPROC(fast_unaligned_fixup)
453487
454488 #endif /* XCHAL_UNALIGNED_LOAD_EXCEPTION || XCHAL_UNALIGNED_STORE_EXCEPTION */
arch/xtensa/kernel/entry.S+42−12
@@ -986,6 +986,8 @@ ENDPROC(fast_syscall_unrecoverable) · 985 unmodified lines
986986 * j done
987987 */
988988
989+#ifdef CONFIG_FAST_SYSCALL_XTENSA
990+
989991 #define TRY \
990992 .section __ex_table, "a"; \
991993 .word 66f, 67f; \
@@ -1001,9 +1003,8 @@ ENTRY(fast_syscall_xtensa) · 9 unmodified lines
10011003 movi a7, 4 # sizeof(unsigned int)
10021004 access_ok a3, a7, a0, a2, .Leac # a0: scratch reg, a2: sp
10031005
1004− addi a6, a6, -1 # assuming SYS_XTENSA_ATOMIC_SET = 1
1005− _bgeui a6, SYS_XTENSA_COUNT - 1, .Lill
1006− _bnei a6, SYS_XTENSA_ATOMIC_CMP_SWP - 1, .Lnswp
1006+ _bgeui a6, SYS_XTENSA_COUNT, .Lill
1007+ _bnei a6, SYS_XTENSA_ATOMIC_CMP_SWP, .Lnswp
10071008
10081009 /* Fall through for ATOMIC_CMP_SWP. */
10091010
@@ -1015,27 +1016,26 @@ TRY s32i a5, a3, 0 # different, modify value · 5 unmodified lines
10151016 l32i a7, a2, PT_AREG7 # restore a7
10161017 l32i a0, a2, PT_AREG0 # restore a0
10171018 movi a2, 1 # and return 1
1018− addi a6, a6, 1 # restore a6 (really necessary?)
10191019 rfe
10201020
10211021 1: l32i a7, a2, PT_AREG7 # restore a7
10221022 l32i a0, a2, PT_AREG0 # restore a0
10231023 movi a2, 0 # return 0 (note that we cannot set
1024− addi a6, a6, 1 # restore a6 (really necessary?)
10251024 rfe
10261025
10271026 .Lnswp: /* Atomic set, add, and exg_add. */
10281027
10291028 TRY l32i a7, a3, 0 # orig
1029+ addi a6, a6, -SYS_XTENSA_ATOMIC_SET
10301030 add a0, a4, a7 # + arg
10311031 moveqz a0, a4, a6 # set
1032+ addi a6, a6, SYS_XTENSA_ATOMIC_SET
10321033 TRY s32i a0, a3, 0 # write new value
10331034
10341035 mov a0, a2
10351036 mov a2, a7
10361037 l32i a7, a0, PT_AREG7 # restore a7
10371038 l32i a0, a0, PT_AREG0 # restore a0
1038− addi a6, a6, 1 # restore a6 (really necessary?)
10391039 rfe
10401040
10411041 CATCH
@@ -1044,13 +1044,25 @@ CATCH · 2 unmodified lines
10441044 movi a2, -EFAULT
10451045 rfe
10461046
1047−.Lill: l32i a7, a2, PT_AREG0 # restore a7
1047+.Lill: l32i a7, a2, PT_AREG7 # restore a7
10481048 l32i a0, a2, PT_AREG0 # restore a0
10491049 movi a2, -EINVAL
10501050 rfe
10511051
10521052 ENDPROC(fast_syscall_xtensa)
10531053
1054+#else /* CONFIG_FAST_SYSCALL_XTENSA */
1055+
1056+ENTRY(fast_syscall_xtensa)
1057+
1058+ l32i a0, a2, PT_AREG0 # restore a0
1059+ movi a2, -ENOSYS
1060+ rfe
1061+
1062+ENDPROC(fast_syscall_xtensa)
1063+
1064+#endif /* CONFIG_FAST_SYSCALL_XTENSA */
1065+
10541066
10551067 /* fast_syscall_spill_registers.
10561068 *
@@ -1066,6 +1078,8 @@ ENDPROC(fast_syscall_xtensa) · 9 unmodified lines
10661078 * Note: We assume the stack pointer is EXC_TABLE_KSTK in the fixup handler.
10671079 */
10681080
1081+#ifdef CONFIG_FAST_SYSCALL_SPILL_REGISTERS
1082+
10691083 ENTRY(fast_syscall_spill_registers)
10701084
10711085 /* Register a FIXUP handler (pass current wb as a parameter) */
@@ -1400,6 +1414,18 @@ ENTRY(fast_syscall_spill_registers_fixup_return) · 328 unmodified lines
14001414
14011415 ENDPROC(fast_syscall_spill_registers_fixup_return)
14021416
1417+#else /* CONFIG_FAST_SYSCALL_SPILL_REGISTERS */
1418+
1419+ENTRY(fast_syscall_spill_registers)
1420+
1421+ l32i a0, a2, PT_AREG0 # restore a0
1422+ movi a2, -ENOSYS
1423+ rfe
1424+
1425+ENDPROC(fast_syscall_spill_registers)
1426+
1427+#endif /* CONFIG_FAST_SYSCALL_SPILL_REGISTERS */
1428+
14031429 #ifdef CONFIG_MMU
14041430 /*
14051431 * We should never get here. Bail out!
@@ -1565,7 +1591,7 @@ ENTRY(fast_second_level_miss) · 159 unmodified lines
15651591 rsr a0, excvaddr
15661592 bltu a0, a3, 2f
15671593
1568− addi a1, a0, -(2 << (DCACHE_ALIAS_ORDER + PAGE_SHIFT))
1594+ addi a1, a0, -TLBTEMP_SIZE
15691595 bgeu a1, a3, 2f
15701596
15711597 /* Check if we have to restore an ITLB mapping. */
@@ -1820,7 +1846,6 @@ ENTRY(_switch_to) · 248 unmodified lines
18201846
18211847 entry a1, 16
18221848
1823− mov a10, a2 # preserve 'prev' (a2)
18241849 mov a11, a3 # and 'next' (a3)
18251850
18261851 l32i a4, a2, TASK_THREAD_INFO
@@ -1828,8 +1853,14 @@ ENTRY(_switch_to) · 1 unmodified line
18281853
18291854 save_xtregs_user a4 a6 a8 a9 a12 a13 THREAD_XTREGS_USER
18301855
1831− s32i a0, a10, THREAD_RA # save return address
1832− s32i a1, a10, THREAD_SP # save stack pointer
1856+#if THREAD_RA > 1020 || THREAD_SP > 1020
1857+ addi a10, a2, TASK_THREAD
1858+ s32i a0, a10, THREAD_RA - TASK_THREAD # save return address
1859+ s32i a1, a10, THREAD_SP - TASK_THREAD # save stack pointer
1860+#else
1861+ s32i a0, a2, THREAD_RA # save return address
1862+ s32i a1, a2, THREAD_SP # save stack pointer
1863+#endif
18331864
18341865 /* Disable ints while we manipulate the stack pointer. */
18351866
@@ -1870,7 +1901,6 @@ ENTRY(_switch_to) · 34 unmodified lines
18701901 load_xtregs_user a5 a6 a8 a9 a12 a13 THREAD_XTREGS_USER
18711902
18721903 wsr a14, ps
1873− mov a2, a10 # return 'prev'
18741904 rsync
18751905
18761906 retw
arch/xtensa/kernel/pci-dma.c+6−6
@@ -49,9 +49,8 @@ dma_alloc_coherent(struct device *dev,size_t size,dma_addr_t *handle,gfp_t flag) · 48 unmodified lines
4949
5050 /* We currently don't support coherent memory outside KSEG */
5151
52− if (ret < XCHAL_KSEG_CACHED_VADDR
53− || ret >= XCHAL_KSEG_CACHED_VADDR + XCHAL_KSEG_SIZE)
54− BUG();
52+ BUG_ON(ret < XCHAL_KSEG_CACHED_VADDR ||
53+ ret > XCHAL_KSEG_CACHED_VADDR + XCHAL_KSEG_SIZE - 1);
5554
5655
5756 if (ret != 0) {
@@ -68,10 +67,11 @@ EXPORT_SYMBOL(dma_alloc_coherent); · 10 unmodified lines
6867 void dma_free_coherent(struct device *hwdev, size_t size,
6968 void *vaddr, dma_addr_t dma_handle)
7069 {
71− long addr=(long)vaddr+XCHAL_KSEG_CACHED_VADDR-XCHAL_KSEG_BYPASS_VADDR;
70+ unsigned long addr = (unsigned long)vaddr +
71+ XCHAL_KSEG_CACHED_VADDR - XCHAL_KSEG_BYPASS_VADDR;
7272
73− if (addr < 0 || addr >= XCHAL_KSEG_SIZE)
74− BUG();
73+ BUG_ON(addr < XCHAL_KSEG_CACHED_VADDR ||
74+ addr > XCHAL_KSEG_CACHED_VADDR + XCHAL_KSEG_SIZE - 1);
7575
7676 free_pages(addr, get_order(size));
7777 }
arch/xtensa/kernel/smp.c+1−0
@@ -571,6 +571,7 @@ void flush_icache_range(unsigned long start, unsigned long end) · 570 unmodified lines
571571 };
572572 on_each_cpu(ipi_flush_icache_range, &fd, 1);
573573 }
574+EXPORT_SYMBOL(flush_icache_range);
574575
575576 /* ------------------------------------------------------------------------- */
576577
arch/xtensa/kernel/traps.c+1−4
@@ -101,9 +101,8 @@ static dispatch_init_table_t __initdata dispatch_init_table[] = { · 100 unmodified lines
101101 #if XCHAL_UNALIGNED_LOAD_EXCEPTION || XCHAL_UNALIGNED_STORE_EXCEPTION
102102 #ifdef CONFIG_XTENSA_UNALIGNED_USER
103103 { EXCCAUSE_UNALIGNED, USER, fast_unaligned },
104−#else
105−{ EXCCAUSE_UNALIGNED, 0, do_unaligned_user },
106104 #endif
105+{ EXCCAUSE_UNALIGNED, 0, do_unaligned_user },
107106 { EXCCAUSE_UNALIGNED, KRNL, fast_unaligned },
108107 #endif
109108 #ifdef CONFIG_MMU
@@ -264,7 +263,6 @@ do_illegal_instruction(struct pt_regs *regs) · 154 unmodified lines
264263 */
265264
266265 #if XCHAL_UNALIGNED_LOAD_EXCEPTION || XCHAL_UNALIGNED_STORE_EXCEPTION
267−#ifndef CONFIG_XTENSA_UNALIGNED_USER
268266 void
269267 do_unaligned_user (struct pt_regs *regs)
270268 {
@@ -286,7 +284,6 @@ do_unaligned_user (struct pt_regs *regs) · 15 unmodified lines
286284
287285 }
288286 #endif
289−#endif
290287
291288 void
292289 do_debug(struct pt_regs *regs)
arch/xtensa/kernel/vectors.S+7−1
@@ -454,8 +454,14 @@ _DoubleExceptionVector_WindowOverflow: · 453 unmodified lines
454454 s32i a0, a2, PT_DEPC
455455
456456 _DoubleExceptionVector_handle_exception:
457+ addi a0, a0, -EXCCAUSE_UNALIGNED
458+ beqz a0, 2f
457459 addx4 a0, a0, a3
458− l32i a0, a0, EXC_TABLE_FAST_USER
460+ l32i a0, a0, EXC_TABLE_FAST_USER + 4 * EXCCAUSE_UNALIGNED
461+ xsr a3, excsave1
462+ jx a0
463+2:
464+ movi a0, user_exception
459465 xsr a3, excsave1
460466 jx a0
461467
arch/xtensa/kernel/vmlinux.lds.S+2−2
@@ -269,13 +269,13 @@ SECTIONS · 268 unmodified lines
269269 .UserExceptionVector.literal)
270270 SECTION_VECTOR (_DoubleExceptionVector_literal,
271271 .DoubleExceptionVector.literal,
272− DOUBLEEXC_VECTOR_VADDR - 40,
272+ DOUBLEEXC_VECTOR_VADDR - 48,
273273 SIZEOF(.UserExceptionVector.text),
274274 .UserExceptionVector.text)
275275 SECTION_VECTOR (_DoubleExceptionVector_text,
276276 .DoubleExceptionVector.text,
277277 DOUBLEEXC_VECTOR_VADDR,
278− 40,
278+ 48,
279279 .DoubleExceptionVector.literal)
280280
281281 . = (LOADADDR( .DoubleExceptionVector.text ) + SIZEOF( .DoubleExceptionVector.text ) + 3) & ~ 3;
arch/xtensa/mm/cache.c+68−9
@@ -59,9 +59,68 @@ · 58 unmodified lines
5959 *
6060 */
6161
62−#if (DCACHE_WAY_SIZE > PAGE_SIZE) && defined(CONFIG_HIGHMEM)
63−#error "HIGHMEM is not supported on cores with aliasing cache."
64−#endif
62+#if (DCACHE_WAY_SIZE > PAGE_SIZE)
63+static inline void kmap_invalidate_coherent(struct page *page,
64+ unsigned long vaddr)
65+{
66+ if (!DCACHE_ALIAS_EQ(page_to_phys(page), vaddr)) {
67+ unsigned long kvaddr;
68+
69+ if (!PageHighMem(page)) {
70+ kvaddr = (unsigned long)page_to_virt(page);
71+
72+ __invalidate_dcache_page(kvaddr);
73+ } else {
74+ kvaddr = TLBTEMP_BASE_1 +
75+ (page_to_phys(page) & DCACHE_ALIAS_MASK);
76+
77+ __invalidate_dcache_page_alias(kvaddr,
78+ page_to_phys(page));
79+ }
80+ }
81+}
82+
83+static inline void *coherent_kvaddr(struct page *page, unsigned long base,
84+ unsigned long vaddr, unsigned long *paddr)
85+{
86+ if (PageHighMem(page) || !DCACHE_ALIAS_EQ(page_to_phys(page), vaddr)) {
87+ *paddr = page_to_phys(page);
88+ return (void *)(base + (vaddr & DCACHE_ALIAS_MASK));
89+ } else {
90+ *paddr = 0;
91+ return page_to_virt(page);
92+ }
93+}
94+
95+void clear_user_highpage(struct page *page, unsigned long vaddr)
96+{
97+ unsigned long paddr;
98+ void *kvaddr = coherent_kvaddr(page, TLBTEMP_BASE_1, vaddr, &paddr);
99+
100+ pagefault_disable();
101+ kmap_invalidate_coherent(page, vaddr);
102+ set_bit(PG_arch_1, &page->flags);
103+ clear_page_alias(kvaddr, paddr);
104+ pagefault_enable();
105+}
106+
107+void copy_user_highpage(struct page *dst, struct page *src,
108+ unsigned long vaddr, struct vm_area_struct *vma)
109+{
110+ unsigned long dst_paddr, src_paddr;
111+ void *dst_vaddr = coherent_kvaddr(dst, TLBTEMP_BASE_1, vaddr,
112+ &dst_paddr);
113+ void *src_vaddr = coherent_kvaddr(src, TLBTEMP_BASE_2, vaddr,
114+ &src_paddr);
115+
116+ pagefault_disable();
117+ kmap_invalidate_coherent(dst, vaddr);
118+ set_bit(PG_arch_1, &dst->flags);
119+ copy_page_alias(dst_vaddr, src_vaddr, dst_paddr, src_paddr);
120+ pagefault_enable();
121+}
122+
123+#endif /* DCACHE_WAY_SIZE > PAGE_SIZE */
65124
66125 #if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
67126
@@ -103,7 +162,8 @@ void flush_dcache_page(struct page *page) · 35 unmodified lines
103162 if (!alias && !mapping)
104163 return;
105164
106− __flush_invalidate_dcache_page((long)page_address(page));
165+ virt = TLBTEMP_BASE_1 + (phys & DCACHE_ALIAS_MASK);
166+ __flush_invalidate_dcache_page_alias(virt, phys);
107167
108168 virt = TLBTEMP_BASE_1 + (temp & DCACHE_ALIAS_MASK);
109169
@@ -168,13 +228,12 @@ update_mmu_cache(struct vm_area_struct * vma, unsigned long addr, pte_t *ptep) · 58 unmodified lines
168228 #if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
169229
170230 if (!PageReserved(page) && test_bit(PG_arch_1, &page->flags)) {
171−
172− unsigned long paddr = (unsigned long) page_address(page);
173231 unsigned long phys = page_to_phys(page);
174− unsigned long tmp = TLBTEMP_BASE_1 + (addr & DCACHE_ALIAS_MASK);
175−
176− __flush_invalidate_dcache_page(paddr);
232+ unsigned long tmp;
177233
234+ tmp = TLBTEMP_BASE_1 + (phys & DCACHE_ALIAS_MASK);
235+ __flush_invalidate_dcache_page_alias(tmp, phys);
236+ tmp = TLBTEMP_BASE_1 + (addr & DCACHE_ALIAS_MASK);
178237 __flush_invalidate_dcache_page_alias(tmp, phys);
179238 __invalidate_icache_page_alias(tmp, phys);
180239
arch/xtensa/mm/highmem.c+31−10
@@ -14,23 +14,45 @@ · 13 unmodified lines
1414
1515 static pte_t *kmap_pte;
1616
17+#if DCACHE_WAY_SIZE > PAGE_SIZE
18+unsigned int last_pkmap_nr_arr[DCACHE_N_COLORS];
19+wait_queue_head_t pkmap_map_wait_arr[DCACHE_N_COLORS];
20+
21+static void __init kmap_waitqueues_init(void)
22+{
23+ unsigned int i;
24+
25+ for (i = 0; i < ARRAY_SIZE(pkmap_map_wait_arr); ++i)
26+ init_waitqueue_head(pkmap_map_wait_arr + i);
27+}
28+#else
29+static inline void kmap_waitqueues_init(void)
30+{
31+}
32+#endif
33+
34+static inline enum fixed_addresses kmap_idx(int type, unsigned long color)
35+{
36+ return (type + KM_TYPE_NR * smp_processor_id()) * DCACHE_N_COLORS +
37+ color;
38+}
39+
1740 void *kmap_atomic(struct page *page)
1841 {
1942 enum fixed_addresses idx;
2043 unsigned long vaddr;
21− int type;
2244
2345 pagefault_disable();
2446 if (!PageHighMem(page))
2547 return page_address(page);
2648
27− type = kmap_atomic_idx_push();
28− idx = type + KM_TYPE_NR * smp_processor_id();
49+ idx = kmap_idx(kmap_atomic_idx_push(),
50+ DCACHE_ALIAS(page_to_phys(page)));
2951 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
3052 #ifdef CONFIG_DEBUG_HIGHMEM
31− BUG_ON(!pte_none(*(kmap_pte - idx)));
53+ BUG_ON(!pte_none(*(kmap_pte + idx)));
3254 #endif
33− set_pte(kmap_pte - idx, mk_pte(page, PAGE_KERNEL_EXEC));
55+ set_pte(kmap_pte + idx, mk_pte(page, PAGE_KERNEL_EXEC));
3456
3557 return (void *)vaddr;
3658 }
@@ -38,12 +60,10 @@ EXPORT_SYMBOL(kmap_atomic); · 1 unmodified line
3860
3961 void __kunmap_atomic(void *kvaddr)
4062 {
41− int idx, type;
42−
4363 if (kvaddr >= (void *)FIXADDR_START &&
4464 kvaddr < (void *)FIXADDR_TOP) {
45− type = kmap_atomic_idx();
46− idx = type + KM_TYPE_NR * smp_processor_id();
65+ int idx = kmap_idx(kmap_atomic_idx(),
66+ DCACHE_ALIAS((unsigned long)kvaddr));
4767
4868 /*
4969 * Force other mappings to Oops if they'll try to access this
@@ -51,7 +71,7 @@ void __kunmap_atomic(void *kvaddr) · 1 unmodified line
5171 * is a bad idea also, in case the page changes cacheability
5272 * attributes or becomes a protected page in a hypervisor.
5373 */
54− pte_clear(&init_mm, kvaddr, kmap_pte - idx);
74+ pte_clear(&init_mm, kvaddr, kmap_pte + idx);
5575 local_flush_tlb_kernel_range((unsigned long)kvaddr,
5676 (unsigned long)kvaddr + PAGE_SIZE);
5777
@@ -69,4 +89,5 @@ void __init kmap_init(void) · 11 unmodified lines
6989 /* cache the first kmap pte */
7090 kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);
7191 kmap_pte = kmap_get_fixmap_pte(kmap_vstart);
92+ kmap_waitqueues_init();
7293 }
arch/xtensa/mm/misc.S+52−64
@@ -110,41 +110,24 @@ ENTRY(__tlbtemp_mapping_start) · 109 unmodified lines
110110 #if (DCACHE_WAY_SIZE > PAGE_SIZE)
111111
112112 /*
113− * clear_user_page (void *addr, unsigned long vaddr, struct page *page)
114− * a2 a3 a4
113+ * clear_page_alias(void *addr, unsigned long paddr)
114+ * a2 a3
115115 */
116116
117−ENTRY(clear_user_page)
117+ENTRY(clear_page_alias)
118118
119119 entry a1, 32
120120
121− /* Mark page dirty and determine alias. */
121+ /* Skip setting up a temporary DTLB if not aliased low page. */
122122
123− movi a7, (1 << PG_ARCH_1)
124− l32i a5, a4, PAGE_FLAGS
125− xor a6, a2, a3
126− extui a3, a3, PAGE_SHIFT, DCACHE_ALIAS_ORDER
127− extui a6, a6, PAGE_SHIFT, DCACHE_ALIAS_ORDER
128− or a5, a5, a7
129− slli a3, a3, PAGE_SHIFT
130− s32i a5, a4, PAGE_FLAGS
123+ movi a5, PAGE_OFFSET
124+ movi a6, 0
125+ beqz a3, 1f
131126
132− /* Skip setting up a temporary DTLB if not aliased. */
133−
134− beqz a6, 1f
135−
136− /* Invalidate kernel page. */
137−
138− mov a10, a2
139− call8 __invalidate_dcache_page
140−
141− /* Setup a temporary DTLB with the color of the VPN */
142−
143− movi a4, ((PAGE_KERNEL | _PAGE_HW_WRITE) - PAGE_OFFSET) & 0xffffffff
144− movi a5, TLBTEMP_BASE_1 # virt
145− add a6, a2, a4 # ppn
146− add a2, a5, a3 # add 'color'
127+ /* Setup a temporary DTLB for the addr. */
147128
129+ addi a6, a3, (PAGE_KERNEL | _PAGE_HW_WRITE)
130+ mov a4, a2
148131 wdtlb a6, a2
149132 dsync
150133
@@ -165,62 +148,43 @@ ENTRY(clear_user_page) · 14 unmodified lines
165148
166149 /* We need to invalidate the temporary idtlb entry, if any. */
167150
168−1: addi a2, a2, -PAGE_SIZE
169− idtlb a2
151+1: idtlb a4
170152 dsync
171153
172154 retw
173155
174−ENDPROC(clear_user_page)
156+ENDPROC(clear_page_alias)
175157
176158 /*
177− * copy_page_user (void *to, void *from, unsigned long vaddr, struct page *page)
178− * a2 a3 a4 a5
159+ * copy_page_alias(void *to, void *from,
160+ * a2 a3
161+ * unsigned long to_paddr, unsigned long from_paddr)
162+ * a4 a5
179163 */
180164
181−ENTRY(copy_user_page)
165+ENTRY(copy_page_alias)
182166
183167 entry a1, 32
184168
185− /* Mark page dirty and determine alias for destination. */
186−
187− movi a8, (1 << PG_ARCH_1)
188− l32i a9, a5, PAGE_FLAGS
189− xor a6, a2, a4
190− xor a7, a3, a4
191− extui a4, a4, PAGE_SHIFT, DCACHE_ALIAS_ORDER
192− extui a6, a6, PAGE_SHIFT, DCACHE_ALIAS_ORDER
193− extui a7, a7, PAGE_SHIFT, DCACHE_ALIAS_ORDER
194− or a9, a9, a8
195− slli a4, a4, PAGE_SHIFT
196− s32i a9, a5, PAGE_FLAGS
197− movi a5, ((PAGE_KERNEL | _PAGE_HW_WRITE) - PAGE_OFFSET) & 0xffffffff
198−
199− beqz a6, 1f
200−
201− /* Invalidate dcache */
202−
203− mov a10, a2
204− call8 __invalidate_dcache_page
169+ /* Skip setting up a temporary DTLB for destination if not aliased. */
205170
206− /* Setup a temporary DTLB with a matching color. */
171+ movi a6, 0
172+ movi a7, 0
173+ beqz a4, 1f
207174
208− movi a8, TLBTEMP_BASE_1 # base
209− add a6, a2, a5 # ppn
210− add a2, a8, a4 # add 'color'
175+ /* Setup a temporary DTLB for destination. */
211176
177+ addi a6, a4, (PAGE_KERNEL | _PAGE_HW_WRITE)
212178 wdtlb a6, a2
213179 dsync
214180
215− /* Skip setting up a temporary DTLB for destination if not aliased. */
181+ /* Skip setting up a temporary DTLB for source if not aliased. */
216182
217−1: beqz a7, 1f
183+1: beqz a5, 1f
218184
219− /* Setup a temporary DTLB with a matching color. */
185+ /* Setup a temporary DTLB for source. */
220186
221− movi a8, TLBTEMP_BASE_2 # base
222− add a7, a3, a5 # ppn
223− add a3, a8, a4
187+ addi a7, a5, PAGE_KERNEL
224188 addi a8, a3, 1 # way1
225189
226190 wdtlb a7, a8
@@ -271,7 +235,7 @@ ENTRY(copy_user_page) · 44 unmodified lines
271235
272236 retw
273237
274−ENDPROC(copy_user_page)
238+ENDPROC(copy_page_alias)
275239
276240 #endif
277241
@@ -300,6 +264,30 @@ ENTRY(__flush_invalidate_dcache_page_alias) · 22 unmodified lines
300264 retw
301265
302266 ENDPROC(__flush_invalidate_dcache_page_alias)
267+
268+/*
269+ * void __invalidate_dcache_page_alias (addr, phys)
270+ * a2 a3
271+ */
272+
273+ENTRY(__invalidate_dcache_page_alias)
274+
275+ entry sp, 16
276+
277+ movi a7, 0 # required for exception handler
278+ addi a6, a3, (PAGE_KERNEL | _PAGE_HW_WRITE)
279+ mov a4, a2
280+ wdtlb a6, a2
281+ dsync
282+
283+ ___invalidate_dcache_page a2 a3
284+
285+ idtlb a4
286+ dsync
287+
288+ retw
289+
290+ENDPROC(__invalidate_dcache_page_alias)
303291 #endif
304292
305293 ENTRY(__tlbtemp_mapping_itlb)
arch/xtensa/mm/mmu.c+22−16
@@ -18,32 +18,38 @@ · 17 unmodified lines
1818 #include <asm/io.h>
1919
2020 #if defined(CONFIG_HIGHMEM)
21−static void * __init init_pmd(unsigned long vaddr)
21+static void * __init init_pmd(unsigned long vaddr, unsigned long n_pages)
2222 {
2323 pgd_t *pgd = pgd_offset_k(vaddr);
2424 pmd_t *pmd = pmd_offset(pgd, vaddr);
25+ pte_t *pte;
26+ unsigned long i;
2527
26− if (pmd_none(*pmd)) {
27− unsigned i;
28− pte_t *pte = alloc_bootmem_low_pages(PAGE_SIZE);
28+ n_pages = ALIGN(n_pages, PTRS_PER_PTE);
2929
30− for (i = 0; i < 1024; i++)
31− pte_clear(NULL, 0, pte + i);
30+ pr_debug("%s: vaddr: 0x%08lx, n_pages: %ld\n",
31+ __func__, vaddr, n_pages);
3232
33− set_pmd(pmd, __pmd(((unsigned long)pte) & PAGE_MASK));
34− BUG_ON(pte != pte_offset_kernel(pmd, 0));
35− pr_debug("%s: vaddr: 0x%08lx, pmd: 0x%p, pte: 0x%p\n",
36− __func__, vaddr, pmd, pte);
37− return pte;
38− } else {
39− return pte_offset_kernel(pmd, 0);
33+ pte = alloc_bootmem_low_pages(n_pages * sizeof(pte_t));
34+
35+ for (i = 0; i < n_pages; ++i)
36+ pte_clear(NULL, 0, pte + i);
37+
38+ for (i = 0; i < n_pages; i += PTRS_PER_PTE, ++pmd) {
39+ pte_t *cur_pte = pte + i;
40+
41+ BUG_ON(!pmd_none(*pmd));
42+ set_pmd(pmd, __pmd(((unsigned long)cur_pte) & PAGE_MASK));
43+ BUG_ON(cur_pte != pte_offset_kernel(pmd, 0));
44+ pr_debug("%s: pmd: 0x%p, pte: 0x%p\n",
45+ __func__, pmd, cur_pte);
4046 }
47+ return pte;
4148 }
4249
4350 static void __init fixedrange_init(void)
4451 {
45− BUILD_BUG_ON(FIXADDR_SIZE > PMD_SIZE);
46− init_pmd(__fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK);
52+ init_pmd(__fix_to_virt(0), __end_of_fixed_addresses);
4753 }
4854 #endif
4955
@@ -52,7 +58,7 @@ void __init paging_init(void) · 2 unmodified lines
5258 memset(swapper_pg_dir, 0, PAGE_SIZE);
5359 #ifdef CONFIG_HIGHMEM
5460 fixedrange_init();
55− pkmap_page_table = init_pmd(PKMAP_BASE);
61+ pkmap_page_table = init_pmd(PKMAP_BASE, LAST_PKMAP);
5662 kmap_init();
5763 #endif
5864 }
block/bio-integrity.c+1−1
@@ -520,7 +520,7 @@ void bio_integrity_endio(struct bio *bio, int error) · 519 unmodified lines
520520 */
521521 if (error) {
522522 bio->bi_end_io = bip->bip_end_io;
523− bio_endio(bio, error);
523+ bio_endio_nodec(bio, error);
524524
525525 return;
526526 }
block/blk-core.c+0−1
@@ -1252,7 +1252,6 @@ void blk_rq_set_block_pc(struct request *rq) · 1251 unmodified lines
12521252 rq->__sector = (sector_t) -1;
12531253 rq->bio = rq->biotail = NULL;
12541254 memset(rq->__cmd, 0, sizeof(rq->__cmd));
1255− rq->cmd = rq->__cmd;
12561255 }
12571256 EXPORT_SYMBOL(blk_rq_set_block_pc);
12581257
block/blk-mq.c+22−14
@@ -112,18 +112,22 @@ static void blk_mq_usage_counter_release(struct percpu_ref *ref) · 111 unmodified lines
112112 */
113113 void blk_mq_freeze_queue(struct request_queue *q)
114114 {
115+ bool freeze;
116+
115117 spin_lock_irq(q->queue_lock);
116− q->mq_freeze_depth++;
118+ freeze = !q->mq_freeze_depth++;
117119 spin_unlock_irq(q->queue_lock);
118120
119− percpu_ref_kill(&q->mq_usage_counter);
120− blk_mq_run_queues(q, false);
121+ if (freeze) {
122+ percpu_ref_kill(&q->mq_usage_counter);
123+ blk_mq_run_queues(q, false);
124+ }
121125 wait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->mq_usage_counter));
122126 }
123127
124128 static void blk_mq_unfreeze_queue(struct request_queue *q)
125129 {
126− bool wake = false;
130+ bool wake;
127131
128132 spin_lock_irq(q->queue_lock);
129133 wake = !--q->mq_freeze_depth;
@@ -172,6 +176,8 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx, · 42 unmodified lines
172176 /* tag was already set */
173177 rq->errors = 0;
174178
179+ rq->cmd = rq->__cmd;
180+
175181 rq->extra_len = 0;
176182 rq->sense_len = 0;
177183 rq->resid_len = 0;
@@ -1068,13 +1074,17 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio) · 890 unmodified lines
10681074 blk_account_io_start(rq, 1);
10691075 }
10701076
1077+static inline bool hctx_allow_merges(struct blk_mq_hw_ctx *hctx)
1078+{
1079+ return (hctx->flags & BLK_MQ_F_SHOULD_MERGE) &&
1080+ !blk_queue_nomerges(hctx->queue);
1081+}
1082+
10711083 static inline bool blk_mq_merge_queue_io(struct blk_mq_hw_ctx *hctx,
10721084 struct blk_mq_ctx *ctx,
10731085 struct request *rq, struct bio *bio)
10741086 {
1075− struct request_queue *q = hctx->queue;
1076−
1077− if (!(hctx->flags & BLK_MQ_F_SHOULD_MERGE)) {
1087+ if (!hctx_allow_merges(hctx)) {
10781088 blk_mq_bio_to_request(rq, bio);
10791089 spin_lock(&ctx->lock);
10801090 insert_rq:
@@ -1082,6 +1092,8 @@ insert_rq: · 1 unmodified line
10821092 spin_unlock(&ctx->lock);
10831093 return false;
10841094 } else {
1095+ struct request_queue *q = hctx->queue;
1096+
10851097 spin_lock(&ctx->lock);
10861098 if (!blk_mq_attempt_merge(q, ctx, bio)) {
10871099 blk_mq_bio_to_request(rq, bio);
@@ -1574,7 +1586,7 @@ static int blk_mq_init_hw_queues(struct request_queue *q, · 486 unmodified lines
15741586 hctx->tags = set->tags[i];
15751587
15761588 /*
1577− * Allocate space for all possible cpus to avoid allocation in
1589+ * Allocate space for all possible cpus to avoid allocation at
15781590 * runtime
15791591 */
15801592 hctx->ctxs = kmalloc_node(nr_cpu_ids * sizeof(void *),
@@ -1662,8 +1674,8 @@ static void blk_mq_map_swqueue(struct request_queue *q) · 81 unmodified lines
16621674
16631675 queue_for_each_hw_ctx(q, hctx, i) {
16641676 /*
1665− * If not software queues are mapped to this hardware queue,
1666− * disable it and free the request entries
1677+ * If no software queues are mapped to this hardware queue,
1678+ * disable it and free the request entries.
16671679 */
16681680 if (!hctx->nr_ctx) {
16691681 struct blk_mq_tag_set *set = q->tag_set;
@@ -1713,14 +1725,10 @@ static void blk_mq_del_queue_tag_set(struct request_queue *q) · 43 unmodified lines
17131725 {
17141726 struct blk_mq_tag_set *set = q->tag_set;
17151727
1716− blk_mq_freeze_queue(q);
1717−
17181728 mutex_lock(&set->tag_list_lock);
17191729 list_del_init(&q->tag_set_list);
17201730 blk_mq_update_tag_set_depth(set);
17211731 mutex_unlock(&set->tag_list_lock);
1722−
1723− blk_mq_unfreeze_queue(q);
17241732 }
17251733
17261734 static void blk_mq_add_queue_tag_set(struct blk_mq_tag_set *set,
block/cfq-iosched.c+16−3
@@ -1272,15 +1272,22 @@ __cfq_group_service_tree_add(struct cfq_rb_root *st, struct cfq_group *cfqg) · 1271 unmodified lines
12721272 rb_insert_color(&cfqg->rb_node, &st->rb);
12731273 }
12741274
1275+/*
1276+ * This has to be called only on activation of cfqg
1277+ */
12751278 static void
12761279 cfq_update_group_weight(struct cfq_group *cfqg)
12771280 {
1278− BUG_ON(!RB_EMPTY_NODE(&cfqg->rb_node));
1279−
12801281 if (cfqg->new_weight) {
12811282 cfqg->weight = cfqg->new_weight;
12821283 cfqg->new_weight = 0;
12831284 }
1285+}
1286+
1287+static void
1288+cfq_update_group_leaf_weight(struct cfq_group *cfqg)
1289+{
1290+ BUG_ON(!RB_EMPTY_NODE(&cfqg->rb_node));
12841291
12851292 if (cfqg->new_leaf_weight) {
12861293 cfqg->leaf_weight = cfqg->new_leaf_weight;
@@ -1299,7 +1306,12 @@ cfq_group_service_tree_add(struct cfq_rb_root *st, struct cfq_group *cfqg) · 12 unmodified lines
12991306 /* add to the service tree */
13001307 BUG_ON(!RB_EMPTY_NODE(&cfqg->rb_node));
13011308
1302− cfq_update_group_weight(cfqg);
1309+ /*
1310+ * Update leaf_weight. We cannot update weight at this point
1311+ * because cfqg might already have been activated and is
1312+ * contributing its current weight to the parent's child_weight.
1313+ */
1314+ cfq_update_group_leaf_weight(cfqg);
13031315 __cfq_group_service_tree_add(st, cfqg);
13041316
13051317 /*
@@ -1323,6 +1335,7 @@ cfq_group_service_tree_add(struct cfq_rb_root *st, struct cfq_group *cfqg) · 17 unmodified lines
13231335 */
13241336 while ((parent = cfqg_parent(pos))) {
13251337 if (propagate) {
1338+ cfq_update_group_weight(pos);
13261339 propagate = !parent->nr_active++;
13271340 parent->children_weight += pos->weight;
13281341 }
block/scsi_ioctl.c+27−13
@@ -279,7 +279,6 @@ static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, · 278 unmodified lines
279279 r = blk_rq_unmap_user(bio);
280280 if (!ret)
281281 ret = r;
282− blk_put_request(rq);
283282
284283 return ret;
285284 }
@@ -297,8 +296,6 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, · 11 unmodified lines
297296
298297 if (hdr->interface_id != 'S')
299298 return -EINVAL;
300− if (hdr->cmd_len > BLK_MAX_CDB)
301− return -EINVAL;
302299
303300 if (hdr->dxfer_len > (queue_max_hw_sectors(q) << 9))
304301 return -EIO;
@@ -317,16 +314,23 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, · 12 unmodified lines
317314 if (hdr->flags & SG_FLAG_Q_AT_HEAD)
318315 at_head = 1;
319316
317+ ret = -ENOMEM;
320318 rq = blk_get_request(q, writing ? WRITE : READ, GFP_KERNEL);
321319 if (!rq)
322− return -ENOMEM;
320+ goto out;
323321 blk_rq_set_block_pc(rq);
324322
325− if (blk_fill_sghdr_rq(q, rq, hdr, mode)) {
326− blk_put_request(rq);
327− return -EFAULT;
323+ if (hdr->cmd_len > BLK_MAX_CDB) {
324+ rq->cmd = kzalloc(hdr->cmd_len, GFP_KERNEL);
325+ if (!rq->cmd)
326+ goto out_put_request;
328327 }
329328
329+ ret = -EFAULT;
330+ if (blk_fill_sghdr_rq(q, rq, hdr, mode))
331+ goto out_free_cdb;
332+
333+ ret = 0;
330334 if (hdr->iovec_count) {
331335 size_t iov_data_len;
332336 struct iovec *iov = NULL;
@@ -335,7 +339,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, · 2 unmodified lines
335339 0, NULL, &iov);
336340 if (ret < 0) {
337341 kfree(iov);
338− goto out;
342+ goto out_free_cdb;
339343 }
340344
341345 iov_data_len = ret;
@@ -358,7 +362,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, · 16 unmodified lines
358362 GFP_KERNEL);
359363
360364 if (ret)
361− goto out;
365+ goto out_free_cdb;
362366
363367 bio = rq->bio;
364368 memset(sense, 0, sizeof(sense));
@@ -376,9 +380,14 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, · 11 unmodified lines
376380
377381 hdr->duration = jiffies_to_msecs(jiffies - start_time);
378382
379− return blk_complete_sghdr_rq(rq, hdr, bio);
380−out:
383+ ret = blk_complete_sghdr_rq(rq, hdr, bio);
384+
385+out_free_cdb:
386+ if (rq->cmd != rq->__cmd)
387+ kfree(rq->cmd);
388+out_put_request:
381389 blk_put_request(rq);
390+out:
382391 return ret;
383392 }
384393
@@ -448,6 +457,11 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, · 63 unmodified lines
448457 }
449458
450459 rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_WAIT);
460+ if (!rq) {
461+ err = -ENOMEM;
462+ goto error;
463+ }
464+ blk_rq_set_block_pc(rq);
451465
452466 cmdlen = COMMAND_SIZE(opcode);
453467
@@ -501,7 +515,6 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, · 47 unmodified lines
501515 memset(sense, 0, sizeof(sense));
502516 rq->sense = sense;
503517 rq->sense_len = 0;
504− blk_rq_set_block_pc(rq);
505518
506519 blk_execute_rq(q, disk, rq, 0);
507520
@@ -521,7 +534,8 @@ out: · 13 unmodified lines
521534
522535 error:
523536 kfree(buffer);
524− blk_put_request(rq);
537+ if (rq)
538+ blk_put_request(rq);
525539 return err;
526540 }
527541 EXPORT_SYMBOL_GPL(sg_scsi_ioctl);
crypto/asymmetric_keys/public_key.c+1−0
@@ -121,6 +121,7 @@ static int public_key_verify_signature_2(const struct key *key, · 120 unmodified lines
121121 struct asymmetric_key_subtype public_key_subtype = {
122122 .owner = THIS_MODULE,
123123 .name = "public_key",
124+ .name_len = sizeof("public_key") - 1,
124125 .describe = public_key_describe,
125126 .destroy = public_key_destroy,
126127 .verify_signature = public_key_verify_signature_2,
crypto/asymmetric_keys/verify_pefile.c+33−16
@@ -128,6 +128,7 @@ static int pefile_strip_sig_wrapper(const void *pebuf, · 127 unmodified lines
128128 {
129129 struct win_certificate wrapper;
130130 const u8 *pkcs7;
131+ unsigned len;
131132
132133 if (ctx->sig_len < sizeof(wrapper)) {
133134 pr_debug("Signature wrapper too short\n");
@@ -154,33 +155,49 @@ static int pefile_strip_sig_wrapper(const void *pebuf, · 20 unmodified lines
154155 return -ENOTSUPP;
155156 }
156157
157− /* Looks like actual pkcs signature length is in wrapper->length.
158− * size obtained from data dir entries lists the total size of
159− * certificate table which is also aligned to octawrod boundary.
160− *
161− * So set signature length field appropriately.
158+ /* It looks like the pkcs signature length in wrapper->length and the
159+ * size obtained from the data dir entries, which lists the total size
160+ * of certificate table, are both aligned to an octaword boundary, so
161+ * we may have to deal with some padding.
162162 */
163163 ctx->sig_len = wrapper.length;
164164 ctx->sig_offset += sizeof(wrapper);
165165 ctx->sig_len -= sizeof(wrapper);
166− if (ctx->sig_len == 0) {
166+ if (ctx->sig_len < 4) {
167167 pr_debug("Signature data missing\n");
168168 return -EKEYREJECTED;
169169 }
170170
171− /* What's left should a PKCS#7 cert */
171+ /* What's left should be a PKCS#7 cert */
172172 pkcs7 = pebuf + ctx->sig_offset;
173− if (pkcs7[0] == (ASN1_CONS_BIT | ASN1_SEQ)) {
174− if (pkcs7[1] == 0x82 &&
175− pkcs7[2] == (((ctx->sig_len - 4) >> 8) & 0xff) &&
176− pkcs7[3] == ((ctx->sig_len - 4) & 0xff))
177− return 0;
178− if (pkcs7[1] == 0x80)
179− return 0;
180− if (pkcs7[1] > 0x82)
181− return -EMSGSIZE;
173+ if (pkcs7[0] != (ASN1_CONS_BIT | ASN1_SEQ))
174+ goto not_pkcs7;
175+
176+ switch (pkcs7[1]) {
177+ case 0 ... 0x7f:
178+ len = pkcs7[1] + 2;
179+ goto check_len;
180+ case ASN1_INDEFINITE_LENGTH:
181+ return 0;
182+ case 0x81:
183+ len = pkcs7[2] + 3;
184+ goto check_len;
185+ case 0x82:
186+ len = ((pkcs7[2] << 8) | pkcs7[3]) + 4;
187+ goto check_len;
188+ case 0x83 ... 0xff:
189+ return -EMSGSIZE;
190+ default:
191+ goto not_pkcs7;
182192 }
183193
194+check_len:
195+ if (len <= ctx->sig_len) {
196+ /* There may be padding */
197+ ctx->sig_len = len;
198+ return 0;
199+ }
200+not_pkcs7:
184201 pr_debug("Signature data not PKCS#7\n");
185202 return -ELIBBAD;
186203 }
drivers/acpi/acpi_lpss.c+17−0
@@ -196,6 +196,17 @@ static struct lpss_device_desc byt_i2c_dev_desc = { · 195 unmodified lines
196196 .setup = lpss_i2c_setup,
197197 };
198198
199+static struct lpss_shared_clock bsw_pwm_clock = {
200+ .name = "pwm_clk",
201+ .rate = 19200000,
202+};
203+
204+static struct lpss_device_desc bsw_pwm_dev_desc = {
205+ .clk_required = true,
206+ .save_ctx = true,
207+ .shared_clock = &bsw_pwm_clock,
208+};
209+
199210 #else
200211
201212 #define LPSS_ADDR(desc) (0UL)
@@ -225,6 +236,12 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = { · 23 unmodified lines
225236 { "INT33B2", },
226237 { "INT33FC", },
227238
239+ /* Braswell LPSS devices */
240+ { "80862288", LPSS_ADDR(bsw_pwm_dev_desc) },
241+ { "8086228A", LPSS_ADDR(byt_uart_dev_desc) },
242+ { "8086228E", LPSS_ADDR(byt_spi_dev_desc) },
243+ { "808622C1", LPSS_ADDR(byt_i2c_dev_desc) },
244+
228245 { "INT3430", LPSS_ADDR(lpt_dev_desc) },
229246 { "INT3431", LPSS_ADDR(lpt_dev_desc) },
230247 { "INT3432", LPSS_ADDR(lpt_i2c_dev_desc) },
drivers/acpi/acpica/nsprepkg.c+39−0
@@ -316,6 +316,45 @@ acpi_ns_check_package(struct acpi_evaluate_info *info, · 315 unmodified lines
316316 acpi_ns_check_package_list(info, package, elements, count);
317317 break;
318318
319+ case ACPI_PTYPE2_UUID_PAIR:
320+
321+ /* The package must contain pairs of (UUID + type) */
322+
323+ if (count & 1) {
324+ expected_count = count + 1;
325+ goto package_too_small;
326+ }
327+
328+ while (count > 0) {
329+ status = acpi_ns_check_object_type(info, elements,
330+ package->ret_info.
331+ object_type1, 0);
332+ if (ACPI_FAILURE(status)) {
333+ return (status);
334+ }
335+
336+ /* Validate length of the UUID buffer */
337+
338+ if ((*elements)->buffer.length != 16) {
339+ ACPI_WARN_PREDEFINED((AE_INFO,
340+ info->full_pathname,
341+ info->node_flags,
342+ "Invalid length for UUID Buffer"));
343+ return (AE_AML_OPERAND_VALUE);
344+ }
345+
346+ status = acpi_ns_check_object_type(info, elements + 1,
347+ package->ret_info.
348+ object_type2, 0);
349+ if (ACPI_FAILURE(status)) {
350+ return (status);
351+ }
352+
353+ elements += 2;
354+ count -= 2;
355+ }
356+ break;
357+
319358 default:
320359
321360 /* Should not get here if predefined info table is correct */
drivers/acpi/ec.c+22−3
@@ -197,6 +197,8 @@ static bool advance_transaction(struct acpi_ec *ec) · 196 unmodified lines
197197 t->rdata[t->ri++] = acpi_ec_read_data(ec);
198198 if (t->rlen == t->ri) {
199199 t->flags |= ACPI_EC_COMMAND_COMPLETE;
200+ if (t->command == ACPI_EC_COMMAND_QUERY)
201+ pr_debug("hardware QR_EC completion\n");
200202 wakeup = true;
201203 }
202204 } else
@@ -208,7 +210,20 @@ static bool advance_transaction(struct acpi_ec *ec) · 5 unmodified lines
208210 }
209211 return wakeup;
210212 } else {
211− if ((status & ACPI_EC_FLAG_IBF) == 0) {
213+ /*
214+ * There is firmware refusing to respond QR_EC when SCI_EVT
215+ * is not set, for which case, we complete the QR_EC
216+ * without issuing it to the firmware.
217+ * https://bugzilla.kernel.org/show_bug.cgi?id=86211
218+ */
219+ if (!(status & ACPI_EC_FLAG_SCI) &&
220+ (t->command == ACPI_EC_COMMAND_QUERY)) {
221+ t->flags |= ACPI_EC_COMMAND_POLL;
222+ t->rdata[t->ri++] = 0x00;
223+ t->flags |= ACPI_EC_COMMAND_COMPLETE;
224+ pr_debug("software QR_EC completion\n");
225+ wakeup = true;
226+ } else if ((status & ACPI_EC_FLAG_IBF) == 0) {
212227 acpi_ec_write_cmd(ec, t->command);
213228 t->flags |= ACPI_EC_COMMAND_POLL;
214229 } else
@@ -288,11 +303,11 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, · 73 unmodified lines
288303 /* following two actions should be kept atomic */
289304 ec->curr = t;
290305 start_transaction(ec);
291− if (ec->curr->command == ACPI_EC_COMMAND_QUERY)
292− clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
293306 spin_unlock_irqrestore(&ec->lock, tmp);
294307 ret = ec_poll(ec);
295308 spin_lock_irqsave(&ec->lock, tmp);
309+ if (ec->curr->command == ACPI_EC_COMMAND_QUERY)
310+ clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
296311 ec->curr = NULL;
297312 spin_unlock_irqrestore(&ec->lock, tmp);
298313 return ret;
@@ -1015,6 +1030,10 @@ static struct dmi_system_id ec_dmi_table[] __initdata = { · 716 unmodified lines
10151030 DMI_MATCH(DMI_SYS_VENDOR, "Quanta"),
10161031 DMI_MATCH(DMI_PRODUCT_NAME, "TW9/SW9"),}, NULL},
10171032 {
1033+ ec_flag_msi, "Clevo W350etq", {
1034+ DMI_MATCH(DMI_SYS_VENDOR, "CLEVO CO."),
1035+ DMI_MATCH(DMI_PRODUCT_NAME, "W35_37ET"),}, NULL},
1036+ {
10181037 ec_validate_ecdt, "ASUS hardware", {
10191038 DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL},
10201039 {
drivers/acpi/pci_irq.c+4−0
@@ -484,6 +484,10 @@ void acpi_pci_irq_disable(struct pci_dev *dev) · 483 unmodified lines
484484 /* Keep IOAPIC pin configuration when suspending */
485485 if (dev->dev.power.is_prepared)
486486 return;
487+#ifdef CONFIG_PM_RUNTIME
488+ if (dev->dev.power.runtime_status == RPM_SUSPENDING)
489+ return;
490+#endif
487491
488492 entry = acpi_pci_irq_lookup(dev, pin);
489493 if (!entry)
drivers/acpi/processor_idle.c+2−2
@@ -1071,9 +1071,9 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) · 1070 unmodified lines
10711071
10721072 if (pr->id == 0 && cpuidle_get_driver() == &acpi_idle_driver) {
10731073
1074− cpuidle_pause_and_lock();
10751074 /* Protect against cpu-hotplug */
10761075 get_online_cpus();
1076+ cpuidle_pause_and_lock();
10771077
10781078 /* Disable all cpuidle devices */
10791079 for_each_online_cpu(cpu) {
@@ -1100,8 +1100,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) · 20 unmodified lines
11001100 cpuidle_enable_device(dev);
11011101 }
11021102 }
1103− put_online_cpus();
11041103 cpuidle_resume_and_unlock();
1104+ put_online_cpus();
11051105 }
11061106
11071107 return 0;
drivers/acpi/scan.c+19−13
@@ -667,8 +667,14 @@ static ssize_t · 666 unmodified lines
667667 acpi_device_sun_show(struct device *dev, struct device_attribute *attr,
668668 char *buf) {
669669 struct acpi_device *acpi_dev = to_acpi_device(dev);
670+ acpi_status status;
671+ unsigned long long sun;
672+
673+ status = acpi_evaluate_integer(acpi_dev->handle, "_SUN", NULL, &sun);
674+ if (ACPI_FAILURE(status))
675+ return -ENODEV;
670676
671− return sprintf(buf, "%lu\n", acpi_dev->pnp.sun);
677+ return sprintf(buf, "%llu\n", sun);
672678 }
673679 static DEVICE_ATTR(sun, 0444, acpi_device_sun_show, NULL);
674680
@@ -690,7 +696,6 @@ static int acpi_device_setup_files(struct acpi_device *dev) · 15 unmodified lines
690696 {
691697 struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
692698 acpi_status status;
693− unsigned long long sun;
694699 int result = 0;
695700
696701 /*
@@ -731,14 +736,10 @@ static int acpi_device_setup_files(struct acpi_device *dev) · 34 unmodified lines
731736 if (dev->pnp.unique_id)
732737 result = device_create_file(&dev->dev, &dev_attr_uid);
733738
734− status = acpi_evaluate_integer(dev->handle, "_SUN", NULL, &sun);
735− if (ACPI_SUCCESS(status)) {
736− dev->pnp.sun = (unsigned long)sun;
739+ if (acpi_has_method(dev->handle, "_SUN")) {
737740 result = device_create_file(&dev->dev, &dev_attr_sun);
738741 if (result)
739742 goto end;
740− } else {
741− dev->pnp.sun = (unsigned long)-1;
742743 }
743744
744745 if (acpi_has_method(dev->handle, "_STA")) {
@@ -922,12 +923,17 @@ static void acpi_device_notify(acpi_handle handle, u32 event, void *data) · 177 unmodified lines
922923 device->driver->ops.notify(device, event);
923924 }
924925
925−static acpi_status acpi_device_notify_fixed(void *data)
926+static void acpi_device_notify_fixed(void *data)
926927 {
927928 struct acpi_device *device = data;
928929
929930 /* Fixed hardware devices have no handles */
930931 acpi_device_notify(NULL, ACPI_FIXED_HARDWARE_EVENT, device);
932+}
933+
934+static acpi_status acpi_device_fixed_event(void *data)
935+{
936+ acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_device_notify_fixed, data);
931937 return AE_OK;
932938 }
933939
@@ -938,12 +944,12 @@ static int acpi_device_install_notify_handler(struct acpi_device *device) · 4 unmodified lines
938944 if (device->device_type == ACPI_BUS_TYPE_POWER_BUTTON)
939945 status =
940946 acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
941− acpi_device_notify_fixed,
947+ acpi_device_fixed_event,
942948 device);
943949 else if (device->device_type == ACPI_BUS_TYPE_SLEEP_BUTTON)
944950 status =
945951 acpi_install_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
946− acpi_device_notify_fixed,
952+ acpi_device_fixed_event,
947953 device);
948954 else
949955 status = acpi_install_notify_handler(device->handle,
@@ -960,10 +966,10 @@ static void acpi_device_remove_notify_handler(struct acpi_device *device) · 10 unmodified lines
960966 {
961967 if (device->device_type == ACPI_BUS_TYPE_POWER_BUTTON)
962968 acpi_remove_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
963− acpi_device_notify_fixed);
969+ acpi_device_fixed_event);
964970 else if (device->device_type == ACPI_BUS_TYPE_SLEEP_BUTTON)
965971 acpi_remove_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
966− acpi_device_notify_fixed);
972+ acpi_device_fixed_event);
967973 else
968974 acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
969975 acpi_device_notify);
@@ -975,7 +981,7 @@ static int acpi_device_probe(struct device *dev) · 5 unmodified lines
975981 struct acpi_driver *acpi_drv = to_acpi_driver(dev->driver);
976982 int ret;
977983
978− if (acpi_dev->handler)
984+ if (acpi_dev->handler && !acpi_is_pnp_device(acpi_dev))
979985 return -EINVAL;
980986
981987 if (!acpi_drv->ops.add)
drivers/acpi/video.c+43−2
@@ -82,9 +82,9 @@ module_param(allow_duplicates, bool, 0644); · 81 unmodified lines
8282 * For Windows 8 systems: used to decide if video module
8383 * should skip registering backlight interface of its own.
8484 */
85−static int use_native_backlight_param = 1;
85+static int use_native_backlight_param = -1;
8686 module_param_named(use_native_backlight, use_native_backlight_param, int, 0444);
87−static bool use_native_backlight_dmi = false;
87+static bool use_native_backlight_dmi = true;
8888
8989 static int register_count;
9090 static struct mutex video_list_lock;
@@ -417,6 +417,12 @@ static int __init video_set_use_native_backlight(const struct dmi_system_id *d) · 326 unmodified lines
417417 return 0;
418418 }
419419
420+static int __init video_disable_native_backlight(const struct dmi_system_id *d)
421+{
422+ use_native_backlight_dmi = false;
423+ return 0;
424+}
425+
420426 static struct dmi_system_id video_dmi_table[] __initdata = {
421427 /*
422428 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
@@ -720,6 +726,41 @@ static struct dmi_system_id video_dmi_table[] __initdata = { · 297 unmodified lines
720726 DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook 8780w"),
721727 },
722728 },
729+
730+ /*
731+ * These models have a working acpi_video backlight control, and using
732+ * native backlight causes a regression where backlight does not work
733+ * when userspace is not handling brightness key events. Disable
734+ * native_backlight on these to fix this:
735+ * https://bugzilla.kernel.org/show_bug.cgi?id=81691
736+ */
737+ {
738+ .callback = video_disable_native_backlight,
739+ .ident = "ThinkPad T420",
740+ .matches = {
741+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
742+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T420"),
743+ },
744+ },
745+ {
746+ .callback = video_disable_native_backlight,
747+ .ident = "ThinkPad T520",
748+ .matches = {
749+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
750+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T520"),
751+ },
752+ },
753+
754+ /* The native backlight controls do not work on some older machines */
755+ {
756+ /* https://bugs.freedesktop.org/show_bug.cgi?id=81515 */
757+ .callback = video_disable_native_backlight,
758+ .ident = "HP ENVY 15 Notebook",
759+ .matches = {
760+ DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
761+ DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY 15 Notebook PC"),
762+ },
763+ },
723764 {}
724765 };
725766
drivers/ata/ahci.c+22−0
@@ -305,6 +305,14 @@ static const struct pci_device_id ahci_pci_tbl[] = { · 304 unmodified lines
305305 { PCI_VDEVICE(INTEL, 0x9c85), board_ahci }, /* Wildcat Point-LP RAID */
306306 { PCI_VDEVICE(INTEL, 0x9c87), board_ahci }, /* Wildcat Point-LP RAID */
307307 { PCI_VDEVICE(INTEL, 0x9c8f), board_ahci }, /* Wildcat Point-LP RAID */
308+ { PCI_VDEVICE(INTEL, 0x8c82), board_ahci }, /* 9 Series AHCI */
309+ { PCI_VDEVICE(INTEL, 0x8c83), board_ahci }, /* 9 Series AHCI */
310+ { PCI_VDEVICE(INTEL, 0x8c84), board_ahci }, /* 9 Series RAID */
311+ { PCI_VDEVICE(INTEL, 0x8c85), board_ahci }, /* 9 Series RAID */
312+ { PCI_VDEVICE(INTEL, 0x8c86), board_ahci }, /* 9 Series RAID */
313+ { PCI_VDEVICE(INTEL, 0x8c87), board_ahci }, /* 9 Series RAID */
314+ { PCI_VDEVICE(INTEL, 0x8c8e), board_ahci }, /* 9 Series RAID */
315+ { PCI_VDEVICE(INTEL, 0x8c8f), board_ahci }, /* 9 Series RAID */
308316
309317 /* JMicron 360/1/3/5/6, match class to avoid IDE function */
310318 { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -442,6 +450,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { · 131 unmodified lines
442450 { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a),
443451 .driver_data = board_ahci_yes_fbs }, /* 88se9172 */
444452 { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9172),
453+ .driver_data = board_ahci_yes_fbs }, /* 88se9182 */
454+ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9182),
445455 .driver_data = board_ahci_yes_fbs }, /* 88se9172 */
446456 { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192),
447457 .driver_data = board_ahci_yes_fbs }, /* 88se9172 on some Gigabyte */
@@ -1329,6 +1339,18 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) · 881 unmodified lines
13291339 else if (pdev->vendor == 0x1c44 && pdev->device == 0x8000)
13301340 ahci_pci_bar = AHCI_PCI_BAR_ENMOTUS;
13311341
1342+ /*
1343+ * The JMicron chip 361/363 contains one SATA controller and one
1344+ * PATA controller,for powering on these both controllers, we must
1345+ * follow the sequence one by one, otherwise one of them can not be
1346+ * powered on successfully, so here we disable the async suspend
1347+ * method for these chips.
1348+ */
1349+ if (pdev->vendor == PCI_VENDOR_ID_JMICRON &&
1350+ (pdev->device == PCI_DEVICE_ID_JMICRON_JMB363 ||
1351+ pdev->device == PCI_DEVICE_ID_JMICRON_JMB361))
1352+ device_disable_async_suspend(&pdev->dev);
1353+
13321354 /* acquire resources */
13331355 rc = pcim_enable_device(pdev);
13341356 if (rc)
drivers/ata/ahci_tegra.c+10−4
@@ -18,14 +18,17 @@ · 17 unmodified lines
1818 */
1919
2020 #include <linux/ahci_platform.h>
21−#include <linux/reset.h>
2221 #include <linux/errno.h>
2322 #include <linux/kernel.h>
2423 #include <linux/module.h>
2524 #include <linux/of_device.h>
2625 #include <linux/platform_device.h>
2726 #include <linux/regulator/consumer.h>
27+#include <linux/reset.h>
28+
29+#include <soc/tegra/fuse.h>
2830 #include <soc/tegra/pmc.h>
31+
2932 #include "ahci.h"
3033
3134 #define SATA_CONFIGURATION_0 0x180
@@ -180,9 +183,12 @@ static int tegra_ahci_controller_init(struct ahci_host_priv *hpriv) · 148 unmodified lines
180183
181184 /* Pad calibration */
182185
183− /* FIXME Always use calibration 0. Change this to read the calibration
184− * fuse once the fuse driver has landed. */
185− val = 0;
186+ ret = tegra_fuse_readl(FUSE_SATA_CALIB, &val);
187+ if (ret) {
188+ dev_err(&tegra->pdev->dev,
189+ "failed to read calibration fuse: %d\n", ret);
190+ return ret;
191+ }
186192
187193 calib = tegra124_pad_calibration[val & FUSE_SATA_CALIB_MASK];
188194
drivers/ata/ahci_xgene.c+47−14
@@ -78,6 +78,9 @@ · 77 unmodified lines
7878 #define CFG_MEM_RAM_SHUTDOWN 0x00000070
7979 #define BLOCK_MEM_RDY 0x00000074
8080
81+/* Max retry for link down */
82+#define MAX_LINK_DOWN_RETRY 3
83+
8184 struct xgene_ahci_context {
8285 struct ahci_host_priv *hpriv;
8386 struct device *dev;
@@ -145,6 +148,14 @@ static unsigned int xgene_ahci_qc_issue(struct ata_queued_cmd *qc) · 61 unmodified lines
145148 return rc;
146149 }
147150
151+static bool xgene_ahci_is_memram_inited(struct xgene_ahci_context *ctx)
152+{
153+ void __iomem *diagcsr = ctx->csr_diag;
154+
155+ return (readl(diagcsr + CFG_MEM_RAM_SHUTDOWN) == 0 &&
156+ readl(diagcsr + BLOCK_MEM_RDY) == 0xFFFFFFFF);
157+}
158+
148159 /**
149160 * xgene_ahci_read_id - Read ID data from the specified device
150161 * @dev: device
@@ -229,8 +240,11 @@ static void xgene_ahci_set_phy_cfg(struct xgene_ahci_context *ctx, int channel) · 78 unmodified lines
229240 * and Gen1 (1.5Gbps). Otherwise during long IO stress test, the PHY will
230241 * report disparity error and etc. In addition, during COMRESET, there can
231242 * be error reported in the register PORT_SCR_ERR. For SERR_DISPARITY and
232− * SERR_10B_8B_ERR, the PHY receiver line must be reseted. The following
233− * algorithm is followed to proper configure the hardware PHY during COMRESET:
243+ * SERR_10B_8B_ERR, the PHY receiver line must be reseted. Also during long
244+ * reboot cycle regression, sometimes the PHY reports link down even if the
245+ * device is present because of speed negotiation failure. so need to retry
246+ * the COMRESET to get the link up. The following algorithm is followed to
247+ * proper configure the hardware PHY during COMRESET:
234248 *
235249 * Alg Part 1:
236250 * 1. Start the PHY at Gen3 speed (default setting)
@@ -246,9 +260,15 @@ static void xgene_ahci_set_phy_cfg(struct xgene_ahci_context *ctx, int channel) · 9 unmodified lines
246260 * Alg Part 2:
247261 * 1. On link up, if there are any SERR_DISPARITY and SERR_10B_8B_ERR error
248262 * reported in the register PORT_SCR_ERR, then reset the PHY receiver line
249− * 2. Go to Alg Part 3
263+ * 2. Go to Alg Part 4
250264 *
251265 * Alg Part 3:
266+ * 1. Check the PORT_SCR_STAT to see whether device presence detected but PHY
267+ * communication establishment failed and maximum link down attempts are
268+ * less than Max attempts 3 then goto Alg Part 1.
269+ * 2. Go to Alg Part 4.
270+ *
271+ * Alg Part 4:
252272 * 1. Clear any pending from register PORT_SCR_ERR.
253273 *
254274 * NOTE: For the initial version, we will NOT support Gen1/Gen2. In addition
@@ -267,19 +287,27 @@ static int xgene_ahci_do_hardreset(struct ata_link *link, · 12 unmodified lines
267287 u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;
268288 void __iomem *port_mmio = ahci_port_base(ap);
269289 struct ata_taskfile tf;
290+ int link_down_retry = 0;
270291 int rc;
271− u32 val;
272−
273− /* clear D2H reception area to properly wait for D2H FIS */
274− ata_tf_init(link->device, &tf);
275− tf.command = ATA_BUSY;
276− ata_tf_to_fis(&tf, 0, 0, d2h_fis);
277− rc = sata_link_hardreset(link, timing, deadline, online,
292+ u32 val, sstatus;
293+
294+ do {
295+ /* clear D2H reception area to properly wait for D2H FIS */
296+ ata_tf_init(link->device, &tf);
297+ tf.command = ATA_BUSY;
298+ ata_tf_to_fis(&tf, 0, 0, d2h_fis);
299+ rc = sata_link_hardreset(link, timing, deadline, online,
278300 ahci_check_ready);
301+ if (*online) {
302+ val = readl(port_mmio + PORT_SCR_ERR);
303+ if (val & (SERR_DISPARITY | SERR_10B_8B_ERR))
304+ dev_warn(ctx->dev, "link has error\n");
305+ break;
306+ }
279307
280− val = readl(port_mmio + PORT_SCR_ERR);
281− if (val & (SERR_DISPARITY | SERR_10B_8B_ERR))
282− dev_warn(ctx->dev, "link has error\n");
308+ sata_scr_read(link, SCR_STATUS, &sstatus);
309+ } while (link_down_retry++ < MAX_LINK_DOWN_RETRY &&
310+ (sstatus & 0xff) == 0x1);
283311
284312 /* clear all errors if any pending */
285313 val = readl(port_mmio + PORT_SCR_ERR);
@@ -467,6 +495,11 @@ static int xgene_ahci_probe(struct platform_device *pdev) · 181 unmodified lines
467495 return -ENODEV;
468496 }
469497
498+ if (xgene_ahci_is_memram_inited(ctx)) {
499+ dev_info(dev, "skip clock and PHY initialization\n");
500+ goto skip_clk_phy;
501+ }
502+
470503 /* Due to errata, HW requires full toggle transition */
471504 rc = ahci_platform_enable_clks(hpriv);
472505 if (rc)
@@ -479,7 +512,7 @@ static int xgene_ahci_probe(struct platform_device *pdev) · 6 unmodified lines
479512
480513 /* Configure the host controller */
481514 xgene_ahci_hw_init(hpriv);
482−
515+skip_clk_phy:
483516 hpriv->flags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ;
484517
485518 rc = ahci_platform_init_host(pdev, hpriv, &xgene_ahci_port_info);
drivers/ata/ata_piix.c+8−0
@@ -340,6 +340,14 @@ static const struct pci_device_id piix_pci_tbl[] = { · 339 unmodified lines
340340 { 0x8086, 0x0F21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt },
341341 /* SATA Controller IDE (Coleto Creek) */
342342 { 0x8086, 0x23a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
343+ /* SATA Controller IDE (9 Series) */
344+ { 0x8086, 0x8c88, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_snb },
345+ /* SATA Controller IDE (9 Series) */
346+ { 0x8086, 0x8c89, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_snb },
347+ /* SATA Controller IDE (9 Series) */
348+ { 0x8086, 0x8c80, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
349+ /* SATA Controller IDE (9 Series) */
350+ { 0x8086, 0x8c81, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
343351
344352 { } /* terminate list */
345353 };
drivers/ata/pata_jmicron.c+12−0
@@ -143,6 +143,18 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i · 142 unmodified lines
143143 };
144144 const struct ata_port_info *ppi[] = { &info, NULL };
145145
146+ /*
147+ * The JMicron chip 361/363 contains one SATA controller and one
148+ * PATA controller,for powering on these both controllers, we must
149+ * follow the sequence one by one, otherwise one of them can not be
150+ * powered on successfully, so here we disable the async suspend
151+ * method for these chips.
152+ */
153+ if (pdev->vendor == PCI_VENDOR_ID_JMICRON &&
154+ (pdev->device == PCI_DEVICE_ID_JMICRON_JMB363 ||
155+ pdev->device == PCI_DEVICE_ID_JMICRON_JMB361))
156+ device_disable_async_suspend(&pdev->dev);
157+
146158 return ata_pci_bmdma_init_one(pdev, ppi, &jmicron_sht, NULL, 0);
147159 }
148160
drivers/base/regmap/internal.h+3−0
@@ -146,6 +146,9 @@ struct regcache_ops { · 145 unmodified lines
146146 enum regcache_type type;
147147 int (*init)(struct regmap *map);
148148 int (*exit)(struct regmap *map);
149+#ifdef CONFIG_DEBUG_FS
150+ void (*debugfs_init)(struct regmap *map);
151+#endif
149152 int (*read)(struct regmap *map, unsigned int reg, unsigned int *value);
150153 int (*write)(struct regmap *map, unsigned int reg, unsigned int value);
151154 int (*sync)(struct regmap *map, unsigned int min, unsigned int max);
drivers/base/regmap/regcache-rbtree.c+3−6
@@ -194,10 +194,6 @@ static void rbtree_debugfs_init(struct regmap *map) · 193 unmodified lines
194194 {
195195 debugfs_create_file("rbtree", 0400, map->debugfs, map, &rbtree_fops);
196196 }
197−#else
198−static void rbtree_debugfs_init(struct regmap *map)
199−{
200−}
201197 #endif
202198
203199 static int regcache_rbtree_init(struct regmap *map)
@@ -222,8 +218,6 @@ static int regcache_rbtree_init(struct regmap *map) · 18 unmodified lines
222218 goto err;
223219 }
224220
225− rbtree_debugfs_init(map);
226−
227221 return 0;
228222
229223 err:
@@ -532,6 +526,9 @@ struct regcache_ops regcache_rbtree_ops = { · 302 unmodified lines
532526 .name = "rbtree",
533527 .init = regcache_rbtree_init,
534528 .exit = regcache_rbtree_exit,
529+#ifdef CONFIG_DEBUG_FS
530+ .debugfs_init = rbtree_debugfs_init,
531+#endif
535532 .read = regcache_rbtree_read,
536533 .write = regcache_rbtree_write,
537534 .sync = regcache_rbtree_sync,
drivers/base/regmap/regcache.c+1−1
@@ -698,7 +698,7 @@ int regcache_sync_block(struct regmap *map, void *block, · 697 unmodified lines
698698 unsigned int block_base, unsigned int start,
699699 unsigned int end)
700700 {
701− if (regmap_can_raw_write(map))
701+ if (regmap_can_raw_write(map) && !map->use_single_rw)
702702 return regcache_sync_block_raw(map, block, cache_present,
703703 block_base, start, end);
704704 else
drivers/base/regmap/regmap-debugfs.c+3−0
@@ -538,6 +538,9 @@ void regmap_debugfs_init(struct regmap *map, const char *name) · 537 unmodified lines
538538
539539 next = rb_next(&range_node->node);
540540 }
541+
542+ if (map->cache_ops && map->cache_ops->debugfs_init)
543+ map->cache_ops->debugfs_init(map);
541544 }
542545
543546 void regmap_debugfs_exit(struct regmap *map)
drivers/base/regmap/regmap.c+1−1
@@ -109,7 +109,7 @@ bool regmap_readable(struct regmap *map, unsigned int reg) · 108 unmodified lines
109109
110110 bool regmap_volatile(struct regmap *map, unsigned int reg)
111111 {
112− if (!regmap_readable(map, reg))
112+ if (!map->format.format_write && !regmap_readable(map, reg))
113113 return false;
114114
115115 if (map->volatile_reg)
drivers/bcma/host_pci.c+1−0
@@ -282,6 +282,7 @@ static const struct pci_device_id bcma_pci_bridge_tbl[] = { · 281 unmodified lines
282282 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },
283283 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },
284284 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
285+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43227) }, /* 0xA8DB */
285286 { 0, },
286287 };
287288 MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);
drivers/block/brd.c+5−1
@@ -442,12 +442,15 @@ static int rd_nr; · 441 unmodified lines
442442 int rd_size = CONFIG_BLK_DEV_RAM_SIZE;
443443 static int max_part;
444444 static int part_shift;
445+static int part_show = 0;
445446 module_param(rd_nr, int, S_IRUGO);
446447 MODULE_PARM_DESC(rd_nr, "Maximum number of brd devices");
447448 module_param(rd_size, int, S_IRUGO);
448449 MODULE_PARM_DESC(rd_size, "Size of each RAM disk in kbytes.");
449450 module_param(max_part, int, S_IRUGO);
450451 MODULE_PARM_DESC(max_part, "Maximum number of partitions per RAM disk");
452+module_param(part_show, int, S_IRUGO);
453+MODULE_PARM_DESC(part_show, "Control RAM disk visibility in /proc/partitions");
451454 MODULE_LICENSE("GPL");
452455 MODULE_ALIAS_BLOCKDEV_MAJOR(RAMDISK_MAJOR);
453456 MODULE_ALIAS("rd");
@@ -501,7 +504,8 @@ static struct brd_device *brd_alloc(int i) · 47 unmodified lines
501504 disk->fops = &brd_fops;
502505 disk->private_data = brd;
503506 disk->queue = brd->brd_queue;
504− disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO;
507+ if (!part_show)
508+ disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO;
505509 sprintf(disk->disk_name, "ram%d", i);
506510 set_capacity(disk, rd_size * 2);
507511
drivers/block/xsysace.c+0−1
@@ -1203,7 +1203,6 @@ static struct platform_driver ace_platform_driver = { · 1202 unmodified lines
12031203 .probe = ace_probe,
12041204 .remove = ace_remove,
12051205 .driver = {
1206− .owner = THIS_MODULE,
12071206 .name = "xsysace",
12081207 .of_match_table = ace_of_match,
12091208 },
drivers/block/zram/zram_drv.c+7−3
@@ -378,7 +378,6 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index) · 377 unmodified lines
378378 /* Should NEVER happen. Return bio error if it does. */
379379 if (unlikely(ret)) {
380380 pr_err("Decompression failed! err=%d, page=%u\n", ret, index);
381− atomic64_inc(&zram->stats.failed_reads);
382381 return ret;
383382 }
384383
@@ -547,8 +546,6 @@ out: · 162 unmodified lines
547546 zcomp_strm_release(zram->comp, zstrm);
548547 if (is_partial_io(bvec))
549548 kfree(uncmem);
550− if (ret)
551− atomic64_inc(&zram->stats.failed_writes);
552549 return ret;
553550 }
554551
@@ -566,6 +563,13 @@ static int zram_bvec_rw(struct zram *zram, struct bio_vec *bvec, u32 index, · 11 unmodified lines
566563 ret = zram_bvec_write(zram, bvec, index, offset);
567564 }
568565
566+ if (unlikely(ret)) {
567+ if (rw == READ)
568+ atomic64_inc(&zram->stats.failed_reads);
569+ else
570+ atomic64_inc(&zram->stats.failed_writes);
571+ }
572+
569573 return ret;
570574 }
571575
drivers/block/zram/zram_drv.h+1−1
@@ -84,7 +84,7 @@ struct zram_stats { · 83 unmodified lines
8484 atomic64_t compr_data_size; /* compressed size of pages stored */
8585 atomic64_t num_reads; /* failed + successful */
8686 atomic64_t num_writes; /* --do-- */
87− atomic64_t failed_reads; /* should NEVER! happen */
87+ atomic64_t failed_reads; /* can happen when memory is too low */
8888 atomic64_t failed_writes; /* can happen when memory is too low */
8989 atomic64_t invalid_io; /* non-page-aligned I/O requests */
9090 atomic64_t notify_free; /* no. of swap slot free notifications */
drivers/bus/arm-ccn.c+26−27
@@ -586,6 +586,30 @@ static int arm_ccn_pmu_type_eq(u32 a, u32 b) · 585 unmodified lines
586586 return 0;
587587 }
588588
589+static void arm_ccn_pmu_event_destroy(struct perf_event *event)
590+{
591+ struct arm_ccn *ccn = pmu_to_arm_ccn(event->pmu);
592+ struct hw_perf_event *hw = &event->hw;
593+
594+ if (hw->idx == CCN_IDX_PMU_CYCLE_COUNTER) {
595+ clear_bit(CCN_IDX_PMU_CYCLE_COUNTER, ccn->dt.pmu_counters_mask);
596+ } else {
597+ struct arm_ccn_component *source =
598+ ccn->dt.pmu_counters[hw->idx].source;
599+
600+ if (CCN_CONFIG_TYPE(event->attr.config) == CCN_TYPE_XP &&
601+ CCN_CONFIG_EVENT(event->attr.config) ==
602+ CCN_EVENT_WATCHPOINT)
603+ clear_bit(hw->config_base, source->xp.dt_cmp_mask);
604+ else
605+ clear_bit(hw->config_base, source->pmu_events_mask);
606+ clear_bit(hw->idx, ccn->dt.pmu_counters_mask);
607+ }
608+
609+ ccn->dt.pmu_counters[hw->idx].source = NULL;
610+ ccn->dt.pmu_counters[hw->idx].event = NULL;
611+}
612+
589613 static int arm_ccn_pmu_event_init(struct perf_event *event)
590614 {
591615 struct arm_ccn *ccn;
@@ -599,6 +623,7 @@ static int arm_ccn_pmu_event_init(struct perf_event *event) · 7 unmodified lines
599623 return -ENOENT;
600624
601625 ccn = pmu_to_arm_ccn(event->pmu);
626+ event->destroy = arm_ccn_pmu_event_destroy;
602627
603628 if (hw->sample_period) {
604629 dev_warn(ccn->dev, "Sampling not supported!\n");
@@ -662,7 +687,7 @@ static int arm_ccn_pmu_event_init(struct perf_event *event) · 57 unmodified lines
662687 }
663688 if (e->num_vcs && vc >= e->num_vcs) {
664689 dev_warn(ccn->dev, "Invalid vc %d for node/XP %d!\n",
665− port, node_xp);
690+ vc, node_xp);
666691 return -EINVAL;
667692 }
668693 valid = 1;
@@ -731,30 +756,6 @@ static int arm_ccn_pmu_event_init(struct perf_event *event) · 62 unmodified lines
731756 return 0;
732757 }
733758
734−static void arm_ccn_pmu_event_free(struct perf_event *event)
735−{
736− struct arm_ccn *ccn = pmu_to_arm_ccn(event->pmu);
737− struct hw_perf_event *hw = &event->hw;
738−
739− if (hw->idx == CCN_IDX_PMU_CYCLE_COUNTER) {
740− clear_bit(CCN_IDX_PMU_CYCLE_COUNTER, ccn->dt.pmu_counters_mask);
741− } else {
742− struct arm_ccn_component *source =
743− ccn->dt.pmu_counters[hw->idx].source;
744−
745− if (CCN_CONFIG_TYPE(event->attr.config) == CCN_TYPE_XP &&
746− CCN_CONFIG_EVENT(event->attr.config) ==
747− CCN_EVENT_WATCHPOINT)
748− clear_bit(hw->config_base, source->xp.dt_cmp_mask);
749− else
750− clear_bit(hw->config_base, source->pmu_events_mask);
751− clear_bit(hw->idx, ccn->dt.pmu_counters_mask);
752− }
753−
754− ccn->dt.pmu_counters[hw->idx].source = NULL;
755− ccn->dt.pmu_counters[hw->idx].event = NULL;
756−}
757−
758759 static u64 arm_ccn_pmu_read_counter(struct arm_ccn *ccn, int idx)
759760 {
760761 u64 res;
@@ -1027,8 +1028,6 @@ static int arm_ccn_pmu_event_add(struct perf_event *event, int flags) · 266 unmodified lines
10271028 static void arm_ccn_pmu_event_del(struct perf_event *event, int flags)
10281029 {
10291030 arm_ccn_pmu_event_stop(event, PERF_EF_UPDATE);
1030−
1031− arm_ccn_pmu_event_free(event);
10321031 }
10331032
10341033 static void arm_ccn_pmu_event_read(struct perf_event *event)
drivers/cpufreq/intel_pstate.c+2−5
@@ -660,6 +660,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = { · 659 unmodified lines
660660 ICPU(0x3f, core_params),
661661 ICPU(0x45, core_params),
662662 ICPU(0x46, core_params),
663+ ICPU(0x4c, byt_params),
663664 ICPU(0x4f, core_params),
664665 ICPU(0x56, core_params),
665666 {}
@@ -688,7 +689,7 @@ static int intel_pstate_init_cpu(unsigned int cpunum) · 22 unmodified lines
688689
689690 add_timer_on(&cpu->timer, cpunum);
690691
691− pr_info("Intel pstate controlling: cpu %d\n", cpunum);
692+ pr_debug("Intel pstate controlling: cpu %d\n", cpunum);
692693
693694 return 0;
694695 }
@@ -707,10 +708,6 @@ static unsigned int intel_pstate_get(unsigned int cpu_num) · 12 unmodified lines
707708
708709 static int intel_pstate_set_policy(struct cpufreq_policy *policy)
709710 {
710− struct cpudata *cpu;
711−
712− cpu = all_cpu_data[policy->cpu];
713−
714711 if (!policy->cpuinfo.max_freq)
715712 return -ENODEV;
716713
drivers/cpufreq/s5pv210-cpufreq.c+1−1
@@ -501,7 +501,7 @@ static int check_mem_type(void __iomem *dmc_reg) · 500 unmodified lines
501501 return val >> 8;
502502 }
503503
504−static int __init s5pv210_cpu_init(struct cpufreq_policy *policy)
504+static int s5pv210_cpu_init(struct cpufreq_policy *policy)
505505 {
506506 unsigned long mem_type;
507507 int ret;
drivers/cpuidle/cpuidle-big_little.c+3−10
@@ -138,25 +138,18 @@ static int bl_enter_powerdown(struct cpuidle_device *dev, · 137 unmodified lines
138138 return idx;
139139 }
140140
141−static int __init bl_idle_driver_init(struct cpuidle_driver *drv, int cpu_id)
141+static int __init bl_idle_driver_init(struct cpuidle_driver *drv, int part_id)
142142 {
143− struct cpuinfo_arm *cpu_info;
144143 struct cpumask *cpumask;
145− unsigned long cpuid;
146144 int cpu;
147145
148146 cpumask = kzalloc(cpumask_size(), GFP_KERNEL);
149147 if (!cpumask)
150148 return -ENOMEM;
151149
152− for_each_possible_cpu(cpu) {
153− cpu_info = &per_cpu(cpu_data, cpu);
154− cpuid = is_smp() ? cpu_info->cpuid : read_cpuid_id();
155−
156− /* read cpu id part number */
157− if ((cpuid & 0xFFF0) == cpu_id)
150+ for_each_possible_cpu(cpu)
151+ if (smp_cpuid_part(cpu) == part_id)
158152 cpumask_set_cpu(cpu, cpumask);
159− }
160153
161154 drv->cpumask = cpumask;
162155
drivers/dma-buf/fence.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 EXPORT_TRACEPOINT_SYMBOL(fence_annotate_wait_on);
3030 EXPORT_TRACEPOINT_SYMBOL(fence_emit);
3131
32−/**
32+/*
3333 * fence context counter: each execution context should have its own
3434 * fence context, this allows checking if fences belong to the same
3535 * context or not. One device can have multiple separate contexts,
drivers/firmware/efi/vars.c+4−4
@@ -481,7 +481,7 @@ EXPORT_SYMBOL_GPL(efivar_entry_remove); · 480 unmodified lines
481481 */
482482 static void efivar_entry_list_del_unlock(struct efivar_entry *entry)
483483 {
484− WARN_ON(!spin_is_locked(&__efivars->lock));
484+ lockdep_assert_held(&__efivars->lock);
485485
486486 list_del(&entry->list);
487487 spin_unlock_irq(&__efivars->lock);
@@ -507,7 +507,7 @@ int __efivar_entry_delete(struct efivar_entry *entry) · 19 unmodified lines
507507 const struct efivar_operations *ops = __efivars->ops;
508508 efi_status_t status;
509509
510− WARN_ON(!spin_is_locked(&__efivars->lock));
510+ lockdep_assert_held(&__efivars->lock);
511511
512512 status = ops->set_variable(entry->var.VariableName,
513513 &entry->var.VendorGuid,
@@ -667,7 +667,7 @@ struct efivar_entry *efivar_entry_find(efi_char16_t *name, efi_guid_t guid, · 153 unmodified lines
667667 int strsize1, strsize2;
668668 bool found = false;
669669
670− WARN_ON(!spin_is_locked(&__efivars->lock));
670+ lockdep_assert_held(&__efivars->lock);
671671
672672 list_for_each_entry_safe(entry, n, head, list) {
673673 strsize1 = ucs2_strsize(name, 1024);
@@ -739,7 +739,7 @@ int __efivar_entry_get(struct efivar_entry *entry, u32 *attributes, · 65 unmodified lines
739739 const struct efivar_operations *ops = __efivars->ops;
740740 efi_status_t status;
741741
742− WARN_ON(!spin_is_locked(&__efivars->lock));
742+ lockdep_assert_held(&__efivars->lock);
743743
744744 status = ops->get_variable(entry->var.VariableName,
745745 &entry->var.VendorGuid,
drivers/gpio/devres.c+1−1
@@ -90,7 +90,7 @@ struct gpio_desc *__must_check __devm_gpiod_get_index(struct device *dev, · 89 unmodified lines
9090 struct gpio_desc **dr;
9191 struct gpio_desc *desc;
9292
93− dr = devres_alloc(devm_gpiod_release, sizeof(struct gpiod_desc *),
93+ dr = devres_alloc(devm_gpiod_release, sizeof(struct gpio_desc *),
9494 GFP_KERNEL);
9595 if (!dr)
9696 return ERR_PTR(-ENOMEM);
drivers/gpio/gpio-bt8xx.c+0−3
@@ -241,9 +241,6 @@ static void bt8xxgpio_remove(struct pci_dev *pdev) · 240 unmodified lines
241241 bgwrite(~0x0, BT848_INT_STAT);
242242 bgwrite(0x0, BT848_GPIO_OUT_EN);
243243
244− iounmap(bg->mmio);
245− release_mem_region(pci_resource_start(pdev, 0),
246− pci_resource_len(pdev, 0));
247244 pci_disable_device(pdev);
248245 }
249246
drivers/gpio/gpio-lynxpoint.c+18−0
@@ -407,9 +407,27 @@ static int lp_gpio_runtime_resume(struct device *dev) · 406 unmodified lines
407407 return 0;
408408 }
409409
410+static int lp_gpio_resume(struct device *dev)
411+{
412+ struct platform_device *pdev = to_platform_device(dev);
413+ struct lp_gpio *lg = platform_get_drvdata(pdev);
414+ unsigned long reg;
415+ int i;
416+
417+ /* on some hardware suspend clears input sensing, re-enable it here */
418+ for (i = 0; i < lg->chip.ngpio; i++) {
419+ if (gpiochip_is_requested(&lg->chip, i) != NULL) {
420+ reg = lp_gpio_reg(&lg->chip, i, LP_CONFIG2);
421+ outl(inl(reg) & ~GPINDIS_BIT, reg);
422+ }
423+ }
424+ return 0;
425+}
426+
410427 static const struct dev_pm_ops lp_gpio_pm_ops = {
411428 .runtime_suspend = lp_gpio_runtime_suspend,
412429 .runtime_resume = lp_gpio_runtime_resume,
430+ .resume = lp_gpio_resume,
413431 };
414432
415433 static const struct acpi_device_id lynxpoint_gpio_acpi_match[] = {
drivers/gpio/gpio-zynq.c+28−8
@@ -95,6 +95,9 @@ struct zynq_gpio { · 94 unmodified lines
9595 struct clk *clk;
9696 };
9797
98+static struct irq_chip zynq_gpio_level_irqchip;
99+static struct irq_chip zynq_gpio_edge_irqchip;
100+
98101 /**
99102 * zynq_gpio_get_bank_pin - Get the bank number and pin number within that bank
100103 * for a given pin in the GPIO device
@@ -410,6 +413,15 @@ static int zynq_gpio_set_irq_type(struct irq_data *irq_data, unsigned int type) · 309 unmodified lines
410413 gpio->base_addr + ZYNQ_GPIO_INTPOL_OFFSET(bank_num));
411414 writel_relaxed(int_any,
412415 gpio->base_addr + ZYNQ_GPIO_INTANY_OFFSET(bank_num));
416+
417+ if (type & IRQ_TYPE_LEVEL_MASK) {
418+ __irq_set_chip_handler_name_locked(irq_data->irq,
419+ &zynq_gpio_level_irqchip, handle_fasteoi_irq, NULL);
420+ } else {
421+ __irq_set_chip_handler_name_locked(irq_data->irq,
422+ &zynq_gpio_edge_irqchip, handle_level_irq, NULL);
423+ }
424+
413425 return 0;
414426 }
415427
@@ -424,9 +436,21 @@ static int zynq_gpio_set_wake(struct irq_data *data, unsigned int on) · 8 unmodified lines
424436 }
425437
426438 /* irq chip descriptor */
427−static struct irq_chip zynq_gpio_irqchip = {
439+static struct irq_chip zynq_gpio_level_irqchip = {
428440 .name = DRIVER_NAME,
429441 .irq_enable = zynq_gpio_irq_enable,
442+ .irq_eoi = zynq_gpio_irq_ack,
443+ .irq_mask = zynq_gpio_irq_mask,
444+ .irq_unmask = zynq_gpio_irq_unmask,
445+ .irq_set_type = zynq_gpio_set_irq_type,
446+ .irq_set_wake = zynq_gpio_set_wake,
447+ .flags = IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED,
448+};
449+
450+static struct irq_chip zynq_gpio_edge_irqchip = {
451+ .name = DRIVER_NAME,
452+ .irq_enable = zynq_gpio_irq_enable,
453+ .irq_ack = zynq_gpio_irq_ack,
430454 .irq_mask = zynq_gpio_irq_mask,
431455 .irq_unmask = zynq_gpio_irq_unmask,
432456 .irq_set_type = zynq_gpio_set_irq_type,
@@ -469,10 +493,6 @@ static void zynq_gpio_irqhandler(unsigned int irq, struct irq_desc *desc) · 36 unmodified lines
469493 offset);
470494 generic_handle_irq(gpio_irq);
471495 }
472−
473− /* clear IRQ in HW */
474− writel_relaxed(int_sts, gpio->base_addr +
475− ZYNQ_GPIO_INTSTS_OFFSET(bank_num));
476496 }
477497 }
478498
@@ -610,14 +630,14 @@ static int zynq_gpio_probe(struct platform_device *pdev) · 131 unmodified lines
610630 writel_relaxed(ZYNQ_GPIO_IXR_DISABLE_ALL, gpio->base_addr +
611631 ZYNQ_GPIO_INTDIS_OFFSET(bank_num));
612632
613− ret = gpiochip_irqchip_add(chip, &zynq_gpio_irqchip, 0,
614− handle_simple_irq, IRQ_TYPE_NONE);
633+ ret = gpiochip_irqchip_add(chip, &zynq_gpio_edge_irqchip, 0,
634+ handle_level_irq, IRQ_TYPE_NONE);
615635 if (ret) {
616636 dev_err(&pdev->dev, "Failed to add irq chip\n");
617637 goto err_rm_gpiochip;
618638 }
619639
620− gpiochip_set_chained_irqchip(chip, &zynq_gpio_irqchip, irq,
640+ gpiochip_set_chained_irqchip(chip, &zynq_gpio_edge_irqchip, irq,
621641 zynq_gpio_irqhandler);
622642
623643 pm_runtime_set_active(&pdev->dev);
drivers/gpio/gpiolib-of.c+1−3
@@ -307,7 +307,5 @@ void of_gpiochip_add(struct gpio_chip *chip) · 306 unmodified lines
307307 void of_gpiochip_remove(struct gpio_chip *chip)
308308 {
309309 gpiochip_remove_pin_ranges(chip);
310−
311− if (chip->of_node)
312− of_node_put(chip->of_node);
310+ of_node_put(chip->of_node);
313311 }
drivers/gpu/drm/ast/ast_tables.h+1−0
@@ -99,6 +99,7 @@ static struct ast_vbios_dclk_info dclk_table[] = { · 98 unmodified lines
9999 {0x25, 0x65, 0x80}, /* 16: VCLK88.75 */
100100 {0x77, 0x58, 0x80}, /* 17: VCLK119 */
101101 {0x32, 0x67, 0x80}, /* 18: VCLK85_5 */
102+ {0x6a, 0x6d, 0x80}, /* 19: VCLK97_75 */
102103 };
103104
104105 static struct ast_vbios_stdtable vbios_stdtable[] = {
drivers/gpu/drm/drm_crtc.c+2−1
@@ -4696,8 +4696,9 @@ int drm_mode_create_dumb_ioctl(struct drm_device *dev, · 4695 unmodified lines
46964696 return -EINVAL;
46974697
46984698 /* overflow checks for 32bit size calculations */
4699+ /* NOTE: DIV_ROUND_UP() can overflow */
46994700 cpp = DIV_ROUND_UP(args->bpp, 8);
4700− if (cpp > 0xffffffffU / args->width)
4701+ if (!cpp || cpp > 0xffffffffU / args->width)
47014702 return -EINVAL;
47024703 stride = cpp * args->width;
47034704 if (args->height > 0xffffffffU / stride)
drivers/gpu/drm/i915/i915_drv.c+33−0
@@ -494,6 +494,36 @@ bool i915_semaphore_is_enabled(struct drm_device *dev) · 493 unmodified lines
494494 return true;
495495 }
496496
497+void intel_hpd_cancel_work(struct drm_i915_private *dev_priv)
498+{
499+ spin_lock_irq(&dev_priv->irq_lock);
500+
501+ dev_priv->long_hpd_port_mask = 0;
502+ dev_priv->short_hpd_port_mask = 0;
503+ dev_priv->hpd_event_bits = 0;
504+
505+ spin_unlock_irq(&dev_priv->irq_lock);
506+
507+ cancel_work_sync(&dev_priv->dig_port_work);
508+ cancel_work_sync(&dev_priv->hotplug_work);
509+ cancel_delayed_work_sync(&dev_priv->hotplug_reenable_work);
510+}
511+
512+static void intel_suspend_encoders(struct drm_i915_private *dev_priv)
513+{
514+ struct drm_device *dev = dev_priv->dev;
515+ struct drm_encoder *encoder;
516+
517+ drm_modeset_lock_all(dev);
518+ list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
519+ struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
520+
521+ if (intel_encoder->suspend)
522+ intel_encoder->suspend(intel_encoder);
523+ }
524+ drm_modeset_unlock_all(dev);
525+}
526+
497527 static int i915_drm_freeze(struct drm_device *dev)
498528 {
499529 struct drm_i915_private *dev_priv = dev->dev_private;
@@ -538,6 +568,9 @@ static int i915_drm_freeze(struct drm_device *dev) · 38 unmodified lines
538568 flush_delayed_work(&dev_priv->rps.delayed_resume_work);
539569
540570 intel_runtime_pm_disable_interrupts(dev);
571+ intel_hpd_cancel_work(dev_priv);
572+
573+ intel_suspend_encoders(dev_priv);
541574
542575 intel_suspend_gt_powersave(dev);
543576
drivers/gpu/drm/i915/i915_drv.h+2−1
@@ -1458,7 +1458,7 @@ struct drm_i915_private { · 1457 unmodified lines
14581458 } hpd_mark;
14591459 } hpd_stats[HPD_NUM_PINS];
14601460 u32 hpd_event_bits;
1461− struct timer_list hotplug_reenable_timer;
1461+ struct delayed_work hotplug_reenable_work;
14621462
14631463 struct i915_fbc fbc;
14641464 struct i915_drrs drrs;
@@ -2178,6 +2178,7 @@ extern unsigned long i915_mch_val(struct drm_i915_private *dev_priv); · 713 unmodified lines
21782178 extern unsigned long i915_gfx_val(struct drm_i915_private *dev_priv);
21792179 extern void i915_update_gfx_val(struct drm_i915_private *dev_priv);
21802180 int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on);
2181+void intel_hpd_cancel_work(struct drm_i915_private *dev_priv);
21812182
21822183 extern void intel_console_resume(struct work_struct *work);
21832184
drivers/gpu/drm/i915/i915_irq.c+12−21
@@ -1189,8 +1189,8 @@ static void i915_hotplug_work_func(struct work_struct *work) · 1188 unmodified lines
11891189 * some connectors */
11901190 if (hpd_disabled) {
11911191 drm_kms_helper_poll_enable(dev);
1192− mod_timer(&dev_priv->hotplug_reenable_timer,
1193− jiffies + msecs_to_jiffies(I915_REENABLE_HOTPLUG_DELAY));
1192+ mod_delayed_work(system_wq, &dev_priv->hotplug_reenable_work,
1193+ msecs_to_jiffies(I915_REENABLE_HOTPLUG_DELAY));
11941194 }
11951195
11961196 spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
@@ -1213,11 +1213,6 @@ static void i915_hotplug_work_func(struct work_struct *work) · 16 unmodified lines
12131213 drm_kms_helper_hotplug_event(dev);
12141214 }
12151215
1216−static void intel_hpd_irq_uninstall(struct drm_i915_private *dev_priv)
1217−{
1218− del_timer_sync(&dev_priv->hotplug_reenable_timer);
1219−}
1220−
12211216 static void ironlake_rps_change_irq_handler(struct drm_device *dev)
12221217 {
12231218 struct drm_i915_private *dev_priv = dev->dev_private;
@@ -3892,8 +3887,6 @@ static void gen8_irq_uninstall(struct drm_device *dev) · 2668 unmodified lines
38923887 if (!dev_priv)
38933888 return;
38943889
3895− intel_hpd_irq_uninstall(dev_priv);
3896−
38973890 gen8_irq_reset(dev);
38983891 }
38993892
@@ -3908,8 +3901,6 @@ static void valleyview_irq_uninstall(struct drm_device *dev) · 8 unmodified lines
39083901
39093902 I915_WRITE(VLV_MASTER_IER, 0);
39103903
3911− intel_hpd_irq_uninstall(dev_priv);
3912−
39133904 for_each_pipe(pipe)
39143905 I915_WRITE(PIPESTAT(pipe), 0xffff);
39153906
@@ -3988,8 +3979,6 @@ static void ironlake_irq_uninstall(struct drm_device *dev) · 72 unmodified lines
39883979 if (!dev_priv)
39893980 return;
39903981
3991− intel_hpd_irq_uninstall(dev_priv);
3992−
39933982 ironlake_irq_reset(dev);
39943983 }
39953984
@@ -4360,8 +4349,6 @@ static void i915_irq_uninstall(struct drm_device * dev) · 364 unmodified lines
43604349 struct drm_i915_private *dev_priv = dev->dev_private;
43614350 int pipe;
43624351
4363− intel_hpd_irq_uninstall(dev_priv);
4364−
43654352 if (I915_HAS_HOTPLUG(dev)) {
43664353 I915_WRITE(PORT_HOTPLUG_EN, 0);
43674354 I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
@@ -4598,8 +4585,6 @@ static void i965_irq_uninstall(struct drm_device * dev) · 230 unmodified lines
45984585 if (!dev_priv)
45994586 return;
46004587
4601− intel_hpd_irq_uninstall(dev_priv);
4602−
46034588 I915_WRITE(PORT_HOTPLUG_EN, 0);
46044589 I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
46054590
@@ -4615,14 +4600,18 @@ static void i965_irq_uninstall(struct drm_device * dev) · 9 unmodified lines
46154600 I915_WRITE(IIR, I915_READ(IIR));
46164601 }
46174602
4618−static void intel_hpd_irq_reenable(unsigned long data)
4603+static void intel_hpd_irq_reenable(struct work_struct *work)
46194604 {
4620− struct drm_i915_private *dev_priv = (struct drm_i915_private *)data;
4605+ struct drm_i915_private *dev_priv =
4606+ container_of(work, typeof(*dev_priv),
4607+ hotplug_reenable_work.work);
46214608 struct drm_device *dev = dev_priv->dev;
46224609 struct drm_mode_config *mode_config = &dev->mode_config;
46234610 unsigned long irqflags;
46244611 int i;
46254612
4613+ intel_runtime_pm_get(dev_priv);
4614+
46264615 spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
46274616 for (i = (HPD_NONE + 1); i < HPD_NUM_PINS; i++) {
46284617 struct drm_connector *connector;
@@ -4648,6 +4637,8 @@ static void intel_hpd_irq_reenable(unsigned long data) · 19 unmodified lines
46484637 if (dev_priv->display.hpd_irq_setup)
46494638 dev_priv->display.hpd_irq_setup(dev);
46504639 spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
4640+
4641+ intel_runtime_pm_put(dev_priv);
46514642 }
46524643
46534644 void intel_irq_init(struct drm_device *dev)
@@ -4670,8 +4661,8 @@ void intel_irq_init(struct drm_device *dev) · 16 unmodified lines
46704661 setup_timer(&dev_priv->gpu_error.hangcheck_timer,
46714662 i915_hangcheck_elapsed,
46724663 (unsigned long) dev);
4673− setup_timer(&dev_priv->hotplug_reenable_timer, intel_hpd_irq_reenable,
4674− (unsigned long) dev_priv);
4664+ INIT_DELAYED_WORK(&dev_priv->hotplug_reenable_work,
4665+ intel_hpd_irq_reenable);
46754666
46764667 pm_qos_add_request(&dev_priv->pm_qos, PM_QOS_CPU_DMA_LATENCY, PM_QOS_DEFAULT_VALUE);
46774668
drivers/gpu/drm/i915/intel_bios.c+1−1
@@ -1123,7 +1123,7 @@ init_vbt_defaults(struct drm_i915_private *dev_priv) · 1122 unmodified lines
11231123 }
11241124 }
11251125
1126−static int __init intel_no_opregion_vbt_callback(const struct dmi_system_id *id)
1126+static int intel_no_opregion_vbt_callback(const struct dmi_system_id *id)
11271127 {
11281128 DRM_DEBUG_KMS("Falling back to manually reading VBT from "
11291129 "VBIOS ROM for %s\n",
drivers/gpu/drm/i915/intel_crt.c+7−2
@@ -699,16 +699,21 @@ intel_crt_detect(struct drm_connector *connector, bool force) · 698 unmodified lines
699699 goto out;
700700 }
701701
702+ drm_modeset_acquire_init(&ctx, 0);
703+
702704 /* for pre-945g platforms use load detect */
703705 if (intel_get_load_detect_pipe(connector, NULL, &tmp, &ctx)) {
704706 if (intel_crt_detect_ddc(connector))
705707 status = connector_status_connected;
706708 else
707709 status = intel_crt_load_detect(crt);
708− intel_release_load_detect_pipe(connector, &tmp, &ctx);
710+ intel_release_load_detect_pipe(connector, &tmp);
709711 } else
710712 status = connector_status_unknown;
711713
714+ drm_modeset_drop_locks(&ctx);
715+ drm_modeset_acquire_fini(&ctx);
716+
712717 out:
713718 intel_display_power_put(dev_priv, power_domain);
714719 return status;
@@ -799,7 +804,7 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = { · 84 unmodified lines
799804 .destroy = intel_encoder_destroy,
800805 };
801806
802−static int __init intel_no_crt_dmi_callback(const struct dmi_system_id *id)
807+static int intel_no_crt_dmi_callback(const struct dmi_system_id *id)
803808 {
804809 DRM_INFO("Skipping CRT initialization for %s\n", id->ident);
805810 return 1;
drivers/gpu/drm/i915/intel_display.c+45−28
@@ -2233,6 +2233,15 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, · 2232 unmodified lines
22332233 if (need_vtd_wa(dev) && alignment < 256 * 1024)
22342234 alignment = 256 * 1024;
22352235
2236+ /*
2237+ * Global gtt pte registers are special registers which actually forward
2238+ * writes to a chunk of system memory. Which means that there is no risk
2239+ * that the register values disappear as soon as we call
2240+ * intel_runtime_pm_put(), so it is correct to wrap only the
2241+ * pin/unpin/fence and not more.
2242+ */
2243+ intel_runtime_pm_get(dev_priv);
2244+
22362245 dev_priv->mm.interruptible = false;
22372246 ret = i915_gem_object_pin_to_display_plane(obj, alignment, pipelined);
22382247 if (ret)
@@ -2250,12 +2259,14 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, · 11 unmodified lines
22502259 i915_gem_object_pin_fence(obj);
22512260
22522261 dev_priv->mm.interruptible = true;
2262+ intel_runtime_pm_put(dev_priv);
22532263 return 0;
22542264
22552265 err_unpin:
22562266 i915_gem_object_unpin_from_display_plane(obj);
22572267 err_interruptible:
22582268 dev_priv->mm.interruptible = true;
2269+ intel_runtime_pm_put(dev_priv);
22592270 return ret;
22602271 }
22612272
@@ -4188,10 +4199,6 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) · 1926 unmodified lines
41884199 intel_set_pch_fifo_underrun_reporting(dev, pipe, false);
41894200
41904201 intel_disable_pipe(dev_priv, pipe);
4191−
4192− if (intel_crtc->config.dp_encoder_is_mst)
4193− intel_ddi_set_vc_payload_alloc(crtc, false);
4194−
41954202 ironlake_pfit_disable(intel_crtc);
41964203
41974204 for_each_encoder_on_crtc(dev, crtc, encoder)
@@ -4256,6 +4263,9 @@ static void haswell_crtc_disable(struct drm_crtc *crtc) · 58 unmodified lines
42564263 intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, false);
42574264 intel_disable_pipe(dev_priv, pipe);
42584265
4266+ if (intel_crtc->config.dp_encoder_is_mst)
4267+ intel_ddi_set_vc_payload_alloc(crtc, false);
4268+
42594269 intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder);
42604270
42614271 ironlake_pfit_disable(intel_crtc);
@@ -8240,6 +8250,15 @@ static int intel_crtc_cursor_set_obj(struct drm_crtc *crtc, · 3978 unmodified lines
82408250 goto fail_locked;
82418251 }
82428252
8253+ /*
8254+ * Global gtt pte registers are special registers which actually
8255+ * forward writes to a chunk of system memory. Which means that
8256+ * there is no risk that the register values disappear as soon
8257+ * as we call intel_runtime_pm_put(), so it is correct to wrap
8258+ * only the pin/unpin/fence and not more.
8259+ */
8260+ intel_runtime_pm_get(dev_priv);
8261+
82438262 /* Note that the w/a also requires 2 PTE of padding following
82448263 * the bo. We currently fill all unused PTE with the shadow
82458264 * page and so we should always have valid PTE following the
@@ -8252,16 +8271,20 @@ static int intel_crtc_cursor_set_obj(struct drm_crtc *crtc, · 6 unmodified lines
82528271 ret = i915_gem_object_pin_to_display_plane(obj, alignment, NULL);
82538272 if (ret) {
82548273 DRM_DEBUG_KMS("failed to move cursor bo into the GTT\n");
8274+ intel_runtime_pm_put(dev_priv);
82558275 goto fail_locked;
82568276 }
82578277
82588278 ret = i915_gem_object_put_fence(obj);
82598279 if (ret) {
82608280 DRM_DEBUG_KMS("failed to release fence for cursor");
8281+ intel_runtime_pm_put(dev_priv);
82618282 goto fail_unpin;
82628283 }
82638284
82648285 addr = i915_gem_obj_ggtt_offset(obj);
8286+
8287+ intel_runtime_pm_put(dev_priv);
82658288 } else {
82668289 int align = IS_I830(dev) ? 16 * 1024 : 256;
82678290 ret = i915_gem_object_attach_phys(obj, align);
@@ -8462,8 +8485,6 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector, · 194 unmodified lines
84628485 connector->base.id, connector->name,
84638486 encoder->base.id, encoder->name);
84648487
8465− drm_modeset_acquire_init(ctx, 0);
8466−
84678488 retry:
84688489 ret = drm_modeset_lock(&config->connection_mutex, ctx);
84698490 if (ret)
@@ -8502,10 +8523,14 @@ retry: · 32 unmodified lines
85028523 i++;
85038524 if (!(encoder->possible_crtcs & (1 << i)))
85048525 continue;
8505− if (!possible_crtc->enabled) {
8506− crtc = possible_crtc;
8507− break;
8508− }
8526+ if (possible_crtc->enabled)
8527+ continue;
8528+ /* This can occur when applying the pipe A quirk on resume. */
8529+ if (to_intel_crtc(possible_crtc)->new_enabled)
8530+ continue;
8531+
8532+ crtc = possible_crtc;
8533+ break;
85098534 }
85108535
85118536 /*
@@ -8574,15 +8599,11 @@ fail_unlock: · 62 unmodified lines
85748599 goto retry;
85758600 }
85768601
8577− drm_modeset_drop_locks(ctx);
8578− drm_modeset_acquire_fini(ctx);
8579−
85808602 return false;
85818603 }
85828604
85838605 void intel_release_load_detect_pipe(struct drm_connector *connector,
8584− struct intel_load_detect_pipe *old,
8585− struct drm_modeset_acquire_ctx *ctx)
8606+ struct intel_load_detect_pipe *old)
85868607 {
85878608 struct intel_encoder *intel_encoder =
85888609 intel_attached_encoder(connector);
@@ -8606,17 +8627,12 @@ void intel_release_load_detect_pipe(struct drm_connector *connector, · 17 unmodified lines
86068627 drm_framebuffer_unreference(old->release_fb);
86078628 }
86088629
8609− goto unlock;
86108630 return;
86118631 }
86128632
86138633 /* Switch crtc and encoder back off if necessary */
86148634 if (old->dpms_mode != DRM_MODE_DPMS_ON)
86158635 connector->funcs->dpms(connector, old->dpms_mode);
8616−
8617−unlock:
8618− drm_modeset_drop_locks(ctx);
8619− drm_modeset_acquire_fini(ctx);
86208636 }
86218637
86228638 static int i9xx_pll_refclk(struct drm_device *dev,
@@ -11700,8 +11716,8 @@ intel_cursor_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, · 3077 unmodified lines
1170011716 };
1170111717 const struct drm_rect clip = {
1170211718 /* integer pixels */
11703− .x2 = intel_crtc->config.pipe_src_w,
11704− .y2 = intel_crtc->config.pipe_src_h,
11719+ .x2 = intel_crtc->active ? intel_crtc->config.pipe_src_w : 0,
11720+ .y2 = intel_crtc->active ? intel_crtc->config.pipe_src_h : 0,
1170511721 };
1170611722 bool visible;
1170711723 int ret;
@@ -12488,6 +12504,9 @@ static struct intel_quirk intel_quirks[] = { · 780 unmodified lines
1248812504 /* Acer C720 and C720P Chromebooks (Celeron 2955U) have backlights */
1248912505 { 0x0a06, 0x1025, 0x0a11, quirk_backlight_present },
1249012506
12507+ /* Acer C720 Chromebook (Core i3 4005U) */
12508+ { 0x0a16, 0x1025, 0x0a11, quirk_backlight_present },
12509+
1249112510 /* Toshiba CB35 Chromebook (Celeron 2955U) */
1249212511 { 0x0a06, 0x1179, 0x0a88, quirk_backlight_present },
1249312512
@@ -12659,7 +12678,7 @@ static void intel_enable_pipe_a(struct drm_device *dev) · 165 unmodified lines
1265912678 struct intel_connector *connector;
1266012679 struct drm_connector *crt = NULL;
1266112680 struct intel_load_detect_pipe load_detect_temp;
12662− struct drm_modeset_acquire_ctx ctx;
12681+ struct drm_modeset_acquire_ctx *ctx = dev->mode_config.acquire_ctx;
1266312682
1266412683 /* We can't just switch on the pipe A, we need to set things up with a
1266512684 * proper mode and output configuration. As a gross hack, enable pipe A
@@ -12676,10 +12695,8 @@ static void intel_enable_pipe_a(struct drm_device *dev) · 10 unmodified lines
1267612695 if (!crt)
1267712696 return;
1267812697
12679− if (intel_get_load_detect_pipe(crt, NULL, &load_detect_temp, &ctx))
12680− intel_release_load_detect_pipe(crt, &load_detect_temp, &ctx);
12681−
12682−
12698+ if (intel_get_load_detect_pipe(crt, NULL, &load_detect_temp, ctx))
12699+ intel_release_load_detect_pipe(crt, &load_detect_temp);
1268312700 }
1268412701
1268512702 static bool
@@ -13112,7 +13129,7 @@ void intel_modeset_cleanup(struct drm_device *dev) · 426 unmodified lines
1311213129 * experience fancy races otherwise.
1311313130 */
1311413131 drm_irq_uninstall(dev);
13115− cancel_work_sync(&dev_priv->hotplug_work);
13132+ intel_hpd_cancel_work(dev_priv);
1311613133 dev_priv->pm._irqs_disabled = true;
1311713134
1311813135 /*
drivers/gpu/drm/i915/intel_dp.c+65−23
@@ -3553,6 +3553,9 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) · 3552 unmodified lines
35533553 if (WARN_ON(!intel_encoder->base.crtc))
35543554 return;
35553555
3556+ if (!to_intel_crtc(intel_encoder->base.crtc)->active)
3557+ return;
3558+
35563559 /* Try to read receiver status if the link appears to be up */
35573560 if (!intel_dp_get_link_status(intel_dp, link_status)) {
35583561 return;
@@ -3658,24 +3661,12 @@ ironlake_dp_detect(struct intel_dp *intel_dp) · 99 unmodified lines
36583661 return intel_dp_detect_dpcd(intel_dp);
36593662 }
36603663
3661−static enum drm_connector_status
3662−g4x_dp_detect(struct intel_dp *intel_dp)
3664+static int g4x_digital_port_connected(struct drm_device *dev,
3665+ struct intel_digital_port *intel_dig_port)
36633666 {
3664− struct drm_device *dev = intel_dp_to_dev(intel_dp);
36653667 struct drm_i915_private *dev_priv = dev->dev_private;
3666− struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
36673668 uint32_t bit;
36683669
3669− /* Can't disconnect eDP, but you can close the lid... */
3670− if (is_edp(intel_dp)) {
3671− enum drm_connector_status status;
3672−
3673− status = intel_panel_detect(dev);
3674− if (status == connector_status_unknown)
3675− status = connector_status_connected;
3676− return status;
3677− }
3678−
36793670 if (IS_VALLEYVIEW(dev)) {
36803671 switch (intel_dig_port->port) {
36813672 case PORT_B:
@@ -3688,7 +3679,7 @@ g4x_dp_detect(struct intel_dp *intel_dp) · 6 unmodified lines
36883679 bit = PORTD_HOTPLUG_LIVE_STATUS_VLV;
36893680 break;
36903681 default:
3691− return connector_status_unknown;
3682+ return -EINVAL;
36923683 }
36933684 } else {
36943685 switch (intel_dig_port->port) {
@@ -3702,11 +3693,36 @@ g4x_dp_detect(struct intel_dp *intel_dp) · 7 unmodified lines
37023693 bit = PORTD_HOTPLUG_LIVE_STATUS_G4X;
37033694 break;
37043695 default:
3705− return connector_status_unknown;
3696+ return -EINVAL;
37063697 }
37073698 }
37083699
37093700 if ((I915_READ(PORT_HOTPLUG_STAT) & bit) == 0)
3701+ return 0;
3702+ return 1;
3703+}
3704+
3705+static enum drm_connector_status
3706+g4x_dp_detect(struct intel_dp *intel_dp)
3707+{
3708+ struct drm_device *dev = intel_dp_to_dev(intel_dp);
3709+ struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
3710+ int ret;
3711+
3712+ /* Can't disconnect eDP, but you can close the lid... */
3713+ if (is_edp(intel_dp)) {
3714+ enum drm_connector_status status;
3715+
3716+ status = intel_panel_detect(dev);
3717+ if (status == connector_status_unknown)
3718+ status = connector_status_connected;
3719+ return status;
3720+ }
3721+
3722+ ret = g4x_digital_port_connected(dev, intel_dig_port);
3723+ if (ret == -EINVAL)
3724+ return connector_status_unknown;
3725+ else if (ret == 0)
37103726 return connector_status_disconnected;
37113727
37123728 return intel_dp_detect_dpcd(intel_dp);
@@ -4003,6 +4019,16 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder) · 290 unmodified lines
40034019 kfree(intel_dig_port);
40044020 }
40054021
4022+static void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder)
4023+{
4024+ struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base);
4025+
4026+ if (!is_edp(intel_dp))
4027+ return;
4028+
4029+ edp_panel_vdd_off_sync(intel_dp);
4030+}
4031+
40064032 static void intel_dp_encoder_reset(struct drm_encoder *encoder)
40074033 {
40084034 intel_edp_panel_vdd_sanitize(to_intel_encoder(encoder));
@@ -4037,18 +4063,30 @@ bool · 28 unmodified lines
40374063 intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
40384064 {
40394065 struct intel_dp *intel_dp = &intel_dig_port->dp;
4066+ struct intel_encoder *intel_encoder = &intel_dig_port->base;
40404067 struct drm_device *dev = intel_dig_port->base.base.dev;
40414068 struct drm_i915_private *dev_priv = dev->dev_private;
4042− int ret;
4069+ enum intel_display_power_domain power_domain;
4070+ bool ret = true;
4071+
40434072 if (intel_dig_port->base.type != INTEL_OUTPUT_EDP)
40444073 intel_dig_port->base.type = INTEL_OUTPUT_DISPLAYPORT;
40454074
40464075 DRM_DEBUG_KMS("got hpd irq on port %d - %s\n", intel_dig_port->port,
40474076 long_hpd ? "long" : "short");
40484077
4078+ power_domain = intel_display_port_power_domain(intel_encoder);
4079+ intel_display_power_get(dev_priv, power_domain);
4080+
40494081 if (long_hpd) {
4050− if (!ibx_digital_port_connected(dev_priv, intel_dig_port))
4051− goto mst_fail;
4082+
4083+ if (HAS_PCH_SPLIT(dev)) {
4084+ if (!ibx_digital_port_connected(dev_priv, intel_dig_port))
4085+ goto mst_fail;
4086+ } else {
4087+ if (g4x_digital_port_connected(dev, intel_dig_port) != 1)
4088+ goto mst_fail;
4089+ }
40524090
40534091 if (!intel_dp_get_dpcd(intel_dp)) {
40544092 goto mst_fail;
@@ -4061,8 +4099,7 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) · 6 unmodified lines
40614099
40624100 } else {
40634101 if (intel_dp->is_mst) {
4064− ret = intel_dp_check_mst_status(intel_dp);
4065− if (ret == -EINVAL)
4102+ if (intel_dp_check_mst_status(intel_dp) == -EINVAL)
40664103 goto mst_fail;
40674104 }
40684105
@@ -4076,7 +4113,8 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) · 7 unmodified lines
40764113 drm_modeset_unlock(&dev->mode_config.connection_mutex);
40774114 }
40784115 }
4079− return false;
4116+ ret = false;
4117+ goto put_power;
40804118 mst_fail:
40814119 /* if we were in MST mode, and device is not there get out of MST mode */
40824120 if (intel_dp->is_mst) {
@@ -4084,7 +4122,10 @@ mst_fail: · 1 unmodified line
40844122 intel_dp->is_mst = false;
40854123 drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, intel_dp->is_mst);
40864124 }
4087− return true;
4125+put_power:
4126+ intel_display_power_put(dev_priv, power_domain);
4127+
4128+ return ret;
40884129 }
40894130
40904131 /* Return which DP Port should be selected for Transcoder DP control */
@@ -4722,6 +4763,7 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) · 631 unmodified lines
47224763 intel_encoder->disable = intel_disable_dp;
47234764 intel_encoder->get_hw_state = intel_dp_get_hw_state;
47244765 intel_encoder->get_config = intel_dp_get_config;
4766+ intel_encoder->suspend = intel_dp_encoder_suspend;
47254767 if (IS_CHERRYVIEW(dev)) {
47264768 intel_encoder->pre_pll_enable = chv_dp_pre_pll_enable;
47274769 intel_encoder->pre_enable = chv_pre_enable_dp;
drivers/gpu/drm/i915/intel_drv.h+7−2
@@ -153,6 +153,12 @@ struct intel_encoder { · 152 unmodified lines
153153 * be set correctly before calling this function. */
154154 void (*get_config)(struct intel_encoder *,
155155 struct intel_crtc_config *pipe_config);
156+ /*
157+ * Called during system suspend after all pending requests for the
158+ * encoder are flushed (for example for DP AUX transactions) and
159+ * device interrupts are disabled.
160+ */
161+ void (*suspend)(struct intel_encoder *);
156162 int crtc_mask;
157163 enum hpd_pin hpd_pin;
158164 };
@@ -830,8 +836,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector, · 671 unmodified lines
830836 struct intel_load_detect_pipe *old,
831837 struct drm_modeset_acquire_ctx *ctx);
832838 void intel_release_load_detect_pipe(struct drm_connector *connector,
833− struct intel_load_detect_pipe *old,
834− struct drm_modeset_acquire_ctx *ctx);
839+ struct intel_load_detect_pipe *old);
835840 int intel_pin_and_fence_fb_obj(struct drm_device *dev,
836841 struct drm_i915_gem_object *obj,
837842 struct intel_engine_cs *pipelined);
drivers/gpu/drm/i915/intel_lvds.c+1−1
@@ -538,7 +538,7 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = { · 537 unmodified lines
538538 .destroy = intel_encoder_destroy,
539539 };
540540
541−static int __init intel_no_lvds_dmi_callback(const struct dmi_system_id *id)
541+static int intel_no_lvds_dmi_callback(const struct dmi_system_id *id)
542542 {
543543 DRM_INFO("Skipping LVDS initialization for %s\n", id->ident);
544544 return 1;
drivers/gpu/drm/i915/intel_panel.c+4−4
@@ -801,7 +801,7 @@ static void pch_enable_backlight(struct intel_connector *connector) · 800 unmodified lines
801801
802802 cpu_ctl2 = I915_READ(BLC_PWM_CPU_CTL2);
803803 if (cpu_ctl2 & BLM_PWM_ENABLE) {
804− WARN(1, "cpu backlight already enabled\n");
804+ DRM_DEBUG_KMS("cpu backlight already enabled\n");
805805 cpu_ctl2 &= ~BLM_PWM_ENABLE;
806806 I915_WRITE(BLC_PWM_CPU_CTL2, cpu_ctl2);
807807 }
@@ -845,7 +845,7 @@ static void i9xx_enable_backlight(struct intel_connector *connector) · 37 unmodified lines
845845
846846 ctl = I915_READ(BLC_PWM_CTL);
847847 if (ctl & BACKLIGHT_DUTY_CYCLE_MASK_PNV) {
848− WARN(1, "backlight already enabled\n");
848+ DRM_DEBUG_KMS("backlight already enabled\n");
849849 I915_WRITE(BLC_PWM_CTL, 0);
850850 }
851851
@@ -876,7 +876,7 @@ static void i965_enable_backlight(struct intel_connector *connector) · 24 unmodified lines
876876
877877 ctl2 = I915_READ(BLC_PWM_CTL2);
878878 if (ctl2 & BLM_PWM_ENABLE) {
879− WARN(1, "backlight already enabled\n");
879+ DRM_DEBUG_KMS("backlight already enabled\n");
880880 ctl2 &= ~BLM_PWM_ENABLE;
881881 I915_WRITE(BLC_PWM_CTL2, ctl2);
882882 }
@@ -910,7 +910,7 @@ static void vlv_enable_backlight(struct intel_connector *connector) · 27 unmodified lines
910910
911911 ctl2 = I915_READ(VLV_BLC_PWM_CTL2(pipe));
912912 if (ctl2 & BLM_PWM_ENABLE) {
913− WARN(1, "backlight already enabled\n");
913+ DRM_DEBUG_KMS("backlight already enabled\n");
914914 ctl2 &= ~BLM_PWM_ENABLE;
915915 I915_WRITE(VLV_BLC_PWM_CTL2(pipe), ctl2);
916916 }
drivers/gpu/drm/i915/intel_tv.c+13−4
@@ -1311,6 +1311,7 @@ intel_tv_detect(struct drm_connector *connector, bool force) · 1310 unmodified lines
13111311 {
13121312 struct drm_display_mode mode;
13131313 struct intel_tv *intel_tv = intel_attached_tv(connector);
1314+ enum drm_connector_status status;
13141315 int type;
13151316
13161317 DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n",
@@ -1323,16 +1324,24 @@ intel_tv_detect(struct drm_connector *connector, bool force) · 6 unmodified lines
13231324 struct intel_load_detect_pipe tmp;
13241325 struct drm_modeset_acquire_ctx ctx;
13251326
1327+ drm_modeset_acquire_init(&ctx, 0);
1328+
13261329 if (intel_get_load_detect_pipe(connector, &mode, &tmp, &ctx)) {
13271330 type = intel_tv_detect_type(intel_tv, connector);
1328− intel_release_load_detect_pipe(connector, &tmp, &ctx);
1331+ intel_release_load_detect_pipe(connector, &tmp);
1332+ status = type < 0 ?
1333+ connector_status_disconnected :
1334+ connector_status_connected;
13291335 } else
1330− return connector_status_unknown;
1336+ status = connector_status_unknown;
1337+
1338+ drm_modeset_drop_locks(&ctx);
1339+ drm_modeset_acquire_fini(&ctx);
13311340 } else
13321341 return connector->status;
13331342
1334− if (type < 0)
1335− return connector_status_disconnected;
1343+ if (status != connector_status_connected)
1344+ return status;
13361345
13371346 intel_tv->type = type;
13381347 intel_tv_find_better_format(connector);
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c+2−0
@@ -397,6 +397,7 @@ static void mdp4_crtc_prepare(struct drm_crtc *crtc) · 396 unmodified lines
397397 struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
398398 DBG("%s", mdp4_crtc->name);
399399 /* make sure we hold a ref to mdp clks while setting up mode: */
400+ drm_crtc_vblank_get(crtc);
400401 mdp4_enable(get_kms(crtc));
401402 mdp4_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
402403 }
@@ -407,6 +408,7 @@ static void mdp4_crtc_commit(struct drm_crtc *crtc) · 4 unmodified lines
407408 crtc_flush(crtc);
408409 /* drop the ref to mdp clk's that we got in prepare: */
409410 mdp4_disable(get_kms(crtc));
411+ drm_crtc_vblank_put(crtc);
410412 }
411413
412414 static int mdp4_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
drivers/gpu/drm/msm/msm_drv.c+1−2
@@ -974,12 +974,11 @@ static int msm_pdev_probe(struct platform_device *pdev) · 973 unmodified lines
974974
975975 for (i = 0; i < ARRAY_SIZE(devnames); i++) {
976976 struct device *dev;
977− int ret;
978977
979978 dev = bus_find_device_by_name(&platform_bus_type,
980979 NULL, devnames[i]);
981980 if (!dev) {
982− dev_info(master, "still waiting for %s\n", devnames[i]);
981+ dev_info(&pdev->dev, "still waiting for %s\n", devnames[i]);
983982 return -EPROBE_DEFER;
984983 }
985984
drivers/gpu/drm/msm/msm_fbdev.c+1−1
@@ -143,7 +143,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper, · 142 unmodified lines
143143 ret = msm_gem_get_iova_locked(fbdev->bo, 0, &paddr);
144144 if (ret) {
145145 dev_err(dev->dev, "failed to get buffer obj iova: %d\n", ret);
146− goto fail;
146+ goto fail_unlock;
147147 }
148148
149149 fbi = framebuffer_alloc(0, dev->dev);
drivers/gpu/drm/msm/msm_iommu.c+2−2
@@ -27,8 +27,8 @@ struct msm_iommu { · 26 unmodified lines
2727 static int msm_fault_handler(struct iommu_domain *iommu, struct device *dev,
2828 unsigned long iova, int flags, void *arg)
2929 {
30− DBG("*** fault: iova=%08lx, flags=%d", iova, flags);
31− return -ENOSYS;
30+ pr_warn_ratelimited("*** fault: iova=%08lx, flags=%d\n", iova, flags);
31+ return 0;
3232 }
3333
3434 static int msm_iommu_attach(struct msm_mmu *mmu, const char **names, int cnt)
drivers/gpu/drm/nouveau/core/core/parent.c+2−2
@@ -86,7 +86,7 @@ nouveau_parent_lclass(struct nouveau_object *parent, u32 *lclass, int size) · 85 unmodified lines
8686 sclass = nv_parent(parent)->sclass;
8787 while (sclass) {
8888 if (++nr < size)
89− lclass[nr] = sclass->oclass->handle;
89+ lclass[nr] = sclass->oclass->handle & 0xffff;
9090 sclass = sclass->sclass;
9191 }
9292
@@ -96,7 +96,7 @@ nouveau_parent_lclass(struct nouveau_object *parent, u32 *lclass, int size) · 3 unmodified lines
9696 if (engine && (oclass = engine->sclass)) {
9797 while (oclass->ofuncs) {
9898 if (++nr < size)
99− lclass[nr] = oclass->handle;
99+ lclass[nr] = oclass->handle & 0xffff;
100100 oclass++;
101101 }
102102 }
drivers/gpu/drm/radeon/Makefile+1−1
@@ -76,7 +76,7 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ · 75 unmodified lines
7676 evergreen.o evergreen_cs.o evergreen_blit_shaders.o \
7777 evergreen_hdmi.o radeon_trace_points.o ni.o cayman_blit_shaders.o \
7878 atombios_encoders.o radeon_semaphore.o radeon_sa.o atombios_i2c.o si.o \
79− si_blit_shaders.o radeon_prime.o radeon_uvd.o cik.o cik_blit_shaders.o \
79+ si_blit_shaders.o radeon_prime.o cik.o cik_blit_shaders.o \
8080 r600_dpm.o rs780_dpm.o rv6xx_dpm.o rv770_dpm.o rv730_dpm.o rv740_dpm.o \
8181 rv770_smc.o cypress_dpm.o btc_dpm.o sumo_dpm.o sumo_smc.o trinity_dpm.o \
8282 trinity_smc.o ni_dpm.o si_smc.o si_dpm.o kv_smc.o kv_dpm.o ci_smc.o \
drivers/gpu/drm/radeon/ci_dpm.c+3−0
@@ -869,6 +869,9 @@ static int ci_set_thermal_temperature_range(struct radeon_device *rdev, · 868 unmodified lines
869869 WREG32_SMC(CG_THERMAL_CTRL, tmp);
870870 #endif
871871
872+ rdev->pm.dpm.thermal.min_temp = low_temp;
873+ rdev->pm.dpm.thermal.max_temp = high_temp;
874+
872875 return 0;
873876 }
874877
drivers/gpu/drm/radeon/cik.c+49−20
@@ -3483,7 +3483,7 @@ static void cik_gpu_init(struct radeon_device *rdev) · 3482 unmodified lines
34833483 u32 mc_shared_chmap, mc_arb_ramcfg;
34843484 u32 hdp_host_path_cntl;
34853485 u32 tmp;
3486− int i, j, k;
3486+ int i, j;
34873487
34883488 switch (rdev->family) {
34893489 case CHIP_BONAIRE:
@@ -3544,6 +3544,7 @@ static void cik_gpu_init(struct radeon_device *rdev) · 54 unmodified lines
35443544 (rdev->pdev->device == 0x130B) ||
35453545 (rdev->pdev->device == 0x130E) ||
35463546 (rdev->pdev->device == 0x1315) ||
3547+ (rdev->pdev->device == 0x1318) ||
35473548 (rdev->pdev->device == 0x131B)) {
35483549 rdev->config.cik.max_cu_per_sh = 4;
35493550 rdev->config.cik.max_backends_per_se = 1;
@@ -3672,12 +3673,11 @@ static void cik_gpu_init(struct radeon_device *rdev) · 122 unmodified lines
36723673 rdev->config.cik.max_sh_per_se,
36733674 rdev->config.cik.max_backends_per_se);
36743675
3676+ rdev->config.cik.active_cus = 0;
36753677 for (i = 0; i < rdev->config.cik.max_shader_engines; i++) {
36763678 for (j = 0; j < rdev->config.cik.max_sh_per_se; j++) {
3677− for (k = 0; k < rdev->config.cik.max_cu_per_sh; k++) {
3678− rdev->config.cik.active_cus +=
3679− hweight32(cik_get_cu_active_bitmap(rdev, i, j));
3680− }
3679+ rdev->config.cik.active_cus +=
3680+ hweight32(cik_get_cu_active_bitmap(rdev, i, j));
36813681 }
36823682 }
36833683
@@ -3801,7 +3801,7 @@ int cik_ring_test(struct radeon_device *rdev, struct radeon_ring *ring) · 117 unmodified lines
38013801 radeon_ring_write(ring, PACKET3(PACKET3_SET_UCONFIG_REG, 1));
38023802 radeon_ring_write(ring, ((scratch - PACKET3_SET_UCONFIG_REG_START) >> 2));
38033803 radeon_ring_write(ring, 0xDEADBEEF);
3804− radeon_ring_unlock_commit(rdev, ring);
3804+ radeon_ring_unlock_commit(rdev, ring, false);
38053805
38063806 for (i = 0; i < rdev->usec_timeout; i++) {
38073807 tmp = RREG32(scratch);
@@ -3920,6 +3920,17 @@ void cik_fence_compute_ring_emit(struct radeon_device *rdev, · 112 unmodified lines
39203920 radeon_ring_write(ring, 0);
39213921 }
39223922
3923+/**
3924+ * cik_semaphore_ring_emit - emit a semaphore on the CP ring
3925+ *
3926+ * @rdev: radeon_device pointer
3927+ * @ring: radeon ring buffer object
3928+ * @semaphore: radeon semaphore object
3929+ * @emit_wait: Is this a sempahore wait?
3930+ *
3931+ * Emits a semaphore signal/wait packet to the CP ring and prevents the PFP
3932+ * from running ahead of semaphore waits.
3933+ */
39233934 bool cik_semaphore_ring_emit(struct radeon_device *rdev,
39243935 struct radeon_ring *ring,
39253936 struct radeon_semaphore *semaphore,
@@ -3932,6 +3943,12 @@ bool cik_semaphore_ring_emit(struct radeon_device *rdev, · 6 unmodified lines
39323943 radeon_ring_write(ring, lower_32_bits(addr));
39333944 radeon_ring_write(ring, (upper_32_bits(addr) & 0xffff) | sel);
39343945
3946+ if (emit_wait && ring->idx == RADEON_RING_TYPE_GFX_INDEX) {
3947+ /* Prevent the PFP from running ahead of the semaphore wait */
3948+ radeon_ring_write(ring, PACKET3(PACKET3_PFP_SYNC_ME, 0));
3949+ radeon_ring_write(ring, 0x0);
3950+ }
3951+
39353952 return true;
39363953 }
39373954
@@ -4004,7 +4021,7 @@ int cik_copy_cpdma(struct radeon_device *rdev, · 66 unmodified lines
40044021 return r;
40054022 }
40064023
4007− radeon_ring_unlock_commit(rdev, ring);
4024+ radeon_ring_unlock_commit(rdev, ring, false);
40084025 radeon_semaphore_free(rdev, &sem, *fence);
40094026
40104027 return r;
@@ -4103,7 +4120,7 @@ int cik_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) · 92 unmodified lines
41034120 ib.ptr[1] = ((scratch - PACKET3_SET_UCONFIG_REG_START) >> 2);
41044121 ib.ptr[2] = 0xDEADBEEF;
41054122 ib.length_dw = 3;
4106− r = radeon_ib_schedule(rdev, &ib, NULL);
4123+ r = radeon_ib_schedule(rdev, &ib, NULL, false);
41074124 if (r) {
41084125 radeon_scratch_free(rdev, scratch);
41094126 radeon_ib_free(rdev, &ib);
@@ -4324,7 +4341,7 @@ static int cik_cp_gfx_start(struct radeon_device *rdev) · 214 unmodified lines
43244341 radeon_ring_write(ring, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */
43254342 radeon_ring_write(ring, 0x00000010); /* VGT_OUT_DEALLOC_CNTL */
43264343
4327− radeon_ring_unlock_commit(rdev, ring);
4344+ radeon_ring_unlock_commit(rdev, ring, false);
43284345
43294346 return 0;
43304347 }
@@ -5732,20 +5749,17 @@ static int cik_pcie_gart_enable(struct radeon_device *rdev) · 1401 unmodified lines
57325749 WREG32(0x15D8, 0);
57335750 WREG32(0x15DC, 0);
57345751
5735− /* empty context1-15 */
5736− /* FIXME start with 4G, once using 2 level pt switch to full
5737− * vm size space
5738− */
5752+ /* restore context1-15 */
57395753 /* set vm size, must be a multiple of 4 */
57405754 WREG32(VM_CONTEXT1_PAGE_TABLE_START_ADDR, 0);
57415755 WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, rdev->vm_manager.max_pfn);
57425756 for (i = 1; i < 16; i++) {
57435757 if (i < 8)
57445758 WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
5745− rdev->gart.table_addr >> 12);
5759+ rdev->vm_manager.saved_table_addr[i]);
57465760 else
57475761 WREG32(VM_CONTEXT8_PAGE_TABLE_BASE_ADDR + ((i - 8) << 2),
5748− rdev->gart.table_addr >> 12);
5762+ rdev->vm_manager.saved_table_addr[i]);
57495763 }
57505764
57515765 /* enable context1-15 */
@@ -5810,6 +5824,17 @@ static int cik_pcie_gart_enable(struct radeon_device *rdev) · 58 unmodified lines
58105824 */
58115825 static void cik_pcie_gart_disable(struct radeon_device *rdev)
58125826 {
5827+ unsigned i;
5828+
5829+ for (i = 1; i < 16; ++i) {
5830+ uint32_t reg;
5831+ if (i < 8)
5832+ reg = VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2);
5833+ else
5834+ reg = VM_CONTEXT8_PAGE_TABLE_BASE_ADDR + ((i - 8) << 2);
5835+ rdev->vm_manager.saved_table_addr[i] = RREG32(reg);
5836+ }
5837+
58135838 /* Disable all tables */
58145839 WREG32(VM_CONTEXT0_CNTL, 0);
58155840 WREG32(VM_CONTEXT1_CNTL, 0);
@@ -5958,14 +5983,14 @@ void cik_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm) · 142 unmodified lines
59585983
59595984 /* update SH_MEM_* regs */
59605985 radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
5961− radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
5986+ radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
59625987 WRITE_DATA_DST_SEL(0)));
59635988 radeon_ring_write(ring, SRBM_GFX_CNTL >> 2);
59645989 radeon_ring_write(ring, 0);
59655990 radeon_ring_write(ring, VMID(vm->id));
59665991
59675992 radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 6));
5968− radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
5993+ radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
59695994 WRITE_DATA_DST_SEL(0)));
59705995 radeon_ring_write(ring, SH_MEM_BASES >> 2);
59715996 radeon_ring_write(ring, 0);
@@ -5976,7 +6001,7 @@ void cik_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm) · 4 unmodified lines
59766001 radeon_ring_write(ring, 0); /* SH_MEM_APE1_LIMIT */
59776002
59786003 radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
5979− radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
6004+ radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
59806005 WRITE_DATA_DST_SEL(0)));
59816006 radeon_ring_write(ring, SRBM_GFX_CNTL >> 2);
59826007 radeon_ring_write(ring, 0);
@@ -5987,7 +6012,7 @@ void cik_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm) · 4 unmodified lines
59876012
59886013 /* bits 0-15 are the VM contexts0-15 */
59896014 radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
5990− radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
6015+ radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
59916016 WRITE_DATA_DST_SEL(0)));
59926017 radeon_ring_write(ring, VM_INVALIDATE_REQUEST >> 2);
59936018 radeon_ring_write(ring, 0);
@@ -9538,6 +9563,9 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev) · 3544 unmodified lines
95389563 int ret, i;
95399564 u16 tmp16;
95409565
9566+ if (pci_is_root_bus(rdev->pdev->bus))
9567+ return;
9568+
95419569 if (radeon_pcie_gen2 == 0)
95429570 return;
95439571
@@ -9764,7 +9792,8 @@ static void cik_program_aspm(struct radeon_device *rdev) · 220 unmodified lines
97649792 if (orig != data)
97659793 WREG32_PCIE_PORT(PCIE_LC_LINK_WIDTH_CNTL, data);
97669794
9767− if (!disable_clkreq) {
9795+ if (!disable_clkreq &&
9796+ !pci_is_root_bus(rdev->pdev->bus)) {
97689797 struct pci_dev *root = rdev->pdev->bus->self;
97699798 u32 lnkcap;
97709799
drivers/gpu/drm/radeon/cik_sdma.c+3−3
@@ -596,7 +596,7 @@ int cik_copy_dma(struct radeon_device *rdev, · 595 unmodified lines
596596 return r;
597597 }
598598
599− radeon_ring_unlock_commit(rdev, ring);
599+ radeon_ring_unlock_commit(rdev, ring, false);
600600 radeon_semaphore_free(rdev, &sem, *fence);
601601
602602 return r;
@@ -638,7 +638,7 @@ int cik_sdma_ring_test(struct radeon_device *rdev, · 35 unmodified lines
638638 radeon_ring_write(ring, upper_32_bits(rdev->vram_scratch.gpu_addr));
639639 radeon_ring_write(ring, 1); /* number of DWs to follow */
640640 radeon_ring_write(ring, 0xDEADBEEF);
641− radeon_ring_unlock_commit(rdev, ring);
641+ radeon_ring_unlock_commit(rdev, ring, false);
642642
643643 for (i = 0; i < rdev->usec_timeout; i++) {
644644 tmp = readl(ptr);
@@ -695,7 +695,7 @@ int cik_sdma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) · 50 unmodified lines
695695 ib.ptr[4] = 0xDEADBEEF;
696696 ib.length_dw = 5;
697697
698− r = radeon_ib_schedule(rdev, &ib, NULL);
698+ r = radeon_ib_schedule(rdev, &ib, NULL, false);
699699 if (r) {
700700 radeon_ib_free(rdev, &ib);
701701 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
drivers/gpu/drm/radeon/evergreen.c+2−2
@@ -2869,7 +2869,7 @@ static int evergreen_cp_start(struct radeon_device *rdev) · 2868 unmodified lines
28692869 radeon_ring_write(ring, PACKET3_ME_INITIALIZE_DEVICE_ID(1));
28702870 radeon_ring_write(ring, 0);
28712871 radeon_ring_write(ring, 0);
2872− radeon_ring_unlock_commit(rdev, ring);
2872+ radeon_ring_unlock_commit(rdev, ring, false);
28732873
28742874 cp_me = 0xff;
28752875 WREG32(CP_ME_CNTL, cp_me);
@@ -2912,7 +2912,7 @@ static int evergreen_cp_start(struct radeon_device *rdev) · 36 unmodified lines
29122912 radeon_ring_write(ring, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */
29132913 radeon_ring_write(ring, 0x00000010); /* */
29142914
2915− radeon_ring_unlock_commit(rdev, ring);
2915+ radeon_ring_unlock_commit(rdev, ring, false);
29162916
29172917 return 0;
29182918 }
drivers/gpu/drm/radeon/evergreen_dma.c+1−1
@@ -155,7 +155,7 @@ int evergreen_copy_dma(struct radeon_device *rdev, · 154 unmodified lines
155155 return r;
156156 }
157157
158− radeon_ring_unlock_commit(rdev, ring);
158+ radeon_ring_unlock_commit(rdev, ring, false);
159159 radeon_semaphore_free(rdev, &sem, *fence);
160160
161161 return r;
drivers/gpu/drm/radeon/kv_dpm.c+7−4
@@ -1438,14 +1438,14 @@ static int kv_update_uvd_dpm(struct radeon_device *rdev, bool gate) · 1437 unmodified lines
14381438 return kv_enable_uvd_dpm(rdev, !gate);
14391439 }
14401440
1441−static u8 kv_get_vce_boot_level(struct radeon_device *rdev)
1441+static u8 kv_get_vce_boot_level(struct radeon_device *rdev, u32 evclk)
14421442 {
14431443 u8 i;
14441444 struct radeon_vce_clock_voltage_dependency_table *table =
14451445 &rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table;
14461446
14471447 for (i = 0; i < table->count; i++) {
1448− if (table->entries[i].evclk >= 0) /* XXX */
1448+ if (table->entries[i].evclk >= evclk)
14491449 break;
14501450 }
14511451
@@ -1468,7 +1468,7 @@ static int kv_update_vce_dpm(struct radeon_device *rdev, · 16 unmodified lines
14681468 if (pi->caps_stable_p_state)
14691469 pi->vce_boot_level = table->count - 1;
14701470 else
1471− pi->vce_boot_level = kv_get_vce_boot_level(rdev);
1471+ pi->vce_boot_level = kv_get_vce_boot_level(rdev, radeon_new_state->evclk);
14721472
14731473 ret = kv_copy_bytes_to_smc(rdev,
14741474 pi->dpm_table_start +
@@ -2726,7 +2726,10 @@ int kv_dpm_init(struct radeon_device *rdev) · 1251 unmodified lines
27262726 pi->caps_sclk_ds = true;
27272727 pi->enable_auto_thermal_throttling = true;
27282728 pi->disable_nb_ps3_in_battery = false;
2729− pi->bapm_enable = true;
2729+ if (radeon_bapm == 0)
2730+ pi->bapm_enable = false;
2731+ else
2732+ pi->bapm_enable = true;
27302733 pi->voltage_drop_t = 0;
27312734 pi->caps_sclk_throttle_low_notification = false;
27322735 pi->caps_fps = false; /* true? */
drivers/gpu/drm/radeon/ni.c+10−3
@@ -1271,7 +1271,7 @@ static int cayman_pcie_gart_enable(struct radeon_device *rdev) · 1270 unmodified lines
12711271 WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR + (i << 2), 0);
12721272 WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR + (i << 2), rdev->vm_manager.max_pfn);
12731273 WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
1274− rdev->gart.table_addr >> 12);
1274+ rdev->vm_manager.saved_table_addr[i]);
12751275 }
12761276
12771277 /* enable context1-7 */
@@ -1303,6 +1303,13 @@ static int cayman_pcie_gart_enable(struct radeon_device *rdev) · 25 unmodified lines
13031303
13041304 static void cayman_pcie_gart_disable(struct radeon_device *rdev)
13051305 {
1306+ unsigned i;
1307+
1308+ for (i = 1; i < 8; ++i) {
1309+ rdev->vm_manager.saved_table_addr[i] = RREG32(
1310+ VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2));
1311+ }
1312+
13061313 /* Disable all tables */
13071314 WREG32(VM_CONTEXT0_CNTL, 0);
13081315 WREG32(VM_CONTEXT1_CNTL, 0);
@@ -1505,7 +1512,7 @@ static int cayman_cp_start(struct radeon_device *rdev) · 196 unmodified lines
15051512 radeon_ring_write(ring, PACKET3_ME_INITIALIZE_DEVICE_ID(1));
15061513 radeon_ring_write(ring, 0);
15071514 radeon_ring_write(ring, 0);
1508− radeon_ring_unlock_commit(rdev, ring);
1515+ radeon_ring_unlock_commit(rdev, ring, false);
15091516
15101517 cayman_cp_enable(rdev, true);
15111518
@@ -1547,7 +1554,7 @@ static int cayman_cp_start(struct radeon_device *rdev) · 35 unmodified lines
15471554 radeon_ring_write(ring, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */
15481555 radeon_ring_write(ring, 0x00000010); /* */
15491556
1550− radeon_ring_unlock_commit(rdev, ring);
1557+ radeon_ring_unlock_commit(rdev, ring, false);
15511558
15521559 /* XXX init other rings */
15531560
drivers/gpu/drm/radeon/r100.c+4−4
@@ -925,7 +925,7 @@ int r100_copy_blit(struct radeon_device *rdev, · 924 unmodified lines
925925 if (fence) {
926926 r = radeon_fence_emit(rdev, fence, RADEON_RING_TYPE_GFX_INDEX);
927927 }
928− radeon_ring_unlock_commit(rdev, ring);
928+ radeon_ring_unlock_commit(rdev, ring, false);
929929 return r;
930930 }
931931
@@ -958,7 +958,7 @@ void r100_ring_start(struct radeon_device *rdev, struct radeon_ring *ring) · 26 unmodified lines
958958 RADEON_ISYNC_ANY3D_IDLE2D |
959959 RADEON_ISYNC_WAIT_IDLEGUI |
960960 RADEON_ISYNC_CPSCRATCH_IDLEGUI);
961− radeon_ring_unlock_commit(rdev, ring);
961+ radeon_ring_unlock_commit(rdev, ring, false);
962962 }
963963
964964
@@ -3638,7 +3638,7 @@ int r100_ring_test(struct radeon_device *rdev, struct radeon_ring *ring) · 2673 unmodified lines
36383638 }
36393639 radeon_ring_write(ring, PACKET0(scratch, 0));
36403640 radeon_ring_write(ring, 0xDEADBEEF);
3641− radeon_ring_unlock_commit(rdev, ring);
3641+ radeon_ring_unlock_commit(rdev, ring, false);
36423642 for (i = 0; i < rdev->usec_timeout; i++) {
36433643 tmp = RREG32(scratch);
36443644 if (tmp == 0xDEADBEEF) {
@@ -3700,7 +3700,7 @@ int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) · 55 unmodified lines
37003700 ib.ptr[6] = PACKET2(0);
37013701 ib.ptr[7] = PACKET2(0);
37023702 ib.length_dw = 8;
3703− r = radeon_ib_schedule(rdev, &ib, NULL);
3703+ r = radeon_ib_schedule(rdev, &ib, NULL, false);
37043704 if (r) {
37053705 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
37063706 goto free_ib;
drivers/gpu/drm/radeon/r200.c+1−1
@@ -121,7 +121,7 @@ int r200_copy_dma(struct radeon_device *rdev, · 120 unmodified lines
121121 if (fence) {
122122 r = radeon_fence_emit(rdev, fence, RADEON_RING_TYPE_GFX_INDEX);
123123 }
124− radeon_ring_unlock_commit(rdev, ring);
124+ radeon_ring_unlock_commit(rdev, ring, false);
125125 return r;
126126 }
127127
drivers/gpu/drm/radeon/r300.c+1−1
@@ -295,7 +295,7 @@ void r300_ring_start(struct radeon_device *rdev, struct radeon_ring *ring) · 294 unmodified lines
295295 radeon_ring_write(ring,
296296 R300_GEOMETRY_ROUND_NEAREST |
297297 R300_COLOR_ROUND_NEAREST);
298− radeon_ring_unlock_commit(rdev, ring);
298+ radeon_ring_unlock_commit(rdev, ring, false);
299299 }
300300
301301 static void r300_errata(struct radeon_device *rdev)
drivers/gpu/drm/radeon/r420.c+2−2
@@ -219,7 +219,7 @@ static void r420_cp_errata_init(struct radeon_device *rdev) · 218 unmodified lines
219219 radeon_ring_write(ring, PACKET0(R300_CP_RESYNC_ADDR, 1));
220220 radeon_ring_write(ring, rdev->config.r300.resync_scratch);
221221 radeon_ring_write(ring, 0xDEADBEEF);
222− radeon_ring_unlock_commit(rdev, ring);
222+ radeon_ring_unlock_commit(rdev, ring, false);
223223 }
224224
225225 static void r420_cp_errata_fini(struct radeon_device *rdev)
@@ -232,7 +232,7 @@ static void r420_cp_errata_fini(struct radeon_device *rdev) · 6 unmodified lines
232232 radeon_ring_lock(rdev, ring, 8);
233233 radeon_ring_write(ring, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
234234 radeon_ring_write(ring, R300_RB3D_DC_FINISH);
235− radeon_ring_unlock_commit(rdev, ring);
235+ radeon_ring_unlock_commit(rdev, ring, false);
236236 radeon_scratch_free(rdev, rdev->config.r300.resync_scratch);
237237 }
238238
drivers/gpu/drm/radeon/r600.c+30−22
@@ -1812,7 +1812,6 @@ static void r600_gpu_init(struct radeon_device *rdev) · 1811 unmodified lines
18121812 {
18131813 u32 tiling_config;
18141814 u32 ramcfg;
1815− u32 cc_rb_backend_disable;
18161815 u32 cc_gc_shader_pipe_config;
18171816 u32 tmp;
18181817 int i, j;
@@ -1939,29 +1938,20 @@ static void r600_gpu_init(struct radeon_device *rdev) · 120 unmodified lines
19391938 }
19401939 tiling_config |= BANK_SWAPS(1);
19411940
1942− cc_rb_backend_disable = RREG32(CC_RB_BACKEND_DISABLE) & 0x00ff0000;
1943− tmp = R6XX_MAX_BACKENDS -
1944− r600_count_pipe_bits((cc_rb_backend_disable >> 16) & R6XX_MAX_BACKENDS_MASK);
1945− if (tmp < rdev->config.r600.max_backends) {
1946− rdev->config.r600.max_backends = tmp;
1947− }
1948−
19491941 cc_gc_shader_pipe_config = RREG32(CC_GC_SHADER_PIPE_CONFIG) & 0x00ffff00;
1950− tmp = R6XX_MAX_PIPES -
1951− r600_count_pipe_bits((cc_gc_shader_pipe_config >> 8) & R6XX_MAX_PIPES_MASK);
1952− if (tmp < rdev->config.r600.max_pipes) {
1953− rdev->config.r600.max_pipes = tmp;
1954− }
1955− tmp = R6XX_MAX_SIMDS -
1956− r600_count_pipe_bits((cc_gc_shader_pipe_config >> 16) & R6XX_MAX_SIMDS_MASK);
1957− if (tmp < rdev->config.r600.max_simds) {
1958− rdev->config.r600.max_simds = tmp;
1959− }
19601942 tmp = rdev->config.r600.max_simds -
19611943 r600_count_pipe_bits((cc_gc_shader_pipe_config >> 16) & R6XX_MAX_SIMDS_MASK);
19621944 rdev->config.r600.active_simds = tmp;
19631945
19641946 disabled_rb_mask = (RREG32(CC_RB_BACKEND_DISABLE) >> 16) & R6XX_MAX_BACKENDS_MASK;
1947+ tmp = 0;
1948+ for (i = 0; i < rdev->config.r600.max_backends; i++)
1949+ tmp |= (1 << i);
1950+ /* if all the backends are disabled, fix it up here */
1951+ if ((disabled_rb_mask & tmp) == tmp) {
1952+ for (i = 0; i < rdev->config.r600.max_backends; i++)
1953+ disabled_rb_mask &= ~(1 << i);
1954+ }
19651955 tmp = (tiling_config & PIPE_TILING__MASK) >> PIPE_TILING__SHIFT;
19661956 tmp = r6xx_remap_render_backend(rdev, tmp, rdev->config.r600.max_backends,
19671957 R6XX_MAX_BACKENDS, disabled_rb_mask);
@@ -2547,7 +2537,7 @@ int r600_cp_start(struct radeon_device *rdev) · 579 unmodified lines
25472537 radeon_ring_write(ring, PACKET3_ME_INITIALIZE_DEVICE_ID(1));
25482538 radeon_ring_write(ring, 0);
25492539 radeon_ring_write(ring, 0);
2550− radeon_ring_unlock_commit(rdev, ring);
2540+ radeon_ring_unlock_commit(rdev, ring, false);
25512541
25522542 cp_me = 0xff;
25532543 WREG32(R_0086D8_CP_ME_CNTL, cp_me);
@@ -2683,7 +2673,7 @@ int r600_ring_test(struct radeon_device *rdev, struct radeon_ring *ring) · 129 unmodified lines
26832673 radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));
26842674 radeon_ring_write(ring, ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) >> 2));
26852675 radeon_ring_write(ring, 0xDEADBEEF);
2686− radeon_ring_unlock_commit(rdev, ring);
2676+ radeon_ring_unlock_commit(rdev, ring, false);
26872677 for (i = 0; i < rdev->usec_timeout; i++) {
26882678 tmp = RREG32(scratch);
26892679 if (tmp == 0xDEADBEEF)
@@ -2753,6 +2743,17 @@ void r600_fence_ring_emit(struct radeon_device *rdev, · 63 unmodified lines
27532743 }
27542744 }
27552745
2746+/**
2747+ * r600_semaphore_ring_emit - emit a semaphore on the CP ring
2748+ *
2749+ * @rdev: radeon_device pointer
2750+ * @ring: radeon ring buffer object
2751+ * @semaphore: radeon semaphore object
2752+ * @emit_wait: Is this a sempahore wait?
2753+ *
2754+ * Emits a semaphore signal/wait packet to the CP ring and prevents the PFP
2755+ * from running ahead of semaphore waits.
2756+ */
27562757 bool r600_semaphore_ring_emit(struct radeon_device *rdev,
27572758 struct radeon_ring *ring,
27582759 struct radeon_semaphore *semaphore,
@@ -2768,6 +2769,13 @@ bool r600_semaphore_ring_emit(struct radeon_device *rdev, · 9 unmodified lines
27682769 radeon_ring_write(ring, lower_32_bits(addr));
27692770 radeon_ring_write(ring, (upper_32_bits(addr) & 0xff) | sel);
27702771
2772+ /* PFP_SYNC_ME packet only exists on 7xx+ */
2773+ if (emit_wait && (rdev->family >= CHIP_RV770)) {
2774+ /* Prevent the PFP from running ahead of the semaphore wait */
2775+ radeon_ring_write(ring, PACKET3(PACKET3_PFP_SYNC_ME, 0));
2776+ radeon_ring_write(ring, 0x0);
2777+ }
2778+
27712779 return true;
27722780 }
27732781
@@ -2845,7 +2853,7 @@ int r600_copy_cpdma(struct radeon_device *rdev, · 71 unmodified lines
28452853 return r;
28462854 }
28472855
2848− radeon_ring_unlock_commit(rdev, ring);
2856+ radeon_ring_unlock_commit(rdev, ring, false);
28492857 radeon_semaphore_free(rdev, &sem, *fence);
28502858
28512859 return r;
@@ -3165,7 +3173,7 @@ int r600_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) · 313 unmodified lines
31653173 ib.ptr[1] = ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);
31663174 ib.ptr[2] = 0xDEADBEEF;
31673175 ib.length_dw = 3;
3168− r = radeon_ib_schedule(rdev, &ib, NULL);
3176+ r = radeon_ib_schedule(rdev, &ib, NULL, false);
31693177 if (r) {
31703178 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
31713179 goto free_ib;
drivers/gpu/drm/radeon/r600_dma.c+3−3
@@ -261,7 +261,7 @@ int r600_dma_ring_test(struct radeon_device *rdev, · 260 unmodified lines
261261 radeon_ring_write(ring, rdev->vram_scratch.gpu_addr & 0xfffffffc);
262262 radeon_ring_write(ring, upper_32_bits(rdev->vram_scratch.gpu_addr) & 0xff);
263263 radeon_ring_write(ring, 0xDEADBEEF);
264− radeon_ring_unlock_commit(rdev, ring);
264+ radeon_ring_unlock_commit(rdev, ring, false);
265265
266266 for (i = 0; i < rdev->usec_timeout; i++) {
267267 tmp = readl(ptr);
@@ -368,7 +368,7 @@ int r600_dma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) · 100 unmodified lines
368368 ib.ptr[3] = 0xDEADBEEF;
369369 ib.length_dw = 4;
370370
371− r = radeon_ib_schedule(rdev, &ib, NULL);
371+ r = radeon_ib_schedule(rdev, &ib, NULL, false);
372372 if (r) {
373373 radeon_ib_free(rdev, &ib);
374374 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
@@ -493,7 +493,7 @@ int r600_copy_dma(struct radeon_device *rdev, · 118 unmodified lines
493493 return r;
494494 }
495495
496− radeon_ring_unlock_commit(rdev, ring);
496+ radeon_ring_unlock_commit(rdev, ring, false);
497497 radeon_semaphore_free(rdev, &sem, *fence);
498498
499499 return r;
drivers/gpu/drm/radeon/r600d.h+1−0
@@ -1597,6 +1597,7 @@ · 1596 unmodified lines
15971597 */
15981598 # define PACKET3_CP_DMA_CMD_SAIC (1 << 28)
15991599 # define PACKET3_CP_DMA_CMD_DAIC (1 << 29)
1600+#define PACKET3_PFP_SYNC_ME 0x42 /* r7xx+ only */
16001601 #define PACKET3_SURFACE_SYNC 0x43
16011602 # define PACKET3_CB0_DEST_BASE_ENA (1 << 6)
16021603 # define PACKET3_FULL_CACHE_ENA (1 << 20) /* r7xx+ only */
drivers/gpu/drm/radeon/radeon.h+8−3
@@ -105,6 +105,7 @@ extern int radeon_vm_size; · 104 unmodified lines
105105 extern int radeon_vm_block_size;
106106 extern int radeon_deep_color;
107107 extern int radeon_use_pflipirq;
108+extern int radeon_bapm;
108109
109110 /*
110111 * Copy from radeon_drv.h so we don't have to include both and have conflicting
@@ -914,6 +915,8 @@ struct radeon_vm_manager { · 803 unmodified lines
914915 u64 vram_base_offset;
915916 /* is vm enabled? */
916917 bool enabled;
918+ /* for hw to save the PD addr on suspend/resume */
919+ uint32_t saved_table_addr[RADEON_NUM_VM];
917920 };
918921
919922 /*
@@ -967,7 +970,7 @@ int radeon_ib_get(struct radeon_device *rdev, int ring, · 47 unmodified lines
967970 unsigned size);
968971 void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib *ib);
969972 int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib,
970− struct radeon_ib *const_ib);
973+ struct radeon_ib *const_ib, bool hdp_flush);
971974 int radeon_ib_pool_init(struct radeon_device *rdev);
972975 void radeon_ib_pool_fini(struct radeon_device *rdev);
973976 int radeon_ib_ring_tests(struct radeon_device *rdev);
@@ -977,8 +980,10 @@ bool radeon_ring_supports_scratch_reg(struct radeon_device *rdev, · 3 unmodified lines
977980 void radeon_ring_free_size(struct radeon_device *rdev, struct radeon_ring *cp);
978981 int radeon_ring_alloc(struct radeon_device *rdev, struct radeon_ring *cp, unsigned ndw);
979982 int radeon_ring_lock(struct radeon_device *rdev, struct radeon_ring *cp, unsigned ndw);
980−void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *cp);
981−void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *cp);
983+void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *cp,
984+ bool hdp_flush);
985+void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *cp,
986+ bool hdp_flush);
982987 void radeon_ring_undo(struct radeon_ring *ring);
983988 void radeon_ring_unlock_undo(struct radeon_device *rdev, struct radeon_ring *cp);
984989 int radeon_ring_test(struct radeon_device *rdev, struct radeon_ring *cp);
drivers/gpu/drm/radeon/radeon_cs.c+5−4
@@ -132,7 +132,8 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) · 131 unmodified lines
132132 * the buffers used for read only, which doubles the range
133133 * to 0 to 31. 32 is reserved for the kernel driver.
134134 */
135− priority = (r->flags & 0xf) * 2 + !!r->write_domain;
135+ priority = (r->flags & RADEON_RELOC_PRIO_MASK) * 2
136+ + !!r->write_domain;
136137
137138 /* the first reloc of an UVD job is the msg and that must be in
138139 VRAM, also but everything into VRAM on AGP cards to avoid
@@ -450,7 +451,7 @@ static int radeon_cs_ib_chunk(struct radeon_device *rdev, · 311 unmodified lines
450451 radeon_vce_note_usage(rdev);
451452
452453 radeon_cs_sync_rings(parser);
453− r = radeon_ib_schedule(rdev, &parser->ib, NULL);
454+ r = radeon_ib_schedule(rdev, &parser->ib, NULL, true);
454455 if (r) {
455456 DRM_ERROR("Failed to schedule IB !\n");
456457 }
@@ -541,9 +542,9 @@ static int radeon_cs_ib_vm_chunk(struct radeon_device *rdev, · 84 unmodified lines
541542
542543 if ((rdev->family >= CHIP_TAHITI) &&
543544 (parser->chunk_const_ib_idx != -1)) {
544− r = radeon_ib_schedule(rdev, &parser->ib, &parser->const_ib);
545+ r = radeon_ib_schedule(rdev, &parser->ib, &parser->const_ib, true);
545546 } else {
546− r = radeon_ib_schedule(rdev, &parser->ib, NULL);
547+ r = radeon_ib_schedule(rdev, &parser->ib, NULL, true);
547548 }
548549
549550 out:
drivers/gpu/drm/radeon/radeon_device.c+32−2
@@ -1680,8 +1680,8 @@ int radeon_gpu_reset(struct radeon_device *rdev) · 1679 unmodified lines
16801680 radeon_save_bios_scratch_regs(rdev);
16811681 /* block TTM */
16821682 resched = ttm_bo_lock_delayed_workqueue(&rdev->mman.bdev);
1683− radeon_pm_suspend(rdev);
16841683 radeon_suspend(rdev);
1684+ radeon_hpd_fini(rdev);
16851685
16861686 for (i = 0; i < RADEON_NUM_RINGS; ++i) {
16871687 ring_sizes[i] = radeon_ring_backup(rdev, &rdev->ring[i],
@@ -1726,9 +1726,39 @@ retry: · 38 unmodified lines
17261726 }
17271727 }
17281728
1729− radeon_pm_resume(rdev);
1729+ if ((rdev->pm.pm_method == PM_METHOD_DPM) && rdev->pm.dpm_enabled) {
1730+ /* do dpm late init */
1731+ r = radeon_pm_late_init(rdev);
1732+ if (r) {
1733+ rdev->pm.dpm_enabled = false;
1734+ DRM_ERROR("radeon_pm_late_init failed, disabling dpm\n");
1735+ }
1736+ } else {
1737+ /* resume old pm late */
1738+ radeon_pm_resume(rdev);
1739+ }
1740+
1741+ /* init dig PHYs, disp eng pll */
1742+ if (rdev->is_atom_bios) {
1743+ radeon_atom_encoder_init(rdev);
1744+ radeon_atom_disp_eng_pll_init(rdev);
1745+ /* turn on the BL */
1746+ if (rdev->mode_info.bl_encoder) {
1747+ u8 bl_level = radeon_get_backlight_level(rdev,
1748+ rdev->mode_info.bl_encoder);
1749+ radeon_set_backlight_level(rdev, rdev->mode_info.bl_encoder,
1750+ bl_level);
1751+ }
1752+ }
1753+ /* reset hpd state */
1754+ radeon_hpd_init(rdev);
1755+
17301756 drm_helper_resume_force_mode(rdev->ddev);
17311757
1758+ /* set the power state here in case we are a PX system or headless */
1759+ if ((rdev->pm.pm_method == PM_METHOD_DPM) && rdev->pm.dpm_enabled)
1760+ radeon_pm_compute_clocks(rdev);
1761+
17321762 ttm_bo_unlock_delayed_workqueue(&rdev->mman.bdev, resched);
17331763 if (r) {
17341764 /* bad news, how to tell it to userspace ? */
drivers/gpu/drm/radeon/radeon_drv.c+4−0
@@ -180,6 +180,7 @@ int radeon_vm_size = 8; · 179 unmodified lines
180180 int radeon_vm_block_size = -1;
181181 int radeon_deep_color = 0;
182182 int radeon_use_pflipirq = 2;
183+int radeon_bapm = -1;
183184
184185 MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
185186 module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -259,6 +260,9 @@ module_param_named(deep_color, radeon_deep_color, int, 0444); · 73 unmodified lines
259260 MODULE_PARM_DESC(use_pflipirq, "Pflip irqs for pageflip completion (0 = disable, 1 = as fallback, 2 = exclusive (default))");
260261 module_param_named(use_pflipirq, radeon_use_pflipirq, int, 0444);
261262
263+MODULE_PARM_DESC(bapm, "BAPM support (1 = enable, 0 = disable, -1 = auto)");
264+module_param_named(bapm, radeon_bapm, int, 0444);
265+
262266 static struct pci_device_id pciidlist[] = {
263267 radeon_PCI_IDS
264268 };
drivers/gpu/drm/radeon/radeon_ib.c+3−2
@@ -107,6 +107,7 @@ void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib *ib) · 106 unmodified lines
107107 * @rdev: radeon_device pointer
108108 * @ib: IB object to schedule
109109 * @const_ib: Const IB to schedule (SI only)
110+ * @hdp_flush: Whether or not to perform an HDP cache flush
110111 *
111112 * Schedule an IB on the associated ring (all asics).
112113 * Returns 0 on success, error on failure.
@@ -122,7 +123,7 @@ void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib *ib) · 9 unmodified lines
122123 * to SI there was just a DE IB.
123124 */
124125 int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib,
125− struct radeon_ib *const_ib)
126+ struct radeon_ib *const_ib, bool hdp_flush)
126127 {
127128 struct radeon_ring *ring = &rdev->ring[ib->ring];
128129 int r = 0;
@@ -176,7 +177,7 @@ int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib, · 47 unmodified lines
176177 if (ib->vm)
177178 radeon_vm_fence(rdev, ib->vm, ib->fence);
178179
179− radeon_ring_unlock_commit(rdev, ring);
180+ radeon_ring_unlock_commit(rdev, ring, hdp_flush);
180181 return 0;
181182 }
182183
drivers/gpu/drm/radeon/radeon_pm.c+6−10
@@ -460,10 +460,6 @@ static ssize_t radeon_get_dpm_state(struct device *dev, · 459 unmodified lines
460460 struct radeon_device *rdev = ddev->dev_private;
461461 enum radeon_pm_state_type pm = rdev->pm.dpm.user_state;
462462
463− if ((rdev->flags & RADEON_IS_PX) &&
464− (ddev->switch_power_state != DRM_SWITCH_POWER_ON))
465− return snprintf(buf, PAGE_SIZE, "off\n");
466−
467463 return snprintf(buf, PAGE_SIZE, "%s\n",
468464 (pm == POWER_STATE_TYPE_BATTERY) ? "battery" :
469465 (pm == POWER_STATE_TYPE_BALANCED) ? "balanced" : "performance");
@@ -477,11 +473,6 @@ static ssize_t radeon_set_dpm_state(struct device *dev, · 7 unmodified lines
477473 struct drm_device *ddev = dev_get_drvdata(dev);
478474 struct radeon_device *rdev = ddev->dev_private;
479475
480− /* Can't set dpm state when the card is off */
481− if ((rdev->flags & RADEON_IS_PX) &&
482− (ddev->switch_power_state != DRM_SWITCH_POWER_ON))
483− return -EINVAL;
484−
485476 mutex_lock(&rdev->pm.mutex);
486477 if (strncmp("battery", buf, strlen("battery")) == 0)
487478 rdev->pm.dpm.user_state = POWER_STATE_TYPE_BATTERY;
@@ -495,7 +486,12 @@ static ssize_t radeon_set_dpm_state(struct device *dev, · 7 unmodified lines
495486 goto fail;
496487 }
497488 mutex_unlock(&rdev->pm.mutex);
498− radeon_pm_compute_clocks(rdev);
489+
490+ /* Can't set dpm state when the card is off */
491+ if (!(rdev->flags & RADEON_IS_PX) ||
492+ (ddev->switch_power_state == DRM_SWITCH_POWER_ON))
493+ radeon_pm_compute_clocks(rdev);
494+
499495 fail:
500496 return count;
501497 }
drivers/gpu/drm/radeon/radeon_ring.c+11−9
@@ -177,16 +177,18 @@ int radeon_ring_lock(struct radeon_device *rdev, struct radeon_ring *ring, unsig · 176 unmodified lines
177177 *
178178 * @rdev: radeon_device pointer
179179 * @ring: radeon_ring structure holding ring information
180+ * @hdp_flush: Whether or not to perform an HDP cache flush
180181 *
181182 * Update the wptr (write pointer) to tell the GPU to
182183 * execute new commands on the ring buffer (all asics).
183184 */
184−void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *ring)
185+void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *ring,
186+ bool hdp_flush)
185187 {
186188 /* If we are emitting the HDP flush via the ring buffer, we need to
187189 * do it before padding.
188190 */
189− if (rdev->asic->ring[ring->idx]->hdp_flush)
191+ if (hdp_flush && rdev->asic->ring[ring->idx]->hdp_flush)
190192 rdev->asic->ring[ring->idx]->hdp_flush(rdev, ring);
191193 /* We pad to match fetch size */
192194 while (ring->wptr & ring->align_mask) {
@@ -196,7 +198,7 @@ void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *ring) · 3 unmodified lines
196198 /* If we are emitting the HDP flush via MMIO, we need to do it after
197199 * all CPU writes to VRAM finished.
198200 */
199− if (rdev->asic->mmio_hdp_flush)
201+ if (hdp_flush && rdev->asic->mmio_hdp_flush)
200202 rdev->asic->mmio_hdp_flush(rdev);
201203 radeon_ring_set_wptr(rdev, ring);
202204 }
@@ -207,12 +209,14 @@ void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *ring) · 4 unmodified lines
207209 *
208210 * @rdev: radeon_device pointer
209211 * @ring: radeon_ring structure holding ring information
212+ * @hdp_flush: Whether or not to perform an HDP cache flush
210213 *
211214 * Call radeon_ring_commit() then unlock the ring (all asics).
212215 */
213−void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *ring)
216+void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *ring,
217+ bool hdp_flush)
214218 {
215− radeon_ring_commit(rdev, ring);
219+ radeon_ring_commit(rdev, ring, hdp_flush);
216220 mutex_unlock(&rdev->ring_lock);
217221 }
218222
@@ -372,7 +376,7 @@ int radeon_ring_restore(struct radeon_device *rdev, struct radeon_ring *ring, · 153 unmodified lines
372376 radeon_ring_write(ring, data[i]);
373377 }
374378
375− radeon_ring_unlock_commit(rdev, ring);
379+ radeon_ring_unlock_commit(rdev, ring, false);
376380 kfree(data);
377381 return 0;
378382 }
@@ -400,9 +404,7 @@ int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *ring, unsig · 21 unmodified lines
400404 /* Allocate ring buffer */
401405 if (ring->ring_obj == NULL) {
402406 r = radeon_bo_create(rdev, ring->ring_size, PAGE_SIZE, true,
403− RADEON_GEM_DOMAIN_GTT,
404− (rdev->flags & RADEON_IS_PCIE) ?
405− RADEON_GEM_GTT_WC : 0,
407+ RADEON_GEM_DOMAIN_GTT, 0,
406408 NULL, &ring->ring_obj);
407409 if (r) {
408410 dev_err(rdev->dev, "(%d) ring create failed\n", r);
drivers/gpu/drm/radeon/radeon_semaphore.c+1−1
@@ -179,7 +179,7 @@ int radeon_semaphore_sync_rings(struct radeon_device *rdev, · 178 unmodified lines
179179 continue;
180180 }
181181
182− radeon_ring_commit(rdev, &rdev->ring[i]);
182+ radeon_ring_commit(rdev, &rdev->ring[i], false);
183183 radeon_fence_note_sync(fence, ring);
184184
185185 semaphore->gpu_addr += 8;
drivers/gpu/drm/radeon/radeon_test.c+9−9
@@ -288,7 +288,7 @@ static int radeon_test_create_and_emit_fence(struct radeon_device *rdev, · 287 unmodified lines
288288 return r;
289289 }
290290 radeon_fence_emit(rdev, fence, ring->idx);
291− radeon_ring_unlock_commit(rdev, ring);
291+ radeon_ring_unlock_commit(rdev, ring, false);
292292 }
293293 return 0;
294294 }
@@ -313,7 +313,7 @@ void radeon_test_ring_sync(struct radeon_device *rdev, · 18 unmodified lines
313313 goto out_cleanup;
314314 }
315315 radeon_semaphore_emit_wait(rdev, ringA->idx, semaphore);
316− radeon_ring_unlock_commit(rdev, ringA);
316+ radeon_ring_unlock_commit(rdev, ringA, false);
317317
318318 r = radeon_test_create_and_emit_fence(rdev, ringA, &fence1);
319319 if (r)
@@ -325,7 +325,7 @@ void radeon_test_ring_sync(struct radeon_device *rdev, · 5 unmodified lines
325325 goto out_cleanup;
326326 }
327327 radeon_semaphore_emit_wait(rdev, ringA->idx, semaphore);
328− radeon_ring_unlock_commit(rdev, ringA);
328+ radeon_ring_unlock_commit(rdev, ringA, false);
329329
330330 r = radeon_test_create_and_emit_fence(rdev, ringA, &fence2);
331331 if (r)
@@ -344,7 +344,7 @@ void radeon_test_ring_sync(struct radeon_device *rdev, · 12 unmodified lines
344344 goto out_cleanup;
345345 }
346346 radeon_semaphore_emit_signal(rdev, ringB->idx, semaphore);
347− radeon_ring_unlock_commit(rdev, ringB);
347+ radeon_ring_unlock_commit(rdev, ringB, false);
348348
349349 r = radeon_fence_wait(fence1, false);
350350 if (r) {
@@ -365,7 +365,7 @@ void radeon_test_ring_sync(struct radeon_device *rdev, · 14 unmodified lines
365365 goto out_cleanup;
366366 }
367367 radeon_semaphore_emit_signal(rdev, ringB->idx, semaphore);
368− radeon_ring_unlock_commit(rdev, ringB);
368+ radeon_ring_unlock_commit(rdev, ringB, false);
369369
370370 r = radeon_fence_wait(fence2, false);
371371 if (r) {
@@ -408,7 +408,7 @@ static void radeon_test_ring_sync2(struct radeon_device *rdev, · 36 unmodified lines
408408 goto out_cleanup;
409409 }
410410 radeon_semaphore_emit_wait(rdev, ringA->idx, semaphore);
411− radeon_ring_unlock_commit(rdev, ringA);
411+ radeon_ring_unlock_commit(rdev, ringA, false);
412412
413413 r = radeon_test_create_and_emit_fence(rdev, ringA, &fenceA);
414414 if (r)
@@ -420,7 +420,7 @@ static void radeon_test_ring_sync2(struct radeon_device *rdev, · 5 unmodified lines
420420 goto out_cleanup;
421421 }
422422 radeon_semaphore_emit_wait(rdev, ringB->idx, semaphore);
423− radeon_ring_unlock_commit(rdev, ringB);
423+ radeon_ring_unlock_commit(rdev, ringB, false);
424424 r = radeon_test_create_and_emit_fence(rdev, ringB, &fenceB);
425425 if (r)
426426 goto out_cleanup;
@@ -442,7 +442,7 @@ static void radeon_test_ring_sync2(struct radeon_device *rdev, · 15 unmodified lines
442442 goto out_cleanup;
443443 }
444444 radeon_semaphore_emit_signal(rdev, ringC->idx, semaphore);
445− radeon_ring_unlock_commit(rdev, ringC);
445+ radeon_ring_unlock_commit(rdev, ringC, false);
446446
447447 for (i = 0; i < 30; ++i) {
448448 mdelay(100);
@@ -468,7 +468,7 @@ static void radeon_test_ring_sync2(struct radeon_device *rdev, · 19 unmodified lines
468468 goto out_cleanup;
469469 }
470470 radeon_semaphore_emit_signal(rdev, ringC->idx, semaphore);
471− radeon_ring_unlock_commit(rdev, ringC);
471+ radeon_ring_unlock_commit(rdev, ringC, false);
472472
473473 mdelay(1000);
474474
drivers/gpu/drm/radeon/radeon_uvd.c+1−1
@@ -646,7 +646,7 @@ static int radeon_uvd_send_msg(struct radeon_device *rdev, · 645 unmodified lines
646646 ib.ptr[i] = PACKET2(0);
647647 ib.length_dw = 16;
648648
649− r = radeon_ib_schedule(rdev, &ib, NULL);
649+ r = radeon_ib_schedule(rdev, &ib, NULL, false);
650650 if (r)
651651 goto err;
652652 ttm_eu_fence_buffer_objects(&ticket, &head, ib.fence);
drivers/gpu/drm/radeon/radeon_vce.c+3−3
@@ -368,7 +368,7 @@ int radeon_vce_get_create_msg(struct radeon_device *rdev, int ring, · 367 unmodified lines
368368 for (i = ib.length_dw; i < ib_size_dw; ++i)
369369 ib.ptr[i] = 0x0;
370370
371− r = radeon_ib_schedule(rdev, &ib, NULL);
371+ r = radeon_ib_schedule(rdev, &ib, NULL, false);
372372 if (r) {
373373 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
374374 }
@@ -425,7 +425,7 @@ int radeon_vce_get_destroy_msg(struct radeon_device *rdev, int ring, · 50 unmodified lines
425425 for (i = ib.length_dw; i < ib_size_dw; ++i)
426426 ib.ptr[i] = 0x0;
427427
428− r = radeon_ib_schedule(rdev, &ib, NULL);
428+ r = radeon_ib_schedule(rdev, &ib, NULL, false);
429429 if (r) {
430430 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
431431 }
@@ -715,7 +715,7 @@ int radeon_vce_ring_test(struct radeon_device *rdev, struct radeon_ring *ring) · 283 unmodified lines
715715 return r;
716716 }
717717 radeon_ring_write(ring, VCE_CMD_END);
718− radeon_ring_unlock_commit(rdev, ring);
718+ radeon_ring_unlock_commit(rdev, ring, false);
719719
720720 for (i = 0; i < rdev->usec_timeout; i++) {
721721 if (vce_v1_0_get_rptr(rdev, ring) != rptr)
drivers/gpu/drm/radeon/radeon_vm.c+7−3
@@ -420,7 +420,7 @@ static int radeon_vm_clear_bo(struct radeon_device *rdev, · 419 unmodified lines
420420 radeon_asic_vm_pad_ib(rdev, &ib);
421421 WARN_ON(ib.length_dw > 64);
422422
423− r = radeon_ib_schedule(rdev, &ib, NULL);
423+ r = radeon_ib_schedule(rdev, &ib, NULL, false);
424424 if (r)
425425 goto error;
426426
@@ -483,6 +483,10 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev, · 56 unmodified lines
483483 /* add a clone of the bo_va to clear the old address */
484484 struct radeon_bo_va *tmp;
485485 tmp = kzalloc(sizeof(struct radeon_bo_va), GFP_KERNEL);
486+ if (!tmp) {
487+ mutex_unlock(&vm->mutex);
488+ return -ENOMEM;
489+ }
486490 tmp->it.start = bo_va->it.start;
487491 tmp->it.last = bo_va->it.last;
488492 tmp->vm = vm;
@@ -693,7 +697,7 @@ int radeon_vm_update_page_directory(struct radeon_device *rdev, · 204 unmodified lines
693697 radeon_semaphore_sync_to(ib.semaphore, pd->tbo.sync_obj);
694698 radeon_semaphore_sync_to(ib.semaphore, vm->last_id_use);
695699 WARN_ON(ib.length_dw > ndw);
696− r = radeon_ib_schedule(rdev, &ib, NULL);
700+ r = radeon_ib_schedule(rdev, &ib, NULL, false);
697701 if (r) {
698702 radeon_ib_free(rdev, &ib);
699703 return r;
@@ -957,7 +961,7 @@ int radeon_vm_bo_update(struct radeon_device *rdev, · 257 unmodified lines
957961 WARN_ON(ib.length_dw > ndw);
958962
959963 radeon_semaphore_sync_to(ib.semaphore, vm->fence);
960− r = radeon_ib_schedule(rdev, &ib, NULL);
964+ r = radeon_ib_schedule(rdev, &ib, NULL, false);
961965 if (r) {
962966 radeon_ib_free(rdev, &ib);
963967 return r;
drivers/gpu/drm/radeon/rv515.c+1−1
@@ -124,7 +124,7 @@ void rv515_ring_start(struct radeon_device *rdev, struct radeon_ring *ring) · 123 unmodified lines
124124 radeon_ring_write(ring, GEOMETRY_ROUND_NEAREST | COLOR_ROUND_NEAREST);
125125 radeon_ring_write(ring, PACKET0(0x20C8, 0));
126126 radeon_ring_write(ring, 0);
127− radeon_ring_unlock_commit(rdev, ring);
127+ radeon_ring_unlock_commit(rdev, ring, false);
128128 }
129129
130130 int rv515_mc_wait_for_idle(struct radeon_device *rdev)
drivers/gpu/drm/radeon/rv770.c+8−15
@@ -1177,7 +1177,6 @@ static void rv770_gpu_init(struct radeon_device *rdev) · 1176 unmodified lines
11771177 u32 hdp_host_path_cntl;
11781178 u32 sq_dyn_gpr_size_simd_ab_0;
11791179 u32 gb_tiling_config = 0;
1180− u32 cc_rb_backend_disable = 0;
11811180 u32 cc_gc_shader_pipe_config = 0;
11821181 u32 mc_arb_ramcfg;
11831182 u32 db_debug4, tmp;
@@ -1311,21 +1310,7 @@ static void rv770_gpu_init(struct radeon_device *rdev) · 127 unmodified lines
13111310 WREG32(SPI_CONFIG_CNTL, 0);
13121311 }
13131312
1314− cc_rb_backend_disable = RREG32(CC_RB_BACKEND_DISABLE) & 0x00ff0000;
1315− tmp = R7XX_MAX_BACKENDS - r600_count_pipe_bits(cc_rb_backend_disable >> 16);
1316− if (tmp < rdev->config.rv770.max_backends) {
1317− rdev->config.rv770.max_backends = tmp;
1318− }
1319−
13201313 cc_gc_shader_pipe_config = RREG32(CC_GC_SHADER_PIPE_CONFIG) & 0xffffff00;
1321− tmp = R7XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config >> 8) & R7XX_MAX_PIPES_MASK);
1322− if (tmp < rdev->config.rv770.max_pipes) {
1323− rdev->config.rv770.max_pipes = tmp;
1324− }
1325− tmp = R7XX_MAX_SIMDS - r600_count_pipe_bits((cc_gc_shader_pipe_config >> 16) & R7XX_MAX_SIMDS_MASK);
1326− if (tmp < rdev->config.rv770.max_simds) {
1327− rdev->config.rv770.max_simds = tmp;
1328− }
13291314 tmp = rdev->config.rv770.max_simds -
13301315 r600_count_pipe_bits((cc_gc_shader_pipe_config >> 16) & R7XX_MAX_SIMDS_MASK);
13311316 rdev->config.rv770.active_simds = tmp;
@@ -1348,6 +1333,14 @@ static void rv770_gpu_init(struct radeon_device *rdev) · 16 unmodified lines
13481333 rdev->config.rv770.tiling_npipes = rdev->config.rv770.max_tile_pipes;
13491334
13501335 disabled_rb_mask = (RREG32(CC_RB_BACKEND_DISABLE) >> 16) & R7XX_MAX_BACKENDS_MASK;
1336+ tmp = 0;
1337+ for (i = 0; i < rdev->config.rv770.max_backends; i++)
1338+ tmp |= (1 << i);
1339+ /* if all the backends are disabled, fix it up here */
1340+ if ((disabled_rb_mask & tmp) == tmp) {
1341+ for (i = 0; i < rdev->config.rv770.max_backends; i++)
1342+ disabled_rb_mask &= ~(1 << i);
1343+ }
13511344 tmp = (gb_tiling_config & PIPE_TILING__MASK) >> PIPE_TILING__SHIFT;
13521345 tmp = r6xx_remap_render_backend(rdev, tmp, rdev->config.rv770.max_backends,
13531346 R7XX_MAX_BACKENDS, disabled_rb_mask);
drivers/gpu/drm/radeon/rv770_dma.c+1−1
@@ -90,7 +90,7 @@ int rv770_copy_dma(struct radeon_device *rdev, · 89 unmodified lines
9090 return r;
9191 }
9292
93− radeon_ring_unlock_commit(rdev, ring);
93+ radeon_ring_unlock_commit(rdev, ring, false);
9494 radeon_semaphore_free(rdev, &sem, *fence);
9595
9696 return r;
drivers/gpu/drm/radeon/si.c+27−13
@@ -3057,7 +3057,7 @@ static void si_gpu_init(struct radeon_device *rdev) · 3056 unmodified lines
30573057 u32 sx_debug_1;
30583058 u32 hdp_host_path_cntl;
30593059 u32 tmp;
3060− int i, j, k;
3060+ int i, j;
30613061
30623062 switch (rdev->family) {
30633063 case CHIP_TAHITI:
@@ -3255,12 +3255,11 @@ static void si_gpu_init(struct radeon_device *rdev) · 191 unmodified lines
32553255 rdev->config.si.max_sh_per_se,
32563256 rdev->config.si.max_cu_per_sh);
32573257
3258+ rdev->config.si.active_cus = 0;
32583259 for (i = 0; i < rdev->config.si.max_shader_engines; i++) {
32593260 for (j = 0; j < rdev->config.si.max_sh_per_se; j++) {
3260− for (k = 0; k < rdev->config.si.max_cu_per_sh; k++) {
3261− rdev->config.si.active_cus +=
3262− hweight32(si_get_cu_active_bitmap(rdev, i, j));
3263− }
3261+ rdev->config.si.active_cus +=
3262+ hweight32(si_get_cu_active_bitmap(rdev, i, j));
32643263 }
32653264 }
32663265
@@ -3541,7 +3540,7 @@ static int si_cp_start(struct radeon_device *rdev) · 274 unmodified lines
35413540 radeon_ring_write(ring, PACKET3_BASE_INDEX(CE_PARTITION_BASE));
35423541 radeon_ring_write(ring, 0xc000);
35433542 radeon_ring_write(ring, 0xe000);
3544− radeon_ring_unlock_commit(rdev, ring);
3543+ radeon_ring_unlock_commit(rdev, ring, false);
35453544
35463545 si_cp_enable(rdev, true);
35473546
@@ -3570,7 +3569,7 @@ static int si_cp_start(struct radeon_device *rdev) · 22 unmodified lines
35703569 radeon_ring_write(ring, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */
35713570 radeon_ring_write(ring, 0x00000010); /* VGT_OUT_DEALLOC_CNTL */
35723571
3573− radeon_ring_unlock_commit(rdev, ring);
3572+ radeon_ring_unlock_commit(rdev, ring, false);
35743573
35753574 for (i = RADEON_RING_TYPE_GFX_INDEX; i <= CAYMAN_RING_TYPE_CP2_INDEX; ++i) {
35763575 ring = &rdev->ring[i];
@@ -3580,7 +3579,7 @@ static int si_cp_start(struct radeon_device *rdev) · 3 unmodified lines
35803579 radeon_ring_write(ring, PACKET3_COMPUTE(PACKET3_CLEAR_STATE, 0));
35813580 radeon_ring_write(ring, 0);
35823581
3583− radeon_ring_unlock_commit(rdev, ring);
3582+ radeon_ring_unlock_commit(rdev, ring, false);
35843583 }
35853584
35863585 return 0;
@@ -4291,10 +4290,10 @@ static int si_pcie_gart_enable(struct radeon_device *rdev) · 704 unmodified lines
42914290 for (i = 1; i < 16; i++) {
42924291 if (i < 8)
42934292 WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
4294− rdev->gart.table_addr >> 12);
4293+ rdev->vm_manager.saved_table_addr[i]);
42954294 else
42964295 WREG32(VM_CONTEXT8_PAGE_TABLE_BASE_ADDR + ((i - 8) << 2),
4297− rdev->gart.table_addr >> 12);
4296+ rdev->vm_manager.saved_table_addr[i]);
42984297 }
42994298
43004299 /* enable context1-15 */
@@ -4326,6 +4325,17 @@ static int si_pcie_gart_enable(struct radeon_device *rdev) · 25 unmodified lines
43264325
43274326 static void si_pcie_gart_disable(struct radeon_device *rdev)
43284327 {
4328+ unsigned i;
4329+
4330+ for (i = 1; i < 16; ++i) {
4331+ uint32_t reg;
4332+ if (i < 8)
4333+ reg = VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2);
4334+ else
4335+ reg = VM_CONTEXT8_PAGE_TABLE_BASE_ADDR + ((i - 8) << 2);
4336+ rdev->vm_manager.saved_table_addr[i] = RREG32(reg);
4337+ }
4338+
43294339 /* Disable all tables */
43304340 WREG32(VM_CONTEXT0_CNTL, 0);
43314341 WREG32(VM_CONTEXT1_CNTL, 0);
@@ -5028,7 +5038,7 @@ void si_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm) · 696 unmodified lines
50285038
50295039 /* flush hdp cache */
50305040 radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
5031− radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
5041+ radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(1) |
50325042 WRITE_DATA_DST_SEL(0)));
50335043 radeon_ring_write(ring, HDP_MEM_COHERENCY_FLUSH_CNTL >> 2);
50345044 radeon_ring_write(ring, 0);
@@ -5036,7 +5046,7 @@ void si_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm) · 1 unmodified line
50365046
50375047 /* bits 0-15 are the VM contexts0-15 */
50385048 radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
5039− radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
5049+ radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(1) |
50405050 WRITE_DATA_DST_SEL(0)));
50415051 radeon_ring_write(ring, VM_INVALIDATE_REQUEST >> 2);
50425052 radeon_ring_write(ring, 0);
@@ -7178,6 +7188,9 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev) · 2135 unmodified lines
71787188 int ret, i;
71797189 u16 tmp16;
71807190
7191+ if (pci_is_root_bus(rdev->pdev->bus))
7192+ return;
7193+
71817194 if (radeon_pcie_gen2 == 0)
71827195 return;
71837196
@@ -7455,7 +7468,8 @@ static void si_program_aspm(struct radeon_device *rdev) · 271 unmodified lines
74557468 if (orig != data)
74567469 WREG32_PIF_PHY1(PB1_PIF_CNTL, data);
74577470
7458− if (!disable_clkreq) {
7471+ if (!disable_clkreq &&
7472+ !pci_is_root_bus(rdev->pdev->bus)) {
74597473 struct pci_dev *root = rdev->pdev->bus->self;
74607474 u32 lnkcap;
74617475
drivers/gpu/drm/radeon/si_dma.c+1−1
@@ -275,7 +275,7 @@ int si_copy_dma(struct radeon_device *rdev, · 274 unmodified lines
275275 return r;
276276 }
277277
278− radeon_ring_unlock_commit(rdev, ring);
278+ radeon_ring_unlock_commit(rdev, ring, false);
279279 radeon_semaphore_free(rdev, &sem, *fence);
280280
281281 return r;
drivers/gpu/drm/radeon/trinity_dpm.c+15−9
@@ -1874,16 +1874,22 @@ int trinity_dpm_init(struct radeon_device *rdev) · 1873 unmodified lines
18741874 for (i = 0; i < SUMO_MAX_HARDWARE_POWERLEVELS; i++)
18751875 pi->at[i] = TRINITY_AT_DFLT;
18761876
1877− /* There are stability issues reported on with
1878− * bapm enabled when switching between AC and battery
1879− * power. At the same time, some MSI boards hang
1880− * if it's not enabled and dpm is enabled. Just enable
1881− * it for MSI boards right now.
1882− */
1883− if (rdev->pdev->subsystem_vendor == 0x1462)
1884− pi->enable_bapm = true;
1885− else
1877+ if (radeon_bapm == -1) {
1878+ /* There are stability issues reported on with
1879+ * bapm enabled when switching between AC and battery
1880+ * power. At the same time, some MSI boards hang
1881+ * if it's not enabled and dpm is enabled. Just enable
1882+ * it for MSI boards right now.
1883+ */
1884+ if (rdev->pdev->subsystem_vendor == 0x1462)
1885+ pi->enable_bapm = true;
1886+ else
1887+ pi->enable_bapm = false;
1888+ } else if (radeon_bapm == 0) {
18861889 pi->enable_bapm = false;
1890+ } else {
1891+ pi->enable_bapm = true;
1892+ }
18871893 pi->enable_nbps_policy = true;
18881894 pi->enable_sclk_ds = true;
18891895 pi->enable_gfx_power_gating = true;
drivers/gpu/drm/radeon/uvd_v1_0.c+2−2
@@ -124,7 +124,7 @@ int uvd_v1_0_init(struct radeon_device *rdev) · 123 unmodified lines
124124 radeon_ring_write(ring, PACKET0(UVD_SEMA_CNTL, 0));
125125 radeon_ring_write(ring, 3);
126126
127− radeon_ring_unlock_commit(rdev, ring);
127+ radeon_ring_unlock_commit(rdev, ring, false);
128128
129129 done:
130130 /* lower clocks again */
@@ -331,7 +331,7 @@ int uvd_v1_0_ring_test(struct radeon_device *rdev, struct radeon_ring *ring) · 200 unmodified lines
331331 }
332332 radeon_ring_write(ring, PACKET0(UVD_CONTEXT_ID, 0));
333333 radeon_ring_write(ring, 0xDEADBEEF);
334− radeon_ring_unlock_commit(rdev, ring);
334+ radeon_ring_unlock_commit(rdev, ring, false);
335335 for (i = 0; i < rdev->usec_timeout; i++) {
336336 tmp = RREG32(UVD_CONTEXT_ID);
337337 if (tmp == 0xDEADBEEF)
drivers/gpu/drm/sti/Kconfig+1−0
@@ -1,6 +1,7 @@
11 config DRM_STI
22 tristate "DRM Support for STMicroelectronics SoC stiH41x Series"
33 depends on DRM && (SOC_STIH415 || SOC_STIH416 || ARCH_MULTIPLATFORM)
4+ select RESET_CONTROLLER
45 select DRM_KMS_HELPER
56 select DRM_GEM_CMA_HELPER
67 select DRM_KMS_CMA_HELPER
drivers/gpu/drm/sti/sti_drm_drv.c+2−2
@@ -201,8 +201,8 @@ static int sti_drm_platform_probe(struct platform_device *pdev) · 200 unmodified lines
201201 master = platform_device_register_resndata(dev,
202202 DRIVER_NAME "__master", -1,
203203 NULL, 0, NULL, 0);
204− if (!master)
205− return -EINVAL;
204+ if (IS_ERR(master))
205+ return PTR_ERR(master);
206206
207207 platform_set_drvdata(pdev, master);
208208 return 0;
drivers/gpu/drm/sti/sti_hda.c+5−5
@@ -730,16 +730,16 @@ static int sti_hda_probe(struct platform_device *pdev) · 729 unmodified lines
730730 return -ENOMEM;
731731 }
732732 hda->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
733− if (IS_ERR(hda->regs))
734− return PTR_ERR(hda->regs);
733+ if (!hda->regs)
734+ return -ENOMEM;
735735
736736 res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
737737 "video-dacs-ctrl");
738738 if (res) {
739739 hda->video_dacs_ctrl = devm_ioremap_nocache(dev, res->start,
740740 resource_size(res));
741− if (IS_ERR(hda->video_dacs_ctrl))
742− return PTR_ERR(hda->video_dacs_ctrl);
741+ if (!hda->video_dacs_ctrl)
742+ return -ENOMEM;
743743 } else {
744744 /* If no existing video-dacs-ctrl resource continue the probe */
745745 DRM_DEBUG_DRIVER("No video-dacs-ctrl resource\n");
@@ -770,7 +770,7 @@ static int sti_hda_remove(struct platform_device *pdev) · 24 unmodified lines
770770 return 0;
771771 }
772772
773−static struct of_device_id hda_of_match[] = {
773+static const struct of_device_id hda_of_match[] = {
774774 { .compatible = "st,stih416-hda", },
775775 { .compatible = "st,stih407-hda", },
776776 { /* end node */ }
drivers/gpu/drm/sti/sti_hdmi.c+5−5
@@ -677,7 +677,7 @@ static const struct component_ops sti_hdmi_ops = { · 676 unmodified lines
677677 .unbind = sti_hdmi_unbind,
678678 };
679679
680−static struct of_device_id hdmi_of_match[] = {
680+static const struct of_device_id hdmi_of_match[] = {
681681 {
682682 .compatible = "st,stih416-hdmi",
683683 .data = &tx3g0c55phy_ops,
@@ -713,8 +713,8 @@ static int sti_hdmi_probe(struct platform_device *pdev) · 29 unmodified lines
713713 return -ENOMEM;
714714 }
715715 hdmi->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
716− if (IS_ERR(hdmi->regs))
717− return PTR_ERR(hdmi->regs);
716+ if (!hdmi->regs)
717+ return -ENOMEM;
718718
719719 if (of_device_is_compatible(np, "st,stih416-hdmi")) {
720720 res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
@@ -725,8 +725,8 @@ static int sti_hdmi_probe(struct platform_device *pdev) · 4 unmodified lines
725725 }
726726 hdmi->syscfg = devm_ioremap_nocache(dev, res->start,
727727 resource_size(res));
728− if (IS_ERR(hdmi->syscfg))
729− return PTR_ERR(hdmi->syscfg);
728+ if (!hdmi->syscfg)
729+ return -ENOMEM;
730730
731731 }
732732
drivers/gpu/drm/sti/sti_tvout.c+3−3
@@ -591,8 +591,8 @@ static int sti_tvout_probe(struct platform_device *pdev) · 590 unmodified lines
591591 return -ENOMEM;
592592 }
593593 tvout->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
594− if (IS_ERR(tvout->regs))
595− return PTR_ERR(tvout->regs);
594+ if (!tvout->regs)
595+ return -ENOMEM;
596596
597597 /* get reset resources */
598598 tvout->reset = devm_reset_control_get(dev, "tvout");
@@ -624,7 +624,7 @@ static int sti_tvout_remove(struct platform_device *pdev) · 25 unmodified lines
624624 return 0;
625625 }
626626
627−static struct of_device_id tvout_of_match[] = {
627+static const struct of_device_id tvout_of_match[] = {
628628 { .compatible = "st,stih416-tvout", },
629629 { .compatible = "st,stih407-tvout", },
630630 { /* end node */ }
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c+5−6
@@ -450,11 +450,11 @@ static int vmw_cmd_res_reloc_add(struct vmw_private *dev_priv, · 449 unmodified lines
450450 res,
451451 id_loc - sw_context->buf_start);
452452 if (unlikely(ret != 0))
453− goto out_err;
453+ return ret;
454454
455455 ret = vmw_resource_val_add(sw_context, res, &node);
456456 if (unlikely(ret != 0))
457− goto out_err;
457+ return ret;
458458
459459 if (res_type == vmw_res_context && dev_priv->has_mob &&
460460 node->first_usage) {
@@ -468,13 +468,13 @@ static int vmw_cmd_res_reloc_add(struct vmw_private *dev_priv, · 7 unmodified lines
468468
469469 ret = vmw_resource_context_res_add(dev_priv, sw_context, res);
470470 if (unlikely(ret != 0))
471− goto out_err;
471+ return ret;
472472 node->staged_bindings =
473473 kzalloc(sizeof(*node->staged_bindings), GFP_KERNEL);
474474 if (node->staged_bindings == NULL) {
475475 DRM_ERROR("Failed to allocate context binding "
476476 "information.\n");
477− goto out_err;
477+ return -ENOMEM;
478478 }
479479 INIT_LIST_HEAD(&node->staged_bindings->list);
480480 }
@@ -482,8 +482,7 @@ static int vmw_cmd_res_reloc_add(struct vmw_private *dev_priv, · 1 unmodified line
482482 if (p_val)
483483 *p_val = node;
484484
485−out_err:
486− return ret;
485+ return 0;
487486 }
488487
489488
drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c+2−1
@@ -180,8 +180,9 @@ void vmw_fifo_release(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo) · 179 unmodified lines
180180
181181 mutex_lock(&dev_priv->hw_mutex);
182182
183+ vmw_write(dev_priv, SVGA_REG_SYNC, SVGA_SYNC_GENERIC);
183184 while (vmw_read(dev_priv, SVGA_REG_BUSY) != 0)
184− vmw_write(dev_priv, SVGA_REG_SYNC, SVGA_SYNC_GENERIC);
185+ ;
185186
186187 dev_priv->last_read_seqno = ioread32(fifo_mem + SVGA_FIFO_FENCE);
187188
drivers/hid/hid-logitech-dj.c+25−18
@@ -656,7 +656,6 @@ static int logi_dj_raw_event(struct hid_device *hdev, · 655 unmodified lines
656656 struct dj_receiver_dev *djrcv_dev = hid_get_drvdata(hdev);
657657 struct dj_report *dj_report = (struct dj_report *) data;
658658 unsigned long flags;
659− bool report_processed = false;
660659
661660 dbg_hid("%s, size:%d\n", __func__, size);
662661
@@ -683,34 +682,42 @@ static int logi_dj_raw_event(struct hid_device *hdev, · 20 unmodified lines
683682 * device (via hid_input_report() ) and return 1 so hid-core does not do
684683 * anything else with it.
685684 */
685+
686+ /* case 1) */
687+ if (data[0] != REPORT_ID_DJ_SHORT)
688+ return false;
689+
686690 if ((dj_report->device_index < DJ_DEVICE_INDEX_MIN) ||
687691 (dj_report->device_index > DJ_DEVICE_INDEX_MAX)) {
688− dev_err(&hdev->dev, "%s: invalid device index:%d\n",
692+ /*
693+ * Device index is wrong, bail out.
694+ * This driver can ignore safely the receiver notifications,
695+ * so ignore those reports too.
696+ */
697+ if (dj_report->device_index != DJ_RECEIVER_INDEX)
698+ dev_err(&hdev->dev, "%s: invalid device index:%d\n",
689699 __func__, dj_report->device_index);
690700 return false;
691701 }
692702
693703 spin_lock_irqsave(&djrcv_dev->lock, flags);
694− if (dj_report->report_id == REPORT_ID_DJ_SHORT) {
695− switch (dj_report->report_type) {
696− case REPORT_TYPE_NOTIF_DEVICE_PAIRED:
697− case REPORT_TYPE_NOTIF_DEVICE_UNPAIRED:
698− logi_dj_recv_queue_notification(djrcv_dev, dj_report);
699− break;
700− case REPORT_TYPE_NOTIF_CONNECTION_STATUS:
701− if (dj_report->report_params[CONNECTION_STATUS_PARAM_STATUS] ==
702− STATUS_LINKLOSS) {
703− logi_dj_recv_forward_null_report(djrcv_dev, dj_report);
704− }
705− break;
706− default:
707− logi_dj_recv_forward_report(djrcv_dev, dj_report);
704+ switch (dj_report->report_type) {
705+ case REPORT_TYPE_NOTIF_DEVICE_PAIRED:
706+ case REPORT_TYPE_NOTIF_DEVICE_UNPAIRED:
707+ logi_dj_recv_queue_notification(djrcv_dev, dj_report);
708+ break;
709+ case REPORT_TYPE_NOTIF_CONNECTION_STATUS:
710+ if (dj_report->report_params[CONNECTION_STATUS_PARAM_STATUS] ==
711+ STATUS_LINKLOSS) {
712+ logi_dj_recv_forward_null_report(djrcv_dev, dj_report);
708713 }
709− report_processed = true;
714+ break;
715+ default:
716+ logi_dj_recv_forward_report(djrcv_dev, dj_report);
710717 }
711718 spin_unlock_irqrestore(&djrcv_dev->lock, flags);
712719
713− return report_processed;
720+ return true;
714721 }
715722
716723 static int logi_dj_probe(struct hid_device *hdev,
drivers/hid/hid-logitech-dj.h+1−0
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727
2828 #define DJ_MAX_PAIRED_DEVICES 6
2929 #define DJ_MAX_NUMBER_NOTIFICATIONS 8
30+#define DJ_RECEIVER_INDEX 0
3031 #define DJ_DEVICE_INDEX_MIN 1
3132 #define DJ_DEVICE_INDEX_MAX 6
3233
drivers/hid/hid-magicmouse.c+10−0
@@ -290,6 +290,11 @@ static int magicmouse_raw_event(struct hid_device *hdev, · 289 unmodified lines
290290 if (size < 4 || ((size - 4) % 9) != 0)
291291 return 0;
292292 npoints = (size - 4) / 9;
293+ if (npoints > 15) {
294+ hid_warn(hdev, "invalid size value (%d) for TRACKPAD_REPORT_ID\n",
295+ size);
296+ return 0;
297+ }
293298 msc->ntouches = 0;
294299 for (ii = 0; ii < npoints; ii++)
295300 magicmouse_emit_touch(msc, ii, data + ii * 9 + 4);
@@ -307,6 +312,11 @@ static int magicmouse_raw_event(struct hid_device *hdev, · 11 unmodified lines
307312 if (size < 6 || ((size - 6) % 8) != 0)
308313 return 0;
309314 npoints = (size - 6) / 8;
315+ if (npoints > 15) {
316+ hid_warn(hdev, "invalid size value (%d) for MOUSE_REPORT_ID\n",
317+ size);
318+ return 0;
319+ }
310320 msc->ntouches = 0;
311321 for (ii = 0; ii < npoints; ii++)
312322 magicmouse_emit_touch(msc, ii, data + ii * 8 + 6);
drivers/hid/hid-picolcd_core.c+6−0
@@ -350,6 +350,12 @@ static int picolcd_raw_event(struct hid_device *hdev, · 349 unmodified lines
350350 if (!data)
351351 return 1;
352352
353+ if (size > 64) {
354+ hid_warn(hdev, "invalid size value (%d) for picolcd raw event\n",
355+ size);
356+ return 0;
357+ }
358+
353359 if (report->id == REPORT_KEY_STATE) {
354360 if (data->input_keys)
355361 ret = picolcd_raw_keypad(data, report, raw_data+1, size-1);
drivers/hwmon/ds1621.c+1−0
@@ -309,6 +309,7 @@ static ssize_t set_convrate(struct device *dev, struct device_attribute *da, · 308 unmodified lines
309309 data->conf |= (resol << DS1621_REG_CONFIG_RESOL_SHIFT);
310310 i2c_smbus_write_byte_data(client, DS1621_REG_CONF, data->conf);
311311 data->update_interval = ds1721_convrates[resol];
312+ data->zbits = 7 - resol;
312313 mutex_unlock(&data->update_lock);
313314
314315 return count;
drivers/i2c/busses/i2c-at91.c+26−6
@@ -101,6 +101,7 @@ struct at91_twi_dev { · 100 unmodified lines
101101 unsigned twi_cwgr_reg;
102102 struct at91_twi_pdata *pdata;
103103 bool use_dma;
104+ bool recv_len_abort;
104105 struct at91_twi_dma dma;
105106 };
106107
@@ -267,12 +268,24 @@ static void at91_twi_read_next_byte(struct at91_twi_dev *dev) · 160 unmodified lines
267268 *dev->buf = at91_twi_read(dev, AT91_TWI_RHR) & 0xff;
268269 --dev->buf_len;
269270
271+ /* return if aborting, we only needed to read RHR to clear RXRDY*/
272+ if (dev->recv_len_abort)
273+ return;
274+
270275 /* handle I2C_SMBUS_BLOCK_DATA */
271276 if (unlikely(dev->msg->flags & I2C_M_RECV_LEN)) {
272− dev->msg->flags &= ~I2C_M_RECV_LEN;
273− dev->buf_len += *dev->buf;
274− dev->msg->len = dev->buf_len + 1;
275− dev_dbg(dev->dev, "received block length %d\n", dev->buf_len);
277+ /* ensure length byte is a valid value */
278+ if (*dev->buf <= I2C_SMBUS_BLOCK_MAX && *dev->buf > 0) {
279+ dev->msg->flags &= ~I2C_M_RECV_LEN;
280+ dev->buf_len += *dev->buf;
281+ dev->msg->len = dev->buf_len + 1;
282+ dev_dbg(dev->dev, "received block length %d\n",
283+ dev->buf_len);
284+ } else {
285+ /* abort and send the stop by reading one more byte */
286+ dev->recv_len_abort = true;
287+ dev->buf_len = 1;
288+ }
276289 }
277290
278291 /* send stop if second but last byte has been read */
@@ -421,8 +434,8 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev) · 142 unmodified lines
421434 }
422435 }
423436
424− ret = wait_for_completion_interruptible_timeout(&dev->cmd_complete,
425− dev->adapter.timeout);
437+ ret = wait_for_completion_io_timeout(&dev->cmd_complete,
438+ dev->adapter.timeout);
426439 if (ret == 0) {
427440 dev_err(dev->dev, "controller timed out\n");
428441 at91_init_twi_bus(dev);
@@ -444,6 +457,12 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev) · 15 unmodified lines
444457 ret = -EIO;
445458 goto error;
446459 }
460+ if (dev->recv_len_abort) {
461+ dev_err(dev->dev, "invalid smbus block length recvd\n");
462+ ret = -EPROTO;
463+ goto error;
464+ }
465+
447466 dev_dbg(dev->dev, "transfer complete\n");
448467
449468 return 0;
@@ -500,6 +519,7 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num) · 50 unmodified lines
500519 dev->buf_len = m_start->len;
501520 dev->buf = m_start->buf;
502521 dev->msg = m_start;
522+ dev->recv_len_abort = false;
503523
504524 ret = at91_do_twi_transfer(dev);
505525
drivers/i2c/busses/i2c-mv64xxx.c+1−2
@@ -746,8 +746,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, · 745 unmodified lines
746746 }
747747 tclk = clk_get_rate(drv_data->clk);
748748
749− rc = of_property_read_u32(np, "clock-frequency", &bus_freq);
750− if (rc)
749+ if (of_property_read_u32(np, "clock-frequency", &bus_freq))
751750 bus_freq = 100000; /* 100kHz by default */
752751
753752 if (!mv64xxx_find_baud_factors(bus_freq, tclk,
drivers/i2c/busses/i2c-rcar.c+31−6
@@ -34,6 +34,7 @@ · 33 unmodified lines
3434 #include <linux/platform_device.h>
3535 #include <linux/pm_runtime.h>
3636 #include <linux/slab.h>
37+#include <linux/spinlock.h>
3738
3839 /* register offsets */
3940 #define ICSCR 0x00 /* slave ctrl */
@@ -95,6 +96,7 @@ struct rcar_i2c_priv { · 55 unmodified lines
9596 struct i2c_msg *msg;
9697 struct clk *clk;
9798
99+ spinlock_t lock;
98100 wait_queue_head_t wait;
99101
100102 int pos;
@@ -365,20 +367,20 @@ static irqreturn_t rcar_i2c_irq(int irq, void *ptr) · 264 unmodified lines
365367 struct rcar_i2c_priv *priv = ptr;
366368 u32 msr;
367369
370+ /*-------------- spin lock -----------------*/
371+ spin_lock(&priv->lock);
372+
368373 msr = rcar_i2c_read(priv, ICMSR);
369374
375+ /* Only handle interrupts that are currently enabled */
376+ msr &= rcar_i2c_read(priv, ICMIER);
377+
370378 /* Arbitration lost */
371379 if (msr & MAL) {
372380 rcar_i2c_flags_set(priv, (ID_DONE | ID_ARBLOST));
373381 goto out;
374382 }
375383
376− /* Stop */
377− if (msr & MST) {
378− rcar_i2c_flags_set(priv, ID_DONE);
379− goto out;
380− }
381−
382384 /* Nack */
383385 if (msr & MNR) {
384386 /* go to stop phase */
@@ -388,6 +390,12 @@ static irqreturn_t rcar_i2c_irq(int irq, void *ptr) · 3 unmodified lines
388390 goto out;
389391 }
390392
393+ /* Stop */
394+ if (msr & MST) {
395+ rcar_i2c_flags_set(priv, ID_DONE);
396+ goto out;
397+ }
398+
391399 if (rcar_i2c_is_recv(priv))
392400 rcar_i2c_flags_set(priv, rcar_i2c_irq_recv(priv, msr));
393401 else
@@ -400,6 +408,9 @@ out: · 6 unmodified lines
400408 wake_up(&priv->wait);
401409 }
402410
411+ spin_unlock(&priv->lock);
412+ /*-------------- spin unlock -----------------*/
413+
403414 return IRQ_HANDLED;
404415 }
405416
@@ -409,14 +420,21 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, · 3 unmodified lines
409420 {
410421 struct rcar_i2c_priv *priv = i2c_get_adapdata(adap);
411422 struct device *dev = rcar_i2c_priv_to_dev(priv);
423+ unsigned long flags;
412424 int i, ret, timeout;
413425
414426 pm_runtime_get_sync(dev);
415427
428+ /*-------------- spin lock -----------------*/
429+ spin_lock_irqsave(&priv->lock, flags);
430+
416431 rcar_i2c_init(priv);
417432 /* start clock */
418433 rcar_i2c_write(priv, ICCCR, priv->icccr);
419434
435+ spin_unlock_irqrestore(&priv->lock, flags);
436+ /*-------------- spin unlock -----------------*/
437+
420438 ret = rcar_i2c_bus_barrier(priv);
421439 if (ret < 0)
422440 goto out;
@@ -428,6 +446,9 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, · 5 unmodified lines
428446 break;
429447 }
430448
449+ /*-------------- spin lock -----------------*/
450+ spin_lock_irqsave(&priv->lock, flags);
451+
431452 /* init each data */
432453 priv->msg = &msgs[i];
433454 priv->pos = 0;
@@ -437,6 +458,9 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, · 3 unmodified lines
437458
438459 ret = rcar_i2c_prepare_msg(priv);
439460
461+ spin_unlock_irqrestore(&priv->lock, flags);
462+ /*-------------- spin unlock -----------------*/
463+
440464 if (ret < 0)
441465 break;
442466
@@ -540,6 +564,7 @@ static int rcar_i2c_probe(struct platform_device *pdev) · 97 unmodified lines
540564
541565 irq = platform_get_irq(pdev, 0);
542566 init_waitqueue_head(&priv->wait);
567+ spin_lock_init(&priv->lock);
543568
544569 adap = &priv->adap;
545570 adap->nr = pdev->id;
drivers/i2c/busses/i2c-rk3x.c+4−0
@@ -323,6 +323,10 @@ static void rk3x_i2c_handle_read(struct rk3x_i2c *i2c, unsigned int ipd) · 322 unmodified lines
323323 /* ack interrupt */
324324 i2c_writel(i2c, REG_INT_MBRF, REG_IPD);
325325
326+ /* Can only handle a maximum of 32 bytes at a time */
327+ if (len > 32)
328+ len = 32;
329+
326330 /* read the data from receive buffer */
327331 for (i = 0; i < len; ++i) {
328332 if (i % 4 == 0)
drivers/infiniband/hw/mlx4/main.c+30−0
@@ -1089,6 +1089,30 @@ static int __mlx4_ib_destroy_flow(struct mlx4_dev *dev, u64 reg_id) · 1088 unmodified lines
10891089 return err;
10901090 }
10911091
1092+static int mlx4_ib_tunnel_steer_add(struct ib_qp *qp, struct ib_flow_attr *flow_attr,
1093+ u64 *reg_id)
1094+{
1095+ void *ib_flow;
1096+ union ib_flow_spec *ib_spec;
1097+ struct mlx4_dev *dev = to_mdev(qp->device)->dev;
1098+ int err = 0;
1099+
1100+ if (dev->caps.tunnel_offload_mode != MLX4_TUNNEL_OFFLOAD_MODE_VXLAN)
1101+ return 0; /* do nothing */
1102+
1103+ ib_flow = flow_attr + 1;
1104+ ib_spec = (union ib_flow_spec *)ib_flow;
1105+
1106+ if (ib_spec->type != IB_FLOW_SPEC_ETH || flow_attr->num_of_specs != 1)
1107+ return 0; /* do nothing */
1108+
1109+ err = mlx4_tunnel_steer_add(to_mdev(qp->device)->dev, ib_spec->eth.val.dst_mac,
1110+ flow_attr->port, qp->qp_num,
1111+ MLX4_DOMAIN_UVERBS | (flow_attr->priority & 0xff),
1112+ reg_id);
1113+ return err;
1114+}
1115+
10921116 static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp,
10931117 struct ib_flow_attr *flow_attr,
10941118 int domain)
@@ -1136,6 +1160,12 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp, · 41 unmodified lines
11361160 i++;
11371161 }
11381162
1163+ if (i < ARRAY_SIZE(type) && flow_attr->type == IB_FLOW_ATTR_NORMAL) {
1164+ err = mlx4_ib_tunnel_steer_add(qp, flow_attr, &mflow->reg_id[i]);
1165+ if (err)
1166+ goto err_free;
1167+ }
1168+
11391169 return &mflow->ibflow;
11401170
11411171 err_free:
drivers/infiniband/hw/mlx4/qp.c+7−1
@@ -1677,9 +1677,15 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp, · 1676 unmodified lines
16771677 }
16781678 }
16791679
1680− if (qp->ibqp.qp_type == IB_QPT_RAW_PACKET)
1680+ if (qp->ibqp.qp_type == IB_QPT_RAW_PACKET) {
16811681 context->pri_path.ackto = (context->pri_path.ackto & 0xf8) |
16821682 MLX4_IB_LINK_TYPE_ETH;
1683+ if (dev->dev->caps.tunnel_offload_mode == MLX4_TUNNEL_OFFLOAD_MODE_VXLAN) {
1684+ /* set QP to receive both tunneled & non-tunneled packets */
1685+ if (!(context->flags & (1 << MLX4_RSS_QPC_FLAG_OFFSET)))
1686+ context->srqn = cpu_to_be32(7 << 28);
1687+ }
1688+ }
16831689
16841690 if (ibqp->qp_type == IB_QPT_UD && (new_state == IB_QPS_RTR)) {
16851691 int is_eth = rdma_port_get_link_layer(
drivers/input/input-mt.c+18−12
@@ -236,6 +236,18 @@ void input_mt_report_pointer_emulation(struct input_dev *dev, bool use_count) · 235 unmodified lines
236236 }
237237 EXPORT_SYMBOL(input_mt_report_pointer_emulation);
238238
239+static void __input_mt_drop_unused(struct input_dev *dev, struct input_mt *mt)
240+{
241+ int i;
242+
243+ for (i = 0; i < mt->num_slots; i++) {
244+ if (!input_mt_is_used(mt, &mt->slots[i])) {
245+ input_mt_slot(dev, i);
246+ input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, -1);
247+ }
248+ }
249+}
250+
239251 /**
240252 * input_mt_drop_unused() - Inactivate slots not seen in this frame
241253 * @dev: input device with allocated MT slots
@@ -245,19 +257,11 @@ EXPORT_SYMBOL(input_mt_report_pointer_emulation); · 3 unmodified lines
245257 void input_mt_drop_unused(struct input_dev *dev)
246258 {
247259 struct input_mt *mt = dev->mt;
248− int i;
249260
250− if (!mt)
251− return;
252−
253− for (i = 0; i < mt->num_slots; i++) {
254− if (!input_mt_is_used(mt, &mt->slots[i])) {
255− input_mt_slot(dev, i);
256− input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, -1);
257− }
261+ if (mt) {
262+ __input_mt_drop_unused(dev, mt);
263+ mt->frame++;
258264 }
259−
260− mt->frame++;
261265 }
262266 EXPORT_SYMBOL(input_mt_drop_unused);
263267
@@ -278,12 +282,14 @@ void input_mt_sync_frame(struct input_dev *dev) · 14 unmodified lines
278282 return;
279283
280284 if (mt->flags & INPUT_MT_DROP_UNUSED)
281− input_mt_drop_unused(dev);
285+ __input_mt_drop_unused(dev, mt);
282286
283287 if ((mt->flags & INPUT_MT_POINTER) && !(mt->flags & INPUT_MT_SEMI_MT))
284288 use_count = true;
285289
286290 input_mt_report_pointer_emulation(dev, use_count);
291+
292+ mt->frame++;
287293 }
288294 EXPORT_SYMBOL(input_mt_sync_frame);
289295
drivers/input/mouse/alps.c+2−2
@@ -2234,8 +2234,8 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv) · 2233 unmodified lines
22342234 return 0;
22352235 }
22362236
2237− psmouse_info(psmouse,
2238− "Unknown ALPS touchpad: E7=%3ph, EC=%3ph\n", e7, ec);
2237+ psmouse_dbg(psmouse,
2238+ "Likely not an ALPS touchpad: E7=%3ph, EC=%3ph\n", e7, ec);
22392239
22402240 return -EINVAL;
22412241 }
drivers/input/mouse/elantech.c+128−9
@@ -18,6 +18,7 @@ · 17 unmodified lines
1818 #include <linux/input/mt.h>
1919 #include <linux/serio.h>
2020 #include <linux/libps2.h>
21+#include <asm/unaligned.h>
2122 #include "psmouse.h"
2223 #include "elantech.h"
2324
@@ -403,6 +404,68 @@ static void elantech_report_absolute_v2(struct psmouse *psmouse) · 379 unmodified lines
403404 input_sync(dev);
404405 }
405406
407+static void elantech_report_trackpoint(struct psmouse *psmouse,
408+ int packet_type)
409+{
410+ /*
411+ * byte 0: 0 0 sx sy 0 M R L
412+ * byte 1:~sx 0 0 0 0 0 0 0
413+ * byte 2:~sy 0 0 0 0 0 0 0
414+ * byte 3: 0 0 ~sy ~sx 0 1 1 0
415+ * byte 4: x7 x6 x5 x4 x3 x2 x1 x0
416+ * byte 5: y7 y6 y5 y4 y3 y2 y1 y0
417+ *
418+ * x and y are written in two's complement spread
419+ * over 9 bits with sx/sy the relative top bit and
420+ * x7..x0 and y7..y0 the lower bits.
421+ * The sign of y is opposite to what the input driver
422+ * expects for a relative movement
423+ */
424+
425+ struct elantech_data *etd = psmouse->private;
426+ struct input_dev *tp_dev = etd->tp_dev;
427+ unsigned char *packet = psmouse->packet;
428+ int x, y;
429+ u32 t;
430+
431+ if (dev_WARN_ONCE(&psmouse->ps2dev.serio->dev,
432+ !tp_dev,
433+ psmouse_fmt("Unexpected trackpoint message\n"))) {
434+ if (etd->debug == 1)
435+ elantech_packet_dump(psmouse);
436+ return;
437+ }
438+
439+ t = get_unaligned_le32(&packet[0]);
440+
441+ switch (t & ~7U) {
442+ case 0x06000030U:
443+ case 0x16008020U:
444+ case 0x26800010U:
445+ case 0x36808000U:
446+ x = packet[4] - (int)((packet[1]^0x80) << 1);
447+ y = (int)((packet[2]^0x80) << 1) - packet[5];
448+
449+ input_report_key(tp_dev, BTN_LEFT, packet[0] & 0x01);
450+ input_report_key(tp_dev, BTN_RIGHT, packet[0] & 0x02);
451+ input_report_key(tp_dev, BTN_MIDDLE, packet[0] & 0x04);
452+
453+ input_report_rel(tp_dev, REL_X, x);
454+ input_report_rel(tp_dev, REL_Y, y);
455+
456+ input_sync(tp_dev);
457+
458+ break;
459+
460+ default:
461+ /* Dump unexpected packet sequences if debug=1 (default) */
462+ if (etd->debug == 1)
463+ elantech_packet_dump(psmouse);
464+
465+ break;
466+ }
467+}
468+
406469 /*
407470 * Interpret complete data packets and report absolute mode input events for
408471 * hardware version 3. (12 byte packets for two fingers)
@@ -715,6 +778,8 @@ static int elantech_packet_check_v3(struct psmouse *psmouse) · 306 unmodified lines
715778
716779 if ((packet[0] & 0x0c) == 0x0c && (packet[3] & 0xce) == 0x0c)
717780 return PACKET_V3_TAIL;
781+ if ((packet[3] & 0x0f) == 0x06)
782+ return PACKET_TRACKPOINT;
718783 }
719784
720785 return PACKET_UNKNOWN;
@@ -791,14 +856,23 @@ static psmouse_ret_t elantech_process_byte(struct psmouse *psmouse) · 70 unmodified lines
791856
792857 case 3:
793858 packet_type = elantech_packet_check_v3(psmouse);
794− /* ignore debounce */
795− if (packet_type == PACKET_DEBOUNCE)
796− return PSMOUSE_FULL_PACKET;
797−
798− if (packet_type == PACKET_UNKNOWN)
859+ switch (packet_type) {
860+ case PACKET_UNKNOWN:
799861 return PSMOUSE_BAD_DATA;
800862
801− elantech_report_absolute_v3(psmouse, packet_type);
863+ case PACKET_DEBOUNCE:
864+ /* ignore debounce */
865+ break;
866+
867+ case PACKET_TRACKPOINT:
868+ elantech_report_trackpoint(psmouse, packet_type);
869+ break;
870+
871+ default:
872+ elantech_report_absolute_v3(psmouse, packet_type);
873+ break;
874+ }
875+
802876 break;
803877
804878 case 4:
@@ -1018,8 +1092,10 @@ static int elantech_get_resolution_v4(struct psmouse *psmouse, · 213 unmodified lines
10181092 * Asus UX31 0x361f00 20, 15, 0e clickpad
10191093 * Asus UX32VD 0x361f02 00, 15, 0e clickpad
10201094 * Avatar AVIU-145A2 0x361f00 ? clickpad
1095+ * Fujitsu H730 0x570f00 c0, 14, 0c 3 hw buttons (**)
10211096 * Gigabyte U2442 0x450f01 58, 17, 0c 2 hw buttons
10221097 * Lenovo L430 0x350f02 b9, 15, 0c 2 hw buttons (*)
1098+ * Lenovo L530 0x350f02 b9, 15, 0c 2 hw buttons (*)
10231099 * Samsung NF210 0x150b00 78, 14, 0a 2 hw buttons
10241100 * Samsung NP770Z5E 0x575f01 10, 15, 0f clickpad
10251101 * Samsung NP700Z5B 0x361f06 21, 15, 0f clickpad
@@ -1029,6 +1105,8 @@ static int elantech_get_resolution_v4(struct psmouse *psmouse, · 3 unmodified lines
10291105 * Samsung RF710 0x450f00 ? 2 hw buttons
10301106 * System76 Pangolin 0x250f01 ? 2 hw buttons
10311107 * (*) + 3 trackpoint buttons
1108+ * (**) + 0 trackpoint buttons
1109+ * Note: Lenovo L430 and Lenovo L430 have the same fw_version/caps
10321110 */
10331111 static void elantech_set_buttonpad_prop(struct psmouse *psmouse)
10341112 {
@@ -1324,6 +1402,10 @@ int elantech_detect(struct psmouse *psmouse, bool set_properties) · 289 unmodified lines
13241402 */
13251403 static void elantech_disconnect(struct psmouse *psmouse)
13261404 {
1405+ struct elantech_data *etd = psmouse->private;
1406+
1407+ if (etd->tp_dev)
1408+ input_unregister_device(etd->tp_dev);
13271409 sysfs_remove_group(&psmouse->ps2dev.serio->dev.kobj,
13281410 &elantech_attr_group);
13291411 kfree(psmouse->private);
@@ -1438,8 +1520,10 @@ static int elantech_set_properties(struct elantech_data *etd) · 108 unmodified lines
14381520 int elantech_init(struct psmouse *psmouse)
14391521 {
14401522 struct elantech_data *etd;
1441− int i, error;
1523+ int i;
1524+ int error = -EINVAL;
14421525 unsigned char param[3];
1526+ struct input_dev *tp_dev;
14431527
14441528 psmouse->private = etd = kzalloc(sizeof(struct elantech_data), GFP_KERNEL);
14451529 if (!etd)
@@ -1498,14 +1582,49 @@ int elantech_init(struct psmouse *psmouse) · 52 unmodified lines
14981582 goto init_fail;
14991583 }
15001584
1585+ /* The MSB indicates the presence of the trackpoint */
1586+ if ((etd->capabilities[0] & 0x80) == 0x80) {
1587+ tp_dev = input_allocate_device();
1588+
1589+ if (!tp_dev) {
1590+ error = -ENOMEM;
1591+ goto init_fail_tp_alloc;
1592+ }
1593+
1594+ etd->tp_dev = tp_dev;
1595+ snprintf(etd->tp_phys, sizeof(etd->tp_phys), "%s/input1",
1596+ psmouse->ps2dev.serio->phys);
1597+ tp_dev->phys = etd->tp_phys;
1598+ tp_dev->name = "Elantech PS/2 TrackPoint";
1599+ tp_dev->id.bustype = BUS_I8042;
1600+ tp_dev->id.vendor = 0x0002;
1601+ tp_dev->id.product = PSMOUSE_ELANTECH;
1602+ tp_dev->id.version = 0x0000;
1603+ tp_dev->dev.parent = &psmouse->ps2dev.serio->dev;
1604+ tp_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
1605+ tp_dev->relbit[BIT_WORD(REL_X)] =
1606+ BIT_MASK(REL_X) | BIT_MASK(REL_Y);
1607+ tp_dev->keybit[BIT_WORD(BTN_LEFT)] =
1608+ BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) |
1609+ BIT_MASK(BTN_RIGHT);
1610+ error = input_register_device(etd->tp_dev);
1611+ if (error < 0)
1612+ goto init_fail_tp_reg;
1613+ }
1614+
15011615 psmouse->protocol_handler = elantech_process_byte;
15021616 psmouse->disconnect = elantech_disconnect;
15031617 psmouse->reconnect = elantech_reconnect;
15041618 psmouse->pktsize = etd->hw_version > 1 ? 6 : 4;
15051619
15061620 return 0;
1507−
1621+ init_fail_tp_reg:
1622+ input_free_device(tp_dev);
1623+ init_fail_tp_alloc:
1624+ sysfs_remove_group(&psmouse->ps2dev.serio->dev.kobj,
1625+ &elantech_attr_group);
15081626 init_fail:
1627+ psmouse_reset(psmouse);
15091628 kfree(etd);
1510− return -1;
1629+ return error;
15111630 }
drivers/input/mouse/elantech.h+3−0
@@ -94,6 +94,7 @@ · 93 unmodified lines
9494 #define PACKET_V4_HEAD 0x05
9595 #define PACKET_V4_MOTION 0x06
9696 #define PACKET_V4_STATUS 0x07
97+#define PACKET_TRACKPOINT 0x08
9798
9899 /*
99100 * track up to 5 fingers for v4 hardware
@@ -114,6 +115,8 @@ struct finger_pos { · 14 unmodified lines
114115 };
115116
116117 struct elantech_data {
118+ struct input_dev *tp_dev; /* Relative device for trackpoint */
119+ char tp_phys[32];
117120 unsigned char reg_07;
118121 unsigned char reg_10;
119122 unsigned char reg_11;
drivers/input/serio/i8042-sparcio.h+2−1
@@ -17,7 +17,6 @@ static int i8042_aux_irq = -1; · 16 unmodified lines
1717 #define I8042_MUX_PHYS_DESC "sparcps2/serio%d"
1818
1919 static void __iomem *kbd_iobase;
20−static struct resource *kbd_res;
2120
2221 #define I8042_COMMAND_REG (kbd_iobase + 0x64UL)
2322 #define I8042_DATA_REG (kbd_iobase + 0x60UL)
@@ -44,6 +43,8 @@ static inline void i8042_write_command(int val) · 20 unmodified lines
4443
4544 #ifdef CONFIG_PCI
4645
46+static struct resource *kbd_res;
47+
4748 #define OBP_PS2KBD_NAME1 "kb_ps2"
4849 #define OBP_PS2KBD_NAME2 "keyboard"
4950 #define OBP_PS2MS_NAME1 "kdmouse"
drivers/leds/led-class.c+7−7
@@ -15,10 +15,10 @@ · 14 unmodified lines
1515 #include <linux/list.h>
1616 #include <linux/spinlock.h>
1717 #include <linux/device.h>
18+#include <linux/timer.h>
1819 #include <linux/err.h>
1920 #include <linux/ctype.h>
2021 #include <linux/leds.h>
21−#include <linux/workqueue.h>
2222 #include "leds.h"
2323
2424 static struct class *leds_class;
@@ -97,10 +97,9 @@ static const struct attribute_group *led_groups[] = { · 72 unmodified lines
9797 NULL,
9898 };
9999
100−static void led_work_function(struct work_struct *ws)
100+static void led_timer_function(unsigned long data)
101101 {
102− struct led_classdev *led_cdev =
103− container_of(ws, struct led_classdev, blink_work.work);
102+ struct led_classdev *led_cdev = (void *)data;
104103 unsigned long brightness;
105104 unsigned long delay;
106105
@@ -144,8 +143,7 @@ static void led_work_function(struct work_struct *ws) · 37 unmodified lines
144143 }
145144 }
146145
147− queue_delayed_work(system_wq, &led_cdev->blink_work,
148− msecs_to_jiffies(delay));
146+ mod_timer(&led_cdev->blink_timer, jiffies + msecs_to_jiffies(delay));
149147 }
150148
151149 static void set_brightness_delayed(struct work_struct *ws)
@@ -233,7 +231,9 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev) · 81 unmodified lines
233231
234232 INIT_WORK(&led_cdev->set_brightness_work, set_brightness_delayed);
235233
236− INIT_DELAYED_WORK(&led_cdev->blink_work, led_work_function);
234+ init_timer(&led_cdev->blink_timer);
235+ led_cdev->blink_timer.function = led_timer_function;
236+ led_cdev->blink_timer.data = (unsigned long)led_cdev;
237237
238238 #ifdef CONFIG_LEDS_TRIGGERS
239239 led_trigger_set_default(led_cdev);
drivers/leds/led-core.c+5−6
@@ -16,7 +16,6 @@ · 15 unmodified lines
1616 #include <linux/module.h>
1717 #include <linux/rwsem.h>
1818 #include <linux/leds.h>
19−#include <linux/workqueue.h>
2019 #include "leds.h"
2120
2221 DECLARE_RWSEM(leds_list_lock);
@@ -52,7 +51,7 @@ static void led_set_software_blink(struct led_classdev *led_cdev, · 29 unmodified lines
5251 return;
5352 }
5453
55− queue_delayed_work(system_wq, &led_cdev->blink_work, 1);
54+ mod_timer(&led_cdev->blink_timer, jiffies + 1);
5655 }
5756
5857
@@ -76,7 +75,7 @@ void led_blink_set(struct led_classdev *led_cdev, · 17 unmodified lines
7675 unsigned long *delay_on,
7776 unsigned long *delay_off)
7877 {
79− cancel_delayed_work_sync(&led_cdev->blink_work);
78+ del_timer_sync(&led_cdev->blink_timer);
8079
8180 led_cdev->flags &= ~LED_BLINK_ONESHOT;
8281 led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;
@@ -91,7 +90,7 @@ void led_blink_set_oneshot(struct led_classdev *led_cdev, · 8 unmodified lines
9190 int invert)
9291 {
9392 if ((led_cdev->flags & LED_BLINK_ONESHOT) &&
94− delayed_work_pending(&led_cdev->blink_work))
93+ timer_pending(&led_cdev->blink_timer))
9594 return;
9695
9796 led_cdev->flags |= LED_BLINK_ONESHOT;
@@ -108,7 +107,7 @@ EXPORT_SYMBOL(led_blink_set_oneshot); · 10 unmodified lines
108107
109108 void led_stop_software_blink(struct led_classdev *led_cdev)
110109 {
111− cancel_delayed_work_sync(&led_cdev->blink_work);
110+ del_timer_sync(&led_cdev->blink_timer);
112111 led_cdev->blink_delay_on = 0;
113112 led_cdev->blink_delay_off = 0;
114113 }
@@ -117,7 +116,7 @@ EXPORT_SYMBOL_GPL(led_stop_software_blink); · 2 unmodified lines
117116 void led_set_brightness(struct led_classdev *led_cdev,
118117 enum led_brightness brightness)
119118 {
120− /* delay brightness setting if need to stop soft-blink work */
119+ /* delay brightness setting if need to stop soft-blink timer */
121120 if (led_cdev->blink_delay_on || led_cdev->blink_delay_off) {
122121 led_cdev->delayed_set_value = brightness;
123122 schedule_work(&led_cdev->set_brightness_work);
drivers/md/dm-crypt.c+19−6
@@ -1688,6 +1688,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) · 1687 unmodified lines
16881688 unsigned int key_size, opt_params;
16891689 unsigned long long tmpll;
16901690 int ret;
1691+ size_t iv_size_padding;
16911692 struct dm_arg_set as;
16921693 const char *opt_string;
16931694 char dummy;
@@ -1724,20 +1725,32 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) · 30 unmodified lines
17241725
17251726 cc->dmreq_start = sizeof(struct ablkcipher_request);
17261727 cc->dmreq_start += crypto_ablkcipher_reqsize(any_tfm(cc));
1727− cc->dmreq_start = ALIGN(cc->dmreq_start, crypto_tfm_ctx_alignment());
1728− cc->dmreq_start += crypto_ablkcipher_alignmask(any_tfm(cc)) &
1729− ~(crypto_tfm_ctx_alignment() - 1);
1728+ cc->dmreq_start = ALIGN(cc->dmreq_start, __alignof__(struct dm_crypt_request));
1729+
1730+ if (crypto_ablkcipher_alignmask(any_tfm(cc)) < CRYPTO_MINALIGN) {
1731+ /* Allocate the padding exactly */
1732+ iv_size_padding = -(cc->dmreq_start + sizeof(struct dm_crypt_request))
1733+ & crypto_ablkcipher_alignmask(any_tfm(cc));
1734+ } else {
1735+ /*
1736+ * If the cipher requires greater alignment than kmalloc
1737+ * alignment, we don't know the exact position of the
1738+ * initialization vector. We must assume worst case.
1739+ */
1740+ iv_size_padding = crypto_ablkcipher_alignmask(any_tfm(cc));
1741+ }
17301742
17311743 cc->req_pool = mempool_create_kmalloc_pool(MIN_IOS, cc->dmreq_start +
1732− sizeof(struct dm_crypt_request) + cc->iv_size);
1744+ sizeof(struct dm_crypt_request) + iv_size_padding + cc->iv_size);
17331745 if (!cc->req_pool) {
17341746 ti->error = "Cannot allocate crypt request mempool";
17351747 goto bad;
17361748 }
17371749
17381750 cc->per_bio_data_size = ti->per_bio_data_size =
1739− sizeof(struct dm_crypt_io) + cc->dmreq_start +
1740− sizeof(struct dm_crypt_request) + cc->iv_size;
1751+ ALIGN(sizeof(struct dm_crypt_io) + cc->dmreq_start +
1752+ sizeof(struct dm_crypt_request) + iv_size_padding + cc->iv_size,
1753+ ARCH_KMALLOC_MINALIGN);
17411754
17421755 cc->page_pool = mempool_create_page_pool(MIN_POOL_PAGES, 0);
17431756 if (!cc->page_pool) {
drivers/mfd/ab8500-core.c+1−1
@@ -1754,7 +1754,7 @@ static int ab8500_probe(struct platform_device *pdev) · 1753 unmodified lines
17541754 if (ret)
17551755 return ret;
17561756
1757−#if CONFIG_DEBUG_FS
1757+#ifdef CONFIG_DEBUG_FS
17581758 /* Pass to debugfs */
17591759 ab8500_debug_resources[0].start = ab8500->irq;
17601760 ab8500_debug_resources[0].end = ab8500->irq;
drivers/mfd/htc-i2cpld.c+1−1
@@ -404,7 +404,7 @@ static int htcpld_register_chip_i2c( · 403 unmodified lines
404404 }
405405
406406 i2c_set_clientdata(client, chip);
407− snprintf(client->name, I2C_NAME_SIZE, "Chip_0x%d", client->addr);
407+ snprintf(client->name, I2C_NAME_SIZE, "Chip_0x%x", client->addr);
408408 chip->client = client;
409409
410410 /* Reset the chip */
drivers/mfd/omap-usb-host.c+1−1
@@ -647,7 +647,7 @@ static int usbhs_omap_probe(struct platform_device *pdev) · 646 unmodified lines
647647 default:
648648 omap->nports = OMAP3_HS_USB_PORTS;
649649 dev_dbg(dev,
650− "USB HOST Rev:0x%d not recognized, assuming %d ports\n",
650+ "USB HOST Rev:0x%x not recognized, assuming %d ports\n",
651651 omap->usbhs_rev, omap->nports);
652652 break;
653653 }
drivers/mfd/twl4030-power.c+10−10
@@ -724,24 +724,24 @@ static struct twl4030_script *omap3_idle_scripts[] = { · 723 unmodified lines
724724 * above.
725725 */
726726 static struct twl4030_resconfig omap3_idle_rconfig[] = {
727− TWL_REMAP_SLEEP(RES_VAUX1, DEV_GRP_NULL, 0, 0),
728− TWL_REMAP_SLEEP(RES_VAUX2, DEV_GRP_NULL, 0, 0),
729− TWL_REMAP_SLEEP(RES_VAUX3, DEV_GRP_NULL, 0, 0),
730− TWL_REMAP_SLEEP(RES_VAUX4, DEV_GRP_NULL, 0, 0),
731− TWL_REMAP_SLEEP(RES_VMMC1, DEV_GRP_NULL, 0, 0),
732− TWL_REMAP_SLEEP(RES_VMMC2, DEV_GRP_NULL, 0, 0),
727+ TWL_REMAP_SLEEP(RES_VAUX1, TWL4030_RESCONFIG_UNDEF, 0, 0),
728+ TWL_REMAP_SLEEP(RES_VAUX2, TWL4030_RESCONFIG_UNDEF, 0, 0),
729+ TWL_REMAP_SLEEP(RES_VAUX3, TWL4030_RESCONFIG_UNDEF, 0, 0),
730+ TWL_REMAP_SLEEP(RES_VAUX4, TWL4030_RESCONFIG_UNDEF, 0, 0),
731+ TWL_REMAP_SLEEP(RES_VMMC1, TWL4030_RESCONFIG_UNDEF, 0, 0),
732+ TWL_REMAP_SLEEP(RES_VMMC2, TWL4030_RESCONFIG_UNDEF, 0, 0),
733733 TWL_REMAP_OFF(RES_VPLL1, DEV_GRP_P1, 3, 1),
734734 TWL_REMAP_SLEEP(RES_VPLL2, DEV_GRP_P1, 0, 0),
735− TWL_REMAP_SLEEP(RES_VSIM, DEV_GRP_NULL, 0, 0),
736− TWL_REMAP_SLEEP(RES_VDAC, DEV_GRP_NULL, 0, 0),
735+ TWL_REMAP_SLEEP(RES_VSIM, TWL4030_RESCONFIG_UNDEF, 0, 0),
736+ TWL_REMAP_SLEEP(RES_VDAC, TWL4030_RESCONFIG_UNDEF, 0, 0),
737737 TWL_REMAP_SLEEP(RES_VINTANA1, TWL_DEV_GRP_P123, 1, 2),
738738 TWL_REMAP_SLEEP(RES_VINTANA2, TWL_DEV_GRP_P123, 0, 2),
739739 TWL_REMAP_SLEEP(RES_VINTDIG, TWL_DEV_GRP_P123, 1, 2),
740740 TWL_REMAP_SLEEP(RES_VIO, TWL_DEV_GRP_P123, 2, 2),
741741 TWL_REMAP_OFF(RES_VDD1, DEV_GRP_P1, 4, 1),
742742 TWL_REMAP_OFF(RES_VDD2, DEV_GRP_P1, 3, 1),
743− TWL_REMAP_SLEEP(RES_VUSB_1V5, DEV_GRP_NULL, 0, 0),
744− TWL_REMAP_SLEEP(RES_VUSB_1V8, DEV_GRP_NULL, 0, 0),
743+ TWL_REMAP_SLEEP(RES_VUSB_1V5, TWL4030_RESCONFIG_UNDEF, 0, 0),
744+ TWL_REMAP_SLEEP(RES_VUSB_1V8, TWL4030_RESCONFIG_UNDEF, 0, 0),
745745 TWL_REMAP_SLEEP(RES_VUSB_3V1, TWL_DEV_GRP_P123, 0, 0),
746746 /* Resource #20 USB charge pump skipped */
747747 TWL_REMAP_SLEEP(RES_REGEN, TWL_DEV_GRP_P123, 2, 1),
drivers/misc/mei/client.c+1−0
@@ -601,6 +601,7 @@ int mei_cl_connect(struct mei_cl *cl, struct file *file) · 600 unmodified lines
601601 cl->timer_count = MEI_CONNECT_TIMEOUT;
602602 list_add_tail(&cb->list, &dev->ctrl_rd_list.list);
603603 } else {
604+ cl->state = MEI_FILE_INITIALIZING;
604605 list_add_tail(&cb->list, &dev->ctrl_wr_list.list);
605606 }
606607
drivers/misc/mei/nfc.c+5−6
@@ -342,9 +342,10 @@ static int mei_nfc_send(struct mei_cl_device *cldev, u8 *buf, size_t length) · 341 unmodified lines
342342 ndev = (struct mei_nfc_dev *) cldev->priv_data;
343343 dev = ndev->cl->dev;
344344
345+ err = -ENOMEM;
345346 mei_buf = kzalloc(length + MEI_NFC_HEADER_SIZE, GFP_KERNEL);
346347 if (!mei_buf)
347− return -ENOMEM;
348+ goto out;
348349
349350 hdr = (struct mei_nfc_hci_hdr *) mei_buf;
350351 hdr->cmd = MEI_NFC_CMD_HCI_SEND;
@@ -354,12 +355,9 @@ static int mei_nfc_send(struct mei_cl_device *cldev, u8 *buf, size_t length) · 3 unmodified lines
354355 hdr->data_size = length;
355356
356357 memcpy(mei_buf + MEI_NFC_HEADER_SIZE, buf, length);
357−
358358 err = __mei_cl_send(ndev->cl, mei_buf, length + MEI_NFC_HEADER_SIZE);
359359 if (err < 0)
360− return err;
361−
362− kfree(mei_buf);
360+ goto out;
363361
364362 if (!wait_event_interruptible_timeout(ndev->send_wq,
365363 ndev->recv_req_id == ndev->req_id, HZ)) {
@@ -368,7 +366,8 @@ static int mei_nfc_send(struct mei_cl_device *cldev, u8 *buf, size_t length) · 2 unmodified lines
368366 } else {
369367 ndev->req_id++;
370368 }
371−
369+out:
370+ kfree(mei_buf);
372371 return err;
373372 }
374373
drivers/mtd/chips/cfi_cmdset_0002.c+4−0
@@ -1434,6 +1434,10 @@ static int cfi_amdstd_otp_walk(struct mtd_info *mtd, loff_t from, size_t len, · 1433 unmodified lines
14341434
14351435 mutex_lock(&chip->mutex);
14361436 ret = get_chip(map, chip, base, FL_LOCKING);
1437+ if (ret) {
1438+ mutex_unlock(&chip->mutex);
1439+ return ret;
1440+ }
14371441
14381442 /* Enter lock register command */
14391443 cfi_send_gen_cmd(0xAA, cfi->addr_unlock1,
drivers/mtd/nand/omap2.c+12−4
@@ -931,7 +931,7 @@ static int omap_calculate_ecc(struct mtd_info *mtd, const u_char *dat, · 930 unmodified lines
931931 u32 val;
932932
933933 val = readl(info->reg.gpmc_ecc_config);
934− if (((val >> ECC_CONFIG_CS_SHIFT) & ~CS_MASK) != info->gpmc_cs)
934+ if (((val >> ECC_CONFIG_CS_SHIFT) & CS_MASK) != info->gpmc_cs)
935935 return -EINVAL;
936936
937937 /* read ecc result */
@@ -1794,9 +1794,12 @@ static int omap_nand_probe(struct platform_device *pdev) · 856 unmodified lines
17941794 }
17951795
17961796 /* populate MTD interface based on ECC scheme */
1797− nand_chip->ecc.layout = &omap_oobinfo;
17981797 ecclayout = &omap_oobinfo;
17991798 switch (info->ecc_opt) {
1799+ case OMAP_ECC_HAM1_CODE_SW:
1800+ nand_chip->ecc.mode = NAND_ECC_SOFT;
1801+ break;
1802+
18001803 case OMAP_ECC_HAM1_CODE_HW:
18011804 pr_info("nand: using OMAP_ECC_HAM1_CODE_HW\n");
18021805 nand_chip->ecc.mode = NAND_ECC_HW;
@@ -1848,7 +1851,7 @@ static int omap_nand_probe(struct platform_device *pdev) · 45 unmodified lines
18481851 nand_chip->ecc.priv = nand_bch_init(mtd,
18491852 nand_chip->ecc.size,
18501853 nand_chip->ecc.bytes,
1851− &nand_chip->ecc.layout);
1854+ &ecclayout);
18521855 if (!nand_chip->ecc.priv) {
18531856 pr_err("nand: error: unable to use s/w BCH library\n");
18541857 err = -EINVAL;
@@ -1923,7 +1926,7 @@ static int omap_nand_probe(struct platform_device *pdev) · 68 unmodified lines
19231926 nand_chip->ecc.priv = nand_bch_init(mtd,
19241927 nand_chip->ecc.size,
19251928 nand_chip->ecc.bytes,
1926− &nand_chip->ecc.layout);
1929+ &ecclayout);
19271930 if (!nand_chip->ecc.priv) {
19281931 pr_err("nand: error: unable to use s/w BCH library\n");
19291932 err = -EINVAL;
@@ -2012,6 +2015,9 @@ static int omap_nand_probe(struct platform_device *pdev) · 82 unmodified lines
20122015 goto return_error;
20132016 }
20142017
2018+ if (info->ecc_opt == OMAP_ECC_HAM1_CODE_SW)
2019+ goto scan_tail;
2020+
20152021 /* all OOB bytes from oobfree->offset till end off OOB are free */
20162022 ecclayout->oobfree->length = mtd->oobsize - ecclayout->oobfree->offset;
20172023 /* check if NAND device's OOB is enough to store ECC signatures */
@@ -2021,7 +2027,9 @@ static int omap_nand_probe(struct platform_device *pdev) · 3 unmodified lines
20212027 err = -EINVAL;
20222028 goto return_error;
20232029 }
2030+ nand_chip->ecc.layout = ecclayout;
20242031
2032+scan_tail:
20252033 /* second phase scan */
20262034 if (nand_scan_tail(mtd)) {
20272035 err = -ENXIO;
drivers/net/ethernet/3com/3c59x.c+4−4
@@ -2177,10 +2177,10 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) · 2176 unmodified lines
21772177 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
21782178
21792179 vp->tx_ring[entry].frag[i+1].addr =
2180− cpu_to_le32(pci_map_single(
2181− VORTEX_PCI(vp),
2182− (void *)skb_frag_address(frag),
2183− skb_frag_size(frag), PCI_DMA_TODEVICE));
2180+ cpu_to_le32(skb_frag_dma_map(
2181+ &VORTEX_PCI(vp)->dev,
2182+ frag,
2183+ frag->page_offset, frag->size, DMA_TO_DEVICE));
21842184
21852185 if (i == skb_shinfo(skb)->nr_frags-1)
21862186 vp->tx_ring[entry].frag[i+1].length = cpu_to_le32(skb_frag_size(frag)|LAST_FRAG);
drivers/net/ethernet/aeroflex/greth.c+48−38
@@ -123,6 +123,12 @@ static inline void greth_enable_tx(struct greth_private *greth) · 122 unmodified lines
123123 GRETH_REGORIN(greth->regs->control, GRETH_TXEN);
124124 }
125125
126+static inline void greth_enable_tx_and_irq(struct greth_private *greth)
127+{
128+ wmb(); /* BDs must been written to memory before enabling TX */
129+ GRETH_REGORIN(greth->regs->control, GRETH_TXEN | GRETH_TXI);
130+}
131+
126132 static inline void greth_disable_tx(struct greth_private *greth)
127133 {
128134 GRETH_REGANDIN(greth->regs->control, ~GRETH_TXEN);
@@ -447,29 +453,30 @@ out: · 318 unmodified lines
447453 return err;
448454 }
449455
456+static inline u16 greth_num_free_bds(u16 tx_last, u16 tx_next)
457+{
458+ if (tx_next < tx_last)
459+ return (tx_last - tx_next) - 1;
460+ else
461+ return GRETH_TXBD_NUM - (tx_next - tx_last) - 1;
462+}
450463
451464 static netdev_tx_t
452465 greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
453466 {
454467 struct greth_private *greth = netdev_priv(dev);
455468 struct greth_bd *bdp;
456− u32 status = 0, dma_addr, ctrl;
469+ u32 status, dma_addr;
457470 int curr_tx, nr_frags, i, err = NETDEV_TX_OK;
458471 unsigned long flags;
472+ u16 tx_last;
459473
460474 nr_frags = skb_shinfo(skb)->nr_frags;
475+ tx_last = greth->tx_last;
476+ rmb(); /* tx_last is updated by the poll task */
461477
462− /* Clean TX Ring */
463− greth_clean_tx_gbit(dev);
464−
465− if (greth->tx_free < nr_frags + 1) {
466− spin_lock_irqsave(&greth->devlock, flags);/*save from poll/irq*/
467− ctrl = GRETH_REGLOAD(greth->regs->control);
468− /* Enable TX IRQ only if not already in poll() routine */
469− if (ctrl & GRETH_RXI)
470− GRETH_REGSAVE(greth->regs->control, ctrl | GRETH_TXI);
478+ if (greth_num_free_bds(tx_last, greth->tx_next) < nr_frags + 1) {
471479 netif_stop_queue(dev);
472− spin_unlock_irqrestore(&greth->devlock, flags);
473480 err = NETDEV_TX_BUSY;
474481 goto out;
475482 }
@@ -488,6 +495,8 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev) · 12 unmodified lines
488495 /* Linear buf */
489496 if (nr_frags != 0)
490497 status = GRETH_TXBD_MORE;
498+ else
499+ status = GRETH_BD_IE;
491500
492501 if (skb->ip_summed == CHECKSUM_PARTIAL)
493502 status |= GRETH_TXBD_CSALL;
@@ -545,14 +554,12 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev) · 51 unmodified lines
545554
546555 /* Enable the descriptor chain by enabling the first descriptor */
547556 bdp = greth->tx_bd_base + greth->tx_next;
548− greth_write_bd(&bdp->stat, greth_read_bd(&bdp->stat) | GRETH_BD_EN);
549− greth->tx_next = curr_tx;
550− greth->tx_free -= nr_frags + 1;
551−
552− wmb();
557+ greth_write_bd(&bdp->stat,
558+ greth_read_bd(&bdp->stat) | GRETH_BD_EN);
553559
554560 spin_lock_irqsave(&greth->devlock, flags); /*save from poll/irq*/
555− greth_enable_tx(greth);
561+ greth->tx_next = curr_tx;
562+ greth_enable_tx_and_irq(greth);
556563 spin_unlock_irqrestore(&greth->devlock, flags);
557564
558565 return NETDEV_TX_OK;
@@ -648,7 +655,6 @@ static void greth_clean_tx(struct net_device *dev) · 89 unmodified lines
648655 if (greth->tx_free > 0) {
649656 netif_wake_queue(dev);
650657 }
651−
652658 }
653659
654660 static inline void greth_update_tx_stats(struct net_device *dev, u32 stat)
@@ -670,20 +676,22 @@ static void greth_clean_tx_gbit(struct net_device *dev) · 15 unmodified lines
670676 {
671677 struct greth_private *greth;
672678 struct greth_bd *bdp, *bdp_last_frag;
673− struct sk_buff *skb;
679+ struct sk_buff *skb = NULL;
674680 u32 stat;
675681 int nr_frags, i;
682+ u16 tx_last;
676683
677684 greth = netdev_priv(dev);
685+ tx_last = greth->tx_last;
678686
679− while (greth->tx_free < GRETH_TXBD_NUM) {
687+ while (tx_last != greth->tx_next) {
680688
681− skb = greth->tx_skbuff[greth->tx_last];
689+ skb = greth->tx_skbuff[tx_last];
682690
683691 nr_frags = skb_shinfo(skb)->nr_frags;
684692
685693 /* We only clean fully completed SKBs */
686− bdp_last_frag = greth->tx_bd_base + SKIP_TX(greth->tx_last, nr_frags);
694+ bdp_last_frag = greth->tx_bd_base + SKIP_TX(tx_last, nr_frags);
687695
688696 GRETH_REGSAVE(greth->regs->status, GRETH_INT_TE | GRETH_INT_TX);
689697 mb();
@@ -692,14 +700,14 @@ static void greth_clean_tx_gbit(struct net_device *dev) · 2 unmodified lines
692700 if (stat & GRETH_BD_EN)
693701 break;
694702
695− greth->tx_skbuff[greth->tx_last] = NULL;
703+ greth->tx_skbuff[tx_last] = NULL;
696704
697705 greth_update_tx_stats(dev, stat);
698706 dev->stats.tx_bytes += skb->len;
699707
700− bdp = greth->tx_bd_base + greth->tx_last;
708+ bdp = greth->tx_bd_base + tx_last;
701709
702− greth->tx_last = NEXT_TX(greth->tx_last);
710+ tx_last = NEXT_TX(tx_last);
703711
704712 dma_unmap_single(greth->dev,
705713 greth_read_bd(&bdp->addr),
@@ -708,21 +716,26 @@ static void greth_clean_tx_gbit(struct net_device *dev) · 2 unmodified lines
708716
709717 for (i = 0; i < nr_frags; i++) {
710718 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
711− bdp = greth->tx_bd_base + greth->tx_last;
719+ bdp = greth->tx_bd_base + tx_last;
712720
713721 dma_unmap_page(greth->dev,
714722 greth_read_bd(&bdp->addr),
715723 skb_frag_size(frag),
716724 DMA_TO_DEVICE);
717725
718− greth->tx_last = NEXT_TX(greth->tx_last);
726+ tx_last = NEXT_TX(tx_last);
719727 }
720− greth->tx_free += nr_frags+1;
721728 dev_kfree_skb(skb);
722729 }
730+ if (skb) { /* skb is set only if the above while loop was entered */
731+ wmb();
732+ greth->tx_last = tx_last;
723733
724− if (netif_queue_stopped(dev) && (greth->tx_free > (MAX_SKB_FRAGS+1)))
725− netif_wake_queue(dev);
734+ if (netif_queue_stopped(dev) &&
735+ (greth_num_free_bds(tx_last, greth->tx_next) >
736+ (MAX_SKB_FRAGS+1)))
737+ netif_wake_queue(dev);
738+ }
726739 }
727740
728741 static int greth_rx(struct net_device *dev, int limit)
@@ -965,16 +978,12 @@ static int greth_poll(struct napi_struct *napi, int budget) · 236 unmodified lines
965978 greth = container_of(napi, struct greth_private, napi);
966979
967980 restart_txrx_poll:
968− if (netif_queue_stopped(greth->netdev)) {
969− if (greth->gbit_mac)
970− greth_clean_tx_gbit(greth->netdev);
971− else
972− greth_clean_tx(greth->netdev);
973− }
974−
975981 if (greth->gbit_mac) {
982+ greth_clean_tx_gbit(greth->netdev);
976983 work_done += greth_rx_gbit(greth->netdev, budget - work_done);
977984 } else {
985+ if (netif_queue_stopped(greth->netdev))
986+ greth_clean_tx(greth->netdev);
978987 work_done += greth_rx(greth->netdev, budget - work_done);
979988 }
980989
@@ -983,7 +992,8 @@ restart_txrx_poll: · 2 unmodified lines
983992 spin_lock_irqsave(&greth->devlock, flags);
984993
985994 ctrl = GRETH_REGLOAD(greth->regs->control);
986− if (netif_queue_stopped(greth->netdev)) {
995+ if ((greth->gbit_mac && (greth->tx_last != greth->tx_next)) ||
996+ (!greth->gbit_mac && netif_queue_stopped(greth->netdev))) {
987997 GRETH_REGSAVE(greth->regs->control,
988998 ctrl | GRETH_TXI | GRETH_RXI);
989999 mask = GRETH_INT_RX | GRETH_INT_RE |
drivers/net/ethernet/aeroflex/greth.h+1−1
@@ -107,7 +107,7 @@ struct greth_private { · 106 unmodified lines
107107
108108 u16 tx_next;
109109 u16 tx_last;
110− u16 tx_free;
110+ u16 tx_free; /* only used on 10/100Mbit */
111111 u16 rx_cur;
112112
113113 struct greth_regs *regs; /* Address of controller registers. */
drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c+4−4
@@ -271,8 +271,8 @@ static ssize_t xpcs_reg_value_read(struct file *filp, char __user *buffer, · 270 unmodified lines
271271 struct xgbe_prv_data *pdata = filp->private_data;
272272 unsigned int value;
273273
274− value = pdata->hw_if.read_mmd_regs(pdata, pdata->debugfs_xpcs_mmd,
275− pdata->debugfs_xpcs_reg);
274+ value = XMDIO_READ(pdata, pdata->debugfs_xpcs_mmd,
275+ pdata->debugfs_xpcs_reg);
276276
277277 return xgbe_common_read(buffer, count, ppos, value);
278278 }
@@ -289,8 +289,8 @@ static ssize_t xpcs_reg_value_write(struct file *filp, · 10 unmodified lines
289289 if (len < 0)
290290 return len;
291291
292− pdata->hw_if.write_mmd_regs(pdata, pdata->debugfs_xpcs_mmd,
293− pdata->debugfs_xpcs_reg, value);
292+ XMDIO_WRITE(pdata, pdata->debugfs_xpcs_mmd, pdata->debugfs_xpcs_reg,
293+ value);
294294
295295 return len;
296296 }
drivers/net/ethernet/amd/xgbe/xgbe-dev.c+121−88
@@ -347,7 +347,7 @@ static int xgbe_disable_tx_flow_control(struct xgbe_prv_data *pdata) · 346 unmodified lines
347347
348348 /* Clear MAC flow control */
349349 max_q_count = XGMAC_MAX_FLOW_CONTROL_QUEUES;
350− q_count = min_t(unsigned int, pdata->rx_q_count, max_q_count);
350+ q_count = min_t(unsigned int, pdata->tx_q_count, max_q_count);
351351 reg = MAC_Q0TFCR;
352352 for (i = 0; i < q_count; i++) {
353353 reg_val = XGMAC_IOREAD(pdata, reg);
@@ -372,7 +372,7 @@ static int xgbe_enable_tx_flow_control(struct xgbe_prv_data *pdata) · 18 unmodified lines
372372
373373 /* Set MAC flow control */
374374 max_q_count = XGMAC_MAX_FLOW_CONTROL_QUEUES;
375− q_count = min_t(unsigned int, pdata->rx_q_count, max_q_count);
375+ q_count = min_t(unsigned int, pdata->tx_q_count, max_q_count);
376376 reg = MAC_Q0TFCR;
377377 for (i = 0; i < q_count; i++) {
378378 reg_val = XGMAC_IOREAD(pdata, reg);
@@ -508,8 +508,8 @@ static void xgbe_enable_mac_interrupts(struct xgbe_prv_data *pdata) · 129 unmodified lines
508508 XGMAC_IOWRITE(pdata, MAC_IER, mac_ier);
509509
510510 /* Enable all counter interrupts */
511− XGMAC_IOWRITE_BITS(pdata, MMC_RIER, ALL_INTERRUPTS, 0xff);
512− XGMAC_IOWRITE_BITS(pdata, MMC_TIER, ALL_INTERRUPTS, 0xff);
511+ XGMAC_IOWRITE_BITS(pdata, MMC_RIER, ALL_INTERRUPTS, 0xffffffff);
512+ XGMAC_IOWRITE_BITS(pdata, MMC_TIER, ALL_INTERRUPTS, 0xffffffff);
513513 }
514514
515515 static int xgbe_set_gmii_speed(struct xgbe_prv_data *pdata)
@@ -1632,6 +1632,9 @@ static int xgbe_flush_tx_queues(struct xgbe_prv_data *pdata) · 1116 unmodified lines
16321632 {
16331633 unsigned int i, count;
16341634
1635+ if (XGMAC_GET_BITS(pdata->hw_feat.version, MAC_VR, SNPSVER) < 0x21)
1636+ return 0;
1637+
16351638 for (i = 0; i < pdata->tx_q_count; i++)
16361639 XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_TQOMR, FTQ, 1);
16371640
@@ -1702,8 +1705,8 @@ static void xgbe_config_mtl_mode(struct xgbe_prv_data *pdata) · 64 unmodified lines
17021705 XGMAC_IOWRITE_BITS(pdata, MTL_OMR, RAA, MTL_RAA_SP);
17031706 }
17041707
1705−static unsigned int xgbe_calculate_per_queue_fifo(unsigned long fifo_size,
1706− unsigned char queue_count)
1708+static unsigned int xgbe_calculate_per_queue_fifo(unsigned int fifo_size,
1709+ unsigned int queue_count)
17071710 {
17081711 unsigned int q_fifo_size = 0;
17091712 enum xgbe_mtl_fifo_size p_fifo = XGMAC_MTL_FIFO_SIZE_256;
@@ -1747,6 +1750,10 @@ static unsigned int xgbe_calculate_per_queue_fifo(unsigned long fifo_size, · 37 unmodified lines
17471750 q_fifo_size = XGBE_FIFO_SIZE_KB(256);
17481751 break;
17491752 }
1753+
1754+ /* The configured value is not the actual amount of fifo RAM */
1755+ q_fifo_size = min_t(unsigned int, XGBE_FIFO_MAX, q_fifo_size);
1756+
17501757 q_fifo_size = q_fifo_size / queue_count;
17511758
17521759 /* Set the queue fifo size programmable value */
@@ -1946,6 +1953,32 @@ static void xgbe_config_vlan_support(struct xgbe_prv_data *pdata) · 193 unmodified lines
19461953 xgbe_disable_rx_vlan_stripping(pdata);
19471954 }
19481955
1956+static u64 xgbe_mmc_read(struct xgbe_prv_data *pdata, unsigned int reg_lo)
1957+{
1958+ bool read_hi;
1959+ u64 val;
1960+
1961+ switch (reg_lo) {
1962+ /* These registers are always 64 bit */
1963+ case MMC_TXOCTETCOUNT_GB_LO:
1964+ case MMC_TXOCTETCOUNT_G_LO:
1965+ case MMC_RXOCTETCOUNT_GB_LO:
1966+ case MMC_RXOCTETCOUNT_G_LO:
1967+ read_hi = true;
1968+ break;
1969+
1970+ default:
1971+ read_hi = false;
1972+ };
1973+
1974+ val = XGMAC_IOREAD(pdata, reg_lo);
1975+
1976+ if (read_hi)
1977+ val |= ((u64)XGMAC_IOREAD(pdata, reg_lo + 4) << 32);
1978+
1979+ return val;
1980+}
1981+
19491982 static void xgbe_tx_mmc_int(struct xgbe_prv_data *pdata)
19501983 {
19511984 struct xgbe_mmc_stats *stats = &pdata->mmc_stats;
@@ -1953,75 +1986,75 @@ static void xgbe_tx_mmc_int(struct xgbe_prv_data *pdata) · 1 unmodified line
19531986
19541987 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXOCTETCOUNT_GB))
19551988 stats->txoctetcount_gb +=
1956− XGMAC_IOREAD(pdata, MMC_TXOCTETCOUNT_GB_LO);
1989+ xgbe_mmc_read(pdata, MMC_TXOCTETCOUNT_GB_LO);
19571990
19581991 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXFRAMECOUNT_GB))
19591992 stats->txframecount_gb +=
1960− XGMAC_IOREAD(pdata, MMC_TXFRAMECOUNT_GB_LO);
1993+ xgbe_mmc_read(pdata, MMC_TXFRAMECOUNT_GB_LO);
19611994
19621995 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXBROADCASTFRAMES_G))
19631996 stats->txbroadcastframes_g +=
1964− XGMAC_IOREAD(pdata, MMC_TXBROADCASTFRAMES_G_LO);
1997+ xgbe_mmc_read(pdata, MMC_TXBROADCASTFRAMES_G_LO);
19651998
19661999 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXMULTICASTFRAMES_G))
19672000 stats->txmulticastframes_g +=
1968− XGMAC_IOREAD(pdata, MMC_TXMULTICASTFRAMES_G_LO);
2001+ xgbe_mmc_read(pdata, MMC_TXMULTICASTFRAMES_G_LO);
19692002
19702003 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX64OCTETS_GB))
19712004 stats->tx64octets_gb +=
1972− XGMAC_IOREAD(pdata, MMC_TX64OCTETS_GB_LO);
2005+ xgbe_mmc_read(pdata, MMC_TX64OCTETS_GB_LO);
19732006
19742007 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX65TO127OCTETS_GB))
19752008 stats->tx65to127octets_gb +=
1976− XGMAC_IOREAD(pdata, MMC_TX65TO127OCTETS_GB_LO);
2009+ xgbe_mmc_read(pdata, MMC_TX65TO127OCTETS_GB_LO);
19772010
19782011 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX128TO255OCTETS_GB))
19792012 stats->tx128to255octets_gb +=
1980− XGMAC_IOREAD(pdata, MMC_TX128TO255OCTETS_GB_LO);
2013+ xgbe_mmc_read(pdata, MMC_TX128TO255OCTETS_GB_LO);
19812014
19822015 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX256TO511OCTETS_GB))
19832016 stats->tx256to511octets_gb +=
1984− XGMAC_IOREAD(pdata, MMC_TX256TO511OCTETS_GB_LO);
2017+ xgbe_mmc_read(pdata, MMC_TX256TO511OCTETS_GB_LO);
19852018
19862019 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX512TO1023OCTETS_GB))
19872020 stats->tx512to1023octets_gb +=
1988− XGMAC_IOREAD(pdata, MMC_TX512TO1023OCTETS_GB_LO);
2021+ xgbe_mmc_read(pdata, MMC_TX512TO1023OCTETS_GB_LO);
19892022
19902023 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX1024TOMAXOCTETS_GB))
19912024 stats->tx1024tomaxoctets_gb +=
1992− XGMAC_IOREAD(pdata, MMC_TX1024TOMAXOCTETS_GB_LO);
2025+ xgbe_mmc_read(pdata, MMC_TX1024TOMAXOCTETS_GB_LO);
19932026
19942027 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXUNICASTFRAMES_GB))
19952028 stats->txunicastframes_gb +=
1996− XGMAC_IOREAD(pdata, MMC_TXUNICASTFRAMES_GB_LO);
2029+ xgbe_mmc_read(pdata, MMC_TXUNICASTFRAMES_GB_LO);
19972030
19982031 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXMULTICASTFRAMES_GB))
19992032 stats->txmulticastframes_gb +=
2000− XGMAC_IOREAD(pdata, MMC_TXMULTICASTFRAMES_GB_LO);
2033+ xgbe_mmc_read(pdata, MMC_TXMULTICASTFRAMES_GB_LO);
20012034
20022035 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXBROADCASTFRAMES_GB))
20032036 stats->txbroadcastframes_g +=
2004− XGMAC_IOREAD(pdata, MMC_TXBROADCASTFRAMES_GB_LO);
2037+ xgbe_mmc_read(pdata, MMC_TXBROADCASTFRAMES_GB_LO);
20052038
20062039 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXUNDERFLOWERROR))
20072040 stats->txunderflowerror +=
2008− XGMAC_IOREAD(pdata, MMC_TXUNDERFLOWERROR_LO);
2041+ xgbe_mmc_read(pdata, MMC_TXUNDERFLOWERROR_LO);
20092042
20102043 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXOCTETCOUNT_G))
20112044 stats->txoctetcount_g +=
2012− XGMAC_IOREAD(pdata, MMC_TXOCTETCOUNT_G_LO);
2045+ xgbe_mmc_read(pdata, MMC_TXOCTETCOUNT_G_LO);
20132046
20142047 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXFRAMECOUNT_G))
20152048 stats->txframecount_g +=
2016− XGMAC_IOREAD(pdata, MMC_TXFRAMECOUNT_G_LO);
2049+ xgbe_mmc_read(pdata, MMC_TXFRAMECOUNT_G_LO);
20172050
20182051 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXPAUSEFRAMES))
20192052 stats->txpauseframes +=
2020− XGMAC_IOREAD(pdata, MMC_TXPAUSEFRAMES_LO);
2053+ xgbe_mmc_read(pdata, MMC_TXPAUSEFRAMES_LO);
20212054
20222055 if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXVLANFRAMES_G))
20232056 stats->txvlanframes_g +=
2024− XGMAC_IOREAD(pdata, MMC_TXVLANFRAMES_G_LO);
2057+ xgbe_mmc_read(pdata, MMC_TXVLANFRAMES_G_LO);
20252058 }
20262059
20272060 static void xgbe_rx_mmc_int(struct xgbe_prv_data *pdata)
@@ -2031,95 +2064,95 @@ static void xgbe_rx_mmc_int(struct xgbe_prv_data *pdata) · 3 unmodified lines
20312064
20322065 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXFRAMECOUNT_GB))
20332066 stats->rxframecount_gb +=
2034− XGMAC_IOREAD(pdata, MMC_RXFRAMECOUNT_GB_LO);
2067+ xgbe_mmc_read(pdata, MMC_RXFRAMECOUNT_GB_LO);
20352068
20362069 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXOCTETCOUNT_GB))
20372070 stats->rxoctetcount_gb +=
2038− XGMAC_IOREAD(pdata, MMC_RXOCTETCOUNT_GB_LO);
2071+ xgbe_mmc_read(pdata, MMC_RXOCTETCOUNT_GB_LO);
20392072
20402073 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXOCTETCOUNT_G))
20412074 stats->rxoctetcount_g +=
2042− XGMAC_IOREAD(pdata, MMC_RXOCTETCOUNT_G_LO);
2075+ xgbe_mmc_read(pdata, MMC_RXOCTETCOUNT_G_LO);
20432076
20442077 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXBROADCASTFRAMES_G))
20452078 stats->rxbroadcastframes_g +=
2046− XGMAC_IOREAD(pdata, MMC_RXBROADCASTFRAMES_G_LO);
2079+ xgbe_mmc_read(pdata, MMC_RXBROADCASTFRAMES_G_LO);
20472080
20482081 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXMULTICASTFRAMES_G))
20492082 stats->rxmulticastframes_g +=
2050− XGMAC_IOREAD(pdata, MMC_RXMULTICASTFRAMES_G_LO);
2083+ xgbe_mmc_read(pdata, MMC_RXMULTICASTFRAMES_G_LO);
20512084
20522085 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXCRCERROR))
20532086 stats->rxcrcerror +=
2054− XGMAC_IOREAD(pdata, MMC_RXCRCERROR_LO);
2087+ xgbe_mmc_read(pdata, MMC_RXCRCERROR_LO);
20552088
20562089 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXRUNTERROR))
20572090 stats->rxrunterror +=
2058− XGMAC_IOREAD(pdata, MMC_RXRUNTERROR);
2091+ xgbe_mmc_read(pdata, MMC_RXRUNTERROR);
20592092
20602093 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXJABBERERROR))
20612094 stats->rxjabbererror +=
2062− XGMAC_IOREAD(pdata, MMC_RXJABBERERROR);
2095+ xgbe_mmc_read(pdata, MMC_RXJABBERERROR);
20632096
20642097 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXUNDERSIZE_G))
20652098 stats->rxundersize_g +=
2066− XGMAC_IOREAD(pdata, MMC_RXUNDERSIZE_G);
2099+ xgbe_mmc_read(pdata, MMC_RXUNDERSIZE_G);
20672100
20682101 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXOVERSIZE_G))
20692102 stats->rxoversize_g +=
2070− XGMAC_IOREAD(pdata, MMC_RXOVERSIZE_G);
2103+ xgbe_mmc_read(pdata, MMC_RXOVERSIZE_G);
20712104
20722105 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX64OCTETS_GB))
20732106 stats->rx64octets_gb +=
2074− XGMAC_IOREAD(pdata, MMC_RX64OCTETS_GB_LO);
2107+ xgbe_mmc_read(pdata, MMC_RX64OCTETS_GB_LO);
20752108
20762109 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX65TO127OCTETS_GB))
20772110 stats->rx65to127octets_gb +=
2078− XGMAC_IOREAD(pdata, MMC_RX65TO127OCTETS_GB_LO);
2111+ xgbe_mmc_read(pdata, MMC_RX65TO127OCTETS_GB_LO);
20792112
20802113 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX128TO255OCTETS_GB))
20812114 stats->rx128to255octets_gb +=
2082− XGMAC_IOREAD(pdata, MMC_RX128TO255OCTETS_GB_LO);
2115+ xgbe_mmc_read(pdata, MMC_RX128TO255OCTETS_GB_LO);
20832116
20842117 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX256TO511OCTETS_GB))
20852118 stats->rx256to511octets_gb +=
2086− XGMAC_IOREAD(pdata, MMC_RX256TO511OCTETS_GB_LO);
2119+ xgbe_mmc_read(pdata, MMC_RX256TO511OCTETS_GB_LO);
20872120
20882121 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX512TO1023OCTETS_GB))
20892122 stats->rx512to1023octets_gb +=
2090− XGMAC_IOREAD(pdata, MMC_RX512TO1023OCTETS_GB_LO);
2123+ xgbe_mmc_read(pdata, MMC_RX512TO1023OCTETS_GB_LO);
20912124
20922125 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX1024TOMAXOCTETS_GB))
20932126 stats->rx1024tomaxoctets_gb +=
2094− XGMAC_IOREAD(pdata, MMC_RX1024TOMAXOCTETS_GB_LO);
2127+ xgbe_mmc_read(pdata, MMC_RX1024TOMAXOCTETS_GB_LO);
20952128
20962129 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXUNICASTFRAMES_G))
20972130 stats->rxunicastframes_g +=
2098− XGMAC_IOREAD(pdata, MMC_RXUNICASTFRAMES_G_LO);
2131+ xgbe_mmc_read(pdata, MMC_RXUNICASTFRAMES_G_LO);
20992132
21002133 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXLENGTHERROR))
21012134 stats->rxlengtherror +=
2102− XGMAC_IOREAD(pdata, MMC_RXLENGTHERROR_LO);
2135+ xgbe_mmc_read(pdata, MMC_RXLENGTHERROR_LO);
21032136
21042137 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXOUTOFRANGETYPE))
21052138 stats->rxoutofrangetype +=
2106− XGMAC_IOREAD(pdata, MMC_RXOUTOFRANGETYPE_LO);
2139+ xgbe_mmc_read(pdata, MMC_RXOUTOFRANGETYPE_LO);
21072140
21082141 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXPAUSEFRAMES))
21092142 stats->rxpauseframes +=
2110− XGMAC_IOREAD(pdata, MMC_RXPAUSEFRAMES_LO);
2143+ xgbe_mmc_read(pdata, MMC_RXPAUSEFRAMES_LO);
21112144
21122145 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXFIFOOVERFLOW))
21132146 stats->rxfifooverflow +=
2114− XGMAC_IOREAD(pdata, MMC_RXFIFOOVERFLOW_LO);
2147+ xgbe_mmc_read(pdata, MMC_RXFIFOOVERFLOW_LO);
21152148
21162149 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXVLANFRAMES_GB))
21172150 stats->rxvlanframes_gb +=
2118− XGMAC_IOREAD(pdata, MMC_RXVLANFRAMES_GB_LO);
2151+ xgbe_mmc_read(pdata, MMC_RXVLANFRAMES_GB_LO);
21192152
21202153 if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXWATCHDOGERROR))
21212154 stats->rxwatchdogerror +=
2122− XGMAC_IOREAD(pdata, MMC_RXWATCHDOGERROR);
2155+ xgbe_mmc_read(pdata, MMC_RXWATCHDOGERROR);
21232156 }
21242157
21252158 static void xgbe_read_mmc_stats(struct xgbe_prv_data *pdata)
@@ -2130,127 +2163,127 @@ static void xgbe_read_mmc_stats(struct xgbe_prv_data *pdata) · 4 unmodified lines
21302163 XGMAC_IOWRITE_BITS(pdata, MMC_CR, MCF, 1);
21312164
21322165 stats->txoctetcount_gb +=
2133− XGMAC_IOREAD(pdata, MMC_TXOCTETCOUNT_GB_LO);
2166+ xgbe_mmc_read(pdata, MMC_TXOCTETCOUNT_GB_LO);
21342167
21352168 stats->txframecount_gb +=
2136− XGMAC_IOREAD(pdata, MMC_TXFRAMECOUNT_GB_LO);
2169+ xgbe_mmc_read(pdata, MMC_TXFRAMECOUNT_GB_LO);
21372170
21382171 stats->txbroadcastframes_g +=
2139− XGMAC_IOREAD(pdata, MMC_TXBROADCASTFRAMES_G_LO);
2172+ xgbe_mmc_read(pdata, MMC_TXBROADCASTFRAMES_G_LO);
21402173
21412174 stats->txmulticastframes_g +=
2142− XGMAC_IOREAD(pdata, MMC_TXMULTICASTFRAMES_G_LO);
2175+ xgbe_mmc_read(pdata, MMC_TXMULTICASTFRAMES_G_LO);
21432176
21442177 stats->tx64octets_gb +=
2145− XGMAC_IOREAD(pdata, MMC_TX64OCTETS_GB_LO);
2178+ xgbe_mmc_read(pdata, MMC_TX64OCTETS_GB_LO);
21462179
21472180 stats->tx65to127octets_gb +=
2148− XGMAC_IOREAD(pdata, MMC_TX65TO127OCTETS_GB_LO);
2181+ xgbe_mmc_read(pdata, MMC_TX65TO127OCTETS_GB_LO);
21492182
21502183 stats->tx128to255octets_gb +=
2151− XGMAC_IOREAD(pdata, MMC_TX128TO255OCTETS_GB_LO);
2184+ xgbe_mmc_read(pdata, MMC_TX128TO255OCTETS_GB_LO);
21522185
21532186 stats->tx256to511octets_gb +=
2154− XGMAC_IOREAD(pdata, MMC_TX256TO511OCTETS_GB_LO);
2187+ xgbe_mmc_read(pdata, MMC_TX256TO511OCTETS_GB_LO);
21552188
21562189 stats->tx512to1023octets_gb +=
2157− XGMAC_IOREAD(pdata, MMC_TX512TO1023OCTETS_GB_LO);
2190+ xgbe_mmc_read(pdata, MMC_TX512TO1023OCTETS_GB_LO);
21582191
21592192 stats->tx1024tomaxoctets_gb +=
2160− XGMAC_IOREAD(pdata, MMC_TX1024TOMAXOCTETS_GB_LO);
2193+ xgbe_mmc_read(pdata, MMC_TX1024TOMAXOCTETS_GB_LO);
21612194
21622195 stats->txunicastframes_gb +=
2163− XGMAC_IOREAD(pdata, MMC_TXUNICASTFRAMES_GB_LO);
2196+ xgbe_mmc_read(pdata, MMC_TXUNICASTFRAMES_GB_LO);
21642197
21652198 stats->txmulticastframes_gb +=
2166− XGMAC_IOREAD(pdata, MMC_TXMULTICASTFRAMES_GB_LO);
2199+ xgbe_mmc_read(pdata, MMC_TXMULTICASTFRAMES_GB_LO);
21672200
21682201 stats->txbroadcastframes_g +=
2169− XGMAC_IOREAD(pdata, MMC_TXBROADCASTFRAMES_GB_LO);
2202+ xgbe_mmc_read(pdata, MMC_TXBROADCASTFRAMES_GB_LO);
21702203
21712204 stats->txunderflowerror +=
2172− XGMAC_IOREAD(pdata, MMC_TXUNDERFLOWERROR_LO);
2205+ xgbe_mmc_read(pdata, MMC_TXUNDERFLOWERROR_LO);
21732206
21742207 stats->txoctetcount_g +=
2175− XGMAC_IOREAD(pdata, MMC_TXOCTETCOUNT_G_LO);
2208+ xgbe_mmc_read(pdata, MMC_TXOCTETCOUNT_G_LO);
21762209
21772210 stats->txframecount_g +=
2178− XGMAC_IOREAD(pdata, MMC_TXFRAMECOUNT_G_LO);
2211+ xgbe_mmc_read(pdata, MMC_TXFRAMECOUNT_G_LO);
21792212
21802213 stats->txpauseframes +=
2181− XGMAC_IOREAD(pdata, MMC_TXPAUSEFRAMES_LO);
2214+ xgbe_mmc_read(pdata, MMC_TXPAUSEFRAMES_LO);
21822215
21832216 stats->txvlanframes_g +=
2184− XGMAC_IOREAD(pdata, MMC_TXVLANFRAMES_G_LO);
2217+ xgbe_mmc_read(pdata, MMC_TXVLANFRAMES_G_LO);
21852218
21862219 stats->rxframecount_gb +=
2187− XGMAC_IOREAD(pdata, MMC_RXFRAMECOUNT_GB_LO);
2220+ xgbe_mmc_read(pdata, MMC_RXFRAMECOUNT_GB_LO);
21882221
21892222 stats->rxoctetcount_gb +=
2190− XGMAC_IOREAD(pdata, MMC_RXOCTETCOUNT_GB_LO);
2223+ xgbe_mmc_read(pdata, MMC_RXOCTETCOUNT_GB_LO);
21912224
21922225 stats->rxoctetcount_g +=
2193− XGMAC_IOREAD(pdata, MMC_RXOCTETCOUNT_G_LO);
2226+ xgbe_mmc_read(pdata, MMC_RXOCTETCOUNT_G_LO);
21942227
21952228 stats->rxbroadcastframes_g +=
2196− XGMAC_IOREAD(pdata, MMC_RXBROADCASTFRAMES_G_LO);
2229+ xgbe_mmc_read(pdata, MMC_RXBROADCASTFRAMES_G_LO);
21972230
21982231 stats->rxmulticastframes_g +=
2199− XGMAC_IOREAD(pdata, MMC_RXMULTICASTFRAMES_G_LO);
2232+ xgbe_mmc_read(pdata, MMC_RXMULTICASTFRAMES_G_LO);
22002233
22012234 stats->rxcrcerror +=
2202− XGMAC_IOREAD(pdata, MMC_RXCRCERROR_LO);
2235+ xgbe_mmc_read(pdata, MMC_RXCRCERROR_LO);
22032236
22042237 stats->rxrunterror +=
2205− XGMAC_IOREAD(pdata, MMC_RXRUNTERROR);
2238+ xgbe_mmc_read(pdata, MMC_RXRUNTERROR);
22062239
22072240 stats->rxjabbererror +=
2208− XGMAC_IOREAD(pdata, MMC_RXJABBERERROR);
2241+ xgbe_mmc_read(pdata, MMC_RXJABBERERROR);
22092242
22102243 stats->rxundersize_g +=
2211− XGMAC_IOREAD(pdata, MMC_RXUNDERSIZE_G);
2244+ xgbe_mmc_read(pdata, MMC_RXUNDERSIZE_G);
22122245
22132246 stats->rxoversize_g +=
2214− XGMAC_IOREAD(pdata, MMC_RXOVERSIZE_G);
2247+ xgbe_mmc_read(pdata, MMC_RXOVERSIZE_G);
22152248
22162249 stats->rx64octets_gb +=
2217− XGMAC_IOREAD(pdata, MMC_RX64OCTETS_GB_LO);
2250+ xgbe_mmc_read(pdata, MMC_RX64OCTETS_GB_LO);
22182251
22192252 stats->rx65to127octets_gb +=
2220− XGMAC_IOREAD(pdata, MMC_RX65TO127OCTETS_GB_LO);
2253+ xgbe_mmc_read(pdata, MMC_RX65TO127OCTETS_GB_LO);
22212254
22222255 stats->rx128to255octets_gb +=
2223− XGMAC_IOREAD(pdata, MMC_RX128TO255OCTETS_GB_LO);
2256+ xgbe_mmc_read(pdata, MMC_RX128TO255OCTETS_GB_LO);
22242257
22252258 stats->rx256to511octets_gb +=
2226− XGMAC_IOREAD(pdata, MMC_RX256TO511OCTETS_GB_LO);
2259+ xgbe_mmc_read(pdata, MMC_RX256TO511OCTETS_GB_LO);
22272260
22282261 stats->rx512to1023octets_gb +=
2229− XGMAC_IOREAD(pdata, MMC_RX512TO1023OCTETS_GB_LO);
2262+ xgbe_mmc_read(pdata, MMC_RX512TO1023OCTETS_GB_LO);
22302263
22312264 stats->rx1024tomaxoctets_gb +=
2232− XGMAC_IOREAD(pdata, MMC_RX1024TOMAXOCTETS_GB_LO);
2265+ xgbe_mmc_read(pdata, MMC_RX1024TOMAXOCTETS_GB_LO);
22332266
22342267 stats->rxunicastframes_g +=
2235− XGMAC_IOREAD(pdata, MMC_RXUNICASTFRAMES_G_LO);
2268+ xgbe_mmc_read(pdata, MMC_RXUNICASTFRAMES_G_LO);
22362269
22372270 stats->rxlengtherror +=
2238− XGMAC_IOREAD(pdata, MMC_RXLENGTHERROR_LO);
2271+ xgbe_mmc_read(pdata, MMC_RXLENGTHERROR_LO);
22392272
22402273 stats->rxoutofrangetype +=
2241− XGMAC_IOREAD(pdata, MMC_RXOUTOFRANGETYPE_LO);
2274+ xgbe_mmc_read(pdata, MMC_RXOUTOFRANGETYPE_LO);
22422275
22432276 stats->rxpauseframes +=
2244− XGMAC_IOREAD(pdata, MMC_RXPAUSEFRAMES_LO);
2277+ xgbe_mmc_read(pdata, MMC_RXPAUSEFRAMES_LO);
22452278
22462279 stats->rxfifooverflow +=
2247− XGMAC_IOREAD(pdata, MMC_RXFIFOOVERFLOW_LO);
2280+ xgbe_mmc_read(pdata, MMC_RXFIFOOVERFLOW_LO);
22482281
22492282 stats->rxvlanframes_gb +=
2250− XGMAC_IOREAD(pdata, MMC_RXVLANFRAMES_GB_LO);
2283+ xgbe_mmc_read(pdata, MMC_RXVLANFRAMES_GB_LO);
22512284
22522285 stats->rxwatchdogerror +=
2253− XGMAC_IOREAD(pdata, MMC_RXWATCHDOGERROR);
2286+ xgbe_mmc_read(pdata, MMC_RXWATCHDOGERROR);
22542287
22552288 /* Un-freeze counters */
22562289 XGMAC_IOWRITE_BITS(pdata, MMC_CR, MCF, 0);
drivers/net/ethernet/amd/xgbe/xgbe-drv.c+2−0
@@ -360,6 +360,8 @@ void xgbe_get_all_hw_features(struct xgbe_prv_data *pdata) · 359 unmodified lines
360360
361361 memset(hw_feat, 0, sizeof(*hw_feat));
362362
363+ hw_feat->version = XGMAC_IOREAD(pdata, MAC_VR);
364+
363365 /* Hardware feature register 0 */
364366 hw_feat->gmii = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, GMIISEL);
365367 hw_feat->vlhash = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, VLHASH);
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c+4−3
@@ -361,15 +361,16 @@ static void xgbe_get_drvinfo(struct net_device *netdev, · 360 unmodified lines
361361 struct ethtool_drvinfo *drvinfo)
362362 {
363363 struct xgbe_prv_data *pdata = netdev_priv(netdev);
364+ struct xgbe_hw_features *hw_feat = &pdata->hw_feat;
364365
365366 strlcpy(drvinfo->driver, XGBE_DRV_NAME, sizeof(drvinfo->driver));
366367 strlcpy(drvinfo->version, XGBE_DRV_VERSION, sizeof(drvinfo->version));
367368 strlcpy(drvinfo->bus_info, dev_name(pdata->dev),
368369 sizeof(drvinfo->bus_info));
369370 snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%d",
370− XGMAC_IOREAD_BITS(pdata, MAC_VR, USERVER),
371− XGMAC_IOREAD_BITS(pdata, MAC_VR, DEVID),
372− XGMAC_IOREAD_BITS(pdata, MAC_VR, SNPSVER));
371+ XGMAC_GET_BITS(hw_feat->version, MAC_VR, USERVER),
372+ XGMAC_GET_BITS(hw_feat->version, MAC_VR, DEVID),
373+ XGMAC_GET_BITS(hw_feat->version, MAC_VR, SNPSVER));
373374 drvinfo->n_stats = XGBE_STATS_COUNT;
374375 }
375376
drivers/net/ethernet/amd/xgbe/xgbe-main.c+1−1
@@ -171,7 +171,7 @@ static struct xgbe_channel *xgbe_alloc_rings(struct xgbe_prv_data *pdata) · 170 unmodified lines
171171 }
172172
173173 if (i < pdata->rx_ring_count) {
174− spin_lock_init(&tx_ring->lock);
174+ spin_lock_init(&rx_ring->lock);
175175 channel->rx_ring = rx_ring++;
176176 }
177177
drivers/net/ethernet/amd/xgbe/xgbe.h+4−0
@@ -182,6 +182,7 @@ · 181 unmodified lines
182182 #define XGMAC_DRIVER_CONTEXT 1
183183 #define XGMAC_IOCTL_CONTEXT 2
184184
185+#define XGBE_FIFO_MAX 81920
185186 #define XGBE_FIFO_SIZE_B(x) (x)
186187 #define XGBE_FIFO_SIZE_KB(x) (x * 1024)
187188
@@ -524,6 +525,9 @@ struct xgbe_desc_if { · 336 unmodified lines
524525 * or configurations are present in the device.
525526 */
526527 struct xgbe_hw_features {
528+ /* HW Version */
529+ unsigned int version;
530+
527531 /* HW Feature Register0 */
528532 unsigned int gmii; /* 1000 Mbps support */
529533 unsigned int vlhash; /* VLAN Hash Filter */
drivers/net/ethernet/apm/xgene/Kconfig+1−0
@@ -1,5 +1,6 @@
11 config NET_XGENE
22 tristate "APM X-Gene SoC Ethernet Driver"
3+ depends on HAS_DMA
34 select PHYLIB
45 help
56 This is the Ethernet driver for the on-chip ethernet interface on the
drivers/net/ethernet/broadcom/Kconfig+1−1
@@ -84,7 +84,7 @@ config BNX2 · 83 unmodified lines
8484
8585 config CNIC
8686 tristate "QLogic CNIC support"
87− depends on PCI
87+ depends on PCI && (IPV6 || IPV6=n)
8888 select BNX2
8989 select UIO
9090 ---help---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h+6−1
@@ -2233,7 +2233,12 @@ struct shmem2_region { · 2232 unmodified lines
22332233 u32 reserved3; /* Offset 0x14C */
22342234 u32 reserved4; /* Offset 0x150 */
22352235 u32 link_attr_sync[PORT_MAX]; /* Offset 0x154 */
2236− #define LINK_ATTR_SYNC_KR2_ENABLE (1<<0)
2236+ #define LINK_ATTR_SYNC_KR2_ENABLE 0x00000001
2237+ #define LINK_SFP_EEPROM_COMP_CODE_MASK 0x0000ff00
2238+ #define LINK_SFP_EEPROM_COMP_CODE_SHIFT 8
2239+ #define LINK_SFP_EEPROM_COMP_CODE_SR 0x00001000
2240+ #define LINK_SFP_EEPROM_COMP_CODE_LR 0x00002000
2241+ #define LINK_SFP_EEPROM_COMP_CODE_LRM 0x00004000
22372242
22382243 u32 reserved5[2];
22392244 u32 reserved6[PORT_MAX];
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c+41−33
@@ -154,15 +154,22 @@ typedef int (*read_sfp_module_eeprom_func_p)(struct bnx2x_phy *phy, · 153 unmodified lines
154154 LINK_STATUS_LINK_PARTNER_ASYMMETRIC_PAUSE)
155155
156156 #define SFP_EEPROM_CON_TYPE_ADDR 0x2
157+ #define SFP_EEPROM_CON_TYPE_VAL_UNKNOWN 0x0
157158 #define SFP_EEPROM_CON_TYPE_VAL_LC 0x7
158159 #define SFP_EEPROM_CON_TYPE_VAL_COPPER 0x21
159160 #define SFP_EEPROM_CON_TYPE_VAL_RJ45 0x22
160161
161162
162−#define SFP_EEPROM_COMP_CODE_ADDR 0x3
163− #define SFP_EEPROM_COMP_CODE_SR_MASK (1<<4)
164− #define SFP_EEPROM_COMP_CODE_LR_MASK (1<<5)
165− #define SFP_EEPROM_COMP_CODE_LRM_MASK (1<<6)
163+#define SFP_EEPROM_10G_COMP_CODE_ADDR 0x3
164+ #define SFP_EEPROM_10G_COMP_CODE_SR_MASK (1<<4)
165+ #define SFP_EEPROM_10G_COMP_CODE_LR_MASK (1<<5)
166+ #define SFP_EEPROM_10G_COMP_CODE_LRM_MASK (1<<6)
167+
168+#define SFP_EEPROM_1G_COMP_CODE_ADDR 0x6
169+ #define SFP_EEPROM_1G_COMP_CODE_SX (1<<0)
170+ #define SFP_EEPROM_1G_COMP_CODE_LX (1<<1)
171+ #define SFP_EEPROM_1G_COMP_CODE_CX (1<<2)
172+ #define SFP_EEPROM_1G_COMP_CODE_BASE_T (1<<3)
166173
167174 #define SFP_EEPROM_FC_TX_TECH_ADDR 0x8
168175 #define SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_PASSIVE 0x4
@@ -3633,8 +3640,8 @@ static void bnx2x_warpcore_enable_AN_KR2(struct bnx2x_phy *phy, · 3464 unmodified lines
36333640 reg_set[i].val);
36343641
36353642 /* Start KR2 work-around timer which handles BCM8073 link-parner */
3636− vars->link_attr_sync |= LINK_ATTR_SYNC_KR2_ENABLE;
3637− bnx2x_update_link_attr(params, vars->link_attr_sync);
3643+ params->link_attr_sync |= LINK_ATTR_SYNC_KR2_ENABLE;
3644+ bnx2x_update_link_attr(params, params->link_attr_sync);
36383645 }
36393646
36403647 static void bnx2x_disable_kr2(struct link_params *params,
@@ -3666,8 +3673,8 @@ static void bnx2x_disable_kr2(struct link_params *params, · 25 unmodified lines
36663673 for (i = 0; i < ARRAY_SIZE(reg_set); i++)
36673674 bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg,
36683675 reg_set[i].val);
3669− vars->link_attr_sync &= ~LINK_ATTR_SYNC_KR2_ENABLE;
3670− bnx2x_update_link_attr(params, vars->link_attr_sync);
3676+ params->link_attr_sync &= ~LINK_ATTR_SYNC_KR2_ENABLE;
3677+ bnx2x_update_link_attr(params, params->link_attr_sync);
36713678
36723679 vars->check_kr2_recovery_cnt = CHECK_KR2_RECOVERY_CNT;
36733680 }
@@ -4810,7 +4817,7 @@ void bnx2x_link_status_update(struct link_params *params, · 1136 unmodified lines
48104817 ~FEATURE_CONFIG_PFC_ENABLED;
48114818
48124819 if (SHMEM2_HAS(bp, link_attr_sync))
4813− vars->link_attr_sync = SHMEM2_RD(bp,
4820+ params->link_attr_sync = SHMEM2_RD(bp,
48144821 link_attr_sync[params->port]);
48154822
48164823 DP(NETIF_MSG_LINK, "link_status 0x%x phy_link_up %x int_mask 0x%x\n",
@@ -8057,21 +8064,24 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy, · 3240 unmodified lines
80578064 {
80588065 struct bnx2x *bp = params->bp;
80598066 u32 sync_offset = 0, phy_idx, media_types;
8060− u8 gport, val[2], check_limiting_mode = 0;
8067+ u8 val[SFP_EEPROM_FC_TX_TECH_ADDR + 1], check_limiting_mode = 0;
80618068 *edc_mode = EDC_MODE_LIMITING;
80628069 phy->media_type = ETH_PHY_UNSPECIFIED;
80638070 /* First check for copper cable */
80648071 if (bnx2x_read_sfp_module_eeprom(phy,
80658072 params,
80668073 I2C_DEV_ADDR_A0,
8067− SFP_EEPROM_CON_TYPE_ADDR,
8068− 2,
8074+ 0,
8075+ SFP_EEPROM_FC_TX_TECH_ADDR + 1,
80698076 (u8 *)val) != 0) {
80708077 DP(NETIF_MSG_LINK, "Failed to read from SFP+ module EEPROM\n");
80718078 return -EINVAL;
80728079 }
8073−
8074− switch (val[0]) {
8080+ params->link_attr_sync &= ~LINK_SFP_EEPROM_COMP_CODE_MASK;
8081+ params->link_attr_sync |= val[SFP_EEPROM_10G_COMP_CODE_ADDR] <<
8082+ LINK_SFP_EEPROM_COMP_CODE_SHIFT;
8083+ bnx2x_update_link_attr(params, params->link_attr_sync);
8084+ switch (val[SFP_EEPROM_CON_TYPE_ADDR]) {
80758085 case SFP_EEPROM_CON_TYPE_VAL_COPPER:
80768086 {
80778087 u8 copper_module_type;
@@ -8079,17 +8089,7 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy, · 1 unmodified line
80798089 /* Check if its active cable (includes SFP+ module)
80808090 * of passive cable
80818091 */
8082− if (bnx2x_read_sfp_module_eeprom(phy,
8083− params,
8084− I2C_DEV_ADDR_A0,
8085− SFP_EEPROM_FC_TX_TECH_ADDR,
8086− 1,
8087− &copper_module_type) != 0) {
8088− DP(NETIF_MSG_LINK,
8089− "Failed to read copper-cable-type"
8090− " from SFP+ EEPROM\n");
8091− return -EINVAL;
8092− }
8092+ copper_module_type = val[SFP_EEPROM_FC_TX_TECH_ADDR];
80938093
80948094 if (copper_module_type &
80958095 SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_ACTIVE) {
@@ -8115,16 +8115,18 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy, · 19 unmodified lines
81158115 }
81168116 break;
81178117 }
8118+ case SFP_EEPROM_CON_TYPE_VAL_UNKNOWN:
81188119 case SFP_EEPROM_CON_TYPE_VAL_LC:
81198120 case SFP_EEPROM_CON_TYPE_VAL_RJ45:
81208121 check_limiting_mode = 1;
8121− if ((val[1] & (SFP_EEPROM_COMP_CODE_SR_MASK |
8122− SFP_EEPROM_COMP_CODE_LR_MASK |
8123− SFP_EEPROM_COMP_CODE_LRM_MASK)) == 0) {
8122+ if ((val[SFP_EEPROM_10G_COMP_CODE_ADDR] &
8123+ (SFP_EEPROM_10G_COMP_CODE_SR_MASK |
8124+ SFP_EEPROM_10G_COMP_CODE_LR_MASK |
8125+ SFP_EEPROM_10G_COMP_CODE_LRM_MASK)) == 0) {
81248126 DP(NETIF_MSG_LINK, "1G SFP module detected\n");
8125− gport = params->port;
81268127 phy->media_type = ETH_PHY_SFP_1G_FIBER;
81278128 if (phy->req_line_speed != SPEED_1000) {
8129+ u8 gport = params->port;
81288130 phy->req_line_speed = SPEED_1000;
81298131 if (!CHIP_IS_E1x(bp)) {
81308132 gport = BP_PATH(bp) +
@@ -8134,6 +8136,12 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy, · 3 unmodified lines
81348136 "Warning: Link speed was forced to 1000Mbps. Current SFP module in port %d is not compliant with 10G Ethernet\n",
81358137 gport);
81368138 }
8139+ if (val[SFP_EEPROM_1G_COMP_CODE_ADDR] &
8140+ SFP_EEPROM_1G_COMP_CODE_BASE_T) {
8141+ bnx2x_sfp_set_transmitter(params, phy, 0);
8142+ msleep(40);
8143+ bnx2x_sfp_set_transmitter(params, phy, 1);
8144+ }
81378145 } else {
81388146 int idx, cfg_idx = 0;
81398147 DP(NETIF_MSG_LINK, "10G Optic module detected\n");
@@ -8149,7 +8157,7 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy, · 9 unmodified lines
81498157 break;
81508158 default:
81518159 DP(NETIF_MSG_LINK, "Unable to determine module type 0x%x !!!\n",
8152− val[0]);
8160+ val[SFP_EEPROM_CON_TYPE_ADDR]);
81538161 return -EINVAL;
81548162 }
81558163 sync_offset = params->shmem_base +
@@ -13507,7 +13515,7 @@ static void bnx2x_check_kr2_wa(struct link_params *params, · 5351 unmodified lines
1350713515
1350813516 sigdet = bnx2x_warpcore_get_sigdet(phy, params);
1350913517 if (!sigdet) {
13510− if (!(vars->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
13518+ if (!(params->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
1351113519 bnx2x_kr2_recovery(params, vars, phy);
1351213520 DP(NETIF_MSG_LINK, "No sigdet\n");
1351313521 }
@@ -13525,7 +13533,7 @@ static void bnx2x_check_kr2_wa(struct link_params *params, · 11 unmodified lines
1352513533
1352613534 /* CL73 has not begun yet */
1352713535 if (base_page == 0) {
13528− if (!(vars->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
13536+ if (!(params->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
1352913537 bnx2x_kr2_recovery(params, vars, phy);
1353013538 DP(NETIF_MSG_LINK, "No BP\n");
1353113539 }
@@ -13541,7 +13549,7 @@ static void bnx2x_check_kr2_wa(struct link_params *params, · 9 unmodified lines
1354113549 ((next_page & 0xe0) == 0x20))));
1354213550
1354313551 /* In case KR2 is already disabled, check if we need to re-enable it */
13544− if (!(vars->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
13552+ if (!(params->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
1354513553 if (!not_kr2_device) {
1354613554 DP(NETIF_MSG_LINK, "BP=0x%x, NP=0x%x\n", base_page,
1354713555 next_page);
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h+3−2
@@ -323,6 +323,9 @@ struct link_params { · 322 unmodified lines
323323 #define LINK_FLAGS_INT_DISABLED (1<<0)
324324 #define PHY_INITIALIZED (1<<1)
325325 u32 lfa_base;
326+
327+ /* The same definitions as the shmem2 parameter */
328+ u32 link_attr_sync;
326329 };
327330
328331 /* Output parameters */
@@ -364,8 +367,6 @@ struct link_vars { · 35 unmodified lines
364367 u8 rx_tx_asic_rst;
365368 u8 turn_to_run_wc_rt;
366369 u16 rsrv2;
367− /* The same definitions as the shmem2 parameter */
368− u32 link_attr_sync;
369370 };
370371
371372 /***********************************************************/
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c+39−18
@@ -6868,6 +6868,37 @@ static void bnx2x__common_init_phy(struct bnx2x *bp) · 6867 unmodified lines
68686868 bnx2x_release_phy_lock(bp);
68696869 }
68706870
6871+static void bnx2x_config_endianity(struct bnx2x *bp, u32 val)
6872+{
6873+ REG_WR(bp, PXP2_REG_RQ_QM_ENDIAN_M, val);
6874+ REG_WR(bp, PXP2_REG_RQ_TM_ENDIAN_M, val);
6875+ REG_WR(bp, PXP2_REG_RQ_SRC_ENDIAN_M, val);
6876+ REG_WR(bp, PXP2_REG_RQ_CDU_ENDIAN_M, val);
6877+ REG_WR(bp, PXP2_REG_RQ_DBG_ENDIAN_M, val);
6878+
6879+ /* make sure this value is 0 */
6880+ REG_WR(bp, PXP2_REG_RQ_HC_ENDIAN_M, 0);
6881+
6882+ REG_WR(bp, PXP2_REG_RD_QM_SWAP_MODE, val);
6883+ REG_WR(bp, PXP2_REG_RD_TM_SWAP_MODE, val);
6884+ REG_WR(bp, PXP2_REG_RD_SRC_SWAP_MODE, val);
6885+ REG_WR(bp, PXP2_REG_RD_CDURD_SWAP_MODE, val);
6886+}
6887+
6888+static void bnx2x_set_endianity(struct bnx2x *bp)
6889+{
6890+#ifdef __BIG_ENDIAN
6891+ bnx2x_config_endianity(bp, 1);
6892+#else
6893+ bnx2x_config_endianity(bp, 0);
6894+#endif
6895+}
6896+
6897+static void bnx2x_reset_endianity(struct bnx2x *bp)
6898+{
6899+ bnx2x_config_endianity(bp, 0);
6900+}
6901+
68716902 /**
68726903 * bnx2x_init_hw_common - initialize the HW at the COMMON phase.
68736904 *
@@ -6934,23 +6965,7 @@ static int bnx2x_init_hw_common(struct bnx2x *bp) · 60 unmodified lines
69346965
69356966 bnx2x_init_block(bp, BLOCK_PXP2, PHASE_COMMON);
69366967 bnx2x_init_pxp(bp);
6937−
6938−#ifdef __BIG_ENDIAN
6939− REG_WR(bp, PXP2_REG_RQ_QM_ENDIAN_M, 1);
6940− REG_WR(bp, PXP2_REG_RQ_TM_ENDIAN_M, 1);
6941− REG_WR(bp, PXP2_REG_RQ_SRC_ENDIAN_M, 1);
6942− REG_WR(bp, PXP2_REG_RQ_CDU_ENDIAN_M, 1);
6943− REG_WR(bp, PXP2_REG_RQ_DBG_ENDIAN_M, 1);
6944− /* make sure this value is 0 */
6945− REG_WR(bp, PXP2_REG_RQ_HC_ENDIAN_M, 0);
6946−
6947−/* REG_WR(bp, PXP2_REG_RD_PBF_SWAP_MODE, 1); */
6948− REG_WR(bp, PXP2_REG_RD_QM_SWAP_MODE, 1);
6949− REG_WR(bp, PXP2_REG_RD_TM_SWAP_MODE, 1);
6950− REG_WR(bp, PXP2_REG_RD_SRC_SWAP_MODE, 1);
6951− REG_WR(bp, PXP2_REG_RD_CDURD_SWAP_MODE, 1);
6952−#endif
6953−
6968+ bnx2x_set_endianity(bp);
69546969 bnx2x_ilt_init_page_size(bp, INITOP_SET);
69556970
69566971 if (CHIP_REV_IS_FPGA(bp) && CHIP_IS_E1H(bp))
@@ -13440,9 +13455,15 @@ static void __bnx2x_remove(struct pci_dev *pdev, · 6483 unmodified lines
1344013455 bnx2x_iov_remove_one(bp);
1344113456
1344213457 /* Power on: we can't let PCI layer write to us while we are in D3 */
13443− if (IS_PF(bp))
13458+ if (IS_PF(bp)) {
1344413459 bnx2x_set_power_state(bp, PCI_D0);
1344513460
13461+ /* Set endianity registers to reset values in case next driver
13462+ * boots in different endianty environment.
13463+ */
13464+ bnx2x_reset_endianity(bp);
13465+ }
13466+
1344613467 /* Disable MSI/MSI-X */
1344713468 bnx2x_disable_msi(bp);
1344813469
drivers/net/ethernet/broadcom/cnic.c+2−2
@@ -31,7 +31,7 @@ · 30 unmodified lines
3131 #include <linux/if_vlan.h>
3232 #include <linux/prefetch.h>
3333 #include <linux/random.h>
34−#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
34+#if IS_ENABLED(CONFIG_VLAN_8021Q)
3535 #define BCM_VLAN 1
3636 #endif
3737 #include <net/ip.h>
@@ -3685,7 +3685,7 @@ static int cnic_get_v4_route(struct sockaddr_in *dst_addr, · 3647 unmodified lines
36853685 static int cnic_get_v6_route(struct sockaddr_in6 *dst_addr,
36863686 struct dst_entry **dst)
36873687 {
3688−#if defined(CONFIG_IPV6) || (defined(CONFIG_IPV6_MODULE) && defined(MODULE))
3688+#if IS_ENABLED(CONFIG_IPV6)
36893689 struct flowi6 fl6;
36903690
36913691 memset(&fl6, 0, sizeof(fl6));
drivers/net/ethernet/broadcom/tg3.c+16−0
@@ -11617,6 +11617,12 @@ static int tg3_open(struct net_device *dev) · 11616 unmodified lines
1161711617 struct tg3 *tp = netdev_priv(dev);
1161811618 int err;
1161911619
11620+ if (tp->pcierr_recovery) {
11621+ netdev_err(dev, "Failed to open device. PCI error recovery "
11622+ "in progress\n");
11623+ return -EAGAIN;
11624+ }
11625+
1162011626 if (tp->fw_needed) {
1162111627 err = tg3_request_firmware(tp);
1162211628 if (tg3_asic_rev(tp) == ASIC_REV_57766) {
@@ -11674,6 +11680,12 @@ static int tg3_close(struct net_device *dev) · 51 unmodified lines
1167411680 {
1167511681 struct tg3 *tp = netdev_priv(dev);
1167611682
11683+ if (tp->pcierr_recovery) {
11684+ netdev_err(dev, "Failed to close device. PCI error recovery "
11685+ "in progress\n");
11686+ return -EAGAIN;
11687+ }
11688+
1167711689 tg3_ptp_fini(tp);
1167811690
1167911691 tg3_stop(tp);
@@ -17561,6 +17573,7 @@ static int tg3_init_one(struct pci_dev *pdev, · 5881 unmodified lines
1756117573 tp->rx_mode = TG3_DEF_RX_MODE;
1756217574 tp->tx_mode = TG3_DEF_TX_MODE;
1756317575 tp->irq_sync = 1;
17576+ tp->pcierr_recovery = false;
1756417577
1756517578 if (tg3_debug > 0)
1756617579 tp->msg_enable = tg3_debug;
@@ -18071,6 +18084,8 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev, · 504 unmodified lines
1807118084
1807218085 rtnl_lock();
1807318086
18087+ tp->pcierr_recovery = true;
18088+
1807418089 /* We probably don't have netdev yet */
1807518090 if (!netdev || !netif_running(netdev))
1807618091 goto done;
@@ -18195,6 +18210,7 @@ static void tg3_io_resume(struct pci_dev *pdev) · 118 unmodified lines
1819518210 tg3_phy_start(tp);
1819618211
1819718212 done:
18213+ tp->pcierr_recovery = false;
1819818214 rtnl_unlock();
1819918215 }
1820018216
drivers/net/ethernet/broadcom/tg3.h+1−0
@@ -3407,6 +3407,7 @@ struct tg3 { · 3406 unmodified lines
34073407
34083408 struct device *hwmon_dev;
34093409 bool link_up;
3410+ bool pcierr_recovery;
34103411 };
34113412
34123413 /* Accessor macros for chip and asic attributes
drivers/net/ethernet/brocade/bna/bnad.c+4−3
@@ -2506,7 +2506,7 @@ bnad_tso_prepare(struct bnad *bnad, struct sk_buff *skb) · 2505 unmodified lines
25062506 * For TSO, the TCP checksum field is seeded with pseudo-header sum
25072507 * excluding the length field.
25082508 */
2509− if (skb->protocol == htons(ETH_P_IP)) {
2509+ if (vlan_get_protocol(skb) == htons(ETH_P_IP)) {
25102510 struct iphdr *iph = ip_hdr(skb);
25112511
25122512 /* Do we really need these? */
@@ -2870,12 +2870,13 @@ bnad_txq_wi_prepare(struct bnad *bnad, struct bna_tcb *tcb, · 357 unmodified lines
28702870 }
28712871
28722872 if (skb->ip_summed == CHECKSUM_PARTIAL) {
2873+ __be16 net_proto = vlan_get_protocol(skb);
28732874 u8 proto = 0;
28742875
2875− if (skb->protocol == htons(ETH_P_IP))
2876+ if (net_proto == htons(ETH_P_IP))
28762877 proto = ip_hdr(skb)->protocol;
28772878 #ifdef NETIF_F_IPV6_CSUM
2878− else if (skb->protocol == htons(ETH_P_IPV6)) {
2879+ else if (net_proto == htons(ETH_P_IPV6)) {
28792880 /* nexthdr may not be TCP immediately. */
28802881 proto = ipv6_hdr(skb)->nexthdr;
28812882 }
drivers/net/ethernet/calxeda/Kconfig+1−0
@@ -1,6 +1,7 @@
11 config NET_CALXEDA_XGMAC
22 tristate "Calxeda 1G/10G XGMAC Ethernet driver"
33 depends on HAS_IOMEM && HAS_DMA
4+ depends on ARCH_HIGHBANK || COMPILE_TEST
45 select CRC32
56 help
67 This is the driver for the XGMAC Ethernet IP block found on Calxeda
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c+11−5
@@ -1253,7 +1253,9 @@ freeout: t4_free_sge_resources(adap); · 1252 unmodified lines
12531253 goto freeout;
12541254 }
12551255
1256− t4_write_reg(adap, MPS_TRC_RSS_CONTROL,
1256+ t4_write_reg(adap, is_t4(adap->params.chip) ?
1257+ MPS_TRC_RSS_CONTROL :
1258+ MPS_T5_TRC_RSS_CONTROL,
12571259 RSSCONTROL(netdev2pinfo(adap->port[0])->tx_chan) |
12581260 QUEUENUMBER(s->ethrxq[0].rspq.abs_id));
12591261 return 0;
@@ -1761,7 +1763,8 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs, · 501 unmodified lines
17611763 0xd004, 0xd03c,
17621764 0xdfc0, 0xdfe0,
17631765 0xe000, 0xea7c,
1764− 0xf000, 0x11190,
1766+ 0xf000, 0x11110,
1767+ 0x11118, 0x11190,
17651768 0x19040, 0x1906c,
17661769 0x19078, 0x19080,
17671770 0x1908c, 0x19124,
@@ -1968,7 +1971,8 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs, · 200 unmodified lines
19681971 0xd004, 0xd03c,
19691972 0xdfc0, 0xdfe0,
19701973 0xe000, 0x11088,
1971− 0x1109c, 0x1117c,
1974+ 0x1109c, 0x11110,
1975+ 0x11118, 0x1117c,
19721976 0x11190, 0x11204,
19731977 0x19040, 0x1906c,
19741978 0x19078, 0x19080,
@@ -5955,7 +5959,8 @@ static int adap_init0(struct adapter *adap) · 3980 unmodified lines
59555959 params[3] = FW_PARAM_PFVF(CQ_END);
59565960 params[4] = FW_PARAM_PFVF(OCQ_START);
59575961 params[5] = FW_PARAM_PFVF(OCQ_END);
5958− ret = t4_query_params(adap, 0, 0, 0, 6, params, val);
5962+ ret = t4_query_params(adap, adap->mbox, adap->fn, 0, 6, params,
5963+ val);
59595964 if (ret < 0)
59605965 goto bye;
59615966 adap->vres.qp.start = val[0];
@@ -5967,7 +5972,8 @@ static int adap_init0(struct adapter *adap) · 5 unmodified lines
59675972
59685973 params[0] = FW_PARAM_DEV(MAXORDIRD_QP);
59695974 params[1] = FW_PARAM_DEV(MAXIRD_ADAPTER);
5970− ret = t4_query_params(adap, 0, 0, 0, 2, params, val);
5975+ ret = t4_query_params(adap, adap->mbox, adap->fn, 0, 2, params,
5976+ val);
59715977 if (ret < 0) {
59725978 adap->params.max_ordird_qp = 8;
59735979 adap->params.max_ird_adapter = 32 * adap->tids.ntids;
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c+67−12
@@ -167,6 +167,34 @@ void t4_hw_pci_read_cfg4(struct adapter *adap, int reg, u32 *val) · 166 unmodified lines
167167 t4_write_reg(adap, PCIE_CFG_SPACE_REQ, 0);
168168 }
169169
170+/*
171+ * t4_report_fw_error - report firmware error
172+ * @adap: the adapter
173+ *
174+ * The adapter firmware can indicate error conditions to the host.
175+ * If the firmware has indicated an error, print out the reason for
176+ * the firmware error.
177+ */
178+static void t4_report_fw_error(struct adapter *adap)
179+{
180+ static const char *const reason[] = {
181+ "Crash", /* PCIE_FW_EVAL_CRASH */
182+ "During Device Preparation", /* PCIE_FW_EVAL_PREP */
183+ "During Device Configuration", /* PCIE_FW_EVAL_CONF */
184+ "During Device Initialization", /* PCIE_FW_EVAL_INIT */
185+ "Unexpected Event", /* PCIE_FW_EVAL_UNEXPECTEDEVENT */
186+ "Insufficient Airflow", /* PCIE_FW_EVAL_OVERHEAT */
187+ "Device Shutdown", /* PCIE_FW_EVAL_DEVICESHUTDOWN */
188+ "Reserved", /* reserved */
189+ };
190+ u32 pcie_fw;
191+
192+ pcie_fw = t4_read_reg(adap, MA_PCIE_FW);
193+ if (pcie_fw & FW_PCIE_FW_ERR)
194+ dev_err(adap->pdev_dev, "Firmware reports adapter error: %s\n",
195+ reason[FW_PCIE_FW_EVAL_GET(pcie_fw)]);
196+}
197+
170198 /*
171199 * Get the reply to a mailbox command and store it in @rpl in big-endian order.
172200 */
@@ -300,6 +328,7 @@ int t4_wr_mbox_meat(struct adapter *adap, int mbox, const void *cmd, int size, · 127 unmodified lines
300328 dump_mbox(adap, mbox, data_reg);
301329 dev_err(adap->pdev_dev, "command %#x in mailbox %d timed out\n",
302330 *(const u8 *)cmd, mbox);
331+ t4_report_fw_error(adap);
303332 return -ETIMEDOUT;
304333 }
305334
@@ -566,6 +595,7 @@ int t4_memory_rw(struct adapter *adap, int win, int mtype, u32 addr, · 260 unmodified lines
566595 #define VPD_BASE 0x400
567596 #define VPD_BASE_OLD 0
568597 #define VPD_LEN 1024
598+#define CHELSIO_VPD_UNIQUE_ID 0x82
569599
570600 /**
571601 * t4_seeprom_wp - enable/disable EEPROM write protection
@@ -603,7 +633,14 @@ int get_vpd_params(struct adapter *adapter, struct vpd_params *p) · 31 unmodified lines
603633 ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(u32), vpd);
604634 if (ret < 0)
605635 goto out;
606− addr = *vpd == 0x82 ? VPD_BASE : VPD_BASE_OLD;
636+
637+ /* The VPD shall have a unique identifier specified by the PCI SIG.
638+ * For chelsio adapters, the identifier is 0x82. The first byte of a VPD
639+ * shall be CHELSIO_VPD_UNIQUE_ID (0x82). The VPD programming software
640+ * is expected to automatically put this entry at the
641+ * beginning of the VPD.
642+ */
643+ addr = *vpd == CHELSIO_VPD_UNIQUE_ID ? VPD_BASE : VPD_BASE_OLD;
607644
608645 ret = pci_read_vpd(adapter->pdev, addr, VPD_LEN, vpd);
609646 if (ret < 0)
@@ -667,6 +704,7 @@ int get_vpd_params(struct adapter *adapter, struct vpd_params *p) · 57 unmodified lines
667704 i = pci_vpd_info_field_size(vpd + sn - PCI_VPD_INFO_FLD_HDR_SIZE);
668705 memcpy(p->sn, vpd + sn, min(i, SERNUM_LEN));
669706 strim(p->sn);
707+ i = pci_vpd_info_field_size(vpd + pn - PCI_VPD_INFO_FLD_HDR_SIZE);
670708 memcpy(p->pn, vpd + pn, min(i, PN_LEN));
671709 strim(p->pn);
672710
@@ -1394,15 +1432,18 @@ static void pcie_intr_handler(struct adapter *adapter) · 721 unmodified lines
13941432
13951433 int fat;
13961434
1397− fat = t4_handle_intr_status(adapter,
1398− PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
1399− sysbus_intr_info) +
1400− t4_handle_intr_status(adapter,
1401− PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
1402− pcie_port_intr_info) +
1403− t4_handle_intr_status(adapter, PCIE_INT_CAUSE,
1404− is_t4(adapter->params.chip) ?
1405− pcie_intr_info : t5_pcie_intr_info);
1435+ if (is_t4(adapter->params.chip))
1436+ fat = t4_handle_intr_status(adapter,
1437+ PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
1438+ sysbus_intr_info) +
1439+ t4_handle_intr_status(adapter,
1440+ PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
1441+ pcie_port_intr_info) +
1442+ t4_handle_intr_status(adapter, PCIE_INT_CAUSE,
1443+ pcie_intr_info);
1444+ else
1445+ fat = t4_handle_intr_status(adapter, PCIE_INT_CAUSE,
1446+ t5_pcie_intr_info);
14061447
14071448 if (fat)
14081449 t4_fatal_err(adapter);
@@ -1521,6 +1562,9 @@ static void cim_intr_handler(struct adapter *adapter) · 112 unmodified lines
15211562
15221563 int fat;
15231564
1565+ if (t4_read_reg(adapter, MA_PCIE_FW) & FW_PCIE_FW_ERR)
1566+ t4_report_fw_error(adapter);
1567+
15241568 fat = t4_handle_intr_status(adapter, CIM_HOST_INT_CAUSE,
15251569 cim_intr_info) +
15261570 t4_handle_intr_status(adapter, CIM_HOST_UPACC_INT_CAUSE,
@@ -1768,10 +1812,16 @@ static void ma_intr_handler(struct adapter *adap) · 241 unmodified lines
17681812 {
17691813 u32 v, status = t4_read_reg(adap, MA_INT_CAUSE);
17701814
1771− if (status & MEM_PERR_INT_CAUSE)
1815+ if (status & MEM_PERR_INT_CAUSE) {
17721816 dev_alert(adap->pdev_dev,
17731817 "MA parity error, parity status %#x\n",
17741818 t4_read_reg(adap, MA_PARITY_ERROR_STATUS));
1819+ if (is_t5(adap->params.chip))
1820+ dev_alert(adap->pdev_dev,
1821+ "MA parity error, parity status %#x\n",
1822+ t4_read_reg(adap,
1823+ MA_PARITY_ERROR_STATUS2));
1824+ }
17751825 if (status & MEM_WRAP_INT_CAUSE) {
17761826 v = t4_read_reg(adap, MA_INT_WRAP_STATUS);
17771827 dev_alert(adap->pdev_dev, "MA address wrap-around error by "
@@ -2733,12 +2783,16 @@ retry: · 955 unmodified lines
27332783 /*
27342784 * Issue the HELLO command to the firmware. If it's not successful
27352785 * but indicates that we got a "busy" or "timeout" condition, retry
2736− * the HELLO until we exhaust our retry limit.
2786+ * the HELLO until we exhaust our retry limit. If we do exceed our
2787+ * retry limit, check to see if the firmware left us any error
2788+ * information and report that if so.
27372789 */
27382790 ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
27392791 if (ret < 0) {
27402792 if ((ret == -EBUSY || ret == -ETIMEDOUT) && retries-- > 0)
27412793 goto retry;
2794+ if (t4_read_reg(adap, MA_PCIE_FW) & FW_PCIE_FW_ERR)
2795+ t4_report_fw_error(adap);
27422796 return ret;
27432797 }
27442798
@@ -3742,6 +3796,7 @@ int t4_handle_fw_rpl(struct adapter *adap, const __be64 *rpl) · 997 unmodified lines
37423796 lc->link_ok = link_ok;
37433797 lc->speed = speed;
37443798 lc->fc = fc;
3799+ lc->supported = be16_to_cpu(p->u.info.pcap);
37453800 t4_os_link_changed(adap, port, link_ok);
37463801 }
37473802 if (mod != pi->mod_type) {
drivers/net/ethernet/chelsio/cxgb4/t4_regs.h+2−0
@@ -511,6 +511,7 @@ · 510 unmodified lines
511511 #define MEM_WRAP_CLIENT_NUM_GET(x) (((x) & MEM_WRAP_CLIENT_NUM_MASK) >> MEM_WRAP_CLIENT_NUM_SHIFT)
512512 #define MA_PCIE_FW 0x30b8
513513 #define MA_PARITY_ERROR_STATUS 0x77f4
514+#define MA_PARITY_ERROR_STATUS2 0x7804
514515
515516 #define MA_EXT_MEMORY1_BAR 0x7808
516517 #define EDC_0_BASE_ADDR 0x7900
@@ -959,6 +960,7 @@ · 442 unmodified lines
959960 #define TRCMULTIFILTER 0x00000001U
960961
961962 #define MPS_TRC_RSS_CONTROL 0x9808
963+#define MPS_T5_TRC_RSS_CONTROL 0xa00c
962964 #define RSSCONTROL_MASK 0x00ff0000U
963965 #define RSSCONTROL_SHIFT 16
964966 #define RSSCONTROL(x) ((x) << RSSCONTROL_SHIFT)
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h+4−0
@@ -2228,6 +2228,10 @@ struct fw_debug_cmd { · 2227 unmodified lines
22282228 #define FW_PCIE_FW_MASTER(x) ((x) << FW_PCIE_FW_MASTER_SHIFT)
22292229 #define FW_PCIE_FW_MASTER_GET(x) (((x) >> FW_PCIE_FW_MASTER_SHIFT) & \
22302230 FW_PCIE_FW_MASTER_MASK)
2231+#define FW_PCIE_FW_EVAL_MASK 0x7
2232+#define FW_PCIE_FW_EVAL_SHIFT 24
2233+#define FW_PCIE_FW_EVAL_GET(x) (((x) >> FW_PCIE_FW_EVAL_SHIFT) & \
2234+ FW_PCIE_FW_EVAL_MASK)
22312235
22322236 struct fw_hdr {
22332237 u8 ver;
drivers/net/ethernet/ibm/ehea/ehea_main.c+1−1
@@ -1994,7 +1994,7 @@ static void xmit_common(struct sk_buff *skb, struct ehea_swqe *swqe) · 1993 unmodified lines
19941994 {
19951995 swqe->tx_control |= EHEA_SWQE_IMM_DATA_PRESENT | EHEA_SWQE_CRC;
19961996
1997− if (skb->protocol != htons(ETH_P_IP))
1997+ if (vlan_get_protocol(skb) != htons(ETH_P_IP))
19981998 return;
19991999
20002000 if (skb->ip_summed == CHECKSUM_PARTIAL)
drivers/net/ethernet/intel/e1000/e1000_main.c+11−8
@@ -2674,7 +2674,8 @@ set_itr_now: · 2673 unmodified lines
26742674 #define E1000_TX_FLAGS_VLAN_SHIFT 16
26752675
26762676 static int e1000_tso(struct e1000_adapter *adapter,
2677− struct e1000_tx_ring *tx_ring, struct sk_buff *skb)
2677+ struct e1000_tx_ring *tx_ring, struct sk_buff *skb,
2678+ __be16 protocol)
26782679 {
26792680 struct e1000_context_desc *context_desc;
26802681 struct e1000_buffer *buffer_info;
@@ -2692,7 +2693,7 @@ static int e1000_tso(struct e1000_adapter *adapter, · 11 unmodified lines
26922693
26932694 hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
26942695 mss = skb_shinfo(skb)->gso_size;
2695− if (skb->protocol == htons(ETH_P_IP)) {
2696+ if (protocol == htons(ETH_P_IP)) {
26962697 struct iphdr *iph = ip_hdr(skb);
26972698 iph->tot_len = 0;
26982699 iph->check = 0;
@@ -2702,7 +2703,7 @@ static int e1000_tso(struct e1000_adapter *adapter, · 3 unmodified lines
27022703 0);
27032704 cmd_length = E1000_TXD_CMD_IP;
27042705 ipcse = skb_transport_offset(skb) - 1;
2705− } else if (skb->protocol == htons(ETH_P_IPV6)) {
2706+ } else if (skb_is_gso_v6(skb)) {
27062707 ipv6_hdr(skb)->payload_len = 0;
27072708 tcp_hdr(skb)->check =
27082709 ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
@@ -2745,7 +2746,8 @@ static int e1000_tso(struct e1000_adapter *adapter, · 36 unmodified lines
27452746 }
27462747
27472748 static bool e1000_tx_csum(struct e1000_adapter *adapter,
2748− struct e1000_tx_ring *tx_ring, struct sk_buff *skb)
2749+ struct e1000_tx_ring *tx_ring, struct sk_buff *skb,
2750+ __be16 protocol)
27492751 {
27502752 struct e1000_context_desc *context_desc;
27512753 struct e1000_buffer *buffer_info;
@@ -2756,7 +2758,7 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter, · 4 unmodified lines
27562758 if (skb->ip_summed != CHECKSUM_PARTIAL)
27572759 return false;
27582760
2759− switch (skb->protocol) {
2761+ switch (protocol) {
27602762 case cpu_to_be16(ETH_P_IP):
27612763 if (ip_hdr(skb)->protocol == IPPROTO_TCP)
27622764 cmd_len |= E1000_TXD_CMD_TCP;
@@ -3097,6 +3099,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, · 334 unmodified lines
30973099 int count = 0;
30983100 int tso;
30993101 unsigned int f;
3102+ __be16 protocol = vlan_get_protocol(skb);
31003103
31013104 /* This goes back to the question of how to logically map a Tx queue
31023105 * to a flow. Right now, performance is impacted slightly negatively
@@ -3210,7 +3213,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, · 107 unmodified lines
32103213
32113214 first = tx_ring->next_to_use;
32123215
3213− tso = e1000_tso(adapter, tx_ring, skb);
3216+ tso = e1000_tso(adapter, tx_ring, skb, protocol);
32143217 if (tso < 0) {
32153218 dev_kfree_skb_any(skb);
32163219 return NETDEV_TX_OK;
@@ -3220,10 +3223,10 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, · 3 unmodified lines
32203223 if (likely(hw->mac_type != e1000_82544))
32213224 tx_ring->last_tx_tso = true;
32223225 tx_flags |= E1000_TX_FLAGS_TSO;
3223− } else if (likely(e1000_tx_csum(adapter, tx_ring, skb)))
3226+ } else if (likely(e1000_tx_csum(adapter, tx_ring, skb, protocol)))
32243227 tx_flags |= E1000_TX_FLAGS_CSUM;
32253228
3226− if (likely(skb->protocol == htons(ETH_P_IP)))
3229+ if (protocol == htons(ETH_P_IP))
32273230 tx_flags |= E1000_TX_FLAGS_IPV4;
32283231
32293232 if (unlikely(skb->no_fcs))
drivers/net/ethernet/intel/e1000e/netdev.c+9−12
@@ -5164,7 +5164,8 @@ link_up: · 5163 unmodified lines
51645164 #define E1000_TX_FLAGS_VLAN_MASK 0xffff0000
51655165 #define E1000_TX_FLAGS_VLAN_SHIFT 16
51665166
5167−static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
5167+static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb,
5168+ __be16 protocol)
51685169 {
51695170 struct e1000_context_desc *context_desc;
51705171 struct e1000_buffer *buffer_info;
@@ -5183,7 +5184,7 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb) · 12 unmodified lines
51835184
51845185 hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
51855186 mss = skb_shinfo(skb)->gso_size;
5186− if (skb->protocol == htons(ETH_P_IP)) {
5187+ if (protocol == htons(ETH_P_IP)) {
51875188 struct iphdr *iph = ip_hdr(skb);
51885189 iph->tot_len = 0;
51895190 iph->check = 0;
@@ -5231,7 +5232,8 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb) · 41 unmodified lines
52315232 return 1;
52325233 }
52335234
5234−static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb)
5235+static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb,
5236+ __be16 protocol)
52355237 {
52365238 struct e1000_adapter *adapter = tx_ring->adapter;
52375239 struct e1000_context_desc *context_desc;
@@ -5239,16 +5241,10 @@ static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb) · 1 unmodified line
52395241 unsigned int i;
52405242 u8 css;
52415243 u32 cmd_len = E1000_TXD_CMD_DEXT;
5242− __be16 protocol;
52435244
52445245 if (skb->ip_summed != CHECKSUM_PARTIAL)
52455246 return false;
52465247
5247− if (skb->protocol == cpu_to_be16(ETH_P_8021Q))
5248− protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
5249− else
5250− protocol = skb->protocol;
5251−
52525248 switch (protocol) {
52535249 case cpu_to_be16(ETH_P_IP):
52545250 if (ip_hdr(skb)->protocol == IPPROTO_TCP)
@@ -5546,6 +5542,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, · 291 unmodified lines
55465542 int count = 0;
55475543 int tso;
55485544 unsigned int f;
5545+ __be16 protocol = vlan_get_protocol(skb);
55495546
55505547 if (test_bit(__E1000_DOWN, &adapter->state)) {
55515548 dev_kfree_skb_any(skb);
@@ -5620,7 +5617,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, · 68 unmodified lines
56205617
56215618 first = tx_ring->next_to_use;
56225619
5623− tso = e1000_tso(tx_ring, skb);
5620+ tso = e1000_tso(tx_ring, skb, protocol);
56245621 if (tso < 0) {
56255622 dev_kfree_skb_any(skb);
56265623 return NETDEV_TX_OK;
@@ -5628,14 +5625,14 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, · 1 unmodified line
56285625
56295626 if (tso)
56305627 tx_flags |= E1000_TX_FLAGS_TSO;
5631− else if (e1000_tx_csum(tx_ring, skb))
5628+ else if (e1000_tx_csum(tx_ring, skb, protocol))
56325629 tx_flags |= E1000_TX_FLAGS_CSUM;
56335630
56345631 /* Old method was to assume IPv4 packet by default if TSO was enabled.
56355632 * 82571 hardware supports TSO capabilities for IPv6 as well...
56365633 * no longer assume, we must.
56375634 */
5638− if (skb->protocol == htons(ETH_P_IP))
5635+ if (protocol == htons(ETH_P_IP))
56395636 tx_flags |= E1000_TX_FLAGS_IPV4;
56405637
56415638 if (unlikely(skb->no_fcs))
drivers/net/ethernet/intel/i40e/i40e_txrx.c+1−1
@@ -2323,7 +2323,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb, · 2322 unmodified lines
23232323 goto out_drop;
23242324
23252325 /* obtain protocol of skb */
2326− protocol = skb->protocol;
2326+ protocol = vlan_get_protocol(skb);
23272327
23282328 /* record the location of the first descriptor for this packet */
23292329 first = &tx_ring->tx_bi[tx_ring->next_to_use];
drivers/net/ethernet/intel/i40evf/i40e_txrx.c+1−1
@@ -1599,7 +1599,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb, · 1598 unmodified lines
15991599 goto out_drop;
16001600
16011601 /* obtain protocol of skb */
1602− protocol = skb->protocol;
1602+ protocol = vlan_get_protocol(skb);
16031603
16041604 /* record the location of the first descriptor for this packet */
16051605 first = &tx_ring->tx_bi[tx_ring->next_to_use];
drivers/net/ethernet/marvell/mvneta.c+5−3
@@ -20,6 +20,7 @@ · 19 unmodified lines
2020 #include <linux/mbus.h>
2121 #include <linux/module.h>
2222 #include <linux/interrupt.h>
23+#include <linux/if_vlan.h>
2324 #include <net/ip.h>
2425 #include <net/ipv6.h>
2526 #include <linux/io.h>
@@ -1371,15 +1372,16 @@ static u32 mvneta_skb_tx_csum(struct mvneta_port *pp, struct sk_buff *skb) · 1345 unmodified lines
13711372 {
13721373 if (skb->ip_summed == CHECKSUM_PARTIAL) {
13731374 int ip_hdr_len = 0;
1375+ __be16 l3_proto = vlan_get_protocol(skb);
13741376 u8 l4_proto;
13751377
1376− if (skb->protocol == htons(ETH_P_IP)) {
1378+ if (l3_proto == htons(ETH_P_IP)) {
13771379 struct iphdr *ip4h = ip_hdr(skb);
13781380
13791381 /* Calculate IPv4 checksum and L4 checksum */
13801382 ip_hdr_len = ip4h->ihl;
13811383 l4_proto = ip4h->protocol;
1382− } else if (skb->protocol == htons(ETH_P_IPV6)) {
1384+ } else if (l3_proto == htons(ETH_P_IPV6)) {
13831385 struct ipv6hdr *ip6h = ipv6_hdr(skb);
13841386
13851387 /* Read l4_protocol from one of IPv6 extra headers */
@@ -1390,7 +1392,7 @@ static u32 mvneta_skb_tx_csum(struct mvneta_port *pp, struct sk_buff *skb) · 4 unmodified lines
13901392 return MVNETA_TX_L4_CSUM_NOT;
13911393
13921394 return mvneta_txq_desc_csum(skb_network_offset(skb),
1393− skb->protocol, ip_hdr_len, l4_proto);
1395+ l3_proto, ip_hdr_len, l4_proto);
13941396 }
13951397
13961398 return MVNETA_TX_L4_CSUM_NOT;
drivers/net/ethernet/mellanox/mlx4/en_netdev.c+2−29
@@ -474,39 +474,12 @@ static int mlx4_en_tunnel_steer_add(struct mlx4_en_priv *priv, unsigned char *ad · 473 unmodified lines
474474 int qpn, u64 *reg_id)
475475 {
476476 int err;
477− struct mlx4_spec_list spec_eth_outer = { {NULL} };
478− struct mlx4_spec_list spec_vxlan = { {NULL} };
479− struct mlx4_spec_list spec_eth_inner = { {NULL} };
480−
481− struct mlx4_net_trans_rule rule = {
482− .queue_mode = MLX4_NET_TRANS_Q_FIFO,
483− .exclusive = 0,
484− .allow_loopback = 1,
485− .promisc_mode = MLX4_FS_REGULAR,
486− .priority = MLX4_DOMAIN_NIC,
487− };
488−
489− __be64 mac_mask = cpu_to_be64(MLX4_MAC_MASK << 16);
490477
491478 if (priv->mdev->dev->caps.tunnel_offload_mode != MLX4_TUNNEL_OFFLOAD_MODE_VXLAN)
492479 return 0; /* do nothing */
493480
494− rule.port = priv->port;
495− rule.qpn = qpn;
496− INIT_LIST_HEAD(&rule.list);
497−
498− spec_eth_outer.id = MLX4_NET_TRANS_RULE_ID_ETH;
499− memcpy(spec_eth_outer.eth.dst_mac, addr, ETH_ALEN);
500− memcpy(spec_eth_outer.eth.dst_mac_msk, &mac_mask, ETH_ALEN);
501−
502− spec_vxlan.id = MLX4_NET_TRANS_RULE_ID_VXLAN; /* any vxlan header */
503− spec_eth_inner.id = MLX4_NET_TRANS_RULE_ID_ETH; /* any inner eth header */
504−
505− list_add_tail(&spec_eth_outer.list, &rule.list);
506− list_add_tail(&spec_vxlan.list, &rule.list);
507− list_add_tail(&spec_eth_inner.list, &rule.list);
508−
509− err = mlx4_flow_attach(priv->mdev->dev, &rule, reg_id);
481+ err = mlx4_tunnel_steer_add(priv->mdev->dev, addr, priv->port, qpn,
482+ MLX4_DOMAIN_NIC, reg_id);
510483 if (err) {
511484 en_err(priv, "failed to add vxlan steering rule, err %d\n", err);
512485 return err;
drivers/net/ethernet/mellanox/mlx4/mcg.c+38−0
@@ -1020,6 +1020,44 @@ int mlx4_flow_detach(struct mlx4_dev *dev, u64 reg_id) · 1019 unmodified lines
10201020 }
10211021 EXPORT_SYMBOL_GPL(mlx4_flow_detach);
10221022
1023+int mlx4_tunnel_steer_add(struct mlx4_dev *dev, unsigned char *addr,
1024+ int port, int qpn, u16 prio, u64 *reg_id)
1025+{
1026+ int err;
1027+ struct mlx4_spec_list spec_eth_outer = { {NULL} };
1028+ struct mlx4_spec_list spec_vxlan = { {NULL} };
1029+ struct mlx4_spec_list spec_eth_inner = { {NULL} };
1030+
1031+ struct mlx4_net_trans_rule rule = {
1032+ .queue_mode = MLX4_NET_TRANS_Q_FIFO,
1033+ .exclusive = 0,
1034+ .allow_loopback = 1,
1035+ .promisc_mode = MLX4_FS_REGULAR,
1036+ };
1037+
1038+ __be64 mac_mask = cpu_to_be64(MLX4_MAC_MASK << 16);
1039+
1040+ rule.port = port;
1041+ rule.qpn = qpn;
1042+ rule.priority = prio;
1043+ INIT_LIST_HEAD(&rule.list);
1044+
1045+ spec_eth_outer.id = MLX4_NET_TRANS_RULE_ID_ETH;
1046+ memcpy(spec_eth_outer.eth.dst_mac, addr, ETH_ALEN);
1047+ memcpy(spec_eth_outer.eth.dst_mac_msk, &mac_mask, ETH_ALEN);
1048+
1049+ spec_vxlan.id = MLX4_NET_TRANS_RULE_ID_VXLAN; /* any vxlan header */
1050+ spec_eth_inner.id = MLX4_NET_TRANS_RULE_ID_ETH; /* any inner eth header */
1051+
1052+ list_add_tail(&spec_eth_outer.list, &rule.list);
1053+ list_add_tail(&spec_vxlan.list, &rule.list);
1054+ list_add_tail(&spec_eth_inner.list, &rule.list);
1055+
1056+ err = mlx4_flow_attach(dev, &rule, reg_id);
1057+ return err;
1058+}
1059+EXPORT_SYMBOL(mlx4_tunnel_steer_add);
1060+
10231061 int mlx4_FLOW_STEERING_IB_UC_QP_RANGE(struct mlx4_dev *dev, u32 min_range_qpn,
10241062 u32 max_range_qpn)
10251063 {
drivers/net/ethernet/moxa/moxart_ether.c+19−15
@@ -206,7 +206,7 @@ static int moxart_rx_poll(struct napi_struct *napi, int budget) · 205 unmodified lines
206206 int rx_head = priv->rx_head;
207207 int rx = 0;
208208
209− while (1) {
209+ while (rx < budget) {
210210 desc = priv->rx_desc_base + (RX_REG_DESC_SIZE * rx_head);
211211 desc0 = readl(desc + RX_REG_OFFSET_DESC0);
212212
@@ -218,7 +218,7 @@ static int moxart_rx_poll(struct napi_struct *napi, int budget) · 5 unmodified lines
218218 net_dbg_ratelimited("packet error\n");
219219 priv->stats.rx_dropped++;
220220 priv->stats.rx_errors++;
221− continue;
221+ goto rx_next;
222222 }
223223
224224 len = desc0 & RX_DESC0_FRAME_LEN_MASK;
@@ -226,13 +226,19 @@ static int moxart_rx_poll(struct napi_struct *napi, int budget) · 1 unmodified line
226226 if (len > RX_BUF_SIZE)
227227 len = RX_BUF_SIZE;
228228
229− skb = build_skb(priv->rx_buf[rx_head], priv->rx_buf_size);
229+ dma_sync_single_for_cpu(&ndev->dev,
230+ priv->rx_mapping[rx_head],
231+ priv->rx_buf_size, DMA_FROM_DEVICE);
232+ skb = netdev_alloc_skb_ip_align(ndev, len);
233+
230234 if (unlikely(!skb)) {
231− net_dbg_ratelimited("build_skb failed\n");
235+ net_dbg_ratelimited("netdev_alloc_skb_ip_align failed\n");
232236 priv->stats.rx_dropped++;
233237 priv->stats.rx_errors++;
238+ goto rx_next;
234239 }
235240
241+ memcpy(skb->data, priv->rx_buf[rx_head], len);
236242 skb_put(skb, len);
237243 skb->protocol = eth_type_trans(skb, ndev);
238244 napi_gro_receive(&priv->napi, skb);
@@ -244,18 +250,15 @@ static int moxart_rx_poll(struct napi_struct *napi, int budget) · 5 unmodified lines
244250 if (desc0 & RX_DESC0_MULTICAST)
245251 priv->stats.multicast++;
246252
253+rx_next:
247254 writel(RX_DESC0_DMA_OWN, desc + RX_REG_OFFSET_DESC0);
248255
249256 rx_head = RX_NEXT(rx_head);
250257 priv->rx_head = rx_head;
251−
252− if (rx >= budget)
253− break;
254258 }
255259
256260 if (rx < budget) {
257− napi_gro_flush(napi, false);
258− __napi_complete(napi);
261+ napi_complete(napi);
259262 }
260263
261264 priv->reg_imr |= RPKT_FINISH_M;
@@ -346,10 +349,12 @@ static int moxart_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev) · 84 unmodified lines
346349 len = ETH_ZLEN;
347350 }
348351
349− txdes1 = readl(desc + TX_REG_OFFSET_DESC1);
350− txdes1 |= TX_DESC1_LTS | TX_DESC1_FTS;
351− txdes1 &= ~(TX_DESC1_FIFO_COMPLETE | TX_DESC1_INTR_COMPLETE);
352− txdes1 |= (len & TX_DESC1_BUF_SIZE_MASK);
352+ dma_sync_single_for_device(&ndev->dev, priv->tx_mapping[tx_head],
353+ priv->tx_buf_size, DMA_TO_DEVICE);
354+
355+ txdes1 = TX_DESC1_LTS | TX_DESC1_FTS | (len & TX_DESC1_BUF_SIZE_MASK);
356+ if (tx_head == TX_DESC_NUM_MASK)
357+ txdes1 |= TX_DESC1_END;
353358 writel(txdes1, desc + TX_REG_OFFSET_DESC1);
354359 writel(TX_DESC0_DMA_OWN, desc + TX_REG_OFFSET_DESC0);
355360
@@ -465,8 +470,7 @@ static int moxart_mac_probe(struct platform_device *pdev) · 109 unmodified lines
465470 spin_lock_init(&priv->txlock);
466471
467472 priv->tx_buf_size = TX_BUF_SIZE;
468− priv->rx_buf_size = RX_BUF_SIZE +
469− SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
473+ priv->rx_buf_size = RX_BUF_SIZE;
470474
471475 priv->tx_desc_base = dma_alloc_coherent(NULL, TX_REG_DESC_SIZE *
472476 TX_DESC_NUM, &priv->tx_base,
drivers/net/ethernet/nxp/lpc_eth.c+3−0
@@ -1220,6 +1220,9 @@ static int lpc_eth_open(struct net_device *ndev) · 1219 unmodified lines
12201220
12211221 __lpc_eth_clock_enable(pldat, true);
12221222
1223+ /* Suspended PHY makes LPC ethernet core block, so resume now */
1224+ phy_resume(pldat->phy_dev);
1225+
12231226 /* Reset and initialize */
12241227 __lpc_eth_reset(pldat);
12251228 __lpc_eth_init(pldat);
drivers/net/ethernet/qlogic/qlge/qlge_main.c+3−2
@@ -2556,6 +2556,7 @@ static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr) · 2555 unmodified lines
25562556
25572557 if (skb_is_gso(skb)) {
25582558 int err;
2559+ __be16 l3_proto = vlan_get_protocol(skb);
25592560
25602561 err = skb_cow_head(skb, 0);
25612562 if (err < 0)
@@ -2572,7 +2573,7 @@ static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr) · 10 unmodified lines
25722573 << OB_MAC_TRANSPORT_HDR_SHIFT);
25732574 mac_iocb_ptr->mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
25742575 mac_iocb_ptr->flags2 |= OB_MAC_TSO_IOCB_LSO;
2575− if (likely(skb->protocol == htons(ETH_P_IP))) {
2576+ if (likely(l3_proto == htons(ETH_P_IP))) {
25762577 struct iphdr *iph = ip_hdr(skb);
25772578 iph->check = 0;
25782579 mac_iocb_ptr->flags1 |= OB_MAC_TSO_IOCB_IP4;
@@ -2580,7 +2581,7 @@ static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr) · 1 unmodified line
25802581 iph->daddr, 0,
25812582 IPPROTO_TCP,
25822583 0);
2583− } else if (skb->protocol == htons(ETH_P_IPV6)) {
2584+ } else if (l3_proto == htons(ETH_P_IPV6)) {
25842585 mac_iocb_ptr->flags1 |= OB_MAC_TSO_IOCB_IP6;
25852586 tcp_hdr(skb)->check =
25862587 ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
drivers/net/ethernet/renesas/Kconfig+1−0
@@ -5,6 +5,7 @@ · 4 unmodified lines
55 config SH_ETH
66 tristate "Renesas SuperH Ethernet support"
77 depends on HAS_DMA
8+ depends on ARCH_SHMOBILE || SUPERH || COMPILE_TEST
89 select CRC32
910 select MII
1011 select MDIO_BITBANG
drivers/net/ethernet/stmicro/stmmac/chain_mode.c+10−4
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828
2929 #include "stmmac.h"
3030
31−static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
31+static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
3232 {
3333 struct stmmac_priv *priv = (struct stmmac_priv *)p;
3434 unsigned int txsize = priv->dma_tx_size;
@@ -47,7 +47,9 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) · 12 unmodified lines
4747
4848 desc->des2 = dma_map_single(priv->device, skb->data,
4949 bmax, DMA_TO_DEVICE);
50− priv->tx_skbuff_dma[entry] = desc->des2;
50+ if (dma_mapping_error(priv->device, desc->des2))
51+ return -1;
52+ priv->tx_skbuff_dma[entry].buf = desc->des2;
5153 priv->hw->desc->prepare_tx_desc(desc, 1, bmax, csum, STMMAC_CHAIN_MODE);
5254
5355 while (len != 0) {
@@ -59,7 +61,9 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) · 5 unmodified lines
5961 desc->des2 = dma_map_single(priv->device,
6062 (skb->data + bmax * i),
6163 bmax, DMA_TO_DEVICE);
62− priv->tx_skbuff_dma[entry] = desc->des2;
64+ if (dma_mapping_error(priv->device, desc->des2))
65+ return -1;
66+ priv->tx_skbuff_dma[entry].buf = desc->des2;
6367 priv->hw->desc->prepare_tx_desc(desc, 0, bmax, csum,
6468 STMMAC_CHAIN_MODE);
6569 priv->hw->desc->set_tx_owner(desc);
@@ -69,7 +73,9 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) · 3 unmodified lines
6973 desc->des2 = dma_map_single(priv->device,
7074 (skb->data + bmax * i), len,
7175 DMA_TO_DEVICE);
72− priv->tx_skbuff_dma[entry] = desc->des2;
76+ if (dma_mapping_error(priv->device, desc->des2))
77+ return -1;
78+ priv->tx_skbuff_dma[entry].buf = desc->des2;
7379 priv->hw->desc->prepare_tx_desc(desc, 0, len, csum,
7480 STMMAC_CHAIN_MODE);
7581 priv->hw->desc->set_tx_owner(desc);
drivers/net/ethernet/stmicro/stmmac/common.h+7−6
@@ -220,10 +220,10 @@ enum dma_irq_status { · 219 unmodified lines
220220 handle_tx = 0x8,
221221 };
222222
223−#define CORE_IRQ_TX_PATH_IN_LPI_MODE (1 << 1)
224−#define CORE_IRQ_TX_PATH_EXIT_LPI_MODE (1 << 2)
225−#define CORE_IRQ_RX_PATH_IN_LPI_MODE (1 << 3)
226−#define CORE_IRQ_RX_PATH_EXIT_LPI_MODE (1 << 4)
223+#define CORE_IRQ_TX_PATH_IN_LPI_MODE (1 << 0)
224+#define CORE_IRQ_TX_PATH_EXIT_LPI_MODE (1 << 1)
225+#define CORE_IRQ_RX_PATH_IN_LPI_MODE (1 << 2)
226+#define CORE_IRQ_RX_PATH_EXIT_LPI_MODE (1 << 3)
227227
228228 #define CORE_PCS_ANE_COMPLETE (1 << 5)
229229 #define CORE_PCS_LINK_STATUS (1 << 6)
@@ -287,7 +287,7 @@ struct dma_features { · 57 unmodified lines
287287
288288 /* Default LPI timers */
289289 #define STMMAC_DEFAULT_LIT_LS 0x3E8
290−#define STMMAC_DEFAULT_TWT_LS 0x0
290+#define STMMAC_DEFAULT_TWT_LS 0x1E
291291
292292 #define STMMAC_CHAIN_MODE 0x1
293293 #define STMMAC_RING_MODE 0x2
@@ -425,7 +425,7 @@ struct stmmac_mode_ops { · 131 unmodified lines
425425 void (*init) (void *des, dma_addr_t phy_addr, unsigned int size,
426426 unsigned int extend_desc);
427427 unsigned int (*is_jumbo_frm) (int len, int ehn_desc);
428− unsigned int (*jumbo_frm) (void *priv, struct sk_buff *skb, int csum);
428+ int (*jumbo_frm)(void *priv, struct sk_buff *skb, int csum);
429429 int (*set_16kib_bfsize)(int mtu);
430430 void (*init_desc3)(struct dma_desc *p);
431431 void (*refill_desc3) (void *priv, struct dma_desc *p);
@@ -445,6 +445,7 @@ struct mac_device_info { · 13 unmodified lines
445445 int multicast_filter_bins;
446446 int unicast_filter_entries;
447447 int mcast_bits_log2;
448+ unsigned int rx_csum;
448449 };
449450
450451 struct mac_device_info *dwmac1000_setup(void __iomem *ioaddr, int mcbins,
drivers/net/ethernet/stmicro/stmmac/dwmac1000.h+1−1
@@ -153,7 +153,7 @@ enum inter_frame_gap { · 152 unmodified lines
153153 #define GMAC_CONTROL_RE 0x00000004 /* Receiver Enable */
154154
155155 #define GMAC_CORE_INIT (GMAC_CONTROL_JD | GMAC_CONTROL_PS | GMAC_CONTROL_ACS | \
156− GMAC_CONTROL_BE)
156+ GMAC_CONTROL_BE | GMAC_CONTROL_DCRS)
157157
158158 /* GMAC Frame Filter defines */
159159 #define GMAC_FRAME_FILTER_PR 0x00000001 /* Promiscuous Mode */
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c+5−1
@@ -58,7 +58,11 @@ static int dwmac1000_rx_ipc_enable(struct mac_device_info *hw) · 57 unmodified lines
5858 void __iomem *ioaddr = hw->pcsr;
5959 u32 value = readl(ioaddr + GMAC_CONTROL);
6060
61− value |= GMAC_CONTROL_IPC;
61+ if (hw->rx_csum)
62+ value |= GMAC_CONTROL_IPC;
63+ else
64+ value &= ~GMAC_CONTROL_IPC;
65+
6266 writel(value, ioaddr + GMAC_CONTROL);
6367
6468 value = readl(ioaddr + GMAC_CONTROL);
drivers/net/ethernet/stmicro/stmmac/mmc.h+1−1
@@ -68,7 +68,7 @@ struct stmmac_counters { · 67 unmodified lines
6868 unsigned int mmc_rx_octetcount_g;
6969 unsigned int mmc_rx_broadcastframe_g;
7070 unsigned int mmc_rx_multicastframe_g;
71− unsigned int mmc_rx_crc_errror;
71+ unsigned int mmc_rx_crc_error;
7272 unsigned int mmc_rx_align_error;
7373 unsigned int mmc_rx_run_error;
7474 unsigned int mmc_rx_jabber_error;
drivers/net/ethernet/stmicro/stmmac/mmc_core.c+1−1
@@ -196,7 +196,7 @@ void dwmac_mmc_read(void __iomem *ioaddr, struct stmmac_counters *mmc) · 195 unmodified lines
196196 mmc->mmc_rx_octetcount_g += readl(ioaddr + MMC_RX_OCTETCOUNT_G);
197197 mmc->mmc_rx_broadcastframe_g += readl(ioaddr + MMC_RX_BROADCASTFRAME_G);
198198 mmc->mmc_rx_multicastframe_g += readl(ioaddr + MMC_RX_MULTICASTFRAME_G);
199− mmc->mmc_rx_crc_errror += readl(ioaddr + MMC_RX_CRC_ERRROR);
199+ mmc->mmc_rx_crc_error += readl(ioaddr + MMC_RX_CRC_ERRROR);
200200 mmc->mmc_rx_align_error += readl(ioaddr + MMC_RX_ALIGN_ERROR);
201201 mmc->mmc_rx_run_error += readl(ioaddr + MMC_RX_RUN_ERROR);
202202 mmc->mmc_rx_jabber_error += readl(ioaddr + MMC_RX_JABBER_ERROR);
drivers/net/ethernet/stmicro/stmmac/ring_mode.c+11−4
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828
2929 #include "stmmac.h"
3030
31−static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
31+static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
3232 {
3333 struct stmmac_priv *priv = (struct stmmac_priv *)p;
3434 unsigned int txsize = priv->dma_tx_size;
@@ -53,7 +53,10 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) · 18 unmodified lines
5353
5454 desc->des2 = dma_map_single(priv->device, skb->data,
5555 bmax, DMA_TO_DEVICE);
56− priv->tx_skbuff_dma[entry] = desc->des2;
56+ if (dma_mapping_error(priv->device, desc->des2))
57+ return -1;
58+
59+ priv->tx_skbuff_dma[entry].buf = desc->des2;
5760 desc->des3 = desc->des2 + BUF_SIZE_4KiB;
5861 priv->hw->desc->prepare_tx_desc(desc, 1, bmax, csum,
5962 STMMAC_RING_MODE);
@@ -68,7 +71,9 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) · 8 unmodified lines
6871
6972 desc->des2 = dma_map_single(priv->device, skb->data + bmax,
7073 len, DMA_TO_DEVICE);
71− priv->tx_skbuff_dma[entry] = desc->des2;
74+ if (dma_mapping_error(priv->device, desc->des2))
75+ return -1;
76+ priv->tx_skbuff_dma[entry].buf = desc->des2;
7277 desc->des3 = desc->des2 + BUF_SIZE_4KiB;
7378 priv->hw->desc->prepare_tx_desc(desc, 0, len, csum,
7479 STMMAC_RING_MODE);
@@ -77,7 +82,9 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) · 2 unmodified lines
7782 } else {
7883 desc->des2 = dma_map_single(priv->device, skb->data,
7984 nopaged_len, DMA_TO_DEVICE);
80− priv->tx_skbuff_dma[entry] = desc->des2;
85+ if (dma_mapping_error(priv->device, desc->des2))
86+ return -1;
87+ priv->tx_skbuff_dma[entry].buf = desc->des2;
8188 desc->des3 = desc->des2 + BUF_SIZE_4KiB;
8289 priv->hw->desc->prepare_tx_desc(desc, 1, nopaged_len, csum,
8390 STMMAC_RING_MODE);
drivers/net/ethernet/stmicro/stmmac/stmmac.h+8−1
@@ -34,6 +34,11 @@ · 33 unmodified lines
3434 #include <linux/ptp_clock_kernel.h>
3535 #include <linux/reset.h>
3636
37+struct stmmac_tx_info {
38+ dma_addr_t buf;
39+ bool map_as_page;
40+};
41+
3742 struct stmmac_priv {
3843 /* Frequently used values are kept adjacent for cache effect */
3944 struct dma_extended_desc *dma_etx ____cacheline_aligned_in_smp;
@@ -45,7 +50,7 @@ struct stmmac_priv { · 5 unmodified lines
4550 u32 tx_count_frames;
4651 u32 tx_coal_frames;
4752 u32 tx_coal_timer;
48− dma_addr_t *tx_skbuff_dma;
53+ struct stmmac_tx_info *tx_skbuff_dma;
4954 dma_addr_t dma_tx_phy;
5055 int tx_coalesce;
5156 int hwts_tx_en;
@@ -105,6 +110,8 @@ struct stmmac_priv { · 53 unmodified lines
105110 struct ptp_clock *ptp_clock;
106111 struct ptp_clock_info ptp_clock_ops;
107112 unsigned int default_addend;
113+ struct clk *clk_ptp_ref;
114+ unsigned int clk_ptp_rate;
108115 u32 adv_ts;
109116 int use_riwt;
110117 int irq_wake;
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c+1−1
@@ -175,7 +175,7 @@ static const struct stmmac_stats stmmac_mmc[] = { · 174 unmodified lines
175175 STMMAC_MMC_STAT(mmc_rx_octetcount_g),
176176 STMMAC_MMC_STAT(mmc_rx_broadcastframe_g),
177177 STMMAC_MMC_STAT(mmc_rx_multicastframe_g),
178− STMMAC_MMC_STAT(mmc_rx_crc_errror),
178+ STMMAC_MMC_STAT(mmc_rx_crc_error),
179179 STMMAC_MMC_STAT(mmc_rx_align_error),
180180 STMMAC_MMC_STAT(mmc_rx_run_error),
181181 STMMAC_MMC_STAT(mmc_rx_jabber_error),
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c+106−36
@@ -275,6 +275,7 @@ static void stmmac_eee_ctrl_timer(unsigned long arg) · 274 unmodified lines
275275 */
276276 bool stmmac_eee_init(struct stmmac_priv *priv)
277277 {
278+ char *phy_bus_name = priv->plat->phy_bus_name;
278279 bool ret = false;
279280
280281 /* Using PCS we cannot dial with the phy registers at this stage
@@ -284,6 +285,10 @@ bool stmmac_eee_init(struct stmmac_priv *priv) · 3 unmodified lines
284285 (priv->pcs == STMMAC_PCS_RTBI))
285286 goto out;
286287
288+ /* Never init EEE in case of a switch is attached */
289+ if (phy_bus_name && (!strcmp(phy_bus_name, "fixed")))
290+ goto out;
291+
287292 /* MAC core supports the EEE feature. */
288293 if (priv->dma_cap.eee) {
289294 int tx_lpi_timer = priv->tx_lpi_timer;
@@ -316,10 +321,9 @@ bool stmmac_eee_init(struct stmmac_priv *priv) · 26 unmodified lines
316321 priv->hw->mac->set_eee_timer(priv->hw,
317322 STMMAC_DEFAULT_LIT_LS,
318323 tx_lpi_timer);
319− } else
320− /* Set HW EEE according to the speed */
321− priv->hw->mac->set_eee_pls(priv->hw,
322− priv->phydev->link);
324+ }
325+ /* Set HW EEE according to the speed */
326+ priv->hw->mac->set_eee_pls(priv->hw, priv->phydev->link);
323327
324328 pr_debug("stmmac: Energy-Efficient Ethernet initialized\n");
325329
@@ -603,16 +607,16 @@ static int stmmac_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr) · 277 unmodified lines
603607 /* calculate default added value:
604608 * formula is :
605609 * addend = (2^32)/freq_div_ratio;
606− * where, freq_div_ratio = STMMAC_SYSCLOCK/50MHz
607− * hence, addend = ((2^32) * 50MHz)/STMMAC_SYSCLOCK;
608− * NOTE: STMMAC_SYSCLOCK should be >= 50MHz to
610+ * where, freq_div_ratio = clk_ptp_ref_i/50MHz
611+ * hence, addend = ((2^32) * 50MHz)/clk_ptp_ref_i;
612+ * NOTE: clk_ptp_ref_i should be >= 50MHz to
609613 * achive 20ns accuracy.
610614 *
611615 * 2^x * y == (y << x), hence
612616 * 2^32 * 50000000 ==> (50000000 << 32)
613617 */
614618 temp = (u64) (50000000ULL << 32);
615− priv->default_addend = div_u64(temp, STMMAC_SYSCLOCK);
619+ priv->default_addend = div_u64(temp, priv->clk_ptp_rate);
616620 priv->hw->ptp->config_addend(priv->ioaddr,
617621 priv->default_addend);
618622
@@ -638,6 +642,16 @@ static int stmmac_init_ptp(struct stmmac_priv *priv) · 19 unmodified lines
638642 if (!(priv->dma_cap.time_stamp || priv->dma_cap.atime_stamp))
639643 return -EOPNOTSUPP;
640644
645+ /* Fall-back to main clock in case of no PTP ref is passed */
646+ priv->clk_ptp_ref = devm_clk_get(priv->device, "clk_ptp_ref");
647+ if (IS_ERR(priv->clk_ptp_ref)) {
648+ priv->clk_ptp_rate = clk_get_rate(priv->stmmac_clk);
649+ priv->clk_ptp_ref = NULL;
650+ } else {
651+ clk_prepare_enable(priv->clk_ptp_ref);
652+ priv->clk_ptp_rate = clk_get_rate(priv->clk_ptp_ref);
653+ }
654+
641655 priv->adv_ts = 0;
642656 if (priv->dma_cap.atime_stamp && priv->extend_desc)
643657 priv->adv_ts = 1;
@@ -657,6 +671,8 @@ static int stmmac_init_ptp(struct stmmac_priv *priv) · 13 unmodified lines
657671
658672 static void stmmac_release_ptp(struct stmmac_priv *priv)
659673 {
674+ if (priv->clk_ptp_ref)
675+ clk_disable_unprepare(priv->clk_ptp_ref);
660676 stmmac_ptp_unregister(priv);
661677 }
662678
@@ -1061,7 +1077,8 @@ static int init_dma_desc_rings(struct net_device *dev) · 398 unmodified lines
10611077 else
10621078 p = priv->dma_tx + i;
10631079 p->des2 = 0;
1064− priv->tx_skbuff_dma[i] = 0;
1080+ priv->tx_skbuff_dma[i].buf = 0;
1081+ priv->tx_skbuff_dma[i].map_as_page = false;
10651082 priv->tx_skbuff[i] = NULL;
10661083 }
10671084
@@ -1100,17 +1117,24 @@ static void dma_free_tx_skbufs(struct stmmac_priv *priv) · 32 unmodified lines
11001117 else
11011118 p = priv->dma_tx + i;
11021119
1103− if (priv->tx_skbuff_dma[i]) {
1104− dma_unmap_single(priv->device,
1105− priv->tx_skbuff_dma[i],
1106− priv->hw->desc->get_tx_len(p),
1107− DMA_TO_DEVICE);
1108− priv->tx_skbuff_dma[i] = 0;
1120+ if (priv->tx_skbuff_dma[i].buf) {
1121+ if (priv->tx_skbuff_dma[i].map_as_page)
1122+ dma_unmap_page(priv->device,
1123+ priv->tx_skbuff_dma[i].buf,
1124+ priv->hw->desc->get_tx_len(p),
1125+ DMA_TO_DEVICE);
1126+ else
1127+ dma_unmap_single(priv->device,
1128+ priv->tx_skbuff_dma[i].buf,
1129+ priv->hw->desc->get_tx_len(p),
1130+ DMA_TO_DEVICE);
11091131 }
11101132
11111133 if (priv->tx_skbuff[i] != NULL) {
11121134 dev_kfree_skb_any(priv->tx_skbuff[i]);
11131135 priv->tx_skbuff[i] = NULL;
1136+ priv->tx_skbuff_dma[i].buf = 0;
1137+ priv->tx_skbuff_dma[i].map_as_page = false;
11141138 }
11151139 }
11161140 }
@@ -1131,7 +1155,8 @@ static int alloc_dma_desc_resources(struct stmmac_priv *priv) · 14 unmodified lines
11311155 if (!priv->rx_skbuff)
11321156 goto err_rx_skbuff;
11331157
1134− priv->tx_skbuff_dma = kmalloc_array(txsize, sizeof(dma_addr_t),
1158+ priv->tx_skbuff_dma = kmalloc_array(txsize,
1159+ sizeof(*priv->tx_skbuff_dma),
11351160 GFP_KERNEL);
11361161 if (!priv->tx_skbuff_dma)
11371162 goto err_tx_skbuff_dma;
@@ -1293,12 +1318,19 @@ static void stmmac_tx_clean(struct stmmac_priv *priv) · 155 unmodified lines
12931318 pr_debug("%s: curr %d, dirty %d\n", __func__,
12941319 priv->cur_tx, priv->dirty_tx);
12951320
1296− if (likely(priv->tx_skbuff_dma[entry])) {
1297− dma_unmap_single(priv->device,
1298− priv->tx_skbuff_dma[entry],
1299− priv->hw->desc->get_tx_len(p),
1300− DMA_TO_DEVICE);
1301− priv->tx_skbuff_dma[entry] = 0;
1321+ if (likely(priv->tx_skbuff_dma[entry].buf)) {
1322+ if (priv->tx_skbuff_dma[entry].map_as_page)
1323+ dma_unmap_page(priv->device,
1324+ priv->tx_skbuff_dma[entry].buf,
1325+ priv->hw->desc->get_tx_len(p),
1326+ DMA_TO_DEVICE);
1327+ else
1328+ dma_unmap_single(priv->device,
1329+ priv->tx_skbuff_dma[entry].buf,
1330+ priv->hw->desc->get_tx_len(p),
1331+ DMA_TO_DEVICE);
1332+ priv->tx_skbuff_dma[entry].buf = 0;
1333+ priv->tx_skbuff_dma[entry].map_as_page = false;
13021334 }
13031335 priv->hw->mode->clean_desc3(priv, p);
13041336
@@ -1637,6 +1669,13 @@ static int stmmac_hw_setup(struct net_device *dev) · 332 unmodified lines
16371669 /* Initialize the MAC Core */
16381670 priv->hw->mac->core_init(priv->hw, dev->mtu);
16391671
1672+ ret = priv->hw->mac->rx_ipc(priv->hw);
1673+ if (!ret) {
1674+ pr_warn(" RX IPC Checksum Offload disabled\n");
1675+ priv->plat->rx_coe = STMMAC_RX_COE_NONE;
1676+ priv->hw->rx_csum = 0;
1677+ }
1678+
16401679 /* Enable the MAC Rx/Tx */
16411680 stmmac_set_mac(priv->ioaddr, true);
16421681
@@ -1887,12 +1926,16 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) · 244 unmodified lines
18871926 if (likely(!is_jumbo)) {
18881927 desc->des2 = dma_map_single(priv->device, skb->data,
18891928 nopaged_len, DMA_TO_DEVICE);
1890− priv->tx_skbuff_dma[entry] = desc->des2;
1929+ if (dma_mapping_error(priv->device, desc->des2))
1930+ goto dma_map_err;
1931+ priv->tx_skbuff_dma[entry].buf = desc->des2;
18911932 priv->hw->desc->prepare_tx_desc(desc, 1, nopaged_len,
18921933 csum_insertion, priv->mode);
18931934 } else {
18941935 desc = first;
18951936 entry = priv->hw->mode->jumbo_frm(priv, skb, csum_insertion);
1937+ if (unlikely(entry < 0))
1938+ goto dma_map_err;
18961939 }
18971940
18981941 for (i = 0; i < nfrags; i++) {
@@ -1908,7 +1951,11 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) · 9 unmodified lines
19081951
19091952 desc->des2 = skb_frag_dma_map(priv->device, frag, 0, len,
19101953 DMA_TO_DEVICE);
1911− priv->tx_skbuff_dma[entry] = desc->des2;
1954+ if (dma_mapping_error(priv->device, desc->des2))
1955+ goto dma_map_err; /* should reuse desc w/o issues */
1956+
1957+ priv->tx_skbuff_dma[entry].buf = desc->des2;
1958+ priv->tx_skbuff_dma[entry].map_as_page = true;
19121959 priv->hw->desc->prepare_tx_desc(desc, 0, len, csum_insertion,
19131960 priv->mode);
19141961 wmb();
@@ -1975,7 +2022,12 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) · 60 unmodified lines
19752022 priv->hw->dma->enable_dma_transmission(priv->ioaddr);
19762023
19772024 spin_unlock(&priv->tx_lock);
2025+ return NETDEV_TX_OK;
19782026
2027+dma_map_err:
2028+ dev_err(priv->device, "Tx dma map failed\n");
2029+ dev_kfree_skb(skb);
2030+ priv->dev->stats.tx_dropped++;
19792031 return NETDEV_TX_OK;
19802032 }
19812033
@@ -2028,7 +2080,12 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv) · 46 unmodified lines
20282080 priv->rx_skbuff_dma[entry] =
20292081 dma_map_single(priv->device, skb->data, bfsize,
20302082 DMA_FROM_DEVICE);
2031−
2083+ if (dma_mapping_error(priv->device,
2084+ priv->rx_skbuff_dma[entry])) {
2085+ dev_err(priv->device, "Rx dma map failed\n");
2086+ dev_kfree_skb(skb);
2087+ break;
2088+ }
20322089 p->des2 = priv->rx_skbuff_dma[entry];
20332090
20342091 priv->hw->mode->refill_desc3(priv, p);
@@ -2055,7 +2112,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) · 20 unmodified lines
20552112 unsigned int entry = priv->cur_rx % rxsize;
20562113 unsigned int next_entry;
20572114 unsigned int count = 0;
2058− int coe = priv->plat->rx_coe;
2115+ int coe = priv->hw->rx_csum;
20592116
20602117 if (netif_msg_rx_status(priv)) {
20612118 pr_debug("%s: descriptor ring:\n", __func__);
@@ -2276,8 +2333,7 @@ static netdev_features_t stmmac_fix_features(struct net_device *dev, · 214 unmodified lines
22762333
22772334 if (priv->plat->rx_coe == STMMAC_RX_COE_NONE)
22782335 features &= ~NETIF_F_RXCSUM;
2279− else if (priv->plat->rx_coe == STMMAC_RX_COE_TYPE1)
2280− features &= ~NETIF_F_IPV6_CSUM;
2336+
22812337 if (!priv->plat->tx_coe)
22822338 features &= ~NETIF_F_ALL_CSUM;
22832339
@@ -2292,6 +2348,24 @@ static netdev_features_t stmmac_fix_features(struct net_device *dev, · 8 unmodified lines
22922348 return features;
22932349 }
22942350
2351+static int stmmac_set_features(struct net_device *netdev,
2352+ netdev_features_t features)
2353+{
2354+ struct stmmac_priv *priv = netdev_priv(netdev);
2355+
2356+ /* Keep the COE Type in case of csum is supporting */
2357+ if (features & NETIF_F_RXCSUM)
2358+ priv->hw->rx_csum = priv->plat->rx_coe;
2359+ else
2360+ priv->hw->rx_csum = 0;
2361+ /* No check needed because rx_coe has been set before and it will be
2362+ * fixed in case of issue.
2363+ */
2364+ priv->hw->mac->rx_ipc(priv->hw);
2365+
2366+ return 0;
2367+}
2368+
22952369 /**
22962370 * stmmac_interrupt - main ISR
22972371 * @irq: interrupt number.
@@ -2572,6 +2646,7 @@ static const struct net_device_ops stmmac_netdev_ops = { · 274 unmodified lines
25722646 .ndo_stop = stmmac_release,
25732647 .ndo_change_mtu = stmmac_change_mtu,
25742648 .ndo_fix_features = stmmac_fix_features,
2649+ .ndo_set_features = stmmac_set_features,
25752650 .ndo_set_rx_mode = stmmac_set_rx_mode,
25762651 .ndo_tx_timeout = stmmac_tx_timeout,
25772652 .ndo_do_ioctl = stmmac_ioctl,
@@ -2592,7 +2667,6 @@ static const struct net_device_ops stmmac_netdev_ops = { · 14 unmodified lines
25922667 */
25932668 static int stmmac_hw_init(struct stmmac_priv *priv)
25942669 {
2595− int ret;
25962670 struct mac_device_info *mac;
25972671
25982672 /* Identify the MAC HW device */
@@ -2649,15 +2723,11 @@ static int stmmac_hw_init(struct stmmac_priv *priv) · 50 unmodified lines
26492723 /* To use alternate (extended) or normal descriptor structures */
26502724 stmmac_selec_desc_mode(priv);
26512725
2652− ret = priv->hw->mac->rx_ipc(priv->hw);
2653− if (!ret) {
2654− pr_warn(" RX IPC Checksum Offload not configured.\n");
2655− priv->plat->rx_coe = STMMAC_RX_COE_NONE;
2656− }
2657−
2658− if (priv->plat->rx_coe)
2726+ if (priv->plat->rx_coe) {
2727+ priv->hw->rx_csum = priv->plat->rx_coe;
26592728 pr_info(" RX Checksum Offload Engine supported (type %d)\n",
26602729 priv->plat->rx_coe);
2730+ }
26612731 if (priv->plat->tx_coe)
26622732 pr_info(" TX Checksum insertion supported\n");
26632733
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c+1−0
@@ -206,6 +206,7 @@ void stmmac_ptp_unregister(struct stmmac_priv *priv) · 205 unmodified lines
206206 {
207207 if (priv->ptp_clock) {
208208 ptp_clock_unregister(priv->ptp_clock);
209+ priv->ptp_clock = NULL;
209210 pr_debug("Removed PTP HW clock successfully on %s\n",
210211 priv->dev->name);
211212 }
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h+0−2
@@ -25,8 +25,6 @@ · 24 unmodified lines
2525 #ifndef __STMMAC_PTP_H__
2626 #define __STMMAC_PTP_H__
2727
28−#define STMMAC_SYSCLOCK 62500000
29−
3028 /* IEEE 1588 PTP register offsets */
3129 #define PTP_TCR 0x0700 /* Timestamp Control Reg */
3230 #define PTP_SSIR 0x0704 /* Sub-Second Increment Reg */
drivers/net/fddi/skfp/h/skfbi.h+0−5
@@ -147,11 +147,6 @@ · 146 unmodified lines
147147 #define PCI_MEM64BIT (2<<1) /* Base addr anywhere in 64 Bit range */
148148 #define PCI_MEMSPACE 0x00000001L /* Bit 0: Memory Space Indic. */
149149
150−/* PCI_BASE_2ND 32 bit 2nd Base address */
151−#define PCI_IOBASE 0xffffff00L /* Bit 31..8: I/O Base address */
152−#define PCI_IOSIZE 0x000000fcL /* Bit 7..2: I/O Size Requirements */
153−#define PCI_IOSPACE 0x00000001L /* Bit 0: I/O Space Indicator */
154−
155150 /* PCI_SUB_VID 16 bit Subsystem Vendor ID */
156151 /* PCI_SUB_ID 16 bit Subsystem ID */
157152
drivers/net/phy/phy.c+9−9
@@ -1040,31 +1040,31 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable) · 1039 unmodified lines
10401040 /* First check if the EEE ability is supported */
10411041 eee_cap = phy_read_mmd_indirect(phydev, MDIO_PCS_EEE_ABLE,
10421042 MDIO_MMD_PCS, phydev->addr);
1043− if (eee_cap < 0)
1044− return eee_cap;
1043+ if (eee_cap <= 0)
1044+ goto eee_exit_err;
10451045
10461046 cap = mmd_eee_cap_to_ethtool_sup_t(eee_cap);
10471047 if (!cap)
1048− return -EPROTONOSUPPORT;
1048+ goto eee_exit_err;
10491049
10501050 /* Check which link settings negotiated and verify it in
10511051 * the EEE advertising registers.
10521052 */
10531053 eee_lp = phy_read_mmd_indirect(phydev, MDIO_AN_EEE_LPABLE,
10541054 MDIO_MMD_AN, phydev->addr);
1055− if (eee_lp < 0)
1056− return eee_lp;
1055+ if (eee_lp <= 0)
1056+ goto eee_exit_err;
10571057
10581058 eee_adv = phy_read_mmd_indirect(phydev, MDIO_AN_EEE_ADV,
10591059 MDIO_MMD_AN, phydev->addr);
1060− if (eee_adv < 0)
1061− return eee_adv;
1060+ if (eee_adv <= 0)
1061+ goto eee_exit_err;
10621062
10631063 adv = mmd_eee_adv_to_ethtool_adv_t(eee_adv);
10641064 lp = mmd_eee_adv_to_ethtool_adv_t(eee_lp);
10651065 idx = phy_find_setting(phydev->speed, phydev->duplex);
10661066 if (!(lp & adv & settings[idx].setting))
1067− return -EPROTONOSUPPORT;
1067+ goto eee_exit_err;
10681068
10691069 if (clk_stop_enable) {
10701070 /* Configure the PHY to stop receiving xMII
@@ -1084,7 +1084,7 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable) · 13 unmodified lines
10841084
10851085 return 0; /* EEE supported */
10861086 }
1087−
1087+eee_exit_err:
10881088 return -EPROTONOSUPPORT;
10891089 }
10901090 EXPORT_SYMBOL(phy_init_eee);
drivers/net/vmxnet3/vmxnet3_drv.c+8−7
@@ -2056,7 +2056,6 @@ vmxnet3_set_mc(struct net_device *netdev) · 2055 unmodified lines
20562056 if (!netdev_mc_empty(netdev)) {
20572057 new_table = vmxnet3_copy_mc(netdev);
20582058 if (new_table) {
2059− new_mode |= VMXNET3_RXM_MCAST;
20602059 rxConf->mfTableLen = cpu_to_le16(
20612060 netdev_mc_count(netdev) * ETH_ALEN);
20622061 new_table_pa = dma_map_single(
@@ -2064,15 +2063,18 @@ vmxnet3_set_mc(struct net_device *netdev) · 1 unmodified line
20642063 new_table,
20652064 rxConf->mfTableLen,
20662065 PCI_DMA_TODEVICE);
2066+ }
2067+
2068+ if (new_table_pa) {
2069+ new_mode |= VMXNET3_RXM_MCAST;
20672070 rxConf->mfTablePA = cpu_to_le64(new_table_pa);
20682071 } else {
2069− netdev_info(netdev, "failed to copy mcast list"
2070− ", setting ALL_MULTI\n");
2072+ netdev_info(netdev,
2073+ "failed to copy mcast list, setting ALL_MULTI\n");
20712074 new_mode |= VMXNET3_RXM_ALL_MULTI;
20722075 }
20732076 }
20742077
2075−
20762078 if (!(new_mode & VMXNET3_RXM_MCAST)) {
20772079 rxConf->mfTableLen = 0;
20782080 rxConf->mfTablePA = 0;
@@ -2091,11 +2093,10 @@ vmxnet3_set_mc(struct net_device *netdev) · 12 unmodified lines
20912093 VMXNET3_CMD_UPDATE_MAC_FILTERS);
20922094 spin_unlock_irqrestore(&adapter->cmd_lock, flags);
20932095
2094− if (new_table) {
2096+ if (new_table_pa)
20952097 dma_unmap_single(&adapter->pdev->dev, new_table_pa,
20962098 rxConf->mfTableLen, PCI_DMA_TODEVICE);
2097− kfree(new_table);
2098− }
2099+ kfree(new_table);
20992100 }
21002101
21012102 void
drivers/net/vmxnet3/vmxnet3_int.h+2−2
@@ -69,10 +69,10 @@ · 68 unmodified lines
6969 /*
7070 * Version numbers
7171 */
72−#define VMXNET3_DRIVER_VERSION_STRING "1.2.0.0-k"
72+#define VMXNET3_DRIVER_VERSION_STRING "1.2.1.0-k"
7373
7474 /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
75−#define VMXNET3_DRIVER_VERSION_NUM 0x01020000
75+#define VMXNET3_DRIVER_VERSION_NUM 0x01020100
7676
7777 #if defined(CONFIG_PCI_MSI)
7878 /* RSS only makes sense if MSI-X is supported. */
drivers/net/wireless/at76c50x-usb.c+1−2
@@ -2423,8 +2423,6 @@ static void at76_delete_device(struct at76_priv *priv) · 2422 unmodified lines
24232423
24242424 kfree_skb(priv->rx_skb);
24252425
2426− usb_put_dev(priv->udev);
2427−
24282426 at76_dbg(DBG_PROC_ENTRY, "%s: before freeing priv/ieee80211_hw",
24292427 __func__);
24302428 ieee80211_free_hw(priv->hw);
@@ -2558,6 +2556,7 @@ static void at76_disconnect(struct usb_interface *interface) · 127 unmodified lines
25582556
25592557 wiphy_info(priv->hw->wiphy, "disconnecting\n");
25602558 at76_delete_device(priv);
2559+ usb_put_dev(priv->udev);
25612560 dev_info(&interface->dev, "disconnected\n");
25622561 }
25632562
drivers/net/wireless/ath/ath9k/spectral.c+1−1
@@ -253,7 +253,7 @@ static ssize_t write_file_spec_scan_ctl(struct file *file, · 252 unmodified lines
253253
254254 if (strncmp("trigger", buf, 7) == 0) {
255255 ath9k_spectral_scan_trigger(sc->hw);
256− } else if (strncmp("background", buf, 9) == 0) {
256+ } else if (strncmp("background", buf, 10) == 0) {
257257 ath9k_spectral_scan_config(sc->hw, SPECTRAL_BACKGROUND);
258258 ath_dbg(common, CONFIG, "spectral scan: background mode enabled\n");
259259 } else if (strncmp("chanscan", buf, 8) == 0) {
drivers/net/wireless/iwlwifi/Kconfig+0−2
@@ -51,7 +51,6 @@ config IWLWIFI_LEDS · 50 unmodified lines
5151
5252 config IWLDVM
5353 tristate "Intel Wireless WiFi DVM Firmware support"
54− depends on m
5554 default IWLWIFI
5655 help
5756 This is the driver that supports the DVM firmware which is
@@ -60,7 +59,6 @@ config IWLDVM · 2 unmodified lines
6059
6160 config IWLMVM
6261 tristate "Intel Wireless WiFi MVM Firmware support"
63− depends on m
6462 help
6563 This is the driver that supports the MVM firmware which is
6664 currently only available for 7260 and 3160 devices.
drivers/net/wireless/iwlwifi/dvm/rxon.c+12−0
@@ -1068,6 +1068,13 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) · 1067 unmodified lines
10681068 /* recalculate basic rates */
10691069 iwl_calc_basic_rates(priv, ctx);
10701070
1071+ /*
1072+ * force CTS-to-self frames protection if RTS-CTS is not preferred
1073+ * one aggregation protection method
1074+ */
1075+ if (!priv->hw_params.use_rts_for_aggregation)
1076+ ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
1077+
10711078 if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) ||
10721079 !(ctx->staging.flags & RXON_FLG_BAND_24G_MSK))
10731080 ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
@@ -1473,6 +1480,11 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, · 399 unmodified lines
14731480 else
14741481 ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
14751482
1483+ if (bss_conf->use_cts_prot)
1484+ ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
1485+ else
1486+ ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;
1487+
14761488 memcpy(ctx->staging.bssid_addr, bss_conf->bssid, ETH_ALEN);
14771489
14781490 if (vif->type == NL80211_IFTYPE_AP ||
drivers/net/wireless/iwlwifi/iwl-7000.c+2−2
@@ -67,8 +67,8 @@ · 66 unmodified lines
6767 #include "iwl-agn-hw.h"
6868
6969 /* Highest firmware API version supported */
70−#define IWL7260_UCODE_API_MAX 9
71−#define IWL3160_UCODE_API_MAX 9
70+#define IWL7260_UCODE_API_MAX 10
71+#define IWL3160_UCODE_API_MAX 10
7272
7373 /* Oldest version we won't warn about */
7474 #define IWL7260_UCODE_API_OK 9
drivers/net/wireless/iwlwifi/iwl-8000.c+1−1
@@ -67,7 +67,7 @@ · 66 unmodified lines
6767 #include "iwl-agn-hw.h"
6868
6969 /* Highest firmware API version supported */
70−#define IWL8000_UCODE_API_MAX 9
70+#define IWL8000_UCODE_API_MAX 10
7171
7272 /* Oldest version we won't warn about */
7373 #define IWL8000_UCODE_API_OK 8
drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c+1−1
@@ -101,7 +101,7 @@ static bool halbtc_legacy(struct rtl_priv *adapter) · 100 unmodified lines
101101
102102 bool is_legacy = false;
103103
104− if ((mac->mode == WIRELESS_MODE_B) || (mac->mode == WIRELESS_MODE_B))
104+ if ((mac->mode == WIRELESS_MODE_B) || (mac->mode == WIRELESS_MODE_G))
105105 is_legacy = true;
106106
107107 return is_legacy;
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c+1−0
@@ -317,6 +317,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = { · 316 unmodified lines
317317 {RTL_USB_DEVICE(0x0bda, 0x5088, rtl92cu_hal_cfg)}, /*Thinkware-CC&C*/
318318 {RTL_USB_DEVICE(0x0df6, 0x0052, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/
319319 {RTL_USB_DEVICE(0x0df6, 0x005c, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/
320+ {RTL_USB_DEVICE(0x0df6, 0x0070, rtl92cu_hal_cfg)}, /*Sitecom - 150N */
320321 {RTL_USB_DEVICE(0x0df6, 0x0077, rtl92cu_hal_cfg)}, /*Sitecom-WLA2100V2*/
321322 {RTL_USB_DEVICE(0x0eb0, 0x9071, rtl92cu_hal_cfg)}, /*NO Brand - Etop*/
322323 {RTL_USB_DEVICE(0x4856, 0x0091, rtl92cu_hal_cfg)}, /*NetweeN - Feixun*/
drivers/net/xen-netback/interface.c+3−3
@@ -576,6 +576,9 @@ int xenvif_connect(struct xenvif_queue *queue, unsigned long tx_ring_ref, · 575 unmodified lines
576576 init_waitqueue_head(&queue->dealloc_wq);
577577 atomic_set(&queue->inflight_packets, 0);
578578
579+ netif_napi_add(queue->vif->dev, &queue->napi, xenvif_poll,
580+ XENVIF_NAPI_WEIGHT);
581+
579582 if (tx_evtchn == rx_evtchn) {
580583 /* feature-split-event-channels == 0 */
581584 err = bind_interdomain_evtchn_to_irqhandler(
@@ -629,9 +632,6 @@ int xenvif_connect(struct xenvif_queue *queue, unsigned long tx_ring_ref, · 47 unmodified lines
629632 wake_up_process(queue->task);
630633 wake_up_process(queue->dealloc_task);
631634
632− netif_napi_add(queue->vif->dev, &queue->napi, xenvif_poll,
633− XENVIF_NAPI_WEIGHT);
634−
635635 return 0;
636636
637637 err_rx_unbind:
drivers/pci/host/Kconfig+1−1
@@ -56,7 +56,7 @@ config PCI_HOST_GENERIC · 55 unmodified lines
5656 controller, such as the one emulated by kvmtool.
5757
5858 config PCIE_SPEAR13XX
59− tristate "STMicroelectronics SPEAr PCIe controller"
59+ bool "STMicroelectronics SPEAr PCIe controller"
6060 depends on ARCH_SPEAR13XX
6161 select PCIEPORTBUS
6262 select PCIE_DW
drivers/pinctrl/nomadik/pinctrl-abx500.c+1−2
@@ -620,8 +620,7 @@ static void abx500_gpio_dbg_show_one(struct seq_file *s, · 619 unmodified lines
620620 } else
621621 seq_printf(s, " %-9s", chip->get(chip, offset) ? "hi" : "lo");
622622
623− if (pctldev)
624− mode = abx500_get_mode(pctldev, chip, offset);
623+ mode = abx500_get_mode(pctldev, chip, offset);
625624
626625 seq_printf(s, " %s", (mode < 0) ? "unknown" : modes[mode]);
627626
drivers/pinctrl/pinctrl-at91.c+2−2
@@ -497,10 +497,10 @@ static struct at91_pinctrl_mux_ops at91sam9x5_ops = { · 496 unmodified lines
497497 static void at91_pin_dbg(const struct device *dev, const struct at91_pmx_pin *pin)
498498 {
499499 if (pin->mux) {
500− dev_dbg(dev, "pio%c%d configured as periph%c with conf = 0x%lu\n",
500+ dev_dbg(dev, "pio%c%d configured as periph%c with conf = 0x%lx\n",
501501 pin->bank + 'A', pin->pin, pin->mux - 1 + 'A', pin->conf);
502502 } else {
503− dev_dbg(dev, "pio%c%d configured as gpio with conf = 0x%lu\n",
503+ dev_dbg(dev, "pio%c%d configured as gpio with conf = 0x%lx\n",
504504 pin->bank + 'A', pin->pin, pin->conf);
505505 }
506506 }
drivers/pinctrl/pinctrl-rockchip.c+9−6
@@ -438,7 +438,7 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) · 437 unmodified lines
438438 int reg, ret, mask;
439439 unsigned long flags;
440440 u8 bit;
441− u32 data;
441+ u32 data, rmask;
442442
443443 if (iomux_num > 3)
444444 return -EINVAL;
@@ -478,8 +478,9 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) · 33 unmodified lines
478478 spin_lock_irqsave(&bank->slock, flags);
479479
480480 data = (mask << (bit + 16));
481+ rmask = data | (data >> 16);
481482 data |= (mux & mask) << bit;
482− ret = regmap_write(regmap, reg, data);
483+ ret = regmap_update_bits(regmap, reg, rmask, data);
483484
484485 spin_unlock_irqrestore(&bank->slock, flags);
485486
@@ -634,7 +635,7 @@ static int rk3288_set_drive(struct rockchip_pin_bank *bank, int pin_num, · 148 unmodified lines
634635 struct regmap *regmap;
635636 unsigned long flags;
636637 int reg, ret, i;
637− u32 data;
638+ u32 data, rmask;
638639 u8 bit;
639640
640641 rk3288_calc_drv_reg_and_bit(bank, pin_num, &regmap, &reg, &bit);
@@ -657,9 +658,10 @@ static int rk3288_set_drive(struct rockchip_pin_bank *bank, int pin_num, · 16 unmodified lines
657658
658659 /* enable the write to the equivalent lower bits */
659660 data = ((1 << RK3288_DRV_BITS_PER_PIN) - 1) << (bit + 16);
661+ rmask = data | (data >> 16);
660662 data |= (ret << bit);
661663
662− ret = regmap_write(regmap, reg, data);
664+ ret = regmap_update_bits(regmap, reg, rmask, data);
663665 spin_unlock_irqrestore(&bank->slock, flags);
664666
665667 return ret;
@@ -722,7 +724,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, · 56 unmodified lines
722724 int reg, ret;
723725 unsigned long flags;
724726 u8 bit;
725− u32 data;
727+ u32 data, rmask;
726728
727729 dev_dbg(info->dev, "setting pull of GPIO%d-%d to %d\n",
728730 bank->bank_num, pin_num, pull);
@@ -750,6 +752,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, · 21 unmodified lines
750752
751753 /* enable the write to the equivalent lower bits */
752754 data = ((1 << RK3188_PULL_BITS_PER_PIN) - 1) << (bit + 16);
755+ rmask = data | (data >> 16);
753756
754757 switch (pull) {
755758 case PIN_CONFIG_BIAS_DISABLE:
@@ -770,7 +773,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, · 14 unmodified lines
770773 return -EINVAL;
771774 }
772775
773− ret = regmap_write(regmap, reg, data);
776+ ret = regmap_update_bits(regmap, reg, rmask, data);
774777
775778 spin_unlock_irqrestore(&bank->slock, flags);
776779 break;
drivers/pinctrl/pinctrl-tegra-xusb.c+3−2
@@ -680,7 +680,7 @@ static struct phy *tegra_xusb_padctl_xlate(struct device *dev, · 679 unmodified lines
680680 if (args->args_count <= 0)
681681 return ERR_PTR(-EINVAL);
682682
683− if (index > ARRAY_SIZE(padctl->phys))
683+ if (index >= ARRAY_SIZE(padctl->phys))
684684 return ERR_PTR(-EINVAL);
685685
686686 return padctl->phys[index];
@@ -930,7 +930,8 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev) · 243 unmodified lines
930930
931931 padctl->provider = devm_of_phy_provider_register(&pdev->dev,
932932 tegra_xusb_padctl_xlate);
933− if (err < 0) {
933+ if (IS_ERR(padctl->provider)) {
934+ err = PTR_ERR(padctl->provider);
934935 dev_err(&pdev->dev, "failed to register PHYs: %d\n", err);
935936 goto unregister;
936937 }
drivers/pinctrl/samsung/pinctrl-exynos.c+63−6
@@ -127,14 +127,10 @@ static int exynos_irq_set_type(struct irq_data *irqd, unsigned int type) · 126 unmodified lines
127127 struct irq_chip *chip = irq_data_get_irq_chip(irqd);
128128 struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);
129129 struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);
130− struct samsung_pin_bank_type *bank_type = bank->type;
131130 struct samsung_pinctrl_drv_data *d = bank->drvdata;
132− unsigned int pin = irqd->hwirq;
133− unsigned int shift = EXYNOS_EINT_CON_LEN * pin;
131+ unsigned int shift = EXYNOS_EINT_CON_LEN * irqd->hwirq;
134132 unsigned int con, trig_type;
135133 unsigned long reg_con = our_chip->eint_con + bank->eint_offset;
136− unsigned long flags;
137− unsigned int mask;
138134
139135 switch (type) {
140136 case IRQ_TYPE_EDGE_RISING:
@@ -167,8 +163,32 @@ static int exynos_irq_set_type(struct irq_data *irqd, unsigned int type) · 26 unmodified lines
167163 con |= trig_type << shift;
168164 writel(con, d->virt_base + reg_con);
169165
166+ return 0;
167+}
168+
169+static int exynos_irq_request_resources(struct irq_data *irqd)
170+{
171+ struct irq_chip *chip = irq_data_get_irq_chip(irqd);
172+ struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);
173+ struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);
174+ struct samsung_pin_bank_type *bank_type = bank->type;
175+ struct samsung_pinctrl_drv_data *d = bank->drvdata;
176+ unsigned int shift = EXYNOS_EINT_CON_LEN * irqd->hwirq;
177+ unsigned long reg_con = our_chip->eint_con + bank->eint_offset;
178+ unsigned long flags;
179+ unsigned int mask;
180+ unsigned int con;
181+ int ret;
182+
183+ ret = gpio_lock_as_irq(&bank->gpio_chip, irqd->hwirq);
184+ if (ret) {
185+ dev_err(bank->gpio_chip.dev, "unable to lock pin %s-%lu IRQ\n",
186+ bank->name, irqd->hwirq);
187+ return ret;
188+ }
189+
170190 reg_con = bank->pctl_offset + bank_type->reg_offset[PINCFG_TYPE_FUNC];
171− shift = pin * bank_type->fld_width[PINCFG_TYPE_FUNC];
191+ shift = irqd->hwirq * bank_type->fld_width[PINCFG_TYPE_FUNC];
172192 mask = (1 << bank_type->fld_width[PINCFG_TYPE_FUNC]) - 1;
173193
174194 spin_lock_irqsave(&bank->slock, flags);
@@ -180,9 +200,42 @@ static int exynos_irq_set_type(struct irq_data *irqd, unsigned int type) · 5 unmodified lines
180200
181201 spin_unlock_irqrestore(&bank->slock, flags);
182202
203+ exynos_irq_unmask(irqd);
204+
183205 return 0;
184206 }
185207
208+static void exynos_irq_release_resources(struct irq_data *irqd)
209+{
210+ struct irq_chip *chip = irq_data_get_irq_chip(irqd);
211+ struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);
212+ struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);
213+ struct samsung_pin_bank_type *bank_type = bank->type;
214+ struct samsung_pinctrl_drv_data *d = bank->drvdata;
215+ unsigned int shift = EXYNOS_EINT_CON_LEN * irqd->hwirq;
216+ unsigned long reg_con = our_chip->eint_con + bank->eint_offset;
217+ unsigned long flags;
218+ unsigned int mask;
219+ unsigned int con;
220+
221+ reg_con = bank->pctl_offset + bank_type->reg_offset[PINCFG_TYPE_FUNC];
222+ shift = irqd->hwirq * bank_type->fld_width[PINCFG_TYPE_FUNC];
223+ mask = (1 << bank_type->fld_width[PINCFG_TYPE_FUNC]) - 1;
224+
225+ exynos_irq_mask(irqd);
226+
227+ spin_lock_irqsave(&bank->slock, flags);
228+
229+ con = readl(d->virt_base + reg_con);
230+ con &= ~(mask << shift);
231+ con |= FUNC_INPUT << shift;
232+ writel(con, d->virt_base + reg_con);
233+
234+ spin_unlock_irqrestore(&bank->slock, flags);
235+
236+ gpio_unlock_as_irq(&bank->gpio_chip, irqd->hwirq);
237+}
238+
186239 /*
187240 * irq_chip for gpio interrupts.
188241 */
@@ -193,6 +246,8 @@ static struct exynos_irq_chip exynos_gpio_irq_chip = { · 4 unmodified lines
193246 .irq_mask = exynos_irq_mask,
194247 .irq_ack = exynos_irq_ack,
195248 .irq_set_type = exynos_irq_set_type,
249+ .irq_request_resources = exynos_irq_request_resources,
250+ .irq_release_resources = exynos_irq_release_resources,
196251 },
197252 .eint_con = EXYNOS_GPIO_ECON_OFFSET,
198253 .eint_mask = EXYNOS_GPIO_EMASK_OFFSET,
@@ -336,6 +391,8 @@ static struct exynos_irq_chip exynos_wkup_irq_chip = { · 137 unmodified lines
336391 .irq_ack = exynos_irq_ack,
337392 .irq_set_type = exynos_irq_set_type,
338393 .irq_set_wake = exynos_wkup_irq_set_wake,
394+ .irq_request_resources = exynos_irq_request_resources,
395+ .irq_release_resources = exynos_irq_release_resources,
339396 },
340397 .eint_con = EXYNOS_WKUP_ECON_OFFSET,
341398 .eint_mask = EXYNOS_WKUP_EMASK_OFFSET,
drivers/pinctrl/samsung/pinctrl-samsung.h+1−0
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #include <linux/gpio.h>
2727
2828 /* pinmux function number for pin as gpio output line */
29+#define FUNC_INPUT 0x0
2930 #define FUNC_OUTPUT 0x1
3031
3132 /**
drivers/pinctrl/sh-pfc/pfc-r8a7791.c+4−4
@@ -4509,24 +4509,24 @@ static const char * const audio_clk_groups[] = { · 4508 unmodified lines
45094509 };
45104510
45114511 static const char * const can0_groups[] = {
4512− "can0_data_a",
4512+ "can0_data",
45134513 "can0_data_b",
45144514 "can0_data_c",
45154515 "can0_data_d",
45164516 "can0_data_e",
45174517 "can0_data_f",
4518− "can_clk_a",
4518+ "can_clk",
45194519 "can_clk_b",
45204520 "can_clk_c",
45214521 "can_clk_d",
45224522 };
45234523
45244524 static const char * const can1_groups[] = {
4525− "can1_data_a",
4525+ "can1_data",
45264526 "can1_data_b",
45274527 "can1_data_c",
45284528 "can1_data_d",
4529− "can_clk_a",
4529+ "can_clk",
45304530 "can_clk_b",
45314531 "can_clk_c",
45324532 "can_clk_d",
drivers/platform/x86/ideapad-laptop.c+2−29
@@ -88,7 +88,6 @@ struct ideapad_private { · 87 unmodified lines
8888 struct dentry *debug;
8989 unsigned long cfg;
9090 bool has_hw_rfkill_switch;
91− bool has_touchpad_control;
9291 };
9392
9493 static bool no_bt_rfkill;
@@ -456,7 +455,7 @@ struct ideapad_rfk_data { · 361 unmodified lines
456455 int type;
457456 };
458457
459−const const struct ideapad_rfk_data ideapad_rfk_data[] = {
458+static const struct ideapad_rfk_data ideapad_rfk_data[] = {
460459 { "ideapad_wlan", CFG_WIFI_BIT, VPCCMD_W_WIFI, RFKILL_TYPE_WLAN },
461460 { "ideapad_bluetooth", CFG_BT_BIT, VPCCMD_W_BT, RFKILL_TYPE_BLUETOOTH },
462461 { "ideapad_3g", CFG_3G_BIT, VPCCMD_W_3G, RFKILL_TYPE_WWAN },
@@ -767,9 +766,6 @@ static void ideapad_sync_touchpad_state(struct ideapad_private *priv) · 304 unmodified lines
767766 {
768767 unsigned long value;
769768
770− if (!priv->has_touchpad_control)
771− return;
772−
773769 /* Without reading from EC touchpad LED doesn't switch state */
774770 if (!read_ec_data(priv->adev->handle, VPCCMD_R_TOUCHPAD, &value)) {
775771 /* Some IdeaPads don't really turn off touchpad - they only
@@ -833,29 +829,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data) · 57 unmodified lines
833829 * always results in 0 on these models, causing ideapad_laptop to wrongly
834830 * report all radios as hardware-blocked.
835831 */
836−static struct dmi_system_id no_hw_rfkill_list[] = {
837− {
838− .ident = "Lenovo Yoga 2 11 / 13 / Pro",
839− .matches = {
840− DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
841− DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2"),
842− },
843− },
844− {}
845−};
846−
847−/*
848− * Some models don't offer touchpad ctrl through the ideapad interface, causing
849− * ideapad_sync_touchpad_state to send wrong touchpad enable/disable events.
850− */
851−static struct dmi_system_id no_touchpad_ctrl_list[] = {
852− {
853− .ident = "Lenovo Yoga 1 series",
854− .matches = {
855− DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
856− DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo IdeaPad Yoga"),
857− },
858− },
832+static const struct dmi_system_id no_hw_rfkill_list[] = {
859833 {
860834 .ident = "Lenovo Yoga 2 11 / 13 / Pro",
861835 .matches = {
@@ -889,7 +863,6 @@ static int ideapad_acpi_add(struct platform_device *pdev) · 27 unmodified lines
889863 priv->adev = adev;
890864 priv->platform_device = pdev;
891865 priv->has_hw_rfkill_switch = !dmi_check_system(no_hw_rfkill_list);
892− priv->has_touchpad_control = !dmi_check_system(no_touchpad_ctrl_list);
893866
894867 ret = ideapad_sysfs_init(priv);
895868 if (ret)
drivers/platform/x86/toshiba_acpi.c+20−7
@@ -1255,10 +1255,15 @@ static ssize_t toshiba_kbd_bl_mode_store(struct device *dev, · 1254 unmodified lines
12551255 const char *buf, size_t count)
12561256 {
12571257 struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev);
1258− int mode = -1;
1259− int time = -1;
1258+ int mode;
1259+ int time;
1260+ int ret;
12601261
1261− if (sscanf(buf, "%i", &mode) != 1 && (mode != 2 || mode != 1))
1262+
1263+ ret = kstrtoint(buf, 0, &mode);
1264+ if (ret)
1265+ return ret;
1266+ if (mode != SCI_KBD_MODE_FNZ && mode != SCI_KBD_MODE_AUTO)
12621267 return -EINVAL;
12631268
12641269 /* Set the Keyboard Backlight Mode where:
@@ -1266,11 +1271,12 @@ static ssize_t toshiba_kbd_bl_mode_store(struct device *dev, · 1 unmodified line
12661271 * Auto - KBD backlight turns off automatically in given time
12671272 * FN-Z - KBD backlight "toggles" when hotkey pressed
12681273 */
1269− if (mode != -1 && toshiba->kbd_mode != mode) {
1274+ if (toshiba->kbd_mode != mode) {
12701275 time = toshiba->kbd_time << HCI_MISC_SHIFT;
12711276 time = time + toshiba->kbd_mode;
1272− if (toshiba_kbd_illum_status_set(toshiba, time) < 0)
1273− return -EIO;
1277+ ret = toshiba_kbd_illum_status_set(toshiba, time);
1278+ if (ret)
1279+ return ret;
12741280 toshiba->kbd_mode = mode;
12751281 }
12761282
@@ -1857,9 +1863,16 @@ static int toshiba_acpi_resume(struct device *device) · 580 unmodified lines
18571863 {
18581864 struct toshiba_acpi_dev *dev = acpi_driver_data(to_acpi_device(device));
18591865 u32 result;
1866+ acpi_status status;
1867+
1868+ if (dev->hotkey_dev) {
1869+ status = acpi_evaluate_object(dev->acpi_dev->handle, "ENAB",
1870+ NULL, NULL);
1871+ if (ACPI_FAILURE(status))
1872+ pr_info("Unable to re-enable hotkeys\n");
18601873
1861− if (dev->hotkey_dev)
18621874 hci_write1(dev, HCI_HOTKEY_EVENT, HCI_HOTKEY_ENABLE, &result);
1875+ }
18631876
18641877 return 0;
18651878 }
drivers/powercap/intel_rapl.c+4−4
@@ -953,6 +953,7 @@ static const struct x86_cpu_id rapl_ids[] = { · 952 unmodified lines
953953 { X86_VENDOR_INTEL, 6, 0x3a},/* Ivy Bridge */
954954 { X86_VENDOR_INTEL, 6, 0x3c},/* Haswell */
955955 { X86_VENDOR_INTEL, 6, 0x3d},/* Broadwell */
956+ { X86_VENDOR_INTEL, 6, 0x3f},/* Haswell */
956957 { X86_VENDOR_INTEL, 6, 0x45},/* Haswell ULT */
957958 /* TODO: Add more CPU IDs after testing */
958959 {}
@@ -1166,11 +1167,10 @@ static int rapl_detect_domains(struct rapl_package *rp, int cpu) · 207 unmodified lines
11661167
11671168 for (i = 0; i < RAPL_DOMAIN_MAX; i++) {
11681169 /* use physical package id to read counters */
1169− if (!rapl_check_domain(cpu, i))
1170+ if (!rapl_check_domain(cpu, i)) {
11701171 rp->domain_map |= 1 << i;
1171− else
1172− pr_warn("RAPL domain %s detection failed\n",
1173− rapl_domain_names[i]);
1172+ pr_info("Found RAPL domain %s\n", rapl_domain_names[i]);
1173+ }
11741174 }
11751175 rp->nr_domains = bitmap_weight(&rp->domain_map, RAPL_DOMAIN_MAX);
11761176 if (!rp->nr_domains) {
drivers/rtc/rtc-s5m.c+14−7
@@ -717,12 +717,14 @@ static int s5m_rtc_probe(struct platform_device *pdev) · 716 unmodified lines
717717 info->device_type = s5m87xx->device_type;
718718 info->wtsr_smpl = s5m87xx->wtsr_smpl;
719719
720− info->irq = regmap_irq_get_virq(s5m87xx->irq_data, alarm_irq);
721− if (info->irq <= 0) {
722− ret = -EINVAL;
723− dev_err(&pdev->dev, "Failed to get virtual IRQ %d\n",
720+ if (s5m87xx->irq_data) {
721+ info->irq = regmap_irq_get_virq(s5m87xx->irq_data, alarm_irq);
722+ if (info->irq <= 0) {
723+ ret = -EINVAL;
724+ dev_err(&pdev->dev, "Failed to get virtual IRQ %d\n",
724725 alarm_irq);
725− goto err;
726+ goto err;
727+ }
726728 }
727729
728730 platform_set_drvdata(pdev, info);
@@ -744,6 +746,11 @@ static int s5m_rtc_probe(struct platform_device *pdev) · 15 unmodified lines
744746 goto err;
745747 }
746748
749+ if (!info->irq) {
750+ dev_info(&pdev->dev, "Alarm IRQ not available\n");
751+ return 0;
752+ }
753+
747754 ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
748755 s5m_rtc_alarm_irq, 0, "rtc-alarm0",
749756 info);
@@ -802,7 +809,7 @@ static int s5m_rtc_resume(struct device *dev) · 52 unmodified lines
802809 struct s5m_rtc_info *info = dev_get_drvdata(dev);
803810 int ret = 0;
804811
805− if (device_may_wakeup(dev))
812+ if (info->irq && device_may_wakeup(dev))
806813 ret = disable_irq_wake(info->irq);
807814
808815 return ret;
@@ -813,7 +820,7 @@ static int s5m_rtc_suspend(struct device *dev) · 4 unmodified lines
813820 struct s5m_rtc_info *info = dev_get_drvdata(dev);
814821 int ret = 0;
815822
816− if (device_may_wakeup(dev))
823+ if (info->irq && device_may_wakeup(dev))
817824 ret = enable_irq_wake(info->irq);
818825
819826 return ret;
drivers/s390/char/con3215.c+17−3
@@ -1035,12 +1035,26 @@ static int tty3215_write(struct tty_struct * tty, · 1034 unmodified lines
10351035 const unsigned char *buf, int count)
10361036 {
10371037 struct raw3215_info *raw;
1038+ int i, written;
10381039
10391040 if (!tty)
10401041 return 0;
10411042 raw = (struct raw3215_info *) tty->driver_data;
1042− raw3215_write(raw, buf, count);
1043− return count;
1043+ written = count;
1044+ while (count > 0) {
1045+ for (i = 0; i < count; i++)
1046+ if (buf[i] == '\t' || buf[i] == '\n')
1047+ break;
1048+ raw3215_write(raw, buf, i);
1049+ count -= i;
1050+ buf += i;
1051+ if (count > 0) {
1052+ raw3215_putchar(raw, *buf);
1053+ count--;
1054+ buf++;
1055+ }
1056+ }
1057+ return written;
10441058 }
10451059
10461060 /*
@@ -1188,7 +1202,7 @@ static int __init tty3215_init(void) · 141 unmodified lines
11881202 driver->subtype = SYSTEM_TYPE_TTY;
11891203 driver->init_termios = tty_std_termios;
11901204 driver->init_termios.c_iflag = IGNBRK | IGNPAR;
1191− driver->init_termios.c_oflag = ONLCR | XTABS;
1205+ driver->init_termios.c_oflag = ONLCR;
11921206 driver->init_termios.c_lflag = ISIG;
11931207 driver->flags = TTY_DRIVER_REAL_RAW;
11941208 tty_set_operations(driver, &tty3215_ops);
drivers/s390/char/sclp_tty.c+1−1
@@ -559,7 +559,7 @@ sclp_tty_init(void) · 558 unmodified lines
559559 driver->subtype = SYSTEM_TYPE_TTY;
560560 driver->init_termios = tty_std_termios;
561561 driver->init_termios.c_iflag = IGNBRK | IGNPAR;
562− driver->init_termios.c_oflag = ONLCR | XTABS;
562+ driver->init_termios.c_oflag = ONLCR;
563563 driver->init_termios.c_lflag = ISIG | ECHO;
564564 driver->flags = TTY_DRIVER_REAL_RAW;
565565 tty_set_operations(driver, &sclp_ops);
drivers/s390/net/qeth_core.h+1−0
@@ -889,6 +889,7 @@ extern const struct attribute_group *qeth_generic_attr_groups[]; · 888 unmodified lines
889889 extern const struct attribute_group *qeth_osn_attr_groups[];
890890 extern struct workqueue_struct *qeth_wq;
891891
892+int qeth_card_hw_is_reachable(struct qeth_card *);
892893 const char *qeth_get_cardname_short(struct qeth_card *);
893894 int qeth_realloc_buffer_pool(struct qeth_card *, int);
894895 int qeth_core_load_discipline(struct qeth_card *, enum qeth_discipline_id);
drivers/s390/net/qeth_core_main.c+15−1
@@ -73,6 +73,13 @@ static int qeth_init_qdio_out_buf(struct qeth_qdio_out_q *, int); · 72 unmodified lines
7373 struct workqueue_struct *qeth_wq;
7474 EXPORT_SYMBOL_GPL(qeth_wq);
7575
76+int qeth_card_hw_is_reachable(struct qeth_card *card)
77+{
78+ return (card->state == CARD_STATE_SOFTSETUP) ||
79+ (card->state == CARD_STATE_UP);
80+}
81+EXPORT_SYMBOL_GPL(qeth_card_hw_is_reachable);
82+
7683 static void qeth_close_dev_handler(struct work_struct *work)
7784 {
7885 struct qeth_card *card;
@@ -5790,6 +5797,7 @@ int qeth_core_ethtool_get_settings(struct net_device *netdev, · 5711 unmodified lines
57905797 struct qeth_card *card = netdev->ml_priv;
57915798 enum qeth_link_types link_type;
57925799 struct carrier_info carrier_info;
5800+ int rc;
57935801 u32 speed;
57945802
57955803 if ((card->info.type == QETH_CARD_TYPE_IQD) || (card->info.guestlan))
@@ -5832,8 +5840,14 @@ int qeth_core_ethtool_get_settings(struct net_device *netdev, · 36 unmodified lines
58325840 /* Check if we can obtain more accurate information. */
58335841 /* If QUERY_CARD_INFO command is not supported or fails, */
58345842 /* just return the heuristics that was filled above. */
5835− if (qeth_query_card_info(card, &carrier_info) != 0)
5843+ if (!qeth_card_hw_is_reachable(card))
5844+ return -ENODEV;
5845+ rc = qeth_query_card_info(card, &carrier_info);
5846+ if (rc == -EOPNOTSUPP) /* for old hardware, return heuristic */
58365847 return 0;
5848+ if (rc) /* report error from the hardware operation */
5849+ return rc;
5850+ /* on success, fill in the information got from the hardware */
58375851
58385852 netdev_dbg(netdev,
58395853 "card info: card_type=0x%02x, port_mode=0x%04x, port_speed=0x%08x\n",
drivers/s390/net/qeth_l2_sys.c+1−6
@@ -5,17 +5,12 @@ · 4 unmodified lines
55
66 #include <linux/slab.h>
77 #include <asm/ebcdic.h>
8+#include "qeth_core.h"
89 #include "qeth_l2.h"
910
1011 #define QETH_DEVICE_ATTR(_id, _name, _mode, _show, _store) \
1112 struct device_attribute dev_attr_##_id = __ATTR(_name, _mode, _show, _store)
1213
13−static int qeth_card_hw_is_reachable(struct qeth_card *card)
14−{
15− return (card->state == CARD_STATE_SOFTSETUP) ||
16− (card->state == CARD_STATE_UP);
17−}
18−
1914 static ssize_t qeth_bridge_port_role_state_show(struct device *dev,
2015 struct device_attribute *attr, char *buf,
2116 int show_state)
drivers/scsi/scsi_lib.c+0−1
@@ -1808,7 +1808,6 @@ static int scsi_mq_prep_fn(struct request *req) · 1807 unmodified lines
18081808
18091809 cmd->tag = req->tag;
18101810
1811− req->cmd = req->__cmd;
18121811 cmd->cmnd = req->cmd;
18131812 cmd->prot_op = SCSI_PROT_NORMAL;
18141813
drivers/sh/Makefile+1−2
@@ -1,8 +1,7 @@
11 #
22 # Makefile for the SuperH specific drivers.
33 #
4−obj-$(CONFIG_SUPERH) += intc/
5−obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += intc/
4+obj-$(CONFIG_SH_INTC) += intc/
65 ifneq ($(CONFIG_COMMON_CLK),y)
76 obj-$(CONFIG_HAVE_CLK) += clk/
87 endif
drivers/sh/intc/Kconfig+5−1
@@ -1,7 +1,9 @@
11 config SH_INTC
2− def_bool y
2+ bool
33 select IRQ_DOMAIN
44
5+if SH_INTC
6+
57 comment "Interrupt controller options"
68
79 config INTC_USERIMASK
@@ -37,3 +39,5 @@ config INTC_MAPPING_DEBUG · 29 unmodified lines
3739 between system IRQs and the per-controller id tables.
3840
3941 If in doubt, say N.
42+
43+endif
drivers/spi/spi-au1550.c+1−1
@@ -945,7 +945,7 @@ static int au1550_spi_remove(struct platform_device *pdev) · 944 unmodified lines
945945 spi_bitbang_stop(&hw->bitbang);
946946 free_irq(hw->irq, hw);
947947 iounmap((void __iomem *)hw->regs);
948− release_mem_region(r->start, sizeof(psc_spi_t));
948+ release_mem_region(hw->ioarea->start, sizeof(psc_spi_t));
949949
950950 if (hw->usedma) {
951951 au1550_spi_dma_rxtmp_free(hw);
drivers/spi/spi-davinci.c+8−8
@@ -417,16 +417,16 @@ static int davinci_spi_setup(struct spi_device *spi) · 416 unmodified lines
417417 flags, dev_name(&spi->dev));
418418 internal_cs = false;
419419 }
420− }
421420
422− if (retval) {
423− dev_err(&spi->dev, "GPIO %d setup failed (%d)\n",
424− spi->cs_gpio, retval);
425− return retval;
426− }
421+ if (retval) {
422+ dev_err(&spi->dev, "GPIO %d setup failed (%d)\n",
423+ spi->cs_gpio, retval);
424+ return retval;
425+ }
427426
428− if (internal_cs)
429− set_io_bits(dspi->base + SPIPC0, 1 << spi->chip_select);
427+ if (internal_cs)
428+ set_io_bits(dspi->base + SPIPC0, 1 << spi->chip_select);
429+ }
430430
431431 if (spi->mode & SPI_READY)
432432 set_io_bits(dspi->base + SPIPC0, SPIPC0_SPIENA_MASK);
drivers/spi/spi-dw-pci.c+2−0
@@ -62,6 +62,8 @@ static int spi_pci_probe(struct pci_dev *pdev, · 61 unmodified lines
6262 if (ret)
6363 return ret;
6464
65+ dws->regs = pcim_iomap_table(pdev)[pci_bar];
66+
6567 dws->bus_num = 0;
6668 dws->num_cs = 4;
6769 dws->irq = pdev->irq;
drivers/spi/spi-dw.c+1−1
@@ -271,7 +271,7 @@ static void giveback(struct dw_spi *dws) · 270 unmodified lines
271271 transfer_list);
272272
273273 if (!last_transfer->cs_change)
274− spi_chip_sel(dws, dws->cur_msg->spi, 0);
274+ spi_chip_sel(dws, msg->spi, 0);
275275
276276 spi_finalize_current_message(dws->master);
277277 }
drivers/spi/spi-omap2-mcspi.c+2−1
@@ -329,7 +329,8 @@ static void omap2_mcspi_set_fifo(const struct spi_device *spi, · 328 unmodified lines
329329 disable_fifo:
330330 if (t->rx_buf != NULL)
331331 chconf &= ~OMAP2_MCSPI_CHCONF_FFER;
332− else
332+
333+ if (t->tx_buf != NULL)
333334 chconf &= ~OMAP2_MCSPI_CHCONF_FFET;
334335
335336 mcspi_write_chconf0(spi, chconf);
drivers/spi/spi-pxa2xx.c+1−0
@@ -1074,6 +1074,7 @@ static struct acpi_device_id pxa2xx_spi_acpi_match[] = { · 1073 unmodified lines
10741074 { "INT3430", 0 },
10751075 { "INT3431", 0 },
10761076 { "80860F0E", 0 },
1077+ { "8086228E", 0 },
10771078 { },
10781079 };
10791080 MODULE_DEVICE_TABLE(acpi, pxa2xx_spi_acpi_match);
drivers/spi/spi-rockchip.c+2−2
@@ -499,7 +499,7 @@ static void rockchip_spi_config(struct rockchip_spi *rs) · 498 unmodified lines
499499 }
500500
501501 /* div doesn't support odd number */
502− div = rs->max_freq / rs->speed;
502+ div = max_t(u32, rs->max_freq / rs->speed, 1);
503503 div = (div + 1) & 0xfffe;
504504
505505 spi_enable_chip(rs, 0);
@@ -678,7 +678,7 @@ static int rockchip_spi_probe(struct platform_device *pdev) · 172 unmodified lines
678678 rs->dma_tx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_TXDR);
679679 rs->dma_rx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_RXDR);
680680 rs->dma_tx.direction = DMA_MEM_TO_DEV;
681− rs->dma_tx.direction = DMA_DEV_TO_MEM;
681+ rs->dma_rx.direction = DMA_DEV_TO_MEM;
682682
683683 master->can_dma = rockchip_spi_can_dma;
684684 master->dma_tx = rs->dma_tx.ch;
drivers/spi/spi-rspi.c+58−36
@@ -472,25 +472,52 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx, · 471 unmodified lines
472472 dma_cookie_t cookie;
473473 int ret;
474474
475− if (tx) {
476− desc_tx = dmaengine_prep_slave_sg(rspi->master->dma_tx,
477− tx->sgl, tx->nents, DMA_TO_DEVICE,
478− DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
479− if (!desc_tx)
480− goto no_dma;
481−
482− irq_mask |= SPCR_SPTIE;
483− }
475+ /* First prepare and submit the DMA request(s), as this may fail */
484476 if (rx) {
485477 desc_rx = dmaengine_prep_slave_sg(rspi->master->dma_rx,
486478 rx->sgl, rx->nents, DMA_FROM_DEVICE,
487479 DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
488− if (!desc_rx)
489− goto no_dma;
480+ if (!desc_rx) {
481+ ret = -EAGAIN;
482+ goto no_dma_rx;
483+ }
484+
485+ desc_rx->callback = rspi_dma_complete;
486+ desc_rx->callback_param = rspi;
487+ cookie = dmaengine_submit(desc_rx);
488+ if (dma_submit_error(cookie)) {
489+ ret = cookie;
490+ goto no_dma_rx;
491+ }
490492
491493 irq_mask |= SPCR_SPRIE;
492494 }
493495
496+ if (tx) {
497+ desc_tx = dmaengine_prep_slave_sg(rspi->master->dma_tx,
498+ tx->sgl, tx->nents, DMA_TO_DEVICE,
499+ DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
500+ if (!desc_tx) {
501+ ret = -EAGAIN;
502+ goto no_dma_tx;
503+ }
504+
505+ if (rx) {
506+ /* No callback */
507+ desc_tx->callback = NULL;
508+ } else {
509+ desc_tx->callback = rspi_dma_complete;
510+ desc_tx->callback_param = rspi;
511+ }
512+ cookie = dmaengine_submit(desc_tx);
513+ if (dma_submit_error(cookie)) {
514+ ret = cookie;
515+ goto no_dma_tx;
516+ }
517+
518+ irq_mask |= SPCR_SPTIE;
519+ }
520+
494521 /*
495522 * DMAC needs SPxIE, but if SPxIE is set, the IRQ routine will be
496523 * called. So, this driver disables the IRQ while DMA transfer.
@@ -503,34 +530,24 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx, · 6 unmodified lines
503530 rspi_enable_irq(rspi, irq_mask);
504531 rspi->dma_callbacked = 0;
505532
506− if (rx) {
507− desc_rx->callback = rspi_dma_complete;
508− desc_rx->callback_param = rspi;
509− cookie = dmaengine_submit(desc_rx);
510− if (dma_submit_error(cookie))
511− return cookie;
533+ /* Now start DMA */
534+ if (rx)
512535 dma_async_issue_pending(rspi->master->dma_rx);
513− }
514− if (tx) {
515− if (rx) {
516− /* No callback */
517− desc_tx->callback = NULL;
518− } else {
519− desc_tx->callback = rspi_dma_complete;
520− desc_tx->callback_param = rspi;
521− }
522− cookie = dmaengine_submit(desc_tx);
523− if (dma_submit_error(cookie))
524− return cookie;
536+ if (tx)
525537 dma_async_issue_pending(rspi->master->dma_tx);
526− }
527538
528539 ret = wait_event_interruptible_timeout(rspi->wait,
529540 rspi->dma_callbacked, HZ);
530541 if (ret > 0 && rspi->dma_callbacked)
531542 ret = 0;
532− else if (!ret)
543+ else if (!ret) {
544+ dev_err(&rspi->master->dev, "DMA timeout\n");
533545 ret = -ETIMEDOUT;
546+ if (tx)
547+ dmaengine_terminate_all(rspi->master->dma_tx);
548+ if (rx)
549+ dmaengine_terminate_all(rspi->master->dma_rx);
550+ }
534551
535552 rspi_disable_irq(rspi, irq_mask);
536553
@@ -541,11 +558,16 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx, · 4 unmodified lines
541558
542559 return ret;
543560
544−no_dma:
545− pr_warn_once("%s %s: DMA not available, falling back to PIO\n",
546− dev_driver_string(&rspi->master->dev),
547− dev_name(&rspi->master->dev));
548− return -EAGAIN;
561+no_dma_tx:
562+ if (rx)
563+ dmaengine_terminate_all(rspi->master->dma_rx);
564+no_dma_rx:
565+ if (ret == -EAGAIN) {
566+ pr_warn_once("%s %s: DMA not available, falling back to PIO\n",
567+ dev_driver_string(&rspi->master->dev),
568+ dev_name(&rspi->master->dev));
569+ }
570+ return ret;
549571 }
550572
551573 static void rspi_receive_init(const struct rspi_data *rspi)
drivers/spi/spi-sh-msiof.c+38−33
@@ -636,48 +636,38 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, · 635 unmodified lines
636636 dma_cookie_t cookie;
637637 int ret;
638638
639− if (tx) {
640− ier_bits |= IER_TDREQE | IER_TDMAE;
641− dma_sync_single_for_device(p->master->dma_tx->device->dev,
642− p->tx_dma_addr, len, DMA_TO_DEVICE);
643− desc_tx = dmaengine_prep_slave_single(p->master->dma_tx,
644− p->tx_dma_addr, len, DMA_TO_DEVICE,
645− DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
646− if (!desc_tx)
647− return -EAGAIN;
648− }
649−
639+ /* First prepare and submit the DMA request(s), as this may fail */
650640 if (rx) {
651641 ier_bits |= IER_RDREQE | IER_RDMAE;
652642 desc_rx = dmaengine_prep_slave_single(p->master->dma_rx,
653643 p->rx_dma_addr, len, DMA_FROM_DEVICE,
654644 DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
655− if (!desc_rx)
656− return -EAGAIN;
657− }
658−
659− /* 1 stage FIFO watermarks for DMA */
660− sh_msiof_write(p, FCTR, FCTR_TFWM_1 | FCTR_RFWM_1);
661−
662− /* setup msiof transfer mode registers (32-bit words) */
663− sh_msiof_spi_set_mode_regs(p, tx, rx, 32, len / 4);
664−
665− sh_msiof_write(p, IER, ier_bits);
666−
667− reinit_completion(&p->done);
645+ if (!desc_rx) {
646+ ret = -EAGAIN;
647+ goto no_dma_rx;
648+ }
668649
669− if (rx) {
670650 desc_rx->callback = sh_msiof_dma_complete;
671651 desc_rx->callback_param = p;
672652 cookie = dmaengine_submit(desc_rx);
673653 if (dma_submit_error(cookie)) {
674654 ret = cookie;
675− goto stop_ier;
655+ goto no_dma_rx;
676656 }
677− dma_async_issue_pending(p->master->dma_rx);
678657 }
679658
680659 if (tx) {
660+ ier_bits |= IER_TDREQE | IER_TDMAE;
661+ dma_sync_single_for_device(p->master->dma_tx->device->dev,
662+ p->tx_dma_addr, len, DMA_TO_DEVICE);
663+ desc_tx = dmaengine_prep_slave_single(p->master->dma_tx,
664+ p->tx_dma_addr, len, DMA_TO_DEVICE,
665+ DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
666+ if (!desc_tx) {
667+ ret = -EAGAIN;
668+ goto no_dma_tx;
669+ }
670+
681671 if (rx) {
682672 /* No callback */
683673 desc_tx->callback = NULL;
@@ -688,15 +678,30 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, · 4 unmodified lines
688678 cookie = dmaengine_submit(desc_tx);
689679 if (dma_submit_error(cookie)) {
690680 ret = cookie;
691− goto stop_rx;
681+ goto no_dma_tx;
692682 }
693− dma_async_issue_pending(p->master->dma_tx);
694683 }
695684
685+ /* 1 stage FIFO watermarks for DMA */
686+ sh_msiof_write(p, FCTR, FCTR_TFWM_1 | FCTR_RFWM_1);
687+
688+ /* setup msiof transfer mode registers (32-bit words) */
689+ sh_msiof_spi_set_mode_regs(p, tx, rx, 32, len / 4);
690+
691+ sh_msiof_write(p, IER, ier_bits);
692+
693+ reinit_completion(&p->done);
694+
695+ /* Now start DMA */
696+ if (rx)
697+ dma_async_issue_pending(p->master->dma_rx);
698+ if (tx)
699+ dma_async_issue_pending(p->master->dma_tx);
700+
696701 ret = sh_msiof_spi_start(p, rx);
697702 if (ret) {
698703 dev_err(&p->pdev->dev, "failed to start hardware\n");
699− goto stop_tx;
704+ goto stop_dma;
700705 }
701706
702707 /* wait for tx fifo to be emptied / rx fifo to be filled */
@@ -726,14 +731,14 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, · 23 unmodified lines
726731 stop_reset:
727732 sh_msiof_reset_str(p);
728733 sh_msiof_spi_stop(p, rx);
729−stop_tx:
734+stop_dma:
730735 if (tx)
731736 dmaengine_terminate_all(p->master->dma_tx);
732−stop_rx:
737+no_dma_tx:
733738 if (rx)
734739 dmaengine_terminate_all(p->master->dma_rx);
735−stop_ier:
736740 sh_msiof_write(p, IER, 0);
741+no_dma_rx:
737742 return ret;
738743 }
739744
drivers/spi/spi.c+1−0
@@ -848,6 +848,7 @@ out: · 847 unmodified lines
848848
849849 /**
850850 * spi_finalize_current_transfer - report completion of a transfer
851+ * @master: the master reporting completion
851852 *
852853 * Called by SPI drivers using the core transfer_one_message()
853854 * implementation to notify it that the current interrupt driven
drivers/ssb/b43_pci_bridge.c+1−0
@@ -38,6 +38,7 @@ static const struct pci_device_id b43_pci_bridge_tbl[] = { · 37 unmodified lines
3838 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) },
3939 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432c) },
4040 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4350) },
41+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4351) },
4142 { 0, },
4243 };
4344 MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
drivers/staging/Kconfig+0−2
@@ -28,8 +28,6 @@ source "drivers/staging/et131x/Kconfig" · 27 unmodified lines
2828
2929 source "drivers/staging/slicoss/Kconfig"
3030
31−source "drivers/staging/usbip/Kconfig"
32−
3331 source "drivers/staging/wlan-ng/Kconfig"
3432
3533 source "drivers/staging/comedi/Kconfig"
drivers/staging/Makefile+0−1
@@ -6,7 +6,6 @@ obj-$(CONFIG_STAGING) += staging.o · 5 unmodified lines
66 obj-y += media/
77 obj-$(CONFIG_ET131X) += et131x/
88 obj-$(CONFIG_SLICOSS) += slicoss/
9−obj-$(CONFIG_USBIP_CORE) += usbip/
109 obj-$(CONFIG_PRISM2_USB) += wlan-ng/
1110 obj-$(CONFIG_COMEDI) += comedi/
1211 obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
drivers/staging/android/logger.c+4−1
@@ -790,7 +790,7 @@ static int __init create_log(char *log_name, int size) · 789 unmodified lines
790790 if (unlikely(ret)) {
791791 pr_err("failed to register misc device for log '%s'!\n",
792792 log->misc.name);
793− goto out_free_log;
793+ goto out_free_misc_name;
794794 }
795795
796796 pr_info("created %luK log '%s'\n",
@@ -798,6 +798,9 @@ static int __init create_log(char *log_name, int size) · 1 unmodified line
798798
799799 return 0;
800800
801+out_free_misc_name:
802+ kfree(log->misc.name);
803+
801804 out_free_log:
802805 kfree(log);
803806
drivers/staging/et131x/et131x.c+27−41
@@ -1421,22 +1421,16 @@ static int et131x_mii_read(struct et131x_adapter *adapter, u8 reg, u16 *value) · 1420 unmodified lines
14211421 * @reg: the register to read
14221422 * @value: 16-bit value to write
14231423 */
1424−static int et131x_mii_write(struct et131x_adapter *adapter, u8 reg, u16 value)
1424+static int et131x_mii_write(struct et131x_adapter *adapter, u8 addr, u8 reg,
1425+ u16 value)
14251426 {
14261427 struct mac_regs __iomem *mac = &adapter->regs->mac;
1427− struct phy_device *phydev = adapter->phydev;
14281428 int status = 0;
1429− u8 addr;
14301429 u32 delay = 0;
14311430 u32 mii_addr;
14321431 u32 mii_cmd;
14331432 u32 mii_indicator;
14341433
1435− if (!phydev)
1436− return -EIO;
1437−
1438− addr = phydev->addr;
1439−
14401434 /* Save a local copy of the registers we are dealing with so we can
14411435 * set them back
14421436 */
@@ -1631,17 +1625,7 @@ static int et131x_mdio_write(struct mii_bus *bus, int phy_addr, · 188 unmodified lines
16311625 struct net_device *netdev = bus->priv;
16321626 struct et131x_adapter *adapter = netdev_priv(netdev);
16331627
1634− return et131x_mii_write(adapter, reg, value);
1635−}
1636−
1637−static int et131x_mdio_reset(struct mii_bus *bus)
1638−{
1639− struct net_device *netdev = bus->priv;
1640− struct et131x_adapter *adapter = netdev_priv(netdev);
1641−
1642− et131x_mii_write(adapter, MII_BMCR, BMCR_RESET);
1643−
1644− return 0;
1628+ return et131x_mii_write(adapter, phy_addr, reg, value);
16451629 }
16461630
16471631 /* et1310_phy_power_switch - PHY power control
@@ -1656,18 +1640,20 @@ static int et131x_mdio_reset(struct mii_bus *bus) · 8 unmodified lines
16561640 static void et1310_phy_power_switch(struct et131x_adapter *adapter, bool down)
16571641 {
16581642 u16 data;
1643+ struct phy_device *phydev = adapter->phydev;
16591644
16601645 et131x_mii_read(adapter, MII_BMCR, &data);
16611646 data &= ~BMCR_PDOWN;
16621647 if (down)
16631648 data |= BMCR_PDOWN;
1664− et131x_mii_write(adapter, MII_BMCR, data);
1649+ et131x_mii_write(adapter, phydev->addr, MII_BMCR, data);
16651650 }
16661651
16671652 /* et131x_xcvr_init - Init the phy if we are setting it into force mode */
16681653 static void et131x_xcvr_init(struct et131x_adapter *adapter)
16691654 {
16701655 u16 lcr2;
1656+ struct phy_device *phydev = adapter->phydev;
16711657
16721658 /* Set the LED behavior such that LED 1 indicates speed (off =
16731659 * 10Mbits, blink = 100Mbits, on = 1000Mbits) and LED 2 indicates
@@ -1688,7 +1674,7 @@ static void et131x_xcvr_init(struct et131x_adapter *adapter) · 14 unmodified lines
16881674 else
16891675 lcr2 |= (LED_VAL_LINKON << LED_TXRX_SHIFT);
16901676
1691− et131x_mii_write(adapter, PHY_LED_2, lcr2);
1677+ et131x_mii_write(adapter, phydev->addr, PHY_LED_2, lcr2);
16921678 }
16931679 }
16941680
@@ -3643,14 +3629,14 @@ static void et131x_adjust_link(struct net_device *netdev) · 1948 unmodified lines
36433629
36443630 et131x_mii_read(adapter, PHY_MPHY_CONTROL_REG,
36453631 &register18);
3646− et131x_mii_write(adapter, PHY_MPHY_CONTROL_REG,
3647− register18 | 0x4);
3648− et131x_mii_write(adapter, PHY_INDEX_REG,
3632+ et131x_mii_write(adapter, phydev->addr,
3633+ PHY_MPHY_CONTROL_REG, register18 | 0x4);
3634+ et131x_mii_write(adapter, phydev->addr, PHY_INDEX_REG,
36493635 register18 | 0x8402);
3650− et131x_mii_write(adapter, PHY_DATA_REG,
3636+ et131x_mii_write(adapter, phydev->addr, PHY_DATA_REG,
36513637 register18 | 511);
3652− et131x_mii_write(adapter, PHY_MPHY_CONTROL_REG,
3653− register18);
3638+ et131x_mii_write(adapter, phydev->addr,
3639+ PHY_MPHY_CONTROL_REG, register18);
36543640 }
36553641
36563642 et1310_config_flow_control(adapter);
@@ -3662,7 +3648,8 @@ static void et131x_adjust_link(struct net_device *netdev) · 5 unmodified lines
36623648 et131x_mii_read(adapter, PHY_CONFIG, &reg);
36633649 reg &= ~ET_PHY_CONFIG_TX_FIFO_DEPTH;
36643650 reg |= ET_PHY_CONFIG_FIFO_DEPTH_32;
3665− et131x_mii_write(adapter, PHY_CONFIG, reg);
3651+ et131x_mii_write(adapter, phydev->addr, PHY_CONFIG,
3652+ reg);
36663653 }
36673654
36683655 et131x_set_rx_dma_timer(adapter);
@@ -3675,14 +3662,14 @@ static void et131x_adjust_link(struct net_device *netdev) · 6 unmodified lines
36753662
36763663 et131x_mii_read(adapter, PHY_MPHY_CONTROL_REG,
36773664 &register18);
3678− et131x_mii_write(adapter, PHY_MPHY_CONTROL_REG,
3679− register18 | 0x4);
3680− et131x_mii_write(adapter, PHY_INDEX_REG,
3681− register18 | 0x8402);
3682− et131x_mii_write(adapter, PHY_DATA_REG,
3683− register18 | 511);
3684− et131x_mii_write(adapter, PHY_MPHY_CONTROL_REG,
3685− register18);
3665+ et131x_mii_write(adapter, phydev->addr,
3666+ PHY_MPHY_CONTROL_REG, register18 | 0x4);
3667+ et131x_mii_write(adapter, phydev->addr,
3668+ PHY_INDEX_REG, register18 | 0x8402);
3669+ et131x_mii_write(adapter, phydev->addr,
3670+ PHY_DATA_REG, register18 | 511);
3671+ et131x_mii_write(adapter, phydev->addr,
3672+ PHY_MPHY_CONTROL_REG, register18);
36863673 }
36873674
36883675 /* Free the packets being actively sent & stopped */
@@ -4644,10 +4631,6 @@ static int et131x_pci_setup(struct pci_dev *pdev, · 955 unmodified lines
46444631 /* Copy address into the net_device struct */
46454632 memcpy(netdev->dev_addr, adapter->addr, ETH_ALEN);
46464633
4647− /* Init variable for counting how long we do not have link status */
4648− adapter->boot_coma = 0;
4649− et1310_disable_phy_coma(adapter);
4650−
46514634 rc = -ENOMEM;
46524635
46534636 /* Setup the mii_bus struct */
@@ -4663,7 +4646,6 @@ static int et131x_pci_setup(struct pci_dev *pdev, · 9 unmodified lines
46634646 adapter->mii_bus->priv = netdev;
46644647 adapter->mii_bus->read = et131x_mdio_read;
46654648 adapter->mii_bus->write = et131x_mdio_write;
4666− adapter->mii_bus->reset = et131x_mdio_reset;
46674649 adapter->mii_bus->irq = kmalloc_array(PHY_MAX_ADDR, sizeof(int),
46684650 GFP_KERNEL);
46694651 if (!adapter->mii_bus->irq)
@@ -4687,6 +4669,10 @@ static int et131x_pci_setup(struct pci_dev *pdev, · 17 unmodified lines
46874669 /* Setup et1310 as per the documentation */
46884670 et131x_adapter_setup(adapter);
46894671
4672+ /* Init variable for counting how long we do not have link status */
4673+ adapter->boot_coma = 0;
4674+ et1310_disable_phy_coma(adapter);
4675+
46904676 /* We can enable interrupts now
46914677 *
46924678 * NOTE - Because registration of interrupt handler is done in the
drivers/staging/lustre/lustre/libcfs/workitem.c+1−0
@@ -365,6 +365,7 @@ cfs_wi_sched_create(char *name, struct cfs_cpt_table *cptab, · 364 unmodified lines
365365 return -ENOMEM;
366366
367367 strncpy(sched->ws_name, name, CFS_WS_NAME_LEN);
368+ sched->ws_name[CFS_WS_NAME_LEN - 1] = '\0';
368369 sched->ws_cptab = cptab;
369370 sched->ws_cpt = cpt;
370371
drivers/staging/lustre/lustre/obdclass/class_obd.c+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
3535 */
3636
3737 #define DEBUG_SUBSYSTEM S_CLASS
38−# include <asm/atomic.h>
38+# include <linux/atomic.h>
3939
4040 #include "../include/obd_support.h"
4141 #include "../include/obd_class.h"
drivers/staging/rtl8188eu/os_dep/usb_intf.c+2−0
@@ -43,9 +43,11 @@ static struct usb_device_id rtw_usb_id_tbl[] = { · 42 unmodified lines
4343 {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x0179)}, /* 8188ETV */
4444 /*=== Customer ID ===*/
4545 /****** 8188EUS ********/
46+ {USB_DEVICE(0x056e, 0x4008)}, /* Elecom WDC-150SU2M */
4647 {USB_DEVICE(0x07b8, 0x8179)}, /* Abocom - Abocom */
4748 {USB_DEVICE(0x2001, 0x330F)}, /* DLink DWA-125 REV D1 */
4849 {USB_DEVICE(0x2001, 0x3310)}, /* Dlink DWA-123 REV D1 */
50+ {USB_DEVICE(0x0df6, 0x0076)}, /* Sitecom N150 v2 */
4951 {} /* Terminating entry */
5052 };
5153
drivers/thunderbolt/path.c+20−1
@@ -150,7 +150,26 @@ int tb_path_activate(struct tb_path *path) · 149 unmodified lines
150150
151151 /* Activate hops. */
152152 for (i = path->path_length - 1; i >= 0; i--) {
153− struct tb_regs_hop hop;
153+ struct tb_regs_hop hop = { 0 };
154+
155+ /*
156+ * We do (currently) not tear down paths setup by the firmeware.
157+ * If a firmware device is unplugged and plugged in again then
158+ * it can happen that we reuse some of the hops from the (now
159+ * defunct) firmeware path. This causes the hotplug operation to
160+ * fail (the pci device does not show up). Clearing the hop
161+ * before overwriting it fixes the problem.
162+ *
163+ * Should be removed once we discover and tear down firmeware
164+ * paths.
165+ */
166+ res = tb_port_write(path->hops[i].in_port, &hop, TB_CFG_HOPS,
167+ 2 * path->hops[i].in_hop_index, 2);
168+ if (res) {
169+ __tb_path_deactivate_hops(path, i);
170+ __tb_path_deallocate_nfc(path, 0);
171+ goto err;
172+ }
154173
155174 /* dword 0 */
156175 hop.next_hop = path->hops[i].next_hop_index;
drivers/usb/Kconfig+2−0
@@ -92,6 +92,8 @@ source "drivers/usb/storage/Kconfig" · 91 unmodified lines
9292
9393 source "drivers/usb/image/Kconfig"
9494
95+source "drivers/usb/usbip/Kconfig"
96+
9597 endif
9698
9799 source "drivers/usb/musb/Kconfig"
drivers/usb/Makefile+2−0
@@ -60,3 +60,5 @@ obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs/ · 59 unmodified lines
6060 obj-$(CONFIG_USB_GADGET) += gadget/
6161
6262 obj-$(CONFIG_USB_COMMON) += common/
63+
64+obj-$(CONFIG_USBIP_CORE) += usbip/
drivers/usb/core/hub.c+10−6
@@ -1728,8 +1728,14 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) · 1727 unmodified lines
17281728 * - Change autosuspend delay of hub can avoid unnecessary auto
17291729 * suspend timer for hub, also may decrease power consumption
17301730 * of USB bus.
1731+ *
1732+ * - If user has indicated to prevent autosuspend by passing
1733+ * usbcore.autosuspend = -1 then keep autosuspend disabled.
17311734 */
1732− pm_runtime_set_autosuspend_delay(&hdev->dev, 0);
1735+#ifdef CONFIG_PM_RUNTIME
1736+ if (hdev->dev.power.autosuspend_delay >= 0)
1737+ pm_runtime_set_autosuspend_delay(&hdev->dev, 0);
1738+#endif
17331739
17341740 /*
17351741 * Hubs have proper suspend/resume support, except for root hubs
@@ -2107,8 +2113,8 @@ void usb_disconnect(struct usb_device **pdev) · 371 unmodified lines
21072113 {
21082114 struct usb_port *port_dev = NULL;
21092115 struct usb_device *udev = *pdev;
2110− struct usb_hub *hub;
2111− int port1;
2116+ struct usb_hub *hub = NULL;
2117+ int port1 = 1;
21122118
21132119 /* mark the device as inactive, so any further urb submissions for
21142120 * this device (and any of its children) will fail immediately.
@@ -4631,9 +4637,7 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, · 2516 unmodified lines
46314637 if (status != -ENODEV &&
46324638 port1 != unreliable_port &&
46334639 printk_ratelimit())
4634− dev_err(&udev->dev, "connect-debounce failed, port %d disabled\n",
4635− port1);
4636−
4640+ dev_err(&port_dev->dev, "connect-debounce failed\n");
46374641 portstatus &= ~USB_PORT_STAT_CONNECTION;
46384642 unreliable_port = port1;
46394643 } else {
drivers/usb/dwc2/gadget.c+1−1
@@ -1901,7 +1901,7 @@ static void s3c_hsotg_epint(struct s3c_hsotg *hsotg, unsigned int idx, · 1900 unmodified lines
19011901 static void s3c_hsotg_irq_enumdone(struct s3c_hsotg *hsotg)
19021902 {
19031903 u32 dsts = readl(hsotg->regs + DSTS);
1904− int ep0_mps = 0, ep_mps;
1904+ int ep0_mps = 0, ep_mps = 8;
19051905
19061906 /*
19071907 * This should signal the finish of the enumeration phase
drivers/usb/dwc3/dwc3-omap.c+1−1
@@ -425,7 +425,7 @@ static void dwc3_omap_set_utmi_mode(struct dwc3_omap *omap) · 424 unmodified lines
425425
426426 static int dwc3_omap_extcon_register(struct dwc3_omap *omap)
427427 {
428− u32 ret;
428+ int ret;
429429 struct device_node *node = omap->dev->of_node;
430430 struct extcon_dev *edev;
431431
drivers/usb/gadget/Makefile+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 #
44 subdir-ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG
55 subdir-ccflags-$(CONFIG_USB_GADGET_VERBOSE) += -DVERBOSE_DEBUG
6−ccflags-y += -I$(PWD)/drivers/usb/gadget/udc
6+ccflags-y += -Idrivers/usb/gadget/udc
77
88 obj-$(CONFIG_USB_LIBCOMPOSITE) += libcomposite.o
99 libcomposite-y := usbstring.o config.o epautoconf.o
drivers/usb/gadget/function/Makefile+2−2
@@ -2,8 +2,8 @@ · 1 unmodified line
22 # USB peripheral controller drivers
33 #
44
5−ccflags-y := -I$(PWD)/drivers/usb/gadget/
6−ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/
5+ccflags-y := -Idrivers/usb/gadget/
6+ccflags-y += -Idrivers/usb/gadget/udc/
77
88 # USB Functions
99 usb_f_acm-y := f_acm.o
drivers/usb/gadget/function/u_ether.c+0−3
@@ -1127,10 +1127,7 @@ void gether_disconnect(struct gether *link) · 1126 unmodified lines
11271127
11281128 DBG(dev, "%s\n", __func__);
11291129
1130− netif_tx_lock(dev->net);
11311130 netif_stop_queue(dev->net);
1132− netif_tx_unlock(dev->net);
1133−
11341131 netif_carrier_off(dev->net);
11351132
11361133 /* disable endpoints, forcing (synchronous) completion
drivers/usb/gadget/function/uvc_video.c+3−0
@@ -195,6 +195,7 @@ uvc_video_complete(struct usb_ep *ep, struct usb_request *req) · 194 unmodified lines
195195 printk(KERN_INFO "Failed to queue request (%d).\n", ret);
196196 usb_ep_set_halt(ep);
197197 spin_unlock_irqrestore(&video->queue.irqlock, flags);
198+ uvc_queue_cancel(queue, 0);
198199 goto requeue;
199200 }
200201 spin_unlock_irqrestore(&video->queue.irqlock, flags);
@@ -281,6 +282,7 @@ error: · 80 unmodified lines
281282 static int
282283 uvc_video_pump(struct uvc_video *video)
283284 {
285+ struct uvc_video_queue *queue = &video->queue;
284286 struct usb_request *req;
285287 struct uvc_buffer *buf;
286288 unsigned long flags;
@@ -322,6 +324,7 @@ uvc_video_pump(struct uvc_video *video) · 35 unmodified lines
322324 printk(KERN_INFO "Failed to queue request (%d)\n", ret);
323325 usb_ep_set_halt(video->ep);
324326 spin_unlock_irqrestore(&video->queue.irqlock, flags);
327+ uvc_queue_cancel(queue, 0);
325328 break;
326329 }
327330 spin_unlock_irqrestore(&video->queue.irqlock, flags);
drivers/usb/gadget/legacy/Makefile+3−3
@@ -2,9 +2,9 @@ · 1 unmodified line
22 # USB gadget drivers
33 #
44
5−ccflags-y := -I$(PWD)/drivers/usb/gadget/
6−ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/
7−ccflags-y += -I$(PWD)/drivers/usb/gadget/function/
5+ccflags-y := -Idrivers/usb/gadget/
6+ccflags-y += -Idrivers/usb/gadget/udc/
7+ccflags-y += -Idrivers/usb/gadget/function/
88
99 g_zero-y := zero.o
1010 g_audio-y := audio.o
drivers/usb/gadget/legacy/dbgp.c+2−0
@@ -222,10 +222,12 @@ static void dbgp_unbind(struct usb_gadget *gadget) · 221 unmodified lines
222222 {
223223 #ifdef CONFIG_USB_G_DBGP_SERIAL
224224 kfree(dbgp.serial);
225+ dbgp.serial = NULL;
225226 #endif
226227 if (dbgp.req) {
227228 kfree(dbgp.req->buf);
228229 usb_ep_free_request(gadget->ep0, dbgp.req);
230+ dbgp.req = NULL;
229231 }
230232
231233 gadget->ep0->driver_data = NULL;
drivers/usb/gadget/legacy/inode.c+1−1
@@ -440,7 +440,7 @@ ep_write (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) · 439 unmodified lines
440440
441441 value = -ENOMEM;
442442 kbuf = memdup_user(buf, len);
443− if (!kbuf) {
443+ if (IS_ERR(kbuf)) {
444444 value = PTR_ERR(kbuf);
445445 goto free1;
446446 }
drivers/usb/gadget/udc/Kconfig+2−1
@@ -332,7 +332,7 @@ config USB_GOKU · 331 unmodified lines
332332 gadget drivers to also be dynamically linked.
333333
334334 config USB_EG20T
335− tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
335+ tristate "Intel QUARK X1000/EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
336336 depends on PCI
337337 help
338338 This is a USB device driver for EG20T PCH.
@@ -353,6 +353,7 @@ config USB_EG20T · 14 unmodified lines
353353 ML7213/ML7831 is companion chip for Intel Atom E6xx series.
354354 ML7213/ML7831 is completely compatible for Intel EG20T PCH.
355355
356+ This driver can be used with Intel's Quark X1000 SOC platform
356357 #
357358 # LAST -- dummy/emulated controller
358359 #
drivers/usb/gadget/udc/atmel_usba_udc.c+1−1
@@ -1661,7 +1661,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid) · 1660 unmodified lines
16611661 if (dma_status) {
16621662 int i;
16631663
1664− for (i = 1; i < USBA_NR_DMAS; i++)
1664+ for (i = 1; i <= USBA_NR_DMAS; i++)
16651665 if (dma_status & (1 << i))
16661666 usba_dma_irq(udc, &udc->usba_ep[i]);
16671667 }
drivers/usb/gadget/udc/fusb300_udc.c+6−2
@@ -1398,13 +1398,17 @@ static int fusb300_probe(struct platform_device *pdev) · 1397 unmodified lines
13981398
13991399 /* initialize udc */
14001400 fusb300 = kzalloc(sizeof(struct fusb300), GFP_KERNEL);
1401− if (fusb300 == NULL)
1401+ if (fusb300 == NULL) {
1402+ ret = -ENOMEM;
14021403 goto clean_up;
1404+ }
14031405
14041406 for (i = 0; i < FUSB300_MAX_NUM_EP; i++) {
14051407 _ep[i] = kzalloc(sizeof(struct fusb300_ep), GFP_KERNEL);
1406− if (_ep[i] == NULL)
1408+ if (_ep[i] == NULL) {
1409+ ret = -ENOMEM;
14071410 goto clean_up;
1411+ }
14081412 fusb300->ep[i] = _ep[i];
14091413 }
14101414
drivers/usb/gadget/udc/pch_udc.c+19−3
@@ -343,6 +343,7 @@ struct pch_vbus_gpio_data { · 342 unmodified lines
343343 * @setup_data: Received setup data
344344 * @phys_addr: of device memory
345345 * @base_addr: for mapped device memory
346+ * @bar: Indicates which PCI BAR for USB regs
346347 * @irq: IRQ line for the device
347348 * @cfg_data: current cfg, intf, and alt in use
348349 * @vbus_gpio: GPIO informaton for detecting VBUS
@@ -370,14 +371,17 @@ struct pch_udc_dev { · 21 unmodified lines
370371 struct usb_ctrlrequest setup_data;
371372 unsigned long phys_addr;
372373 void __iomem *base_addr;
374+ unsigned bar;
373375 unsigned irq;
374376 struct pch_udc_cfg_data cfg_data;
375377 struct pch_vbus_gpio_data vbus_gpio;
376378 };
377379 #define to_pch_udc(g) (container_of((g), struct pch_udc_dev, gadget))
378380
381+#define PCH_UDC_PCI_BAR_QUARK_X1000 0
379382 #define PCH_UDC_PCI_BAR 1
380383 #define PCI_DEVICE_ID_INTEL_EG20T_UDC 0x8808
384+#define PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC 0x0939
381385 #define PCI_VENDOR_ID_ROHM 0x10DB
382386 #define PCI_DEVICE_ID_ML7213_IOH_UDC 0x801D
383387 #define PCI_DEVICE_ID_ML7831_IOH_UDC 0x8808
@@ -3076,7 +3080,7 @@ static void pch_udc_remove(struct pci_dev *pdev) · 2692 unmodified lines
30763080 iounmap(dev->base_addr);
30773081 if (dev->mem_region)
30783082 release_mem_region(dev->phys_addr,
3079− pci_resource_len(pdev, PCH_UDC_PCI_BAR));
3083+ pci_resource_len(pdev, dev->bar));
30803084 if (dev->active)
30813085 pci_disable_device(pdev);
30823086 kfree(dev);
@@ -3144,9 +3148,15 @@ static int pch_udc_probe(struct pci_dev *pdev, · 61 unmodified lines
31443148 dev->active = 1;
31453149 pci_set_drvdata(pdev, dev);
31463150
3151+ /* Determine BAR based on PCI ID */
3152+ if (id->device == PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC)
3153+ dev->bar = PCH_UDC_PCI_BAR_QUARK_X1000;
3154+ else
3155+ dev->bar = PCH_UDC_PCI_BAR;
3156+
31473157 /* PCI resource allocation */
3148− resource = pci_resource_start(pdev, 1);
3149− len = pci_resource_len(pdev, 1);
3158+ resource = pci_resource_start(pdev, dev->bar);
3159+ len = pci_resource_len(pdev, dev->bar);
31503160
31513161 if (!request_mem_region(resource, len, KBUILD_MODNAME)) {
31523162 dev_err(&pdev->dev, "%s: pci device used already\n", __func__);
@@ -3211,6 +3221,12 @@ finished: · 58 unmodified lines
32113221 }
32123222
32133223 static const struct pci_device_id pch_udc_pcidev_id[] = {
3224+ {
3225+ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
3226+ PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC),
3227+ .class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
3228+ .class_mask = 0xffffffff,
3229+ },
32143230 {
32153231 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EG20T_UDC),
32163232 .class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
drivers/usb/gadget/udc/r8a66597-udc.c+2−2
@@ -1868,8 +1868,8 @@ static int r8a66597_probe(struct platform_device *pdev) · 1867 unmodified lines
18681868
18691869 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
18701870 reg = devm_ioremap_resource(&pdev->dev, res);
1871− if (!reg)
1872− return -ENODEV;
1871+ if (IS_ERR(reg))
1872+ return PTR_ERR(reg);
18731873
18741874 ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
18751875 irq = ires->start;
drivers/usb/host/ehci-hub.c+1−1
@@ -1230,7 +1230,7 @@ int ehci_hub_control( · 1229 unmodified lines
12301230 if (selector == EHSET_TEST_SINGLE_STEP_SET_FEATURE) {
12311231 spin_unlock_irqrestore(&ehci->lock, flags);
12321232 retval = ehset_single_step_set_feature(hcd,
1233− wIndex);
1233+ wIndex + 1);
12341234 spin_lock_irqsave(&ehci->lock, flags);
12351235 break;
12361236 }
drivers/usb/host/xhci-pci.c+9−0
@@ -101,6 +101,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) · 100 unmodified lines
101101 /* AMD PLL quirk */
102102 if (pdev->vendor == PCI_VENDOR_ID_AMD && usb_amd_find_chipset_info())
103103 xhci->quirks |= XHCI_AMD_PLL_FIX;
104+
105+ if (pdev->vendor == PCI_VENDOR_ID_AMD)
106+ xhci->quirks |= XHCI_TRUST_TX_LENGTH;
107+
104108 if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
105109 xhci->quirks |= XHCI_LPM_SUPPORT;
106110 xhci->quirks |= XHCI_INTEL_HOST;
@@ -151,6 +155,11 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) · 44 unmodified lines
151155 if (pdev->vendor == PCI_VENDOR_ID_VIA)
152156 xhci->quirks |= XHCI_RESET_ON_RESUME;
153157
158+ /* See https://bugzilla.kernel.org/show_bug.cgi?id=79511 */
159+ if (pdev->vendor == PCI_VENDOR_ID_VIA &&
160+ pdev->device == 0x3432)
161+ xhci->quirks |= XHCI_BROKEN_STREAMS;
162+
154163 if (xhci->quirks & XHCI_RESET_ON_RESUME)
155164 xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
156165 "QUIRK: Resetting on resume");
drivers/usb/host/xhci-ring.c+41−63
@@ -364,32 +364,6 @@ static void ring_doorbell_for_active_rings(struct xhci_hcd *xhci, · 363 unmodified lines
364364 }
365365 }
366366
367−/*
368− * Find the segment that trb is in. Start searching in start_seg.
369− * If we must move past a segment that has a link TRB with a toggle cycle state
370− * bit set, then we will toggle the value pointed at by cycle_state.
371− */
372−static struct xhci_segment *find_trb_seg(
373− struct xhci_segment *start_seg,
374− union xhci_trb *trb, int *cycle_state)
375−{
376− struct xhci_segment *cur_seg = start_seg;
377− struct xhci_generic_trb *generic_trb;
378−
379− while (cur_seg->trbs > trb ||
380− &cur_seg->trbs[TRBS_PER_SEGMENT - 1] < trb) {
381− generic_trb = &cur_seg->trbs[TRBS_PER_SEGMENT - 1].generic;
382− if (generic_trb->field[3] & cpu_to_le32(LINK_TOGGLE))
383− *cycle_state ^= 0x1;
384− cur_seg = cur_seg->next;
385− if (cur_seg == start_seg)
386− /* Looped over the entire list. Oops! */
387− return NULL;
388− }
389− return cur_seg;
390−}
391−
392−
393367 static struct xhci_ring *xhci_triad_to_transfer_ring(struct xhci_hcd *xhci,
394368 unsigned int slot_id, unsigned int ep_index,
395369 unsigned int stream_id)
@@ -459,9 +433,12 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, · 63 unmodified lines
459433 struct xhci_virt_device *dev = xhci->devs[slot_id];
460434 struct xhci_virt_ep *ep = &dev->eps[ep_index];
461435 struct xhci_ring *ep_ring;
462− struct xhci_generic_trb *trb;
436+ struct xhci_segment *new_seg;
437+ union xhci_trb *new_deq;
463438 dma_addr_t addr;
464439 u64 hw_dequeue;
440+ bool cycle_found = false;
441+ bool td_last_trb_found = false;
465442
466443 ep_ring = xhci_triad_to_transfer_ring(xhci, slot_id,
467444 ep_index, stream_id);
@@ -486,45 +463,45 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, · 18 unmodified lines
486463 hw_dequeue = le64_to_cpu(ep_ctx->deq);
487464 }
488465
489− /* Find virtual address and segment of hardware dequeue pointer */
490− state->new_deq_seg = ep_ring->deq_seg;
491− state->new_deq_ptr = ep_ring->dequeue;
492− while (xhci_trb_virt_to_dma(state->new_deq_seg, state->new_deq_ptr)
493− != (dma_addr_t)(hw_dequeue & ~0xf)) {
494− next_trb(xhci, ep_ring, &state->new_deq_seg,
495− &state->new_deq_ptr);
496− if (state->new_deq_ptr == ep_ring->dequeue) {
497− WARN_ON(1);
498− return;
499− }
500− }
466+ new_seg = ep_ring->deq_seg;
467+ new_deq = ep_ring->dequeue;
468+ state->new_cycle_state = hw_dequeue & 0x1;
469+
501470 /*
502− * Find cycle state for last_trb, starting at old cycle state of
503− * hw_dequeue. If there is only one segment ring, find_trb_seg() will
504− * return immediately and cannot toggle the cycle state if this search
505− * wraps around, so add one more toggle manually in that case.
471+ * We want to find the pointer, segment and cycle state of the new trb
472+ * (the one after current TD's last_trb). We know the cycle state at
473+ * hw_dequeue, so walk the ring until both hw_dequeue and last_trb are
474+ * found.
506475 */
507− state->new_cycle_state = hw_dequeue & 0x1;
508− if (ep_ring->first_seg == ep_ring->first_seg->next &&
509− cur_td->last_trb < state->new_deq_ptr)
510− state->new_cycle_state ^= 0x1;
476+ do {
477+ if (!cycle_found && xhci_trb_virt_to_dma(new_seg, new_deq)
478+ == (dma_addr_t)(hw_dequeue & ~0xf)) {
479+ cycle_found = true;
480+ if (td_last_trb_found)
481+ break;
482+ }
483+ if (new_deq == cur_td->last_trb)
484+ td_last_trb_found = true;
511485
512− state->new_deq_ptr = cur_td->last_trb;
513− xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,
514− "Finding segment containing last TRB in TD.");
515− state->new_deq_seg = find_trb_seg(state->new_deq_seg,
516− state->new_deq_ptr, &state->new_cycle_state);
517− if (!state->new_deq_seg) {
518− WARN_ON(1);
519− return;
520− }
486+ if (cycle_found &&
487+ TRB_TYPE_LINK_LE32(new_deq->generic.field[3]) &&
488+ new_deq->generic.field[3] & cpu_to_le32(LINK_TOGGLE))
489+ state->new_cycle_state ^= 0x1;
490+
491+ next_trb(xhci, ep_ring, &new_seg, &new_deq);
492+
493+ /* Search wrapped around, bail out */
494+ if (new_deq == ep->ring->dequeue) {
495+ xhci_err(xhci, "Error: Failed finding new dequeue state\n");
496+ state->new_deq_seg = NULL;
497+ state->new_deq_ptr = NULL;
498+ return;
499+ }
500+
501+ } while (!cycle_found || !td_last_trb_found);
521502
522− /* Increment to find next TRB after last_trb. Cycle if appropriate. */
523− trb = &state->new_deq_ptr->generic;
524− if (TRB_TYPE_LINK_LE32(trb->field[3]) &&
525− (trb->field[3] & cpu_to_le32(LINK_TOGGLE)))
526− state->new_cycle_state ^= 0x1;
527− next_trb(xhci, ep_ring, &state->new_deq_seg, &state->new_deq_ptr);
503+ state->new_deq_seg = new_seg;
504+ state->new_deq_ptr = new_deq;
528505
529506 /* Don't update the ring cycle state for the producer (us). */
530507 xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,
@@ -2487,7 +2464,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, · 1956 unmodified lines
24872464 * last TRB of the previous TD. The command completion handle
24882465 * will take care the rest.
24892466 */
2490− if (!event_seg && trb_comp_code == COMP_STOP_INVAL) {
2467+ if (!event_seg && (trb_comp_code == COMP_STOP ||
2468+ trb_comp_code == COMP_STOP_INVAL)) {
24912469 ret = 0;
24922470 goto cleanup;
24932471 }
drivers/usb/host/xhci.c+3−0
@@ -2880,6 +2880,9 @@ void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci, · 2879 unmodified lines
28802880 ep_index, ep->stopped_stream, ep->stopped_td,
28812881 &deq_state);
28822882
2883+ if (!deq_state.new_deq_ptr || !deq_state.new_deq_seg)
2884+ return;
2885+
28832886 /* HW with the reset endpoint quirk will use the saved dequeue state to
28842887 * issue a configure endpoint command later.
28852888 */
drivers/usb/misc/sisusbvga/sisusb.c+1−0
@@ -3250,6 +3250,7 @@ static const struct usb_device_id sisusb_table[] = { · 3249 unmodified lines
32503250 { USB_DEVICE(0x0711, 0x0918) },
32513251 { USB_DEVICE(0x0711, 0x0920) },
32523252 { USB_DEVICE(0x0711, 0x0950) },
3253+ { USB_DEVICE(0x0711, 0x5200) },
32533254 { USB_DEVICE(0x182d, 0x021c) },
32543255 { USB_DEVICE(0x182d, 0x0269) },
32553256 { }
drivers/usb/musb/ux500_dma.c+1−1
@@ -96,7 +96,7 @@ static bool ux500_configure_channel(struct dma_channel *channel, · 95 unmodified lines
9696 struct musb *musb = ux500_channel->controller->private_data;
9797
9898 dev_dbg(musb->controller,
99− "packet_sz=%d, mode=%d, dma_addr=0x%llu, len=%d is_tx=%d\n",
99+ "packet_sz=%d, mode=%d, dma_addr=0x%llx, len=%d is_tx=%d\n",
100100 packet_sz, mode, (unsigned long long) dma_addr,
101101 len, ux500_channel->is_tx);
102102
drivers/usb/phy/phy-gpio-vbus-usb.c+1−3
@@ -260,10 +260,8 @@ static int gpio_vbus_probe(struct platform_device *pdev) · 259 unmodified lines
260260
261261 gpio_vbus->phy.otg = devm_kzalloc(&pdev->dev, sizeof(struct usb_otg),
262262 GFP_KERNEL);
263− if (!gpio_vbus->phy.otg) {
264− kfree(gpio_vbus);
263+ if (!gpio_vbus->phy.otg)
265264 return -ENOMEM;
266− }
267265
268266 platform_set_drvdata(pdev, gpio_vbus);
269267 gpio_vbus->dev = &pdev->dev;
drivers/usb/phy/phy-msm-usb.c+2−2
@@ -1601,8 +1601,8 @@ static int msm_otg_probe(struct platform_device *pdev) · 1600 unmodified lines
16011601 */
16021602 if (motg->phy_number) {
16031603 phy_select = devm_ioremap_nocache(&pdev->dev, USB2_PHY_SEL, 4);
1604− if (IS_ERR(phy_select))
1605− return PTR_ERR(phy_select);
1604+ if (!phy_select)
1605+ return -ENOMEM;
16061606 /* Enable second PHY with the OTG port */
16071607 writel(0x1, phy_select);
16081608 }
drivers/usb/phy/phy-samsung-usb.h+1−1
@@ -216,7 +216,7 @@ · 215 unmodified lines
216216
217217 #define EXYNOS5_DRD_PHYPARAM1 (0x20)
218218
219−#define PHYPARAM1_PCS_TXDEEMPH_MASK (0x1f << 0)
219+#define PHYPARAM1_PCS_TXDEEMPH_MASK (0x3f << 0)
220220 #define PHYPARAM1_PCS_TXDEEMPH (0x1c)
221221
222222 #define EXYNOS5_DRD_PHYTERM (0x24)
drivers/usb/phy/phy.c+3−0
@@ -232,6 +232,9 @@ struct usb_phy *usb_get_phy_dev(struct device *dev, u8 index) · 231 unmodified lines
232232 phy = __usb_find_phy_dev(dev, &phy_bind_list, index);
233233 if (IS_ERR(phy) || !try_module_get(phy->dev->driver->owner)) {
234234 dev_dbg(dev, "unable to find transceiver\n");
235+ if (!IS_ERR(phy))
236+ phy = ERR_PTR(-ENODEV);
237+
235238 goto err0;
236239 }
237240
drivers/usb/serial/ftdi_sio.c+3−0
@@ -146,6 +146,7 @@ static const struct usb_device_id id_table_combined[] = { · 145 unmodified lines
146146 { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) },
147147 { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) },
148148 { USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) },
149+ { USB_DEVICE(FTDI_VID, FTDI_BM_ATOM_NANO_PID) },
149150 { USB_DEVICE(FTDI_VID, FTDI_NXTCAM_PID) },
150151 { USB_DEVICE(FTDI_VID, FTDI_EV3CON_PID) },
151152 { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_0_PID) },
@@ -934,6 +935,8 @@ static const struct usb_device_id id_table_combined[] = { · 782 unmodified lines
934935 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) },
935936 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) },
936937 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) },
938+ /* ekey Devices */
939+ { USB_DEVICE(FTDI_VID, FTDI_EKEY_CONV_USB_PID) },
937940 /* Infineon Devices */
938941 { USB_DEVICE_INTERFACE_NUMBER(INFINEON_VID, INFINEON_TRIBOARD_PID, 1) },
939942 { } /* Terminating entry */
drivers/usb/serial/ftdi_sio_ids.h+7−0
@@ -42,6 +42,8 @@ · 41 unmodified lines
4242 /* www.candapter.com Ewert Energy Systems CANdapter device */
4343 #define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */
4444
45+#define FTDI_BM_ATOM_NANO_PID 0xa559 /* Basic Micro ATOM Nano USB2Serial */
46+
4547 /*
4648 * Texas Instruments XDS100v2 JTAG / BeagleBone A3
4749 * http://processors.wiki.ti.com/index.php/XDS100
@@ -1378,3 +1380,8 @@ · 1330 unmodified lines
13781380 #define BRAINBOXES_US_160_6_PID 0x9006 /* US-160 16xRS232 1Mbaud Port 11 and 12 */
13791381 #define BRAINBOXES_US_160_7_PID 0x9007 /* US-160 16xRS232 1Mbaud Port 13 and 14 */
13801382 #define BRAINBOXES_US_160_8_PID 0x9008 /* US-160 16xRS232 1Mbaud Port 15 and 16 */
1383+
1384+/*
1385+ * ekey biometric systems GmbH (http://ekey.net/)
1386+ */
1387+#define FTDI_EKEY_CONV_USB_PID 0xCB08 /* Converter USB */
drivers/usb/serial/option.c+28−3
@@ -275,8 +275,12 @@ static void option_instat_callback(struct urb *urb); · 274 unmodified lines
275275 #define ZTE_PRODUCT_MF622 0x0001
276276 #define ZTE_PRODUCT_MF628 0x0015
277277 #define ZTE_PRODUCT_MF626 0x0031
278−#define ZTE_PRODUCT_MC2718 0xffe8
279278 #define ZTE_PRODUCT_AC2726 0xfff1
279+#define ZTE_PRODUCT_CDMA_TECH 0xfffe
280+#define ZTE_PRODUCT_AC8710T 0xffff
281+#define ZTE_PRODUCT_MC2718 0xffe8
282+#define ZTE_PRODUCT_AD3812 0xffeb
283+#define ZTE_PRODUCT_MC2716 0xffed
280284
281285 #define BENQ_VENDOR_ID 0x04a5
282286 #define BENQ_PRODUCT_H10 0x4068
@@ -494,6 +498,10 @@ static void option_instat_callback(struct urb *urb); · 211 unmodified lines
494498 #define INOVIA_VENDOR_ID 0x20a6
495499 #define INOVIA_SEW858 0x1105
496500
501+/* VIA Telecom */
502+#define VIATELECOM_VENDOR_ID 0x15eb
503+#define VIATELECOM_PRODUCT_CDS7 0x0001
504+
497505 /* some devices interfaces need special handling due to a number of reasons */
498506 enum option_blacklist_reason {
499507 OPTION_BLACKLIST_NONE = 0,
@@ -527,10 +535,18 @@ static const struct option_blacklist_info zte_k3765_z_blacklist = { · 27 unmodified lines
527535 .reserved = BIT(4),
528536 };
529537
538+static const struct option_blacklist_info zte_ad3812_z_blacklist = {
539+ .sendsetup = BIT(0) | BIT(1) | BIT(2),
540+};
541+
530542 static const struct option_blacklist_info zte_mc2718_z_blacklist = {
531543 .sendsetup = BIT(1) | BIT(2) | BIT(3) | BIT(4),
532544 };
533545
546+static const struct option_blacklist_info zte_mc2716_z_blacklist = {
547+ .sendsetup = BIT(1) | BIT(2) | BIT(3),
548+};
549+
534550 static const struct option_blacklist_info huawei_cdc12_blacklist = {
535551 .reserved = BIT(1) | BIT(2),
536552 };
@@ -1070,6 +1086,7 @@ static const struct usb_device_id option_ids[] = { · 533 unmodified lines
10701086 { USB_DEVICE_INTERFACE_CLASS(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1012, 0xff) },
10711087 { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC650) },
10721088 { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },
1089+ { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */
10731090 { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
10741091 { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
10751092 { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */
@@ -1544,13 +1561,18 @@ static const struct usb_device_id option_ids[] = { · 468 unmodified lines
15441561 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff93, 0xff, 0xff, 0xff) },
15451562 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff94, 0xff, 0xff, 0xff) },
15461563
1547− /* NOTE: most ZTE CDMA devices should be driven by zte_ev, not option */
1564+ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) },
1565+ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
1566+ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) },
15481567 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2718, 0xff, 0xff, 0xff),
15491568 .driver_info = (kernel_ulong_t)&zte_mc2718_z_blacklist },
1569+ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AD3812, 0xff, 0xff, 0xff),
1570+ .driver_info = (kernel_ulong_t)&zte_ad3812_z_blacklist },
1571+ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2716, 0xff, 0xff, 0xff),
1572+ .driver_info = (kernel_ulong_t)&zte_mc2716_z_blacklist },
15501573 { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x01) },
15511574 { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x05) },
15521575 { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x86, 0x10) },
1553− { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
15541576
15551577 { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
15561578 { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
@@ -1724,6 +1746,7 @@ static const struct usb_device_id option_ids[] = { · 167 unmodified lines
17241746 { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
17251747 { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
17261748 { USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) },
1749+ { USB_DEVICE(VIATELECOM_VENDOR_ID, VIATELECOM_PRODUCT_CDS7) },
17271750 { } /* Terminating entry */
17281751 };
17291752 MODULE_DEVICE_TABLE(usb, option_ids);
@@ -1916,6 +1939,8 @@ static void option_instat_callback(struct urb *urb) · 186 unmodified lines
19161939 dev_dbg(dev, "%s: type %x req %x\n", __func__,
19171940 req_pkt->bRequestType, req_pkt->bRequest);
19181941 }
1942+ } else if (status == -ENOENT || status == -ESHUTDOWN) {
1943+ dev_dbg(dev, "%s: urb stopped: %d\n", __func__, status);
19191944 } else
19201945 dev_err(dev, "%s: error %d\n", __func__, status);
19211946
drivers/usb/serial/pl2303.c+1−0
@@ -45,6 +45,7 @@ static const struct usb_device_id id_table[] = { · 44 unmodified lines
4545 { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GPRS) },
4646 { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_HCR331) },
4747 { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MOTOROLA) },
48+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ZTEK) },
4849 { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },
4950 { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) },
5051 { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) },
drivers/usb/serial/pl2303.h+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #define PL2303_PRODUCT_ID_GPRS 0x0609
2323 #define PL2303_PRODUCT_ID_HCR331 0x331a
2424 #define PL2303_PRODUCT_ID_MOTOROLA 0x0307
25+#define PL2303_PRODUCT_ID_ZTEK 0xe1f1
2526
2627 #define ATEN_VENDOR_ID 0x0557
2728 #define ATEN_VENDOR_ID2 0x0547
drivers/usb/serial/usb-serial.c+27−10
@@ -764,29 +764,39 @@ static int usb_serial_probe(struct usb_interface *interface, · 763 unmodified lines
764764 if (usb_endpoint_is_bulk_in(endpoint)) {
765765 /* we found a bulk in endpoint */
766766 dev_dbg(ddev, "found bulk in on endpoint %d\n", i);
767− bulk_in_endpoint[num_bulk_in] = endpoint;
768− ++num_bulk_in;
767+ if (num_bulk_in < MAX_NUM_PORTS) {
768+ bulk_in_endpoint[num_bulk_in] = endpoint;
769+ ++num_bulk_in;
770+ }
769771 }
770772
771773 if (usb_endpoint_is_bulk_out(endpoint)) {
772774 /* we found a bulk out endpoint */
773775 dev_dbg(ddev, "found bulk out on endpoint %d\n", i);
774− bulk_out_endpoint[num_bulk_out] = endpoint;
775− ++num_bulk_out;
776+ if (num_bulk_out < MAX_NUM_PORTS) {
777+ bulk_out_endpoint[num_bulk_out] = endpoint;
778+ ++num_bulk_out;
779+ }
776780 }
777781
778782 if (usb_endpoint_is_int_in(endpoint)) {
779783 /* we found a interrupt in endpoint */
780784 dev_dbg(ddev, "found interrupt in on endpoint %d\n", i);
781− interrupt_in_endpoint[num_interrupt_in] = endpoint;
782− ++num_interrupt_in;
785+ if (num_interrupt_in < MAX_NUM_PORTS) {
786+ interrupt_in_endpoint[num_interrupt_in] =
787+ endpoint;
788+ ++num_interrupt_in;
789+ }
783790 }
784791
785792 if (usb_endpoint_is_int_out(endpoint)) {
786793 /* we found an interrupt out endpoint */
787794 dev_dbg(ddev, "found interrupt out on endpoint %d\n", i);
788− interrupt_out_endpoint[num_interrupt_out] = endpoint;
789− ++num_interrupt_out;
795+ if (num_interrupt_out < MAX_NUM_PORTS) {
796+ interrupt_out_endpoint[num_interrupt_out] =
797+ endpoint;
798+ ++num_interrupt_out;
799+ }
790800 }
791801 }
792802
@@ -809,8 +819,10 @@ static int usb_serial_probe(struct usb_interface *interface, · 16 unmodified lines
809819 if (usb_endpoint_is_int_in(endpoint)) {
810820 /* we found a interrupt in endpoint */
811821 dev_dbg(ddev, "found interrupt in for Prolific device on separate interface\n");
812− interrupt_in_endpoint[num_interrupt_in] = endpoint;
813− ++num_interrupt_in;
822+ if (num_interrupt_in < MAX_NUM_PORTS) {
823+ interrupt_in_endpoint[num_interrupt_in] = endpoint;
824+ ++num_interrupt_in;
825+ }
814826 }
815827 }
816828 }
@@ -850,6 +862,11 @@ static int usb_serial_probe(struct usb_interface *interface, · 33 unmodified lines
850862 num_ports = type->num_ports;
851863 }
852864
865+ if (num_ports > MAX_NUM_PORTS) {
866+ dev_warn(ddev, "too many ports requested: %d\n", num_ports);
867+ num_ports = MAX_NUM_PORTS;
868+ }
869+
853870 serial->num_ports = num_ports;
854871 serial->num_bulk_in = num_bulk_in;
855872 serial->num_bulk_out = num_bulk_out;
drivers/usb/serial/whiteheat.c+6−1
@@ -514,6 +514,10 @@ static void command_port_read_callback(struct urb *urb) · 513 unmodified lines
514514 dev_dbg(&urb->dev->dev, "%s - command_info is NULL, exiting.\n", __func__);
515515 return;
516516 }
517+ if (!urb->actual_length) {
518+ dev_dbg(&urb->dev->dev, "%s - empty response, exiting.\n", __func__);
519+ return;
520+ }
517521 if (status) {
518522 dev_dbg(&urb->dev->dev, "%s - nonzero urb status: %d\n", __func__, status);
519523 if (status != -ENOENT)
@@ -534,7 +538,8 @@ static void command_port_read_callback(struct urb *urb) · 14 unmodified lines
534538 /* These are unsolicited reports from the firmware, hence no
535539 waiting command to wakeup */
536540 dev_dbg(&urb->dev->dev, "%s - event received\n", __func__);
537− } else if (data[0] == WHITEHEAT_GET_DTR_RTS) {
541+ } else if ((data[0] == WHITEHEAT_GET_DTR_RTS) &&
542+ (urb->actual_length - 1 <= sizeof(command_info->result_buffer))) {
538543 memcpy(command_info->result_buffer, &data[1],
539544 urb->actual_length - 1);
540545 command_info->command_finished = WHITEHEAT_CMD_COMPLETE;
drivers/usb/serial/zte_ev.c+0−20
@@ -272,28 +272,8 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port) · 271 unmodified lines
272272 }
273273
274274 static const struct usb_device_id id_table[] = {
275− /* AC8710, AC8710T */
276− { USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xffff, 0xff, 0xff, 0xff) },
277− /* AC8700 */
278− { USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xfffe, 0xff, 0xff, 0xff) },
279275 /* MG880 */
280276 { USB_DEVICE(0x19d2, 0xfffd) },
281− { USB_DEVICE(0x19d2, 0xfffc) },
282− { USB_DEVICE(0x19d2, 0xfffb) },
283− /* AC8710_V3 */
284− { USB_DEVICE(0x19d2, 0xfff6) },
285− { USB_DEVICE(0x19d2, 0xfff7) },
286− { USB_DEVICE(0x19d2, 0xfff8) },
287− { USB_DEVICE(0x19d2, 0xfff9) },
288− { USB_DEVICE(0x19d2, 0xffee) },
289− /* AC2716, MC2716 */
290− { USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xffed, 0xff, 0xff, 0xff) },
291− /* AD3812 */
292− { USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xffeb, 0xff, 0xff, 0xff) },
293− { USB_DEVICE(0x19d2, 0xffec) },
294− { USB_DEVICE(0x05C6, 0x3197) },
295− { USB_DEVICE(0x05C6, 0x6000) },
296− { USB_DEVICE(0x05C6, 0x9008) },
297277 { },
298278 };
299279 MODULE_DEVICE_TABLE(usb, id_table);
drivers/usb/storage/unusual_devs.h+6−0
@@ -922,6 +922,12 @@ UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x0001, · 921 unmodified lines
922922 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
923923 US_FL_FIX_CAPACITY ),
924924
925+UNUSUAL_DEV( 0x06ca, 0x2003, 0x0100, 0x0100,
926+ "Newer Technology",
927+ "uSCSI",
928+ USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,
929+ US_FL_SCM_MULT_TARG ),
930+
925931 /* Reported by Adrian Pilchowiec <adi1981@epf.pl> */
926932 UNUSUAL_DEV( 0x071b, 0x3203, 0x0000, 0x0000,
927933 "RockChip",
drivers/usb/usbip/Kconfigrenamed from drivers/staging/usbip/Kconfig+0−0

File renamed without changes.

drivers/usb/usbip/Makefilerenamed from drivers/staging/usbip/Makefile+0−0

File renamed without changes.

drivers/usb/usbip/READMErenamed from drivers/staging/usbip/README+0−0

File renamed without changes.

drivers/usb/usbip/stub.hrenamed from drivers/staging/usbip/stub.h+0−0

File renamed without changes.

drivers/usb/usbip/stub_dev.crenamed from drivers/staging/usbip/stub_dev.c+0−27
@@ -25,33 +25,6 @@ · 24 unmodified lines
2525 #include "usbip_common.h"
2626 #include "stub.h"
2727
28−/*
29− * Define device IDs here if you want to explicitly limit exportable devices.
30− * In most cases, wildcard matching will be okay because driver binding can be
31− * changed dynamically by a userland program.
32− */
33−static struct usb_device_id stub_table[] = {
34−#if 0
35− /* just an example */
36− { USB_DEVICE(0x05ac, 0x0301) }, /* Mac 1 button mouse */
37− { USB_DEVICE(0x0430, 0x0009) }, /* Plat Home Keyboard */
38− { USB_DEVICE(0x059b, 0x0001) }, /* Iomega USB Zip 100 */
39− { USB_DEVICE(0x04b3, 0x4427) }, /* IBM USB CD-ROM */
40− { USB_DEVICE(0x05a9, 0xa511) }, /* LifeView USB cam */
41− { USB_DEVICE(0x55aa, 0x0201) }, /* Imation card reader */
42− { USB_DEVICE(0x046d, 0x0870) }, /* Qcam Express(QV-30) */
43− { USB_DEVICE(0x04bb, 0x0101) }, /* IO-DATA HD 120GB */
44− { USB_DEVICE(0x04bb, 0x0904) }, /* IO-DATA USB-ET/TX */
45− { USB_DEVICE(0x04bb, 0x0201) }, /* IO-DATA USB-ET/TX */
46− { USB_DEVICE(0x08bb, 0x2702) }, /* ONKYO USB Speaker */
47− { USB_DEVICE(0x046d, 0x08b2) }, /* Logicool Qcam 4000 Pro */
48−#endif
49− /* magic for wild card */
50− { .driver_info = 1 },
51− { 0, } /* Terminating entry */
52−};
53−MODULE_DEVICE_TABLE(usb, stub_table);
54−
5528 /*
5629 * usbip_status shows the status of usbip-host as long as this driver is bound
5730 * to the target device.
drivers/usb/usbip/stub_main.crenamed from drivers/staging/usbip/stub_main.c+0−0

File renamed without changes.

drivers/usb/usbip/stub_rx.crenamed from drivers/staging/usbip/stub_rx.c+0−0

File renamed without changes.

drivers/usb/usbip/stub_tx.crenamed from drivers/staging/usbip/stub_tx.c+0−0

File renamed without changes.

drivers/usb/usbip/usbip_common.crenamed from drivers/staging/usbip/usbip_common.c+0−0

File renamed without changes.

drivers/usb/usbip/usbip_common.hrenamed from drivers/staging/usbip/usbip_common.h+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 #include <linux/types.h>
3030 #include <linux/usb.h>
3131 #include <linux/wait.h>
32−#include "uapi/usbip.h"
32+#include <uapi/linux/usbip.h>
3333
3434 #define USBIP_VERSION "1.0.0"
3535
drivers/usb/usbip/usbip_event.crenamed from drivers/staging/usbip/usbip_event.c+0−0

File renamed without changes.

drivers/usb/usbip/usbip_protocol.txtrenamed from drivers/staging/usbip/usbip_protocol.txt+0−0

File renamed without changes.

drivers/usb/usbip/vhci.hrenamed from drivers/staging/usbip/vhci.h+0−0

File renamed without changes.

drivers/usb/usbip/vhci_hcd.crenamed from drivers/staging/usbip/vhci_hcd.c+0−0

File renamed without changes.

drivers/usb/usbip/vhci_rx.crenamed from drivers/staging/usbip/vhci_rx.c+0−0

File renamed without changes.

drivers/usb/usbip/vhci_sysfs.crenamed from drivers/staging/usbip/vhci_sysfs.c+0−0

File renamed without changes.

drivers/usb/usbip/vhci_tx.crenamed from drivers/staging/usbip/vhci_tx.c+0−0

File renamed without changes.

drivers/usb/wusbcore/wa-xfer.c+1−2
@@ -2602,6 +2602,7 @@ static void wa_buf_in_cb(struct urb *urb) · 2601 unmodified lines
26022602 dev = &wa->usb_iface->dev;
26032603 --(wa->active_buf_in_urbs);
26042604 active_buf_in_urbs = wa->active_buf_in_urbs;
2605+ rpipe = xfer->ep->hcpriv;
26052606
26062607 if (usb_pipeisoc(xfer->urb->pipe)) {
26072608 struct usb_iso_packet_descriptor *iso_frame_desc =
@@ -2659,7 +2660,6 @@ static void wa_buf_in_cb(struct urb *urb) · 51 unmodified lines
26592660 resubmit_dti = (isoc_data_frame_count ==
26602661 urb_frame_count);
26612662 } else if (active_buf_in_urbs == 0) {
2662− rpipe = xfer->ep->hcpriv;
26632663 dev_dbg(dev,
26642664 "xfer %p 0x%08X#%u: data in done (%zu bytes)\n",
26652665 xfer, wa_xfer_id(xfer), seg->index,
@@ -2685,7 +2685,6 @@ static void wa_buf_in_cb(struct urb *urb) · 19 unmodified lines
26852685 */
26862686 resubmit_dti = wa->dti_state != WA_DTI_TRANSFER_RESULT_PENDING;
26872687 spin_lock_irqsave(&xfer->lock, flags);
2688− rpipe = xfer->ep->hcpriv;
26892688 if (printk_ratelimit())
26902689 dev_err(dev, "xfer %p 0x%08X#%u: data in error %d\n",
26912690 xfer, wa_xfer_id(xfer), seg->index,
drivers/video/backlight/pwm_bl.c+1−0
@@ -173,6 +173,7 @@ static int pwm_backlight_parse_dt(struct device *dev, · 172 unmodified lines
173173 data->max_brightness--;
174174 }
175175
176+ data->enable_gpio = -EINVAL;
176177 return 0;
177178 }
178179
drivers/video/fbdev/amba-clcd.c+18−5
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include <linux/list.h>
2525 #include <linux/amba/bus.h>
2626 #include <linux/amba/clcd.h>
27+#include <linux/bitops.h>
2728 #include <linux/clk.h>
2829 #include <linux/hardirq.h>
2930 #include <linux/dma-mapping.h>
@@ -650,6 +651,7 @@ static int clcdfb_of_init_display(struct clcd_fb *fb) · 620 unmodified lines
650651 {
651652 struct device_node *endpoint;
652653 int err;
654+ unsigned int bpp;
653655 u32 max_bandwidth;
654656 u32 tft_r0b0g0[3];
655657
@@ -667,11 +669,22 @@ static int clcdfb_of_init_display(struct clcd_fb *fb) · 11 unmodified lines
667669
668670 err = of_property_read_u32(fb->dev->dev.of_node, "max-memory-bandwidth",
669671 &max_bandwidth);
670− if (!err)
671− fb->panel->bpp = 8 * max_bandwidth / (fb->panel->mode.xres *
672− fb->panel->mode.yres * fb->panel->mode.refresh);
673− else
674− fb->panel->bpp = 32;
672+ if (!err) {
673+ /*
674+ * max_bandwidth is in bytes per second and pixclock in
675+ * pico-seconds, so the maximum allowed bits per pixel is
676+ * 8 * max_bandwidth / (PICOS2KHZ(pixclock) * 1000)
677+ * Rearrange this calculation to avoid overflow and then ensure
678+ * result is a valid format.
679+ */
680+ bpp = max_bandwidth / (1000 / 8)
681+ / PICOS2KHZ(fb->panel->mode.pixclock);
682+ bpp = rounddown_pow_of_two(bpp);
683+ if (bpp > 32)
684+ bpp = 32;
685+ } else
686+ bpp = 32;
687+ fb->panel->bpp = bpp;
675688
676689 #ifdef CONFIG_CPU_BIG_ENDIAN
677690 fb->panel->cntl |= CNTL_BEBO;
drivers/video/fbdev/atmel_lcdfb.c+2−0
@@ -1102,12 +1102,14 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) · 1101 unmodified lines
11021102 timings = of_get_display_timings(display_np);
11031103 if (!timings) {
11041104 dev_err(dev, "failed to get display timings\n");
1105+ ret = -EINVAL;
11051106 goto put_display_node;
11061107 }
11071108
11081109 timings_np = of_find_node_by_name(display_np, "display-timings");
11091110 if (!timings_np) {
11101111 dev_err(dev, "failed to find display-timings node\n");
1112+ ret = -ENODEV;
11111113 goto put_display_node;
11121114 }
11131115
drivers/video/fbdev/chipsfb.c+1−1
@@ -273,7 +273,7 @@ static struct chips_init_reg chips_init_xr[] = { · 272 unmodified lines
273273 { 0xa8, 0x00 }
274274 };
275275
276−static void __init chips_hw_init(void)
276+static void chips_hw_init(void)
277277 {
278278 int i;
279279
drivers/video/fbdev/da8xx-fb.c+1−1
@@ -419,7 +419,7 @@ static void lcd_cfg_horizontal_sync(int back_porch, int pulse_width, · 418 unmodified lines
419419 {
420420 u32 reg;
421421
422− reg = lcdc_read(LCD_RASTER_TIMING_0_REG) & 0xf;
422+ reg = lcdc_read(LCD_RASTER_TIMING_0_REG) & 0x3ff;
423423 reg |= (((back_porch-1) & 0xff) << 24)
424424 | (((front_porch-1) & 0xff) << 16)
425425 | (((pulse_width-1) & 0x3f) << 10);
drivers/video/of_display_timing.c+1−0
@@ -236,6 +236,7 @@ timingfail: · 235 unmodified lines
236236 if (native_mode)
237237 of_node_put(native_mode);
238238 display_timings_release(disp);
239+ disp = NULL;
239240 entryfail:
240241 kfree(disp);
241242 dispfail:
fs/aio.c+85−5
@@ -141,6 +141,7 @@ struct kioctx { · 140 unmodified lines
141141
142142 struct {
143143 unsigned tail;
144+ unsigned completed_events;
144145 spinlock_t completion_lock;
145146 } ____cacheline_aligned_in_smp;
146147
@@ -792,6 +793,8 @@ void exit_aio(struct mm_struct *mm) · 645 unmodified lines
792793
793794 for (i = 0; i < table->nr; ++i) {
794795 struct kioctx *ctx = table->table[i];
796+ struct completion requests_done =
797+ COMPLETION_INITIALIZER_ONSTACK(requests_done);
795798
796799 if (!ctx)
797800 continue;
@@ -803,7 +806,10 @@ void exit_aio(struct mm_struct *mm) · 5 unmodified lines
803806 * that it needs to unmap the area, just set it to 0.
804807 */
805808 ctx->mmap_size = 0;
806− kill_ioctx(mm, ctx, NULL);
809+ kill_ioctx(mm, ctx, &requests_done);
810+
811+ /* Wait until all IO for the context are done. */
812+ wait_for_completion(&requests_done);
807813 }
808814
809815 RCU_INIT_POINTER(mm->ioctx_table, NULL);
@@ -857,6 +863,68 @@ out: · 47 unmodified lines
857863 return ret;
858864 }
859865
866+/* refill_reqs_available
867+ * Updates the reqs_available reference counts used for tracking the
868+ * number of free slots in the completion ring. This can be called
869+ * from aio_complete() (to optimistically update reqs_available) or
870+ * from aio_get_req() (the we're out of events case). It must be
871+ * called holding ctx->completion_lock.
872+ */
873+static void refill_reqs_available(struct kioctx *ctx, unsigned head,
874+ unsigned tail)
875+{
876+ unsigned events_in_ring, completed;
877+
878+ /* Clamp head since userland can write to it. */
879+ head %= ctx->nr_events;
880+ if (head <= tail)
881+ events_in_ring = tail - head;
882+ else
883+ events_in_ring = ctx->nr_events - (head - tail);
884+
885+ completed = ctx->completed_events;
886+ if (events_in_ring < completed)
887+ completed -= events_in_ring;
888+ else
889+ completed = 0;
890+
891+ if (!completed)
892+ return;
893+
894+ ctx->completed_events -= completed;
895+ put_reqs_available(ctx, completed);
896+}
897+
898+/* user_refill_reqs_available
899+ * Called to refill reqs_available when aio_get_req() encounters an
900+ * out of space in the completion ring.
901+ */
902+static void user_refill_reqs_available(struct kioctx *ctx)
903+{
904+ spin_lock_irq(&ctx->completion_lock);
905+ if (ctx->completed_events) {
906+ struct aio_ring *ring;
907+ unsigned head;
908+
909+ /* Access of ring->head may race with aio_read_events_ring()
910+ * here, but that's okay since whether we read the old version
911+ * or the new version, and either will be valid. The important
912+ * part is that head cannot pass tail since we prevent
913+ * aio_complete() from updating tail by holding
914+ * ctx->completion_lock. Even if head is invalid, the check
915+ * against ctx->completed_events below will make sure we do the
916+ * safe/right thing.
917+ */
918+ ring = kmap_atomic(ctx->ring_pages[0]);
919+ head = ring->head;
920+ kunmap_atomic(ring);
921+
922+ refill_reqs_available(ctx, head, ctx->tail);
923+ }
924+
925+ spin_unlock_irq(&ctx->completion_lock);
926+}
927+
860928 /* aio_get_req
861929 * Allocate a slot for an aio request.
862930 * Returns NULL if no requests are free.
@@ -865,8 +933,11 @@ static inline struct kiocb *aio_get_req(struct kioctx *ctx) · 2 unmodified lines
865933 {
866934 struct kiocb *req;
867935
868− if (!get_reqs_available(ctx))
869− return NULL;
936+ if (!get_reqs_available(ctx)) {
937+ user_refill_reqs_available(ctx);
938+ if (!get_reqs_available(ctx))
939+ return NULL;
940+ }
870941
871942 req = kmem_cache_alloc(kiocb_cachep, GFP_KERNEL|__GFP_ZERO);
872943 if (unlikely(!req))
@@ -925,8 +996,8 @@ void aio_complete(struct kiocb *iocb, long res, long res2) · 52 unmodified lines
925996 struct kioctx *ctx = iocb->ki_ctx;
926997 struct aio_ring *ring;
927998 struct io_event *ev_page, *event;
999+ unsigned tail, pos, head;
9281000 unsigned long flags;
929− unsigned tail, pos;
9301001
9311002 /*
9321003 * Special case handling for sync iocbs:
@@ -987,10 +1058,14 @@ void aio_complete(struct kiocb *iocb, long res, long res2) · 54 unmodified lines
9871058 ctx->tail = tail;
9881059
9891060 ring = kmap_atomic(ctx->ring_pages[0]);
1061+ head = ring->head;
9901062 ring->tail = tail;
9911063 kunmap_atomic(ring);
9921064 flush_dcache_page(ctx->ring_pages[0]);
9931065
1066+ ctx->completed_events++;
1067+ if (ctx->completed_events > 1)
1068+ refill_reqs_available(ctx, head, tail);
9941069 spin_unlock_irqrestore(&ctx->completion_lock, flags);
9951070
9961071 pr_debug("added to ring %p at [%u]\n", iocb, tail);
@@ -1005,7 +1080,6 @@ void aio_complete(struct kiocb *iocb, long res, long res2) · 8 unmodified lines
10051080
10061081 /* everything turned out well, dispose of the aiocb. */
10071082 kiocb_free(iocb);
1008− put_reqs_available(ctx, 1);
10091083
10101084 /*
10111085 * We have to order our ring_info tail store above and test
@@ -1042,6 +1116,12 @@ static long aio_read_events_ring(struct kioctx *ctx, · 30 unmodified lines
10421116 tail = ring->tail;
10431117 kunmap_atomic(ring);
10441118
1119+ /*
1120+ * Ensure that once we've read the current tail pointer, that
1121+ * we also see the events that were stored up to the tail.
1122+ */
1123+ smp_rmb();
1124+
10451125 pr_debug("h%u t%u m%u\n", head, tail, ctx->nr_events);
10461126
10471127 if (head == tail)
fs/btrfs/async-thread.c+36−8
@@ -22,7 +22,6 @@ · 21 unmodified lines
2222 #include <linux/list.h>
2323 #include <linux/spinlock.h>
2424 #include <linux/freezer.h>
25−#include <linux/workqueue.h>
2625 #include "async-thread.h"
2726 #include "ctree.h"
2827
@@ -55,8 +54,39 @@ struct btrfs_workqueue { · 26 unmodified lines
5554 struct __btrfs_workqueue *high;
5655 };
5756
58−static inline struct __btrfs_workqueue
59−*__btrfs_alloc_workqueue(const char *name, int flags, int max_active,
57+static void normal_work_helper(struct btrfs_work *work);
58+
59+#define BTRFS_WORK_HELPER(name) \
60+void btrfs_##name(struct work_struct *arg) \
61+{ \
62+ struct btrfs_work *work = container_of(arg, struct btrfs_work, \
63+ normal_work); \
64+ normal_work_helper(work); \
65+}
66+
67+BTRFS_WORK_HELPER(worker_helper);
68+BTRFS_WORK_HELPER(delalloc_helper);
69+BTRFS_WORK_HELPER(flush_delalloc_helper);
70+BTRFS_WORK_HELPER(cache_helper);
71+BTRFS_WORK_HELPER(submit_helper);
72+BTRFS_WORK_HELPER(fixup_helper);
73+BTRFS_WORK_HELPER(endio_helper);
74+BTRFS_WORK_HELPER(endio_meta_helper);
75+BTRFS_WORK_HELPER(endio_meta_write_helper);
76+BTRFS_WORK_HELPER(endio_raid56_helper);
77+BTRFS_WORK_HELPER(rmw_helper);
78+BTRFS_WORK_HELPER(endio_write_helper);
79+BTRFS_WORK_HELPER(freespace_write_helper);
80+BTRFS_WORK_HELPER(delayed_meta_helper);
81+BTRFS_WORK_HELPER(readahead_helper);
82+BTRFS_WORK_HELPER(qgroup_rescan_helper);
83+BTRFS_WORK_HELPER(extent_refs_helper);
84+BTRFS_WORK_HELPER(scrub_helper);
85+BTRFS_WORK_HELPER(scrubwrc_helper);
86+BTRFS_WORK_HELPER(scrubnc_helper);
87+
88+static struct __btrfs_workqueue *
89+__btrfs_alloc_workqueue(const char *name, int flags, int max_active,
6090 int thresh)
6191 {
6292 struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS);
@@ -232,13 +262,11 @@ static void run_ordered_work(struct __btrfs_workqueue *wq) · 169 unmodified lines
232262 spin_unlock_irqrestore(lock, flags);
233263 }
234264
235−static void normal_work_helper(struct work_struct *arg)
265+static void normal_work_helper(struct btrfs_work *work)
236266 {
237− struct btrfs_work *work;
238267 struct __btrfs_workqueue *wq;
239268 int need_order = 0;
240269
241− work = container_of(arg, struct btrfs_work, normal_work);
242270 /*
243271 * We should not touch things inside work in the following cases:
244272 * 1) after work->func() if it has no ordered_free
@@ -262,7 +290,7 @@ static void normal_work_helper(struct work_struct *arg) · 17 unmodified lines
262290 trace_btrfs_all_work_done(work);
263291 }
264292
265−void btrfs_init_work(struct btrfs_work *work,
293+void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t uniq_func,
266294 btrfs_func_t func,
267295 btrfs_func_t ordered_func,
268296 btrfs_func_t ordered_free)
@@ -270,7 +298,7 @@ void btrfs_init_work(struct btrfs_work *work, · 1 unmodified line
270298 work->func = func;
271299 work->ordered_func = ordered_func;
272300 work->ordered_free = ordered_free;
273− INIT_WORK(&work->normal_work, normal_work_helper);
301+ INIT_WORK(&work->normal_work, uniq_func);
274302 INIT_LIST_HEAD(&work->ordered_list);
275303 work->flags = 0;
276304 }
fs/btrfs/async-thread.h+27−1
@@ -19,12 +19,14 @@ · 18 unmodified lines
1919
2020 #ifndef __BTRFS_ASYNC_THREAD_
2121 #define __BTRFS_ASYNC_THREAD_
22+#include <linux/workqueue.h>
2223
2324 struct btrfs_workqueue;
2425 /* Internal use only */
2526 struct __btrfs_workqueue;
2627 struct btrfs_work;
2728 typedef void (*btrfs_func_t)(struct btrfs_work *arg);
29+typedef void (*btrfs_work_func_t)(struct work_struct *arg);
2830
2931 struct btrfs_work {
3032 btrfs_func_t func;
@@ -38,11 +40,35 @@ struct btrfs_work { · 7 unmodified lines
3840 unsigned long flags;
3941 };
4042
43+#define BTRFS_WORK_HELPER_PROTO(name) \
44+void btrfs_##name(struct work_struct *arg)
45+
46+BTRFS_WORK_HELPER_PROTO(worker_helper);
47+BTRFS_WORK_HELPER_PROTO(delalloc_helper);
48+BTRFS_WORK_HELPER_PROTO(flush_delalloc_helper);
49+BTRFS_WORK_HELPER_PROTO(cache_helper);
50+BTRFS_WORK_HELPER_PROTO(submit_helper);
51+BTRFS_WORK_HELPER_PROTO(fixup_helper);
52+BTRFS_WORK_HELPER_PROTO(endio_helper);
53+BTRFS_WORK_HELPER_PROTO(endio_meta_helper);
54+BTRFS_WORK_HELPER_PROTO(endio_meta_write_helper);
55+BTRFS_WORK_HELPER_PROTO(endio_raid56_helper);
56+BTRFS_WORK_HELPER_PROTO(rmw_helper);
57+BTRFS_WORK_HELPER_PROTO(endio_write_helper);
58+BTRFS_WORK_HELPER_PROTO(freespace_write_helper);
59+BTRFS_WORK_HELPER_PROTO(delayed_meta_helper);
60+BTRFS_WORK_HELPER_PROTO(readahead_helper);
61+BTRFS_WORK_HELPER_PROTO(qgroup_rescan_helper);
62+BTRFS_WORK_HELPER_PROTO(extent_refs_helper);
63+BTRFS_WORK_HELPER_PROTO(scrub_helper);
64+BTRFS_WORK_HELPER_PROTO(scrubwrc_helper);
65+BTRFS_WORK_HELPER_PROTO(scrubnc_helper);
66+
4167 struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name,
4268 int flags,
4369 int max_active,
4470 int thresh);
45−void btrfs_init_work(struct btrfs_work *work,
71+void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t helper,
4672 btrfs_func_t func,
4773 btrfs_func_t ordered_func,
4874 btrfs_func_t ordered_free);
fs/btrfs/delayed-inode.c+2−2
@@ -1395,8 +1395,8 @@ static int btrfs_wq_run_delayed_node(struct btrfs_delayed_root *delayed_root, · 1394 unmodified lines
13951395 return -ENOMEM;
13961396
13971397 async_work->delayed_root = delayed_root;
1398− btrfs_init_work(&async_work->work, btrfs_async_run_delayed_root,
1399− NULL, NULL);
1398+ btrfs_init_work(&async_work->work, btrfs_delayed_meta_helper,
1399+ btrfs_async_run_delayed_root, NULL, NULL);
14001400 async_work->nr = nr;
14011401
14021402 btrfs_queue_work(root->fs_info->delayed_workers, &async_work->work);
fs/btrfs/disk-io.c+31−25
@@ -39,7 +39,6 @@ · 38 unmodified lines
3939 #include "btrfs_inode.h"
4040 #include "volumes.h"
4141 #include "print-tree.h"
42−#include "async-thread.h"
4342 #include "locking.h"
4443 #include "tree-log.h"
4544 #include "free-space-cache.h"
@@ -693,35 +692,41 @@ static void end_workqueue_bio(struct bio *bio, int err) · 647 unmodified lines
693692 {
694693 struct end_io_wq *end_io_wq = bio->bi_private;
695694 struct btrfs_fs_info *fs_info;
695+ struct btrfs_workqueue *wq;
696+ btrfs_work_func_t func;
696697
697698 fs_info = end_io_wq->info;
698699 end_io_wq->error = err;
699− btrfs_init_work(&end_io_wq->work, end_workqueue_fn, NULL, NULL);
700700
701701 if (bio->bi_rw & REQ_WRITE) {
702− if (end_io_wq->metadata == BTRFS_WQ_ENDIO_METADATA)
703− btrfs_queue_work(fs_info->endio_meta_write_workers,
704− &end_io_wq->work);
705− else if (end_io_wq->metadata == BTRFS_WQ_ENDIO_FREE_SPACE)
706− btrfs_queue_work(fs_info->endio_freespace_worker,
707− &end_io_wq->work);
708− else if (end_io_wq->metadata == BTRFS_WQ_ENDIO_RAID56)
709− btrfs_queue_work(fs_info->endio_raid56_workers,
710− &end_io_wq->work);
711− else
712− btrfs_queue_work(fs_info->endio_write_workers,
713− &end_io_wq->work);
702+ if (end_io_wq->metadata == BTRFS_WQ_ENDIO_METADATA) {
703+ wq = fs_info->endio_meta_write_workers;
704+ func = btrfs_endio_meta_write_helper;
705+ } else if (end_io_wq->metadata == BTRFS_WQ_ENDIO_FREE_SPACE) {
706+ wq = fs_info->endio_freespace_worker;
707+ func = btrfs_freespace_write_helper;
708+ } else if (end_io_wq->metadata == BTRFS_WQ_ENDIO_RAID56) {
709+ wq = fs_info->endio_raid56_workers;
710+ func = btrfs_endio_raid56_helper;
711+ } else {
712+ wq = fs_info->endio_write_workers;
713+ func = btrfs_endio_write_helper;
714+ }
714715 } else {
715− if (end_io_wq->metadata == BTRFS_WQ_ENDIO_RAID56)
716− btrfs_queue_work(fs_info->endio_raid56_workers,
717− &end_io_wq->work);
718− else if (end_io_wq->metadata)
719− btrfs_queue_work(fs_info->endio_meta_workers,
720− &end_io_wq->work);
721− else
722− btrfs_queue_work(fs_info->endio_workers,
723− &end_io_wq->work);
716+ if (end_io_wq->metadata == BTRFS_WQ_ENDIO_RAID56) {
717+ wq = fs_info->endio_raid56_workers;
718+ func = btrfs_endio_raid56_helper;
719+ } else if (end_io_wq->metadata) {
720+ wq = fs_info->endio_meta_workers;
721+ func = btrfs_endio_meta_helper;
722+ } else {
723+ wq = fs_info->endio_workers;
724+ func = btrfs_endio_helper;
725+ }
724726 }
727+
728+ btrfs_init_work(&end_io_wq->work, func, end_workqueue_fn, NULL, NULL);
729+ btrfs_queue_work(wq, &end_io_wq->work);
725730 }
726731
727732 /*
@@ -828,7 +833,7 @@ int btrfs_wq_submit_bio(struct btrfs_fs_info *fs_info, struct inode *inode, · 100 unmodified lines
828833 async->submit_bio_start = submit_bio_start;
829834 async->submit_bio_done = submit_bio_done;
830835
831− btrfs_init_work(&async->work, run_one_async_start,
836+ btrfs_init_work(&async->work, btrfs_worker_helper, run_one_async_start,
832837 run_one_async_done, run_one_async_free);
833838
834839 async->bio_flags = bio_flags;
@@ -3450,7 +3455,8 @@ static int write_all_supers(struct btrfs_root *root, int max_mirrors) · 2615 unmodified lines
34503455 btrfs_set_stack_device_generation(dev_item, 0);
34513456 btrfs_set_stack_device_type(dev_item, dev->type);
34523457 btrfs_set_stack_device_id(dev_item, dev->devid);
3453− btrfs_set_stack_device_total_bytes(dev_item, dev->total_bytes);
3458+ btrfs_set_stack_device_total_bytes(dev_item,
3459+ dev->disk_total_bytes);
34543460 btrfs_set_stack_device_bytes_used(dev_item, dev->bytes_used);
34553461 btrfs_set_stack_device_io_align(dev_item, dev->io_align);
34563462 btrfs_set_stack_device_io_width(dev_item, dev->io_width);
fs/btrfs/extent-tree.c+6−17
@@ -552,7 +552,8 @@ static int cache_block_group(struct btrfs_block_group_cache *cache, · 551 unmodified lines
552552 caching_ctl->block_group = cache;
553553 caching_ctl->progress = cache->key.objectid;
554554 atomic_set(&caching_ctl->count, 1);
555− btrfs_init_work(&caching_ctl->work, caching_thread, NULL, NULL);
555+ btrfs_init_work(&caching_ctl->work, btrfs_cache_helper,
556+ caching_thread, NULL, NULL);
556557
557558 spin_lock(&cache->lock);
558559 /*
@@ -2749,8 +2750,8 @@ int btrfs_async_run_delayed_refs(struct btrfs_root *root, · 2190 unmodified lines
27492750 async->sync = 0;
27502751 init_completion(&async->wait);
27512752
2752− btrfs_init_work(&async->work, delayed_ref_async_start,
2753− NULL, NULL);
2753+ btrfs_init_work(&async->work, btrfs_extent_refs_helper,
2754+ delayed_ref_async_start, NULL, NULL);
27542755
27552756 btrfs_queue_work(root->fs_info->extent_workers, &async->work);
27562757
@@ -3586,13 +3587,7 @@ static u64 get_restripe_target(struct btrfs_fs_info *fs_info, u64 flags) · 829 unmodified lines
35863587 */
35873588 static u64 btrfs_reduce_alloc_profile(struct btrfs_root *root, u64 flags)
35883589 {
3589− /*
3590− * we add in the count of missing devices because we want
3591− * to make sure that any RAID levels on a degraded FS
3592− * continue to be honored.
3593− */
3594− u64 num_devices = root->fs_info->fs_devices->rw_devices +
3595− root->fs_info->fs_devices->missing_devices;
3590+ u64 num_devices = root->fs_info->fs_devices->rw_devices;
35963591 u64 target;
35973592 u64 tmp;
35983593
@@ -8440,13 +8435,7 @@ static u64 update_block_group_flags(struct btrfs_root *root, u64 flags) · 4841 unmodified lines
84408435 if (stripped)
84418436 return extended_to_chunk(stripped);
84428437
8443− /*
8444− * we add in the count of missing devices because we want
8445− * to make sure that any RAID levels on a degraded FS
8446− * continue to be honored.
8447− */
8448− num_devices = root->fs_info->fs_devices->rw_devices +
8449− root->fs_info->fs_devices->missing_devices;
8438+ num_devices = root->fs_info->fs_devices->rw_devices;
84508439
84518440 stripped = BTRFS_BLOCK_GROUP_RAID0 |
84528441 BTRFS_BLOCK_GROUP_RAID5 | BTRFS_BLOCK_GROUP_RAID6 |
fs/btrfs/extent_io.c+3−2
@@ -2532,6 +2532,7 @@ static void end_bio_extent_readpage(struct bio *bio, int err) · 2531 unmodified lines
25322532 test_bit(BIO_UPTODATE, &bio->bi_flags);
25332533 if (err)
25342534 uptodate = 0;
2535+ offset += len;
25352536 continue;
25362537 }
25372538 }
@@ -4207,8 +4208,8 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, · 1669 unmodified lines
42074208 return -ENOMEM;
42084209 path->leave_spinning = 1;
42094210
4210− start = ALIGN(start, BTRFS_I(inode)->root->sectorsize);
4211− len = ALIGN(len, BTRFS_I(inode)->root->sectorsize);
4211+ start = round_down(start, BTRFS_I(inode)->root->sectorsize);
4212+ len = round_up(max, BTRFS_I(inode)->root->sectorsize) - start;
42124213
42134214 /*
42144215 * lookup the last file extent. We're not using i_size here
fs/btrfs/file.c+12−5
@@ -1840,7 +1840,15 @@ int btrfs_release_file(struct inode *inode, struct file *filp) · 1839 unmodified lines
18401840 {
18411841 if (filp->private_data)
18421842 btrfs_ioctl_trans_end(filp);
1843− filemap_flush(inode->i_mapping);
1843+ /*
1844+ * ordered_data_close is set by settattr when we are about to truncate
1845+ * a file from a non-zero size to a zero size. This tries to
1846+ * flush down new bytes that may have been written if the
1847+ * application were using truncate to replace a file in place.
1848+ */
1849+ if (test_and_clear_bit(BTRFS_INODE_ORDERED_DATA_CLOSE,
1850+ &BTRFS_I(inode)->runtime_flags))
1851+ filemap_flush(inode->i_mapping);
18441852 return 0;
18451853 }
18461854
@@ -2088,10 +2096,9 @@ static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode, · 241 unmodified lines
20882096 goto out;
20892097 }
20902098
2091− if (hole_mergeable(inode, leaf, path->slots[0]+1, offset, end)) {
2099+ if (hole_mergeable(inode, leaf, path->slots[0], offset, end)) {
20922100 u64 num_bytes;
20932101
2094− path->slots[0]++;
20952102 key.offset = offset;
20962103 btrfs_set_item_key_safe(root, path, &key);
20972104 fi = btrfs_item_ptr(leaf, path->slots[0],
@@ -2216,7 +2223,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) · 118 unmodified lines
22162223 goto out_only_mutex;
22172224 }
22182225
2219− lockstart = round_up(offset , BTRFS_I(inode)->root->sectorsize);
2226+ lockstart = round_up(offset, BTRFS_I(inode)->root->sectorsize);
22202227 lockend = round_down(offset + len,
22212228 BTRFS_I(inode)->root->sectorsize) - 1;
22222229 same_page = ((offset >> PAGE_CACHE_SHIFT) ==
@@ -2277,7 +2284,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) · 54 unmodified lines
22772284 tail_start + tail_len, 0, 1);
22782285 if (ret)
22792286 goto out_only_mutex;
2280− }
2287+ }
22812288 }
22822289 }
22832290
fs/btrfs/inode.c+89−20
@@ -1096,8 +1096,10 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page, · 1095 unmodified lines
10961096 async_cow->end = cur_end;
10971097 INIT_LIST_HEAD(&async_cow->extents);
10981098
1099− btrfs_init_work(&async_cow->work, async_cow_start,
1100− async_cow_submit, async_cow_free);
1099+ btrfs_init_work(&async_cow->work,
1100+ btrfs_delalloc_helper,
1101+ async_cow_start, async_cow_submit,
1102+ async_cow_free);
11011103
11021104 nr_pages = (cur_end - start + PAGE_CACHE_SIZE) >>
11031105 PAGE_CACHE_SHIFT;
@@ -1881,7 +1883,8 @@ static int btrfs_writepage_start_hook(struct page *page, u64 start, u64 end) · 777 unmodified lines
18811883
18821884 SetPageChecked(page);
18831885 page_cache_get(page);
1884− btrfs_init_work(&fixup->work, btrfs_writepage_fixup_worker, NULL, NULL);
1886+ btrfs_init_work(&fixup->work, btrfs_fixup_helper,
1887+ btrfs_writepage_fixup_worker, NULL, NULL);
18851888 fixup->page = page;
18861889 btrfs_queue_work(root->fs_info->fixup_workers, &fixup->work);
18871890 return -EBUSY;
@@ -2822,7 +2825,8 @@ static int btrfs_writepage_end_io_hook(struct page *page, u64 start, u64 end, · 934 unmodified lines
28222825 struct inode *inode = page->mapping->host;
28232826 struct btrfs_root *root = BTRFS_I(inode)->root;
28242827 struct btrfs_ordered_extent *ordered_extent = NULL;
2825− struct btrfs_workqueue *workers;
2828+ struct btrfs_workqueue *wq;
2829+ btrfs_work_func_t func;
28262830
28272831 trace_btrfs_writepage_end_io_hook(page, start, end, uptodate);
28282832
@@ -2831,13 +2835,17 @@ static int btrfs_writepage_end_io_hook(struct page *page, u64 start, u64 end, · 2 unmodified lines
28312835 end - start + 1, uptodate))
28322836 return 0;
28332837
2834− btrfs_init_work(&ordered_extent->work, finish_ordered_fn, NULL, NULL);
2838+ if (btrfs_is_free_space_inode(inode)) {
2839+ wq = root->fs_info->endio_freespace_worker;
2840+ func = btrfs_freespace_write_helper;
2841+ } else {
2842+ wq = root->fs_info->endio_write_workers;
2843+ func = btrfs_endio_write_helper;
2844+ }
28352845
2836− if (btrfs_is_free_space_inode(inode))
2837− workers = root->fs_info->endio_freespace_worker;
2838− else
2839− workers = root->fs_info->endio_write_workers;
2840− btrfs_queue_work(workers, &ordered_extent->work);
2846+ btrfs_init_work(&ordered_extent->work, func, finish_ordered_fn, NULL,
2847+ NULL);
2848+ btrfs_queue_work(wq, &ordered_extent->work);
28412849
28422850 return 0;
28432851 }
@@ -4674,6 +4682,11 @@ static void evict_inode_truncate_pages(struct inode *inode) · 1830 unmodified lines
46744682 clear_bit(EXTENT_FLAG_LOGGING, &em->flags);
46754683 remove_extent_mapping(map_tree, em);
46764684 free_extent_map(em);
4685+ if (need_resched()) {
4686+ write_unlock(&map_tree->lock);
4687+ cond_resched();
4688+ write_lock(&map_tree->lock);
4689+ }
46774690 }
46784691 write_unlock(&map_tree->lock);
46794692
@@ -4696,6 +4709,7 @@ static void evict_inode_truncate_pages(struct inode *inode) · 16 unmodified lines
46964709 &cached_state, GFP_NOFS);
46974710 free_extent_state(state);
46984711
4712+ cond_resched();
46994713 spin_lock(&io_tree->lock);
47004714 }
47014715 spin_unlock(&io_tree->lock);
@@ -5181,6 +5195,42 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry) · 479 unmodified lines
51815195 iput(inode);
51825196 inode = ERR_PTR(ret);
51835197 }
5198+ /*
5199+ * If orphan cleanup did remove any orphans, it means the tree
5200+ * was modified and therefore the commit root is not the same as
5201+ * the current root anymore. This is a problem, because send
5202+ * uses the commit root and therefore can see inode items that
5203+ * don't exist in the current root anymore, and for example make
5204+ * calls to btrfs_iget, which will do tree lookups based on the
5205+ * current root and not on the commit root. Those lookups will
5206+ * fail, returning a -ESTALE error, and making send fail with
5207+ * that error. So make sure a send does not see any orphans we
5208+ * have just removed, and that it will see the same inodes
5209+ * regardless of whether a transaction commit happened before
5210+ * it started (meaning that the commit root will be the same as
5211+ * the current root) or not.
5212+ */
5213+ if (sub_root->node != sub_root->commit_root) {
5214+ u64 sub_flags = btrfs_root_flags(&sub_root->root_item);
5215+
5216+ if (sub_flags & BTRFS_ROOT_SUBVOL_RDONLY) {
5217+ struct extent_buffer *eb;
5218+
5219+ /*
5220+ * Assert we can't have races between dentry
5221+ * lookup called through the snapshot creation
5222+ * ioctl and the VFS.
5223+ */
5224+ ASSERT(mutex_is_locked(&dir->i_mutex));
5225+
5226+ down_write(&root->fs_info->commit_root_sem);
5227+ eb = sub_root->commit_root;
5228+ sub_root->commit_root =
5229+ btrfs_root_node(sub_root);
5230+ up_write(&root->fs_info->commit_root_sem);
5231+ free_extent_buffer(eb);
5232+ }
5233+ }
51845234 }
51855235
51865236 return inode;
@@ -5605,6 +5655,13 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans, · 418 unmodified lines
56055655 return ERR_PTR(-ENOMEM);
56065656 }
56075657
5658+ /*
5659+ * O_TMPFILE, set link count to 0, so that after this point,
5660+ * we fill in an inode item with the correct link count.
5661+ */
5662+ if (!name)
5663+ set_nlink(inode, 0);
5664+
56085665 /*
56095666 * we have to initialize this early, so we can reclaim the inode
56105667 * number if we fail afterwards in this function.
@@ -6097,14 +6154,14 @@ out_fail: · 486 unmodified lines
60976154 static int merge_extent_mapping(struct extent_map_tree *em_tree,
60986155 struct extent_map *existing,
60996156 struct extent_map *em,
6100− u64 map_start, u64 map_len)
6157+ u64 map_start)
61016158 {
61026159 u64 start_diff;
61036160
61046161 BUG_ON(map_start < em->start || map_start >= extent_map_end(em));
61056162 start_diff = map_start - em->start;
61066163 em->start = map_start;
6107− em->len = map_len;
6164+ em->len = existing->start - em->start;
61086165 if (em->block_start < EXTENT_MAP_LAST_BYTE &&
61096166 !test_bit(EXTENT_FLAG_COMPRESSED, &em->flags)) {
61106167 em->block_start += start_diff;
@@ -6275,6 +6332,8 @@ next: · 164 unmodified lines
62756332 goto not_found;
62766333 if (start + len <= found_key.offset)
62776334 goto not_found;
6335+ if (start > found_key.offset)
6336+ goto next;
62786337 em->start = start;
62796338 em->orig_start = start;
62806339 em->len = found_key.offset - start;
@@ -6390,8 +6449,7 @@ insert: · 109 unmodified lines
63906449 em->len);
63916450 if (existing) {
63926451 err = merge_extent_mapping(em_tree, existing,
6393− em, start,
6394− root->sectorsize);
6452+ em, start);
63956453 free_extent_map(existing);
63966454 if (err) {
63976455 free_extent_map(em);
@@ -7158,7 +7216,8 @@ again: · 760 unmodified lines
71587216 if (!ret)
71597217 goto out_test;
71607218
7161− btrfs_init_work(&ordered->work, finish_ordered_fn, NULL, NULL);
7219+ btrfs_init_work(&ordered->work, btrfs_endio_write_helper,
7220+ finish_ordered_fn, NULL, NULL);
71627221 btrfs_queue_work(root->fs_info->endio_write_workers,
71637222 &ordered->work);
71647223 out_test:
@@ -7306,10 +7365,8 @@ static int btrfs_submit_direct_hook(int rw, struct btrfs_dio_private *dip, · 141 unmodified lines
73067365 map_length = orig_bio->bi_iter.bi_size;
73077366 ret = btrfs_map_block(root->fs_info, rw, start_sector << 9,
73087367 &map_length, NULL, 0);
7309− if (ret) {
7310− bio_put(orig_bio);
7368+ if (ret)
73117369 return -EIO;
7312− }
73137370
73147371 if (map_length >= orig_bio->bi_iter.bi_size) {
73157372 bio = orig_bio;
@@ -7326,6 +7383,7 @@ static int btrfs_submit_direct_hook(int rw, struct btrfs_dio_private *dip, · 10 unmodified lines
73267383 bio = btrfs_dio_bio_alloc(orig_bio->bi_bdev, start_sector, GFP_NOFS);
73277384 if (!bio)
73287385 return -ENOMEM;
7386+
73297387 bio->bi_private = dip;
73307388 bio->bi_end_io = btrfs_end_dio_bio;
73317389 atomic_inc(&dip->pending_bios);
@@ -7534,7 +7592,8 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb, · 202 unmodified lines
75347592 count = iov_iter_count(iter);
75357593 if (test_bit(BTRFS_INODE_HAS_ASYNC_EXTENT,
75367594 &BTRFS_I(inode)->runtime_flags))
7537− filemap_fdatawrite_range(inode->i_mapping, offset, count);
7595+ filemap_fdatawrite_range(inode->i_mapping, offset,
7596+ offset + count - 1);
75387597
75397598 if (rw & WRITE) {
75407599 /*
@@ -8495,7 +8554,9 @@ struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode, · 954 unmodified lines
84958554 work->inode = inode;
84968555 work->wait = wait;
84978556 work->delay_iput = delay_iput;
8498− btrfs_init_work(&work->work, btrfs_run_delalloc_work, NULL, NULL);
8557+ WARN_ON_ONCE(!inode);
8558+ btrfs_init_work(&work->work, btrfs_flush_delalloc_helper,
8559+ btrfs_run_delalloc_work, NULL, NULL);
84998560
85008561 return work;
85018562 }
@@ -8979,6 +9040,14 @@ static int btrfs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) · 477 unmodified lines
89799040 if (ret)
89809041 goto out;
89819042
9043+ /*
9044+ * We set number of links to 0 in btrfs_new_inode(), and here we set
9045+ * it to 1 because d_tmpfile() will issue a warning if the count is 0,
9046+ * through:
9047+ *
9048+ * d_tmpfile() -> inode_dec_link_count() -> drop_nlink()
9049+ */
9050+ set_nlink(inode, 1);
89829051 d_tmpfile(dentry, inode);
89839052 mark_inode_dirty(inode);
89849053
fs/btrfs/ioctl.c+2−34
@@ -711,39 +711,6 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir, · 710 unmodified lines
711711 if (ret)
712712 goto fail;
713713
714− ret = btrfs_orphan_cleanup(pending_snapshot->snap);
715− if (ret)
716− goto fail;
717−
718− /*
719− * If orphan cleanup did remove any orphans, it means the tree was
720− * modified and therefore the commit root is not the same as the
721− * current root anymore. This is a problem, because send uses the
722− * commit root and therefore can see inode items that don't exist
723− * in the current root anymore, and for example make calls to
724− * btrfs_iget, which will do tree lookups based on the current root
725− * and not on the commit root. Those lookups will fail, returning a
726− * -ESTALE error, and making send fail with that error. So make sure
727− * a send does not see any orphans we have just removed, and that it
728− * will see the same inodes regardless of whether a transaction
729− * commit happened before it started (meaning that the commit root
730− * will be the same as the current root) or not.
731− */
732− if (readonly && pending_snapshot->snap->node !=
733− pending_snapshot->snap->commit_root) {
734− trans = btrfs_join_transaction(pending_snapshot->snap);
735− if (IS_ERR(trans) && PTR_ERR(trans) != -ENOENT) {
736− ret = PTR_ERR(trans);
737− goto fail;
738− }
739− if (!IS_ERR(trans)) {
740− ret = btrfs_commit_transaction(trans,
741− pending_snapshot->snap);
742− if (ret)
743− goto fail;
744− }
745− }
746−
747714 inode = btrfs_lookup_dentry(dentry->d_parent->d_inode, dentry);
748715 if (IS_ERR(inode)) {
749716 ret = PTR_ERR(inode);
@@ -3527,7 +3494,8 @@ process_slot: · 2777 unmodified lines
35273494 btrfs_mark_buffer_dirty(leaf);
35283495 btrfs_release_path(path);
35293496
3530− last_dest_end = new_key.offset + datal;
3497+ last_dest_end = ALIGN(new_key.offset + datal,
3498+ root->sectorsize);
35313499 ret = clone_finish_inode_update(trans, inode,
35323500 last_dest_end,
35333501 destoff, olen);
fs/btrfs/ordered-data.c+1−0
@@ -615,6 +615,7 @@ int btrfs_wait_ordered_extents(struct btrfs_root *root, int nr) · 614 unmodified lines
615615 spin_unlock(&root->ordered_extent_lock);
616616
617617 btrfs_init_work(&ordered->flush_work,
618+ btrfs_flush_delalloc_helper,
618619 btrfs_run_ordered_extent_work, NULL, NULL);
619620 list_add_tail(&ordered->work_list, &works);
620621 btrfs_queue_work(root->fs_info->flush_workers,
fs/btrfs/qgroup.c+2−1
@@ -1973,7 +1973,7 @@ static int qgroup_subtree_accounting(struct btrfs_trans_handle *trans, · 1972 unmodified lines
19731973 elem.seq, &roots);
19741974 btrfs_put_tree_mod_seq(fs_info, &elem);
19751975 if (ret < 0)
1976− return ret;
1976+ goto out;
19771977
19781978 if (roots->nnodes != 1)
19791979 goto out;
@@ -2720,6 +2720,7 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid, · 740 unmodified lines
27202720 memset(&fs_info->qgroup_rescan_work, 0,
27212721 sizeof(fs_info->qgroup_rescan_work));
27222722 btrfs_init_work(&fs_info->qgroup_rescan_work,
2723+ btrfs_qgroup_rescan_helper,
27232724 btrfs_qgroup_rescan_worker, NULL, NULL);
27242725
27252726 if (ret) {
fs/btrfs/raid56.c+6−3
@@ -1416,7 +1416,8 @@ cleanup: · 1415 unmodified lines
14161416
14171417 static void async_rmw_stripe(struct btrfs_raid_bio *rbio)
14181418 {
1419− btrfs_init_work(&rbio->work, rmw_work, NULL, NULL);
1419+ btrfs_init_work(&rbio->work, btrfs_rmw_helper,
1420+ rmw_work, NULL, NULL);
14201421
14211422 btrfs_queue_work(rbio->fs_info->rmw_workers,
14221423 &rbio->work);
@@ -1424,7 +1425,8 @@ static void async_rmw_stripe(struct btrfs_raid_bio *rbio) · 1 unmodified line
14241425
14251426 static void async_read_rebuild(struct btrfs_raid_bio *rbio)
14261427 {
1427− btrfs_init_work(&rbio->work, read_rebuild_work, NULL, NULL);
1428+ btrfs_init_work(&rbio->work, btrfs_rmw_helper,
1429+ read_rebuild_work, NULL, NULL);
14281430
14291431 btrfs_queue_work(rbio->fs_info->rmw_workers,
14301432 &rbio->work);
@@ -1665,7 +1667,8 @@ static void btrfs_raid_unplug(struct blk_plug_cb *cb, bool from_schedule) · 234 unmodified lines
16651667 plug = container_of(cb, struct btrfs_plug_cb, cb);
16661668
16671669 if (from_schedule) {
1668− btrfs_init_work(&plug->work, unplug_work, NULL, NULL);
1670+ btrfs_init_work(&plug->work, btrfs_rmw_helper,
1671+ unplug_work, NULL, NULL);
16691672 btrfs_queue_work(plug->info->rmw_workers,
16701673 &plug->work);
16711674 return;
fs/btrfs/reada.c+2−1
@@ -798,7 +798,8 @@ static void reada_start_machine(struct btrfs_fs_info *fs_info) · 797 unmodified lines
798798 /* FIXME we cannot handle this properly right now */
799799 BUG();
800800 }
801− btrfs_init_work(&rmw->work, reada_start_machine_worker, NULL, NULL);
801+ btrfs_init_work(&rmw->work, btrfs_readahead_helper,
802+ reada_start_machine_worker, NULL, NULL);
802803 rmw->fs_info = fs_info;
803804
804805 btrfs_queue_work(fs_info->readahead_workers, &rmw->work);
fs/btrfs/scrub.c+19−6
@@ -428,8 +428,8 @@ struct scrub_ctx *scrub_setup_ctx(struct btrfs_device *dev, int is_dev_replace) · 427 unmodified lines
428428 sbio->index = i;
429429 sbio->sctx = sctx;
430430 sbio->page_count = 0;
431− btrfs_init_work(&sbio->work, scrub_bio_end_io_worker,
432− NULL, NULL);
431+ btrfs_init_work(&sbio->work, btrfs_scrub_helper,
432+ scrub_bio_end_io_worker, NULL, NULL);
433433
434434 if (i != SCRUB_BIOS_PER_SCTX - 1)
435435 sctx->bios[i]->next_free = i + 1;
@@ -999,8 +999,8 @@ nodatasum_case: · 563 unmodified lines
999999 fixup_nodatasum->root = fs_info->extent_root;
10001000 fixup_nodatasum->mirror_num = failed_mirror_index + 1;
10011001 scrub_pending_trans_workers_inc(sctx);
1002− btrfs_init_work(&fixup_nodatasum->work, scrub_fixup_nodatasum,
1003− NULL, NULL);
1002+ btrfs_init_work(&fixup_nodatasum->work, btrfs_scrub_helper,
1003+ scrub_fixup_nodatasum, NULL, NULL);
10041004 btrfs_queue_work(fs_info->scrub_workers,
10051005 &fixup_nodatasum->work);
10061006 goto out;
@@ -1616,7 +1616,8 @@ static void scrub_wr_bio_end_io(struct bio *bio, int err) · 609 unmodified lines
16161616 sbio->err = err;
16171617 sbio->bio = bio;
16181618
1619− btrfs_init_work(&sbio->work, scrub_wr_bio_end_io_worker, NULL, NULL);
1619+ btrfs_init_work(&sbio->work, btrfs_scrubwrc_helper,
1620+ scrub_wr_bio_end_io_worker, NULL, NULL);
16201621 btrfs_queue_work(fs_info->scrub_wr_completion_workers, &sbio->work);
16211622 }
16221623
@@ -2904,6 +2905,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, · 1281 unmodified lines
29042905 struct scrub_ctx *sctx;
29052906 int ret;
29062907 struct btrfs_device *dev;
2908+ struct rcu_string *name;
29072909
29082910 if (btrfs_fs_closing(fs_info))
29092911 return -EINVAL;
@@ -2965,6 +2967,16 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, · 55 unmodified lines
29652967 return -ENODEV;
29662968 }
29672969
2970+ if (!is_dev_replace && !readonly && !dev->writeable) {
2971+ mutex_unlock(&fs_info->fs_devices->device_list_mutex);
2972+ rcu_read_lock();
2973+ name = rcu_dereference(dev->name);
2974+ btrfs_err(fs_info, "scrub: device %s is not writable",
2975+ name->str);
2976+ rcu_read_unlock();
2977+ return -EROFS;
2978+ }
2979+
29682980 mutex_lock(&fs_info->scrub_lock);
29692981 if (!dev->in_fs_metadata || dev->is_tgtdev_for_dev_replace) {
29702982 mutex_unlock(&fs_info->scrub_lock);
@@ -3203,7 +3215,8 @@ static int copy_nocow_pages(struct scrub_ctx *sctx, u64 logical, u64 len, · 232 unmodified lines
32033215 nocow_ctx->len = len;
32043216 nocow_ctx->mirror_num = mirror_num;
32053217 nocow_ctx->physical_for_dev_replace = physical_for_dev_replace;
3206− btrfs_init_work(&nocow_ctx->work, copy_nocow_pages_worker, NULL, NULL);
3218+ btrfs_init_work(&nocow_ctx->work, btrfs_scrubnc_helper,
3219+ copy_nocow_pages_worker, NULL, NULL);
32073220 INIT_LIST_HEAD(&nocow_ctx->inodes);
32083221 btrfs_queue_work(fs_info->scrub_nocow_workers,
32093222 &nocow_ctx->work);
fs/btrfs/sysfs.c+1−1
@@ -614,7 +614,7 @@ int btrfs_kobj_rm_device(struct btrfs_fs_info *fs_info, · 613 unmodified lines
614614 if (!fs_info->device_dir_kobj)
615615 return -EINVAL;
616616
617− if (one_device) {
617+ if (one_device && one_device->bdev) {
618618 disk = one_device->bdev->bd_part;
619619 disk_kobj = &part_to_dev(disk)->kobj;
620620
fs/btrfs/tree-log.c+13−4
@@ -3298,7 +3298,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, · 3297 unmodified lines
32983298 struct list_head ordered_sums;
32993299 int skip_csum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM;
33003300 bool has_extents = false;
3301− bool need_find_last_extent = (*last_extent == 0);
3301+ bool need_find_last_extent = true;
33023302 bool done = false;
33033303
33043304 INIT_LIST_HEAD(&ordered_sums);
@@ -3352,8 +3352,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, · 47 unmodified lines
33523352 */
33533353 if (ins_keys[i].type == BTRFS_EXTENT_DATA_KEY) {
33543354 has_extents = true;
3355− if (need_find_last_extent &&
3356− first_key.objectid == (u64)-1)
3355+ if (first_key.objectid == (u64)-1)
33573356 first_key = ins_keys[i];
33583357 } else {
33593358 need_find_last_extent = false;
@@ -3427,6 +3426,16 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, · 67 unmodified lines
34273426 if (!has_extents)
34283427 return ret;
34293428
3429+ if (need_find_last_extent && *last_extent == first_key.offset) {
3430+ /*
3431+ * We don't have any leafs between our current one and the one
3432+ * we processed before that can have file extent items for our
3433+ * inode (and have a generation number smaller than our current
3434+ * transaction id).
3435+ */
3436+ need_find_last_extent = false;
3437+ }
3438+
34303439 /*
34313440 * Because we use btrfs_search_forward we could skip leaves that were
34323441 * not modified and then assume *last_extent is valid when it really
@@ -3537,7 +3546,7 @@ fill_holes: · 104 unmodified lines
35373546 0, 0);
35383547 if (ret)
35393548 break;
3540− *last_extent = offset + len;
3549+ *last_extent = extent_end;
35413550 }
35423551 /*
35433552 * Need to let the callers know we dropped the path so they should
fs/btrfs/volumes.c+60−5
@@ -508,6 +508,44 @@ static noinline int device_list_add(const char *path, · 507 unmodified lines
508508 ret = 1;
509509 device->fs_devices = fs_devices;
510510 } else if (!device->name || strcmp(device->name->str, path)) {
511+ /*
512+ * When FS is already mounted.
513+ * 1. If you are here and if the device->name is NULL that
514+ * means this device was missing at time of FS mount.
515+ * 2. If you are here and if the device->name is different
516+ * from 'path' that means either
517+ * a. The same device disappeared and reappeared with
518+ * different name. or
519+ * b. The missing-disk-which-was-replaced, has
520+ * reappeared now.
521+ *
522+ * We must allow 1 and 2a above. But 2b would be a spurious
523+ * and unintentional.
524+ *
525+ * Further in case of 1 and 2a above, the disk at 'path'
526+ * would have missed some transaction when it was away and
527+ * in case of 2a the stale bdev has to be updated as well.
528+ * 2b must not be allowed at all time.
529+ */
530+
531+ /*
532+ * As of now don't allow update to btrfs_fs_device through
533+ * the btrfs dev scan cli, after FS has been mounted.
534+ */
535+ if (fs_devices->opened) {
536+ return -EBUSY;
537+ } else {
538+ /*
539+ * That is if the FS is _not_ mounted and if you
540+ * are here, that means there is more than one
541+ * disk with same uuid and devid.We keep the one
542+ * with larger generation number or the last-in if
543+ * generation are equal.
544+ */
545+ if (found_transid < device->generation)
546+ return -EEXIST;
547+ }
548+
511549 name = rcu_string_strdup(path, GFP_NOFS);
512550 if (!name)
513551 return -ENOMEM;
@@ -519,6 +557,15 @@ static noinline int device_list_add(const char *path, · 5 unmodified lines
519557 }
520558 }
521559
560+ /*
561+ * Unmount does not free the btrfs_device struct but would zero
562+ * generation along with most of the other members. So just update
563+ * it back. We need it to pick the disk with largest generation
564+ * (as above).
565+ */
566+ if (!fs_devices->opened)
567+ device->generation = found_transid;
568+
522569 if (found_transid > fs_devices->latest_trans) {
523570 fs_devices->latest_devid = devid;
524571 fs_devices->latest_trans = found_transid;
@@ -1436,7 +1483,7 @@ static int btrfs_add_device(struct btrfs_trans_handle *trans, · 911 unmodified lines
14361483 btrfs_set_device_io_align(leaf, dev_item, device->io_align);
14371484 btrfs_set_device_io_width(leaf, dev_item, device->io_width);
14381485 btrfs_set_device_sector_size(leaf, dev_item, device->sector_size);
1439− btrfs_set_device_total_bytes(leaf, dev_item, device->total_bytes);
1486+ btrfs_set_device_total_bytes(leaf, dev_item, device->disk_total_bytes);
14401487 btrfs_set_device_bytes_used(leaf, dev_item, device->bytes_used);
14411488 btrfs_set_device_group(leaf, dev_item, 0);
14421489 btrfs_set_device_seek_speed(leaf, dev_item, 0);
@@ -1671,7 +1718,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) · 228 unmodified lines
16711718 device->fs_devices->total_devices--;
16721719
16731720 if (device->missing)
1674− root->fs_info->fs_devices->missing_devices--;
1721+ device->fs_devices->missing_devices--;
16751722
16761723 next_device = list_entry(root->fs_info->fs_devices->devices.next,
16771724 struct btrfs_device, dev_list);
@@ -1801,8 +1848,12 @@ void btrfs_rm_dev_replace_srcdev(struct btrfs_fs_info *fs_info, · 123 unmodified lines
18011848 if (srcdev->bdev) {
18021849 fs_info->fs_devices->open_devices--;
18031850
1804− /* zero out the old super */
1805− btrfs_scratch_superblock(srcdev);
1851+ /*
1852+ * zero out the old super if it is not writable
1853+ * (e.g. seed device)
1854+ */
1855+ if (srcdev->writeable)
1856+ btrfs_scratch_superblock(srcdev);
18061857 }
18071858
18081859 call_rcu(&srcdev->rcu, free_device);
@@ -1941,6 +1992,9 @@ static int btrfs_prepare_sprout(struct btrfs_root *root) · 132 unmodified lines
19411992 fs_devices->seeding = 0;
19421993 fs_devices->num_devices = 0;
19431994 fs_devices->open_devices = 0;
1995+ fs_devices->missing_devices = 0;
1996+ fs_devices->num_can_discard = 0;
1997+ fs_devices->rotating = 0;
19441998 fs_devices->seed = seed_devices;
19451999
19462000 generate_random_uuid(fs_devices->fsid);
@@ -5800,7 +5854,8 @@ struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info, · 3853 unmodified lines
58005854 else
58015855 generate_random_uuid(dev->uuid);
58025856
5803− btrfs_init_work(&dev->work, pending_bios_fn, NULL, NULL);
5857+ btrfs_init_work(&dev->work, btrfs_submit_helper,
5858+ pending_bios_fn, NULL, NULL);
58045859
58055860 return dev;
58065861 }
fs/ext4/ext4.h+17−1
@@ -1825,7 +1825,7 @@ ext4_group_first_block_no(struct super_block *sb, ext4_group_t group_no) · 1824 unmodified lines
18251825 /*
18261826 * Special error return code only used by dx_probe() and its callers.
18271827 */
1828−#define ERR_BAD_DX_DIR -75000
1828+#define ERR_BAD_DX_DIR (-(MAX_ERRNO - 1))
18291829
18301830 /*
18311831 * Timeout and state flag for lazy initialization inode thread.
@@ -2454,6 +2454,22 @@ static inline void ext4_update_i_disksize(struct inode *inode, loff_t newsize) · 622 unmodified lines
24542454 up_write(&EXT4_I(inode)->i_data_sem);
24552455 }
24562456
2457+/* Update i_size, i_disksize. Requires i_mutex to avoid races with truncate */
2458+static inline int ext4_update_inode_size(struct inode *inode, loff_t newsize)
2459+{
2460+ int changed = 0;
2461+
2462+ if (newsize > inode->i_size) {
2463+ i_size_write(inode, newsize);
2464+ changed = 1;
2465+ }
2466+ if (newsize > EXT4_I(inode)->i_disksize) {
2467+ ext4_update_i_disksize(inode, newsize);
2468+ changed |= 2;
2469+ }
2470+ return changed;
2471+}
2472+
24572473 struct ext4_group_info {
24582474 unsigned long bb_state;
24592475 struct rb_root bb_free_root;
fs/ext4/extents.c+44−44
@@ -4665,7 +4665,8 @@ retry: · 4664 unmodified lines
46654665 }
46664666
46674667 static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset,
4668− ext4_lblk_t len, int flags, int mode)
4668+ ext4_lblk_t len, loff_t new_size,
4669+ int flags, int mode)
46694670 {
46704671 struct inode *inode = file_inode(file);
46714672 handle_t *handle;
@@ -4674,8 +4675,10 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset, · 2 unmodified lines
46744675 int retries = 0;
46754676 struct ext4_map_blocks map;
46764677 unsigned int credits;
4678+ loff_t epos;
46774679
46784680 map.m_lblk = offset;
4681+ map.m_len = len;
46794682 /*
46804683 * Don't normalize the request if it can fit in one extent so
46814684 * that it doesn't get unnecessarily split into multiple
@@ -4690,9 +4693,7 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset, · 8 unmodified lines
46904693 credits = ext4_chunk_trans_blocks(inode, len);
46914694
46924695 retry:
4693− while (ret >= 0 && ret < len) {
4694− map.m_lblk = map.m_lblk + ret;
4695− map.m_len = len = len - ret;
4696+ while (ret >= 0 && len) {
46964697 handle = ext4_journal_start(inode, EXT4_HT_MAP_BLOCKS,
46974698 credits);
46984699 if (IS_ERR(handle)) {
@@ -4709,6 +4710,21 @@ retry: · 10 unmodified lines
47094710 ret2 = ext4_journal_stop(handle);
47104711 break;
47114712 }
4713+ map.m_lblk += ret;
4714+ map.m_len = len = len - ret;
4715+ epos = (loff_t)map.m_lblk << inode->i_blkbits;
4716+ inode->i_ctime = ext4_current_time(inode);
4717+ if (new_size) {
4718+ if (epos > new_size)
4719+ epos = new_size;
4720+ if (ext4_update_inode_size(inode, epos) & 0x1)
4721+ inode->i_mtime = inode->i_ctime;
4722+ } else {
4723+ if (epos > inode->i_size)
4724+ ext4_set_inode_flag(inode,
4725+ EXT4_INODE_EOFBLOCKS);
4726+ }
4727+ ext4_mark_inode_dirty(handle, inode);
47124728 ret2 = ext4_journal_stop(handle);
47134729 if (ret2)
47144730 break;
@@ -4731,7 +4747,8 @@ static long ext4_zero_range(struct file *file, loff_t offset, · 16 unmodified lines
47314747 loff_t new_size = 0;
47324748 int ret = 0;
47334749 int flags;
4734− int partial;
4750+ int credits;
4751+ int partial_begin, partial_end;
47354752 loff_t start, end;
47364753 ext4_lblk_t lblk;
47374754 struct address_space *mapping = inode->i_mapping;
@@ -4771,7 +4788,8 @@ static long ext4_zero_range(struct file *file, loff_t offset, · 33 unmodified lines
47714788
47724789 if (start < offset || end > offset + len)
47734790 return -EINVAL;
4774− partial = (offset + len) & ((1 << blkbits) - 1);
4791+ partial_begin = offset & ((1 << blkbits) - 1);
4792+ partial_end = (offset + len) & ((1 << blkbits) - 1);
47754793
47764794 lblk = start >> blkbits;
47774795 max_blocks = (end >> blkbits);
@@ -4805,7 +4823,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, · 27 unmodified lines
48054823 * If we have a partial block after EOF we have to allocate
48064824 * the entire block.
48074825 */
4808− if (partial)
4826+ if (partial_end)
48094827 max_blocks += 1;
48104828 }
48114829
@@ -4813,6 +4831,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, · 1 unmodified line
48134831
48144832 /* Now release the pages and zero block aligned part of pages*/
48154833 truncate_pagecache_range(inode, start, end - 1);
4834+ inode->i_mtime = inode->i_ctime = ext4_current_time(inode);
48164835
48174836 /* Wait all existing dio workers, newcomers will block on i_mutex */
48184837 ext4_inode_block_unlocked_dio(inode);
@@ -4825,13 +4844,22 @@ static long ext4_zero_range(struct file *file, loff_t offset, · 6 unmodified lines
48254844 if (ret)
48264845 goto out_dio;
48274846
4828− ret = ext4_alloc_file_blocks(file, lblk, max_blocks, flags,
4829− mode);
4847+ ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size,
4848+ flags, mode);
48304849 if (ret)
48314850 goto out_dio;
48324851 }
4852+ if (!partial_begin && !partial_end)
4853+ goto out_dio;
48334854
4834− handle = ext4_journal_start(inode, EXT4_HT_MISC, 4);
4855+ /*
4856+ * In worst case we have to writeout two nonadjacent unwritten
4857+ * blocks and update the inode
4858+ */
4859+ credits = (2 * ext4_ext_index_trans_blocks(inode, 2)) + 1;
4860+ if (ext4_should_journal_data(inode))
4861+ credits += 2;
4862+ handle = ext4_journal_start(inode, EXT4_HT_MISC, credits);
48354863 if (IS_ERR(handle)) {
48364864 ret = PTR_ERR(handle);
48374865 ext4_std_error(inode->i_sb, ret);
@@ -4839,12 +4867,8 @@ static long ext4_zero_range(struct file *file, loff_t offset, · 1 unmodified line
48394867 }
48404868
48414869 inode->i_mtime = inode->i_ctime = ext4_current_time(inode);
4842−
48434870 if (new_size) {
4844− if (new_size > i_size_read(inode))
4845− i_size_write(inode, new_size);
4846− if (new_size > EXT4_I(inode)->i_disksize)
4847− ext4_update_i_disksize(inode, new_size);
4871+ ext4_update_inode_size(inode, new_size);
48484872 } else {
48494873 /*
48504874 * Mark that we allocate beyond EOF so the subsequent truncate
@@ -4853,7 +4877,6 @@ static long ext4_zero_range(struct file *file, loff_t offset, · 2 unmodified lines
48534877 if ((offset + len) > i_size_read(inode))
48544878 ext4_set_inode_flag(inode, EXT4_INODE_EOFBLOCKS);
48554879 }
4856−
48574880 ext4_mark_inode_dirty(handle, inode);
48584881
48594882 /* Zero out partial block at the edges of the range */
@@ -4880,13 +4903,11 @@ out_mutex: · 20 unmodified lines
48804903 long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
48814904 {
48824905 struct inode *inode = file_inode(file);
4883− handle_t *handle;
48844906 loff_t new_size = 0;
48854907 unsigned int max_blocks;
48864908 int ret = 0;
48874909 int flags;
48884910 ext4_lblk_t lblk;
4889− struct timespec tv;
48904911 unsigned int blkbits = inode->i_blkbits;
48914912
48924913 /* Return error if mode is not supported */
@@ -4937,36 +4958,15 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) · 44 unmodified lines
49374958 goto out;
49384959 }
49394960
4940− ret = ext4_alloc_file_blocks(file, lblk, max_blocks, flags, mode);
4961+ ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size,
4962+ flags, mode);
49414963 if (ret)
49424964 goto out;
49434965
4944− handle = ext4_journal_start(inode, EXT4_HT_INODE, 2);
4945− if (IS_ERR(handle))
4946− goto out;
4947−
4948− tv = inode->i_ctime = ext4_current_time(inode);
4949−
4950− if (new_size) {
4951− if (new_size > i_size_read(inode)) {
4952− i_size_write(inode, new_size);
4953− inode->i_mtime = tv;
4954− }
4955− if (new_size > EXT4_I(inode)->i_disksize)
4956− ext4_update_i_disksize(inode, new_size);
4957− } else {
4958− /*
4959− * Mark that we allocate beyond EOF so the subsequent truncate
4960− * can proceed even if the new size is the same as i_size.
4961− */
4962− if ((offset + len) > i_size_read(inode))
4963− ext4_set_inode_flag(inode, EXT4_INODE_EOFBLOCKS);
4966+ if (file->f_flags & O_SYNC && EXT4_SB(inode->i_sb)->s_journal) {
4967+ ret = jbd2_complete_transaction(EXT4_SB(inode->i_sb)->s_journal,
4968+ EXT4_I(inode)->i_sync_tid);
49644969 }
4965− ext4_mark_inode_dirty(handle, inode);
4966− if (file->f_flags & O_SYNC)
4967− ext4_handle_sync(handle);
4968−
4969− ext4_journal_stop(handle);
49704970 out:
49714971 mutex_unlock(&inode->i_mutex);
49724972 trace_ext4_fallocate_exit(inode, offset, max_blocks, ret);
fs/ext4/inode.c+16−28
@@ -1055,27 +1055,11 @@ static int ext4_write_end(struct file *file, · 1054 unmodified lines
10551055 } else
10561056 copied = block_write_end(file, mapping, pos,
10571057 len, copied, page, fsdata);
1058−
10591058 /*
1060− * No need to use i_size_read() here, the i_size
1061− * cannot change under us because we hole i_mutex.
1062− *
1063− * But it's important to update i_size while still holding page lock:
1059+ * it's important to update i_size while still holding page lock:
10641060 * page writeout could otherwise come in and zero beyond i_size.
10651061 */
1066− if (pos + copied > inode->i_size) {
1067− i_size_write(inode, pos + copied);
1068− i_size_changed = 1;
1069− }
1070−
1071− if (pos + copied > EXT4_I(inode)->i_disksize) {
1072− /* We need to mark inode dirty even if
1073− * new_i_size is less that inode->i_size
1074− * but greater than i_disksize. (hint delalloc)
1075− */
1076− ext4_update_i_disksize(inode, (pos + copied));
1077− i_size_changed = 1;
1078− }
1062+ i_size_changed = ext4_update_inode_size(inode, pos + copied);
10791063 unlock_page(page);
10801064 page_cache_release(page);
10811065
@@ -1123,7 +1107,7 @@ static int ext4_journalled_write_end(struct file *file, · 41 unmodified lines
11231107 int ret = 0, ret2;
11241108 int partial = 0;
11251109 unsigned from, to;
1126− loff_t new_i_size;
1110+ int size_changed = 0;
11271111
11281112 trace_ext4_journalled_write_end(inode, pos, len, copied);
11291113 from = pos & (PAGE_CACHE_SIZE - 1);
@@ -1146,20 +1130,18 @@ static int ext4_journalled_write_end(struct file *file, · 16 unmodified lines
11461130 if (!partial)
11471131 SetPageUptodate(page);
11481132 }
1149− new_i_size = pos + copied;
1150− if (new_i_size > inode->i_size)
1151− i_size_write(inode, pos+copied);
1133+ size_changed = ext4_update_inode_size(inode, pos + copied);
11521134 ext4_set_inode_state(inode, EXT4_STATE_JDATA);
11531135 EXT4_I(inode)->i_datasync_tid = handle->h_transaction->t_tid;
1154− if (new_i_size > EXT4_I(inode)->i_disksize) {
1155− ext4_update_i_disksize(inode, new_i_size);
1136+ unlock_page(page);
1137+ page_cache_release(page);
1138+
1139+ if (size_changed) {
11561140 ret2 = ext4_mark_inode_dirty(handle, inode);
11571141 if (!ret)
11581142 ret = ret2;
11591143 }
11601144
1161− unlock_page(page);
1162− page_cache_release(page);
11631145 if (pos + len > inode->i_size && ext4_can_truncate(inode))
11641146 /* if we have allocated more blocks and copied
11651147 * less. We will have blocks allocated outside
@@ -2095,6 +2077,7 @@ static int mpage_map_and_submit_extent(handle_t *handle, · 929 unmodified lines
20952077 struct ext4_map_blocks *map = &mpd->map;
20962078 int err;
20972079 loff_t disksize;
2080+ int progress = 0;
20982081
20992082 mpd->io_submit.io_end->offset =
21002083 ((loff_t)map->m_lblk) << inode->i_blkbits;
@@ -2111,8 +2094,11 @@ static int mpage_map_and_submit_extent(handle_t *handle, · 10 unmodified lines
21112094 * is non-zero, a commit should free up blocks.
21122095 */
21132096 if ((err == -ENOMEM) ||
2114− (err == -ENOSPC && ext4_count_free_clusters(sb)))
2097+ (err == -ENOSPC && ext4_count_free_clusters(sb))) {
2098+ if (progress)
2099+ goto update_disksize;
21152100 return err;
2101+ }
21162102 ext4_msg(sb, KERN_CRIT,
21172103 "Delayed block allocation failed for "
21182104 "inode %lu at logical offset %llu with"
@@ -2129,15 +2115,17 @@ static int mpage_map_and_submit_extent(handle_t *handle, · 10 unmodified lines
21292115 *give_up_on_write = true;
21302116 return err;
21312117 }
2118+ progress = 1;
21322119 /*
21332120 * Update buffer state, submit mapped pages, and get us new
21342121 * extent to map
21352122 */
21362123 err = mpage_map_and_submit_buffers(mpd);
21372124 if (err < 0)
2138− return err;
2125+ goto update_disksize;
21392126 } while (map->m_len);
21402127
2128+update_disksize:
21412129 /*
21422130 * Update on-disk size after IO is submitted. Races with
21432131 * truncate are avoided by checking i_size under i_data_sem.
fs/ext4/mballoc.c+5−0
@@ -1412,6 +1412,8 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b, · 1411 unmodified lines
14121412 int last = first + count - 1;
14131413 struct super_block *sb = e4b->bd_sb;
14141414
1415+ if (WARN_ON(count == 0))
1416+ return;
14151417 BUG_ON(last >= (sb->s_blocksize << 3));
14161418 assert_spin_locked(ext4_group_lock_ptr(sb, e4b->bd_group));
14171419 /* Don't bother if the block group is corrupt. */
@@ -3221,6 +3223,8 @@ static void ext4_discard_allocated_blocks(struct ext4_allocation_context *ac) · 1803 unmodified lines
32213223 int err;
32223224
32233225 if (pa == NULL) {
3226+ if (ac->ac_f_ex.fe_len == 0)
3227+ return;
32243228 err = ext4_mb_load_buddy(ac->ac_sb, ac->ac_f_ex.fe_group, &e4b);
32253229 if (err) {
32263230 /*
@@ -3235,6 +3239,7 @@ static void ext4_discard_allocated_blocks(struct ext4_allocation_context *ac) · 8 unmodified lines
32353239 mb_free_blocks(ac->ac_inode, &e4b, ac->ac_f_ex.fe_start,
32363240 ac->ac_f_ex.fe_len);
32373241 ext4_unlock_group(ac->ac_sb, ac->ac_f_ex.fe_group);
3242+ ext4_mb_unload_buddy(&e4b);
32383243 return;
32393244 }
32403245 if (pa->pa_type == MB_INODE_PA)
fs/ext4/namei.c+51−5
@@ -1227,7 +1227,7 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, · 1226 unmodified lines
12271227 buffer */
12281228 int num = 0;
12291229 ext4_lblk_t nblocks;
1230− int i, err;
1230+ int i, err = 0;
12311231 int namelen;
12321232
12331233 *res_dir = NULL;
@@ -1264,7 +1264,11 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, · 30 unmodified lines
12641264 * return. Otherwise, fall back to doing a search the
12651265 * old fashioned way.
12661266 */
1267− if (bh || (err != ERR_BAD_DX_DIR))
1267+ if (err == -ENOENT)
1268+ return NULL;
1269+ if (err && err != ERR_BAD_DX_DIR)
1270+ return ERR_PTR(err);
1271+ if (bh)
12681272 return bh;
12691273 dxtrace(printk(KERN_DEBUG "ext4_find_entry: dx failed, "
12701274 "falling back\n"));
@@ -1295,6 +1299,11 @@ restart: · 24 unmodified lines
12951299 }
12961300 num++;
12971301 bh = ext4_getblk(NULL, dir, b++, 0, &err);
1302+ if (unlikely(err)) {
1303+ if (ra_max == 0)
1304+ return ERR_PTR(err);
1305+ break;
1306+ }
12981307 bh_use[ra_max] = bh;
12991308 if (bh)
13001309 ll_rw_block(READ | REQ_META | REQ_PRIO,
@@ -1417,6 +1426,8 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi · 116 unmodified lines
14171426 return ERR_PTR(-ENAMETOOLONG);
14181427
14191428 bh = ext4_find_entry(dir, &dentry->d_name, &de, NULL);
1429+ if (IS_ERR(bh))
1430+ return (struct dentry *) bh;
14201431 inode = NULL;
14211432 if (bh) {
14221433 __u32 ino = le32_to_cpu(de->inode);
@@ -1450,6 +1461,8 @@ struct dentry *ext4_get_parent(struct dentry *child) · 27 unmodified lines
14501461 struct buffer_head *bh;
14511462
14521463 bh = ext4_find_entry(child->d_inode, &dotdot, &de, NULL);
1464+ if (IS_ERR(bh))
1465+ return (struct dentry *) bh;
14531466 if (!bh)
14541467 return ERR_PTR(-ENOENT);
14551468 ino = le32_to_cpu(de->inode);
@@ -2727,6 +2740,8 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry) · 1271 unmodified lines
27272740
27282741 retval = -ENOENT;
27292742 bh = ext4_find_entry(dir, &dentry->d_name, &de, NULL);
2743+ if (IS_ERR(bh))
2744+ return PTR_ERR(bh);
27302745 if (!bh)
27312746 goto end_rmdir;
27322747
@@ -2794,6 +2809,8 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry) · 61 unmodified lines
27942809
27952810 retval = -ENOENT;
27962811 bh = ext4_find_entry(dir, &dentry->d_name, &de, NULL);
2812+ if (IS_ERR(bh))
2813+ return PTR_ERR(bh);
27972814 if (!bh)
27982815 goto end_unlink;
27992816
@@ -3121,6 +3138,8 @@ static int ext4_find_delete_entry(handle_t *handle, struct inode *dir, · 321 unmodified lines
31213138 struct ext4_dir_entry_2 *de;
31223139
31233140 bh = ext4_find_entry(dir, d_name, &de, NULL);
3141+ if (IS_ERR(bh))
3142+ return PTR_ERR(bh);
31243143 if (bh) {
31253144 retval = ext4_delete_entry(handle, dir, de, bh);
31263145 brelse(bh);
@@ -3128,7 +3147,8 @@ static int ext4_find_delete_entry(handle_t *handle, struct inode *dir, · 1 unmodified line
31283147 return retval;
31293148 }
31303149
3131−static void ext4_rename_delete(handle_t *handle, struct ext4_renament *ent)
3150+static void ext4_rename_delete(handle_t *handle, struct ext4_renament *ent,
3151+ int force_reread)
31323152 {
31333153 int retval;
31343154 /*
@@ -3140,7 +3160,8 @@ static void ext4_rename_delete(handle_t *handle, struct ext4_renament *ent) · 5 unmodified lines
31403160 if (le32_to_cpu(ent->de->inode) != ent->inode->i_ino ||
31413161 ent->de->name_len != ent->dentry->d_name.len ||
31423162 strncmp(ent->de->name, ent->dentry->d_name.name,
3143− ent->de->name_len)) {
3163+ ent->de->name_len) ||
3164+ force_reread) {
31443165 retval = ext4_find_delete_entry(handle, ent->dir,
31453166 &ent->dentry->d_name);
31463167 } else {
@@ -3191,6 +3212,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, · 44 unmodified lines
31913212 .dentry = new_dentry,
31923213 .inode = new_dentry->d_inode,
31933214 };
3215+ int force_reread;
31943216 int retval;
31953217
31963218 dquot_initialize(old.dir);
@@ -3202,6 +3224,8 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, · 5 unmodified lines
32023224 dquot_initialize(new.inode);
32033225
32043226 old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de, NULL);
3227+ if (IS_ERR(old.bh))
3228+ return PTR_ERR(old.bh);
32053229 /*
32063230 * Check for inode number is _not_ due to possible IO errors.
32073231 * We might rmdir the source, keep it as pwd of some process
@@ -3214,6 +3238,10 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, · 6 unmodified lines
32143238
32153239 new.bh = ext4_find_entry(new.dir, &new.dentry->d_name,
32163240 &new.de, &new.inlined);
3241+ if (IS_ERR(new.bh)) {
3242+ retval = PTR_ERR(new.bh);
3243+ goto end_rename;
3244+ }
32173245 if (new.bh) {
32183246 if (!new.inode) {
32193247 brelse(new.bh);
@@ -3246,6 +3274,15 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, · 26 unmodified lines
32463274 if (retval)
32473275 goto end_rename;
32483276 }
3277+ /*
3278+ * If we're renaming a file within an inline_data dir and adding or
3279+ * setting the new dirent causes a conversion from inline_data to
3280+ * extents/blockmap, we need to force the dirent delete code to
3281+ * re-read the directory, or else we end up trying to delete a dirent
3282+ * from what is now the extent tree root (or a block map).
3283+ */
3284+ force_reread = (new.dir->i_ino == old.dir->i_ino &&
3285+ ext4_test_inode_flag(new.dir, EXT4_INODE_INLINE_DATA));
32493286 if (!new.bh) {
32503287 retval = ext4_add_entry(handle, new.dentry, old.inode);
32513288 if (retval)
@@ -3256,6 +3293,9 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, · 4 unmodified lines
32563293 if (retval)
32573294 goto end_rename;
32583295 }
3296+ if (force_reread)
3297+ force_reread = !ext4_test_inode_flag(new.dir,
3298+ EXT4_INODE_INLINE_DATA);
32593299
32603300 /*
32613301 * Like most other Unix systems, set the ctime for inodes on a
@@ -3267,7 +3307,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, · 5 unmodified lines
32673307 /*
32683308 * ok, that's it
32693309 */
3270− ext4_rename_delete(handle, &old);
3310+ ext4_rename_delete(handle, &old, force_reread);
32713311
32723312 if (new.inode) {
32733313 ext4_dec_count(handle, new.inode);
@@ -3330,6 +3370,8 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry, · 56 unmodified lines
33303370
33313371 old.bh = ext4_find_entry(old.dir, &old.dentry->d_name,
33323372 &old.de, &old.inlined);
3373+ if (IS_ERR(old.bh))
3374+ return PTR_ERR(old.bh);
33333375 /*
33343376 * Check for inode number is _not_ due to possible IO errors.
33353377 * We might rmdir the source, keep it as pwd of some process
@@ -3342,6 +3384,10 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry, · 6 unmodified lines
33423384
33433385 new.bh = ext4_find_entry(new.dir, &new.dentry->d_name,
33443386 &new.de, &new.inlined);
3387+ if (IS_ERR(new.bh)) {
3388+ retval = PTR_ERR(new.bh);
3389+ goto end_rename;
3390+ }
33453391
33463392 /* RENAME_EXCHANGE case: old *and* new must both exist */
33473393 if (!new.bh || le32_to_cpu(new.de->inode) != new.inode->i_ino)
fs/ext4/super.c+3−2
@@ -3181,9 +3181,9 @@ static int set_journal_csum_feature_set(struct super_block *sb) · 3180 unmodified lines
31813181
31823182 if (EXT4_HAS_RO_COMPAT_FEATURE(sb,
31833183 EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
3184− /* journal checksum v2 */
3184+ /* journal checksum v3 */
31853185 compat = 0;
3186− incompat = JBD2_FEATURE_INCOMPAT_CSUM_V2;
3186+ incompat = JBD2_FEATURE_INCOMPAT_CSUM_V3;
31873187 } else {
31883188 /* journal checksum v1 */
31893189 compat = JBD2_FEATURE_COMPAT_CHECKSUM;
@@ -3205,6 +3205,7 @@ static int set_journal_csum_feature_set(struct super_block *sb) · 15 unmodified lines
32053205 jbd2_journal_clear_features(sbi->s_journal,
32063206 JBD2_FEATURE_COMPAT_CHECKSUM, 0,
32073207 JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT |
3208+ JBD2_FEATURE_INCOMPAT_CSUM_V3 |
32083209 JBD2_FEATURE_INCOMPAT_CSUM_V2);
32093210 }
32103211
fs/f2fs/Kconfig+2−2
@@ -23,7 +23,7 @@ config F2FS_STAT_FS · 22 unmodified lines
2323 mounted as f2fs. Each file shows the whole f2fs information.
2424
2525 /sys/kernel/debug/f2fs/status includes:
26− - major file system information managed by f2fs currently
26+ - major filesystem information managed by f2fs currently
2727 - average SIT information about whole segments
2828 - current memory footprint consumed by f2fs.
2929
@@ -68,6 +68,6 @@ config F2FS_CHECK_FS · 38 unmodified lines
6868 bool "F2FS consistency checking feature"
6969 depends on F2FS_FS
7070 help
71− Enables BUG_ONs which check the file system consistency in runtime.
71+ Enables BUG_ONs which check the filesystem consistency in runtime.
7272
7373 If you want to improve the performance, say N.
fs/f2fs/checkpoint.c+51−29
@@ -160,14 +160,11 @@ static int f2fs_write_meta_page(struct page *page, · 159 unmodified lines
160160 goto redirty_out;
161161 if (wbc->for_reclaim)
162162 goto redirty_out;
163−
164− /* Should not write any meta pages, if any IO error was occurred */
165− if (unlikely(is_set_ckpt_flags(F2FS_CKPT(sbi), CP_ERROR_FLAG)))
166− goto no_write;
163+ if (unlikely(f2fs_cp_error(sbi)))
164+ goto redirty_out;
167165
168166 f2fs_wait_on_page_writeback(page, META);
169167 write_meta_page(sbi, page);
170−no_write:
171168 dec_page_count(sbi, F2FS_DIRTY_META);
172169 unlock_page(page);
173170 return 0;
@@ -348,7 +345,7 @@ bool exist_written_data(struct f2fs_sb_info *sbi, nid_t ino, int mode) · 174 unmodified lines
348345 return e ? true : false;
349346 }
350347
351−static void release_dirty_inode(struct f2fs_sb_info *sbi)
348+void release_dirty_inode(struct f2fs_sb_info *sbi)
352349 {
353350 struct ino_entry *e, *tmp;
354351 int i;
@@ -446,8 +443,8 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk) · 91 unmodified lines
446443 struct f2fs_orphan_block *orphan_blk = NULL;
447444 unsigned int nentries = 0;
448445 unsigned short index;
449− unsigned short orphan_blocks = (unsigned short)((sbi->n_orphans +
450− (F2FS_ORPHANS_PER_BLOCK - 1)) / F2FS_ORPHANS_PER_BLOCK);
446+ unsigned short orphan_blocks =
447+ (unsigned short)GET_ORPHAN_BLOCKS(sbi->n_orphans);
451448 struct page *page = NULL;
452449 struct ino_entry *orphan = NULL;
453450
@@ -737,7 +734,7 @@ retry: · 283 unmodified lines
737734 /*
738735 * Freeze all the FS-operations for checkpoint.
739736 */
740−static void block_operations(struct f2fs_sb_info *sbi)
737+static int block_operations(struct f2fs_sb_info *sbi)
741738 {
742739 struct writeback_control wbc = {
743740 .sync_mode = WB_SYNC_ALL,
@@ -745,6 +742,7 @@ static void block_operations(struct f2fs_sb_info *sbi) · 1 unmodified line
745742 .for_reclaim = 0,
746743 };
747744 struct blk_plug plug;
745+ int err = 0;
748746
749747 blk_start_plug(&plug);
750748
@@ -754,11 +752,15 @@ retry_flush_dents: · 3 unmodified lines
754752 if (get_pages(sbi, F2FS_DIRTY_DENTS)) {
755753 f2fs_unlock_all(sbi);
756754 sync_dirty_dir_inodes(sbi);
755+ if (unlikely(f2fs_cp_error(sbi))) {
756+ err = -EIO;
757+ goto out;
758+ }
757759 goto retry_flush_dents;
758760 }
759761
760762 /*
761− * POR: we should ensure that there is no dirty node pages
763+ * POR: we should ensure that there are no dirty node pages
762764 * until finishing nat/sit flush.
763765 */
764766 retry_flush_nodes:
@@ -767,9 +769,16 @@ retry_flush_nodes: · 2 unmodified lines
767769 if (get_pages(sbi, F2FS_DIRTY_NODES)) {
768770 up_write(&sbi->node_write);
769771 sync_node_pages(sbi, 0, &wbc);
772+ if (unlikely(f2fs_cp_error(sbi))) {
773+ f2fs_unlock_all(sbi);
774+ err = -EIO;
775+ goto out;
776+ }
770777 goto retry_flush_nodes;
771778 }
779+out:
772780 blk_finish_plug(&plug);
781+ return err;
773782 }
774783
775784 static void unblock_operations(struct f2fs_sb_info *sbi)
@@ -813,8 +822,11 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount) · 37 unmodified lines
813822 discard_next_dnode(sbi, NEXT_FREE_BLKADDR(sbi, curseg));
814823
815824 /* Flush all the NAT/SIT pages */
816− while (get_pages(sbi, F2FS_DIRTY_META))
825+ while (get_pages(sbi, F2FS_DIRTY_META)) {
817826 sync_meta_pages(sbi, META, LONG_MAX);
827+ if (unlikely(f2fs_cp_error(sbi)))
828+ return;
829+ }
818830
819831 next_free_nid(sbi, &last_nid);
820832
@@ -825,7 +837,7 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount) · 4 unmodified lines
825837 ckpt->elapsed_time = cpu_to_le64(get_mtime(sbi));
826838 ckpt->valid_block_count = cpu_to_le64(valid_user_blocks(sbi));
827839 ckpt->free_segment_count = cpu_to_le32(free_segments(sbi));
828− for (i = 0; i < 3; i++) {
840+ for (i = 0; i < NR_CURSEG_NODE_TYPE; i++) {
829841 ckpt->cur_node_segno[i] =
830842 cpu_to_le32(curseg_segno(sbi, i + CURSEG_HOT_NODE));
831843 ckpt->cur_node_blkoff[i] =
@@ -833,7 +845,7 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount) · 1 unmodified line
833845 ckpt->alloc_type[i + CURSEG_HOT_NODE] =
834846 curseg_alloc_type(sbi, i + CURSEG_HOT_NODE);
835847 }
836− for (i = 0; i < 3; i++) {
848+ for (i = 0; i < NR_CURSEG_DATA_TYPE; i++) {
837849 ckpt->cur_data_segno[i] =
838850 cpu_to_le32(curseg_segno(sbi, i + CURSEG_HOT_DATA));
839851 ckpt->cur_data_blkoff[i] =
@@ -848,24 +860,23 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount) · 8 unmodified lines
848860
849861 /* 2 cp + n data seg summary + orphan inode blocks */
850862 data_sum_blocks = npages_for_summary_flush(sbi);
851− if (data_sum_blocks < 3)
863+ if (data_sum_blocks < NR_CURSEG_DATA_TYPE)
852864 set_ckpt_flags(ckpt, CP_COMPACT_SUM_FLAG);
853865 else
854866 clear_ckpt_flags(ckpt, CP_COMPACT_SUM_FLAG);
855867
856− orphan_blocks = (sbi->n_orphans + F2FS_ORPHANS_PER_BLOCK - 1)
857− / F2FS_ORPHANS_PER_BLOCK;
868+ orphan_blocks = GET_ORPHAN_BLOCKS(sbi->n_orphans);
858869 ckpt->cp_pack_start_sum = cpu_to_le32(1 + cp_payload_blks +
859870 orphan_blocks);
860871
861872 if (is_umount) {
862873 set_ckpt_flags(ckpt, CP_UMOUNT_FLAG);
863− ckpt->cp_pack_total_block_count = cpu_to_le32(2 +
874+ ckpt->cp_pack_total_block_count = cpu_to_le32(F2FS_CP_PACKS+
864875 cp_payload_blks + data_sum_blocks +
865876 orphan_blocks + NR_CURSEG_NODE_TYPE);
866877 } else {
867878 clear_ckpt_flags(ckpt, CP_UMOUNT_FLAG);
868− ckpt->cp_pack_total_block_count = cpu_to_le32(2 +
879+ ckpt->cp_pack_total_block_count = cpu_to_le32(F2FS_CP_PACKS +
869880 cp_payload_blks + data_sum_blocks +
870881 orphan_blocks);
871882 }
@@ -924,6 +935,9 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount) · 52 unmodified lines
924935 /* wait for previous submitted node/meta pages writeback */
925936 wait_on_all_pages_writeback(sbi);
926937
938+ if (unlikely(f2fs_cp_error(sbi)))
939+ return;
940+
927941 filemap_fdatawait_range(NODE_MAPPING(sbi), 0, LONG_MAX);
928942 filemap_fdatawait_range(META_MAPPING(sbi), 0, LONG_MAX);
929943
@@ -934,15 +948,17 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount) · 4 unmodified lines
934948 /* Here, we only have one bio having CP pack */
935949 sync_meta_pages(sbi, META_FLUSH, LONG_MAX);
936950
937− if (!is_set_ckpt_flags(ckpt, CP_ERROR_FLAG)) {
938− clear_prefree_segments(sbi);
939− release_dirty_inode(sbi);
940− F2FS_RESET_SB_DIRT(sbi);
941− }
951+ release_dirty_inode(sbi);
952+
953+ if (unlikely(f2fs_cp_error(sbi)))
954+ return;
955+
956+ clear_prefree_segments(sbi);
957+ F2FS_RESET_SB_DIRT(sbi);
942958 }
943959
944960 /*
945− * We guarantee that this checkpoint procedure should not fail.
961+ * We guarantee that this checkpoint procedure will not fail.
946962 */
947963 void write_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)
948964 {
@@ -952,7 +968,13 @@ void write_checkpoint(struct f2fs_sb_info *sbi, bool is_umount) · 3 unmodified lines
952968 trace_f2fs_write_checkpoint(sbi->sb, is_umount, "start block_ops");
953969
954970 mutex_lock(&sbi->cp_mutex);
955− block_operations(sbi);
971+
972+ if (!sbi->s_dirty)
973+ goto out;
974+ if (unlikely(f2fs_cp_error(sbi)))
975+ goto out;
976+ if (block_operations(sbi))
977+ goto out;
956978
957979 trace_f2fs_write_checkpoint(sbi->sb, is_umount, "finish block_ops");
958980
@@ -976,9 +998,9 @@ void write_checkpoint(struct f2fs_sb_info *sbi, bool is_umount) · 17 unmodified lines
976998 do_checkpoint(sbi, is_umount);
977999
9781000 unblock_operations(sbi);
979− mutex_unlock(&sbi->cp_mutex);
980−
9811001 stat_inc_cp_count(sbi->stat_info);
1002+out:
1003+ mutex_unlock(&sbi->cp_mutex);
9821004 trace_f2fs_write_checkpoint(sbi->sb, is_umount, "finish checkpoint");
9831005 }
9841006
@@ -999,8 +1021,8 @@ void init_ino_entry_info(struct f2fs_sb_info *sbi) · 14 unmodified lines
9991021 * for cp pack we can have max 1020*504 orphan entries
10001022 */
10011023 sbi->n_orphans = 0;
1002− sbi->max_orphans = (sbi->blocks_per_seg - 2 - NR_CURSEG_TYPE)
1003− * F2FS_ORPHANS_PER_BLOCK;
1024+ sbi->max_orphans = (sbi->blocks_per_seg - F2FS_CP_PACKS -
1025+ NR_CURSEG_TYPE) * F2FS_ORPHANS_PER_BLOCK;
10041026 }
10051027
10061028 int __init create_checkpoint_caches(void)
fs/f2fs/data.c+14−5
@@ -53,7 +53,7 @@ static void f2fs_write_end_io(struct bio *bio, int err) · 52 unmodified lines
5353 struct page *page = bvec->bv_page;
5454
5555 if (unlikely(err)) {
56− SetPageError(page);
56+ set_page_dirty(page);
5757 set_bit(AS_EIO, &page->mapping->flags);
5858 f2fs_stop_checkpoint(sbi);
5959 }
@@ -691,7 +691,7 @@ get_next: · 631 unmodified lines
691691 allocated = true;
692692 blkaddr = dn.data_blkaddr;
693693 }
694− /* Give more consecutive addresses for the read ahead */
694+ /* Give more consecutive addresses for the readahead */
695695 if (blkaddr == (bh_result->b_blocknr + ofs)) {
696696 ofs++;
697697 dn.ofs_in_node++;
@@ -739,7 +739,7 @@ static int f2fs_read_data_page(struct file *file, struct page *page) · 41 unmodified lines
739739
740740 trace_f2fs_readpage(page, DATA);
741741
742− /* If the file has inline data, try to read it directlly */
742+ /* If the file has inline data, try to read it directly */
743743 if (f2fs_has_inline_data(inode))
744744 ret = f2fs_read_inline_data(inode, page);
745745 else
@@ -836,10 +836,19 @@ write: · 90 unmodified lines
836836
837837 /* Dentry blocks are controlled by checkpoint */
838838 if (S_ISDIR(inode->i_mode)) {
839+ if (unlikely(f2fs_cp_error(sbi)))
840+ goto redirty_out;
839841 err = do_write_data_page(page, &fio);
840842 goto done;
841843 }
842844
845+ /* we should bypass data pages to proceed the kworkder jobs */
846+ if (unlikely(f2fs_cp_error(sbi))) {
847+ SetPageError(page);
848+ unlock_page(page);
849+ return 0;
850+ }
851+
843852 if (!wbc->for_reclaim)
844853 need_balance_fs = true;
845854 else if (has_not_enough_free_secs(sbi, 0))
@@ -927,7 +936,7 @@ static void f2fs_write_failed(struct address_space *mapping, loff_t to) · 81 unmodified lines
927936
928937 if (to > inode->i_size) {
929938 truncate_pagecache(inode, inode->i_size);
930− truncate_blocks(inode, inode->i_size);
939+ truncate_blocks(inode, inode->i_size, true);
931940 }
932941 }
933942
@@ -946,7 +955,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, · 12 unmodified lines
946955
947956 f2fs_balance_fs(sbi);
948957 repeat:
949− err = f2fs_convert_inline_data(inode, pos + len);
958+ err = f2fs_convert_inline_data(inode, pos + len, NULL);
950959 if (err)
951960 goto fail;
952961
fs/f2fs/debug.c+2−2
@@ -32,7 +32,7 @@ static void update_general_status(struct f2fs_sb_info *sbi) · 31 unmodified lines
3232 struct f2fs_stat_info *si = F2FS_STAT(sbi);
3333 int i;
3434
35− /* valid check of the segment numbers */
35+ /* validation check of the segment numbers */
3636 si->hit_ext = sbi->read_hit_ext;
3737 si->total_ext = sbi->total_hit_ext;
3838 si->ndirty_node = get_pages(sbi, F2FS_DIRTY_NODES);
@@ -152,7 +152,7 @@ static void update_mem_info(struct f2fs_sb_info *sbi) · 113 unmodified lines
152152 si->base_mem += NR_DIRTY_TYPE * f2fs_bitmap_size(TOTAL_SEGS(sbi));
153153 si->base_mem += f2fs_bitmap_size(TOTAL_SECS(sbi));
154154
155− /* buld nm */
155+ /* build nm */
156156 si->base_mem += sizeof(struct f2fs_nm_info);
157157 si->base_mem += __bitmap_size(sbi, NAT_BITMAP);
158158
fs/f2fs/dir.c+3−3
@@ -124,7 +124,7 @@ static struct f2fs_dir_entry *find_in_block(struct page *dentry_page, · 123 unmodified lines
124124
125125 /*
126126 * For the most part, it should be a bug when name_len is zero.
127− * We stop here for figuring out where the bugs are occurred.
127+ * We stop here for figuring out where the bugs has occurred.
128128 */
129129 f2fs_bug_on(!de->name_len);
130130
@@ -391,7 +391,7 @@ put_error: · 260 unmodified lines
391391 error:
392392 /* once the failed inode becomes a bad inode, i_mode is S_IFREG */
393393 truncate_inode_pages(&inode->i_data, 0);
394− truncate_blocks(inode, 0);
394+ truncate_blocks(inode, 0, false);
395395 remove_dirty_dir_inode(inode);
396396 remove_inode_page(inode);
397397 return ERR_PTR(err);
@@ -563,7 +563,7 @@ fail: · 165 unmodified lines
563563 }
564564
565565 /*
566− * It only removes the dentry from the dentry page,corresponding name
566+ * It only removes the dentry from the dentry page, corresponding name
567567 * entry in name page does not need to be touched during deletion.
568568 */
569569 void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
fs/f2fs/f2fs.h+14−12
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 #define f2fs_bug_on(condition) BUG_ON(condition)
2525 #define f2fs_down_write(x, y) down_write_nest_lock(x, y)
2626 #else
27−#define f2fs_bug_on(condition)
27+#define f2fs_bug_on(condition) WARN_ON(condition)
2828 #define f2fs_down_write(x, y) down_write(x)
2929 #endif
3030
@@ -395,7 +395,7 @@ enum count_type { · 364 unmodified lines
395395 };
396396
397397 /*
398− * The below are the page types of bios used in submti_bio().
398+ * The below are the page types of bios used in submit_bio().
399399 * The available types are:
400400 * DATA User data pages. It operates as async mode.
401401 * NODE Node pages. It operates as async mode.
@@ -470,7 +470,7 @@ struct f2fs_sb_info { · 68 unmodified lines
470470 struct list_head dir_inode_list; /* dir inode list */
471471 spinlock_t dir_inode_lock; /* for dir inode list lock */
472472
473− /* basic file system units */
473+ /* basic filesystem units */
474474 unsigned int log_sectors_per_block; /* log2 sectors per block */
475475 unsigned int log_blocksize; /* log2 block size */
476476 unsigned int blocksize; /* block size */
@@ -799,7 +799,7 @@ static inline block_t __start_cp_addr(struct f2fs_sb_info *sbi) · 322 unmodified lines
799799
800800 /*
801801 * odd numbered checkpoint should at cp segment 0
802− * and even segent must be at cp segment 1
802+ * and even segment must be at cp segment 1
803803 */
804804 if (!(ckpt_version & 1))
805805 start_addr += sbi->blocks_per_seg;
@@ -1096,6 +1096,11 @@ static inline int f2fs_readonly(struct super_block *sb) · 290 unmodified lines
10961096 return sb->s_flags & MS_RDONLY;
10971097 }
10981098
1099+static inline bool f2fs_cp_error(struct f2fs_sb_info *sbi)
1100+{
1101+ return is_set_ckpt_flags(sbi->ckpt, CP_ERROR_FLAG);
1102+}
1103+
10991104 static inline void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi)
11001105 {
11011106 set_ckpt_flags(sbi->ckpt, CP_ERROR_FLAG);
@@ -1117,7 +1122,7 @@ static inline void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi) · 15 unmodified lines
11171122 */
11181123 int f2fs_sync_file(struct file *, loff_t, loff_t, int);
11191124 void truncate_data_blocks(struct dnode_of_data *);
1120−int truncate_blocks(struct inode *, u64);
1125+int truncate_blocks(struct inode *, u64, bool);
11211126 void f2fs_truncate(struct inode *);
11221127 int f2fs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
11231128 int f2fs_setattr(struct dentry *, struct iattr *);
@@ -1202,10 +1207,8 @@ int sync_node_pages(struct f2fs_sb_info *, nid_t, struct writeback_control *); · 78 unmodified lines
12021207 bool alloc_nid(struct f2fs_sb_info *, nid_t *);
12031208 void alloc_nid_done(struct f2fs_sb_info *, nid_t);
12041209 void alloc_nid_failed(struct f2fs_sb_info *, nid_t);
1205−void recover_node_page(struct f2fs_sb_info *, struct page *,
1206− struct f2fs_summary *, struct node_info *, block_t);
12071210 void recover_inline_xattr(struct inode *, struct page *);
1208−bool recover_xattr_data(struct inode *, struct page *, block_t);
1211+void recover_xattr_data(struct inode *, struct page *, block_t);
12091212 int recover_inode_page(struct f2fs_sb_info *, struct page *);
12101213 int restore_node_summary(struct f2fs_sb_info *, unsigned int,
12111214 struct f2fs_summary_block *);
@@ -1238,8 +1241,6 @@ void write_data_page(struct page *, struct dnode_of_data *, block_t *, · 26 unmodified lines
12381241 void rewrite_data_page(struct page *, block_t, struct f2fs_io_info *);
12391242 void recover_data_page(struct f2fs_sb_info *, struct page *,
12401243 struct f2fs_summary *, block_t, block_t);
1241−void rewrite_node_page(struct f2fs_sb_info *, struct page *,
1242− struct f2fs_summary *, block_t, block_t);
12431244 void allocate_data_block(struct f2fs_sb_info *, struct page *,
12441245 block_t, block_t *, struct f2fs_summary *, int);
12451246 void f2fs_wait_on_page_writeback(struct page *, enum page_type);
@@ -1262,6 +1263,7 @@ int ra_meta_pages(struct f2fs_sb_info *, int, int, int); · 16 unmodified lines
12621263 long sync_meta_pages(struct f2fs_sb_info *, enum page_type, long);
12631264 void add_dirty_inode(struct f2fs_sb_info *, nid_t, int type);
12641265 void remove_dirty_inode(struct f2fs_sb_info *, nid_t, int type);
1266+void release_dirty_inode(struct f2fs_sb_info *);
12651267 bool exist_written_data(struct f2fs_sb_info *, nid_t, int);
12661268 int acquire_orphan_inode(struct f2fs_sb_info *);
12671269 void release_orphan_inode(struct f2fs_sb_info *);
@@ -1439,8 +1441,8 @@ extern const struct inode_operations f2fs_special_inode_operations; · 171 unmodified lines
14391441 */
14401442 bool f2fs_may_inline(struct inode *);
14411443 int f2fs_read_inline_data(struct inode *, struct page *);
1442−int f2fs_convert_inline_data(struct inode *, pgoff_t);
1444+int f2fs_convert_inline_data(struct inode *, pgoff_t, struct page *);
14431445 int f2fs_write_inline_data(struct inode *, struct page *, unsigned int);
14441446 void truncate_inline_data(struct inode *, u64);
1445−int recover_inline_data(struct inode *, struct page *);
1447+bool recover_inline_data(struct inode *, struct page *);
14461448 #endif
fs/f2fs/file.c+38−22
@@ -41,6 +41,11 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma, · 40 unmodified lines
4141
4242 sb_start_pagefault(inode->i_sb);
4343
44+ /* force to convert with normal data indices */
45+ err = f2fs_convert_inline_data(inode, MAX_INLINE_DATA + 1, page);
46+ if (err)
47+ goto out;
48+
4449 /* block allocation */
4550 f2fs_lock_op(sbi);
4651 set_new_dnode(&dn, inode, NULL, NULL, 0);
@@ -110,6 +115,25 @@ static int get_parent_ino(struct inode *inode, nid_t *pino) · 63 unmodified lines
110115 return 1;
111116 }
112117
118+static inline bool need_do_checkpoint(struct inode *inode)
119+{
120+ struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
121+ bool need_cp = false;
122+
123+ if (!S_ISREG(inode->i_mode) || inode->i_nlink != 1)
124+ need_cp = true;
125+ else if (file_wrong_pino(inode))
126+ need_cp = true;
127+ else if (!space_for_roll_forward(sbi))
128+ need_cp = true;
129+ else if (!is_checkpointed_node(sbi, F2FS_I(inode)->i_pino))
130+ need_cp = true;
131+ else if (F2FS_I(inode)->xattr_ver == cur_cp_version(F2FS_CKPT(sbi)))
132+ need_cp = true;
133+
134+ return need_cp;
135+}
136+
113137 int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
114138 {
115139 struct inode *inode = file->f_mapping->host;
@@ -154,23 +178,12 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) · 38 unmodified lines
154178 /* guarantee free sections for fsync */
155179 f2fs_balance_fs(sbi);
156180
157− down_read(&fi->i_sem);
158−
159181 /*
160182 * Both of fdatasync() and fsync() are able to be recovered from
161183 * sudden-power-off.
162184 */
163− if (!S_ISREG(inode->i_mode) || inode->i_nlink != 1)
164− need_cp = true;
165− else if (file_wrong_pino(inode))
166− need_cp = true;
167− else if (!space_for_roll_forward(sbi))
168− need_cp = true;
169− else if (!is_checkpointed_node(sbi, F2FS_I(inode)->i_pino))
170− need_cp = true;
171− else if (F2FS_I(inode)->xattr_ver == cur_cp_version(F2FS_CKPT(sbi)))
172− need_cp = true;
173−
185+ down_read(&fi->i_sem);
186+ need_cp = need_do_checkpoint(inode);
174187 up_read(&fi->i_sem);
175188
176189 if (need_cp) {
@@ -288,7 +301,7 @@ static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence) · 111 unmodified lines
288301 if (err && err != -ENOENT) {
289302 goto fail;
290303 } else if (err == -ENOENT) {
291− /* direct node is not exist */
304+ /* direct node does not exists */
292305 if (whence == SEEK_DATA) {
293306 pgofs = PGOFS_OF_NEXT_DNODE(pgofs,
294307 F2FS_I(inode));
@@ -417,7 +430,7 @@ out: · 122 unmodified lines
417430 f2fs_put_page(page, 1);
418431 }
419432
420−int truncate_blocks(struct inode *inode, u64 from)
433+int truncate_blocks(struct inode *inode, u64 from, bool lock)
421434 {
422435 struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
423436 unsigned int blocksize = inode->i_sb->s_blocksize;
@@ -433,14 +446,16 @@ int truncate_blocks(struct inode *inode, u64 from) · 9 unmodified lines
433446 free_from = (pgoff_t)
434447 ((from + blocksize - 1) >> (sbi->log_blocksize));
435448
436− f2fs_lock_op(sbi);
449+ if (lock)
450+ f2fs_lock_op(sbi);
437451
438452 set_new_dnode(&dn, inode, NULL, NULL, 0);
439453 err = get_dnode_of_data(&dn, free_from, LOOKUP_NODE);
440454 if (err) {
441455 if (err == -ENOENT)
442456 goto free_next;
443− f2fs_unlock_op(sbi);
457+ if (lock)
458+ f2fs_unlock_op(sbi);
444459 trace_f2fs_truncate_blocks_exit(inode, err);
445460 return err;
446461 }
@@ -458,7 +473,8 @@ int truncate_blocks(struct inode *inode, u64 from) · 11 unmodified lines
458473 f2fs_put_dnode(&dn);
459474 free_next:
460475 err = truncate_inode_blocks(inode, free_from);
461− f2fs_unlock_op(sbi);
476+ if (lock)
477+ f2fs_unlock_op(sbi);
462478 done:
463479 /* lastly zero out the first data page */
464480 truncate_partial_data_page(inode, from);
@@ -475,7 +491,7 @@ void f2fs_truncate(struct inode *inode) · 10 unmodified lines
475491
476492 trace_f2fs_truncate(inode);
477493
478− if (!truncate_blocks(inode, i_size_read(inode))) {
494+ if (!truncate_blocks(inode, i_size_read(inode), true)) {
479495 inode->i_mtime = inode->i_ctime = CURRENT_TIME;
480496 mark_inode_dirty(inode);
481497 }
@@ -533,7 +549,7 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr) · 51 unmodified lines
533549
534550 if ((attr->ia_valid & ATTR_SIZE) &&
535551 attr->ia_size != i_size_read(inode)) {
536− err = f2fs_convert_inline_data(inode, attr->ia_size);
552+ err = f2fs_convert_inline_data(inode, attr->ia_size, NULL);
537553 if (err)
538554 return err;
539555
@@ -622,7 +638,7 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len) · 82 unmodified lines
622638 loff_t off_start, off_end;
623639 int ret = 0;
624640
625− ret = f2fs_convert_inline_data(inode, MAX_INLINE_DATA + 1);
641+ ret = f2fs_convert_inline_data(inode, MAX_INLINE_DATA + 1, NULL);
626642 if (ret)
627643 return ret;
628644
@@ -678,7 +694,7 @@ static int expand_inode_data(struct inode *inode, loff_t offset, · 49 unmodified lines
678694 if (ret)
679695 return ret;
680696
681− ret = f2fs_convert_inline_data(inode, offset + len);
697+ ret = f2fs_convert_inline_data(inode, offset + len, NULL);
682698 if (ret)
683699 return ret;
684700
fs/f2fs/gc.c+4−4
@@ -58,7 +58,7 @@ static int gc_thread_func(void *data) · 57 unmodified lines
5858 * 3. IO subsystem is idle by checking the # of requests in
5959 * bdev's request list.
6060 *
61− * Note) We have to avoid triggering GCs too much frequently.
61+ * Note) We have to avoid triggering GCs frequently.
6262 * Because it is possible that some segments can be
6363 * invalidated soon after by user update or deletion.
6464 * So, I'd like to wait some time to collect dirty segments.
@@ -222,7 +222,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno) · 157 unmodified lines
222222
223223 u = (vblocks * 100) >> sbi->log_blocks_per_seg;
224224
225− /* Handle if the system time is changed by user */
225+ /* Handle if the system time has changed by the user */
226226 if (mtime < sit_i->min_mtime)
227227 sit_i->min_mtime = mtime;
228228 if (mtime > sit_i->max_mtime)
@@ -593,7 +593,7 @@ next_step: · 364 unmodified lines
593593
594594 if (phase == 2) {
595595 inode = f2fs_iget(sb, dni.ino);
596− if (IS_ERR(inode))
596+ if (IS_ERR(inode) || is_bad_inode(inode))
597597 continue;
598598
599599 start_bidx = start_bidx_of_node(nofs, F2FS_I(inode));
@@ -693,7 +693,7 @@ int f2fs_gc(struct f2fs_sb_info *sbi) · 93 unmodified lines
693693 gc_more:
694694 if (unlikely(!(sbi->sb->s_flags & MS_ACTIVE)))
695695 goto stop;
696− if (unlikely(is_set_ckpt_flags(F2FS_CKPT(sbi), CP_ERROR_FLAG)))
696+ if (unlikely(f2fs_cp_error(sbi)))
697697 goto stop;
698698
699699 if (gc_type == BG_GC && has_not_enough_free_secs(sbi, nfree)) {
fs/f2fs/gc.h+1−1
@@ -91,7 +91,7 @@ static inline bool has_enough_invalid_blocks(struct f2fs_sb_info *sbi) · 90 unmodified lines
9191 block_t invalid_user_blocks = sbi->user_block_count -
9292 written_block_count(sbi);
9393 /*
94− * Background GC is triggered with the following condition.
94+ * Background GC is triggered with the following conditions.
9595 * 1. There are a number of invalid blocks.
9696 * 2. There is not enough free space.
9797 */
fs/f2fs/hash.c+4−3
@@ -42,7 +42,8 @@ static void TEA_transform(unsigned int buf[4], unsigned int const in[]) · 41 unmodified lines
4242 buf[1] += b1;
4343 }
4444
45−static void str2hashbuf(const char *msg, size_t len, unsigned int *buf, int num)
45+static void str2hashbuf(const unsigned char *msg, size_t len,
46+ unsigned int *buf, int num)
4647 {
4748 unsigned pad, val;
4849 int i;
@@ -73,9 +74,9 @@ f2fs_hash_t f2fs_dentry_hash(const struct qstr *name_info) · 24 unmodified lines
7374 {
7475 __u32 hash;
7576 f2fs_hash_t f2fs_hash;
76− const char *p;
77+ const unsigned char *p;
7778 __u32 in[8], buf[4];
78− const char *name = name_info->name;
79+ const unsigned char *name = name_info->name;
7980 size_t len = name_info->len;
8081
8182 if ((len <= 2) && (name[0] == '.') &&
fs/f2fs/inline.c+23−15
@@ -68,7 +68,7 @@ out: · 67 unmodified lines
6868
6969 static int __f2fs_convert_inline_data(struct inode *inode, struct page *page)
7070 {
71− int err;
71+ int err = 0;
7272 struct page *ipage;
7373 struct dnode_of_data dn;
7474 void *src_addr, *dst_addr;
@@ -86,6 +86,10 @@ static int __f2fs_convert_inline_data(struct inode *inode, struct page *page) · 11 unmodified lines
8686 goto out;
8787 }
8888
89+ /* someone else converted inline_data already */
90+ if (!f2fs_has_inline_data(inode))
91+ goto out;
92+
8993 /*
9094 * i_addr[0] is not used for inline data,
9195 * so reserving new block will not destroy inline data
@@ -124,9 +128,10 @@ out: · 32 unmodified lines
124128 return err;
125129 }
126130
127−int f2fs_convert_inline_data(struct inode *inode, pgoff_t to_size)
131+int f2fs_convert_inline_data(struct inode *inode, pgoff_t to_size,
132+ struct page *page)
128133 {
129− struct page *page;
134+ struct page *new_page = page;
130135 int err;
131136
132137 if (!f2fs_has_inline_data(inode))
@@ -134,17 +139,20 @@ int f2fs_convert_inline_data(struct inode *inode, pgoff_t to_size) · 1 unmodified line
134139 else if (to_size <= MAX_INLINE_DATA)
135140 return 0;
136141
137− page = grab_cache_page(inode->i_mapping, 0);
138− if (!page)
139− return -ENOMEM;
142+ if (!page || page->index != 0) {
143+ new_page = grab_cache_page(inode->i_mapping, 0);
144+ if (!new_page)
145+ return -ENOMEM;
146+ }
140147
141− err = __f2fs_convert_inline_data(inode, page);
142− f2fs_put_page(page, 1);
148+ err = __f2fs_convert_inline_data(inode, new_page);
149+ if (!page || page->index != 0)
150+ f2fs_put_page(new_page, 1);
143151 return err;
144152 }
145153
146154 int f2fs_write_inline_data(struct inode *inode,
147− struct page *page, unsigned size)
155+ struct page *page, unsigned size)
148156 {
149157 void *src_addr, *dst_addr;
150158 struct page *ipage;
@@ -199,7 +207,7 @@ void truncate_inline_data(struct inode *inode, u64 from) · 48 unmodified lines
199207 f2fs_put_page(ipage, 1);
200208 }
201209
202−int recover_inline_data(struct inode *inode, struct page *npage)
210+bool recover_inline_data(struct inode *inode, struct page *npage)
203211 {
204212 struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
205213 struct f2fs_inode *ri = NULL;
@@ -218,7 +226,7 @@ int recover_inline_data(struct inode *inode, struct page *npage) · 12 unmodified lines
218226 ri = F2FS_INODE(npage);
219227
220228 if (f2fs_has_inline_data(inode) &&
221− ri && ri->i_inline & F2FS_INLINE_DATA) {
229+ ri && (ri->i_inline & F2FS_INLINE_DATA)) {
222230 process_inline:
223231 ipage = get_node_page(sbi, inode->i_ino);
224232 f2fs_bug_on(IS_ERR(ipage));
@@ -230,7 +238,7 @@ process_inline: · 5 unmodified lines
230238 memcpy(dst_addr, src_addr, MAX_INLINE_DATA);
231239 update_inode(inode, ipage);
232240 f2fs_put_page(ipage, 1);
233− return -1;
241+ return true;
234242 }
235243
236244 if (f2fs_has_inline_data(inode)) {
@@ -242,10 +250,10 @@ process_inline: · 5 unmodified lines
242250 clear_inode_flag(F2FS_I(inode), FI_INLINE_DATA);
243251 update_inode(inode, ipage);
244252 f2fs_put_page(ipage, 1);
245− } else if (ri && ri->i_inline & F2FS_INLINE_DATA) {
246− truncate_blocks(inode, 0);
253+ } else if (ri && (ri->i_inline & F2FS_INLINE_DATA)) {
254+ truncate_blocks(inode, 0, false);
247255 set_inode_flag(F2FS_I(inode), FI_INLINE_DATA);
248256 goto process_inline;
249257 }
250− return 0;
258+ return false;
251259 }
fs/f2fs/namei.c+6−17
@@ -134,9 +134,7 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, · 133 unmodified lines
134134 return 0;
135135 out:
136136 clear_nlink(inode);
137− unlock_new_inode(inode);
138− make_bad_inode(inode);
139− iput(inode);
137+ iget_failed(inode);
140138 alloc_nid_failed(sbi, ino);
141139 return err;
142140 }
@@ -229,7 +227,7 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry) · 86 unmodified lines
229227 f2fs_delete_entry(de, page, inode);
230228 f2fs_unlock_op(sbi);
231229
232− /* In order to evict this inode, we set it dirty */
230+ /* In order to evict this inode, we set it dirty */
233231 mark_inode_dirty(inode);
234232 fail:
235233 trace_f2fs_unlink_exit(inode, err);
@@ -267,9 +265,7 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry, · 31 unmodified lines
267265 return err;
268266 out:
269267 clear_nlink(inode);
270− unlock_new_inode(inode);
271− make_bad_inode(inode);
272− iput(inode);
268+ iget_failed(inode);
273269 alloc_nid_failed(sbi, inode->i_ino);
274270 return err;
275271 }
@@ -308,9 +304,7 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) · 32 unmodified lines
308304 out_fail:
309305 clear_inode_flag(F2FS_I(inode), FI_INC_LINK);
310306 clear_nlink(inode);
311− unlock_new_inode(inode);
312− make_bad_inode(inode);
313− iput(inode);
307+ iget_failed(inode);
314308 alloc_nid_failed(sbi, inode->i_ino);
315309 return err;
316310 }
@@ -354,9 +348,7 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry, · 37 unmodified lines
354348 return 0;
355349 out:
356350 clear_nlink(inode);
357− unlock_new_inode(inode);
358− make_bad_inode(inode);
359− iput(inode);
351+ iget_failed(inode);
360352 alloc_nid_failed(sbi, inode->i_ino);
361353 return err;
362354 }
@@ -688,9 +680,7 @@ release_out: · 325 unmodified lines
688680 out:
689681 f2fs_unlock_op(sbi);
690682 clear_nlink(inode);
691− unlock_new_inode(inode);
692− make_bad_inode(inode);
693− iput(inode);
683+ iget_failed(inode);
694684 alloc_nid_failed(sbi, inode->i_ino);
695685 return err;
696686 }
@@ -704,7 +694,6 @@ const struct inode_operations f2fs_dir_inode_operations = { · 7 unmodified lines
704694 .mkdir = f2fs_mkdir,
705695 .rmdir = f2fs_rmdir,
706696 .mknod = f2fs_mknod,
707− .rename = f2fs_rename,
708697 .rename2 = f2fs_rename2,
709698 .tmpfile = f2fs_tmpfile,
710699 .getattr = f2fs_getattr,
fs/f2fs/node.c+37−43
@@ -237,7 +237,7 @@ retry: · 236 unmodified lines
237237 nat_get_blkaddr(e) != NULL_ADDR &&
238238 new_blkaddr == NEW_ADDR);
239239
240− /* increament version no as node is removed */
240+ /* increment version no as node is removed */
241241 if (nat_get_blkaddr(e) != NEW_ADDR && new_blkaddr == NULL_ADDR) {
242242 unsigned char version = nat_get_version(e);
243243 nat_set_version(e, inc_node_version(version));
@@ -274,7 +274,7 @@ int try_to_free_nats(struct f2fs_sb_info *sbi, int nr_shrink) · 30 unmodified lines
274274 }
275275
276276 /*
277− * This function returns always success
277+ * This function always returns success
278278 */
279279 void get_node_info(struct f2fs_sb_info *sbi, nid_t nid, struct node_info *ni)
280280 {
@@ -650,7 +650,7 @@ static int truncate_partial_nodes(struct dnode_of_data *dn, · 369 unmodified lines
650650
651651 /* get indirect nodes in the path */
652652 for (i = 0; i < idx + 1; i++) {
653− /* refernece count'll be increased */
653+ /* reference count'll be increased */
654654 pages[i] = get_node_page(sbi, nid[i]);
655655 if (IS_ERR(pages[i])) {
656656 err = PTR_ERR(pages[i]);
@@ -823,22 +823,26 @@ int truncate_xattr_node(struct inode *inode, struct page *page) · 166 unmodified lines
823823 */
824824 void remove_inode_page(struct inode *inode)
825825 {
826− struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
827− struct page *page;
828− nid_t ino = inode->i_ino;
829826 struct dnode_of_data dn;
830827
831− page = get_node_page(sbi, ino);
832− if (IS_ERR(page))
828+ set_new_dnode(&dn, inode, NULL, NULL, inode->i_ino);
829+ if (get_dnode_of_data(&dn, 0, LOOKUP_NODE))
833830 return;
834831
835− if (truncate_xattr_node(inode, page)) {
836− f2fs_put_page(page, 1);
832+ if (truncate_xattr_node(inode, dn.inode_page)) {
833+ f2fs_put_dnode(&dn);
837834 return;
838835 }
839− /* 0 is possible, after f2fs_new_inode() is failed */
836+
837+ /* remove potential inline_data blocks */
838+ if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
839+ S_ISLNK(inode->i_mode))
840+ truncate_data_blocks_range(&dn, 1);
841+
842+ /* 0 is possible, after f2fs_new_inode() has failed */
840843 f2fs_bug_on(inode->i_blocks != 0 && inode->i_blocks != 1);
841− set_new_dnode(&dn, inode, page, page, ino);
844+
845+ /* will put inode & node pages */
842846 truncate_node(&dn);
843847 }
844848
@@ -1129,8 +1133,11 @@ continue_unlock: · 284 unmodified lines
11291133 set_fsync_mark(page, 0);
11301134 set_dentry_mark(page, 0);
11311135 }
1132− NODE_MAPPING(sbi)->a_ops->writepage(page, wbc);
1133− wrote++;
1136+
1137+ if (NODE_MAPPING(sbi)->a_ops->writepage(page, wbc))
1138+ unlock_page(page);
1139+ else
1140+ wrote++;
11341141
11351142 if (--wbc->nr_to_write == 0)
11361143 break;
@@ -1212,6 +1219,8 @@ static int f2fs_write_node_page(struct page *page, · 75 unmodified lines
12121219
12131220 if (unlikely(sbi->por_doing))
12141221 goto redirty_out;
1222+ if (unlikely(f2fs_cp_error(sbi)))
1223+ goto redirty_out;
12151224
12161225 f2fs_wait_on_page_writeback(page, NODE);
12171226
@@ -1540,15 +1549,6 @@ void alloc_nid_failed(struct f2fs_sb_info *sbi, nid_t nid) · 322 unmodified lines
15401549 kmem_cache_free(free_nid_slab, i);
15411550 }
15421551
1543−void recover_node_page(struct f2fs_sb_info *sbi, struct page *page,
1544− struct f2fs_summary *sum, struct node_info *ni,
1545− block_t new_blkaddr)
1546−{
1547− rewrite_node_page(sbi, page, sum, ni->blk_addr, new_blkaddr);
1548− set_node_addr(sbi, ni, new_blkaddr, false);
1549− clear_node_page_dirty(page);
1550−}
1551−
15521552 void recover_inline_xattr(struct inode *inode, struct page *page)
15531553 {
15541554 struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
@@ -1557,40 +1557,33 @@ void recover_inline_xattr(struct inode *inode, struct page *page) · 2 unmodified lines
15571557 struct page *ipage;
15581558 struct f2fs_inode *ri;
15591559
1560− if (!f2fs_has_inline_xattr(inode))
1561− return;
1562−
1563− if (!IS_INODE(page))
1564− return;
1565−
1566− ri = F2FS_INODE(page);
1567− if (!(ri->i_inline & F2FS_INLINE_XATTR))
1568− return;
1569−
15701560 ipage = get_node_page(sbi, inode->i_ino);
15711561 f2fs_bug_on(IS_ERR(ipage));
15721562
1563+ ri = F2FS_INODE(page);
1564+ if (!(ri->i_inline & F2FS_INLINE_XATTR)) {
1565+ clear_inode_flag(F2FS_I(inode), FI_INLINE_XATTR);
1566+ goto update_inode;
1567+ }
1568+
15731569 dst_addr = inline_xattr_addr(ipage);
15741570 src_addr = inline_xattr_addr(page);
15751571 inline_size = inline_xattr_size(inode);
15761572
15771573 f2fs_wait_on_page_writeback(ipage, NODE);
15781574 memcpy(dst_addr, src_addr, inline_size);
1579−
1575+update_inode:
15801576 update_inode(inode, ipage);
15811577 f2fs_put_page(ipage, 1);
15821578 }
15831579
1584−bool recover_xattr_data(struct inode *inode, struct page *page, block_t blkaddr)
1580+void recover_xattr_data(struct inode *inode, struct page *page, block_t blkaddr)
15851581 {
15861582 struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
15871583 nid_t prev_xnid = F2FS_I(inode)->i_xattr_nid;
15881584 nid_t new_xnid = nid_of_node(page);
15891585 struct node_info ni;
15901586
1591− if (!f2fs_has_xattr_block(ofs_of_node(page)))
1592− return false;
1593−
15941587 /* 1: invalidate the previous xattr nid */
15951588 if (!prev_xnid)
15961589 goto recover_xnid;
@@ -1618,7 +1611,6 @@ recover_xnid: · 21 unmodified lines
16181611 set_node_addr(sbi, &ni, blkaddr, false);
16191612
16201613 update_inode_page(inode);
1621− return true;
16221614 }
16231615
16241616 int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page)
@@ -1637,7 +1629,7 @@ int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page) · 12 unmodified lines
16371629 if (!ipage)
16381630 return -ENOMEM;
16391631
1640− /* Should not use this inode from free nid list */
1632+ /* Should not use this inode from free nid list */
16411633 remove_free_nid(NM_I(sbi), ino);
16421634
16431635 SetPageUptodate(ipage);
@@ -1651,6 +1643,7 @@ int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page) · 7 unmodified lines
16511643 dst->i_blocks = cpu_to_le64(1);
16521644 dst->i_links = cpu_to_le32(1);
16531645 dst->i_xattr_nid = 0;
1646+ dst->i_inline = src->i_inline & F2FS_INLINE_XATTR;
16541647
16551648 new_ni = old_ni;
16561649 new_ni.ino = ino;
@@ -1659,13 +1652,14 @@ int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page) · 2 unmodified lines
16591652 WARN_ON(1);
16601653 set_node_addr(sbi, &new_ni, NEW_ADDR, false);
16611654 inc_valid_inode_count(sbi);
1655+ set_page_dirty(ipage);
16621656 f2fs_put_page(ipage, 1);
16631657 return 0;
16641658 }
16651659
16661660 /*
16671661 * ra_sum_pages() merge contiguous pages into one bio and submit.
1668− * these pre-readed pages are alloced in bd_inode's mapping tree.
1662+ * these pre-read pages are allocated in bd_inode's mapping tree.
16691663 */
16701664 static int ra_sum_pages(struct f2fs_sb_info *sbi, struct page **pages,
16711665 int start, int nrpages)
@@ -1709,7 +1703,7 @@ int restore_node_summary(struct f2fs_sb_info *sbi, · 37 unmodified lines
17091703 for (i = 0; !err && i < last_offset; i += nrpages, addr += nrpages) {
17101704 nrpages = min(last_offset - i, bio_blocks);
17111705
1712− /* read ahead node pages */
1706+ /* readahead node pages */
17131707 nrpages = ra_sum_pages(sbi, pages, addr, nrpages);
17141708 if (!nrpages)
17151709 return -ENOMEM;
@@ -1967,7 +1961,7 @@ static int init_node_manager(struct f2fs_sb_info *sbi) · 251 unmodified lines
19671961 nm_i->max_nid = NAT_ENTRY_PER_BLOCK * nat_blocks;
19681962
19691963 /* not used nids: 0, node, meta, (and root counted as valid node) */
1970− nm_i->available_nids = nm_i->max_nid - 3;
1964+ nm_i->available_nids = nm_i->max_nid - F2FS_RESERVED_NODE_NUM;
19711965 nm_i->fcnt = 0;
19721966 nm_i->nat_cnt = 0;
19731967 nm_i->ram_thresh = DEF_RAM_THRESHOLD;
fs/f2fs/recovery.c+22−8
@@ -62,8 +62,10 @@ static int recover_dentry(struct page *ipage, struct inode *inode) · 61 unmodified lines
6262 }
6363 retry:
6464 de = f2fs_find_entry(dir, &name, &page);
65− if (de && inode->i_ino == le32_to_cpu(de->ino))
65+ if (de && inode->i_ino == le32_to_cpu(de->ino)) {
66+ clear_inode_flag(F2FS_I(inode), FI_INC_LINK);
6667 goto out_unmap_put;
68+ }
6769 if (de) {
6870 einode = f2fs_iget(inode->i_sb, le32_to_cpu(de->ino));
6971 if (IS_ERR(einode)) {
@@ -300,14 +302,19 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, · 230 unmodified lines
300302 struct node_info ni;
301303 int err = 0, recovered = 0;
302304
303− recover_inline_xattr(inode, page);
304−
305− if (recover_inline_data(inode, page))
305+ /* step 1: recover xattr */
306+ if (IS_INODE(page)) {
307+ recover_inline_xattr(inode, page);
308+ } else if (f2fs_has_xattr_block(ofs_of_node(page))) {
309+ recover_xattr_data(inode, page, blkaddr);
306310 goto out;
311+ }
307312
308− if (recover_xattr_data(inode, page, blkaddr))
313+ /* step 2: recover inline data */
314+ if (recover_inline_data(inode, page))
309315 goto out;
310316
317+ /* step 3: recover data indices */
311318 start = start_bidx_of_node(ofs_of_node(page), fi);
312319 end = start + ADDRS_PER_PAGE(page, fi);
313320
@@ -364,8 +371,6 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, · 50 unmodified lines
364371 fill_node_footer(dn.node_page, dn.nid, ni.ino,
365372 ofs_of_node(page), false);
366373 set_page_dirty(dn.node_page);
367−
368− recover_node_page(sbi, dn.node_page, &sum, &ni, blkaddr);
369374 err:
370375 f2fs_put_dnode(&dn);
371376 f2fs_unlock_op(sbi);
@@ -452,6 +457,9 @@ int recover_fsync_data(struct f2fs_sb_info *sbi) · 80 unmodified lines
452457 /* step #1: find fsynced inode numbers */
453458 sbi->por_doing = true;
454459
460+ /* prevent checkpoint */
461+ mutex_lock(&sbi->cp_mutex);
462+
455463 blkaddr = NEXT_FREE_BLKADDR(sbi, curseg);
456464
457465 err = find_fsync_dnodes(sbi, &inode_list);
@@ -465,7 +473,8 @@ int recover_fsync_data(struct f2fs_sb_info *sbi) · 7 unmodified lines
465473
466474 /* step #2: recover data */
467475 err = recover_data(sbi, &inode_list, CURSEG_WARM_NODE);
468− f2fs_bug_on(!list_empty(&inode_list));
476+ if (!err)
477+ f2fs_bug_on(!list_empty(&inode_list));
469478 out:
470479 destroy_fsync_dnodes(&inode_list);
471480 kmem_cache_destroy(fsync_entry_slab);
@@ -482,8 +491,13 @@ out: · 10 unmodified lines
482491 /* Flush all the NAT/SIT pages */
483492 while (get_pages(sbi, F2FS_DIRTY_META))
484493 sync_meta_pages(sbi, META, LONG_MAX);
494+ set_ckpt_flags(sbi->ckpt, CP_ERROR_FLAG);
495+ mutex_unlock(&sbi->cp_mutex);
485496 } else if (need_writecp) {
497+ mutex_unlock(&sbi->cp_mutex);
486498 write_checkpoint(sbi, false);
499+ } else {
500+ mutex_unlock(&sbi->cp_mutex);
487501 }
488502 return err;
489503 }
fs/f2fs/segment.c+2−51
@@ -62,7 +62,7 @@ static inline unsigned long __reverse_ffs(unsigned long word) · 61 unmodified lines
6262 }
6363
6464 /*
65− * __find_rev_next(_zero)_bit is copied from lib/find_next_bit.c becasue
65+ * __find_rev_next(_zero)_bit is copied from lib/find_next_bit.c because
6666 * f2fs_set_bit makes MSB and LSB reversed in a byte.
6767 * Example:
6868 * LSB <--> MSB
@@ -808,7 +808,7 @@ static void __refresh_next_blkoff(struct f2fs_sb_info *sbi, · 739 unmodified lines
808808 }
809809
810810 /*
811− * This function always allocates a used segment (from dirty seglist) by SSR
811+ * This function always allocates a used segment(from dirty seglist) by SSR
812812 * manner, so it should recover the existing segment information of valid blocks
813813 */
814814 static void change_curseg(struct f2fs_sb_info *sbi, int type, bool reuse)
@@ -1103,55 +1103,6 @@ void recover_data_page(struct f2fs_sb_info *sbi, · 288 unmodified lines
11031103 mutex_unlock(&curseg->curseg_mutex);
11041104 }
11051105
1106−void rewrite_node_page(struct f2fs_sb_info *sbi,
1107− struct page *page, struct f2fs_summary *sum,
1108− block_t old_blkaddr, block_t new_blkaddr)
1109−{
1110− struct sit_info *sit_i = SIT_I(sbi);
1111− int type = CURSEG_WARM_NODE;
1112− struct curseg_info *curseg;
1113− unsigned int segno, old_cursegno;
1114− block_t next_blkaddr = next_blkaddr_of_node(page);
1115− unsigned int next_segno = GET_SEGNO(sbi, next_blkaddr);
1116− struct f2fs_io_info fio = {
1117− .type = NODE,
1118− .rw = WRITE_SYNC,
1119− };
1120−
1121− curseg = CURSEG_I(sbi, type);
1122−
1123− mutex_lock(&curseg->curseg_mutex);
1124− mutex_lock(&sit_i->sentry_lock);
1125−
1126− segno = GET_SEGNO(sbi, new_blkaddr);
1127− old_cursegno = curseg->segno;
1128−
1129− /* change the current segment */
1130− if (segno != curseg->segno) {
1131− curseg->next_segno = segno;
1132− change_curseg(sbi, type, true);
1133− }
1134− curseg->next_blkoff = GET_BLKOFF_FROM_SEG0(sbi, new_blkaddr);
1135− __add_sum_entry(sbi, type, sum);
1136−
1137− /* change the current log to the next block addr in advance */
1138− if (next_segno != segno) {
1139− curseg->next_segno = next_segno;
1140− change_curseg(sbi, type, true);
1141− }
1142− curseg->next_blkoff = GET_BLKOFF_FROM_SEG0(sbi, next_blkaddr);
1143−
1144− /* rewrite node page */
1145− set_page_writeback(page);
1146− f2fs_submit_page_mbio(sbi, page, new_blkaddr, &fio);
1147− f2fs_submit_merged_bio(sbi, NODE, WRITE);
1148− refresh_sit_entry(sbi, old_blkaddr, new_blkaddr);
1149− locate_dirty_segment(sbi, old_cursegno);
1150−
1151− mutex_unlock(&sit_i->sentry_lock);
1152− mutex_unlock(&curseg->curseg_mutex);
1153−}
1154−
11551106 static inline bool is_merged_page(struct f2fs_sb_info *sbi,
11561107 struct page *page, enum page_type type)
11571108 {
fs/f2fs/segment.h+1−1
@@ -549,7 +549,7 @@ static inline void verify_block_addr(struct f2fs_sb_info *sbi, block_t blk_addr) · 548 unmodified lines
549549 }
550550
551551 /*
552− * Summary block is always treated as invalid block
552+ * Summary block is always treated as an invalid block
553553 */
554554 static inline void check_block_count(struct f2fs_sb_info *sbi,
555555 int segno, struct f2fs_sit_entry *raw_sit)
fs/f2fs/super.c+23−9
@@ -432,9 +432,15 @@ static void f2fs_put_super(struct super_block *sb) · 431 unmodified lines
432432 stop_gc_thread(sbi);
433433
434434 /* We don't need to do checkpoint when it's clean */
435− if (sbi->s_dirty && get_pages(sbi, F2FS_DIRTY_NODES))
435+ if (sbi->s_dirty)
436436 write_checkpoint(sbi, true);
437437
438+ /*
439+ * normally superblock is clean, so we need to release this.
440+ * In addition, EIO will skip do checkpoint, we need this as well.
441+ */
442+ release_dirty_inode(sbi);
443+
438444 iput(sbi->node_inode);
439445 iput(sbi->meta_inode);
440446
@@ -457,9 +463,6 @@ int f2fs_sync_fs(struct super_block *sb, int sync) · 16 unmodified lines
457463
458464 trace_f2fs_sync_fs(sb, sync);
459465
460− if (!sbi->s_dirty && !get_pages(sbi, F2FS_DIRTY_NODES))
461− return 0;
462−
463466 if (sync) {
464467 mutex_lock(&sbi->gc_mutex);
465468 write_checkpoint(sbi, false);
@@ -505,8 +508,8 @@ static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf) · 39 unmodified lines
505508 buf->f_bfree = buf->f_blocks - valid_user_blocks(sbi) - ovp_count;
506509 buf->f_bavail = user_block_count - valid_user_blocks(sbi);
507510
508− buf->f_files = sbi->total_node_count;
509− buf->f_ffree = sbi->total_node_count - valid_inode_count(sbi);
511+ buf->f_files = sbi->total_node_count - F2FS_RESERVED_NODE_NUM;
512+ buf->f_ffree = buf->f_files - valid_inode_count(sbi);
510513
511514 buf->f_namelen = F2FS_NAME_LEN;
512515 buf->f_fsid.val[0] = (u32)id;
@@ -663,7 +666,7 @@ restore_gc: · 150 unmodified lines
663666 if (need_restart_gc) {
664667 if (start_gc_thread(sbi))
665668 f2fs_msg(sbi->sb, KERN_WARNING,
666− "background gc thread is stop");
669+ "background gc thread has stopped");
667670 } else if (need_stop_gc) {
668671 stop_gc_thread(sbi);
669672 }
@@ -812,7 +815,7 @@ static int sanity_check_ckpt(struct f2fs_sb_info *sbi) · 142 unmodified lines
812815 if (unlikely(fsmeta >= total))
813816 return 1;
814817
815− if (unlikely(is_set_ckpt_flags(ckpt, CP_ERROR_FLAG))) {
818+ if (unlikely(f2fs_cp_error(sbi))) {
816819 f2fs_msg(sbi->sb, KERN_ERR, "A bug case: need to run fsck");
817820 return 1;
818821 }
@@ -899,8 +902,10 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) · 80 unmodified lines
899902 struct buffer_head *raw_super_buf;
900903 struct inode *root;
901904 long err = -EINVAL;
905+ bool retry = true;
902906 int i;
903907
908+try_onemore:
904909 /* allocate memory for f2fs-specific super block info */
905910 sbi = kzalloc(sizeof(struct f2fs_sb_info), GFP_KERNEL);
906911 if (!sbi)
@@ -1080,9 +1085,11 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) · 173 unmodified lines
10801085 /* recover fsynced data */
10811086 if (!test_opt(sbi, DISABLE_ROLL_FORWARD)) {
10821087 err = recover_fsync_data(sbi);
1083− if (err)
1088+ if (err) {
10841089 f2fs_msg(sb, KERN_ERR,
10851090 "Cannot recover all fsync data errno=%ld", err);
1091+ goto free_kobj;
1092+ }
10861093 }
10871094
10881095 /*
@@ -1123,6 +1130,13 @@ free_sb_buf: · 34 unmodified lines
11231130 brelse(raw_super_buf);
11241131 free_sbi:
11251132 kfree(sbi);
1133+
1134+ /* give only one another chance */
1135+ if (retry) {
1136+ retry = 0;
1137+ shrink_dcache_sb(sb);
1138+ goto try_onemore;
1139+ }
11261140 return err;
11271141 }
11281142
fs/f2fs/xattr.c+1−1
@@ -528,7 +528,7 @@ static int __f2fs_setxattr(struct inode *inode, int index, · 527 unmodified lines
528528 int free;
529529 /*
530530 * If value is NULL, it is remove operation.
531− * In case of update operation, we caculate free.
531+ * In case of update operation, we calculate free.
532532 */
533533 free = MIN_OFFSET(inode) - ((char *)last - (char *)base_addr);
534534 if (found)
fs/jbd2/commit.c+12−9
@@ -97,7 +97,7 @@ static void jbd2_commit_block_csum_set(journal_t *j, struct buffer_head *bh) · 96 unmodified lines
9797 struct commit_header *h;
9898 __u32 csum;
9999
100− if (!JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V2))
100+ if (!jbd2_journal_has_csum_v2or3(j))
101101 return;
102102
103103 h = (struct commit_header *)(bh->b_data);
@@ -313,11 +313,11 @@ static __u32 jbd2_checksum_data(__u32 crc32_sum, struct buffer_head *bh) · 209 unmodified lines
313313 return checksum;
314314 }
315315
316−static void write_tag_block(int tag_bytes, journal_block_tag_t *tag,
316+static void write_tag_block(journal_t *j, journal_block_tag_t *tag,
317317 unsigned long long block)
318318 {
319319 tag->t_blocknr = cpu_to_be32(block & (u32)~0);
320− if (tag_bytes > JBD2_TAG_SIZE32)
320+ if (JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_64BIT))
321321 tag->t_blocknr_high = cpu_to_be32((block >> 31) >> 1);
322322 }
323323
@@ -327,7 +327,7 @@ static void jbd2_descr_block_csum_set(journal_t *j, · 3 unmodified lines
327327 struct jbd2_journal_block_tail *tail;
328328 __u32 csum;
329329
330− if (!JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V2))
330+ if (!jbd2_journal_has_csum_v2or3(j))
331331 return;
332332
333333 tail = (struct jbd2_journal_block_tail *)(bh->b_data + j->j_blocksize -
@@ -340,12 +340,13 @@ static void jbd2_descr_block_csum_set(journal_t *j, · 6 unmodified lines
340340 static void jbd2_block_tag_csum_set(journal_t *j, journal_block_tag_t *tag,
341341 struct buffer_head *bh, __u32 sequence)
342342 {
343+ journal_block_tag3_t *tag3 = (journal_block_tag3_t *)tag;
343344 struct page *page = bh->b_page;
344345 __u8 *addr;
345346 __u32 csum32;
346347 __be32 seq;
347348
348− if (!JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V2))
349+ if (!jbd2_journal_has_csum_v2or3(j))
349350 return;
350351
351352 seq = cpu_to_be32(sequence);
@@ -355,8 +356,10 @@ static void jbd2_block_tag_csum_set(journal_t *j, journal_block_tag_t *tag, · 3 unmodified lines
355356 bh->b_size);
356357 kunmap_atomic(addr);
357358
358− /* We only have space to store the lower 16 bits of the crc32c. */
359− tag->t_checksum = cpu_to_be16(csum32);
359+ if (JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V3))
360+ tag3->t_checksum = cpu_to_be32(csum32);
361+ else
362+ tag->t_checksum = cpu_to_be16(csum32);
360363 }
361364 /*
362365 * jbd2_journal_commit_transaction
@@ -396,7 +399,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) · 33 unmodified lines
396399 LIST_HEAD(io_bufs);
397400 LIST_HEAD(log_bufs);
398401
399− if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2))
402+ if (jbd2_journal_has_csum_v2or3(journal))
400403 csum_size = sizeof(struct jbd2_journal_block_tail);
401404
402405 /*
@@ -690,7 +693,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) · 287 unmodified lines
690693 tag_flag |= JBD2_FLAG_SAME_UUID;
691694
692695 tag = (journal_block_tag_t *) tagp;
693− write_tag_block(tag_bytes, tag, jh2bh(jh)->b_blocknr);
696+ write_tag_block(journal, tag, jh2bh(jh)->b_blocknr);
694697 tag->t_flags = cpu_to_be16(tag_flag);
695698 jbd2_block_tag_csum_set(journal, tag, wbuf[bufs],
696699 commit_transaction->t_tid);
fs/jbd2/journal.c+37−19
@@ -124,7 +124,7 @@ EXPORT_SYMBOL(__jbd2_debug); · 123 unmodified lines
124124 /* Checksumming functions */
125125 static int jbd2_verify_csum_type(journal_t *j, journal_superblock_t *sb)
126126 {
127− if (!JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V2))
127+ if (!jbd2_journal_has_csum_v2or3(j))
128128 return 1;
129129
130130 return sb->s_checksum_type == JBD2_CRC32C_CHKSUM;
@@ -145,7 +145,7 @@ static __be32 jbd2_superblock_csum(journal_t *j, journal_superblock_t *sb) · 14 unmodified lines
145145
146146 static int jbd2_superblock_csum_verify(journal_t *j, journal_superblock_t *sb)
147147 {
148− if (!JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V2))
148+ if (!jbd2_journal_has_csum_v2or3(j))
149149 return 1;
150150
151151 return sb->s_checksum == jbd2_superblock_csum(j, sb);
@@ -153,7 +153,7 @@ static int jbd2_superblock_csum_verify(journal_t *j, journal_superblock_t *sb) · 1 unmodified line
153153
154154 static void jbd2_superblock_csum_set(journal_t *j, journal_superblock_t *sb)
155155 {
156− if (!JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V2))
156+ if (!jbd2_journal_has_csum_v2or3(j))
157157 return;
158158
159159 sb->s_checksum = jbd2_superblock_csum(j, sb);
@@ -1522,21 +1522,29 @@ static int journal_get_superblock(journal_t *journal) · 1362 unmodified lines
15221522 goto out;
15231523 }
15241524
1525− if (JBD2_HAS_COMPAT_FEATURE(journal, JBD2_FEATURE_COMPAT_CHECKSUM) &&
1526− JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2)) {
1525+ if (jbd2_journal_has_csum_v2or3(journal) &&
1526+ JBD2_HAS_COMPAT_FEATURE(journal, JBD2_FEATURE_COMPAT_CHECKSUM)) {
15271527 /* Can't have checksum v1 and v2 on at the same time! */
15281528 printk(KERN_ERR "JBD2: Can't enable checksumming v1 and v2 "
15291529 "at the same time!\n");
15301530 goto out;
15311531 }
15321532
1533+ if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2) &&
1534+ JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V3)) {
1535+ /* Can't have checksum v2 and v3 at the same time! */
1536+ printk(KERN_ERR "JBD2: Can't enable checksumming v2 and v3 "
1537+ "at the same time!\n");
1538+ goto out;
1539+ }
1540+
15331541 if (!jbd2_verify_csum_type(journal, sb)) {
15341542 printk(KERN_ERR "JBD2: Unknown checksum type\n");
15351543 goto out;
15361544 }
15371545
15381546 /* Load the checksum driver */
1539− if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2)) {
1547+ if (jbd2_journal_has_csum_v2or3(journal)) {
15401548 journal->j_chksum_driver = crypto_alloc_shash("crc32c", 0, 0);
15411549 if (IS_ERR(journal->j_chksum_driver)) {
15421550 printk(KERN_ERR "JBD2: Cannot load crc32c driver.\n");
@@ -1553,7 +1561,7 @@ static int journal_get_superblock(journal_t *journal) · 10 unmodified lines
15531561 }
15541562
15551563 /* Precompute checksum seed for all metadata */
1556− if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2))
1564+ if (jbd2_journal_has_csum_v2or3(journal))
15571565 journal->j_csum_seed = jbd2_chksum(journal, ~0, sb->s_uuid,
15581566 sizeof(sb->s_uuid));
15591567
@@ -1813,8 +1821,14 @@ int jbd2_journal_set_features (journal_t *journal, unsigned long compat, · 253 unmodified lines
18131821 if (!jbd2_journal_check_available_features(journal, compat, ro, incompat))
18141822 return 0;
18151823
1816− /* Asking for checksumming v2 and v1? Only give them v2. */
1817− if (incompat & JBD2_FEATURE_INCOMPAT_CSUM_V2 &&
1824+ /* If enabling v2 checksums, turn on v3 instead */
1825+ if (incompat & JBD2_FEATURE_INCOMPAT_CSUM_V2) {
1826+ incompat &= ~JBD2_FEATURE_INCOMPAT_CSUM_V2;
1827+ incompat |= JBD2_FEATURE_INCOMPAT_CSUM_V3;
1828+ }
1829+
1830+ /* Asking for checksumming v3 and v1? Only give them v3. */
1831+ if (incompat & JBD2_FEATURE_INCOMPAT_CSUM_V3 &&
18181832 compat & JBD2_FEATURE_COMPAT_CHECKSUM)
18191833 compat &= ~JBD2_FEATURE_COMPAT_CHECKSUM;
18201834
@@ -1823,8 +1837,8 @@ int jbd2_journal_set_features (journal_t *journal, unsigned long compat, · 2 unmodified lines
18231837
18241838 sb = journal->j_superblock;
18251839
1826− /* If enabling v2 checksums, update superblock */
1827− if (INCOMPAT_FEATURE_ON(JBD2_FEATURE_INCOMPAT_CSUM_V2)) {
1840+ /* If enabling v3 checksums, update superblock */
1841+ if (INCOMPAT_FEATURE_ON(JBD2_FEATURE_INCOMPAT_CSUM_V3)) {
18281842 sb->s_checksum_type = JBD2_CRC32C_CHKSUM;
18291843 sb->s_feature_compat &=
18301844 ~cpu_to_be32(JBD2_FEATURE_COMPAT_CHECKSUM);
@@ -1842,8 +1856,7 @@ int jbd2_journal_set_features (journal_t *journal, unsigned long compat, · 11 unmodified lines
18421856 }
18431857
18441858 /* Precompute checksum seed for all metadata */
1845− if (JBD2_HAS_INCOMPAT_FEATURE(journal,
1846− JBD2_FEATURE_INCOMPAT_CSUM_V2))
1859+ if (jbd2_journal_has_csum_v2or3(journal))
18471860 journal->j_csum_seed = jbd2_chksum(journal, ~0,
18481861 sb->s_uuid,
18491862 sizeof(sb->s_uuid));
@@ -1852,7 +1865,8 @@ int jbd2_journal_set_features (journal_t *journal, unsigned long compat, · 2 unmodified lines
18521865 /* If enabling v1 checksums, downgrade superblock */
18531866 if (COMPAT_FEATURE_ON(JBD2_FEATURE_COMPAT_CHECKSUM))
18541867 sb->s_feature_incompat &=
1855− ~cpu_to_be32(JBD2_FEATURE_INCOMPAT_CSUM_V2);
1868+ ~cpu_to_be32(JBD2_FEATURE_INCOMPAT_CSUM_V2 |
1869+ JBD2_FEATURE_INCOMPAT_CSUM_V3);
18561870
18571871 sb->s_feature_compat |= cpu_to_be32(compat);
18581872 sb->s_feature_ro_compat |= cpu_to_be32(ro);
@@ -2165,16 +2179,20 @@ int jbd2_journal_blocks_per_page(struct inode *inode) · 306 unmodified lines
21652179 */
21662180 size_t journal_tag_bytes(journal_t *journal)
21672181 {
2168− journal_block_tag_t tag;
2169− size_t x = 0;
2182+ size_t sz;
2183+
2184+ if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V3))
2185+ return sizeof(journal_block_tag3_t);
2186+
2187+ sz = sizeof(journal_block_tag_t);
21702188
21712189 if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2))
2172− x += sizeof(tag.t_checksum);
2190+ sz += sizeof(__u16);
21732191
21742192 if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_64BIT))
2175− return x + JBD2_TAG_SIZE64;
2193+ return sz;
21762194 else
2177− return x + JBD2_TAG_SIZE32;
2195+ return sz - sizeof(__u32);
21782196 }
21792197
21802198 /*
fs/jbd2/recovery.c+20−13
@@ -181,7 +181,7 @@ static int jbd2_descr_block_csum_verify(journal_t *j, · 180 unmodified lines
181181 __be32 provided;
182182 __u32 calculated;
183183
184− if (!JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V2))
184+ if (!jbd2_journal_has_csum_v2or3(j))
185185 return 1;
186186
187187 tail = (struct jbd2_journal_block_tail *)(buf + j->j_blocksize -
@@ -205,7 +205,7 @@ static int count_tags(journal_t *journal, struct buffer_head *bh) · 17 unmodified lines
205205 int nr = 0, size = journal->j_blocksize;
206206 int tag_bytes = journal_tag_bytes(journal);
207207
208− if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2))
208+ if (jbd2_journal_has_csum_v2or3(journal))
209209 size -= sizeof(struct jbd2_journal_block_tail);
210210
211211 tagp = &bh->b_data[sizeof(journal_header_t)];
@@ -338,10 +338,11 @@ int jbd2_journal_skip_recovery(journal_t *journal) · 126 unmodified lines
338338 return err;
339339 }
340340
341−static inline unsigned long long read_tag_block(int tag_bytes, journal_block_tag_t *tag)
341+static inline unsigned long long read_tag_block(journal_t *journal,
342+ journal_block_tag_t *tag)
342343 {
343344 unsigned long long block = be32_to_cpu(tag->t_blocknr);
344− if (tag_bytes > JBD2_TAG_SIZE32)
345+ if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_64BIT))
345346 block |= (u64)be32_to_cpu(tag->t_blocknr_high) << 32;
346347 return block;
347348 }
@@ -384,7 +385,7 @@ static int jbd2_commit_block_csum_verify(journal_t *j, void *buf) · 36 unmodified lines
384385 __be32 provided;
385386 __u32 calculated;
386387
387− if (!JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V2))
388+ if (!jbd2_journal_has_csum_v2or3(j))
388389 return 1;
389390
390391 h = buf;
@@ -399,17 +400,21 @@ static int jbd2_commit_block_csum_verify(journal_t *j, void *buf) · 8 unmodified lines
399400 static int jbd2_block_tag_csum_verify(journal_t *j, journal_block_tag_t *tag,
400401 void *buf, __u32 sequence)
401402 {
403+ journal_block_tag3_t *tag3 = (journal_block_tag3_t *)tag;
402404 __u32 csum32;
403405 __be32 seq;
404406
405− if (!JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V2))
407+ if (!jbd2_journal_has_csum_v2or3(j))
406408 return 1;
407409
408410 seq = cpu_to_be32(sequence);
409411 csum32 = jbd2_chksum(j, j->j_csum_seed, (__u8 *)&seq, sizeof(seq));
410412 csum32 = jbd2_chksum(j, csum32, buf, j->j_blocksize);
411413
412− return tag->t_checksum == cpu_to_be16(csum32);
414+ if (JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V3))
415+ return tag3->t_checksum == cpu_to_be32(csum32);
416+ else
417+ return tag->t_checksum == cpu_to_be16(csum32);
413418 }
414419
415420 static int do_one_pass(journal_t *journal,
@@ -426,6 +431,7 @@ static int do_one_pass(journal_t *journal, · 10 unmodified lines
426431 int tag_bytes = journal_tag_bytes(journal);
427432 __u32 crc32_sum = ~0; /* Transactional Checksums */
428433 int descr_csum_size = 0;
434+ int block_error = 0;
429435
430436 /*
431437 * First thing is to establish what we expect to find in the log
@@ -512,8 +518,7 @@ static int do_one_pass(journal_t *journal, · 80 unmodified lines
512518 switch(blocktype) {
513519 case JBD2_DESCRIPTOR_BLOCK:
514520 /* Verify checksum first */
515− if (JBD2_HAS_INCOMPAT_FEATURE(journal,
516− JBD2_FEATURE_INCOMPAT_CSUM_V2))
521+ if (jbd2_journal_has_csum_v2or3(journal))
517522 descr_csum_size =
518523 sizeof(struct jbd2_journal_block_tail);
519524 if (descr_csum_size > 0 &&
@@ -574,7 +579,7 @@ static int do_one_pass(journal_t *journal, · 54 unmodified lines
574579 unsigned long long blocknr;
575580
576581 J_ASSERT(obh != NULL);
577− blocknr = read_tag_block(tag_bytes,
582+ blocknr = read_tag_block(journal,
578583 tag);
579584
580585 /* If the block has been
@@ -598,7 +603,8 @@ static int do_one_pass(journal_t *journal, · 17 unmodified lines
598603 "checksum recovering "
599604 "block %llu in log\n",
600605 blocknr);
601− continue;
606+ block_error = 1;
607+ goto skip_write;
602608 }
603609
604610 /* Find a buffer for the new
@@ -797,7 +803,8 @@ static int do_one_pass(journal_t *journal, · 192 unmodified lines
797803 success = -EIO;
798804 }
799805 }
800−
806+ if (block_error && success == 0)
807+ success = -EIO;
801808 return success;
802809
803810 failed:
@@ -811,7 +818,7 @@ static int jbd2_revoke_block_csum_verify(journal_t *j, · 7 unmodified lines
811818 __be32 provided;
812819 __u32 calculated;
813820
814− if (!JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V2))
821+ if (!jbd2_journal_has_csum_v2or3(j))
815822 return 1;
816823
817824 tail = (struct jbd2_journal_revoke_tail *)(buf + j->j_blocksize -
fs/jbd2/revoke.c+3−3
@@ -91,8 +91,8 @@ · 90 unmodified lines
9191 #include <linux/list.h>
9292 #include <linux/init.h>
9393 #include <linux/bio.h>
94−#endif
9594 #include <linux/log2.h>
95+#endif
9696
9797 static struct kmem_cache *jbd2_revoke_record_cache;
9898 static struct kmem_cache *jbd2_revoke_table_cache;
@@ -597,7 +597,7 @@ static void write_one_revoke_record(journal_t *journal, · 498 unmodified lines
597597 offset = *offsetp;
598598
599599 /* Do we need to leave space at the end for a checksum? */
600− if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2))
600+ if (jbd2_journal_has_csum_v2or3(journal))
601601 csum_size = sizeof(struct jbd2_journal_revoke_tail);
602602
603603 /* Make sure we have a descriptor with space left for the record */
@@ -644,7 +644,7 @@ static void jbd2_revoke_csum_set(journal_t *j, struct buffer_head *bh) · 40 unmodified lines
644644 struct jbd2_journal_revoke_tail *tail;
645645 __u32 csum;
646646
647− if (!JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V2))
647+ if (!jbd2_journal_has_csum_v2or3(j))
648648 return;
649649
650650 tail = (struct jbd2_journal_revoke_tail *)(bh->b_data + j->j_blocksize -
fs/locks.c+1−1
@@ -1619,7 +1619,7 @@ static int generic_add_lease(struct file *filp, long arg, struct file_lock **flp · 1618 unmodified lines
16191619 smp_mb();
16201620 error = check_conflicting_open(dentry, arg);
16211621 if (error)
1622− locks_unlink_lock(flp);
1622+ locks_unlink_lock(before);
16231623 out:
16241624 if (is_deleg)
16251625 mutex_unlock(&inode->i_mutex);
fs/namespace.c+9−1
@@ -1217,6 +1217,11 @@ static void namespace_unlock(void) · 1216 unmodified lines
12171217 head.first->pprev = &head.first;
12181218 INIT_HLIST_HEAD(&unmounted);
12191219
1220+ /* undo decrements we'd done in umount_tree() */
1221+ hlist_for_each_entry(mnt, &head, mnt_hash)
1222+ if (mnt->mnt_ex_mountpoint.mnt)
1223+ mntget(mnt->mnt_ex_mountpoint.mnt);
1224+
12201225 up_write(&namespace_sem);
12211226
12221227 synchronize_rcu();
@@ -1253,6 +1258,9 @@ void umount_tree(struct mount *mnt, int how) · 30 unmodified lines
12531258 hlist_add_head(&p->mnt_hash, &tmp_list);
12541259 }
12551260
1261+ hlist_for_each_entry(p, &tmp_list, mnt_hash)
1262+ list_del_init(&p->mnt_child);
1263+
12561264 if (how)
12571265 propagate_umount(&tmp_list);
12581266
@@ -1263,9 +1271,9 @@ void umount_tree(struct mount *mnt, int how) · 4 unmodified lines
12631271 p->mnt_ns = NULL;
12641272 if (how < 2)
12651273 p->mnt.mnt_flags |= MNT_SYNC_UMOUNT;
1266− list_del_init(&p->mnt_child);
12671274 if (mnt_has_parent(p)) {
12681275 put_mountpoint(p->mnt_mp);
1276+ mnt_add_count(p->mnt_parent, -1);
12691277 /* move the reference to mountpoint into ->mnt_ex_mountpoint */
12701278 p->mnt_ex_mountpoint.dentry = p->mnt_mountpoint;
12711279 p->mnt_ex_mountpoint.mnt = &p->mnt_parent->mnt;
fs/nfs/nfs3acl.c+4−1
@@ -129,7 +129,10 @@ static int __nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl, · 128 unmodified lines
129129 .rpc_argp = &args,
130130 .rpc_resp = &fattr,
131131 };
132− int status;
132+ int status = 0;
133+
134+ if (acl == NULL && (!S_ISDIR(inode->i_mode) || dfacl == NULL))
135+ goto out;
133136
134137 status = -EOPNOTSUPP;
135138 if (!nfs_server_capable(inode, NFS_CAP_ACLS))
fs/nfs/nfs4proc.c+17−9
@@ -2560,6 +2560,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data) · 2559 unmodified lines
25602560 struct nfs4_closedata *calldata = data;
25612561 struct nfs4_state *state = calldata->state;
25622562 struct nfs_server *server = NFS_SERVER(calldata->inode);
2563+ nfs4_stateid *res_stateid = NULL;
25632564
25642565 dprintk("%s: begin!\n", __func__);
25652566 if (!nfs4_sequence_done(task, &calldata->res.seq_res))
@@ -2570,12 +2571,12 @@ static void nfs4_close_done(struct rpc_task *task, void *data) · 4 unmodified lines
25702571 */
25712572 switch (task->tk_status) {
25722573 case 0:
2573− if (calldata->roc)
2574+ res_stateid = &calldata->res.stateid;
2575+ if (calldata->arg.fmode == 0 && calldata->roc)
25742576 pnfs_roc_set_barrier(state->inode,
25752577 calldata->roc_barrier);
2576− nfs_clear_open_stateid(state, &calldata->res.stateid, 0);
25772578 renew_lease(server, calldata->timestamp);
2578− goto out_release;
2579+ break;
25792580 case -NFS4ERR_ADMIN_REVOKED:
25802581 case -NFS4ERR_STALE_STATEID:
25812582 case -NFS4ERR_OLD_STATEID:
@@ -2589,7 +2590,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data) · 7 unmodified lines
25892590 goto out_release;
25902591 }
25912592 }
2592− nfs_clear_open_stateid(state, NULL, calldata->arg.fmode);
2593+ nfs_clear_open_stateid(state, res_stateid, calldata->arg.fmode);
25932594 out_release:
25942595 nfs_release_seqid(calldata->arg.seqid);
25952596 nfs_refresh_inode(calldata->inode, calldata->res.fattr);
@@ -2601,6 +2602,7 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) · 5 unmodified lines
26012602 struct nfs4_closedata *calldata = data;
26022603 struct nfs4_state *state = calldata->state;
26032604 struct inode *inode = calldata->inode;
2605+ bool is_rdonly, is_wronly, is_rdwr;
26042606 int call_close = 0;
26052607
26062608 dprintk("%s: begin!\n", __func__);
@@ -2608,18 +2610,24 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) · 1 unmodified line
26082610 goto out_wait;
26092611
26102612 task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_OPEN_DOWNGRADE];
2611− calldata->arg.fmode = FMODE_READ|FMODE_WRITE;
26122613 spin_lock(&state->owner->so_lock);
2614+ is_rdwr = test_bit(NFS_O_RDWR_STATE, &state->flags);
2615+ is_rdonly = test_bit(NFS_O_RDONLY_STATE, &state->flags);
2616+ is_wronly = test_bit(NFS_O_WRONLY_STATE, &state->flags);
2617+ /* Calculate the current open share mode */
2618+ calldata->arg.fmode = 0;
2619+ if (is_rdonly || is_rdwr)
2620+ calldata->arg.fmode |= FMODE_READ;
2621+ if (is_wronly || is_rdwr)
2622+ calldata->arg.fmode |= FMODE_WRITE;
26132623 /* Calculate the change in open mode */
26142624 if (state->n_rdwr == 0) {
26152625 if (state->n_rdonly == 0) {
2616− call_close |= test_bit(NFS_O_RDONLY_STATE, &state->flags);
2617− call_close |= test_bit(NFS_O_RDWR_STATE, &state->flags);
2626+ call_close |= is_rdonly || is_rdwr;
26182627 calldata->arg.fmode &= ~FMODE_READ;
26192628 }
26202629 if (state->n_wronly == 0) {
2621− call_close |= test_bit(NFS_O_WRONLY_STATE, &state->flags);
2622− call_close |= test_bit(NFS_O_RDWR_STATE, &state->flags);
2630+ call_close |= is_wronly || is_rdwr;
26232631 calldata->arg.fmode &= ~FMODE_WRITE;
26242632 }
26252633 }
fs/nfs/pagelist.c+59−25
@@ -116,7 +116,7 @@ __nfs_iocounter_wait(struct nfs_io_counter *c) · 115 unmodified lines
116116 if (atomic_read(&c->io_count) == 0)
117117 break;
118118 ret = nfs_wait_bit_killable(&q.key);
119− } while (atomic_read(&c->io_count) != 0);
119+ } while (atomic_read(&c->io_count) != 0 && !ret);
120120 finish_wait(wq, &q.wait);
121121 return ret;
122122 }
@@ -139,26 +139,49 @@ nfs_iocounter_wait(struct nfs_io_counter *c) · 16 unmodified lines
139139 /*
140140 * nfs_page_group_lock - lock the head of the page group
141141 * @req - request in group that is to be locked
142+ * @nonblock - if true don't block waiting for lock
142143 *
143144 * this lock must be held if modifying the page group list
144145 *
145− * returns result from wait_on_bit_lock: 0 on success, < 0 on error
146+ * return 0 on success, < 0 on error: -EDELAY if nonblocking or the
147+ * result from wait_on_bit_lock
148+ *
149+ * NOTE: calling with nonblock=false should always have set the
150+ * lock bit (see fs/buffer.c and other uses of wait_on_bit_lock
151+ * with TASK_UNINTERRUPTIBLE), so there is no need to check the result.
146152 */
147153 int
148−nfs_page_group_lock(struct nfs_page *req, bool wait)
154+nfs_page_group_lock(struct nfs_page *req, bool nonblock)
149155 {
150156 struct nfs_page *head = req->wb_head;
151− int ret;
152157
153158 WARN_ON_ONCE(head != head->wb_head);
154159
155− do {
156− ret = wait_on_bit_lock(&head->wb_flags, PG_HEADLOCK,
157− TASK_UNINTERRUPTIBLE);
158− } while (wait && ret != 0);
160+ if (!test_and_set_bit(PG_HEADLOCK, &head->wb_flags))
161+ return 0;
159162
160− WARN_ON_ONCE(ret > 0);
161− return ret;
163+ if (!nonblock)
164+ return wait_on_bit_lock(&head->wb_flags, PG_HEADLOCK,
165+ TASK_UNINTERRUPTIBLE);
166+
167+ return -EAGAIN;
168+}
169+
170+/*
171+ * nfs_page_group_lock_wait - wait for the lock to clear, but don't grab it
172+ * @req - a request in the group
173+ *
174+ * This is a blocking call to wait for the group lock to be cleared.
175+ */
176+void
177+nfs_page_group_lock_wait(struct nfs_page *req)
178+{
179+ struct nfs_page *head = req->wb_head;
180+
181+ WARN_ON_ONCE(head != head->wb_head);
182+
183+ wait_on_bit(&head->wb_flags, PG_HEADLOCK,
184+ TASK_UNINTERRUPTIBLE);
162185 }
163186
164187 /*
@@ -219,7 +242,7 @@ bool nfs_page_group_sync_on_bit(struct nfs_page *req, unsigned int bit) · 54 unmodified lines
219242 {
220243 bool ret;
221244
222− nfs_page_group_lock(req, true);
245+ nfs_page_group_lock(req, false);
223246 ret = nfs_page_group_sync_on_bit_locked(req, bit);
224247 nfs_page_group_unlock(req);
225248
@@ -701,10 +724,11 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc, · 475 unmodified lines
701724 struct nfs_pgio_header *hdr)
702725 {
703726 struct nfs_page *req;
704− struct page **pages;
727+ struct page **pages,
728+ *last_page;
705729 struct list_head *head = &desc->pg_list;
706730 struct nfs_commit_info cinfo;
707− unsigned int pagecount;
731+ unsigned int pagecount, pageused;
708732
709733 pagecount = nfs_page_array_len(desc->pg_base, desc->pg_count);
710734 if (!nfs_pgarray_set(&hdr->page_array, pagecount))
@@ -712,12 +736,23 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc, · 1 unmodified line
712736
713737 nfs_init_cinfo(&cinfo, desc->pg_inode, desc->pg_dreq);
714738 pages = hdr->page_array.pagevec;
739+ last_page = NULL;
740+ pageused = 0;
715741 while (!list_empty(head)) {
716742 req = nfs_list_entry(head->next);
717743 nfs_list_remove_request(req);
718744 nfs_list_add_request(req, &hdr->pages);
719− *pages++ = req->wb_page;
745+
746+ if (WARN_ON_ONCE(pageused >= pagecount))
747+ return nfs_pgio_error(desc, hdr);
748+
749+ if (!last_page || last_page != req->wb_page) {
750+ *pages++ = last_page = req->wb_page;
751+ pageused++;
752+ }
720753 }
754+ if (WARN_ON_ONCE(pageused != pagecount))
755+ return nfs_pgio_error(desc, hdr);
721756
722757 if ((desc->pg_ioflags & FLUSH_COND_STABLE) &&
723758 (desc->pg_moreio || nfs_reqs_to_commit(&cinfo)))
@@ -788,6 +823,14 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev, · 64 unmodified lines
788823 return false;
789824 if (req_offset(req) != req_offset(prev) + prev->wb_bytes)
790825 return false;
826+ if (req->wb_page == prev->wb_page) {
827+ if (req->wb_pgbase != prev->wb_pgbase + prev->wb_bytes)
828+ return false;
829+ } else {
830+ if (req->wb_pgbase != 0 ||
831+ prev->wb_pgbase + prev->wb_bytes != PAGE_CACHE_SIZE)
832+ return false;
833+ }
791834 }
792835 size = pgio->pg_ops->pg_test(pgio, prev, req);
793836 WARN_ON_ONCE(size > req->wb_bytes);
@@ -858,13 +901,8 @@ static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc, · 64 unmodified lines
858901 struct nfs_page *subreq;
859902 unsigned int bytes_left = 0;
860903 unsigned int offset, pgbase;
861− int ret;
862904
863− ret = nfs_page_group_lock(req, false);
864− if (ret < 0) {
865− desc->pg_error = ret;
866− return 0;
867− }
905+ nfs_page_group_lock(req, false);
868906
869907 subreq = req;
870908 bytes_left = subreq->wb_bytes;
@@ -886,11 +924,7 @@ static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc, · 15 unmodified lines
886924 if (desc->pg_recoalesce)
887925 return 0;
888926 /* retry add_request for this subreq */
889− ret = nfs_page_group_lock(req, false);
890− if (ret < 0) {
891− desc->pg_error = ret;
892− return 0;
893− }
927+ nfs_page_group_lock(req, false);
894928 continue;
895929 }
896930
fs/nfs/write.c+17−4
@@ -241,7 +241,7 @@ static bool nfs_page_group_covers_page(struct nfs_page *req) · 240 unmodified lines
241241 unsigned int pos = 0;
242242 unsigned int len = nfs_page_length(req->wb_page);
243243
244− nfs_page_group_lock(req, true);
244+ nfs_page_group_lock(req, false);
245245
246246 do {
247247 tmp = nfs_page_group_search_locked(req->wb_head, pos);
@@ -478,10 +478,23 @@ try_again: · 230 unmodified lines
478478 return NULL;
479479 }
480480
481− /* lock each request in the page group */
482− ret = nfs_page_group_lock(head, false);
483− if (ret < 0)
481+ /* holding inode lock, so always make a non-blocking call to try the
482+ * page group lock */
483+ ret = nfs_page_group_lock(head, true);
484+ if (ret < 0) {
485+ spin_unlock(&inode->i_lock);
486+
487+ if (!nonblock && ret == -EAGAIN) {
488+ nfs_page_group_lock_wait(head);
489+ nfs_release_request(head);
490+ goto try_again;
491+ }
492+
493+ nfs_release_request(head);
484494 return ERR_PTR(ret);
495+ }
496+
497+ /* lock each request in the page group */
485498 subreq = head;
486499 do {
487500 /*
fs/ocfs2/cluster/quorum.c+11−2
@@ -160,9 +160,18 @@ static void o2quo_make_decision(struct work_struct *work) · 159 unmodified lines
160160 }
161161
162162 out:
163− spin_unlock(&qs->qs_lock);
164− if (fence)
163+ if (fence) {
164+ spin_unlock(&qs->qs_lock);
165165 o2quo_fence_self();
166+ } else {
167+ mlog(ML_NOTICE, "not fencing this node, heartbeating: %d, "
168+ "connected: %d, lowest: %d (%sreachable)\n",
169+ qs->qs_heartbeating, qs->qs_connected, lowest_hb,
170+ lowest_reachable ? "" : "un");
171+ spin_unlock(&qs->qs_lock);
172+
173+ }
174+
166175 }
167176
168177 static void o2quo_set_hold(struct o2quo_state *qs, u8 node)
fs/ocfs2/cluster/tcp.c+39−6
@@ -1480,6 +1480,14 @@ static int o2net_set_nodelay(struct socket *sock) · 1479 unmodified lines
14801480 return ret;
14811481 }
14821482
1483+static int o2net_set_usertimeout(struct socket *sock)
1484+{
1485+ int user_timeout = O2NET_TCP_USER_TIMEOUT;
1486+
1487+ return kernel_setsockopt(sock, SOL_TCP, TCP_USER_TIMEOUT,
1488+ (char *)&user_timeout, sizeof(user_timeout));
1489+}
1490+
14831491 static void o2net_initialize_handshake(void)
14841492 {
14851493 o2net_hand->o2hb_heartbeat_timeout_ms = cpu_to_be32(
@@ -1536,16 +1544,20 @@ static void o2net_idle_timer(unsigned long data) · 50 unmodified lines
15361544 #endif
15371545
15381546 printk(KERN_NOTICE "o2net: Connection to " SC_NODEF_FMT " has been "
1539− "idle for %lu.%lu secs, shutting it down.\n", SC_NODEF_ARGS(sc),
1540− msecs / 1000, msecs % 1000);
1547+ "idle for %lu.%lu secs.\n",
1548+ SC_NODEF_ARGS(sc), msecs / 1000, msecs % 1000);
15411549
1542− /*
1543− * Initialize the nn_timeout so that the next connection attempt
1544− * will continue in o2net_start_connect.
1550+ /* idle timerout happen, don't shutdown the connection, but
1551+ * make fence decision. Maybe the connection can recover before
1552+ * the decision is made.
15451553 */
15461554 atomic_set(&nn->nn_timeout, 1);
1555+ o2quo_conn_err(o2net_num_from_nn(nn));
1556+ queue_delayed_work(o2net_wq, &nn->nn_still_up,
1557+ msecs_to_jiffies(O2NET_QUORUM_DELAY_MS));
1558+
1559+ o2net_sc_reset_idle_timer(sc);
15471560
1548− o2net_sc_queue_work(sc, &sc->sc_shutdown_work);
15491561 }
15501562
15511563 static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc)
@@ -1560,6 +1572,15 @@ static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc) · 8 unmodified lines
15601572
15611573 static void o2net_sc_postpone_idle(struct o2net_sock_container *sc)
15621574 {
1575+ struct o2net_node *nn = o2net_nn_from_num(sc->sc_node->nd_num);
1576+
1577+ /* clear fence decision since the connection recover from timeout*/
1578+ if (atomic_read(&nn->nn_timeout)) {
1579+ o2quo_conn_up(o2net_num_from_nn(nn));
1580+ cancel_delayed_work(&nn->nn_still_up);
1581+ atomic_set(&nn->nn_timeout, 0);
1582+ }
1583+
15631584 /* Only push out an existing timer */
15641585 if (timer_pending(&sc->sc_idle_timeout))
15651586 o2net_sc_reset_idle_timer(sc);
@@ -1650,6 +1671,12 @@ static void o2net_start_connect(struct work_struct *work) · 84 unmodified lines
16501671 goto out;
16511672 }
16521673
1674+ ret = o2net_set_usertimeout(sock);
1675+ if (ret) {
1676+ mlog(ML_ERROR, "set TCP_USER_TIMEOUT failed with %d\n", ret);
1677+ goto out;
1678+ }
1679+
16531680 o2net_register_callbacks(sc->sc_sock->sk, sc);
16541681
16551682 spin_lock(&nn->nn_lock);
@@ -1831,6 +1858,12 @@ static int o2net_accept_one(struct socket *sock, int *more) · 175 unmodified lines
18311858 goto out;
18321859 }
18331860
1861+ ret = o2net_set_usertimeout(new_sock);
1862+ if (ret) {
1863+ mlog(ML_ERROR, "set TCP_USER_TIMEOUT failed with %d\n", ret);
1864+ goto out;
1865+ }
1866+
18341867 slen = sizeof(sin);
18351868 ret = new_sock->ops->getname(new_sock, (struct sockaddr *) &sin,
18361869 &slen, 1);
fs/ocfs2/cluster/tcp.h+1−0
@@ -63,6 +63,7 @@ typedef void (o2net_post_msg_handler_func)(int status, void *data, · 62 unmodified lines
6363 #define O2NET_KEEPALIVE_DELAY_MS_DEFAULT 2000
6464 #define O2NET_IDLE_TIMEOUT_MS_DEFAULT 30000
6565
66+#define O2NET_TCP_USER_TIMEOUT 0x7fffffff
6667
6768 /* TODO: figure this out.... */
6869 static inline int o2net_link_down(int err, struct socket *sock)
fs/ocfs2/ioctl.c+43−86
@@ -35,9 +35,8 @@ · 34 unmodified lines
3535 copy_to_user((typeof(a) __user *)b, &(a), sizeof(a))
3636
3737 /*
38− * This call is void because we are already reporting an error that may
39− * be -EFAULT. The error will be returned from the ioctl(2) call. It's
40− * just a best-effort to tell userspace that this request caused the error.
38+ * This is just a best-effort to tell userspace that this request
39+ * caused the error.
4140 */
4241 static inline void o2info_set_request_error(struct ocfs2_info_request *kreq,
4342 struct ocfs2_info_request __user *req)
@@ -146,136 +145,105 @@ bail: · 102 unmodified lines
146145 static int ocfs2_info_handle_blocksize(struct inode *inode,
147146 struct ocfs2_info_request __user *req)
148147 {
149− int status = -EFAULT;
150148 struct ocfs2_info_blocksize oib;
151149
152150 if (o2info_from_user(oib, req))
153− goto bail;
151+ return -EFAULT;
154152
155153 oib.ib_blocksize = inode->i_sb->s_blocksize;
156154
157155 o2info_set_request_filled(&oib.ib_req);
158156
159157 if (o2info_to_user(oib, req))
160− goto bail;
161−
162− status = 0;
163−bail:
164− if (status)
165− o2info_set_request_error(&oib.ib_req, req);
158+ return -EFAULT;
166159
167− return status;
160+ return 0;
168161 }
169162
170163 static int ocfs2_info_handle_clustersize(struct inode *inode,
171164 struct ocfs2_info_request __user *req)
172165 {
173− int status = -EFAULT;
174166 struct ocfs2_info_clustersize oic;
175167 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
176168
177169 if (o2info_from_user(oic, req))
178− goto bail;
170+ return -EFAULT;
179171
180172 oic.ic_clustersize = osb->s_clustersize;
181173
182174 o2info_set_request_filled(&oic.ic_req);
183175
184176 if (o2info_to_user(oic, req))
185− goto bail;
186−
187− status = 0;
188−bail:
189− if (status)
190− o2info_set_request_error(&oic.ic_req, req);
177+ return -EFAULT;
191178
192− return status;
179+ return 0;
193180 }
194181
195182 static int ocfs2_info_handle_maxslots(struct inode *inode,
196183 struct ocfs2_info_request __user *req)
197184 {
198− int status = -EFAULT;
199185 struct ocfs2_info_maxslots oim;
200186 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
201187
202188 if (o2info_from_user(oim, req))
203− goto bail;
189+ return -EFAULT;
204190
205191 oim.im_max_slots = osb->max_slots;
206192
207193 o2info_set_request_filled(&oim.im_req);
208194
209195 if (o2info_to_user(oim, req))
210− goto bail;
196+ return -EFAULT;
211197
212− status = 0;
213−bail:
214− if (status)
215− o2info_set_request_error(&oim.im_req, req);
216−
217− return status;
198+ return 0;
218199 }
219200
220201 static int ocfs2_info_handle_label(struct inode *inode,
221202 struct ocfs2_info_request __user *req)
222203 {
223− int status = -EFAULT;
224204 struct ocfs2_info_label oil;
225205 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
226206
227207 if (o2info_from_user(oil, req))
228− goto bail;
208+ return -EFAULT;
229209
230210 memcpy(oil.il_label, osb->vol_label, OCFS2_MAX_VOL_LABEL_LEN);
231211
232212 o2info_set_request_filled(&oil.il_req);
233213
234214 if (o2info_to_user(oil, req))
235− goto bail;
215+ return -EFAULT;
236216
237− status = 0;
238−bail:
239− if (status)
240− o2info_set_request_error(&oil.il_req, req);
241−
242− return status;
217+ return 0;
243218 }
244219
245220 static int ocfs2_info_handle_uuid(struct inode *inode,
246221 struct ocfs2_info_request __user *req)
247222 {
248− int status = -EFAULT;
249223 struct ocfs2_info_uuid oiu;
250224 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
251225
252226 if (o2info_from_user(oiu, req))
253− goto bail;
227+ return -EFAULT;
254228
255229 memcpy(oiu.iu_uuid_str, osb->uuid_str, OCFS2_TEXT_UUID_LEN + 1);
256230
257231 o2info_set_request_filled(&oiu.iu_req);
258232
259233 if (o2info_to_user(oiu, req))
260− goto bail;
261−
262− status = 0;
263−bail:
264− if (status)
265− o2info_set_request_error(&oiu.iu_req, req);
234+ return -EFAULT;
266235
267− return status;
236+ return 0;
268237 }
269238
270239 static int ocfs2_info_handle_fs_features(struct inode *inode,
271240 struct ocfs2_info_request __user *req)
272241 {
273− int status = -EFAULT;
274242 struct ocfs2_info_fs_features oif;
275243 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
276244
277245 if (o2info_from_user(oif, req))
278− goto bail;
246+ return -EFAULT;
279247
280248 oif.if_compat_features = osb->s_feature_compat;
281249 oif.if_incompat_features = osb->s_feature_incompat;
@@ -284,39 +252,28 @@ static int ocfs2_info_handle_fs_features(struct inode *inode, · 2 unmodified lines
284252 o2info_set_request_filled(&oif.if_req);
285253
286254 if (o2info_to_user(oif, req))
287− goto bail;
255+ return -EFAULT;
288256
289− status = 0;
290−bail:
291− if (status)
292− o2info_set_request_error(&oif.if_req, req);
293−
294− return status;
257+ return 0;
295258 }
296259
297260 static int ocfs2_info_handle_journal_size(struct inode *inode,
298261 struct ocfs2_info_request __user *req)
299262 {
300− int status = -EFAULT;
301263 struct ocfs2_info_journal_size oij;
302264 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
303265
304266 if (o2info_from_user(oij, req))
305− goto bail;
267+ return -EFAULT;
306268
307269 oij.ij_journal_size = i_size_read(osb->journal->j_inode);
308270
309271 o2info_set_request_filled(&oij.ij_req);
310272
311273 if (o2info_to_user(oij, req))
312− goto bail;
274+ return -EFAULT;
313275
314− status = 0;
315−bail:
316− if (status)
317− o2info_set_request_error(&oij.ij_req, req);
318−
319− return status;
276+ return 0;
320277 }
321278
322279 static int ocfs2_info_scan_inode_alloc(struct ocfs2_super *osb,
@@ -373,7 +330,7 @@ static int ocfs2_info_handle_freeinode(struct inode *inode, · 50 unmodified lines
373330 u32 i;
374331 u64 blkno = -1;
375332 char namebuf[40];
376− int status = -EFAULT, type = INODE_ALLOC_SYSTEM_INODE;
333+ int status, type = INODE_ALLOC_SYSTEM_INODE;
377334 struct ocfs2_info_freeinode *oifi = NULL;
378335 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
379336 struct inode *inode_alloc = NULL;
@@ -385,8 +342,10 @@ static int ocfs2_info_handle_freeinode(struct inode *inode, · 5 unmodified lines
385342 goto out_err;
386343 }
387344
388− if (o2info_from_user(*oifi, req))
389− goto bail;
345+ if (o2info_from_user(*oifi, req)) {
346+ status = -EFAULT;
347+ goto out_free;
348+ }
390349
391350 oifi->ifi_slotnum = osb->max_slots;
392351
@@ -424,14 +383,16 @@ static int ocfs2_info_handle_freeinode(struct inode *inode, · 31 unmodified lines
424383
425384 o2info_set_request_filled(&oifi->ifi_req);
426385
427− if (o2info_to_user(*oifi, req))
428− goto bail;
386+ if (o2info_to_user(*oifi, req)) {
387+ status = -EFAULT;
388+ goto out_free;
389+ }
429390
430391 status = 0;
431392 bail:
432393 if (status)
433394 o2info_set_request_error(&oifi->ifi_req, req);
434−
395+out_free:
435396 kfree(oifi);
436397 out_err:
437398 return status;
@@ -658,7 +619,7 @@ static int ocfs2_info_handle_freefrag(struct inode *inode, · 220 unmodified lines
658619 {
659620 u64 blkno = -1;
660621 char namebuf[40];
661− int status = -EFAULT, type = GLOBAL_BITMAP_SYSTEM_INODE;
622+ int status, type = GLOBAL_BITMAP_SYSTEM_INODE;
662623
663624 struct ocfs2_info_freefrag *oiff;
664625 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
@@ -671,8 +632,10 @@ static int ocfs2_info_handle_freefrag(struct inode *inode, · 6 unmodified lines
671632 goto out_err;
672633 }
673634
674− if (o2info_from_user(*oiff, req))
675− goto bail;
635+ if (o2info_from_user(*oiff, req)) {
636+ status = -EFAULT;
637+ goto out_free;
638+ }
676639 /*
677640 * chunksize from userspace should be power of 2.
678641 */
@@ -711,14 +674,14 @@ static int ocfs2_info_handle_freefrag(struct inode *inode, · 32 unmodified lines
711674
712675 if (o2info_to_user(*oiff, req)) {
713676 status = -EFAULT;
714− goto bail;
677+ goto out_free;
715678 }
716679
717680 status = 0;
718681 bail:
719682 if (status)
720683 o2info_set_request_error(&oiff->iff_req, req);
721−
684+out_free:
722685 kfree(oiff);
723686 out_err:
724687 return status;
@@ -727,23 +690,17 @@ out_err: · 2 unmodified lines
727690 static int ocfs2_info_handle_unknown(struct inode *inode,
728691 struct ocfs2_info_request __user *req)
729692 {
730− int status = -EFAULT;
731693 struct ocfs2_info_request oir;
732694
733695 if (o2info_from_user(oir, req))
734− goto bail;
696+ return -EFAULT;
735697
736698 o2info_clear_request_filled(&oir);
737699
738700 if (o2info_to_user(oir, req))
739− goto bail;
701+ return -EFAULT;
740702
741− status = 0;
742−bail:
743− if (status)
744− o2info_set_request_error(&oir, req);
745−
746− return status;
703+ return 0;
747704 }
748705
749706 /*
fs/pnode.c+1−0
@@ -381,6 +381,7 @@ static void __propagate_umount(struct mount *mnt) · 380 unmodified lines
381381 * other children
382382 */
383383 if (child && list_empty(&child->mnt_mounts)) {
384+ list_del_init(&child->mnt_child);
384385 hlist_del_init_rcu(&child->mnt_hash);
385386 hlist_add_before_rcu(&child->mnt_hash, &mnt->mnt_hash);
386387 }
fs/sync.c+1−1
@@ -65,7 +65,7 @@ int sync_filesystem(struct super_block *sb) · 64 unmodified lines
6565 return ret;
6666 return __sync_filesystem(sb, 1);
6767 }
68−EXPORT_SYMBOL_GPL(sync_filesystem);
68+EXPORT_SYMBOL(sync_filesystem);
6969
7070 static void sync_inodes_one_sb(struct super_block *sb, void *arg)
7171 {
fs/ufs/inode.c+2−5
@@ -902,9 +902,6 @@ void ufs_evict_inode(struct inode * inode) · 901 unmodified lines
902902 invalidate_inode_buffers(inode);
903903 clear_inode(inode);
904904
905− if (want_delete) {
906− lock_ufs(inode->i_sb);
907− ufs_free_inode (inode);
908− unlock_ufs(inode->i_sb);
909− }
905+ if (want_delete)
906+ ufs_free_inode(inode);
910907 }
fs/ufs/namei.c+6−8
@@ -126,12 +126,12 @@ static int ufs_symlink (struct inode * dir, struct dentry * dentry, · 125 unmodified lines
126126 if (l > sb->s_blocksize)
127127 goto out_notlocked;
128128
129− lock_ufs(dir->i_sb);
130129 inode = ufs_new_inode(dir, S_IFLNK | S_IRWXUGO);
131130 err = PTR_ERR(inode);
132131 if (IS_ERR(inode))
133− goto out;
132+ goto out_notlocked;
134133
134+ lock_ufs(dir->i_sb);
135135 if (l > UFS_SB(sb)->s_uspi->s_maxsymlinklen) {
136136 /* slow symlink */
137137 inode->i_op = &ufs_symlink_inode_operations;
@@ -181,13 +181,9 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode) · 43 unmodified lines
181181 struct inode * inode;
182182 int err;
183183
184− lock_ufs(dir->i_sb);
185− inode_inc_link_count(dir);
186−
187184 inode = ufs_new_inode(dir, S_IFDIR|mode);
188− err = PTR_ERR(inode);
189185 if (IS_ERR(inode))
190− goto out_dir;
186+ return PTR_ERR(inode);
191187
192188 inode->i_op = &ufs_dir_inode_operations;
193189 inode->i_fop = &ufs_dir_operations;
@@ -195,6 +191,9 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode) · 1 unmodified line
195191
196192 inode_inc_link_count(inode);
197193
194+ lock_ufs(dir->i_sb);
195+ inode_inc_link_count(dir);
196+
198197 err = ufs_make_empty(inode, dir);
199198 if (err)
200199 goto out_fail;
@@ -212,7 +211,6 @@ out_fail: · 11 unmodified lines
212211 inode_dec_link_count(inode);
213212 inode_dec_link_count(inode);
214213 iput (inode);
215−out_dir:
216214 inode_dec_link_count(dir);
217215 unlock_ufs(dir->i_sb);
218216 goto out;
fs/xfs/libxfs/xfs_bmap.c+10−8
@@ -5424,7 +5424,7 @@ xfs_bmap_shift_extents( · 5423 unmodified lines
54245424 struct xfs_bmap_free *flist,
54255425 int num_exts)
54265426 {
5427− struct xfs_btree_cur *cur;
5427+ struct xfs_btree_cur *cur = NULL;
54285428 struct xfs_bmbt_rec_host *gotp;
54295429 struct xfs_bmbt_irec got;
54305430 struct xfs_bmbt_irec left;
@@ -5435,7 +5435,7 @@ xfs_bmap_shift_extents( · 4 unmodified lines
54355435 int error = 0;
54365436 int i;
54375437 int whichfork = XFS_DATA_FORK;
5438− int logflags;
5438+ int logflags = 0;
54395439 xfs_filblks_t blockcount = 0;
54405440 int total_extents;
54415441
@@ -5478,16 +5478,11 @@ xfs_bmap_shift_extents( · 36 unmodified lines
54785478 }
54795479 }
54805480
5481− /* We are going to change core inode */
5482− logflags = XFS_ILOG_CORE;
54835481 if (ifp->if_flags & XFS_IFBROOT) {
54845482 cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);
54855483 cur->bc_private.b.firstblock = *firstblock;
54865484 cur->bc_private.b.flist = flist;
54875485 cur->bc_private.b.flags = 0;
5488− } else {
5489− cur = NULL;
5490− logflags |= XFS_ILOG_DEXT;
54915486 }
54925487
54935488 /*
@@ -5545,11 +5540,14 @@ xfs_bmap_shift_extents( · 51 unmodified lines
55455540 blockcount = left.br_blockcount +
55465541 got.br_blockcount;
55475542 xfs_iext_remove(ip, *current_ext, 1, 0);
5543+ logflags |= XFS_ILOG_CORE;
55485544 if (cur) {
55495545 error = xfs_btree_delete(cur, &i);
55505546 if (error)
55515547 goto del_cursor;
55525548 XFS_WANT_CORRUPTED_GOTO(i == 1, del_cursor);
5549+ } else {
5550+ logflags |= XFS_ILOG_DEXT;
55535551 }
55545552 XFS_IFORK_NEXT_SET(ip, whichfork,
55555553 XFS_IFORK_NEXTENTS(ip, whichfork) - 1);
@@ -5575,6 +5573,7 @@ xfs_bmap_shift_extents( · 19 unmodified lines
55755573 got.br_startoff = startoff;
55765574 }
55775575
5576+ logflags |= XFS_ILOG_CORE;
55785577 if (cur) {
55795578 error = xfs_bmbt_update(cur, got.br_startoff,
55805579 got.br_startblock,
@@ -5582,6 +5581,8 @@ xfs_bmap_shift_extents( · 1 unmodified line
55825581 got.br_state);
55835582 if (error)
55845583 goto del_cursor;
5584+ } else {
5585+ logflags |= XFS_ILOG_DEXT;
55855586 }
55865587
55875588 (*current_ext)++;
@@ -5597,6 +5598,7 @@ del_cursor: · 9 unmodified lines
55975598 xfs_btree_del_cursor(cur,
55985599 error ? XFS_BTREE_ERROR : XFS_BTREE_NOERROR);
55995600
5600− xfs_trans_log_inode(tp, ip, logflags);
5601+ if (logflags)
5602+ xfs_trans_log_inode(tp, ip, logflags);
56015603 return error;
56025604 }
fs/xfs/xfs_aops.c+61−0
@@ -1753,11 +1753,72 @@ xfs_vm_readpages( · 1752 unmodified lines
17531753 return mpage_readpages(mapping, pages, nr_pages, xfs_get_blocks);
17541754 }
17551755
1756+/*
1757+ * This is basically a copy of __set_page_dirty_buffers() with one
1758+ * small tweak: buffers beyond EOF do not get marked dirty. If we mark them
1759+ * dirty, we'll never be able to clean them because we don't write buffers
1760+ * beyond EOF, and that means we can't invalidate pages that span EOF
1761+ * that have been marked dirty. Further, the dirty state can leak into
1762+ * the file interior if the file is extended, resulting in all sorts of
1763+ * bad things happening as the state does not match the underlying data.
1764+ *
1765+ * XXX: this really indicates that bufferheads in XFS need to die. Warts like
1766+ * this only exist because of bufferheads and how the generic code manages them.
1767+ */
1768+STATIC int
1769+xfs_vm_set_page_dirty(
1770+ struct page *page)
1771+{
1772+ struct address_space *mapping = page->mapping;
1773+ struct inode *inode = mapping->host;
1774+ loff_t end_offset;
1775+ loff_t offset;
1776+ int newly_dirty;
1777+
1778+ if (unlikely(!mapping))
1779+ return !TestSetPageDirty(page);
1780+
1781+ end_offset = i_size_read(inode);
1782+ offset = page_offset(page);
1783+
1784+ spin_lock(&mapping->private_lock);
1785+ if (page_has_buffers(page)) {
1786+ struct buffer_head *head = page_buffers(page);
1787+ struct buffer_head *bh = head;
1788+
1789+ do {
1790+ if (offset < end_offset)
1791+ set_buffer_dirty(bh);
1792+ bh = bh->b_this_page;
1793+ offset += 1 << inode->i_blkbits;
1794+ } while (bh != head);
1795+ }
1796+ newly_dirty = !TestSetPageDirty(page);
1797+ spin_unlock(&mapping->private_lock);
1798+
1799+ if (newly_dirty) {
1800+ /* sigh - __set_page_dirty() is static, so copy it here, too */
1801+ unsigned long flags;
1802+
1803+ spin_lock_irqsave(&mapping->tree_lock, flags);
1804+ if (page->mapping) { /* Race with truncate? */
1805+ WARN_ON_ONCE(!PageUptodate(page));
1806+ account_page_dirtied(page, mapping);
1807+ radix_tree_tag_set(&mapping->page_tree,
1808+ page_index(page), PAGECACHE_TAG_DIRTY);
1809+ }
1810+ spin_unlock_irqrestore(&mapping->tree_lock, flags);
1811+ __mark_inode_dirty(mapping->host, I_DIRTY_PAGES);
1812+ }
1813+ return newly_dirty;
1814+}
1815+
17561816 const struct address_space_operations xfs_address_space_operations = {
17571817 .readpage = xfs_vm_readpage,
17581818 .readpages = xfs_vm_readpages,
17591819 .writepage = xfs_vm_writepage,
17601820 .writepages = xfs_vm_writepages,
1821+ .set_page_dirty = xfs_vm_set_page_dirty,
17611822 .releasepage = xfs_vm_releasepage,
17621823 .invalidatepage = xfs_vm_invalidatepage,
17631824 .write_begin = xfs_vm_write_begin,
fs/xfs/xfs_bmap_util.c+20−0
@@ -1470,6 +1470,26 @@ xfs_collapse_file_space( · 1469 unmodified lines
14701470 start_fsb = XFS_B_TO_FSB(mp, offset + len);
14711471 shift_fsb = XFS_B_TO_FSB(mp, len);
14721472
1473+ /*
1474+ * Writeback the entire file and force remove any post-eof blocks. The
1475+ * writeback prevents changes to the extent list via concurrent
1476+ * writeback and the eofblocks trim prevents the extent shift algorithm
1477+ * from running into a post-eof delalloc extent.
1478+ *
1479+ * XXX: This is a temporary fix until the extent shift loop below is
1480+ * converted to use offsets and lookups within the ILOCK rather than
1481+ * carrying around the index into the extent list for the next
1482+ * iteration.
1483+ */
1484+ error = filemap_write_and_wait(VFS_I(ip)->i_mapping);
1485+ if (error)
1486+ return error;
1487+ if (xfs_can_free_eofblocks(ip, true)) {
1488+ error = xfs_free_eofblocks(mp, ip, false);
1489+ if (error)
1490+ return error;
1491+ }
1492+
14731493 error = xfs_free_file_space(ip, offset, len);
14741494 if (error)
14751495 return error;
fs/xfs/xfs_file.c+23−4
@@ -291,12 +291,22 @@ xfs_file_read_iter( · 290 unmodified lines
291291 if (inode->i_mapping->nrpages) {
292292 ret = filemap_write_and_wait_range(
293293 VFS_I(ip)->i_mapping,
294− pos, -1);
294+ pos, pos + size - 1);
295295 if (ret) {
296296 xfs_rw_iunlock(ip, XFS_IOLOCK_EXCL);
297297 return ret;
298298 }
299− truncate_pagecache_range(VFS_I(ip), pos, -1);
299+
300+ /*
301+ * Invalidate whole pages. This can return an error if
302+ * we fail to invalidate a page, but this should never
303+ * happen on XFS. Warn if it does fail.
304+ */
305+ ret = invalidate_inode_pages2_range(VFS_I(ip)->i_mapping,
306+ pos >> PAGE_CACHE_SHIFT,
307+ (pos + size - 1) >> PAGE_CACHE_SHIFT);
308+ WARN_ON_ONCE(ret);
309+ ret = 0;
300310 }
301311 xfs_rw_ilock_demote(ip, XFS_IOLOCK_EXCL);
302312 }
@@ -632,10 +642,19 @@ xfs_file_dio_aio_write( · 329 unmodified lines
632642
633643 if (mapping->nrpages) {
634644 ret = filemap_write_and_wait_range(VFS_I(ip)->i_mapping,
635− pos, -1);
645+ pos, pos + count - 1);
636646 if (ret)
637647 goto out;
638− truncate_pagecache_range(VFS_I(ip), pos, -1);
648+ /*
649+ * Invalidate whole pages. This can return an error if
650+ * we fail to invalidate a page, but this should never
651+ * happen on XFS. Warn if it does fail.
652+ */
653+ ret = invalidate_inode_pages2_range(VFS_I(ip)->i_mapping,
654+ pos >> PAGE_CACHE_SHIFT,
655+ (pos + count - 1) >> PAGE_CACHE_SHIFT);
656+ WARN_ON_ONCE(ret);
657+ ret = 0;
639658 }
640659
641660 /*
include/acpi/acpi_bus.h+0−1
@@ -246,7 +246,6 @@ struct acpi_device_pnp { · 245 unmodified lines
246246 acpi_device_name device_name; /* Driver-determined */
247247 acpi_device_class device_class; /* " */
248248 union acpi_object *str_obj; /* unicode string for _STR method */
249− unsigned long sun; /* _SUN */
250249 };
251250
252251 #define acpi_device_bid(d) ((d)->pnp.bus_id)
include/drm/drm_pciids.h+7−0
@@ -17,6 +17,7 @@ · 16 unmodified lines
1717 {0x1002, 0x1315, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
1818 {0x1002, 0x1316, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
1919 {0x1002, 0x1317, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
20+ {0x1002, 0x1318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
2021 {0x1002, 0x131B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
2122 {0x1002, 0x131C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
2223 {0x1002, 0x131D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -164,8 +165,11 @@ · 141 unmodified lines
164165 {0x1002, 0x6601, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
165166 {0x1002, 0x6602, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
166167 {0x1002, 0x6603, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
168+ {0x1002, 0x6604, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
169+ {0x1002, 0x6605, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
167170 {0x1002, 0x6606, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
168171 {0x1002, 0x6607, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
172+ {0x1002, 0x6608, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
169173 {0x1002, 0x6610, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
170174 {0x1002, 0x6611, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
171175 {0x1002, 0x6613, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
@@ -175,6 +179,8 @@ · 3 unmodified lines
175179 {0x1002, 0x6631, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
176180 {0x1002, 0x6640, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
177181 {0x1002, 0x6641, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
182+ {0x1002, 0x6646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
183+ {0x1002, 0x6647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
178184 {0x1002, 0x6649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
179185 {0x1002, 0x6650, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
180186 {0x1002, 0x6651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
@@ -297,6 +303,7 @@ · 116 unmodified lines
297303 {0x1002, 0x6829, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
298304 {0x1002, 0x682A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
299305 {0x1002, 0x682B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
306+ {0x1002, 0x682C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
300307 {0x1002, 0x682D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
301308 {0x1002, 0x682F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
302309 {0x1002, 0x6830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
include/linux/blk-mq.h+3−4
@@ -127,10 +127,9 @@ enum { · 126 unmodified lines
127127 BLK_MQ_RQ_QUEUE_ERROR = 2, /* end IO with error */
128128
129129 BLK_MQ_F_SHOULD_MERGE = 1 << 0,
130− BLK_MQ_F_SHOULD_SORT = 1 << 1,
131− BLK_MQ_F_TAG_SHARED = 1 << 2,
132− BLK_MQ_F_SG_MERGE = 1 << 3,
133− BLK_MQ_F_SYSFS_UP = 1 << 4,
130+ BLK_MQ_F_TAG_SHARED = 1 << 1,
131+ BLK_MQ_F_SG_MERGE = 1 << 2,
132+ BLK_MQ_F_SYSFS_UP = 1 << 3,
134133
135134 BLK_MQ_S_STOPPED = 0,
136135 BLK_MQ_S_TAG_ACTIVE = 1,
include/linux/f2fs_fs.h+13−3
@@ -24,6 +24,9 @@ · 23 unmodified lines
2424 #define NULL_ADDR ((block_t)0) /* used as block_t addresses */
2525 #define NEW_ADDR ((block_t)-1) /* used as block_t addresses */
2626
27+/* 0, 1(node nid), 2(meta nid) are reserved node id */
28+#define F2FS_RESERVED_NODE_NUM 3
29+
2730 #define F2FS_ROOT_INO(sbi) (sbi->root_ino_num)
2831 #define F2FS_NODE_INO(sbi) (sbi->node_ino_num)
2932 #define F2FS_META_INO(sbi) (sbi->meta_ino_num)
@@ -87,6 +90,8 @@ struct f2fs_super_block { · 57 unmodified lines
8790 #define CP_ORPHAN_PRESENT_FLAG 0x00000002
8891 #define CP_UMOUNT_FLAG 0x00000001
8992
93+#define F2FS_CP_PACKS 2 /* # of checkpoint packs */
94+
9095 struct f2fs_checkpoint {
9196 __le64 checkpoint_ver; /* checkpoint block version number */
9297 __le64 user_block_count; /* # of user blocks */
@@ -123,6 +128,9 @@ struct f2fs_checkpoint { · 30 unmodified lines
123128 */
124129 #define F2FS_ORPHANS_PER_BLOCK 1020
125130
131+#define GET_ORPHAN_BLOCKS(n) ((n + F2FS_ORPHANS_PER_BLOCK - 1) / \
132+ F2FS_ORPHANS_PER_BLOCK)
133+
126134 struct f2fs_orphan_block {
127135 __le32 ino[F2FS_ORPHANS_PER_BLOCK]; /* inode numbers */
128136 __le32 reserved; /* reserved */
@@ -144,6 +152,7 @@ struct f2fs_extent { · 15 unmodified lines
144152 #define F2FS_NAME_LEN 255
145153 #define F2FS_INLINE_XATTR_ADDRS 50 /* 200 bytes for inline xattrs */
146154 #define DEF_ADDRS_PER_INODE 923 /* Address Pointers in an Inode */
155+#define DEF_NIDS_PER_INODE 5 /* Node IDs in an Inode */
147156 #define ADDRS_PER_INODE(fi) addrs_per_inode(fi)
148157 #define ADDRS_PER_BLOCK 1018 /* Address Pointers in a Direct Block */
149158 #define NIDS_PER_BLOCK 1018 /* Node IDs in an Indirect Block */
@@ -163,8 +172,9 @@ struct f2fs_extent { · 13 unmodified lines
163172 #define MAX_INLINE_DATA (sizeof(__le32) * (DEF_ADDRS_PER_INODE - \
164173 F2FS_INLINE_XATTR_ADDRS - 1))
165174
166−#define INLINE_DATA_OFFSET (PAGE_CACHE_SIZE - sizeof(struct node_footer) \
167− - sizeof(__le32) * (DEF_ADDRS_PER_INODE + 5 - 1))
175+#define INLINE_DATA_OFFSET (PAGE_CACHE_SIZE - sizeof(struct node_footer) -\
176+ sizeof(__le32) * (DEF_ADDRS_PER_INODE + \
177+ DEF_NIDS_PER_INODE - 1))
168178
169179 struct f2fs_inode {
170180 __le16 i_mode; /* file mode */
@@ -194,7 +204,7 @@ struct f2fs_inode { · 23 unmodified lines
194204
195205 __le32 i_addr[DEF_ADDRS_PER_INODE]; /* Pointers to data blocks */
196206
197− __le32 i_nid[5]; /* direct(2), indirect(2),
207+ __le32 i_nid[DEF_NIDS_PER_INODE]; /* direct(2), indirect(2),
198208 double_indirect(1) node id */
199209 } __packed;
200210
include/linux/ftrace.h+11−3
@@ -102,6 +102,15 @@ enum { · 101 unmodified lines
102102 FTRACE_OPS_FL_DELETED = 1 << 8,
103103 };
104104
105+#ifdef CONFIG_DYNAMIC_FTRACE
106+/* The hash used to know what functions callbacks trace */
107+struct ftrace_ops_hash {
108+ struct ftrace_hash *notrace_hash;
109+ struct ftrace_hash *filter_hash;
110+ struct mutex regex_lock;
111+};
112+#endif
113+
105114 /*
106115 * Note, ftrace_ops can be referenced outside of RCU protection.
107116 * (Although, for perf, the control ops prevent that). If ftrace_ops is
@@ -121,10 +130,9 @@ struct ftrace_ops { · 13 unmodified lines
121130 int __percpu *disabled;
122131 #ifdef CONFIG_DYNAMIC_FTRACE
123132 int nr_trampolines;
124− struct ftrace_hash *notrace_hash;
125− struct ftrace_hash *filter_hash;
133+ struct ftrace_ops_hash local_hash;
134+ struct ftrace_ops_hash *func_hash;
126135 struct ftrace_hash *tramp_hash;
127− struct mutex regex_lock;
128136 unsigned long trampoline;
129137 #endif
130138 };
include/linux/gpio/consumer.h+62−47
@@ -16,8 +16,6 @@ struct device; · 15 unmodified lines
1616 */
1717 struct gpio_desc;
1818
19−#ifdef CONFIG_GPIOLIB
20−
2119 #define GPIOD_FLAGS_BIT_DIR_SET BIT(0)
2220 #define GPIOD_FLAGS_BIT_DIR_OUT BIT(1)
2321 #define GPIOD_FLAGS_BIT_DIR_VAL BIT(2)
@@ -34,64 +32,38 @@ enum gpiod_flags { · 10 unmodified lines
3432 GPIOD_FLAGS_BIT_DIR_VAL,
3533 };
3634
35+#ifdef CONFIG_GPIOLIB
36+
3737 /* Acquire and dispose GPIOs */
3838 struct gpio_desc *__must_check __gpiod_get(struct device *dev,
3939 const char *con_id,
4040 enum gpiod_flags flags);
41−#define __gpiod_get(dev, con_id, flags, ...) __gpiod_get(dev, con_id, flags)
42−#define gpiod_get(varargs...) __gpiod_get(varargs, 0)
4341 struct gpio_desc *__must_check __gpiod_get_index(struct device *dev,
4442 const char *con_id,
4543 unsigned int idx,
4644 enum gpiod_flags flags);
47−#define __gpiod_get_index(dev, con_id, index, flags, ...) \
48− __gpiod_get_index(dev, con_id, index, flags)
49−#define gpiod_get_index(varargs...) __gpiod_get_index(varargs, 0)
5045 struct gpio_desc *__must_check __gpiod_get_optional(struct device *dev,
5146 const char *con_id,
5247 enum gpiod_flags flags);
53−#define __gpiod_get_optional(dev, con_id, flags, ...) \
54− __gpiod_get_optional(dev, con_id, flags)
55−#define gpiod_get_optional(varargs...) __gpiod_get_optional(varargs, 0)
5648 struct gpio_desc *__must_check __gpiod_get_index_optional(struct device *dev,
5749 const char *con_id,
5850 unsigned int index,
5951 enum gpiod_flags flags);
60−#define __gpiod_get_index_optional(dev, con_id, index, flags, ...) \
61− __gpiod_get_index_optional(dev, con_id, index, flags)
62−#define gpiod_get_index_optional(varargs...) \
63− __gpiod_get_index_optional(varargs, 0)
64−
6552 void gpiod_put(struct gpio_desc *desc);
6653
6754 struct gpio_desc *__must_check __devm_gpiod_get(struct device *dev,
6855 const char *con_id,
6956 enum gpiod_flags flags);
70−#define __devm_gpiod_get(dev, con_id, flags, ...) \
71− __devm_gpiod_get(dev, con_id, flags)
72−#define devm_gpiod_get(varargs...) __devm_gpiod_get(varargs, 0)
7357 struct gpio_desc *__must_check __devm_gpiod_get_index(struct device *dev,
7458 const char *con_id,
7559 unsigned int idx,
7660 enum gpiod_flags flags);
77−#define __devm_gpiod_get_index(dev, con_id, index, flags, ...) \
78− __devm_gpiod_get_index(dev, con_id, index, flags)
79−#define devm_gpiod_get_index(varargs...) __devm_gpiod_get_index(varargs, 0)
8061 struct gpio_desc *__must_check __devm_gpiod_get_optional(struct device *dev,
8162 const char *con_id,
8263 enum gpiod_flags flags);
83−#define __devm_gpiod_get_optional(dev, con_id, flags, ...) \
84− __devm_gpiod_get_optional(dev, con_id, flags)
85−#define devm_gpiod_get_optional(varargs...) \
86− __devm_gpiod_get_optional(varargs, 0)
8764 struct gpio_desc *__must_check
8865 __devm_gpiod_get_index_optional(struct device *dev, const char *con_id,
8966 unsigned int index, enum gpiod_flags flags);
90−#define __devm_gpiod_get_index_optional(dev, con_id, index, flags, ...) \
91− __devm_gpiod_get_index_optional(dev, con_id, index, flags)
92−#define devm_gpiod_get_index_optional(varargs...) \
93− __devm_gpiod_get_index_optional(varargs, 0)
94−
9567 void devm_gpiod_put(struct device *dev, struct gpio_desc *desc);
9668
9769 int gpiod_get_direction(const struct gpio_desc *desc);
@@ -124,27 +96,31 @@ int desc_to_gpio(const struct gpio_desc *desc); · 26 unmodified lines
12496
12597 #else /* CONFIG_GPIOLIB */
12698
127−static inline struct gpio_desc *__must_check gpiod_get(struct device *dev,
128− const char *con_id)
99+static inline struct gpio_desc *__must_check __gpiod_get(struct device *dev,
100+ const char *con_id,
101+ enum gpiod_flags flags)
129102 {
130103 return ERR_PTR(-ENOSYS);
131104 }
132−static inline struct gpio_desc *__must_check gpiod_get_index(struct device *dev,
133− const char *con_id,
134− unsigned int idx)
105+static inline struct gpio_desc *__must_check
106+__gpiod_get_index(struct device *dev,
107+ const char *con_id,
108+ unsigned int idx,
109+ enum gpiod_flags flags)
135110 {
136111 return ERR_PTR(-ENOSYS);
137112 }
138113
139114 static inline struct gpio_desc *__must_check
140−gpiod_get_optional(struct device *dev, const char *con_id)
115+__gpiod_get_optional(struct device *dev, const char *con_id,
116+ enum gpiod_flags flags)
141117 {
142118 return ERR_PTR(-ENOSYS);
143119 }
144120
145121 static inline struct gpio_desc *__must_check
146−gpiod_get_index_optional(struct device *dev, const char *con_id,
147− unsigned int index)
122+__gpiod_get_index_optional(struct device *dev, const char *con_id,
123+ unsigned int index, enum gpiod_flags flags)
148124 {
149125 return ERR_PTR(-ENOSYS);
150126 }
@@ -157,28 +133,33 @@ static inline void gpiod_put(struct gpio_desc *desc) · 6 unmodified lines
157133 WARN_ON(1);
158134 }
159135
160−static inline struct gpio_desc *__must_check devm_gpiod_get(struct device *dev,
161− const char *con_id)
136+static inline struct gpio_desc *__must_check
137+__devm_gpiod_get(struct device *dev,
138+ const char *con_id,
139+ enum gpiod_flags flags)
162140 {
163141 return ERR_PTR(-ENOSYS);
164142 }
165143 static inline
166−struct gpio_desc *__must_check devm_gpiod_get_index(struct device *dev,
167− const char *con_id,
168− unsigned int idx)
144+struct gpio_desc *__must_check
145+__devm_gpiod_get_index(struct device *dev,
146+ const char *con_id,
147+ unsigned int idx,
148+ enum gpiod_flags flags)
169149 {
170150 return ERR_PTR(-ENOSYS);
171151 }
172152
173153 static inline struct gpio_desc *__must_check
174−devm_gpiod_get_optional(struct device *dev, const char *con_id)
154+__devm_gpiod_get_optional(struct device *dev, const char *con_id,
155+ enum gpiod_flags flags)
175156 {
176157 return ERR_PTR(-ENOSYS);
177158 }
178159
179160 static inline struct gpio_desc *__must_check
180−devm_gpiod_get_index_optional(struct device *dev, const char *con_id,
181− unsigned int index)
161+__devm_gpiod_get_index_optional(struct device *dev, const char *con_id,
162+ unsigned int index, enum gpiod_flags flags)
182163 {
183164 return ERR_PTR(-ENOSYS);
184165 }
@@ -303,9 +284,43 @@ static inline int desc_to_gpio(const struct gpio_desc *desc) · 118 unmodified lines
303284 return -EINVAL;
304285 }
305286
306−
307287 #endif /* CONFIG_GPIOLIB */
308288
289+/*
290+ * Vararg-hacks! This is done to transition the kernel to always pass
291+ * the options flags argument to the below functions. During a transition
292+ * phase these vararg macros make both old-and-newstyle code compile,
293+ * but when all calls to the elder API are removed, these should go away
294+ * and the __gpiod_get() etc functions above be renamed just gpiod_get()
295+ * etc.
296+ */
297+#define __gpiod_get(dev, con_id, flags, ...) __gpiod_get(dev, con_id, flags)
298+#define gpiod_get(varargs...) __gpiod_get(varargs, 0)
299+#define __gpiod_get_index(dev, con_id, index, flags, ...) \
300+ __gpiod_get_index(dev, con_id, index, flags)
301+#define gpiod_get_index(varargs...) __gpiod_get_index(varargs, 0)
302+#define __gpiod_get_optional(dev, con_id, flags, ...) \
303+ __gpiod_get_optional(dev, con_id, flags)
304+#define gpiod_get_optional(varargs...) __gpiod_get_optional(varargs, 0)
305+#define __gpiod_get_index_optional(dev, con_id, index, flags, ...) \
306+ __gpiod_get_index_optional(dev, con_id, index, flags)
307+#define gpiod_get_index_optional(varargs...) \
308+ __gpiod_get_index_optional(varargs, 0)
309+#define __devm_gpiod_get(dev, con_id, flags, ...) \
310+ __devm_gpiod_get(dev, con_id, flags)
311+#define devm_gpiod_get(varargs...) __devm_gpiod_get(varargs, 0)
312+#define __devm_gpiod_get_index(dev, con_id, index, flags, ...) \
313+ __devm_gpiod_get_index(dev, con_id, index, flags)
314+#define devm_gpiod_get_index(varargs...) __devm_gpiod_get_index(varargs, 0)
315+#define __devm_gpiod_get_optional(dev, con_id, flags, ...) \
316+ __devm_gpiod_get_optional(dev, con_id, flags)
317+#define devm_gpiod_get_optional(varargs...) \
318+ __devm_gpiod_get_optional(varargs, 0)
319+#define __devm_gpiod_get_index_optional(dev, con_id, index, flags, ...) \
320+ __devm_gpiod_get_index_optional(dev, con_id, index, flags)
321+#define devm_gpiod_get_index_optional(varargs...) \
322+ __devm_gpiod_get_index_optional(varargs, 0)
323+
309324 #if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS)
310325
311326 int gpiod_export(struct gpio_desc *desc, bool direction_may_change);
include/linux/jbd2.h+25−5
@@ -159,7 +159,11 @@ typedef struct journal_header_s · 158 unmodified lines
159159 * journal_block_tag (in the descriptor). The other h_chksum* fields are
160160 * not used.
161161 *
162− * Checksum v1 and v2 are mutually exclusive features.
162+ * If FEATURE_INCOMPAT_CSUM_V3 is set, the descriptor block uses
163+ * journal_block_tag3_t to store a full 32-bit checksum. Everything else
164+ * is the same as v2.
165+ *
166+ * Checksum v1, v2, and v3 are mutually exclusive features.
163167 */
164168 struct commit_header {
165169 __be32 h_magic;
@@ -179,6 +183,14 @@ struct commit_header { · 13 unmodified lines
179183 * raw struct shouldn't be used for pointer math or sizeof() - use
180184 * journal_tag_bytes(journal) instead to compute this.
181185 */
186+typedef struct journal_block_tag3_s
187+{
188+ __be32 t_blocknr; /* The on-disk block number */
189+ __be32 t_flags; /* See below */
190+ __be32 t_blocknr_high; /* most-significant high 32bits. */
191+ __be32 t_checksum; /* crc32c(uuid+seq+block) */
192+} journal_block_tag3_t;
193+
182194 typedef struct journal_block_tag_s
183195 {
184196 __be32 t_blocknr; /* The on-disk block number */
@@ -187,9 +199,6 @@ typedef struct journal_block_tag_s · 2 unmodified lines
187199 __be32 t_blocknr_high; /* most-significant high 32bits. */
188200 } journal_block_tag_t;
189201
190−#define JBD2_TAG_SIZE32 (offsetof(journal_block_tag_t, t_blocknr_high))
191−#define JBD2_TAG_SIZE64 (sizeof(journal_block_tag_t))
192−
193202 /* Tail of descriptor block, for checksumming */
194203 struct jbd2_journal_block_tail {
195204 __be32 t_checksum; /* crc32c(uuid+descr_block) */
@@ -284,6 +293,7 @@ typedef struct journal_superblock_s · 88 unmodified lines
284293 #define JBD2_FEATURE_INCOMPAT_64BIT 0x00000002
285294 #define JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT 0x00000004
286295 #define JBD2_FEATURE_INCOMPAT_CSUM_V2 0x00000008
296+#define JBD2_FEATURE_INCOMPAT_CSUM_V3 0x00000010
287297
288298 /* Features known to this kernel version: */
289299 #define JBD2_KNOWN_COMPAT_FEATURES JBD2_FEATURE_COMPAT_CHECKSUM
@@ -291,7 +301,8 @@ typedef struct journal_superblock_s · 1 unmodified line
291301 #define JBD2_KNOWN_INCOMPAT_FEATURES (JBD2_FEATURE_INCOMPAT_REVOKE | \
292302 JBD2_FEATURE_INCOMPAT_64BIT | \
293303 JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT | \
294− JBD2_FEATURE_INCOMPAT_CSUM_V2)
304+ JBD2_FEATURE_INCOMPAT_CSUM_V2 | \
305+ JBD2_FEATURE_INCOMPAT_CSUM_V3)
295306
296307 #ifdef __KERNEL__
297308
@@ -1296,6 +1307,15 @@ static inline int tid_geq(tid_t x, tid_t y) · 998 unmodified lines
12961307 extern int jbd2_journal_blocks_per_page(struct inode *inode);
12971308 extern size_t journal_tag_bytes(journal_t *journal);
12981309
1310+static inline int jbd2_journal_has_csum_v2or3(journal_t *journal)
1311+{
1312+ if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2) ||
1313+ JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V3))
1314+ return 1;
1315+
1316+ return 0;
1317+}
1318+
12991319 /*
13001320 * We reserve t_outstanding_credits >> JBD2_CONTROL_BLOCKS_SHIFT for
13011321 * transaction control blocks.
include/linux/leds.h+2−1
@@ -15,6 +15,7 @@ · 14 unmodified lines
1515 #include <linux/list.h>
1616 #include <linux/spinlock.h>
1717 #include <linux/rwsem.h>
18+#include <linux/timer.h>
1819 #include <linux/workqueue.h>
1920
2021 struct device;
@@ -68,7 +69,7 @@ struct led_classdev { · 47 unmodified lines
6869 const char *default_trigger; /* Trigger to use */
6970
7071 unsigned long blink_delay_on, blink_delay_off;
71− struct delayed_work blink_work;
72+ struct timer_list blink_timer;
7273 int blink_brightness;
7374
7475 struct work_struct set_brightness_work;
include/linux/mlx4/device.h+3−0
@@ -1197,6 +1197,9 @@ int mlx4_map_sw_to_hw_steering_id(struct mlx4_dev *dev, · 1196 unmodified lines
11971197 enum mlx4_net_trans_rule_id id);
11981198 int mlx4_hw_rule_sz(struct mlx4_dev *dev, enum mlx4_net_trans_rule_id id);
11991199
1200+int mlx4_tunnel_steer_add(struct mlx4_dev *dev, unsigned char *addr,
1201+ int port, int qpn, u16 prio, u64 *reg_id);
1202+
12001203 void mlx4_sync_pkey_table(struct mlx4_dev *dev, int slave, int port,
12011204 int i, int val);
12021205
include/linux/mtd/nand.h+1−1
@@ -949,7 +949,7 @@ static inline int jedec_feature(struct nand_chip *chip) · 948 unmodified lines
949949 : 0;
950950 }
951951
952−/**
952+/*
953953 * struct nand_sdr_timings - SDR NAND chip timings
954954 *
955955 * This struct defines the timing requirements of a SDR NAND chip.
include/linux/netdevice.h+2−2
@@ -3272,7 +3272,7 @@ static inline int __dev_uc_sync(struct net_device *dev, · 3271 unmodified lines
32723272 }
32733273
32743274 /**
3275− * __dev_uc_unsync - Remove synchonized addresses from device
3275+ * __dev_uc_unsync - Remove synchronized addresses from device
32763276 * @dev: device to sync
32773277 * @unsync: function to call if address should be removed
32783278 *
@@ -3316,7 +3316,7 @@ static inline int __dev_mc_sync(struct net_device *dev, · 37 unmodified lines
33163316 }
33173317
33183318 /**
3319− * __dev_mc_unsync - Remove synchonized addresses from device
3319+ * __dev_mc_unsync - Remove synchronized addresses from device
33203320 * @dev: device to sync
33213321 * @unsync: function to call if address should be removed
33223322 *
include/linux/netfilter.h+3−2
@@ -9,6 +9,7 @@ · 8 unmodified lines
99 #include <linux/in6.h>
1010 #include <linux/wait.h>
1111 #include <linux/list.h>
12+#include <linux/static_key.h>
1213 #include <uapi/linux/netfilter.h>
1314 #ifdef CONFIG_NETFILTER
1415 static inline int NF_DROP_GETERR(int verdict)
@@ -99,9 +100,9 @@ void nf_unregister_sockopt(struct nf_sockopt_ops *reg); · 84 unmodified lines
99100
100101 extern struct list_head nf_hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS];
101102
102−#if defined(CONFIG_JUMP_LABEL)
103−#include <linux/static_key.h>
103+#ifdef HAVE_JUMP_LABEL
104104 extern struct static_key nf_hooks_needed[NFPROTO_NUMPROTO][NF_MAX_HOOKS];
105+
105106 static inline bool nf_hooks_active(u_int8_t pf, unsigned int hook)
106107 {
107108 if (__builtin_constant_p(pf) &&
include/linux/nfs_page.h+1−0
@@ -123,6 +123,7 @@ extern int nfs_wait_on_request(struct nfs_page *); · 122 unmodified lines
123123 extern void nfs_unlock_request(struct nfs_page *req);
124124 extern void nfs_unlock_and_release_request(struct nfs_page *);
125125 extern int nfs_page_group_lock(struct nfs_page *, bool);
126+extern void nfs_page_group_lock_wait(struct nfs_page *);
126127 extern void nfs_page_group_unlock(struct nfs_page *);
127128 extern bool nfs_page_group_sync_on_bit(struct nfs_page *, unsigned int);
128129
include/linux/platform_data/mtd-nand-omap2.h+11−2
@@ -21,8 +21,17 @@ enum nand_io { · 20 unmodified lines
2121 };
2222
2323 enum omap_ecc {
24− /* 1-bit ECC calculation by GPMC, Error detection by Software */
25− OMAP_ECC_HAM1_CODE_HW = 0,
24+ /*
25+ * 1-bit ECC: calculation and correction by SW
26+ * ECC stored at end of spare area
27+ */
28+ OMAP_ECC_HAM1_CODE_SW = 0,
29+
30+ /*
31+ * 1-bit ECC: calculation by GPMC, Error detection by Software
32+ * ECC layout compatible with ROM code layout
33+ */
34+ OMAP_ECC_HAM1_CODE_HW,
2635 /* 4-bit ECC calculation by GPMC, Error detection by Software */
2736 OMAP_ECC_BCH4_CODE_HW_DETECTION_SW,
2837 /* 4-bit ECC calculation by GPMC, Error detection by ELM */
include/linux/pm_domain.h+1−1
@@ -60,7 +60,7 @@ struct generic_pm_domain { · 59 unmodified lines
6060 struct mutex lock;
6161 struct dev_power_governor *gov;
6262 struct work_struct power_off_work;
63− char *name;
63+ const char *name;
6464 unsigned int in_progress; /* Number of devices being suspended now */
6565 atomic_t sd_count; /* Number of subdomains with power "on" */
6666 enum gpd_status status; /* Current state of the domain */
include/linux/regulator/driver.h+2−0
@@ -218,6 +218,8 @@ enum regulator_type { · 217 unmodified lines
218218 * @linear_min_sel: Minimal selector for starting linear mapping
219219 * @fixed_uV: Fixed voltage of rails.
220220 * @ramp_delay: Time to settle down after voltage change (unit: uV/us)
221+ * @linear_ranges: A constant table of possible voltage ranges.
222+ * @n_linear_ranges: Number of entries in the @linear_ranges table.
221223 * @volt_table: Voltage mapping table (if table based mapping)
222224 *
223225 * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_
include/linux/regulator/machine.h+1−0
@@ -85,6 +85,7 @@ struct regulator_state { · 84 unmodified lines
8585 * bootloader then it will be enabled when the constraints are
8686 * applied.
8787 * @apply_uV: Apply the voltage constraint when initialising.
88+ * @ramp_disable: Disable ramp delay when initialising or when setting voltage.
8889 *
8990 * @input_uV: Input voltage for regulator when supplied by another regulator.
9091 *
include/linux/seqno-fence.h+1−0
@@ -62,6 +62,7 @@ to_seqno_fence(struct fence *fence) · 61 unmodified lines
6262 * @context: the execution context this fence is a part of
6363 * @seqno_ofs: the offset within @sync_buf
6464 * @seqno: the sequence # to signal on
65+ * @cond: fence wait condition
6566 * @ops: the fence_ops for operations on this seqno fence
6667 *
6768 * This function initializes a struct seqno_fence with passed parameters,
include/linux/spi/spi.h+7−0
@@ -253,6 +253,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) · 252 unmodified lines
253253 * the device whose settings are being modified.
254254 * @transfer: adds a message to the controller's transfer queue.
255255 * @cleanup: frees controller-specific state
256+ * @can_dma: determine whether this master supports DMA
256257 * @queued: whether this master is providing an internal message queue
257258 * @kworker: thread struct for message pump
258259 * @kworker_task: pointer to task for message pump kworker thread
@@ -262,6 +263,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) · 3 unmodified lines
262263 * @cur_msg: the currently in-flight message
263264 * @cur_msg_prepared: spi_prepare_message was called for the currently
264265 * in-flight message
266+ * @cur_msg_mapped: message has been mapped for DMA
265267 * @xfer_completion: used by core transfer_one_message()
266268 * @busy: message pump is busy
267269 * @running: message pump is running
@@ -299,6 +301,10 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) · 31 unmodified lines
299301 * @cs_gpios: Array of GPIOs to use as chip select lines; one per CS
300302 * number. Any individual value may be -ENOENT for CS lines that
301303 * are not GPIOs (driven by the SPI controller itself).
304+ * @dma_tx: DMA transmit channel
305+ * @dma_rx: DMA receive channel
306+ * @dummy_rx: dummy receive buffer for full-duplex devices
307+ * @dummy_tx: dummy transmit buffer for full-duplex devices
302308 *
303309 * Each SPI master controller can communicate with one or more @spi_device
304310 * children. These make a small bus, sharing MOSI, MISO and SCK signals
@@ -632,6 +638,7 @@ struct spi_transfer { · 327 unmodified lines
632638 * addresses for each transfer buffer
633639 * @complete: called to report transaction completions
634640 * @context: the argument to complete() when it's called
641+ * @frame_length: the total number of bytes in the message
635642 * @actual_length: the total number of bytes that were transferred in all
636643 * successful segments
637644 * @status: zero for success, else negative errno
include/linux/tick.h+1−6
@@ -183,13 +183,8 @@ static inline bool tick_nohz_full_cpu(int cpu) · 182 unmodified lines
183183
184184 extern void tick_nohz_init(void);
185185 extern void __tick_nohz_full_check(void);
186+extern void tick_nohz_full_kick(void);
186187 extern void tick_nohz_full_kick_cpu(int cpu);
187−
188−static inline void tick_nohz_full_kick(void)
189−{
190− tick_nohz_full_kick_cpu(smp_processor_id());
191−}
192−
193188 extern void tick_nohz_full_kick_all(void);
194189 extern void __tick_nohz_task_switch(struct task_struct *tsk);
195190 #else
include/net/bluetooth/hci_core.h+2−0
@@ -464,6 +464,8 @@ struct hci_conn_params { · 463 unmodified lines
464464 HCI_AUTO_CONN_ALWAYS,
465465 HCI_AUTO_CONN_LINK_LOSS,
466466 } auto_connect;
467+
468+ struct hci_conn *conn;
467469 };
468470
469471 extern struct list_head hci_dev_list;
include/net/netns/ieee802154_6lowpan.h+0−1
@@ -16,7 +16,6 @@ struct netns_sysctl_lowpan { · 15 unmodified lines
1616 struct netns_ieee802154_lowpan {
1717 struct netns_sysctl_lowpan sysctl;
1818 struct netns_frags frags;
19− int max_dsize;
2019 };
2120
2221 #endif
include/net/regulatory.h+1−1
@@ -167,7 +167,7 @@ struct ieee80211_reg_rule { · 166 unmodified lines
167167 struct ieee80211_regdomain {
168168 struct rcu_head rcu_head;
169169 u32 n_reg_rules;
170− char alpha2[2];
170+ char alpha2[3];
171171 enum nl80211_dfs_regions dfs_region;
172172 struct ieee80211_reg_rule reg_rules[];
173173 };
include/net/sctp/sctp.h+13−0
@@ -320,6 +320,19 @@ static inline sctp_assoc_t sctp_assoc2id(const struct sctp_association *asoc) · 319 unmodified lines
320320 return asoc ? asoc->assoc_id : 0;
321321 }
322322
323+static inline enum sctp_sstat_state
324+sctp_assoc_to_state(const struct sctp_association *asoc)
325+{
326+ /* SCTP's uapi always had SCTP_EMPTY(=0) as a dummy state, but we
327+ * got rid of it in kernel space. Therefore SCTP_CLOSED et al
328+ * start at =1 in user space, but actually as =0 in kernel space.
329+ * Now that we can not break user space and SCTP_EMPTY is exposed
330+ * there, we need to fix it up with an ugly offset not to break
331+ * applications. :(
332+ */
333+ return asoc->state + 1;
334+}
335+
323336 /* Look up the association by its id. */
324337 struct sctp_association *sctp_id2assoc(struct sock *sk, sctp_assoc_t id);
325338
include/net/sock.h+1−3
@@ -2171,9 +2171,7 @@ sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb) · 2170 unmodified lines
21712171 */
21722172 if (sock_flag(sk, SOCK_RCVTSTAMP) ||
21732173 (sk->sk_tsflags & SOF_TIMESTAMPING_RX_SOFTWARE) ||
2174− (kt.tv64 &&
2175− (sk->sk_tsflags & SOF_TIMESTAMPING_SOFTWARE ||
2176− skb_shinfo(skb)->tx_flags & SKBTX_ANY_SW_TSTAMP)) ||
2174+ (kt.tv64 && sk->sk_tsflags & SOF_TIMESTAMPING_SOFTWARE) ||
21772175 (hwtstamps->hwtstamp.tv64 &&
21782176 (sk->sk_tsflags & SOF_TIMESTAMPING_RAW_HARDWARE)))
21792177 __sock_recv_timestamp(msg, sk, skb);
include/net/wimax.h+1−1
@@ -290,7 +290,7 @@ struct wimax_dev; · 289 unmodified lines
290290 * This operation has to be synchronous, and return only when the
291291 * reset is complete. In case of having had to resort to bus/cold
292292 * reset implying a device disconnection, the call is allowed to
293− * return inmediately.
293+ * return immediately.
294294 * NOTE: wimax_dev->mutex is NOT locked when this op is being
295295 * called; however, wimax_dev->mutex_reset IS locked to ensure
296296 * serialization of calls to wimax_reset().
include/sound/soc.h+1−1
@@ -277,7 +277,7 @@ · 276 unmodified lines
277277 .access = SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | \
278278 SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \
279279 .tlv.c = (snd_soc_bytes_tlv_callback), \
280− .info = snd_soc_info_bytes_ext, \
280+ .info = snd_soc_bytes_info_ext, \
281281 .private_value = (unsigned long)&(struct soc_bytes_ext) \
282282 {.max = xcount, .get = xhandler_get, .put = xhandler_put, } }
283283 #define SOC_SINGLE_XR_SX(xname, xregbase, xregcount, xnbits, \
include/trace/events/irq.h+2−2
@@ -107,7 +107,7 @@ DECLARE_EVENT_CLASS(softirq, · 106 unmodified lines
107107 * @vec_nr: softirq vector number
108108 *
109109 * When used in combination with the softirq_exit tracepoint
110− * we can determine the softirq handler runtine.
110+ * we can determine the softirq handler routine.
111111 */
112112 DEFINE_EVENT(softirq, softirq_entry,
113113
@@ -121,7 +121,7 @@ DEFINE_EVENT(softirq, softirq_entry, · 7 unmodified lines
121121 * @vec_nr: softirq vector number
122122 *
123123 * When used in combination with the softirq_entry tracepoint
124− * we can determine the softirq handler runtine.
124+ * we can determine the softirq handler routine.
125125 */
126126 DEFINE_EVENT(softirq, softirq_exit,
127127
include/uapi/drm/radeon_drm.h+1−0
@@ -944,6 +944,7 @@ struct drm_radeon_cs_chunk { · 943 unmodified lines
944944 };
945945
946946 /* drm_radeon_cs_reloc.flags */
947+#define RADEON_RELOC_PRIO_MASK (0xf << 0)
947948
948949 struct drm_radeon_cs_reloc {
949950 uint32_t handle;
include/uapi/linux/usbip.hrenamed from drivers/staging/usbip/uapi/usbip.h+0−0

File renamed without changes.

include/uapi/linux/xattr.h+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313 #ifndef _UAPI_LINUX_XATTR_H
1414 #define _UAPI_LINUX_XATTR_H
1515
16−#ifdef __UAPI_DEF_XATTR
16+#if __UAPI_DEF_XATTR
1717 #define __USE_KERNEL_XATTR_DEFS
1818
1919 #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */
kernel/cgroup.c+33−14
@@ -1035,6 +1035,11 @@ static void cgroup_get(struct cgroup *cgrp) · 1034 unmodified lines
10351035 css_get(&cgrp->self);
10361036 }
10371037
1038+static bool cgroup_tryget(struct cgroup *cgrp)
1039+{
1040+ return css_tryget(&cgrp->self);
1041+}
1042+
10381043 static void cgroup_put(struct cgroup *cgrp)
10391044 {
10401045 css_put(&cgrp->self);
@@ -1147,7 +1152,8 @@ static struct cgroup *cgroup_kn_lock_live(struct kernfs_node *kn) · 106 unmodified lines
11471152 * protection against removal. Ensure @cgrp stays accessible and
11481153 * break the active_ref protection.
11491154 */
1150− cgroup_get(cgrp);
1155+ if (!cgroup_tryget(cgrp))
1156+ return NULL;
11511157 kernfs_break_active_protection(kn);
11521158
11531159 mutex_lock(&cgroup_mutex);
@@ -3271,8 +3277,17 @@ int cgroup_add_legacy_cftypes(struct cgroup_subsys *ss, struct cftype *cfts) · 2117 unmodified lines
32713277 {
32723278 struct cftype *cft;
32733279
3274− for (cft = cfts; cft && cft->name[0] != '\0'; cft++)
3275− cft->flags |= __CFTYPE_NOT_ON_DFL;
3280+ /*
3281+ * If legacy_flies_on_dfl, we want to show the legacy files on the
3282+ * dfl hierarchy but iff the target subsystem hasn't been updated
3283+ * for the dfl hierarchy yet.
3284+ */
3285+ if (!cgroup_legacy_files_on_dfl ||
3286+ ss->dfl_cftypes != ss->legacy_cftypes) {
3287+ for (cft = cfts; cft && cft->name[0] != '\0'; cft++)
3288+ cft->flags |= __CFTYPE_NOT_ON_DFL;
3289+ }
3290+
32763291 return cgroup_add_cftypes(ss, cfts);
32773292 }

55 more lines aren’t shown here.

kernel/compat.c+21−3

This diff is large: its 45 lines aren’t shown here.

kernel/events/core.c+22−1

This diff is large: its 44 lines aren’t shown here.

kernel/irq/chip.c+1−0

This diff is large: its 8 lines aren’t shown here.

kernel/kexec.c+11−0

This diff is large: its 61 lines aren’t shown here.

kernel/kprobes.c+12−1

This diff is large: its 20 lines aren’t shown here.

kernel/power/power.h+1−0

This diff is large: its 8 lines aren’t shown here.

kernel/power/suspend.c+1−1

This diff is large: its 9 lines aren’t shown here.

kernel/power/suspend_test.c+19−12

This diff is large: its 68 lines aren’t shown here.

kernel/rcu/tree.h+1−1

This diff is large: its 9 lines aren’t shown here.

kernel/rcu/tree_plugin.h+11−11

This diff is large: its 60 lines aren’t shown here.

kernel/resource.c+4−7

This diff is large: its 20 lines aren’t shown here.

kernel/time/tick-sched.c+14−0

This diff is large: its 21 lines aren’t shown here.

kernel/time/timekeeping.c+3−2

This diff is large: its 15 lines aren’t shown here.

kernel/trace/ftrace.c+157−89

This diff is large: its 561 lines aren’t shown here.

kernel/trace/ring_buffer.c+15−1

This diff is large: its 24 lines aren’t shown here.

lib/Kconfig.debug+10−1

This diff is large: its 26 lines aren’t shown here.

lib/assoc_array.c+1−1

This diff is large: its 9 lines aren’t shown here.

mm/hugetlb_cgroup.c+1−1

This diff is large: its 9 lines aren’t shown here.

mm/memblock.c+1−2

This diff is large: its 10 lines aren’t shown here.

mm/memcontrol.c+78−25

This diff is large: its 207 lines aren’t shown here.

mm/memory.c+3−4

This diff is large: its 27 lines aren’t shown here.

mm/percpu-vm.c+16−6

This diff is large: its 46 lines aren’t shown here.

mm/percpu.c+2−0

This diff is large: its 9 lines aren’t shown here.

mm/pgtable-generic.c+1−1

This diff is large: its 9 lines aren’t shown here.

mm/zbud.c+1−0

This diff is large: its 8 lines aren’t shown here.

mm/zpool.c+1−1

This diff is large: its 9 lines aren’t shown here.

mm/zsmalloc.c+1−0

This diff is large: its 8 lines aren’t shown here.

net/bluetooth/hci_conn.c+8−0

This diff is large: its 15 lines aren’t shown here.

net/bluetooth/hci_core.c+12−2

This diff is large: its 44 lines aren’t shown here.

net/bluetooth/hci_event.c+15−2

This diff is large: its 33 lines aren’t shown here.

net/core/datagram.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/core/dev.c+71−6

This diff is large: its 126 lines aren’t shown here.

net/core/gen_estimator.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/core/gen_stats.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/core/skbuff.c+2−2

This diff is large: its 18 lines aren’t shown here.

net/core/sock.c+18−16

This diff is large: its 73 lines aren’t shown here.

net/ieee802154/6lowpan_rtnl.c+2−2

This diff is large: its 18 lines aren’t shown here.

net/ieee802154/reassembly.c+3−12

This diff is large: its 51 lines aren’t shown here.

net/ipv4/netfilter/Kconfig+55−47

This diff is large: its 130 lines aren’t shown here.

net/ipv4/netfilter/Makefile+1−1

This diff is large: its 9 lines aren’t shown here.

net/ipv6/addrconf.c+10−19

This diff is large: its 80 lines aren’t shown here.

net/ipv6/anycast.c+10−0

This diff is large: its 64 lines aren’t shown here.

net/ipv6/mcast.c+14−0

This diff is large: its 90 lines aren’t shown here.

net/ipv6/netfilter/Kconfig+20−8

This diff is large: its 58 lines aren’t shown here.

net/ipv6/netfilter/Makefile+1−1

This diff is large: its 9 lines aren’t shown here.

net/l2tp/l2tp_ppp.c+2−1

This diff is large: its 10 lines aren’t shown here.

net/mac80211/chan.c+2−0

This diff is large: its 9 lines aren’t shown here.

net/mac80211/debugfs_sta.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/mac80211/iface.c+2−2

This diff is large: its 11 lines aren’t shown here.

net/mac80211/mesh_plink.c+6−1

This diff is large: its 21 lines aren’t shown here.

net/mac80211/mlme.c+1−2

This diff is large: its 10 lines aren’t shown here.

net/mac80211/sta_info.c+5−2

This diff is large: its 14 lines aren’t shown here.

net/mac802154/wpan.c+5−1

This diff is large: its 20 lines aren’t shown here.

net/netfilter/Kconfig+12−2

This diff is large: its 35 lines aren’t shown here.

net/netfilter/Makefile+1−1

This diff is large: its 9 lines aren’t shown here.

net/netfilter/core.c+3−3

This diff is large: its 27 lines aren’t shown here.

net/netfilter/ipvs/ip_vs_core.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/netfilter/ipvs/ip_vs_xmit.c+16−4

This diff is large: its 58 lines aren’t shown here.

net/netfilter/xt_cgroup.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/openvswitch/datapath.c+8−3

This diff is large: its 35 lines aren’t shown here.

net/rfkill/rfkill-gpio.c+1−0

This diff is large: its 8 lines aren’t shown here.

net/sctp/socket.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/socket.c+2−3

This diff is large: its 19 lines aren’t shown here.

scripts/checkpatch.pl+2−2

This diff is large: its 18 lines aren’t shown here.

scripts/kernel-doc+1−0

This diff is large: its 8 lines aren’t shown here.

security/keys/key.c+2−2

This diff is large: its 11 lines aren’t shown here.

security/tomoyo/realpath.c+3−2

This diff is large: its 19 lines aren’t shown here.

sound/core/info.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/core/pcm_misc.c+2−2

This diff is large: its 14 lines aren’t shown here.

sound/firewire/amdtp.c+10−1

This diff is large: its 18 lines aren’t shown here.

sound/firewire/amdtp.h+1−0

This diff is large: its 8 lines aren’t shown here.

sound/firewire/dice.c+20−9

This diff is large: its 50 lines aren’t shown here.

sound/pci/ctxfi/ct20k1reg.h+1−3

This diff is large: its 15 lines aren’t shown here.

sound/pci/hda/ca0132_regs.h+1−1

This diff is large: its 9 lines aren’t shown here.

sound/pci/hda/patch_conexant.c+8−1

This diff is large: its 30 lines aren’t shown here.

sound/pci/hda/patch_realtek.c+20−0

This diff is large: its 55 lines aren’t shown here.

sound/soc/codecs/cs4265.c+6−6

This diff is large: its 28 lines aren’t shown here.

sound/soc/codecs/da732x.h+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/codecs/rt5640.c+1−0

This diff is large: its 8 lines aren’t shown here.

sound/soc/codecs/rt5677.c+4−4

This diff is large: its 15 lines aren’t shown here.

sound/soc/generic/simple-card.c+8−0

This diff is large: its 28 lines aren’t shown here.

sound/soc/omap/omap-twl4030.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/sh/rcar/gen.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/soc-core.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/tegra/tegra_asoc_utils.h+1−1

This diff is large: its 9 lines aren’t shown here.

tools/testing/selftests/ipc/Makefile+3−3

This diff is large: its 22 lines aren’t shown here.

tools/testing/selftests/kcmp/Makefile+3−3

This diff is large: its 23 lines aren’t shown here.

tools/testing/selftests/memfd/Makefile+5−5

This diff is large: its 37 lines aren’t shown here.

tools/usb/usbip/.gitignorerenamed from drivers/staging/usbip/userspace/.gitignore+0−0

File renamed without changes.

tools/usb/usbip/AUTHORSrenamed from drivers/staging/usbip/userspace/AUTHORS+0−0

File renamed without changes.

tools/usb/usbip/COPYINGrenamed from drivers/staging/usbip/userspace/COPYING+0−0

File renamed without changes.

tools/usb/usbip/INSTALLrenamed from drivers/staging/usbip/userspace/INSTALL+0−0

File renamed without changes.

tools/usb/usbip/Makefile.amrenamed from drivers/staging/usbip/userspace/Makefile.am+0−0

File renamed without changes.

tools/usb/usbip/READMErenamed from drivers/staging/usbip/userspace/README+0−0

File renamed without changes.

tools/usb/usbip/autogen.shrenamed from drivers/staging/usbip/userspace/autogen.sh+0−0

File renamed without changes.

tools/usb/usbip/cleanup.shrenamed from drivers/staging/usbip/userspace/cleanup.sh+0−0

File renamed without changes.

tools/usb/usbip/configure.acrenamed from drivers/staging/usbip/userspace/configure.ac+0−0

File renamed without changes.

tools/usb/usbip/doc/usbip.8renamed from drivers/staging/usbip/userspace/doc/usbip.8+0−0

File renamed without changes.

tools/usb/usbip/doc/usbipd.8renamed from drivers/staging/usbip/userspace/doc/usbipd.8+0−0

File renamed without changes.

tools/usb/usbip/libsrc/Makefile.amrenamed from drivers/staging/usbip/userspace/libsrc/Makefile.am+0−0

File renamed without changes.

tools/usb/usbip/libsrc/list.hrenamed from drivers/staging/usbip/userspace/libsrc/list.h+0−0

File renamed without changes.

tools/usb/usbip/libsrc/names.crenamed from drivers/staging/usbip/userspace/libsrc/names.c+0−0

File renamed without changes.

tools/usb/usbip/libsrc/names.hrenamed from drivers/staging/usbip/userspace/libsrc/names.h+0−0

File renamed without changes.

tools/usb/usbip/libsrc/sysfs_utils.crenamed from drivers/staging/usbip/userspace/libsrc/sysfs_utils.c+0−0

File renamed without changes.

tools/usb/usbip/libsrc/sysfs_utils.hrenamed from drivers/staging/usbip/userspace/libsrc/sysfs_utils.h+0−0

File renamed without changes.

tools/usb/usbip/libsrc/usbip_common.crenamed from drivers/staging/usbip/userspace/libsrc/usbip_common.c+0−0

File renamed without changes.

tools/usb/usbip/libsrc/usbip_common.hrenamed from drivers/staging/usbip/userspace/libsrc/usbip_common.h+0−0

File renamed without changes.

tools/usb/usbip/libsrc/usbip_host_driver.crenamed from drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c+0−0

File renamed without changes.

tools/usb/usbip/libsrc/usbip_host_driver.hrenamed from drivers/staging/usbip/userspace/libsrc/usbip_host_driver.h+0−0

File renamed without changes.

tools/usb/usbip/libsrc/vhci_driver.crenamed from drivers/staging/usbip/userspace/libsrc/vhci_driver.c+0−0

File renamed without changes.

tools/usb/usbip/libsrc/vhci_driver.hrenamed from drivers/staging/usbip/userspace/libsrc/vhci_driver.h+0−0

File renamed without changes.

tools/usb/usbip/src/Makefile.amrenamed from drivers/staging/usbip/userspace/src/Makefile.am+0−0

File renamed without changes.

tools/usb/usbip/src/usbip.crenamed from drivers/staging/usbip/userspace/src/usbip.c+0−0

File renamed without changes.

tools/usb/usbip/src/usbip.hrenamed from drivers/staging/usbip/userspace/src/usbip.h+0−0

File renamed without changes.

tools/usb/usbip/src/usbip_attach.crenamed from drivers/staging/usbip/userspace/src/usbip_attach.c+0−0

File renamed without changes.

tools/usb/usbip/src/usbip_bind.crenamed from drivers/staging/usbip/userspace/src/usbip_bind.c+0−0

File renamed without changes.

tools/usb/usbip/src/usbip_detach.crenamed from drivers/staging/usbip/userspace/src/usbip_detach.c+0−0

File renamed without changes.

tools/usb/usbip/src/usbip_list.crenamed from drivers/staging/usbip/userspace/src/usbip_list.c+0−0

File renamed without changes.

tools/usb/usbip/src/usbip_network.crenamed from drivers/staging/usbip/userspace/src/usbip_network.c+0−0

File renamed without changes.

tools/usb/usbip/src/usbip_network.hrenamed from drivers/staging/usbip/userspace/src/usbip_network.h+0−0

File renamed without changes.

tools/usb/usbip/src/usbip_port.crenamed from drivers/staging/usbip/userspace/src/usbip_port.c+0−0

File renamed without changes.

tools/usb/usbip/src/usbip_unbind.crenamed from drivers/staging/usbip/userspace/src/usbip_unbind.c+0−0

File renamed without changes.

tools/usb/usbip/src/usbipd.crenamed from drivers/staging/usbip/userspace/src/usbipd.c+0−0

File renamed without changes.

tools/usb/usbip/src/utils.crenamed from drivers/staging/usbip/userspace/src/utils.c+0−0

File renamed without changes.

tools/usb/usbip/src/utils.hrenamed from drivers/staging/usbip/userspace/src/utils.h+0−0

File renamed without changes.

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