Backmerge tag 'v5.13-rc7' into drm-next

Backmerge Linux 5.13-rc7 to make some pulls from later bases apply, and to bake in the conflicts so far.

Dave Airlie committed 5 years ago

Commit f45fbbb2 parents d472b36 13311e71141 files · +13286 −5752Browse files

Unified · Split

1141 files

.clang-format +11 −2
.mailmap +3 −0
Documentation/admin-guide/sysctl/kernel.rst +14 −3
Documentation/devicetree/bindings/connector/usb-connector.yaml +15 −0
Documentation/devicetree/bindings/hwmon/ti,ads7828.yaml +1 −1
Documentation/devicetree/bindings/i2c/i2c-mpc.yaml +7 −0
Documentation/devicetree/bindings/media/renesas,drif.yaml +1 −3
Documentation/devicetree/bindings/net/renesas,ether.yaml +1 −1
Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml +2 −2
Documentation/devicetree/bindings/spi/spi-mux.yaml +1 −1
Documentation/driver-api/usb/usb.rst +2 −0
Documentation/riscv/vm-layout.rst +2 −2
Documentation/userspace-api/seccomp_filter.rst +8 −8
Documentation/virt/kvm/mmu.rst +2 −2
Documentation/virt/kvm/vcpu-requests.rst +5 −3
Documentation/vm/slub.rst +5 −5
MAINTAINERS +40 −12
Makefile +10 −2
arch/arc/include/uapi/asm/sigcontext.h +1 −0
arch/arc/kernel/signal.c +43 −0
arch/arc/kernel/vmlinux.lds.S +1 −1
arch/arm/boot/dts/imx6dl-yapp4-common.dtsi +5 −1
arch/arm/boot/dts/imx6q-dhcom-som.dtsi +12 −0
arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi +1 −1
arch/arm/boot/dts/imx7d-meerkat96.dts +1 −1
arch/arm/boot/dts/imx7d-pico.dtsi +1 −1
arch/arm/include/asm/cpuidle.h +3 −2
arch/arm/mach-imx/pm-imx27.c +1 −0
arch/arm/mach-omap1/board-ams-delta.c +0 −14
arch/arm/mach-omap1/board-h2.c +3 −1
arch/arm/mach-omap1/pm.c +7 −3
arch/arm/mach-omap2/board-n8x0.c +1 −1
arch/arm64/Kbuild +1 −2
arch/arm64/Kconfig.platforms +1 −0
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var1.dts +2 −1
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var4.dts +2 −3
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +2 −2
arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts +5 −5
arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi +7 −16
arch/arm64/boot/dts/ti/k3-am64-main.dtsi +6 −5
arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi +2 −1
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +6 −4
arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi +2 −2
arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi +7 −6
arch/arm64/boot/dts/ti/k3-am654-base-board.dts +0 −31
arch/arm64/boot/dts/ti/k3-j7200-main.dtsi +6 −2
arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi +4 −3
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +6 −4
arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi +6 −5
arch/arm64/include/asm/barrier.h +1 −1
arch/arm64/include/asm/kvm_asm.h +3 −0
arch/arm64/include/asm/kvm_emulate.h +5 −0
arch/arm64/kvm/arm.c +17 −3
arch/arm64/kvm/hyp/exception.c +17 −1
arch/arm64/kvm/hyp/include/hyp/adjust_pc.h +0 −18
arch/arm64/kvm/hyp/nvhe/hyp-main.c +8 −0
arch/arm64/kvm/hyp/nvhe/mem_protect.c +2 −2
arch/arm64/kvm/hyp/nvhe/setup.c +1 −1
arch/arm64/kvm/hyp/nvhe/switch.c +1 −2
arch/arm64/kvm/hyp/vhe/switch.c +1 −2
arch/arm64/kvm/mmu.c +6 −6
arch/arm64/kvm/reset.c +24 −4
arch/arm64/kvm/sys_regs.c +21 −21
arch/arm64/mm/mmu.c +2 −1
arch/mips/alchemy/board-xxs1500.c +1 −0
arch/mips/include/asm/mips-boards/launch.h +5 −0
arch/mips/lib/mips-atomic.c +6 −6
arch/mips/mm/cache.c +14 −16
arch/mips/ralink/of.c +2 −0
arch/powerpc/boot/dts/fsl/p1010si-post.dtsi +8 −0
arch/powerpc/boot/dts/fsl/p2041si-post.dtsi +16 −0
arch/powerpc/include/asm/jump_label.h +1 −1
arch/powerpc/include/asm/kvm_host.h +1 −0
arch/powerpc/include/asm/pte-walk.h +29 −0
arch/powerpc/kernel/eeh.c +1 −22
arch/powerpc/kernel/io-workarounds.c +3 −13
arch/powerpc/kernel/iommu.c +5 −6
arch/powerpc/kernel/kprobes.c +2 −2
arch/powerpc/kernel/signal_64.c +4 −5
arch/powerpc/kvm/book3s_hv.c +1 −2
arch/powerpc/kvm/book3s_hv_rm_mmu.c +2 −13
arch/powerpc/kvm/book3s_hv_rmhandlers.S +7 −0
arch/powerpc/mm/mem.c +1 −0
arch/powerpc/perf/core-book3s.c +1 −1
arch/riscv/Kconfig +10 −9
arch/riscv/Kconfig.socs +1 −0
arch/riscv/Makefile +10 −1
arch/riscv/boot/dts/microchip/Makefile +1 −0
arch/riscv/boot/dts/sifive/Makefile +1 −0
arch/riscv/boot/dts/sifive/fu740-c000.dtsi +1 −1
arch/riscv/errata/sifive/Makefile +1 −1
arch/riscv/include/asm/alternative-macros.h +2 −2
arch/riscv/include/asm/kexec.h +2 −2
arch/riscv/include/asm/pgtable.h +2 −3
arch/riscv/kernel/machine_kexec.c +6 −5
arch/riscv/kernel/probes/kprobes.c +2 −0
arch/riscv/kernel/setup.c +2 −2
arch/riscv/kernel/stacktrace.c +7 −7
arch/riscv/kernel/traps.c +9 −4
arch/riscv/kernel/vmlinux-xip.lds.S +14 −1
arch/riscv/mm/init.c +6 −2
arch/riscv/mm/kasan_init.c +5 −5
arch/s390/kernel/entry.S +2 −2
arch/x86/Makefile +3 −2
arch/x86/events/intel/uncore_snbep.c +6 −3
arch/x86/include/asm/apic.h +1 −0
arch/x86/include/asm/disabled-features.h +2 −5
arch/x86/include/asm/fpu/api.h +1 −5
arch/x86/include/asm/fpu/internal.h +10 −10
arch/x86/include/asm/kvm-x86-ops.h +1 −0
arch/x86/include/asm/kvm_host.h +1 −0
arch/x86/include/asm/thermal.h +3 −1
arch/x86/kernel/alternative.c +46 −18
arch/x86/kernel/apic/apic.c +1 −0
arch/x86/kernel/apic/vector.c +20 −0
arch/x86/kernel/cpu/perfctr-watchdog.c +2 −2
arch/x86/kernel/cpu/sgx/virt.c +1 −0
arch/x86/kernel/fpu/signal.c +35 −19
arch/x86/kernel/fpu/xstate.c +0 −57
arch/x86/kernel/setup.c +30 −14
arch/x86/kvm/cpuid.c +1 −0
arch/x86/kvm/emulate.c +3 −2
arch/x86/kvm/hyperv.c +8 −0
arch/x86/kvm/kvm_emulate.h +1 −2
arch/x86/kvm/lapic.c +26 −10
arch/x86/kvm/mmu/mmu.c +25 −1
arch/x86/kvm/mmu/paging_tmpl.h +9 −5
arch/x86/kvm/mmu/tdp_mmu.c +3 −3
arch/x86/kvm/svm/avic.c +5 −7
arch/x86/kvm/svm/sev.c +17 −9
arch/x86/kvm/svm/svm.c +1 −3
arch/x86/kvm/svm/svm.h +1 −1
arch/x86/kvm/trace.h +3 −3
arch/x86/kvm/vmx/capabilities.h +1 −2
arch/x86/kvm/vmx/posted_intr.c +14 −0
arch/x86/kvm/vmx/posted_intr.h +1 −0
arch/x86/kvm/vmx/vmx.c +4 −3
arch/x86/kvm/x86.c +37 −15
arch/x86/mm/fault.c +2 −2
arch/x86/mm/ioremap.c +3 −1
arch/x86/mm/mem_encrypt_identity.c +6 −5
arch/x86/mm/numa.c +7 −1
arch/x86/pci/fixup.c +44 −0
arch/x86/platform/efi/quirks.c +12 −0
arch/x86/realmode/init.c +8 −6
crypto/async_tx/async_xor.c +2 −1
drivers/acpi/acpi_apd.c +1 −0
drivers/acpi/acpica/utdelete.c +8 −0
drivers/acpi/bus.c +8 −19
drivers/acpi/internal.h +2 −2
drivers/acpi/power.c +46 −13
drivers/acpi/scan.c +1 −1
drivers/acpi/sleep.c +2 −4
drivers/base/core.c +36 −32
drivers/base/memory.c +3 −3
drivers/block/loop.c +7 −18
drivers/block/loop.h +1 −0
drivers/bluetooth/btusb.c +23 −2
drivers/bus/mhi/pci_generic.c +38 −4
drivers/bus/ti-sysc.c +54 −6
drivers/cpufreq/Kconfig.arm +0 −10
drivers/cpufreq/cppc_cpufreq.c +12 −233
drivers/dma/Kconfig +2 −0
drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c +3 −0
drivers/dma/idxd/cdev.c +1 −0
drivers/dma/idxd/init.c +62 −5
drivers/dma/ipu/ipu_irq.c +1 −1
drivers/dma/mediatek/mtk-uart-apdma.c +14 −13
drivers/dma/pl330.c +4 −2
drivers/dma/qcom/Kconfig +1 −0
drivers/dma/sf-pdma/Kconfig +1 −0
drivers/dma/sh/rcar-dmac.c +1 −1
drivers/dma/ste_dma40.c +3 −0
drivers/dma/stm32-mdma.c +2 −2
drivers/dma/xilinx/xilinx_dpdma.c +28 −3
drivers/dma/xilinx/zynqmp_dma.c +1 −1
drivers/firmware/efi/cper.c +1 −3
drivers/firmware/efi/fdtparams.c +3 −0
drivers/firmware/efi/libstub/file.c +1 −1
drivers/firmware/efi/memattr.c +0 −5
drivers/gpio/gpio-wcd934x.c +1 −1
drivers/gpu/drm/drm_auth.c +2 −1
drivers/gpu/drm/drm_ioctl.c +5 −4
drivers/gpu/drm/mcde/mcde_dsi.c +1 −1
drivers/gpu/drm/meson/meson_drv.c +5 −4
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +114 −41
drivers/gpu/drm/msm/adreno/a6xx_gpu.h +1 −1
drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c +1 −0
drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c +1 −0
drivers/gpu/drm/msm/msm_gem.c +7 −0
drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +27 −4
drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h +3 −2
drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c +36 −5
drivers/gpu/drm/tegra/drm.h +1 −1
drivers/gpu/drm/tegra/hub.c +1 −1
drivers/gpu/drm/tegra/sor.c +42 −28
drivers/gpu/drm/ttm/ttm_bo.c +4 −1
drivers/gpu/drm/ttm/ttm_device.c +1 −7
drivers/gpu/drm/vc4/vc4_kms.c +1 −1
drivers/gpu/host1x/bus.c +24 −6
drivers/hid/Kconfig +17 −2
drivers/hid/Makefile +1 −0
drivers/hid/amd-sfh-hid/amd_sfh_client.c +10 −9
drivers/hid/amd-sfh-hid/amd_sfh_hid.c +0 −3
drivers/hid/hid-a4tech.c +2 −0
drivers/hid/hid-asus.c +20 −12
drivers/hid/hid-core.c +3 −1
drivers/hid/hid-debug.c +3 −0
drivers/hid/hid-ft260.c +16 −13
drivers/hid/hid-gt683r.c +1 −0
drivers/hid/hid-ids.h +7 −2
drivers/hid/hid-input.c +3 −0
drivers/hid/hid-logitech-hidpp.c +1 −0
drivers/hid/hid-magicmouse.c +5 −2
drivers/hid/hid-multitouch.c +37 −9
drivers/hid/hid-quirks.c +4 −0
drivers/hid/hid-semitek.c +40 −0
drivers/hid/hid-sensor-custom.c +5 −3
drivers/hid/hid-sensor-hub.c +9 −4
drivers/hid/hid-thrustmaster.c +1 −1
drivers/hid/i2c-hid/i2c-hid-core.c +10 −3
drivers/hid/intel-ish-hid/ipc/hw-ish.h +2 −0
drivers/hid/intel-ish-hid/ipc/pci-ish.c +2 −0
drivers/hid/surface-hid/surface_hid_core.c +3 −3
drivers/hid/usbhid/hid-core.c +1 −1
drivers/hid/usbhid/hid-pidff.c +1 −0
drivers/hwmon/corsair-psu.c +14 −0
drivers/hwmon/dell-smm-hwmon.c +2 −2
drivers/hwmon/pmbus/fsp-3y.c +25 −7
drivers/hwmon/pmbus/isl68137.c +2 −2
drivers/hwmon/pmbus/q54sj108a2.c +1 −1
drivers/hwmon/scpi-hwmon.c +9 −0
drivers/hwmon/tps23861.c +15 −2
drivers/i2c/busses/Kconfig +1 −1
drivers/i2c/busses/i2c-ali1563.c +1 −1
drivers/i2c/busses/i2c-altera.c +4 −5
drivers/i2c/busses/i2c-cadence.c +1 −1
drivers/i2c/busses/i2c-designware-master.c +1 −1
drivers/i2c/busses/i2c-eg20t.c +2 −1
drivers/i2c/busses/i2c-i801.c +2 −4
drivers/i2c/busses/i2c-icy.c +0 −1
drivers/i2c/busses/i2c-mpc.c +79 −2
drivers/i2c/busses/i2c-mt65xx.c +5 −0
drivers/i2c/busses/i2c-nomadik.c +1 −1
drivers/i2c/busses/i2c-ocores.c +4 −4
drivers/i2c/busses/i2c-pnx.c +4 −4
drivers/i2c/busses/i2c-qcom-geni.c +21 −2
drivers/i2c/busses/i2c-s3c2410.c +3 −0
drivers/i2c/busses/i2c-sh_mobile.c +1 −1
drivers/i2c/busses/i2c-st.c +2 −2
drivers/i2c/busses/i2c-stm32f4.c +1 −1
drivers/i2c/busses/i2c-tegra-bpmp.c +2 −2
drivers/i2c/muxes/i2c-arb-gpio-challenge.c +2 −2
drivers/iio/adc/ad7124.c +20 −16
drivers/iio/adc/ad7192.c +10 −9
drivers/iio/adc/ad7768-1.c +6 −2
drivers/iio/adc/ad7793.c +1 −0
drivers/iio/adc/ad7923.c +3 −1
drivers/iio/dac/ad5770r.c +11 −5
drivers/iio/gyro/fxas21002c_core.c +2 −0
drivers/infiniband/core/uverbs_cmd.c +5 −0
drivers/infiniband/hw/mlx4/main.c +1 −7
drivers/infiniband/hw/mlx5/cq.c +4 −5
drivers/infiniband/hw/mlx5/doorbell.c +6 −1
drivers/infiniband/hw/mlx5/fs.c +8 −3
drivers/infiniband/hw/mlx5/mr.c +4 −4
drivers/infiniband/ulp/ipoib/ipoib_netlink.c +1 −0
drivers/interconnect/qcom/bcm-voter.c +3 −1
drivers/iommu/amd/iommu.c +3 −1
drivers/iommu/intel/dmar.c +3 −1
drivers/iommu/intel/iommu.c +7 −2
drivers/iommu/intel/pasid.c +2 −1
drivers/iommu/virtio-iommu.c +1 −0
drivers/irqchip/irq-gic-v3.c +35 −1
drivers/isdn/hardware/mISDN/netjet.c +0 −1
drivers/md/bcache/bcache.h +0 −1
drivers/md/bcache/request.c +7 −13
drivers/md/bcache/stats.c +0 −14
drivers/md/bcache/stats.h +0 −1
drivers/md/bcache/sysfs.c +0 −4
drivers/md/dm-snap.c +2 −1
drivers/md/dm-verity-verify-sig.c +1 −1
drivers/md/raid5.c +0 −2
drivers/misc/cardreader/rtl8411.c +1 −0
drivers/misc/cardreader/rts5209.c +1 −0
drivers/misc/cardreader/rts5227.c +2 −0
drivers/misc/cardreader/rts5228.c +1 −0
drivers/misc/cardreader/rts5229.c +1 −0
drivers/misc/cardreader/rts5249.c +3 −0
drivers/misc/cardreader/rts5260.c +1 −0
drivers/misc/cardreader/rts5261.c +1 −0
drivers/misc/cardreader/rtsx_pcr.c +31 −13
drivers/misc/kgdbts.c +2 −1
drivers/misc/mei/interrupt.c +3 −0
drivers/mmc/host/renesas_sdhi_core.c +7 −2
drivers/mtd/nand/raw/cs553x_nand.c +11 −1
drivers/mtd/nand/raw/fsmc_nand.c +11 −1
drivers/mtd/nand/raw/lpc32xx_slc.c +14 −1
drivers/mtd/nand/raw/ndfc.c +11 −1
drivers/mtd/nand/raw/sharpsl.c +11 −1
drivers/mtd/nand/raw/tmio_nand.c +5 −3
drivers/mtd/nand/raw/txx9ndfmc.c +3 −2
drivers/mtd/parsers/ofpart_core.c +14 −12
drivers/net/appletalk/cops.c +2 −2
drivers/net/bonding/bond_main.c +1 −1
drivers/net/caif/caif_serial.c +1 −0
drivers/net/can/usb/mcba_usb.c +15 −2
drivers/net/dsa/bcm_sf2.c +2 −3
drivers/net/dsa/microchip/ksz9477.c +1 −0
drivers/net/dsa/mt7530.c +0 −8
drivers/net/dsa/ocelot/felix_vsc9959.c +10 −5
drivers/net/dsa/sja1105/sja1105_dynamic_config.c +19 −4
drivers/net/dsa/sja1105/sja1105_main.c +51 −23
drivers/net/ethernet/amazon/ena/ena_netdev.c +28 −26
drivers/net/ethernet/atheros/alx/main.c +1 −0
drivers/net/ethernet/broadcom/bnx2.c +1 −1
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +3 −1
drivers/net/ethernet/broadcom/bnxt/bnxt.c +117 −29
drivers/net/ethernet/broadcom/bnxt/bnxt.h +10 −0
drivers/net/ethernet/cadence/macb_main.c +3 −0
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +0 −2
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +35 −13
drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c +2 −2
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +3 −5
drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c +5 −9
drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c +6 −3
drivers/net/ethernet/chelsio/cxgb4/sge.c +6 −0
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +29 −17
drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c +79 −1
drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.h +2 −0
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c +4 −2
drivers/net/ethernet/ec_bhf.c +3 −1
drivers/net/ethernet/emulex/benet/be_main.c +1 −0
drivers/net/ethernet/freescale/fec_main.c +19 −5
drivers/net/ethernet/freescale/fec_ptp.c +5 −3
drivers/net/ethernet/google/gve/gve_main.c +12 −9
drivers/net/ethernet/google/gve/gve_tx.c +7 −3
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +3 −3
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +51 −59
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +23 −41
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c +3 −1
drivers/net/ethernet/intel/i40e/i40e_txrx.c +6 −1
drivers/net/ethernet/intel/i40e/i40e_xsk.c +6 −2
drivers/net/ethernet/intel/ice/ice.h +5 −3
drivers/net/ethernet/intel/ice/ice_ethtool.c +6 −45
drivers/net/ethernet/intel/ice/ice_hw_autogen.h +1 −0
drivers/net/ethernet/intel/ice/ice_lib.c +22 −8
drivers/net/ethernet/intel/ice/ice_main.c +15 −0
drivers/net/ethernet/intel/ice/ice_txrx.c +13 −4
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +13 −6
drivers/net/ethernet/intel/ice/ice_xsk.c +9 −2
drivers/net/ethernet/intel/igb/igb.h +1 −1
drivers/net/ethernet/intel/igb/igb_main.c +32 −23
drivers/net/ethernet/intel/igb/igb_ptp.c +10 −13
drivers/net/ethernet/intel/igc/igc_main.c +5 −6
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +8 −8
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +7 −9
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c +8 −6
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +3 −0
drivers/net/ethernet/korina.c +6 −6
drivers/net/ethernet/lantiq_xrx200.c +11 −6
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +22 −0
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +45 −9
drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c +4 −0
drivers/net/ethernet/mediatek/mtk_eth_soc.c +52 −25
drivers/net/ethernet/mediatek/mtk_eth_soc.h +22 −2
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +1 −3
drivers/net/ethernet/mellanox/mlx4/fw.c +3 −0
drivers/net/ethernet/mellanox/mlx4/fw.h +1 −0
drivers/net/ethernet/mellanox/mlx4/main.c +6 −0
drivers/net/ethernet/mellanox/mlx4/port.c +103 −4
drivers/net/ethernet/mellanox/mlx5/core/dev.c +19 −0
drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c +2 −0
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c +0 −1
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h +22 −0
drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c +2 −0
drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c +6 −9
drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c +2 −6
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c +31 −4
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c +0 −3
drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c +1 −1
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +10 −2
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c +1 −0
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +81 −33
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +32 −7
drivers/net/ethernet/mellanox/mlx5/core/en_tc.h +3 −0
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +3 −22
drivers/net/ethernet/mellanox/mlx5/core/eq.c +4 −2
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +7 −0
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +2 −1
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c +26 −35
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +3 −0
drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c +6 −0
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c +1 −1
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.h +5 −0
drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c +3 −0
drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h +1 −4
drivers/net/ethernet/mellanox/mlx5/core/main.c +7 −7
drivers/net/ethernet/mellanox/mlx5/core/mr.c +1 −1
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +17 −5
drivers/net/ethernet/mellanox/mlx5/core/rdma.c +3 −0
drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c +1 −0
drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c +11 −7
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_fw.c +2 −1
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c +16 −10
drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h +5 −4
drivers/net/ethernet/mellanox/mlx5/core/transobj.c +24 −6
drivers/net/ethernet/mellanox/mlx5/core/vport.c +0 −2
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +4 −2
drivers/net/ethernet/mellanox/mlxsw/reg.h +1 −1
drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c +4 −1
drivers/net/ethernet/microchip/encx24j600.c +1 −1
drivers/net/ethernet/microchip/encx24j600_hw.h +1 −1
drivers/net/ethernet/mscc/ocelot.c +5 −0
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +1 −0
drivers/net/ethernet/pensando/Kconfig +1 −0
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +2 −0
drivers/net/ethernet/qlogic/qed/qed_dcbx.c +3 −1
drivers/net/ethernet/qlogic/qla3xxx.c +1 −1
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +1 −0
drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c +9 −9
drivers/net/ethernet/realtek/r8169_main.c +1 −1
drivers/net/ethernet/renesas/sh_eth.c +1 −1
drivers/net/ethernet/sfc/nic.c +1 −0
drivers/net/ethernet/stmicro/stmmac/dwmac1000.h +4 −4
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +25 −13
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +2 −0
drivers/net/ethernet/ti/netcp_core.c +2 −2
drivers/net/ethernet/xilinx/ll_temac_main.c +24 −3
drivers/net/hamradio/mkiss.c +1 −0
drivers/net/ieee802154/mrf24j40.c +2 −2
drivers/net/ipa/ipa.h +2 −0
drivers/net/ipa/ipa_mem.c +2 −1
drivers/net/mdio/mdio-octeon.c +0 −2
drivers/net/mdio/mdio-thunder.c +0 −1
drivers/net/mhi/net.c +1 −1
drivers/net/phy/dp83867.c +1 −5
drivers/net/phy/mdio_bus.c +2 −1
drivers/net/usb/cdc_eem.c +2 −2
drivers/net/usb/cdc_ncm.c +1 −1
drivers/net/usb/hso.c +22 −23
drivers/net/usb/lan78xx.c +1 −0
drivers/net/usb/qmi_wwan.c +1 −1
drivers/net/usb/r8152.c +38 −6
drivers/net/usb/smsc75xx.c +9 −3
drivers/net/virtio_net.c +8 −12
drivers/net/vrf.c +2 −4
drivers/net/wireguard/Makefile +1 −2
drivers/net/wireguard/allowedips.c +99 −90
drivers/net/wireguard/allowedips.h +7 −7
drivers/net/wireguard/main.c +16 −1
drivers/net/wireguard/peer.c +20 −7
drivers/net/wireguard/peer.h +3 −0
drivers/net/wireguard/selftest/allowedips.c +79 −86
drivers/net/wireguard/socket.c +1 −1
drivers/net/wireless/ath/ath10k/htt.h +1 −0
drivers/net/wireless/ath/ath10k/htt_rx.c +191 −10
drivers/net/wireless/ath/ath10k/rx_desc.h +13 −1
drivers/net/wireless/ath/ath11k/dp_rx.c +34 −0
drivers/net/wireless/ath/ath11k/dp_rx.h +1 −0
drivers/net/wireless/ath/ath11k/mac.c +6 −0
drivers/net/wireless/mac80211_hwsim.c +5 −0
drivers/net/wireless/mediatek/mt76/mac80211.c +26 −0
drivers/net/wireless/mediatek/mt76/mt7615/init.c +0 −1
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +3 −2
drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c +12 −7
drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c +0 −3
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +4 −0
drivers/net/wireless/mediatek/mt76/mt76x0/pci.c +77 −4
drivers/net/wireless/mediatek/mt76/mt7921/init.c +2 −2
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +3 −2
drivers/net/wireless/mediatek/mt76/mt7921/main.c +1 −2
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +10 −7
drivers/net/xen-netback/interface.c +6 −0
drivers/nfc/nfcmrvl/fw_dnld.h +1 −1
drivers/nfc/nfcmrvl/i2c.c +1 −1
drivers/nfc/nfcmrvl/nfcmrvl.h +1 −1
drivers/nfc/nfcmrvl/spi.c +1 −1
drivers/nfc/nfcmrvl/uart.c +1 −1
drivers/nfc/nfcmrvl/usb.c +1 −1
drivers/nvme/host/Kconfig +2 −1
drivers/nvme/host/core.c +3 −1
drivers/nvme/host/fabrics.c +5 −0
drivers/nvme/host/fc.c +17 −8
drivers/nvme/host/rdma.c +3 −2
drivers/nvme/target/core.c +27 −21
drivers/nvme/target/loop.c +8 −3
drivers/nvme/target/nvmet.h +1 −1
drivers/nvme/target/tcp.c +1 −1
drivers/pci/controller/dwc/Makefile +2 −1
drivers/pci/controller/dwc/pcie-tegra194-acpi.c +108 −0
drivers/pci/controller/dwc/pcie-tegra194.c +18 −120
drivers/pci/controller/pci-aardvark.c +40 −9
drivers/pci/of.c +9 −0
drivers/pci/probe.c +2 −1
drivers/pci/quirks.c +92 −1
drivers/phy/broadcom/phy-brcm-usb-init.h +2 −2
drivers/phy/cadence/phy-cadence-sierra.c +1 −0
drivers/phy/mediatek/phy-mtk-tphy.c +2 −0
drivers/phy/microchip/sparx5_serdes.c +4 −0
drivers/phy/ralink/phy-mt7621-pci.c +1 −1
drivers/phy/ti/phy-j721e-wiz.c +1 −0
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +2 −2
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c +2 −2
drivers/pinctrl/aspeed/pinctrl-aspeed.c +2 −1
drivers/pinctrl/aspeed/pinmux-aspeed.c +2 −1
drivers/pinctrl/qcom/Kconfig +1 −1
drivers/pinctrl/qcom/pinctrl-sdx55.c +9 −9
drivers/pinctrl/ralink/pinctrl-rt2880.c +1 −1
drivers/platform/mellanox/mlxreg-hotplug.c +2 −2
drivers/platform/surface/aggregator/controller.c +1 −1
drivers/platform/surface/surface_aggregator_registry.c +5 −2
drivers/platform/surface/surface_dtx.c +1 −0
drivers/platform/x86/thinkpad_acpi.c +1 −0
drivers/ptp/ptp_clock.c +3 −3
drivers/ptp/ptp_ocp.c +3 −1
drivers/regulator/Kconfig +1 −1
drivers/regulator/atc260x-regulator.c +10 −9
drivers/regulator/bd718x7-regulator.c +1 −1
drivers/regulator/core.c +6 −0
drivers/regulator/cros-ec-regulator.c +2 −1
drivers/regulator/da9121-regulator.c +7 −3
drivers/regulator/fan53555.c +1 −2
drivers/regulator/fan53880.c +3 −0
drivers/regulator/fixed.c +6 −1
drivers/regulator/helpers.c +1 −1
drivers/regulator/hi6421v600-regulator.c +2 −2
drivers/regulator/hi655x-regulator.c +1 −1
drivers/regulator/max77620-regulator.c +11 −6
drivers/regulator/mt6315-regulator.c +1 −1
drivers/regulator/rt4801-regulator.c +2 −2
drivers/regulator/rtmv20-regulator.c +42 −2
drivers/regulator/scmi-regulator.c +1 −1
drivers/s390/block/dasd_diag.c +7 −1
drivers/s390/block/dasd_fba.c +7 −1
drivers/s390/block/dasd_int.h +0 −1
drivers/s390/cio/vfio_ccw_cp.c +4 −0
drivers/s390/cio/vfio_ccw_drv.c +10 −2
drivers/s390/cio/vfio_ccw_fsm.c +1 −0
drivers/s390/cio/vfio_ccw_ops.c +0 −2
drivers/s390/crypto/ap_queue.c +9 −2
drivers/scsi/aic7xxx/aicasm/aicasm_gram.y +0 −1
drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h +1 −1
drivers/scsi/aic7xxx/scsi_message.h +11 −0
drivers/scsi/bnx2fc/bnx2fc_io.c +1 −0
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +4 −4
drivers/scsi/hosts.c +26 −21
drivers/scsi/libsas/sas_port.c +2 −2
drivers/scsi/lpfc/lpfc_sli.c +1 −3
drivers/scsi/qedf/qedf_main.c +9 −11
drivers/scsi/qla2xxx/qla_target.c +2 −0
drivers/scsi/scsi_devinfo.c +1 −0
drivers/scsi/ufs/ufs-mediatek.c +14 −1
drivers/scsi/vmw_pvscsi.c +7 −1
drivers/soc/amlogic/meson-clk-measure.c +1 −3
drivers/soundwire/qcom.c +10 −2
drivers/spi/Kconfig +1 −1
drivers/spi/spi-bcm2835.c +8 −2
drivers/spi/spi-bitbang.c +14 −4
drivers/spi/spi-fsl-dspi.c +3 −1
drivers/spi/spi-fsl-spi.c +4 −0
drivers/spi/spi-omap-uwire.c +8 −1
drivers/spi/spi-omap2-mcspi.c +20 −13
drivers/spi/spi-pxa2xx.c +8 −1
drivers/spi/spi-sc18is602.c +8 −1
drivers/spi/spi-sprd.c +1 −0
drivers/spi/spi-stm32-qspi.c +4 −1
drivers/spi/spi-zynq-qspi.c +8 −8
drivers/spi/spi.c +38 −13
drivers/staging/emxx_udc/emxx_udc.c +2 −2
drivers/staging/iio/cdc/ad7746.c +0 −1
drivers/staging/ralink-gdma/ralink-gdma.c +0 −2
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +3 −3
drivers/target/target_core_iblock.c +2 −2
drivers/target/target_core_transport.c +2 −4
drivers/target/target_core_user.c +7 −5
drivers/tee/optee/call.c +4 −2
drivers/tee/optee/optee_msg.h +4 −2
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +4 −0
drivers/thermal/intel/therm_throt.c +11 −4
drivers/thermal/intel/x86_pkg_temp_thermal.c +1 −1
drivers/thermal/qcom/qcom-spmi-adc-tm5.c +1 −1
drivers/thermal/ti-soc-thermal/ti-bandgap.c +1 −1
drivers/thunderbolt/dma_port.c +6 −5
drivers/thunderbolt/usb4.c +5 −4
drivers/tty/serial/8250/8250.h +17 −15
drivers/tty/serial/8250/8250_aspeed_vuart.c +1 −0
drivers/tty/serial/8250/8250_dw.c +1 −0
drivers/tty/serial/8250/8250_exar.c +5 −1
drivers/tty/serial/8250/8250_pci.c +35 −12
drivers/tty/serial/8250/8250_port.c +12 −0
drivers/tty/serial/rp2.c +17 −35
drivers/tty/serial/serial-tegra.c +1 −1
drivers/tty/serial/serial_core.c +5 −3
drivers/tty/serial/sh-sci.c +2 −2
drivers/usb/cdns3/cdns3-gadget.c +6 −6
drivers/usb/cdns3/cdnsp-gadget.c +7 −7
drivers/usb/cdns3/cdnsp-ring.c +4 −3
drivers/usb/chipidea/udc.c +1 −0
drivers/usb/chipidea/usbmisc_imx.c +14 −2
drivers/usb/core/devio.c +8 −3
drivers/usb/core/hub.c +7 −0
drivers/usb/dwc3/core.c +1 −7
drivers/usb/dwc3/debug.h +3 −0
drivers/usb/dwc3/debugfs.c +2 −19
drivers/usb/dwc3/dwc3-meson-g12a.c +10 −3
drivers/usb/dwc3/ep0.c +3 −0
drivers/usb/dwc3/gadget.c +19 −12
drivers/usb/gadget/config.c +8 −0
drivers/usb/gadget/function/f_ecm.c +1 −1
drivers/usb/gadget/function/f_eem.c +3 −3
drivers/usb/gadget/function/f_fs.c +3 −0
drivers/usb/gadget/function/f_hid.c +2 −1
drivers/usb/gadget/function/f_loopback.c +1 −1
drivers/usb/gadget/function/f_ncm.c +5 −5
drivers/usb/gadget/function/f_printer.c +2 −1
drivers/usb/gadget/function/f_rndis.c +1 −1
drivers/usb/gadget/function/f_serial.c +1 −1
drivers/usb/gadget/function/f_sourcesink.c +2 −1
drivers/usb/gadget/function/f_subset.c +1 −1
drivers/usb/gadget/function/f_tcm.c +2 −1
drivers/usb/gadget/udc/renesas_usb3.c +3 −2
drivers/usb/host/xhci-pci.c +6 −1
drivers/usb/host/xhci-ring.c +7 −7
drivers/usb/host/xhci.h +1 −0
drivers/usb/misc/brcmstb-usb-pinmap.c +2 −0
drivers/usb/misc/trancevibrator.c +2 −2
drivers/usb/misc/uss720.c +1 −0
drivers/usb/musb/musb_core.c +1 −2
drivers/usb/serial/cp210x.c +78 −6
drivers/usb/serial/ftdi_sio.c +4 −0
drivers/usb/serial/ftdi_sio_ids.h +8 −0
drivers/usb/serial/omninet.c +5 −3
drivers/usb/serial/option.c +4 −0
drivers/usb/serial/pl2303.c +1 −0
drivers/usb/serial/pl2303.h +1 −0
drivers/usb/serial/quatech2.c +3 −3
drivers/usb/serial/ti_usb_3410_5052.c +3 −0
drivers/usb/typec/mux.c +5 −4
drivers/usb/typec/mux/intel_pmc_mux.c +11 −4
drivers/usb/typec/tcpm/tcpm.c +107 −43
drivers/usb/typec/tcpm/wcove.c +1 −1
drivers/usb/typec/ucsi/ucsi.c +2 −1
drivers/vdpa/mlx5/net/mlx5_vnet.c +18 −1
drivers/vfio/pci/Kconfig +1 −0
drivers/vfio/pci/vfio_pci_config.c +1 −1
drivers/vfio/platform/vfio_platform_common.c +1 −1
drivers/vfio/vfio_iommu_type1.c +1 −1
drivers/video/fbdev/core/fb_defio.c +35 −0
drivers/video/fbdev/core/fbmem.c +4 −0
drivers/video/fbdev/hgafb.c +1 −1
fs/afs/cmservice.c +5 −0
fs/afs/dir.c +3 −1
fs/afs/fsclient.c +4 −0
fs/afs/main.c +2 −2
fs/afs/vlclient.c +1 −0
fs/afs/write.c +9 −6
fs/btrfs/block-group.c +4 −4
fs/btrfs/compression.c +12 −5
fs/btrfs/disk-io.c +18 −8
fs/btrfs/extent-tree.c +1 −1
fs/btrfs/file-item.c +81 −27
fs/btrfs/file.c +2 −2
fs/btrfs/inode.c +18 −1
fs/btrfs/reflink.c +22 −16
fs/btrfs/tree-log.c +29 −8
fs/btrfs/zoned.c +18 −5
fs/cifs/cifs_ioctl.h +19 −6
fs/cifs/cifspdu.h +2 −1
fs/cifs/ioctl.c +105 −38
fs/cifs/smb2pdu.c +7 −0
fs/cifs/trace.h +17 −12
fs/coredump.c +1 −1
fs/debugfs/file.c +1 −1
fs/debugfs/inode.c +6 −3
fs/ext4/extents.c +23 −20
fs/ext4/fast_commit.c +90 −80
fs/ext4/fast_commit.h +0 −19
fs/ext4/ialloc.c +4 −2
fs/ext4/mballoc.c +1 −1
fs/ext4/namei.c +4 −2
fs/ext4/super.c +9 −2
fs/ext4/sysfs.c +4 −0
fs/gfs2/file.c +4 −1
fs/gfs2/glock.c +24 −4
fs/gfs2/glops.c +1 −1
fs/gfs2/log.c +3 −3
fs/gfs2/log.h +1 −0
fs/gfs2/lops.c +6 −1
fs/gfs2/lops.h +1 −0
fs/gfs2/util.c +1 −0
fs/hugetlbfs/inode.c +1 −0
fs/io-wq.c +15 −14
fs/io-wq.h +1 −1
fs/io_uring.c +43 −15
fs/netfs/Kconfig +1 −1
fs/netfs/read_helper.c +1 −1
fs/nfs/client.c +1 −1
fs/nfs/filelayout/filelayout.c +1 −1
fs/nfs/namespace.c +1 −1
fs/nfs/nfs4_fs.h +1 −0
fs/nfs/nfs4client.c +1 −1
fs/nfs/nfs4file.c +1 −1
fs/nfs/nfs4proc.c +32 −9
fs/nfs/nfstrace.h +0 −4
fs/nfs/pagelist.c +6 −14
fs/nfs/pnfs.c +8 −9
fs/nfs/super.c +1 −1
fs/notify/fanotify/fanotify_user.c +26 −8
fs/notify/fdinfo.c +1 −1
fs/ocfs2/file.c +50 −5
fs/proc/base.c +13 −0
fs/xfs/libxfs/xfs_ag_resv.c +15 −3
fs/xfs/libxfs/xfs_bmap.c +0 −12
fs/xfs/libxfs/xfs_inode_buf.c +42 −4
fs/xfs/libxfs/xfs_trans_inode.c +17 −0
fs/xfs/xfs_inode.c +29 −0
fs/xfs/xfs_ioctl.c +34 −67
fs/xfs/xfs_message.h +2 −0
include/asm-generic/vmlinux.lds.h +1 −0
include/dt-bindings/usb/pd.h +76 −13
include/linux/arch_topology.h +0 −1
include/linux/avf/virtchnl.h +1 −0
include/linux/cgroup-defs.h +3 −3
include/linux/cgroup.h +1 −1
include/linux/compiler_attributes.h +1 −0
include/linux/device.h +2 −4
include/linux/entry-kvm.h +2 −1
include/linux/fanotify.h +4 −0
include/linux/fb.h +3 −0
include/linux/hid.h +1 −2
include/linux/host1x.h +24 −6
include/linux/huge_mm.h +7 −1
include/linux/hugetlb.h +8 −0
include/linux/init.h +2 −1
include/linux/kvm_host.h +16 −2
include/linux/mfd/rohm-bd70528.h +1 −3
include/linux/mfd/rohm-bd71828.h +5 −5
include/linux/mlx4/device.h +1 −0
include/linux/mlx5/driver.h +26 −22
include/linux/mlx5/mlx5_ifc.h +2 −0
include/linux/mlx5/mpfs.h +18 −0
include/linux/mlx5/transobj.h +1 −0
include/linux/mm.h +3 −0
include/linux/mm_types.h +20 −7
include/linux/pci.h +2 −0
include/linux/pgtable.h +8 −0
include/linux/phy.h +5 −0
include/linux/platform_data/ti-sysc.h +1 −0
include/linux/ptp_clock_kernel.h +1 −1
include/linux/rmap.h +1 −0
include/linux/rtsx_pci.h +2 −0
include/linux/sched.h +8 −0
include/linux/socket.h +0 −2
include/linux/spi/spi.h +2 −2
include/linux/sunrpc/xprt.h +2 −0
include/linux/swapops.h +11 −4
include/linux/tick.h +7 −0
include/linux/usb/pd.h +1 −1
include/linux/usb/pd_ext_sdb.h +0 −4
include/net/caif/caif_dev.h +1 −1
include/net/caif/cfcnfg.h +1 −1
include/net/caif/cfserl.h +1 −0
include/net/cfg80211.h +2 −2
include/net/mac80211.h +7 −2
include/net/net_namespace.h +13 −1
include/net/netfilter/nf_flow_table.h +0 −1
include/net/netfilter/nf_tables.h +0 −6
include/net/nfc/nci_core.h +1 −0
include/net/pkt_cls.h +11 −0
include/net/pkt_sched.h +1 −6
include/net/sch_generic.h +34 −1
include/net/sock.h +16 −5
include/net/tls.h +9 −1
include/sound/soc-dai.h +1 −1
include/uapi/asm-generic/unistd.h +1 −2
include/uapi/linux/in.h +3 −0
include/uapi/linux/input-event-codes.h +1 −0
include/uapi/linux/io_uring.h +10 −9
include/uapi/linux/kvm.h +3 −2
include/uapi/linux/virtio_ids.h +1 −1
init/Kconfig +1 −40
init/main.c +1 −1
kernel/bpf/Kconfig +89 −0
kernel/bpf/bpf_lsm.c +2 −0
kernel/bpf/btf.c +12 −0
kernel/bpf/helpers.c +24 −18
kernel/bpf/ringbuf.c +11 −13
kernel/bpf/syscall.c +2 −1
kernel/bpf/verifier.c +118 −44
kernel/cgroup/cgroup-v1.c +5 −1
kernel/cgroup/cgroup.c +9 −12
kernel/cgroup/cpuset.c +1 −1
kernel/cgroup/rdma.c +1 −1
kernel/cgroup/rstat.c +1 −1
kernel/crash_core.c +1 −0
kernel/entry/common.c +3 −2
kernel/events/core.c +2 −0
kernel/irq_work.c +0 −3
kernel/printk/printk_safe.c +1 −1
kernel/sched/core.c +0 −1
kernel/sched/debug.c +2 −1
kernel/sched/fair.c +42 −30
kernel/sched/pelt.h +1 −10
kernel/seccomp.c +16 −14
kernel/sysctl.c +24 −5
kernel/time/tick-sched.c +1 −0
kernel/trace/bpf_trace.c +12 −20
kernel/trace/ftrace.c +7 −1
kernel/trace/trace.c +1 −12
kernel/trace/trace_clock.c +3 −3
kernel/workqueue.c +10 −2
lib/crc64.c +1 −1
lib/percpu-refcount.c +3 −3
mm/debug_vm_pgtable.c +2 −2
mm/huge_memory.c +29 −27
mm/hugetlb.c +125 −26
mm/internal.h +39 −14
mm/kasan/init.c +2 −2
mm/kfence/core.c +3 −3
mm/memory-failure.c +33 −3
mm/memory.c +45 −0
mm/migrate.c +1 −0
mm/page_alloc.c +2 −0
mm/page_vma_mapped.c +17 −10
mm/pgtable-generic.c +2 −3
mm/rmap.c +27 −12
mm/slab_common.c +1 −2
mm/slub.c +16 −21
mm/sparse.c +11 −2
mm/swapfile.c +1 −1
mm/truncate.c +19 −24
net/Kconfig +0 −27
net/appletalk/aarp.c +1 −1
net/batman-adv/bat_iv_ogm.c +3 −1
net/bluetooth/hci_core.c +6 −1
net/bluetooth/hci_sock.c +2 −2
net/bluetooth/smp.c +3 −3
net/bridge/br_private.h +2 −2
net/bridge/br_vlan_tunnel.c +24 −14
net/caif/caif_dev.c +9 −4
net/caif/caif_usb.c +13 −1
net/caif/cfcnfg.c +11 −5
net/caif/cfserl.c +5 −0
net/can/bcm.c +49 −13
net/can/isotp.c +81 −29
net/can/j1939/transport.c +40 −14
net/can/raw.c +48 −14
net/compat.c +1 −1
net/core/dev.c +24 −5
net/core/devlink.c +2 −2
net/core/fib_rules.c +1 −1
net/core/filter.c +1 −0
net/core/neighbour.c +1 −0
net/core/net_namespace.c +13 −7
net/core/rtnetlink.c +4 −0
net/core/skbuff.c +3 −1
net/core/sock.c +16 −8
net/dsa/master.c +3 −2
net/dsa/slave.c +7 −5
net/dsa/tag_8021q.c +1 −1
net/ethtool/eeprom.c +1 −1
net/ethtool/ioctl.c +5 −5
net/ethtool/stats.c +1 −1
net/ethtool/strset.c +2 −0
net/hsr/hsr_device.c +2 −0
net/hsr/hsr_forward.c +21 −9
net/hsr/hsr_forward.h +4 −4
net/hsr/hsr_main.h +2 −2
net/hsr/hsr_slave.c +5 −6
net/ieee802154/nl-mac.c +6 −4
net/ieee802154/nl-phy.c +3 −1
net/ieee802154/nl802154.c +5 −4
net/ipv4/af_inet.c +2 −2
net/ipv4/bpf_tcp_ca.c +2 −0
net/ipv4/cipso_ipv4.c +1 −0
net/ipv4/devinet.c +1 −1
net/ipv4/icmp.c +7 −0
net/ipv4/igmp.c +1 −0
net/ipv4/ipconfig.c +8 −5
net/ipv4/ping.c +7 −5
net/ipv4/route.c +14 −1
net/ipv4/udp.c +10 −0
net/ipv6/addrconf.c +1 −1
net/ipv6/mcast.c +0 −3
net/ipv6/netfilter/nft_fib_ipv6.c +18 −4
net/ipv6/reassembly.c +3 −1
net/ipv6/route.c +6 −2
net/ipv6/sit.c +3 −0
net/ipv6/udp.c +3 −0
net/mac80211/debugfs.c +9 −2
net/mac80211/ieee80211_i.h +14 −24
net/mac80211/iface.c +15 −15
net/mac80211/key.c +7 −0
net/mac80211/key.h +2 −0
net/mac80211/main.c +6 −1
net/mac80211/mlme.c +8 −0
net/mac80211/rc80211_minstrel_ht.c +1 −1
net/mac80211/rx.c +119 −38
net/mac80211/scan.c +16 −5
net/mac80211/sta_info.c +5 −1
net/mac80211/sta_info.h +32 −1
net/mac80211/tx.c +36 −16
net/mac80211/util.c +11 −13
net/mac80211/wpa.c +9 −4
net/mptcp/options.c +3 −2
net/mptcp/pm_netlink.c +4 −4
net/mptcp/protocol.c +59 −29
net/mptcp/protocol.h +2 −2
net/mptcp/sockopt.c +2 −2
net/mptcp/subflow.c +90 −92
net/netfilter/ipvs/ip_vs_ctl.c +1 −1
net/netfilter/nf_conntrack_proto.c +1 −1
net/netfilter/nf_flow_table_core.c +1 −2
net/netfilter/nf_flow_table_offload.c +4 −3
net/netfilter/nf_synproxy_core.c +5 −0
net/netfilter/nf_tables_api.c +100 −69
net/netfilter/nfnetlink_cthelper.c +6 −2
net/netfilter/nft_ct.c +1 −1
net/netfilter/nft_set_pipapo.c +2 −2
net/netfilter/nft_set_pipapo.h +2 −0
net/netfilter/nft_set_pipapo_avx2.c +3 −0
net/netlink/af_netlink.c +4 −2
net/nfc/llcp_sock.c +2 −0
net/nfc/nci/core.c +1 −0
net/nfc/nci/hci.c +5 −0
net/nfc/rawsock.c +1 −1
net/openvswitch/meter.c +8 −0
net/packet/af_packet.c +31 −20
net/qrtr/qrtr.c +1 −1
net/rds/connection.c +17 −6
net/rds/recv.c +1 −1
net/rds/tcp.c +2 −2
net/rds/tcp.h +2 −1
net/rds/tcp_listen.c +6 −0
net/sched/act_ct.c +17 −14
net/sched/cls_api.c +1 −1
net/sched/sch_cake.c +11 −7
net/sched/sch_dsmark.c +2 −1
net/sched/sch_fq_pie.c +13 −6
net/sched/sch_generic.c +48 −2
net/sched/sch_htb.c +4 −4
net/sctp/socket.c +1 −0
net/sctp/sysctl.c +1 −1
net/smc/smc_ism.c +10 −1
net/socket.c +0 −13
net/sunrpc/clnt.c +0 −7
net/sunrpc/xprt.c +32 −8
net/sunrpc/xprtrdma/rpc_rdma.c +18 −9
net/sunrpc/xprtrdma/transport.c +6 −6
net/sunrpc/xprtrdma/verbs.c +15 −3
net/sunrpc/xprtrdma/xprt_rdma.h +1 −0
net/sunrpc/xprtsock.c +2 −0
net/tipc/core.c +4 −2
net/tipc/core.h +3 −7
net/tipc/discover.c +2 −2
net/tipc/link.c +5 −0
net/tipc/link.h +1 −0
net/tipc/msg.c +2 −7
net/tipc/net.c +3 −12
net/tipc/node.c +6 −6
net/tipc/socket.c +4 −1
net/tipc/udp_media.c +2 −0
net/tls/tls_device.c +49 −11
net/tls/tls_device_fallback.c +7 −0
net/tls/tls_main.c +1 −0
net/tls/tls_sw.c +6 −5
net/unix/af_unix.c +4 −3
net/wireless/Makefile +1 −1
net/wireless/core.c +5 −8
net/wireless/pmsr.c +14 −2
net/wireless/sysfs.c +4 −0
net/wireless/util.c +8 −2
net/x25/af_x25.c +1 −1
samples/bpf/xdpsock_user.c +1 −1
samples/vfio-mdev/mdpy-fb.c +9 −4
scripts/Makefile.modfinal +1 −1
scripts/link-vmlinux.sh +1 −1
scripts/recordmcount.h +10 −5
sound/core/control_led.c +26 −7
sound/core/seq/seq_timer.c +9 −1
sound/core/timer.c +2 −1
sound/firewire/amdtp-stream.c +1 −1
sound/hda/intel-dsp-config.c +4 −0
sound/pci/hda/hda_codec.c +5 −0
sound/pci/hda/hda_generic.c +1 −0
sound/pci/hda/hda_intel.c +3 −0
sound/pci/hda/patch_cirrus.c +3 −4
sound/pci/hda/patch_realtek.c +62 −1
sound/soc/amd/raven/acp3x-pcm-dma.c +0 −10
sound/soc/amd/raven/acp3x.h +1 −0
sound/soc/amd/raven/pci-acp3x.c +15 −0
sound/soc/codecs/ak5558.c +1 −1
sound/soc/codecs/cs35l32.c +3 −0
sound/soc/codecs/cs35l33.c +1 −0
sound/soc/codecs/cs35l34.c +3 −0
sound/soc/codecs/cs42l42.c +3 −0
sound/soc/codecs/cs42l56.c +6 −1
sound/soc/codecs/cs42l73.c +3 −0
sound/soc/codecs/cs53l30.c +3 −0
sound/soc/codecs/da7219.c +1 −4
sound/soc/codecs/lpass-rx-macro.c +1 −0
sound/soc/codecs/lpass-tx-macro.c +1 −0
sound/soc/codecs/max98088.c +11 −2
sound/soc/codecs/rt5659.c +21 −5
sound/soc/codecs/rt5682-sdw.c +2 −1
sound/soc/codecs/rt711-sdca.c +2 −2
sound/soc/codecs/sti-sas.c +1 −0
sound/soc/codecs/tas2562.h +7 −7
sound/soc/fsl/Kconfig +1 −0
sound/soc/fsl/fsl-asoc-card.c +1 −0
sound/soc/generic/audio-graph-card.c +29 −28
sound/soc/generic/simple-card.c +83 −85
sound/soc/intel/boards/bytcr_rt5640.c +25 −0
sound/soc/qcom/lpass-cpu.c +80 −11
sound/soc/qcom/lpass.h +4 −0
sound/soc/soc-core.c +2 −0
sound/soc/soc-topology.c +3 −3
sound/soc/sof/intel/hda-dai.c +5 −0
sound/soc/sof/pm.c +1 −0
sound/soc/stm/stm32_sai_sub.c +1 −4
sound/usb/format.c +1 −1
sound/usb/mixer_quirks.c +1 −1
sound/usb/mixer_scarlett_gen2.c +51 −30
sound/usb/mixer_scarlett_gen2.h +1 −1
tools/arch/mips/include/uapi/asm/perf_regs.h +40 −0
tools/arch/x86/include/asm/disabled-features.h +2 −5
tools/arch/x86/include/uapi/asm/kvm.h +2 −0
tools/bootconfig/include/linux/bootconfig.h +4 −0
tools/bootconfig/main.c +1 −0
tools/bpf/bpftool/Documentation/bpftool-cgroup.rst +3 −1
tools/bpf/bpftool/Documentation/bpftool-prog.rst +1 −1
tools/bpf/bpftool/bash-completion/bpftool +3 −3
tools/bpf/bpftool/cgroup.c +2 −1
tools/bpf/bpftool/prog.c +1 −1
tools/include/uapi/asm-generic/unistd.h +1 −2
tools/include/uapi/linux/fs.h +1 −1
tools/include/uapi/linux/in.h +3 −0
tools/include/uapi/linux/kvm.h +3 −2
tools/include/uapi/linux/perf_event.h +1 −1
tools/lib/bpf/libbpf.c +3 −0
tools/lib/bpf/libbpf_internal.h +5 −0
tools/lib/bpf/xsk.c +1 −1
tools/objtool/arch/x86/decode.c +4 −0
tools/objtool/elf.c +24 −1
tools/perf/Documentation/perf-intel-pt.txt +3 −3
tools/perf/Documentation/perf-script.txt +4 −3
tools/perf/Makefile.config +0 −1
tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl +1 −1
tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +1 −1
tools/perf/arch/s390/entry/syscalls/syscall.tbl +1 −1
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +1 −1
tools/perf/builtin-buildid-list.c +3 −0
tools/perf/builtin-record.c +6 −0
tools/perf/builtin-stat.c +10 −3
tools/perf/check-headers.sh +1 −0
tools/perf/perf.c +2 −2
tools/perf/pmu-events/arch/powerpc/power10/cache.json +20 −10
tools/perf/pmu-events/arch/powerpc/power10/floating_point.json +1 −1
tools/perf/pmu-events/arch/powerpc/power10/frontend.json +77 −47
tools/perf/pmu-events/arch/powerpc/power10/locks.json +2 −2
tools/perf/pmu-events/arch/powerpc/power10/marked.json +28 −33
tools/perf/pmu-events/arch/powerpc/power10/memory.json +37 −42
tools/perf/pmu-events/arch/powerpc/power10/others.json +54 −79
tools/perf/pmu-events/arch/powerpc/power10/pipeline.json +65 −70
tools/perf/pmu-events/arch/powerpc/power10/pmc.json +4 −4
tools/perf/pmu-events/arch/powerpc/power10/translation.json +11 −11
tools/perf/pmu-events/jevents.c +1 −1
tools/perf/scripts/python/exported-sql-viewer.py +9 −3
tools/perf/tests/attr/base-record +1 −1
tools/perf/tests/pfm.c +2 −2
tools/perf/tests/shell/stat_bpf_counters.sh +2 −2
tools/perf/trace/beauty/include/linux/socket.h +0 −2
tools/perf/util/bpf_counter.c +6 −4
tools/perf/util/dwarf-aux.c +6 −2
tools/perf/util/env.c +1 −0
tools/perf/util/event.h +1 −1
tools/perf/util/evlist.c +0 −3
tools/perf/util/evsel.c +1 −0
tools/perf/util/evsel.h +2 −2
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +5 −1
tools/perf/util/intel-pt.c +4 −2
tools/perf/util/machine.c +2 −1
tools/perf/util/metricgroup.c +8 −6
tools/perf/util/parse-events.c +11 −2
tools/perf/util/parse-events.l +1 −0
tools/perf/util/perf_api_probe.c +10 −0
tools/perf/util/perf_api_probe.h +1 −0
tools/perf/util/pfm.c +10 −1
tools/perf/util/probe-finder.c +3 −0
tools/perf/util/session.c +1 −0
tools/perf/util/stat-display.c +3 −5
tools/perf/util/symbol-elf.c +1 −0
tools/testing/selftests/bpf/network_helpers.c +1 −1
tools/testing/selftests/bpf/network_helpers.h +1 −0
tools/testing/selftests/bpf/prog_tests/ringbuf.c +48 −1
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +785 −0
tools/testing/selftests/bpf/progs/test_tc_neigh.c +10 −23
tools/testing/selftests/bpf/progs/test_tc_neigh_fib.c +6 −3
tools/testing/selftests/bpf/progs/test_tc_peer.c +37 −19
tools/testing/selftests/bpf/test_tc_redirect.sh +0 −216
tools/testing/selftests/bpf/test_verifier.c +1 −1
tools/testing/selftests/bpf/verifier/and.c +2 −0
tools/testing/selftests/bpf/verifier/bounds.c +14 −0
tools/testing/selftests/bpf/verifier/dead_code.c +2 −0
tools/testing/selftests/bpf/verifier/jmp32.c +22 −0
tools/testing/selftests/bpf/verifier/jset.c +6 −4
tools/testing/selftests/bpf/verifier/stack_ptr.c +0 −2
tools/testing/selftests/bpf/verifier/unpriv.c +2 −0
tools/testing/selftests/bpf/verifier/value_ptr_arith.c +4 −11
tools/testing/selftests/kvm/.gitignore +1 −0
tools/testing/selftests/kvm/Makefile +2 −1
tools/testing/selftests/kvm/demand_paging_test.c +109 −65
tools/testing/selftests/kvm/hardware_disable_test.c +31 −1
tools/testing/selftests/kvm/include/kvm_util.h +9 −5
tools/testing/selftests/kvm/include/test_util.h +12 −0
tools/testing/selftests/kvm/kvm_page_table_test.c +1 −1
tools/testing/selftests/kvm/lib/kvm_util.c +263 −67
tools/testing/selftests/kvm/lib/kvm_util_internal.h +15 −2
tools/testing/selftests/kvm/lib/perf_test_util.c +4 −2
tools/testing/selftests/kvm/lib/rbtree.c +1 −0
tools/testing/selftests/kvm/lib/test_util.c +35 −16
tools/testing/selftests/kvm/lib/x86_64/processor.c +4 −12
tools/testing/selftests/kvm/memslot_modification_stress_test.c +11 −7
tools/testing/selftests/kvm/memslot_perf_test.c +1037 −0
tools/testing/selftests/kvm/x86_64/get_cpuid_test.c +5 −0
tools/testing/selftests/kvm/x86_64/get_msr_index_features.c +2 −6
tools/testing/selftests/nci/.gitignore +1 −0
tools/testing/selftests/net/fib_tests.sh +25 −0
tools/testing/selftests/net/icmp.sh +74 −0
tools/testing/selftests/net/mptcp/mptcp_connect.sh +17 −7
tools/testing/selftests/net/udpgro_fwd.sh +1 −1
tools/testing/selftests/net/veth.sh +3 −2
tools/testing/selftests/netfilter/Makefile +1 −1
tools/testing/selftests/netfilter/nft_fib.sh +221 −0
tools/testing/selftests/proc/.gitignore +1 −0
tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json +4 −4
tools/testing/selftests/wireguard/netns.sh +1 −0
tools/testing/selftests/wireguard/qemu/kernel.config +0 −1
virt/kvm/kvm_main.c +4 −2
virt/lib/irqbypass.c +6 −10

   - 'css_for_each_child'
   - 'css_for_each_descendant_post'
   - 'css_for_each_descendant_pre'
-  - 'cxl_for_each_cmd'
   - 'device_for_each_child_node'
+  - 'displayid_iter_for_each'
   - 'dma_fence_chain_for_each'
   - 'do_for_each_ftrace_op'
   - 'drm_atomic_crtc_for_each_plane'
   - 'drm_mm_for_each_node_in_range'
   - 'drm_mm_for_each_node_safe'
   - 'flow_action_for_each'
+  - 'for_each_acpi_dev_match'
   - 'for_each_active_dev_scope'
   - 'for_each_active_drhd_unit'
   - 'for_each_active_iommu'
   - 'for_each_dapm_widgets'
   - 'for_each_dev_addr'
   - 'for_each_dev_scope'
-  - 'for_each_displayid_db'
   - 'for_each_dma_cap_mask'
   - 'for_each_dpcm_be'
   - 'for_each_dpcm_be_rollback'
   - 'for_each_dpcm_fe'
   - 'for_each_drhd_unit'
   - 'for_each_dss_dev'
+  - 'for_each_dtpm_table'
   - 'for_each_efi_memory_desc'
   - 'for_each_efi_memory_desc_in_map'
   - 'for_each_element'
   - 'for_each_migratetype_order'
   - 'for_each_msi_entry'
   - 'for_each_msi_entry_safe'
+  - 'for_each_msi_vector'
   - 'for_each_net'
   - 'for_each_net_continue_reverse'
   - 'for_each_netdev'
   - 'for_each_prime_number_from'
   - 'for_each_process'
   - 'for_each_process_thread'
+  - 'for_each_prop_codec_conf'
+  - 'for_each_prop_dai_codec'
+  - 'for_each_prop_dai_cpu'
+  - 'for_each_prop_dlc_codecs'
+  - 'for_each_prop_dlc_cpus'
+  - 'for_each_prop_dlc_platforms'
   - 'for_each_property_of_node'
   - 'for_each_registered_fb'
   - 'for_each_requested_gpio'
   - 'queue_for_each_hw_ctx'
   - 'radix_tree_for_each_slot'
   - 'radix_tree_for_each_tagged'
+  - 'rb_for_each'
   - 'rbtree_postorder_for_each_entry_safe'
   - 'rdma_for_each_block'
   - 'rdma_for_each_port'

.mailmap+3−0

 Mayuresh Janorkar <mayur@ti.com>
 Michael Buesch <m@bues.ch>
 Michel Dänzer <michel@tungstengraphics.com>
+Michel Lespinasse <michel@lespinasse.org>
+Michel Lespinasse <michel@lespinasse.org> <walken@google.com>
+Michel Lespinasse <michel@lespinasse.org> <walken@zoy.org>
 Miguel Ojeda <ojeda@kernel.org> <miguel.ojeda.sandonis@gmail.com>
 Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>
 Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>

Documentation/admin-guide/sysctl/kernel.rst+14−3

 =========================
 Writing 1 to this entry will disable unprivileged calls to ``bpf()``;
-once disabled, calling ``bpf()`` without ``CAP_SYS_ADMIN`` will return
+once disabled, calling ``bpf()`` without ``CAP_SYS_ADMIN`` or ``CAP_BPF``
-``-EPERM``.
+will return ``-EPERM``. Once set to 1, this can't be cleared from the
+running kernel anymore.
-Once set, this can't be cleared.
+Writing 2 to this entry will also disable unprivileged calls to ``bpf()``,
+however, an admin can still change this setting later on, if needed, by
+writing 0 or 1 to this entry.
+If ``BPF_UNPRIV_DEFAULT_OFF`` is enabled in the kernel config, then this
+entry will default to 2 instead of 0.
+= =============================================================
+0 Unprivileged calls to ``bpf()`` are enabled
+1 Unprivileged calls to ``bpf()`` are disabled without recovery
+2 Unprivileged calls to ``bpf()`` are disabled
+= =============================================================
 watchdog
 ========

Documentation/devicetree/bindings/connector/usb-connector.yaml+15−0

@@ -149,6 +149,17 @@ properties: · 148 unmodified lines
149	maxItems: 6	149	maxItems: 6
150	$ref: /schemas/types.yaml#/definitions/uint32-array	150	$ref: /schemas/types.yaml#/definitions/uint32-array
151		151
		152	sink-vdos-v1:
		153	description: An array of u32 with each entry, a Vendor Defined Message Object (VDO),
		154	providing additional information corresponding to the product, the detailed bit
		155	definitions and the order of each VDO can be found in
		156	"USB Power Delivery Specification Revision 2.0, Version 1.3" chapter 6.4.4.3.1 Discover
		157	Identity. User can specify the VDO array via VDO_IDH/_CERT/_PRODUCT/_CABLE/_AMA defined in
		158	dt-bindings/usb/pd.h.
		159	minItems: 3
		160	maxItems: 6
		161	$ref: /schemas/types.yaml#/definitions/uint32-array
		162
152	op-sink-microwatt:	163	op-sink-microwatt:
153	description: Sink required operating power in microwatt, if source can't	164	description: Sink required operating power in microwatt, if source can't
154	offer the power, Capability Mismatch is set. Required for power sink and	165	offer the power, Capability Mismatch is set. Required for power sink and
@@ -207,6 +218,10 @@ properties: · 52 unmodified lines
207	SNK_READY for non-pd link.	218	SNK_READY for non-pd link.
208	type: boolean	219	type: boolean
209		220
		221	dependencies:
		222	sink-vdos-v1: [ 'sink-vdos' ]
		223	sink-vdos: [ 'sink-vdos-v1' ]
		224
210	required:	225	required:
211	- compatible	226	- compatible
212		227

Documentation/devicetree/bindings/hwmon/ti,ads7828.yaml+1−1

@@ -49,7 +49,7 @@ examples: · 48 unmodified lines
49	#size-cells = <0>;	49	#size-cells = <0>;
50		50
51	adc@48 {	51	adc@48 {
52	comatible = "ti,ads7828";	52	compatible = "ti,ads7828";
53	reg = <0x48>;	53	reg = <0x48>;
54	vref-supply = <&vref>;	54	vref-supply = <&vref>;
55	ti,differential-input;	55	ti,differential-input;

Documentation/devicetree/bindings/i2c/i2c-mpc.yaml+7−0

@@ -46,6 +46,13 @@ properties: · 45 unmodified lines
46	description: \|	46	description: \|
47	I2C bus timeout in microseconds	47	I2C bus timeout in microseconds
48		48
		49	fsl,i2c-erratum-a004447:
		50	$ref: /schemas/types.yaml#/definitions/flag
		51	description: \|
		52	Indicates the presence of QorIQ erratum A-004447, which
		53	says that the standard i2c recovery scheme mechanism does
		54	not work and an alternate implementation is needed.
		55
49	required:	56	required:
50	- compatible	57	- compatible
51	- reg	58	- reg

Documentation/devicetree/bindings/media/renesas,drif.yaml+1−3

@@ -67,9 +67,7 @@ properties: · 66 unmodified lines
67	maxItems: 1	67	maxItems: 1
68		68
69	clock-names:	69	clock-names:
70	maxItems: 1	70	const: fck
71	items:
72	- const: fck
73		71
74	resets:	72	resets:
75	maxItems: 1	73	maxItems: 1

Documentation/devicetree/bindings/net/renesas,ether.yaml+1−1

@@ -10,7 +10,7 @@ allOf: · 9 unmodified lines
10	- $ref: ethernet-controller.yaml#	10	- $ref: ethernet-controller.yaml#
11		11
12	maintainers:	12	maintainers:
13	- Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>	13	- Sergei Shtylyov <sergei.shtylyov@gmail.com>
14		14
15	properties:	15	properties:
16	compatible:	16	compatible:

Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml+2−2

@@ -57,7 +57,7 @@ patternProperties: · 56 unmodified lines
57	rate	57	rate
58		58
59	sound-dai:	59	sound-dai:
60	$ref: /schemas/types.yaml#/definitions/phandle	60	$ref: /schemas/types.yaml#/definitions/phandle-array
61	description: phandle of the CPU DAI	61	description: phandle of the CPU DAI
62		62
63	patternProperties:	63	patternProperties:
@@ -71,7 +71,7 @@ patternProperties: · 7 unmodified lines
71		71
72	properties:	72	properties:
73	sound-dai:	73	sound-dai:
74	$ref: /schemas/types.yaml#/definitions/phandle	74	$ref: /schemas/types.yaml#/definitions/phandle-array
75	description: phandle of the codec DAI	75	description: phandle of the codec DAI
76		76
77	required:	77	required:

Documentation/devicetree/bindings/spi/spi-mux.yaml+1−1

@@ -72,7 +72,7 @@ examples: · 71 unmodified lines
72		72
73	mux-controls = <&mux>;	73	mux-controls = <&mux>;
74		74
75	spi-flash@0 {	75	flash@0 {
76	compatible = "jedec,spi-nor";	76	compatible = "jedec,spi-nor";
77	reg = <0>;	77	reg = <0>;
78	spi-max-frequency = <40000000>;	78	spi-max-frequency = <40000000>;

Documentation/driver-api/usb/usb.rst+2−0

@@ -123,6 +123,8 @@ are in ``drivers/usb/common/common.c``. · 122 unmodified lines
123	In addition, some functions useful for creating debugging output are	123	In addition, some functions useful for creating debugging output are
124	defined in ``drivers/usb/common/debug.c``.	124	defined in ``drivers/usb/common/debug.c``.
125		125
		126	.. _usb_header:
		127
126	Host-Side Data Types and Macros	128	Host-Side Data Types and Macros
127	===============================	129	===============================
128		130

Documentation/riscv/vm-layout.rst+2−2

@@ -58,6 +58,6 @@ RISC-V Linux Kernel SV39 · 57 unmodified lines
58	\|	58	\|
59	____________________________________________________________\|____________________________________________________________	59	____________________________________________________________\|____________________________________________________________
60	\| \| \| \|	60	\| \| \| \|
61	ffffffff00000000 \| -4 GB \| ffffffff7fffffff \| 2 GB \| modules	61	ffffffff00000000 \| -4 GB \| ffffffff7fffffff \| 2 GB \| modules, BPF
62	ffffffff80000000 \| -2 GB \| ffffffffffffffff \| 2 GB \| kernel, BPF	62	ffffffff80000000 \| -2 GB \| ffffffffffffffff \| 2 GB \| kernel
63	__________________\|____________\|__________________\|_________\|____________________________________________________________	63	__________________\|____________\|__________________\|_________\|____________________________________________________________

Documentation/userspace-api/seccomp_filter.rst+8−8

@@ -250,14 +250,14 @@ Users can read via ``ioctl(SECCOMP_IOCTL_NOTIF_RECV)`` (or ``poll()``) on a · 249 unmodified lines
250	seccomp notification fd to receive a ``struct seccomp_notif``, which contains	250	seccomp notification fd to receive a ``struct seccomp_notif``, which contains
251	five members: the input length of the structure, a unique-per-filter ``id``,	251	five members: the input length of the structure, a unique-per-filter ``id``,
252	the ``pid`` of the task which triggered this request (which may be 0 if the	252	the ``pid`` of the task which triggered this request (which may be 0 if the
253	task is in a pid ns not visible from the listener's pid namespace), a ``flags``	253	task is in a pid ns not visible from the listener's pid namespace). The
254	member which for now only has ``SECCOMP_NOTIF_FLAG_SIGNALED``, representing	254	notification also contains the ``data`` passed to seccomp, and a filters flag.
255	whether or not the notification is a result of a non-fatal signal, and the	255	The structure should be zeroed out prior to calling the ioctl.
256	``data`` passed to seccomp. Userspace can then make a decision based on this	256
257	information about what to do, and ``ioctl(SECCOMP_IOCTL_NOTIF_SEND)`` a	257	Userspace can then make a decision based on this information about what to do,
258	response, indicating what should be returned to userspace. The ``id`` member of	258	and ``ioctl(SECCOMP_IOCTL_NOTIF_SEND)`` a response, indicating what should be
259	``struct seccomp_notif_resp`` should be the same ``id`` as in ``struct	259	returned to userspace. The ``id`` member of ``struct seccomp_notif_resp`` should
260	seccomp_notif``.	260	be the same ``id`` as in ``struct seccomp_notif``.
261		261
262	It is worth noting that ``struct seccomp_data`` contains the values of register	262	It is worth noting that ``struct seccomp_data`` contains the values of register
263	arguments to the syscall, but does not contain pointers to memory. The task's	263	arguments to the syscall, but does not contain pointers to memory. The task's

Documentation/virt/kvm/mmu.rst+2−2

@@ -171,8 +171,8 @@ Shadow pages contain the following information: · 170 unmodified lines
171	shadow pages) so role.quadrant takes values in the range 0..3. Each	171	shadow pages) so role.quadrant takes values in the range 0..3. Each
172	quadrant maps 1GB virtual address space.	172	quadrant maps 1GB virtual address space.
173	role.access:	173	role.access:
174	Inherited guest access permissions in the form uwx. Note execute	174	Inherited guest access permissions from the parent ptes in the form uwx.
175	permission is positive, not negative.	175	Note execute permission is positive, not negative.
176	role.invalid:	176	role.invalid:
177	The page is invalid and should not be used. It is a root page that is	177	The page is invalid and should not be used. It is a root page that is
178	currently pinned (by a cpu hardware register pointing to it); once it is	178	currently pinned (by a cpu hardware register pointing to it); once it is

Documentation/virt/kvm/vcpu-requests.rst+5−3

   necessary to inform each VCPU to completely refresh the tables.  This
   request is used for that.
-KVM_REQ_PENDING_TIMER
+KVM_REQ_UNBLOCK
-  This request may be made from a timer handler run on the host on behalf
+  This request informs the vCPU to exit kvm_vcpu_block.  It is used for
-  of a VCPU.  It informs the VCPU thread to inject a timer interrupt.
+  example from timer handlers that run on the host on behalf of a vCPU,
+  or in order to update the interrupt routing and ensure that assigned
+  devices will wake up the vCPU.
 KVM_REQ_UNHALT

Documentation/vm/slub.rst+5−5

MAINTAINERS+40−12

@@ -3877,6 +3877,7 @@ L: linux-btrfs@vger.kernel.org · 3876 unmodified lines
3877	S: Maintained	3877	S: Maintained
3878	W: http://btrfs.wiki.kernel.org/	3878	W: http://btrfs.wiki.kernel.org/
3879	Q: http://patchwork.kernel.org/project/linux-btrfs/list/	3879	Q: http://patchwork.kernel.org/project/linux-btrfs/list/
		3880	C: irc://irc.libera.chat/btrfs
3880	T: git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git	3881	T: git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git
3881	F: Documentation/filesystems/btrfs.rst	3882	F: Documentation/filesystems/btrfs.rst
3882	F: fs/btrfs/	3883	F: fs/btrfs/
@@ -4138,6 +4139,14 @@ S: Odd Fixes · 255 unmodified lines
4138	F: Documentation/devicetree/bindings/arm/cavium-thunder2.txt	4139	F: Documentation/devicetree/bindings/arm/cavium-thunder2.txt
4139	F: arch/arm64/boot/dts/cavium/thunder2-99xx*	4140	F: arch/arm64/boot/dts/cavium/thunder2-99xx*
4140		4141
		4142	CBS/ETF/TAPRIO QDISCS
		4143	M: Vinicius Costa Gomes <vinicius.gomes@intel.com>
		4144	S: Maintained
		4145	L: netdev@vger.kernel.org
		4146	F: net/sched/sch_cbs.c
		4147	F: net/sched/sch_etf.c
		4148	F: net/sched/sch_taprio.c
		4149
4141	CC2520 IEEE-802.15.4 RADIO DRIVER	4150	CC2520 IEEE-802.15.4 RADIO DRIVER
4142	M: Varka Bhadram <varkabhadram@gmail.com>	4151	M: Varka Bhadram <varkabhadram@gmail.com>
4143	L: linux-wpan@vger.kernel.org	4152	L: linux-wpan@vger.kernel.org
@@ -5569,7 +5578,6 @@ F: drivers/soc/fsl/dpio · 1425 unmodified lines
5569		5578
5570	DPAA2 ETHERNET DRIVER	5579	DPAA2 ETHERNET DRIVER
5571	M: Ioana Ciornei <ioana.ciornei@nxp.com>	5580	M: Ioana Ciornei <ioana.ciornei@nxp.com>
5572	M: Ioana Radulescu <ruxandra.radulescu@nxp.com>
5573	L: netdev@vger.kernel.org	5581	L: netdev@vger.kernel.org
5574	S: Maintained	5582	S: Maintained
5575	F: Documentation/networking/device_drivers/ethernet/freescale/dpaa2/ethernet-driver.rst	5583	F: Documentation/networking/device_drivers/ethernet/freescale/dpaa2/ethernet-driver.rst
@@ -6953,6 +6961,7 @@ F: net/core/failover.c · 1377 unmodified lines
6953	FANOTIFY	6961	FANOTIFY
6954	M: Jan Kara <jack@suse.cz>	6962	M: Jan Kara <jack@suse.cz>
6955	R: Amir Goldstein <amir73il@gmail.com>	6963	R: Amir Goldstein <amir73il@gmail.com>
		6964	R: Matthew Bobrowski <repnop@google.com>
6956	L: linux-fsdevel@vger.kernel.org	6965	L: linux-fsdevel@vger.kernel.org
6957	S: Maintained	6966	S: Maintained
6958	F: fs/notify/fanotify/	6967	F: fs/notify/fanotify/
@@ -12704,9 +12713,9 @@ F: drivers/rtc/rtc-ntxec.c · 5745 unmodified lines
12704	F: include/linux/mfd/ntxec.h	12713	F: include/linux/mfd/ntxec.h
12705		12714
12706	NETRONOME ETHERNET DRIVERS	12715	NETRONOME ETHERNET DRIVERS
12707	M: Simon Horman <simon.horman@netronome.com>	12716	M: Simon Horman <simon.horman@corigine.com>
12708	R: Jakub Kicinski <kuba@kernel.org>	12717	R: Jakub Kicinski <kuba@kernel.org>
12709	L: oss-drivers@netronome.com	12718	L: oss-drivers@corigine.com
12710	S: Maintained	12719	S: Maintained
12711	F: drivers/net/ethernet/netronome/	12720	F: drivers/net/ethernet/netronome/
12712		12721
@@ -12733,7 +12742,6 @@ M: "David S. Miller" <davem@davemloft.net> · 20 unmodified lines
12733	M: Jakub Kicinski <kuba@kernel.org>	12742	M: Jakub Kicinski <kuba@kernel.org>
12734	L: netdev@vger.kernel.org	12743	L: netdev@vger.kernel.org
12735	S: Maintained	12744	S: Maintained
12736	W: http://www.linuxfoundation.org/en/Net
12737	Q: https://patchwork.kernel.org/project/netdevbpf/list/	12745	Q: https://patchwork.kernel.org/project/netdevbpf/list/
12738	T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git	12746	T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
12739	T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git	12747	T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
@@ -12778,7 +12786,6 @@ M: "David S. Miller" <davem@davemloft.net> · 38 unmodified lines
12778	M: Jakub Kicinski <kuba@kernel.org>	12786	M: Jakub Kicinski <kuba@kernel.org>
12779	L: netdev@vger.kernel.org	12787	L: netdev@vger.kernel.org
12780	S: Maintained	12788	S: Maintained
12781	W: http://www.linuxfoundation.org/en/Net
12782	Q: https://patchwork.kernel.org/project/netdevbpf/list/	12789	Q: https://patchwork.kernel.org/project/netdevbpf/list/
12783	B: mailto:netdev@vger.kernel.org	12790	B: mailto:netdev@vger.kernel.org
12784	T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git	12791	T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
@@ -12920,8 +12927,10 @@ F: include/uapi/linux/nexthop.h · 135 unmodified lines
12920	F: net/ipv4/nexthop.c	12927	F: net/ipv4/nexthop.c
12921		12928
12922	NFC SUBSYSTEM	12929	NFC SUBSYSTEM
		12930	M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
		12931	L: linux-nfc@lists.01.org (subscribers-only)
12923	L: netdev@vger.kernel.org	12932	L: netdev@vger.kernel.org
12924	S: Orphan	12933	S: Maintained
12925	F: Documentation/devicetree/bindings/net/nfc/	12934	F: Documentation/devicetree/bindings/net/nfc/
12926	F: drivers/nfc/	12935	F: drivers/nfc/
12927	F: include/linux/platform_data/nfcmrvl.h	12936	F: include/linux/platform_data/nfcmrvl.h
@@ -12932,7 +12941,7 @@ F: net/nfc/ · 4 unmodified lines
12932	NFC VIRTUAL NCI DEVICE DRIVER	12941	NFC VIRTUAL NCI DEVICE DRIVER
12933	M: Bongsu Jeon <bongsu.jeon@samsung.com>	12942	M: Bongsu Jeon <bongsu.jeon@samsung.com>
12934	L: netdev@vger.kernel.org	12943	L: netdev@vger.kernel.org
12935	L: linux-nfc@lists.01.org (moderated for non-subscribers)	12944	L: linux-nfc@lists.01.org (subscribers-only)
12936	S: Supported	12945	S: Supported
12937	F: drivers/nfc/virtual_ncidev.c	12946	F: drivers/nfc/virtual_ncidev.c
12938	F: tools/testing/selftests/nci/	12947	F: tools/testing/selftests/nci/
@@ -13229,9 +13238,8 @@ F: Documentation/devicetree/bindings/sound/tfa9879.txt · 290 unmodified lines
13229	F: sound/soc/codecs/tfa9879*	13238	F: sound/soc/codecs/tfa9879*
13230		13239
13231	NXP-NCI NFC DRIVER	13240	NXP-NCI NFC DRIVER
13232	M: Clément Perrochaud <clement.perrochaud@effinnov.com>
13233	R: Charles Gorand <charles.gorand@effinnov.com>	13241	R: Charles Gorand <charles.gorand@effinnov.com>
13234	L: linux-nfc@lists.01.org (moderated for non-subscribers)	13242	L: linux-nfc@lists.01.org (subscribers-only)
13235	S: Supported	13243	S: Supported
13236	F: drivers/nfc/nxp-nci	13244	F: drivers/nfc/nxp-nci
13237		13245
@@ -14134,6 +14142,7 @@ F: drivers/pci/controller/pci-v3-semi.c · 896 unmodified lines
14134	PCI ENDPOINT SUBSYSTEM	14142	PCI ENDPOINT SUBSYSTEM
14135	M: Kishon Vijay Abraham I <kishon@ti.com>	14143	M: Kishon Vijay Abraham I <kishon@ti.com>
14136	M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>	14144	M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
		14145	R: Krzysztof Wilczyński <kw@linux.com>
14137	L: linux-pci@vger.kernel.org	14146	L: linux-pci@vger.kernel.org
14138	S: Supported	14147	S: Supported
14139	F: Documentation/PCI/endpoint/*	14148	F: Documentation/PCI/endpoint/*
@@ -14182,6 +14191,7 @@ F: drivers/pci/controller/pci-xgene-msi.c · 42 unmodified lines
14182	PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS	14191	PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
14183	M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>	14192	M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
14184	R: Rob Herring <robh@kernel.org>	14193	R: Rob Herring <robh@kernel.org>
		14194	R: Krzysztof Wilczyński <kw@linux.com>
14185	L: linux-pci@vger.kernel.org	14195	L: linux-pci@vger.kernel.org
14186	S: Supported	14196	S: Supported
14187	Q: http://patchwork.ozlabs.org/project/linux-pci/list/	14197	Q: http://patchwork.ozlabs.org/project/linux-pci/list/
@@ -14341,10 +14351,12 @@ PER-CPU MEMORY ALLOCATOR · 153 unmodified lines
14341	M: Dennis Zhou <dennis@kernel.org>	14351	M: Dennis Zhou <dennis@kernel.org>
14342	M: Tejun Heo <tj@kernel.org>	14352	M: Tejun Heo <tj@kernel.org>
14343	M: Christoph Lameter <cl@linux.com>	14353	M: Christoph Lameter <cl@linux.com>
		14354	L: linux-mm@kvack.org
14344	S: Maintained	14355	S: Maintained
14345	T: git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git	14356	T: git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git
14346	F: arch/*/include/asm/percpu.h	14357	F: arch/*/include/asm/percpu.h
14347	F: include/linux/percpu*.h	14358	F: include/linux/percpu*.h
		14359	F: lib/percpu*.c
14348	F: mm/percpu*.c	14360	F: mm/percpu*.c
14349		14361
14350	PER-TASK DELAY ACCOUNTING	14362	PER-TASK DELAY ACCOUNTING
@@ -15969,6 +15981,7 @@ S390 IUCV NETWORK LAYER · 1618 unmodified lines
15969	M: Julian Wiedmann <jwi@linux.ibm.com>	15981	M: Julian Wiedmann <jwi@linux.ibm.com>
15970	M: Karsten Graul <kgraul@linux.ibm.com>	15982	M: Karsten Graul <kgraul@linux.ibm.com>
15971	L: linux-s390@vger.kernel.org	15983	L: linux-s390@vger.kernel.org
		15984	L: netdev@vger.kernel.org
15972	S: Supported	15985	S: Supported
15973	W: http://www.ibm.com/developerworks/linux/linux390/	15986	W: http://www.ibm.com/developerworks/linux/linux390/
15974	F: drivers/s390/net/iucv	15987	F: drivers/s390/net/iucv
@@ -15979,6 +15992,7 @@ S390 NETWORK DRIVERS · 4 unmodified lines
15979	M: Julian Wiedmann <jwi@linux.ibm.com>	15992	M: Julian Wiedmann <jwi@linux.ibm.com>
15980	M: Karsten Graul <kgraul@linux.ibm.com>	15993	M: Karsten Graul <kgraul@linux.ibm.com>
15981	L: linux-s390@vger.kernel.org	15994	L: linux-s390@vger.kernel.org
		15995	L: netdev@vger.kernel.org
15982	S: Supported	15996	S: Supported
15983	W: http://www.ibm.com/developerworks/linux/linux390/	15997	W: http://www.ibm.com/developerworks/linux/linux390/
15984	F: drivers/s390/net/	15998	F: drivers/s390/net/
@@ -16157,7 +16171,7 @@ F: include/media/drv-intf/s3c_camif.h · 172 unmodified lines
16157	SAMSUNG S3FWRN5 NFC DRIVER	16171	SAMSUNG S3FWRN5 NFC DRIVER
16158	M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>	16172	M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
16159	M: Krzysztof Opasiak <k.opasiak@samsung.com>	16173	M: Krzysztof Opasiak <k.opasiak@samsung.com>
16160	L: linux-nfc@lists.01.org (moderated for non-subscribers)	16174	L: linux-nfc@lists.01.org (subscribers-only)
16161	S: Maintained	16175	S: Maintained
16162	F: Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml	16176	F: Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
16163	F: drivers/nfc/s3fwrn5	16177	F: drivers/nfc/s3fwrn5
@@ -16570,6 +16584,7 @@ F: drivers/misc/sgi-xp/ · 406 unmodified lines
16570		16584
16571	SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS	16585	SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
16572	M: Karsten Graul <kgraul@linux.ibm.com>	16586	M: Karsten Graul <kgraul@linux.ibm.com>
		16587	M: Guvenc Gulce <guvenc@linux.ibm.com>
16573	L: linux-s390@vger.kernel.org	16588	L: linux-s390@vger.kernel.org
16574	S: Supported	16589	S: Supported
16575	W: http://www.ibm.com/developerworks/linux/linux390/	16590	W: http://www.ibm.com/developerworks/linux/linux390/
@@ -17328,6 +17343,12 @@ L: linux-i2c@vger.kernel.org · 752 unmodified lines
17328	S: Maintained	17343	S: Maintained
17329	F: drivers/i2c/busses/i2c-stm32*	17344	F: drivers/i2c/busses/i2c-stm32*
17330		17345
		17346	ST STM32 SPI DRIVER
		17347	M: Alain Volmat <alain.volmat@foss.st.com>
		17348	L: linux-spi@vger.kernel.org
		17349	S: Maintained
		17350	F: drivers/spi/spi-stm32.c
		17351
17331	ST STPDDC60 DRIVER	17352	ST STPDDC60 DRIVER
17332	M: Daniel Nilsson <daniel.nilsson@flex.com>	17353	M: Daniel Nilsson <daniel.nilsson@flex.com>
17333	L: linux-hwmon@vger.kernel.org	17354	L: linux-hwmon@vger.kernel.org
@@ -17686,7 +17707,6 @@ R: Mika Westerberg <mika.westerberg@linux.intel.com> · 352 unmodified lines
17686	L: linux-i2c@vger.kernel.org	17707	L: linux-i2c@vger.kernel.org
17687	S: Maintained	17708	S: Maintained
17688	F: drivers/i2c/busses/i2c-designware-*	17709	F: drivers/i2c/busses/i2c-designware-*
17689	F: include/linux/platform_data/i2c-designware.h
17690		17710
17691	SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER	17711	SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
17692	M: Jaehoon Chung <jh80.chung@samsung.com>	17712	M: Jaehoon Chung <jh80.chung@samsung.com>
@@ -18342,7 +18362,7 @@ F: sound/soc/codecs/tas571x* · 649 unmodified lines
18342	TI TRF7970A NFC DRIVER	18362	TI TRF7970A NFC DRIVER
18343	M: Mark Greer <mgreer@animalcreek.com>	18363	M: Mark Greer <mgreer@animalcreek.com>
18344	L: linux-wireless@vger.kernel.org	18364	L: linux-wireless@vger.kernel.org
18345	L: linux-nfc@lists.01.org (moderated for non-subscribers)	18365	L: linux-nfc@lists.01.org (subscribers-only)
18346	S: Supported	18366	S: Supported
18347	F: Documentation/devicetree/bindings/net/nfc/trf7970a.txt	18367	F: Documentation/devicetree/bindings/net/nfc/trf7970a.txt
18348	F: drivers/nfc/trf7970a.c	18368	F: drivers/nfc/trf7970a.c
@@ -18878,6 +18898,13 @@ S: Maintained · 529 unmodified lines
18878	F: drivers/usb/host/isp116x*	18898	F: drivers/usb/host/isp116x*
18879	F: include/linux/usb/isp116x.h	18899	F: include/linux/usb/isp116x.h
18880		18900
		18901	USB ISP1760 DRIVER
		18902	M: Rui Miguel Silva <rui.silva@linaro.org>
		18903	L: linux-usb@vger.kernel.org
		18904	S: Maintained
		18905	F: drivers/usb/isp1760/*
		18906	F: Documentation/devicetree/bindings/usb/nxp,isp1760.yaml
		18907
18881	USB LAN78XX ETHERNET DRIVER	18908	USB LAN78XX ETHERNET DRIVER
18882	M: Woojung Huh <woojung.huh@microchip.com>	18909	M: Woojung Huh <woojung.huh@microchip.com>
18883	M: UNGLinuxDriver@microchip.com	18910	M: UNGLinuxDriver@microchip.com
@@ -20022,6 +20049,7 @@ F: arch/x86/xen/swiotlb · 1138 unmodified lines
20022	F: drivers/xen/swiotlb	20049	F: drivers/xen/swiotlb
20023		20050
20024	XFS FILESYSTEM	20051	XFS FILESYSTEM
		20052	C: irc://irc.oftc.net/xfs
20025	M: Darrick J. Wong <djwong@kernel.org>	20053	M: Darrick J. Wong <djwong@kernel.org>
20026	M: linux-xfs@vger.kernel.org	20054	M: linux-xfs@vger.kernel.org
20027	L: linux-xfs@vger.kernel.org	20055	L: linux-xfs@vger.kernel.org

Makefile+10−2

 VERSION = 5
 PATCHLEVEL = 13
 SUBLEVEL = 0
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc7
-NAME = Frozen Wasteland
+NAME = Opossums on Parade
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
 # Limit inlining across translation units to reduce binary size
 KBUILD_LDFLAGS += -mllvm -import-instr-limit=5
+# Check for frame size exceeding threshold during prolog/epilog insertion
+# when using lld < 13.0.0.
+ifneq ($(CONFIG_FRAME_WARN),0)
+ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 130000; echo $$?),0)
+KBUILD_LDFLAGS	+= -plugin-opt=-warn-stack-size=$(CONFIG_FRAME_WARN)
+endif
+endif
 endif
 ifdef CONFIG_LTO

arch/arc/include/uapi/asm/sigcontext.h+1−0

@@ -18,6 +18,7 @@ · 17 unmodified lines
18	*/	18	*/
19	struct sigcontext {	19	struct sigcontext {
20	struct user_regs_struct regs;	20	struct user_regs_struct regs;
		21	struct user_regs_arcv2 v2abi;
21	};	22	};
22		23
23	#endif /* _ASM_ARC_SIGCONTEXT_H */	24	#endif /* _ASM_ARC_SIGCONTEXT_H */

arch/arc/kernel/signal.c+43−0

@@ -61,6 +61,41 @@ struct rt_sigframe { · 60 unmodified lines
61	unsigned int sigret_magic;	61	unsigned int sigret_magic;
62	};	62	};
63		63
		64	static int save_arcv2_regs(struct sigcontext mctx, struct pt_regs regs)
		65	{
		66	int err = 0;
		67	#ifndef CONFIG_ISA_ARCOMPACT
		68	struct user_regs_arcv2 v2abi;
		69
		70	v2abi.r30 = regs->r30;
		71	#ifdef CONFIG_ARC_HAS_ACCL_REGS
		72	v2abi.r58 = regs->r58;
		73	v2abi.r59 = regs->r59;
		74	#else
		75	v2abi.r58 = v2abi.r59 = 0;
		76	#endif
		77	err = __copy_to_user(&mctx->v2abi, &v2abi, sizeof(v2abi));
		78	#endif
		79	return err;
		80	}
		81
		82	static int restore_arcv2_regs(struct sigcontext mctx, struct pt_regs regs)
		83	{
		84	int err = 0;
		85	#ifndef CONFIG_ISA_ARCOMPACT
		86	struct user_regs_arcv2 v2abi;
		87
		88	err = __copy_from_user(&v2abi, &mctx->v2abi, sizeof(v2abi));
		89
		90	regs->r30 = v2abi.r30;
		91	#ifdef CONFIG_ARC_HAS_ACCL_REGS
		92	regs->r58 = v2abi.r58;
		93	regs->r59 = v2abi.r59;
		94	#endif
		95	#endif
		96	return err;
		97	}
		98
64	static int	99	static int
65	stash_usr_regs(struct rt_sigframe __user sf, struct pt_regs regs,	100	stash_usr_regs(struct rt_sigframe __user sf, struct pt_regs regs,
66	sigset_t *set)	101	sigset_t *set)
@@ -94,6 +129,10 @@ stash_usr_regs(struct rt_sigframe __user sf, struct pt_regs regs, · 27 unmodified lines
94		129
95	err = __copy_to_user(&(sf->uc.uc_mcontext.regs.scratch), &uregs.scratch,	130	err = __copy_to_user(&(sf->uc.uc_mcontext.regs.scratch), &uregs.scratch,
96	sizeof(sf->uc.uc_mcontext.regs.scratch));	131	sizeof(sf->uc.uc_mcontext.regs.scratch));
		132
		133	if (is_isa_arcv2())
		134	err \|= save_arcv2_regs(&(sf->uc.uc_mcontext), regs);
		135
97	err \|= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t));	136	err \|= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t));
98		137
99	return err ? -EFAULT : 0;	138	return err ? -EFAULT : 0;
@@ -109,6 +148,10 @@ static int restore_usr_regs(struct pt_regs regs, struct rt_sigframe __user sf) · 9 unmodified lines
109	err \|= __copy_from_user(&uregs.scratch,	148	err \|= __copy_from_user(&uregs.scratch,
110	&(sf->uc.uc_mcontext.regs.scratch),	149	&(sf->uc.uc_mcontext.regs.scratch),
111	sizeof(sf->uc.uc_mcontext.regs.scratch));	150	sizeof(sf->uc.uc_mcontext.regs.scratch));
		151
		152	if (is_isa_arcv2())
		153	err \|= restore_arcv2_regs(&(sf->uc.uc_mcontext), regs);
		154
112	if (err)	155	if (err)
113	return -EFAULT;	156	return -EFAULT;
114		157

arch/arc/kernel/vmlinux.lds.S+1−1

 	.init.ramfs : { INIT_RAM_FS }
 	. = ALIGN(PAGE_SIZE);
-	_stext = .;
 	HEAD_TEXT_SECTION
 	INIT_TEXT_SECTION(L1_CACHE_BYTES)
 	.text : {
 		_text = .;
+		_stext = .;
 		TEXT_TEXT
 		SCHED_TEXT
 		CPUIDLE_TEXT

arch/arm/boot/dts/imx6dl-yapp4-common.dtsi+5−1

 	phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
 	phy-reset-duration = <20>;
 	phy-supply = <&sw2_reg>;
-	phy-handle = <&ethphy0>;
 	status = "okay";
+	fixed-link {
+		speed = <1000>;
+		full-duplex;
+	};
 	mdio {
 		#address-cells = <1>;
 		#size-cells = <0>;

arch/arm/boot/dts/imx6q-dhcom-som.dtsi+12−0

@@ -406,6 +406,18 @@ · 405 unmodified lines
406	vin-supply = <&sw1_reg>;	406	vin-supply = <&sw1_reg>;
407	};	407	};
408		408
		409	&reg_pu {
		410	vin-supply = <&sw1_reg>;
		411	};
		412
		413	&reg_vdd1p1 {
		414	vin-supply = <&sw2_reg>;
		415	};
		416
		417	&reg_vdd2p5 {
		418	vin-supply = <&sw2_reg>;
		419	};
		420
409	&uart1 {	421	&uart1 {
410	pinctrl-names = "default";	422	pinctrl-names = "default";
411	pinctrl-0 = <&pinctrl_uart1>;	423	pinctrl-0 = <&pinctrl_uart1>;

arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi+1−1

@@ -126,7 +126,7 @@ · 125 unmodified lines
126	compatible = "nxp,pca8574";	126	compatible = "nxp,pca8574";
127	reg = <0x3a>;	127	reg = <0x3a>;
128	gpio-controller;	128	gpio-controller;
129	#gpio-cells = <1>;	129	#gpio-cells = <2>;
130	};	130	};
131	};	131	};
132		132

arch/arm/boot/dts/imx7d-meerkat96.dts+1−1

@@ -193,7 +193,7 @@ · 192 unmodified lines
193	pinctrl-names = "default";	193	pinctrl-names = "default";
194	pinctrl-0 = <&pinctrl_usdhc1>;	194	pinctrl-0 = <&pinctrl_usdhc1>;
195	keep-power-in-suspend;	195	keep-power-in-suspend;
196	tuning-step = <2>;	196	fsl,tuning-step = <2>;
197	vmmc-supply = <&reg_3p3v>;	197	vmmc-supply = <&reg_3p3v>;
198	no-1-8-v;	198	no-1-8-v;
199	broken-cd;	199	broken-cd;

arch/arm/boot/dts/imx7d-pico.dtsi+1−1

@@ -351,7 +351,7 @@ · 350 unmodified lines
351	pinctrl-2 = <&pinctrl_usdhc1_200mhz>;	351	pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
352	cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;	352	cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
353	bus-width = <4>;	353	bus-width = <4>;
354	tuning-step = <2>;	354	fsl,tuning-step = <2>;
355	vmmc-supply = <&reg_3p3v>;	355	vmmc-supply = <&reg_3p3v>;
356	wakeup-source;	356	wakeup-source;
357	no-1-8-v;	357	no-1-8-v;

arch/arm/include/asm/cpuidle.h+3−2

 #ifdef CONFIG_CPU_IDLE
 extern int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
 		struct cpuidle_driver *drv, int index);
+#define __cpuidle_method_section __used __section("__cpuidle_method_of_table")
 #else
 static inline int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
 		struct cpuidle_driver *drv, int index) { return -ENODEV; }
+#define __cpuidle_method_section __maybe_unused /* drop silently */
 #endif
 /* Common ARM WFI state */
 #define CPUIDLE_METHOD_OF_DECLARE(name, _method, _ops)			\
 	static const struct of_cpuidle_method __cpuidle_method_of_table_##name \
-	__used __section("__cpuidle_method_of_table")			\
+	__cpuidle_method_section = { .method = _method, .ops = _ops }
-	= { .method = _method, .ops = _ops }
 extern int arm_cpuidle_suspend(int index);

arch/arm/mach-imx/pm-imx27.c+1−0

@@ -12,6 +12,7 @@ · 11 unmodified lines
12	#include <linux/suspend.h>	12	#include <linux/suspend.h>
13	#include <linux/io.h>	13	#include <linux/io.h>
14		14
		15	#include "common.h"
15	#include "hardware.h"	16	#include "hardware.h"
16		17
17	static int mx27_suspend_enter(suspend_state_t state)	18	static int mx27_suspend_enter(suspend_state_t state)

arch/arm/mach-omap1/board-ams-delta.c+0−14

@@ -458,20 +458,6 @@ static struct gpiod_lookup_table leds_gpio_table = { · 457 unmodified lines
458		458
459	#ifdef CONFIG_LEDS_TRIGGERS	459	#ifdef CONFIG_LEDS_TRIGGERS
460	DEFINE_LED_TRIGGER(ams_delta_camera_led_trigger);	460	DEFINE_LED_TRIGGER(ams_delta_camera_led_trigger);
461
462	static int ams_delta_camera_power(struct device *dev, int power)
463	{
464	/*
465	* turn on camera LED
466	*/
467	if (power)
468	led_trigger_event(ams_delta_camera_led_trigger, LED_FULL);
469	else
470	led_trigger_event(ams_delta_camera_led_trigger, LED_OFF);
471	return 0;
472	}
473	#else
474	#define ams_delta_camera_power NULL
475	#endif	461	#endif
476		462
477	static struct platform_device ams_delta_audio_device = {	463	static struct platform_device ams_delta_audio_device = {

arch/arm/mach-omap1/board-h2.c+3−1

 {
 	if (!IS_BUILTIN(CONFIG_TPS65010))
 		return -ENOSYS;
 	tps65010_config_vregs1(TPS_LDO2_ENABLE | TPS_VLDO2_3_0V |
 				TPS_LDO1_ENABLE | TPS_VLDO1_3_0V);
 	BUG_ON(gpio_request(H2_NAND_RB_GPIO_PIN, "NAND ready") < 0);
 	gpio_direction_input(H2_NAND_RB_GPIO_PIN);
+	gpiod_add_lookup_table(&isp1301_gpiod_table);
 	omap_cfg_reg(L3_1610_FLASH_CS2B_OE);
 	omap_cfg_reg(M8_1610_FLASH_CS2B_WE);

arch/arm/mach-omap1/pm.c+7−3

@@ -655,9 +655,13 @@ static int __init omap_pm_init(void) · 654 unmodified lines
655	irq = INT_7XX_WAKE_UP_REQ;	655	irq = INT_7XX_WAKE_UP_REQ;
656	else if (cpu_is_omap16xx())	656	else if (cpu_is_omap16xx())
657	irq = INT_1610_WAKE_UP_REQ;	657	irq = INT_1610_WAKE_UP_REQ;
658	if (request_irq(irq, omap_wakeup_interrupt, 0, "peripheral wakeup",	658	else
659	NULL))	659	irq = -1;
660	pr_err("Failed to request irq %d (peripheral wakeup)\n", irq);	660
		661	if (irq >= 0) {
		662	if (request_irq(irq, omap_wakeup_interrupt, 0, "peripheral wakeup", NULL))
		663	pr_err("Failed to request irq %d (peripheral wakeup)\n", irq);
		664	}
661		665
662	/* Program new power ramp-up time	666	/* Program new power ramp-up time
663	* (0 for most boards since we don't lower voltage when in deep sleep)	667	* (0 for most boards since we don't lower voltage when in deep sleep)

arch/arm/mach-omap2/board-n8x0.c+1−1

 static void n8x0_mmc_callback(void *data, u8 card_mask)
 {
+#ifdef CONFIG_MMC_OMAP
 	int bit, *openp, index;
 	if (board_is_n800()) {
 	else
 		*openp = 0;
-#ifdef CONFIG_MMC_OMAP
 	omap_mmc_notify_cover_event(mmc_device, index, *openp);
 #else
 	pr_warn("MMC: notify cover event not available\n");

arch/arm64/Kbuild+1−2

@@ -1,6 +1,5 @@
1	# SPDX-License-Identifier: GPL-2.0-only	1	# SPDX-License-Identifier: GPL-2.0-only
2	obj-y += kernel/ mm/	2	obj-y += kernel/ mm/ net/
3	obj-$(CONFIG_NET) += net/
4	obj-$(CONFIG_KVM) += kvm/	3	obj-$(CONFIG_KVM) += kvm/
5	obj-$(CONFIG_XEN) += xen/	4	obj-$(CONFIG_XEN) += xen/
6	obj-$(CONFIG_CRYPTO) += crypto/	5	obj-$(CONFIG_CRYPTO) += crypto/

arch/arm64/Kconfig.platforms+1−0

@@ -165,6 +165,7 @@ config ARCH_MEDIATEK · 164 unmodified lines
165		165
166	config ARCH_MESON	166	config ARCH_MESON
167	bool "Amlogic Platforms"	167	bool "Amlogic Platforms"
		168	select COMMON_CLK
168	select MESON_IRQ_GPIO	169	select MESON_IRQ_GPIO
169	help	170	help
170	This enables support for the arm64 based Amlogic SoCs	171	This enables support for the arm64 based Amlogic SoCs

arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var1.dts+2−1

@@ -46,7 +46,8 @@ · 45 unmodified lines
46	eee-broken-100tx;	46	eee-broken-100tx;
47	qca,clk-out-frequency = <125000000>;	47	qca,clk-out-frequency = <125000000>;
48	qca,clk-out-strength = <AR803X_STRENGTH_FULL>;	48	qca,clk-out-strength = <AR803X_STRENGTH_FULL>;
49	vddio-supply = <&vddh>;	49	qca,keep-pll-enabled;
		50	vddio-supply = <&vddio>;
50		51
51	vddio: vddio-regulator {	52	vddio: vddio-regulator {
52	regulator-name = "VDDIO";	53	regulator-name = "VDDIO";

arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var4.dts+2−3

@@ -31,11 +31,10 @@ · 30 unmodified lines
31	reg = <0x4>;	31	reg = <0x4>;
32	eee-broken-1000t;	32	eee-broken-1000t;
33	eee-broken-100tx;	33	eee-broken-100tx;
34
35	qca,clk-out-frequency = <125000000>;	34	qca,clk-out-frequency = <125000000>;
36	qca,clk-out-strength = <AR803X_STRENGTH_FULL>;	35	qca,clk-out-strength = <AR803X_STRENGTH_FULL>;
37		36	qca,keep-pll-enabled;
38	vddio-supply = <&vddh>;	37	vddio-supply = <&vddio>;
39		38
40	vddio: vddio-regulator {	39	vddio: vddio-regulator {
41	regulator-name = "VDDIO";	40	regulator-name = "VDDIO";

arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi+2−2

@@ -197,8 +197,8 @@ · 196 unmodified lines
197	ddr: memory-controller@1080000 {	197	ddr: memory-controller@1080000 {
198	compatible = "fsl,qoriq-memory-controller";	198	compatible = "fsl,qoriq-memory-controller";
199	reg = <0x0 0x1080000 0x0 0x1000>;	199	reg = <0x0 0x1080000 0x0 0x1000>;
200	interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;	200	interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
201	big-endian;	201	little-endian;
202	};	202	};
203		203
204	dcfg: syscon@1e00000 {	204	dcfg: syscon@1e00000 {

arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts+5−5

@@ -88,11 +88,11 @@ · 87 unmodified lines
88	pinctrl-0 = <&pinctrl_codec2>;	88	pinctrl-0 = <&pinctrl_codec2>;
89	reg = <0x18>;	89	reg = <0x18>;
90	#sound-dai-cells = <0>;	90	#sound-dai-cells = <0>;
91	HPVDD-supply = <&reg_3p3v>;	91	HPVDD-supply = <&reg_gen_3p3>;
92	SPRVDD-supply = <&reg_3p3v>;	92	SPRVDD-supply = <&reg_gen_3p3>;
93	SPLVDD-supply = <&reg_3p3v>;	93	SPLVDD-supply = <&reg_gen_3p3>;
94	AVDD-supply = <&reg_3p3v>;	94	AVDD-supply = <&reg_gen_3p3>;
95	IOVDD-supply = <&reg_3p3v>;	95	IOVDD-supply = <&reg_gen_3p3>;
96	DVDD-supply = <&vgen4_reg>;	96	DVDD-supply = <&vgen4_reg>;
97	reset-gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;	97	reset-gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
98	};	98	};

arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi+7−16

 	reg_12p0_main: regulator-12p0-main {
 		compatible = "regulator-fixed";
 		regulator-name = "12V_MAIN";
-		regulator-min-microvolt = <5000000>;
+		regulator-min-microvolt = <12000000>;
-		regulator-max-microvolt = <5000000>;
+		regulator-max-microvolt = <12000000>;
 		regulator-always-on;
 	};
 		regulator-always-on;
 	};
-	reg_3p3v: regulator-3p3v {
-		compatible = "regulator-fixed";
-		vin-supply = <&reg_3p3_main>;
-		regulator-name = "GEN_3V3";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-always-on;
-	};
 	reg_usdhc2_vmmc: regulator-vsd-3v3 {
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_reg_usdhc2>;
 		pinctrl-0 = <&pinctrl_codec1>;
 		reg = <0x18>;
 		#sound-dai-cells = <0>;
-		HPVDD-supply = <&reg_3p3v>;
+		HPVDD-supply = <&reg_gen_3p3>;
-		SPRVDD-supply = <&reg_3p3v>;
+		SPRVDD-supply = <&reg_gen_3p3>;
-		SPLVDD-supply = <&reg_3p3v>;
+		SPLVDD-supply = <&reg_gen_3p3>;
-		AVDD-supply = <&reg_3p3v>;
+		AVDD-supply = <&reg_gen_3p3>;
-		IOVDD-supply = <&reg_3p3v>;
+		IOVDD-supply = <&reg_gen_3p3>;
 		DVDD-supply = <&vgen4_reg>;
 		reset-gpios = <&gpio3 3 GPIO_ACTIVE_LOW>;
 	};

arch/arm64/boot/dts/ti/k3-am64-main.dtsi+6−5

 		};
 	};
-	dmss: dmss {
+	dmss: bus@48000000 {
 		compatible = "simple-mfd";
 		#address-cells = <2>;
 		#size-cells = <2>;
 		dma-ranges;
-		ranges;
+		ranges = <0x00 0x48000000 0x00 0x48000000 0x00 0x06400000>;
 		ti,sci-dev-id = <25>;
 		};
 	};
-	dmsc: dmsc@44043000 {
+	dmsc: system-controller@44043000 {
 		compatible = "ti,k2g-sci";
 		ti,host-id = <12>;
 		mbox-names = "rx", "tx";
 			#power-domain-cells = <2>;
 		};
-		k3_clks: clocks {
+		k3_clks: clock-controller {
 			compatible = "ti,k2g-sci-clk";
 			#clock-cells = <2>;
 		};
 		clocks = <&k3_clks 145 0>;
 	};
-	main_gpio_intr: interrupt-controller0 {
+	main_gpio_intr: interrupt-controller@a00000 {
 		compatible = "ti,sci-intr";
+		reg = <0x00 0x00a00000 0x00 0x800>;
 		ti,intr-trigger-type = <1>;
 		interrupt-controller;
 		interrupt-parent = <&gic500>;

arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi+2−1

 		clocks = <&k3_clks 148 0>;
 	};
-	mcu_gpio_intr: interrupt-controller1 {
+	mcu_gpio_intr: interrupt-controller@4210000 {
 		compatible = "ti,sci-intr";
+		reg = <0x00 0x04210000 0x00 0x200>;
 		ti,intr-trigger-type = <1>;
 		interrupt-controller;
 		interrupt-parent = <&gic500>;

arch/arm64/boot/dts/ti/k3-am65-main.dtsi+6−4

 		#phy-cells = <0>;
 	};
-	intr_main_gpio: interrupt-controller0 {
+	intr_main_gpio: interrupt-controller@a00000 {
 		compatible = "ti,sci-intr";
+		reg = <0x0 0x00a00000 0x0 0x400>;
 		ti,intr-trigger-type = <1>;
 		interrupt-controller;
 		interrupt-parent = <&gic500>;
 		ti,interrupt-ranges = <0 392 32>;
 	};
-	main-navss {
+	main_navss: bus@30800000 {
 		compatible = "simple-mfd";
 		#address-cells = <2>;
 		#size-cells = <2>;
-		ranges;
+		ranges = <0x0 0x30800000 0x0 0x30800000 0x0 0xbc00000>;
 		dma-coherent;
 		dma-ranges;
 		ti,sci-dev-id = <118>;
-		intr_main_navss: interrupt-controller1 {
+		intr_main_navss: interrupt-controller@310e0000 {
 			compatible = "ti,sci-intr";
+			reg = <0x0 0x310e0000 0x0 0x2000>;
 			ti,intr-trigger-type = <4>;
 			interrupt-controller;
 			interrupt-parent = <&gic500>;

arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi+2−2

@@ -116,11 +116,11 @@ · 115 unmodified lines
116	};	116	};
117	};	117	};
118		118
119	mcu-navss {	119	mcu_navss: bus@28380000 {
120	compatible = "simple-mfd";	120	compatible = "simple-mfd";
121	#address-cells = <2>;	121	#address-cells = <2>;
122	#size-cells = <2>;	122	#size-cells = <2>;
123	ranges;	123	ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;
124	dma-coherent;	124	dma-coherent;
125	dma-ranges;	125	dma-ranges;
126		126

arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi+7−6

  */
 &cbass_wakeup {
-	dmsc: dmsc {
+	dmsc: system-controller@44083000 {
 		compatible = "ti,am654-sci";
 		ti,host-id = <12>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
 		mbox-names = "rx", "tx";
 		mboxes= <&secure_proxy_main 11>,
 			<&secure_proxy_main 13>;
+		reg-names = "debug_messages";
+		reg = <0x44083000 0x1000>;
 		k3_pds: power-controller {
 			compatible = "ti,sci-pm-domain";
 			#power-domain-cells = <2>;
 		};
-		k3_clks: clocks {
+		k3_clks: clock-controller {
 			compatible = "ti,k2g-sci-clk";
 			#clock-cells = <2>;
 		};
 		power-domains = <&k3_pds 115 TI_SCI_PD_EXCLUSIVE>;
 	};
-	intr_wkup_gpio: interrupt-controller2 {
+	intr_wkup_gpio: interrupt-controller@42200000 {
 		compatible = "ti,sci-intr";
+		reg = <0x42200000 0x200>;
 		ti,intr-trigger-type = <1>;
 		interrupt-controller;
 		interrupt-parent = <&gic500>;

arch/arm64/boot/dts/ti/k3-am654-base-board.dts+0−31

@@ -85,12 +85,6 @@ · 84 unmodified lines
85	gpios = <&wkup_gpio0 27 GPIO_ACTIVE_LOW>;	85	gpios = <&wkup_gpio0 27 GPIO_ACTIVE_LOW>;
86	};	86	};
87	};	87	};
88
89	clk_ov5640_fixed: clock {
90	compatible = "fixed-clock";
91	#clock-cells = <0>;
92	clock-frequency = <24000000>;
93	};
94	};	88	};
95		89
96	&wkup_pmx0 {	90	&wkup_pmx0 {
@@ -287,23 +281,6 @@ · 190 unmodified lines
287	pinctrl-names = "default";	281	pinctrl-names = "default";
288	pinctrl-0 = <&main_i2c1_pins_default>;	282	pinctrl-0 = <&main_i2c1_pins_default>;
289	clock-frequency = <400000>;	283	clock-frequency = <400000>;
290
291	ov5640: camera@3c {
292	compatible = "ovti,ov5640";
293	reg = <0x3c>;
294
295	clocks = <&clk_ov5640_fixed>;
296	clock-names = "xclk";
297
298	port {
299	csi2_cam0: endpoint {
300	remote-endpoint = <&csi2_phy0>;
301	clock-lanes = <0>;
302	data-lanes = <1 2>;
303	};
304	};
305	};
306
307	};	284	};
308		285
309	&main_i2c2 {	286	&main_i2c2 {
@@ -496,14 +473,6 @@ · 186 unmodified lines
496	};	473	};
497	};	474	};
498		475
499	&csi2_0 {
500	csi2_phy0: endpoint {
501	remote-endpoint = <&csi2_cam0>;
502	clock-lanes = <0>;
503	data-lanes = <1 2>;
504	};
505	};
506
507	&mcu_cpsw {	476	&mcu_cpsw {
508	pinctrl-names = "default";	477	pinctrl-names = "default";
509	pinctrl-0 = <&mcu_cpsw_pins_default &mcu_mdio_pins_default>;	478	pinctrl-0 = <&mcu_cpsw_pins_default &mcu_mdio_pins_default>;

arch/arm64/boot/dts/ti/k3-j7200-main.dtsi+6−2

 		};
 	};
-	main_gpio_intr: interrupt-controller0 {
+	main_gpio_intr: interrupt-controller@a00000 {
 		compatible = "ti,sci-intr";
+		reg = <0x00 0x00a00000 0x00 0x800>;
 		ti,intr-trigger-type = <1>;
 		interrupt-controller;
 		interrupt-parent = <&gic500>;
 		#size-cells = <2>;
 		ranges = <0x00 0x30000000 0x00 0x30000000 0x00 0x0c400000>;
 		ti,sci-dev-id = <199>;
+		dma-coherent;
+		dma-ranges;
-		main_navss_intr: interrupt-controller1 {
+		main_navss_intr: interrupt-controller@310e0000 {
 			compatible = "ti,sci-intr";
+			reg = <0x00 0x310e0000 0x00 0x4000>;
 			ti,intr-trigger-type = <4>;
 			interrupt-controller;
 			interrupt-parent = <&gic500>;

arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi+4−3

  */
 &cbass_mcu_wakeup {
-	dmsc: dmsc@44083000 {
+	dmsc: system-controller@44083000 {
 		compatible = "ti,k2g-sci";
 		ti,host-id = <12>;
 			#power-domain-cells = <2>;
 		};
-		k3_clks: clocks {
+		k3_clks: clock-controller {
 			compatible = "ti,k2g-sci-clk";
 			#clock-cells = <2>;
 		};
 		clock-names = "fclk";
 	};
-	wkup_gpio_intr: interrupt-controller2 {
+	wkup_gpio_intr: interrupt-controller@42200000 {
 		compatible = "ti,sci-intr";
+		reg = <0x00 0x42200000 0x00 0x400>;
 		ti,intr-trigger-type = <1>;
 		interrupt-controller;
 		interrupt-parent = <&gic500>;

arch/arm64/boot/dts/ti/k3-j721e-main.dtsi+6−4

 		};
 	};
-	main_gpio_intr: interrupt-controller0 {
+	main_gpio_intr: interrupt-controller@a00000 {
 		compatible = "ti,sci-intr";
+		reg = <0x00 0x00a00000 0x00 0x800>;
 		ti,intr-trigger-type = <1>;
 		interrupt-controller;
 		interrupt-parent = <&gic500>;
 		ti,interrupt-ranges = <8 392 56>;
 	};
-	main-navss {
+	main_navss: bus@30000000 {
 		compatible = "simple-mfd";
 		#address-cells = <2>;
 		#size-cells = <2>;
-		ranges;
+		ranges = <0x00 0x30000000 0x00 0x30000000 0x00 0x0c400000>;
 		dma-coherent;
 		dma-ranges;
 		ti,sci-dev-id = <199>;
-		main_navss_intr: interrupt-controller1 {
+		main_navss_intr: interrupt-controller@310e0000 {
 			compatible = "ti,sci-intr";
+			reg = <0x0 0x310e0000 0x0 0x4000>;
 			ti,intr-trigger-type = <4>;
 			interrupt-controller;
 			interrupt-parent = <&gic500>;

arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi+6−5

  */
 &cbass_mcu_wakeup {
-	dmsc: dmsc@44083000 {
+	dmsc: system-controller@44083000 {
 		compatible = "ti,k2g-sci";
 		ti,host-id = <12>;
 			#power-domain-cells = <2>;
 		};
-		k3_clks: clocks {
+		k3_clks: clock-controller {
 			compatible = "ti,k2g-sci-clk";
 			#clock-cells = <2>;
 		};
 		clock-names = "fclk";
 	};
-	wkup_gpio_intr: interrupt-controller2 {
+	wkup_gpio_intr: interrupt-controller@42200000 {
 		compatible = "ti,sci-intr";
+		reg = <0x00 0x42200000 0x00 0x400>;
 		ti,intr-trigger-type = <1>;
 		interrupt-controller;
 		interrupt-parent = <&gic500>;
 		};
 	};
-	mcu-navss {
+	mcu_navss: bus@28380000 {
 		compatible = "simple-mfd";
 		#address-cells = <2>;
 		#size-cells = <2>;
-		ranges;
+		ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;
 		dma-coherent;
 		dma-ranges;

arch/arm64/include/asm/barrier.h+1−1

@@ -74,7 +74,7 @@ static inline unsigned long array_index_mask_nospec(unsigned long idx, · 73 unmodified lines
74	* This insanity brought to you by speculative system register reads,	74	* This insanity brought to you by speculative system register reads,
75	* out-of-order memory accesses, sequence locks and Thomas Gleixner.	75	* out-of-order memory accesses, sequence locks and Thomas Gleixner.
76	*	76	*
77	* http://lists.infradead.org/pipermail/linux-arm-kernel/2019-February/631195.html	77	* https://lore.kernel.org/r/alpine.DEB.2.21.1902081950260.1662@nanos.tec.linutronix.de/
78	*/	78	*/
79	#define arch_counter_enforce_ordering(val) do { \	79	#define arch_counter_enforce_ordering(val) do { \
80	u64 tmp, _val = (val); \	80	u64 tmp, _val = (val); \

arch/arm64/include/asm/kvm_asm.h+3−0

 #define __KVM_HOST_SMCCC_FUNC___pkvm_cpu_set_vector		18
 #define __KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize		19
 #define __KVM_HOST_SMCCC_FUNC___pkvm_mark_hyp			20
+#define __KVM_HOST_SMCCC_FUNC___kvm_adjust_pc			21
 #ifndef __ASSEMBLY__
 extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);
+extern void __kvm_adjust_pc(struct kvm_vcpu *vcpu);
 extern u64 __vgic_v3_get_gic_config(void);
 extern u64 __vgic_v3_read_vmcr(void);
 extern void __vgic_v3_write_vmcr(u32 vmcr);

arch/arm64/include/asm/kvm_emulate.h+5−0

@@ -463,4 +463,9 @@ static __always_inline void kvm_incr_pc(struct kvm_vcpu *vcpu) · 462 unmodified lines
463	vcpu->arch.flags \|= KVM_ARM64_INCREMENT_PC;	463	vcpu->arch.flags \|= KVM_ARM64_INCREMENT_PC;
464	}	464	}
465		465
		466	static inline bool vcpu_has_feature(struct kvm_vcpu *vcpu, int feature)
		467	{
		468	return test_bit(feature, vcpu->arch.features);
		469	}
		470
466	#endif /* __ARM64_KVM_EMULATE_H__ */	471	#endif /* __ARM64_KVM_EMULATE_H__ */

arch/arm64/kvm/arm.c+17−3

 			return ret;
 	}
-	if (run->immediate_exit)
-		return -EINTR;
 	vcpu_load(vcpu);
+	if (run->immediate_exit) {
+		ret = -EINTR;
+		goto out;
+	}
 	kvm_sigset_activate(vcpu);
 	ret = 1;
 	kvm_sigset_deactivate(vcpu);
+out:
+	/*
+	 * In the unlikely event that we are returning to userspace
+	 * with pending exceptions or PC adjustment, commit these
+	 * adjustments in order to give userspace a consistent view of
+	 * the vcpu state. Note that this relies on __kvm_adjust_pc()
+	 * being preempt-safe on VHE.
+	 */
+	if (unlikely(vcpu->arch.flags & (KVM_ARM64_PENDING_EXCEPTION |
+					 KVM_ARM64_INCREMENT_PC)))
+		kvm_call_hyp(__kvm_adjust_pc, vcpu);
 	vcpu_put(vcpu);
 	return ret;
 }

arch/arm64/kvm/hyp/exception.c+17−1

@@ -296,7 +296,7 @@ static void enter_exception32(struct kvm_vcpu *vcpu, u32 mode, u32 vect_offset) · 295 unmodified lines
296	*vcpu_pc(vcpu) = vect_offset;	296	*vcpu_pc(vcpu) = vect_offset;
297	}	297	}
298		298
299	void kvm_inject_exception(struct kvm_vcpu *vcpu)	299	static void kvm_inject_exception(struct kvm_vcpu *vcpu)
300	{	300	{
301	if (vcpu_el1_is_32bit(vcpu)) {	301	if (vcpu_el1_is_32bit(vcpu)) {
302	switch (vcpu->arch.flags & KVM_ARM64_EXCEPT_MASK) {	302	switch (vcpu->arch.flags & KVM_ARM64_EXCEPT_MASK) {
@@ -329,3 +329,19 @@ void kvm_inject_exception(struct kvm_vcpu *vcpu) · 26 unmodified lines
329	}	329	}
330	}	330	}
331	}	331	}
		332
		333	/*
		334	* Adjust the guest PC (and potentially exception state) depending on
		335	* flags provided by the emulation code.
		336	*/
		337	void __kvm_adjust_pc(struct kvm_vcpu *vcpu)
		338	{
		339	if (vcpu->arch.flags & KVM_ARM64_PENDING_EXCEPTION) {
		340	kvm_inject_exception(vcpu);
		341	vcpu->arch.flags &= ~(KVM_ARM64_PENDING_EXCEPTION \|
		342	KVM_ARM64_EXCEPT_MASK);
		343	} else if (vcpu->arch.flags & KVM_ARM64_INCREMENT_PC) {
		344	kvm_skip_instr(vcpu);
		345	vcpu->arch.flags &= ~KVM_ARM64_INCREMENT_PC;
		346	}
		347	}

arch/arm64/kvm/hyp/include/hyp/adjust_pc.h+0−18

@@ -13,8 +13,6 @@ · 12 unmodified lines
13	#include <asm/kvm_emulate.h>	13	#include <asm/kvm_emulate.h>
14	#include <asm/kvm_host.h>	14	#include <asm/kvm_host.h>
15		15
16	void kvm_inject_exception(struct kvm_vcpu *vcpu);
17
18	static inline void kvm_skip_instr(struct kvm_vcpu *vcpu)	16	static inline void kvm_skip_instr(struct kvm_vcpu *vcpu)
19	{	17	{
20	if (vcpu_mode_is_32bit(vcpu)) {	18	if (vcpu_mode_is_32bit(vcpu)) {
@@ -43,22 +41,6 @@ static inline void __kvm_skip_instr(struct kvm_vcpu *vcpu) · 22 unmodified lines
43	write_sysreg_el2(*vcpu_pc(vcpu), SYS_ELR);	41	write_sysreg_el2(*vcpu_pc(vcpu), SYS_ELR);
44	}	42	}
45		43
46	/*
47	* Adjust the guest PC on entry, depending on flags provided by EL1
48	* for the purpose of emulation (MMIO, sysreg) or exception injection.
49	*/
50	static inline void __adjust_pc(struct kvm_vcpu *vcpu)
51	{
52	if (vcpu->arch.flags & KVM_ARM64_PENDING_EXCEPTION) {
53	kvm_inject_exception(vcpu);
54	vcpu->arch.flags &= ~(KVM_ARM64_PENDING_EXCEPTION \|
55	KVM_ARM64_EXCEPT_MASK);
56	} else if (vcpu->arch.flags & KVM_ARM64_INCREMENT_PC) {
57	kvm_skip_instr(vcpu);
58	vcpu->arch.flags &= ~KVM_ARM64_INCREMENT_PC;
59	}
60	}
61
62	/*	44	/*
63	* Skip an instruction while host sysregs are live.	45	* Skip an instruction while host sysregs are live.
64	* Assumes host is always 64-bit.	46	* Assumes host is always 64-bit.

arch/arm64/kvm/hyp/nvhe/hyp-main.c+8−0

 	cpu_reg(host_ctxt, 1) =  __kvm_vcpu_run(kern_hyp_va(vcpu));
 }
+static void handle___kvm_adjust_pc(struct kvm_cpu_context *host_ctxt)
+{
+	DECLARE_REG(struct kvm_vcpu *, vcpu, host_ctxt, 1);
+	__kvm_adjust_pc(kern_hyp_va(vcpu));
+}
 static void handle___kvm_flush_vm_context(struct kvm_cpu_context *host_ctxt)
 {
 	__kvm_flush_vm_context();
 static const hcall_t host_hcall[] = {
 	HANDLE_FUNC(__kvm_vcpu_run),
+	HANDLE_FUNC(__kvm_adjust_pc),
 	HANDLE_FUNC(__kvm_flush_vm_context),
 	HANDLE_FUNC(__kvm_tlb_flush_vmid_ipa),
 	HANDLE_FUNC(__kvm_tlb_flush_vmid),

arch/arm64/kvm/hyp/nvhe/mem_protect.c+2−2

@@ -23,8 +23,8 @@ · 22 unmodified lines
23	extern unsigned long hyp_nr_cpus;	23	extern unsigned long hyp_nr_cpus;
24	struct host_kvm host_kvm;	24	struct host_kvm host_kvm;
25		25
26	struct hyp_pool host_s2_mem;	26	static struct hyp_pool host_s2_mem;
27	struct hyp_pool host_s2_dev;	27	static struct hyp_pool host_s2_dev;
28		28
29	/*	29	/*
30	* Copies of the host's CPU features registers holding sanitized values.	30	* Copies of the host's CPU features registers holding sanitized values.

arch/arm64/kvm/hyp/nvhe/setup.c+1−1

 #include <nvhe/trap_handler.h>
 struct hyp_pool hpool;
-struct kvm_pgtable_mm_ops pkvm_pgtable_mm_ops;
 unsigned long hyp_nr_cpus;
 #define hyp_percpu_size ((unsigned long)__per_cpu_end - \
 static void *hyp_pgt_base;
 static void *host_s2_mem_pgt_base;
 static void *host_s2_dev_pgt_base;
+static struct kvm_pgtable_mm_ops pkvm_pgtable_mm_ops;
 static int divide_memory_pool(void *virt, unsigned long size)
 {

arch/arm64/kvm/hyp/nvhe/switch.c+1−2

  * Author: Marc Zyngier <marc.zyngier@arm.com>
  */
-#include <hyp/adjust_pc.h>
 #include <hyp/switch.h>
 #include <hyp/sysreg-sr.h>
 	 */
 	__debug_save_host_buffers_nvhe(vcpu);
-	__adjust_pc(vcpu);
+	__kvm_adjust_pc(vcpu);
 	/*
 	 * We must restore the 32-bit state before the sysregs, thanks

arch/arm64/kvm/hyp/vhe/switch.c+1−2

  * Author: Marc Zyngier <marc.zyngier@arm.com>
  */
-#include <hyp/adjust_pc.h>
 #include <hyp/switch.h>
 #include <linux/arm-smccc.h>
 	__load_guest_stage2(vcpu->arch.hw_mmu);
 	__activate_traps(vcpu);
-	__adjust_pc(vcpu);
+	__kvm_adjust_pc(vcpu);
 	sysreg_restore_guest_state_vhe(guest_ctxt);
 	__debug_switch_to_guest(vcpu);

arch/arm64/kvm/mmu.c+6−6

@@ -1156,13 +1156,13 @@ out_unlock: · 1155 unmodified lines
1156	bool kvm_unmap_gfn_range(struct kvm kvm, struct kvm_gfn_range range)	1156	bool kvm_unmap_gfn_range(struct kvm kvm, struct kvm_gfn_range range)
1157	{	1157	{
1158	if (!kvm->arch.mmu.pgt)	1158	if (!kvm->arch.mmu.pgt)
1159	return 0;	1159	return false;
1160		1160
1161	__unmap_stage2_range(&kvm->arch.mmu, range->start << PAGE_SHIFT,	1161	__unmap_stage2_range(&kvm->arch.mmu, range->start << PAGE_SHIFT,
1162	(range->end - range->start) << PAGE_SHIFT,	1162	(range->end - range->start) << PAGE_SHIFT,
1163	range->may_block);	1163	range->may_block);
1164		1164
1165	return 0;	1165	return false;
1166	}	1166	}
1167		1167
1168	bool kvm_set_spte_gfn(struct kvm kvm, struct kvm_gfn_range range)	1168	bool kvm_set_spte_gfn(struct kvm kvm, struct kvm_gfn_range range)
@@ -1170,7 +1170,7 @@ bool kvm_set_spte_gfn(struct kvm kvm, struct kvm_gfn_range range) · 1 unmodified line
1170	kvm_pfn_t pfn = pte_pfn(range->pte);	1170	kvm_pfn_t pfn = pte_pfn(range->pte);
1171		1171
1172	if (!kvm->arch.mmu.pgt)	1172	if (!kvm->arch.mmu.pgt)
1173	return 0;	1173	return false;
1174		1174
1175	WARN_ON(range->end - range->start != 1);	1175	WARN_ON(range->end - range->start != 1);
1176		1176
@@ -1190,7 +1190,7 @@ bool kvm_set_spte_gfn(struct kvm kvm, struct kvm_gfn_range range) · 13 unmodified lines
1190	PAGE_SIZE, __pfn_to_phys(pfn),	1190	PAGE_SIZE, __pfn_to_phys(pfn),
1191	KVM_PGTABLE_PROT_R, NULL);	1191	KVM_PGTABLE_PROT_R, NULL);
1192		1192
1193	return 0;	1193	return false;
1194	}	1194	}
1195		1195
1196	bool kvm_age_gfn(struct kvm kvm, struct kvm_gfn_range range)	1196	bool kvm_age_gfn(struct kvm kvm, struct kvm_gfn_range range)
@@ -1200,7 +1200,7 @@ bool kvm_age_gfn(struct kvm kvm, struct kvm_gfn_range range) · 3 unmodified lines
1200	pte_t pte;	1200	pte_t pte;
1201		1201
1202	if (!kvm->arch.mmu.pgt)	1202	if (!kvm->arch.mmu.pgt)
1203	return 0;	1203	return false;
1204		1204
1205	WARN_ON(size != PAGE_SIZE && size != PMD_SIZE && size != PUD_SIZE);	1205	WARN_ON(size != PAGE_SIZE && size != PMD_SIZE && size != PUD_SIZE);
1206		1206
@@ -1213,7 +1213,7 @@ bool kvm_age_gfn(struct kvm kvm, struct kvm_gfn_range range) · 6 unmodified lines
1213	bool kvm_test_age_gfn(struct kvm kvm, struct kvm_gfn_range range)	1213	bool kvm_test_age_gfn(struct kvm kvm, struct kvm_gfn_range range)
1214	{	1214	{
1215	if (!kvm->arch.mmu.pgt)	1215	if (!kvm->arch.mmu.pgt)
1216	return 0;	1216	return false;
1217		1217
1218	return kvm_pgtable_stage2_is_young(kvm->arch.mmu.pgt,	1218	return kvm_pgtable_stage2_is_young(kvm->arch.mmu.pgt,
1219	range->start << PAGE_SHIFT);	1219	range->start << PAGE_SHIFT);

arch/arm64/kvm/reset.c+24−4

@@ -166,6 +166,25 @@ static int kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu) · 165 unmodified lines
166	return 0;	166	return 0;
167	}	167	}
168		168
		169	static bool vcpu_allowed_register_width(struct kvm_vcpu *vcpu)
		170	{
		171	struct kvm_vcpu *tmp;
		172	bool is32bit;
		173	int i;
		174
		175	is32bit = vcpu_has_feature(vcpu, KVM_ARM_VCPU_EL1_32BIT);
		176	if (!cpus_have_const_cap(ARM64_HAS_32BIT_EL1) && is32bit)
		177	return false;
		178
		179	/* Check that the vcpus are either all 32bit or all 64bit */
		180	kvm_for_each_vcpu(i, tmp, vcpu->kvm) {
		181	if (vcpu_has_feature(tmp, KVM_ARM_VCPU_EL1_32BIT) != is32bit)
		182	return false;
		183	}
		184
		185	return true;
		186	}
		187
169	/**	188	/**
170	* kvm_reset_vcpu - sets core registers and sys_regs to reset value	189	* kvm_reset_vcpu - sets core registers and sys_regs to reset value
171	* @vcpu: The VCPU pointer	190	* @vcpu: The VCPU pointer
@@ -217,13 +236,14 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) · 45 unmodified lines
217	}	236	}
218	}	237	}
219		238
		239	if (!vcpu_allowed_register_width(vcpu)) {
		240	ret = -EINVAL;
		241	goto out;
		242	}
		243
220	switch (vcpu->arch.target) {	244	switch (vcpu->arch.target) {
221	default:	245	default:
222	if (test_bit(KVM_ARM_VCPU_EL1_32BIT, vcpu->arch.features)) {	246	if (test_bit(KVM_ARM_VCPU_EL1_32BIT, vcpu->arch.features)) {
223	if (!cpus_have_const_cap(ARM64_HAS_32BIT_EL1)) {
224	ret = -EINVAL;
225	goto out;
226	}
227	pstate = VCPU_RESET_PSTATE_SVC;	247	pstate = VCPU_RESET_PSTATE_SVC;
228	} else {	248	} else {
229	pstate = VCPU_RESET_PSTATE_EL1;	249	pstate = VCPU_RESET_PSTATE_EL1;

arch/arm64/kvm/sys_regs.c+21−21

arch/arm64/mm/mmu.c+2−1

@@ -515,7 +515,8 @@ static void __init map_mem(pgd_t *pgdp) · 514 unmodified lines
515	*/	515	*/
516	BUILD_BUG_ON(pgd_index(direct_map_end - 1) == pgd_index(direct_map_end));	516	BUILD_BUG_ON(pgd_index(direct_map_end - 1) == pgd_index(direct_map_end));
517		517
518	if (rodata_full \|\| crash_mem_map \|\| debug_pagealloc_enabled())	518	if (rodata_full \|\| crash_mem_map \|\| debug_pagealloc_enabled() \|\|
		519	IS_ENABLED(CONFIG_KFENCE))
519	flags \|= NO_BLOCK_MAPPINGS \| NO_CONT_MAPPINGS;	520	flags \|= NO_BLOCK_MAPPINGS \| NO_CONT_MAPPINGS;
520		521
521	/*	522	/*

arch/mips/alchemy/board-xxs1500.c+1−0

@@ -18,6 +18,7 @@ · 17 unmodified lines
18	#include <asm/reboot.h>	18	#include <asm/reboot.h>
19	#include <asm/setup.h>	19	#include <asm/setup.h>
20	#include <asm/mach-au1x00/au1000.h>	20	#include <asm/mach-au1x00/au1000.h>
		21	#include <asm/mach-au1x00/gpio-au1000.h>
21	#include <prom.h>	22	#include <prom.h>
22		23
23	const char *get_system_type(void)	24	const char *get_system_type(void)

arch/mips/include/asm/mips-boards/launch.h+5−0

  *
  */
+#ifndef _ASM_MIPS_BOARDS_LAUNCH_H
+#define _ASM_MIPS_BOARDS_LAUNCH_H
 #ifndef _ASSEMBLER_
 struct cpulaunch {
 /* Polling period in count cycles for secondary CPU's */
 #define LAUNCHPERIOD	10000
+#endif /* _ASM_MIPS_BOARDS_LAUNCH_H */

arch/mips/lib/mips-atomic.c+6−6

@@ -37,7 +37,7 @@ · 36 unmodified lines
37	*/	37	*/
38	notrace void arch_local_irq_disable(void)	38	notrace void arch_local_irq_disable(void)
39	{	39	{
40	preempt_disable();	40	preempt_disable_notrace();
41		41
42	__asm__ __volatile__(	42	__asm__ __volatile__(
43	" .set push \n"	43	" .set push \n"
@@ -53,7 +53,7 @@ notrace void arch_local_irq_disable(void) · 9 unmodified lines
53	: /* no inputs */	53	: /* no inputs */
54	: "memory");	54	: "memory");
55		55
56	preempt_enable();	56	preempt_enable_notrace();
57	}	57	}
58	EXPORT_SYMBOL(arch_local_irq_disable);	58	EXPORT_SYMBOL(arch_local_irq_disable);
59		59
@@ -61,7 +61,7 @@ notrace unsigned long arch_local_irq_save(void) · 1 unmodified line
61	{	61	{
62	unsigned long flags;	62	unsigned long flags;
63		63
64	preempt_disable();	64	preempt_disable_notrace();
65		65
66	__asm__ __volatile__(	66	__asm__ __volatile__(
67	" .set push \n"	67	" .set push \n"
@@ -78,7 +78,7 @@ notrace unsigned long arch_local_irq_save(void) · 10 unmodified lines
78	: /* no inputs */	78	: /* no inputs */
79	: "memory");	79	: "memory");
80		80
81	preempt_enable();	81	preempt_enable_notrace();
82		82
83	return flags;	83	return flags;
84	}	84	}
@@ -88,7 +88,7 @@ notrace void arch_local_irq_restore(unsigned long flags) · 3 unmodified lines
88	{	88	{
89	unsigned long __tmp1;	89	unsigned long __tmp1;
90		90
91	preempt_disable();	91	preempt_disable_notrace();
92		92
93	__asm__ __volatile__(	93	__asm__ __volatile__(
94	" .set push \n"	94	" .set push \n"
@@ -106,7 +106,7 @@ notrace void arch_local_irq_restore(unsigned long flags) · 11 unmodified lines
106	: "0" (flags)	106	: "0" (flags)
107	: "memory");	107	: "memory");
108		108
109	preempt_enable();	109	preempt_enable_notrace();
110	}	110	}
111	EXPORT_SYMBOL(arch_local_irq_restore);	111	EXPORT_SYMBOL(arch_local_irq_restore);
112		112

arch/mips/mm/cache.c+14−16

@@ -158,31 +158,29 @@ unsigned long _page_cachable_default; · 157 unmodified lines
158	EXPORT_SYMBOL(_page_cachable_default);	158	EXPORT_SYMBOL(_page_cachable_default);
159		159
160	#define PM(p) __pgprot(_page_cachable_default \| (p))	160	#define PM(p) __pgprot(_page_cachable_default \| (p))
161	#define PVA(p) PM(_PAGE_VALID \| _PAGE_ACCESSED \| (p))
162		161
163	static inline void setup_protection_map(void)	162	static inline void setup_protection_map(void)
164	{	163	{
165	protection_map[0] = PM(_PAGE_PRESENT \| _PAGE_NO_EXEC \| _PAGE_NO_READ);	164	protection_map[0] = PM(_PAGE_PRESENT \| _PAGE_NO_EXEC \| _PAGE_NO_READ);
166	protection_map[1] = PVA(_PAGE_PRESENT \| _PAGE_NO_EXEC);	165	protection_map[1] = PM(_PAGE_PRESENT \| _PAGE_NO_EXEC);
167	protection_map[2] = PVA(_PAGE_PRESENT \| _PAGE_NO_EXEC \| _PAGE_NO_READ);	166	protection_map[2] = PM(_PAGE_PRESENT \| _PAGE_NO_EXEC \| _PAGE_NO_READ);
168	protection_map[3] = PVA(_PAGE_PRESENT \| _PAGE_NO_EXEC);	167	protection_map[3] = PM(_PAGE_PRESENT \| _PAGE_NO_EXEC);
169	protection_map[4] = PVA(_PAGE_PRESENT);	168	protection_map[4] = PM(_PAGE_PRESENT);
170	protection_map[5] = PVA(_PAGE_PRESENT);	169	protection_map[5] = PM(_PAGE_PRESENT);
171	protection_map[6] = PVA(_PAGE_PRESENT);	170	protection_map[6] = PM(_PAGE_PRESENT);
172	protection_map[7] = PVA(_PAGE_PRESENT);	171	protection_map[7] = PM(_PAGE_PRESENT);
173		172
174	protection_map[8] = PM(_PAGE_PRESENT \| _PAGE_NO_EXEC \| _PAGE_NO_READ);	173	protection_map[8] = PM(_PAGE_PRESENT \| _PAGE_NO_EXEC \| _PAGE_NO_READ);
175	protection_map[9] = PVA(_PAGE_PRESENT \| _PAGE_NO_EXEC);	174	protection_map[9] = PM(_PAGE_PRESENT \| _PAGE_NO_EXEC);
176	protection_map[10] = PVA(_PAGE_PRESENT \| _PAGE_NO_EXEC \| _PAGE_WRITE \|	175	protection_map[10] = PM(_PAGE_PRESENT \| _PAGE_NO_EXEC \| _PAGE_WRITE \|
177	_PAGE_NO_READ);	176	_PAGE_NO_READ);
178	protection_map[11] = PVA(_PAGE_PRESENT \| _PAGE_NO_EXEC \| _PAGE_WRITE);	177	protection_map[11] = PM(_PAGE_PRESENT \| _PAGE_NO_EXEC \| _PAGE_WRITE);
179	protection_map[12] = PVA(_PAGE_PRESENT);	178	protection_map[12] = PM(_PAGE_PRESENT);
180	protection_map[13] = PVA(_PAGE_PRESENT);	179	protection_map[13] = PM(_PAGE_PRESENT);
181	protection_map[14] = PVA(_PAGE_PRESENT);	180	protection_map[14] = PM(_PAGE_PRESENT \| _PAGE_WRITE);
182	protection_map[15] = PVA(_PAGE_PRESENT);	181	protection_map[15] = PM(_PAGE_PRESENT \| _PAGE_WRITE);
183	}	182	}
184		183
185	#undef _PVA
186	#undef PM	184	#undef PM
187		185
188	void cpu_cache_init(void)	186	void cpu_cache_init(void)

arch/mips/ralink/of.c+2−0

 #include <linux/io.h>
 #include <linux/clk.h>
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/sizes.h>
 #include <linux/of_fdt.h>
 __iomem void *rt_sysc_membase;
 __iomem void *rt_memc_membase;
+EXPORT_SYMBOL_GPL(rt_sysc_membase);
 __iomem void *plat_of_remap_node(const char *node)
 {

arch/powerpc/boot/dts/fsl/p1010si-post.dtsi+8−0

@@ -122,7 +122,15 @@ · 121 unmodified lines
122	};	122	};
123		123
124	/include/ "pq3-i2c-0.dtsi"	124	/include/ "pq3-i2c-0.dtsi"
		125	i2c@3000 {
		126	fsl,i2c-erratum-a004447;
		127	};
		128
125	/include/ "pq3-i2c-1.dtsi"	129	/include/ "pq3-i2c-1.dtsi"
		130	i2c@3100 {
		131	fsl,i2c-erratum-a004447;
		132	};
		133
126	/include/ "pq3-duart-0.dtsi"	134	/include/ "pq3-duart-0.dtsi"
127	/include/ "pq3-espi-0.dtsi"	135	/include/ "pq3-espi-0.dtsi"
128	spi0: spi@7000 {	136	spi0: spi@7000 {

arch/powerpc/boot/dts/fsl/p2041si-post.dtsi+16−0

@@ -371,7 +371,23 @@ · 370 unmodified lines
371	};	371	};
372		372
373	/include/ "qoriq-i2c-0.dtsi"	373	/include/ "qoriq-i2c-0.dtsi"
		374	i2c@118000 {
		375	fsl,i2c-erratum-a004447;
		376	};
		377
		378	i2c@118100 {
		379	fsl,i2c-erratum-a004447;
		380	};
		381
374	/include/ "qoriq-i2c-1.dtsi"	382	/include/ "qoriq-i2c-1.dtsi"
		383	i2c@119000 {
		384	fsl,i2c-erratum-a004447;
		385	};
		386
		387	i2c@119100 {
		388	fsl,i2c-erratum-a004447;
		389	};
		390
375	/include/ "qoriq-duart-0.dtsi"	391	/include/ "qoriq-duart-0.dtsi"
376	/include/ "qoriq-duart-1.dtsi"	392	/include/ "qoriq-duart-1.dtsi"
377	/include/ "qoriq-gpio-0.dtsi"	393	/include/ "qoriq-gpio-0.dtsi"

arch/powerpc/include/asm/jump_label.h+1−1

@@ -50,7 +50,7 @@ l_yes: · 49 unmodified lines
50	1098: nop; \	50	1098: nop; \
51	.pushsection __jump_table, "aw"; \	51	.pushsection __jump_table, "aw"; \
52	.long 1098b - ., LABEL - .; \	52	.long 1098b - ., LABEL - .; \
53	FTR_ENTRY_LONG KEY; \	53	FTR_ENTRY_LONG KEY - .; \
54	.popsection	54	.popsection
55	#endif	55	#endif
56		56

arch/powerpc/include/asm/kvm_host.h+1−0

@@ -51,6 +51,7 @@ · 50 unmodified lines
51	/* PPC-specific vcpu->requests bit members */	51	/* PPC-specific vcpu->requests bit members */
52	#define KVM_REQ_WATCHDOG KVM_ARCH_REQ(0)	52	#define KVM_REQ_WATCHDOG KVM_ARCH_REQ(0)
53	#define KVM_REQ_EPR_EXIT KVM_ARCH_REQ(1)	53	#define KVM_REQ_EPR_EXIT KVM_ARCH_REQ(1)
		54	#define KVM_REQ_PENDING_TIMER KVM_ARCH_REQ(2)
54		55
55	#include <linux/mmu_notifier.h>	56	#include <linux/mmu_notifier.h>
56		57

arch/powerpc/include/asm/pte-walk.h+29−0

@@ -31,6 +31,35 @@ static inline pte_t find_init_mm_pte(unsigned long ea, unsigned hshift) · 30 unmodified lines
31	pgd_t *pgdir = init_mm.pgd;	31	pgd_t *pgdir = init_mm.pgd;
32	return __find_linux_pte(pgdir, ea, NULL, hshift);	32	return __find_linux_pte(pgdir, ea, NULL, hshift);
33	}	33	}
		34
		35	/*
		36	* Convert a kernel vmap virtual address (vmalloc or ioremap space) to a
		37	* physical address, without taking locks. This can be used in real-mode.
		38	*/
		39	static inline phys_addr_t ppc_find_vmap_phys(unsigned long addr)
		40	{
		41	pte_t *ptep;
		42	phys_addr_t pa;
		43	int hugepage_shift;
		44
		45	/*
		46	* init_mm does not free page tables, and does not do THP. It may
		47	* have huge pages from huge vmalloc / ioremap etc.
		48	*/
		49	ptep = find_init_mm_pte(addr, &hugepage_shift);
		50	if (WARN_ON(!ptep))
		51	return 0;
		52
		53	pa = PFN_PHYS(pte_pfn(*ptep));
		54
		55	if (!hugepage_shift)
		56	hugepage_shift = PAGE_SHIFT;
		57
		58	pa \|= addr & ((1ul << hugepage_shift) - 1);
		59
		60	return pa;
		61	}
		62
34	/*	63	/*
35	* This is what we should always use. Any other lockless page table lookup needs	64	* This is what we should always use. Any other lockless page table lookup needs
36	* careful audit against THP split.	65	* careful audit against THP split.

arch/powerpc/kernel/eeh.c+1−22

@@ -346,28 +346,7 @@ void eeh_slot_error_detail(struct eeh_pe *pe, int severity) · 345 unmodified lines
346	*/	346	*/
347	static inline unsigned long eeh_token_to_phys(unsigned long token)	347	static inline unsigned long eeh_token_to_phys(unsigned long token)
348	{	348	{
349	pte_t *ptep;	349	return ppc_find_vmap_phys(token);
350	unsigned long pa;
351	int hugepage_shift;
352
353	/*
354	* We won't find hugepages here(this is iomem). Hence we are not
355	* worried about _PAGE_SPLITTING/collapse. Also we will not hit
356	* page table free, because of init_mm.
357	*/
358	ptep = find_init_mm_pte(token, &hugepage_shift);
359	if (!ptep)
360	return token;
361
362	pa = pte_pfn(*ptep);
363
364	/* On radix we can do hugepage mappings for io, so handle that */
365	if (!hugepage_shift)
366	hugepage_shift = PAGE_SHIFT;
367
368	pa <<= PAGE_SHIFT;
369	pa \|= token & ((1ul << hugepage_shift) - 1);
370	return pa;
371	}	350	}
372		351
373	/*	352	/*

arch/powerpc/kernel/io-workarounds.c+3−13

@@ -55,7 +55,6 @@ static struct iowa_bus *iowa_pci_find(unsigned long vaddr, unsigned long paddr) · 54 unmodified lines
55	#ifdef CONFIG_PPC_INDIRECT_MMIO	55	#ifdef CONFIG_PPC_INDIRECT_MMIO
56	struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr)	56	struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr)
57	{	57	{
58	unsigned hugepage_shift;
59	struct iowa_bus *bus;	58	struct iowa_bus *bus;
60	int token;	59	int token;
61		60
@@ -65,22 +64,13 @@ struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr) · 3 unmodified lines
65	bus = &iowa_busses[token - 1];	64	bus = &iowa_busses[token - 1];
66	else {	65	else {
67	unsigned long vaddr, paddr;	66	unsigned long vaddr, paddr;
68	pte_t *ptep;
69		67
70	vaddr = (unsigned long)PCI_FIX_ADDR(addr);	68	vaddr = (unsigned long)PCI_FIX_ADDR(addr);
71	if (vaddr < PHB_IO_BASE \|\| vaddr >= PHB_IO_END)	69	if (vaddr < PHB_IO_BASE \|\| vaddr >= PHB_IO_END)
72	return NULL;	70	return NULL;
73	/*	71
74	* We won't find huge pages here (iomem). Also can't hit	72	paddr = ppc_find_vmap_phys(vaddr);
75	* a page table free due to init_mm	73
76	*/
77	ptep = find_init_mm_pte(vaddr, &hugepage_shift);
78	if (ptep == NULL)
79	paddr = 0;
80	else {
81	WARN_ON(hugepage_shift);
82	paddr = pte_pfn(*ptep) << PAGE_SHIFT;
83	}
84	bus = iowa_pci_find(vaddr, paddr);	74	bus = iowa_pci_find(vaddr, paddr);
85		75
86	if (bus == NULL)	76	if (bus == NULL)

arch/powerpc/kernel/iommu.c+5−6

 	unsigned int order;
 	unsigned int nio_pages, io_order;
 	struct page *page;
-	size_t size_io = size;
 	size = PAGE_ALIGN(size);
 	order = get_order(size);
 	memset(ret, 0, size);
 	/* Set up tces to cover the allocated range */
-	size_io = IOMMU_PAGE_ALIGN(size_io, tbl);
+	nio_pages = size >> tbl->it_page_shift;
-	nio_pages = size_io >> tbl->it_page_shift;
+	io_order = get_iommu_order(size, tbl);
-	io_order = get_iommu_order(size_io, tbl);
 	mapping = iommu_alloc(dev, tbl, ret, nio_pages, DMA_BIDIRECTIONAL,
 			      mask >> tbl->it_page_shift, io_order, 0);
 	if (mapping == DMA_MAPPING_ERROR) {
 			 void *vaddr, dma_addr_t dma_handle)
 {
 	if (tbl) {
-		size_t size_io = IOMMU_PAGE_ALIGN(size, tbl);
+		unsigned int nio_pages;
-		unsigned int nio_pages = size_io >> tbl->it_page_shift;
+		size = PAGE_ALIGN(size);
+		nio_pages = size >> tbl->it_page_shift;
 		iommu_free(tbl, dma_handle, nio_pages);
 		size = PAGE_ALIGN(size);
 		free_pages((unsigned long)vaddr, get_order(size));

arch/powerpc/kernel/kprobes.c+2−2

 	int ret = 0;
 	struct kprobe *prev;
 	struct ppc_inst insn = ppc_inst_read((struct ppc_inst *)p->addr);
-	struct ppc_inst prefix = ppc_inst_read((struct ppc_inst *)(p->addr - 1));
 	if ((unsigned long)p->addr & 0x03) {
 		printk("Attempt to register kprobe at an unaligned address\n");
 	} else if (IS_MTMSRD(insn) || IS_RFID(insn) || IS_RFI(insn)) {
 		printk("Cannot register a kprobe on rfi/rfid or mtmsr[d]\n");
 		ret = -EINVAL;
-	} else if (ppc_inst_prefixed(prefix)) {
+	} else if ((unsigned long)p->addr & ~PAGE_MASK &&
+		   ppc_inst_prefixed(ppc_inst_read((struct ppc_inst *)(p->addr - 1)))) {
 		printk("Cannot register a kprobe on the second word of prefixed instruction\n");
 		ret = -EINVAL;
 	}

arch/powerpc/kernel/signal_64.c+4−5

 	unsafe_copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set), badframe_block);
 	user_write_access_end();
+	/* Save the siginfo outside of the unsafe block. */
+	if (copy_siginfo_to_user(&frame->info, &ksig->info))
+		goto badframe;
 	/* Make sure signal handler doesn't get spurious FP exceptions */
 	tsk->thread.fp_state.fpscr = 0;
 		regs->nip = (unsigned long) &frame->tramp[0];
 	}
-	/* Save the siginfo outside of the unsafe block. */
-	if (copy_siginfo_to_user(&frame->info, &ksig->info))
-		goto badframe;
 	/* Allocate a dummy caller frame for the signal handler. */
 	newsp = ((unsigned long)frame) - __SIGNAL_FRAMESIZE;
 	err |= put_user(regs->gpr[1], (unsigned long __user *)newsp);

arch/powerpc/kvm/book3s_hv.c+1−2

 				break;
 			}
 			cur = ktime_get();
-		} while (single_task_running() && ktime_before(cur, stop));
+		} while (kvm_vcpu_can_poll(cur, stop));
 		spin_lock(&vc->lock);
 		vc->vcore_state = VCORE_INACTIVE;
 		mtspr(SPRN_EBBRR, ebb_regs[1]);
 		mtspr(SPRN_BESCR, ebb_regs[2]);
 		mtspr(SPRN_TAR, user_tar);
-		mtspr(SPRN_FSCR, current->thread.fscr);
 	}
 	mtspr(SPRN_VRSAVE, user_vrsave);

arch/powerpc/kvm/book3s_hv_rm_mmu.c+2−13

@@ -23,20 +23,9 @@ · 22 unmodified lines
23	#include <asm/pte-walk.h>	23	#include <asm/pte-walk.h>
24		24
25	/* Translate address of a vmalloc'd thing to a linear map address */	25	/* Translate address of a vmalloc'd thing to a linear map address */
26	static void real_vmalloc_addr(void x)	26	static void real_vmalloc_addr(void addr)
27	{	27	{
28	unsigned long addr = (unsigned long) x;	28	return __va(ppc_find_vmap_phys((unsigned long)addr));
29	pte_t *p;
30	/*
31	* assume we don't have huge pages in vmalloc space...
32	* So don't worry about THP collapse/split. Called
33	* Only in realmode with MSR_EE = 0, hence won't need irq_save/restore.
34	*/
35	p = find_init_mm_pte(addr, NULL);
36	if (!p \|\| !pte_present(*p))
37	return NULL;
38	addr = (pte_pfn(*p) << PAGE_SHIFT) \| (addr & ~PAGE_MASK);
39	return __va(addr);
40	}	29	}
41		30
42	/* Return 1 if we need to do a global tlbie, 0 if we can use tlbiel */	31	/* Return 1 if we need to do a global tlbie, 0 if we can use tlbiel */

arch/powerpc/kvm/book3s_hv_rmhandlers.S+7−0

 #define STACK_SLOT_UAMOR	(SFS-88)
 #define STACK_SLOT_DAWR1	(SFS-96)
 #define STACK_SLOT_DAWRX1	(SFS-104)
+#define STACK_SLOT_FSCR		(SFS-112)
 /* the following is used by the P9 short path */
 #define STACK_SLOT_NVGPRS	(SFS-152)	/* 18 gprs */
 	std	r6, STACK_SLOT_DAWR0(r1)
 	std	r7, STACK_SLOT_DAWRX0(r1)
 	std	r8, STACK_SLOT_IAMR(r1)
+	mfspr	r5, SPRN_FSCR
+	std	r5, STACK_SLOT_FSCR(r1)
 END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
 BEGIN_FTR_SECTION
 	mfspr	r6, SPRN_DAWR1
 	ld	r7, STACK_SLOT_HFSCR(r1)
 	mtspr	SPRN_HFSCR, r7
 ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_300)
+BEGIN_FTR_SECTION
+	ld	r5, STACK_SLOT_FSCR(r1)
+	mtspr	SPRN_FSCR, r5
+END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
 	/*
 	 * Restore various registers to 0, where non-zero values
 	 * set by the guest could disrupt the host.

arch/powerpc/mm/mem.c+1−0

@@ -20,6 +20,7 @@ · 19 unmodified lines
20	#include <asm/machdep.h>	20	#include <asm/machdep.h>
21	#include <asm/rtas.h>	21	#include <asm/rtas.h>
22	#include <asm/kasan.h>	22	#include <asm/kasan.h>
		23	#include <asm/sparsemem.h>
23	#include <asm/svm.h>	24	#include <asm/svm.h>
24		25
25	#include <mm/mmu_decl.h>	26	#include <mm/mmu_decl.h>

arch/powerpc/perf/core-book3s.c+1−1

@@ -2254,7 +2254,7 @@ unsigned long perf_instruction_pointer(struct pt_regs *regs) · 2253 unmodified lines
2254	bool use_siar = regs_use_siar(regs);	2254	bool use_siar = regs_use_siar(regs);
2255	unsigned long siar = mfspr(SPRN_SIAR);	2255	unsigned long siar = mfspr(SPRN_SIAR);
2256		2256
2257	if (ppmu->flags & PPMU_P10_DD1) {	2257	if (ppmu && (ppmu->flags & PPMU_P10_DD1)) {
2258	if (siar)	2258	if (siar)
2259	return siar;	2259	return siar;
2260	else	2260	else

arch/riscv/Kconfig+10−9

 	select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
 	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT
 	select ARCH_SUPPORTS_HUGETLBFS if MMU
+	select ARCH_USE_MEMTEST
 	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
 	select ARCH_WANT_FRAME_POINTERS
 	select ARCH_WANT_HUGE_PMD_SHARE if 64BIT
 	select GENERIC_TIME_VSYSCALL if MMU && 64BIT
 	select HANDLE_DOMAIN_IRQ
 	select HAVE_ARCH_AUDITSYSCALL
-	select HAVE_ARCH_JUMP_LABEL
+	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
-	select HAVE_ARCH_JUMP_LABEL_RELATIVE
+	select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL
 	select HAVE_ARCH_KASAN if MMU && 64BIT
 	select HAVE_ARCH_KASAN_VMALLOC if MMU && 64BIT
-	select HAVE_ARCH_KGDB
+	select HAVE_ARCH_KGDB if !XIP_KERNEL
 	select HAVE_ARCH_KGDB_QXFER_PKT
 	select HAVE_ARCH_MMAP_RND_BITS if MMU
 	select HAVE_ARCH_SECCOMP_FILTER
 	select HAVE_GCC_PLUGINS
 	select HAVE_GENERIC_VDSO if MMU && 64BIT
 	select HAVE_IRQ_TIME_ACCOUNTING
-	select HAVE_KPROBES
+	select HAVE_KPROBES if !XIP_KERNEL
-	select HAVE_KPROBES_ON_FTRACE
+	select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL
-	select HAVE_KRETPROBES
+	select HAVE_KRETPROBES if !XIP_KERNEL
 	select HAVE_PCI
 	select HAVE_PERF_EVENTS
 	select HAVE_PERF_REGS
 	bool "RV64I"
 	select 64BIT
 	select ARCH_SUPPORTS_INT128 if CC_HAS_INT128 && GCC_VERSION >= 50000
-	select HAVE_DYNAMIC_FTRACE if MMU && $(cc-option,-fpatchable-function-entry=8)
+	select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && $(cc-option,-fpatchable-function-entry=8)
 	select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
-	select HAVE_FTRACE_MCOUNT_RECORD
+	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
 	select HAVE_FUNCTION_GRAPH_TRACER
-	select HAVE_FUNCTION_TRACER
+	select HAVE_FUNCTION_TRACER if !XIP_KERNEL
 	select SWIOTLB if MMU
 endchoice

arch/riscv/Kconfig.socs+1−0

@@ -14,6 +14,7 @@ config SOC_SIFIVE · 13 unmodified lines
14	select CLK_SIFIVE	14	select CLK_SIFIVE
15	select CLK_SIFIVE_PRCI	15	select CLK_SIFIVE_PRCI
16	select SIFIVE_PLIC	16	select SIFIVE_PLIC
		17	select RISCV_ERRATA_ALTERNATIVE
17	select ERRATA_SIFIVE	18	select ERRATA_SIFIVE
18	help	19	help
19	This enables support for SiFive SoC platform hardware.	20	This enables support for SiFive SoC platform hardware.

arch/riscv/Makefile+10−1

 	CC_FLAGS_FTRACE := -fpatchable-function-entry=8
 endif
-ifeq ($(CONFIG_64BIT)$(CONFIG_CMODEL_MEDLOW),yy)
+ifeq ($(CONFIG_CMODEL_MEDLOW),y)
 KBUILD_CFLAGS_MODULE += -mcmodel=medany
 endif
 	KBUILD_LDFLAGS += -melf32lriscv
 endif
+ifeq ($(CONFIG_LD_IS_LLD),y)
+	KBUILD_CFLAGS += -mno-relax
+	KBUILD_AFLAGS += -mno-relax
+ifneq ($(LLVM_IAS),1)
+	KBUILD_CFLAGS += -Wa,-mno-relax
+	KBUILD_AFLAGS += -Wa,-mno-relax
+endif
+endif
 # ISA string setting
 riscv-march-$(CONFIG_ARCH_RV32I)	:= rv32ima
 riscv-march-$(CONFIG_ARCH_RV64I)	:= rv64ima

arch/riscv/boot/dts/microchip/Makefile+1−0

@@ -1,2 +1,3 @@
1	# SPDX-License-Identifier: GPL-2.0	1	# SPDX-License-Identifier: GPL-2.0
2	dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += microchip-mpfs-icicle-kit.dtb	2	dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += microchip-mpfs-icicle-kit.dtb
		3	obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

arch/riscv/boot/dts/sifive/Makefile+1−0

@@ -1,3 +1,4 @@
1	# SPDX-License-Identifier: GPL-2.0	1	# SPDX-License-Identifier: GPL-2.0
2	dtb-$(CONFIG_SOC_SIFIVE) += hifive-unleashed-a00.dtb \	2	dtb-$(CONFIG_SOC_SIFIVE) += hifive-unleashed-a00.dtb \
3	hifive-unmatched-a00.dtb	3	hifive-unmatched-a00.dtb
		4	obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

arch/riscv/boot/dts/sifive/fu740-c000.dtsi+1−1

@@ -273,7 +273,7 @@ · 272 unmodified lines
273	cache-size = <2097152>;	273	cache-size = <2097152>;
274	cache-unified;	274	cache-unified;
275	interrupt-parent = <&plic0>;	275	interrupt-parent = <&plic0>;
276	interrupts = <19 20 21 22>;	276	interrupts = <19 21 22 20>;
277	reg = <0x0 0x2010000 0x0 0x1000>;	277	reg = <0x0 0x2010000 0x0 0x1000>;
278	};	278	};
279	gpio: gpio@10060000 {	279	gpio: gpio@10060000 {

arch/riscv/errata/sifive/Makefile+1−1

@@ -1,2 +1,2 @@
1	obj-y += errata_cip_453.o	1	obj-$(CONFIG_ERRATA_SIFIVE_CIP_453) += errata_cip_453.o
2	obj-y += errata.o	2	obj-y += errata.o

arch/riscv/include/asm/alternative-macros.h+2−2

@@ -51,7 +51,7 @@ · 50 unmodified lines
51	REG_ASM " " newlen "\n" \	51	REG_ASM " " newlen "\n" \
52	".word " errata_id "\n"	52	".word " errata_id "\n"
53		53
54	#define ALT_NEW_CONSTENT(vendor_id, errata_id, enable, new_c) \	54	#define ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c) \
55	".if " __stringify(enable) " == 1\n" \	55	".if " __stringify(enable) " == 1\n" \
56	".pushsection .alternative, \"a\"\n" \	56	".pushsection .alternative, \"a\"\n" \
57	ALT_ENTRY("886b", "888f", __stringify(vendor_id), __stringify(errata_id), "889f - 888f") \	57	ALT_ENTRY("886b", "888f", __stringify(vendor_id), __stringify(errata_id), "889f - 888f") \
@@ -69,7 +69,7 @@ · 11 unmodified lines
69	"886 :\n" \	69	"886 :\n" \
70	old_c "\n" \	70	old_c "\n" \
71	"887 :\n" \	71	"887 :\n" \
72	ALT_NEW_CONSTENT(vendor_id, errata_id, enable, new_c)	72	ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c)
73		73
74	#define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, CONFIG_k) \	74	#define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, CONFIG_k) \
75	__ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, IS_ENABLED(CONFIG_k))	75	__ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, IS_ENABLED(CONFIG_k))

arch/riscv/include/asm/kexec.h+2−2

@@ -42,8 +42,8 @@ struct kimage_arch { · 41 unmodified lines
42	unsigned long fdt_addr;	42	unsigned long fdt_addr;
43	};	43	};
44		44
45	const extern unsigned char riscv_kexec_relocate[];	45	extern const unsigned char riscv_kexec_relocate[];
46	const extern unsigned int riscv_kexec_relocate_size;	46	extern const unsigned int riscv_kexec_relocate_size;
47		47
48	typedef void (*riscv_kexec_method)(unsigned long first_ind_entry,	48	typedef void (*riscv_kexec_method)(unsigned long first_ind_entry,
49	unsigned long jump_addr,	49	unsigned long jump_addr,

arch/riscv/include/asm/pgtable.h+2−3

 #define BPF_JIT_REGION_SIZE	(SZ_128M)
 #ifdef CONFIG_64BIT
-/* KASLR should leave at least 128MB for BPF after the kernel */
+#define BPF_JIT_REGION_START	(BPF_JIT_REGION_END - BPF_JIT_REGION_SIZE)
-#define BPF_JIT_REGION_START	PFN_ALIGN((unsigned long)&_end)
+#define BPF_JIT_REGION_END	(MODULES_END)
-#define BPF_JIT_REGION_END	(BPF_JIT_REGION_START + BPF_JIT_REGION_SIZE)
 #else
 #define BPF_JIT_REGION_START	(PAGE_OFFSET - BPF_JIT_REGION_SIZE)
 #define BPF_JIT_REGION_END	(VMALLOC_END)

arch/riscv/kernel/machine_kexec.c+6−5

 #include <asm/set_memory.h>	/* For set_memory_x() */
 #include <linux/compiler.h>	/* For unreachable() */
 #include <linux/cpu.h>		/* For cpu_down() */
+#include <linux/reboot.h>
-/**
+/*
  * kexec_image_info - Print received image details
  */
 static void
 	}
 }
-/**
+/*
  * machine_kexec_prepare - Initialize kexec
  *
  * This function is called from do_kexec_load, when the user has
 }
-/**
+/*
  * machine_kexec_cleanup - Cleanup any leftovers from
  *			   machine_kexec_prepare
  *
 #endif
 }
-/**
+/*
  * machine_crash_shutdown - Prepare to kexec after a kernel crash
  *
  * This function is called by crash_kexec just before machine_kexec
 	pr_info("Starting crashdump kernel...\n");
 }
-/**
+/*
  * machine_kexec - Jump to the loaded kimage
  *
  * This function is called by kernel_kexec which is called by the

arch/riscv/kernel/probes/kprobes.c+2−0

 	return 0;
 }
+#ifdef CONFIG_MMU
 void *alloc_insn_page(void)
 {
 	return  __vmalloc_node_range(PAGE_SIZE, 1, VMALLOC_START, VMALLOC_END,
 				     VM_FLUSH_RESET_PERMS, NUMA_NO_NODE,
 				     __builtin_return_address(0));
 }
+#endif
 /* install breakpoint in text */
 void __kprobes arch_arm_kprobe(struct kprobe *p)

arch/riscv/kernel/setup.c+2−2

@@ -231,13 +231,13 @@ static void __init init_resources(void) · 230 unmodified lines
231		231
232	/* Clean-up any unused pre-allocated resources */	232	/* Clean-up any unused pre-allocated resources */
233	mem_res_sz = (num_resources - res_idx + 1) * sizeof(*mem_res);	233	mem_res_sz = (num_resources - res_idx + 1) * sizeof(*mem_res);
234	memblock_free((phys_addr_t) mem_res, mem_res_sz);	234	memblock_free(__pa(mem_res), mem_res_sz);
235	return;	235	return;
236		236
237	error:	237	error:
238	/* Better an empty resource tree than an inconsistent one */	238	/* Better an empty resource tree than an inconsistent one */
239	release_child_resources(&iomem_resource);	239	release_child_resources(&iomem_resource);
240	memblock_free((phys_addr_t) mem_res, mem_res_sz);	240	memblock_free(__pa(mem_res), mem_res_sz);
241	}	241	}
242		242
243		243

arch/riscv/kernel/stacktrace.c+7−7

 		fp = frame_pointer(regs);
 		sp = user_stack_pointer(regs);
 		pc = instruction_pointer(regs);
-	} else if (task == NULL || task == current) {
+	} else if (task == current) {
-		fp = (unsigned long)__builtin_frame_address(0);
+		fp = (unsigned long)__builtin_frame_address(1);
-		sp = sp_in_global;
+		sp = (unsigned long)__builtin_frame_address(0);
-		pc = (unsigned long)walk_stackframe;
+		pc = (unsigned long)__builtin_return_address(0);
 	} else {
 		/* task blocked in __switch_to */
 		fp = task->thread.s[0];
 	return true;
 }
-void dump_backtrace(struct pt_regs *regs, struct task_struct *task,
+noinline void dump_backtrace(struct pt_regs *regs, struct task_struct *task,
 		    const char *loglvl)
 {
-	pr_cont("%sCall Trace:\n", loglvl);
 	walk_stackframe(task, regs, print_trace_address, (void *)loglvl);
 }
 void show_stack(struct task_struct *task, unsigned long *sp, const char *loglvl)
 {
+	pr_cont("%sCall Trace:\n", loglvl);
 	dump_backtrace(NULL, task, loglvl);
 }
 #ifdef CONFIG_STACKTRACE
-void arch_stack_walk(stack_trace_consume_fn consume_entry, void *cookie,
+noinline void arch_stack_walk(stack_trace_consume_fn consume_entry, void *cookie,
 		     struct task_struct *task, struct pt_regs *regs)
 {
 	walk_stackframe(task, regs, consume_entry, cookie);

arch/riscv/kernel/traps.c+9−4

 	}
 }
+#if defined (CONFIG_XIP_KERNEL) && defined (CONFIG_RISCV_ERRATA_ALTERNATIVE)
+#define __trap_section		__section(".xip.traps")
+#else
+#define __trap_section
+#endif
 #define DO_ERROR_INFO(name, signo, code, str)				\
-asmlinkage __visible void name(struct pt_regs *regs)			\
+asmlinkage __visible __trap_section void name(struct pt_regs *regs)	\
 {									\
 	do_trap_error(regs, signo, code, regs->epc, "Oops - " str);	\
 }
 int handle_misaligned_load(struct pt_regs *regs);
 int handle_misaligned_store(struct pt_regs *regs);
-asmlinkage void do_trap_load_misaligned(struct pt_regs *regs)
+asmlinkage void __trap_section do_trap_load_misaligned(struct pt_regs *regs)
 {
 	if (!handle_misaligned_load(regs))
 		return;
 		      "Oops - load address misaligned");
 }
-asmlinkage void do_trap_store_misaligned(struct pt_regs *regs)
+asmlinkage void __trap_section do_trap_store_misaligned(struct pt_regs *regs)
 {
 	if (!handle_misaligned_store(regs))
 		return;
 	return GET_INSN_LENGTH(insn);
 }
-asmlinkage __visible void do_trap_break(struct pt_regs *regs)
+asmlinkage __visible __trap_section void do_trap_break(struct pt_regs *regs)
 {
 #ifdef CONFIG_KPROBES
 	if (kprobe_single_step_handler(regs))

arch/riscv/kernel/vmlinux-xip.lds.S+14−1

@@ -99,9 +99,22 @@ SECTIONS · 98 unmodified lines
99	}	99	}
100	PERCPU_SECTION(L1_CACHE_BYTES)	100	PERCPU_SECTION(L1_CACHE_BYTES)
101		101
102	. = ALIGN(PAGE_SIZE);	102	. = ALIGN(8);
		103	.alternative : {
		104	__alt_start = .;
		105	*(.alternative)
		106	__alt_end = .;
		107	}
103	__init_end = .;	108	__init_end = .;
104		109
		110	. = ALIGN(16);
		111	.xip.traps : {
		112	__xip_traps_start = .;
		113	*(.xip.traps)
		114	__xip_traps_end = .;
		115	}
		116
		117	. = ALIGN(PAGE_SIZE);
105	.sdata : {	118	.sdata : {
106	__global_pointer$ = . + 0x800;	119	__global_pointer$ = . + 0x800;
107	(.sdata)	120	(.sdata)

arch/riscv/mm/init.c+6−2

 	unsigned long init_data_start = (unsigned long)__init_data_begin;
 	unsigned long rodata_start = (unsigned long)__start_rodata;
 	unsigned long data_start = (unsigned long)_data;
-	unsigned long max_low = (unsigned long)(__va(PFN_PHYS(max_low_pfn)));
+#if defined(CONFIG_64BIT) && defined(CONFIG_MMU)
+	unsigned long end_va = kernel_virt_addr + load_sz;
+#else
+	unsigned long end_va = (unsigned long)(__va(PFN_PHYS(max_low_pfn)));
+#endif
 	set_memory_ro(text_start, (init_text_start - text_start) >> PAGE_SHIFT);
 	set_memory_ro(init_text_start, (init_data_start - init_text_start) >> PAGE_SHIFT);
 	set_memory_nx(init_data_start, (rodata_start - init_data_start) >> PAGE_SHIFT);
 	/* rodata section is marked readonly in mark_rodata_ro */
 	set_memory_nx(rodata_start, (data_start - rodata_start) >> PAGE_SHIFT);
-	set_memory_nx(data_start, (max_low - data_start) >> PAGE_SHIFT);
+	set_memory_nx(data_start, (end_va - data_start) >> PAGE_SHIFT);
 }
 void mark_rodata_ro(void)

arch/riscv/mm/kasan_init.c+5−5

@@ -169,7 +169,7 @@ static void __init kasan_shallow_populate(void start, void end) · 168 unmodified lines
169		169
170	void __init kasan_init(void)	170	void __init kasan_init(void)
171	{	171	{
172	phys_addr_t _start, _end;	172	phys_addr_t p_start, p_end;
173	u64 i;	173	u64 i;
174		174
175	/*	175	/*
@@ -189,9 +189,9 @@ void __init kasan_init(void) · 13 unmodified lines
189	(void )kasan_mem_to_shadow((void )VMALLOC_END));	189	(void )kasan_mem_to_shadow((void )VMALLOC_END));
190		190
191	/* Populate the linear mapping */	191	/* Populate the linear mapping */
192	for_each_mem_range(i, &_start, &_end) {	192	for_each_mem_range(i, &p_start, &p_end) {
193	void start = (void )__va(_start);	193	void start = (void )__va(p_start);
194	void end = (void )__va(_end);	194	void end = (void )__va(p_end);
195		195
196	if (start >= end)	196	if (start >= end)
197	break;	197	break;
@@ -201,7 +201,7 @@ void __init kasan_init(void) · 3 unmodified lines
201		201
202	/* Populate kernel, BPF, modules mapping */	202	/* Populate kernel, BPF, modules mapping */
203	kasan_populate(kasan_mem_to_shadow((const void *)MODULES_VADDR),	203	kasan_populate(kasan_mem_to_shadow((const void *)MODULES_VADDR),
204	kasan_mem_to_shadow((const void *)BPF_JIT_REGION_END));	204	kasan_mem_to_shadow((const void *)MODULES_VADDR + SZ_2G));
205		205
206	for (i = 0; i < PTRS_PER_PTE; i++)	206	for (i = 0; i < PTRS_PER_PTE; i++)
207	set_pte(&kasan_early_shadow_pte[i],	207	set_pte(&kasan_early_shadow_pte[i],

arch/s390/kernel/entry.S+2−2

@@ -651,9 +651,9 @@ ENDPROC(stack_overflow) · 650 unmodified lines
651	.Lcleanup_sie_mcck:	651	.Lcleanup_sie_mcck:
652	larl %r13,.Lsie_entry	652	larl %r13,.Lsie_entry
653	slgr %r9,%r13	653	slgr %r9,%r13
654	larl %r13,.Lsie_skip	654	lghi %r13,.Lsie_skip - .Lsie_entry
655	clgr %r9,%r13	655	clgr %r9,%r13
656	jh .Lcleanup_sie_int	656	jhe .Lcleanup_sie_int
657	oi __LC_CPU_FLAGS+7, _CIF_MCCK_GUEST	657	oi __LC_CPU_FLAGS+7, _CIF_MCCK_GUEST
658	.Lcleanup_sie_int:	658	.Lcleanup_sie_int:
659	BPENTER __SF_SIE_FLAGS(%r15),(_TIF_ISOLATE_BP\|_TIF_ISOLATE_BP_GUEST)	659	BPENTER __SF_SIE_FLAGS(%r15),(_TIF_ISOLATE_BP\|_TIF_ISOLATE_BP_GUEST)

arch/x86/Makefile+3−2

@@ -200,8 +200,9 @@ endif · 199 unmodified lines
200	KBUILD_LDFLAGS += -m elf_$(UTS_MACHINE)	200	KBUILD_LDFLAGS += -m elf_$(UTS_MACHINE)
201		201
202	ifdef CONFIG_LTO_CLANG	202	ifdef CONFIG_LTO_CLANG
203	KBUILD_LDFLAGS += -plugin-opt=-code-model=kernel \	203	ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 130000; echo $$?),0)
204	-plugin-opt=-stack-alignment=$(if $(CONFIG_X86_32),4,8)	204	KBUILD_LDFLAGS += -plugin-opt=-stack-alignment=$(if $(CONFIG_X86_32),4,8)
		205	endif
205	endif	206	endif
206		207
207	ifdef CONFIG_X86_NEED_RELOCS	208	ifdef CONFIG_X86_NEED_RELOCS

arch/x86/events/intel/uncore_snbep.c+6−3

 						die_id = i;
 					else
 						die_id = topology_phys_to_logical_pkg(i);
+					if (die_id < 0)
+						die_id = -ENODEV;
 					map->pbus_to_dieid[bus] = die_id;
 					break;
 				}
 			i = -1;
 			if (reverse) {
 				for (bus = 255; bus >= 0; bus--) {
-					if (map->pbus_to_dieid[bus] >= 0)
+					if (map->pbus_to_dieid[bus] != -1)
 						i = map->pbus_to_dieid[bus];
 					else
 						map->pbus_to_dieid[bus] = i;
 				}
 			} else {
 				for (bus = 0; bus <= 255; bus++) {
-					if (map->pbus_to_dieid[bus] >= 0)
+					if (map->pbus_to_dieid[bus] != -1)
 						i = map->pbus_to_dieid[bus];
 					else
 						map->pbus_to_dieid[bus] = i;
 	.perf_ctr	= SNR_M2M_PCI_PMON_CTR0,
 	.event_ctl	= SNR_M2M_PCI_PMON_CTL0,
 	.event_mask	= SNBEP_PMON_RAW_EVENT_MASK,
+	.event_mask_ext	= SNR_M2M_PCI_PMON_UMASK_EXT,
 	.box_ctl	= SNR_M2M_PCI_PMON_BOX_CTL,
 	.ops		= &snr_m2m_uncore_pci_ops,
-	.format_group	= &skx_uncore_format_group,
+	.format_group	= &snr_m2m_uncore_format_group,
 };
 static struct attribute *icx_upi_uncore_formats_attr[] = {

arch/x86/include/asm/apic.h+1−0

@@ -174,6 +174,7 @@ static inline int apic_is_clustered_box(void) · 173 unmodified lines
174	extern int setup_APIC_eilvt(u8 lvt_off, u8 vector, u8 msg_type, u8 mask);	174	extern int setup_APIC_eilvt(u8 lvt_off, u8 vector, u8 msg_type, u8 mask);
175	extern void lapic_assign_system_vectors(void);	175	extern void lapic_assign_system_vectors(void);
176	extern void lapic_assign_legacy_vector(unsigned int isairq, bool replace);	176	extern void lapic_assign_legacy_vector(unsigned int isairq, bool replace);
		177	extern void lapic_update_legacy_vectors(void);
177	extern void lapic_online(void);	178	extern void lapic_online(void);
178	extern void lapic_offline(void);	179	extern void lapic_offline(void);
179	extern bool apic_needs_pit(void);	180	extern bool apic_needs_pit(void);

arch/x86/include/asm/disabled-features.h+2−5

 # define DISABLE_PTI		(1 << (X86_FEATURE_PTI & 31))
 #endif
-#ifdef CONFIG_IOMMU_SUPPORT
+/* Force disable because it's broken beyond repair */
-# define DISABLE_ENQCMD	0
+#define DISABLE_ENQCMD		(1 << (X86_FEATURE_ENQCMD & 31))
-#else
-# define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31))
-#endif
 #ifdef CONFIG_X86_SGX
 # define DISABLE_SGX	0

arch/x86/include/asm/fpu/api.h+1−5

@@ -106,10 +106,6 @@ extern int cpu_has_xfeatures(u64 xfeatures_mask, const char **feature_name); · 105 unmodified lines
106	*/	106	*/
107	#define PASID_DISABLED 0	107	#define PASID_DISABLED 0
108		108
109	#ifdef CONFIG_IOMMU_SUPPORT
110	/* Update current's PASID MSR/state by mm's PASID. */
111	void update_pasid(void);
112	#else
113	static inline void update_pasid(void) { }	109	static inline void update_pasid(void) { }
114	#endif	110
115	#endif /* _ASM_X86_FPU_API_H */	111	#endif /* _ASM_X86_FPU_API_H */

arch/x86/include/asm/fpu/internal.h+10−10

 	 * PKRU state is switched eagerly because it needs to be valid before we
 	 * return to userland e.g. for a copy_to_user() operation.
 	 */
-	if (current->mm) {
+	if (!(current->flags & PF_KTHREAD)) {
+		/*
+		 * If the PKRU bit in xsave.header.xfeatures is not set,
+		 * then the PKRU component was in init state, which means
+		 * XRSTOR will set PKRU to 0. If the bit is not set then
+		 * get_xsave_addr() will return NULL because the PKRU value
+		 * in memory is not valid. This means pkru_val has to be
+		 * set to 0 and not to init_pkru_value.
+		 */
 		pk = get_xsave_addr(&new_fpu->state.xsave, XFEATURE_PKRU);
-		if (pk)
+		pkru_val = pk ? pk->pkru : 0;
-			pkru_val = pk->pkru;
 	}
 	__write_pkru(pkru_val);
-	/*
-	 * Expensive PASID MSR write will be avoided in update_pasid() because
-	 * TIF_NEED_FPU_LOAD was set. And the PASID state won't be updated
-	 * unless it's different from mm->pasid to reduce overhead.
-	 */
-	update_pasid();
 }
 #endif /* _ASM_X86_FPU_INTERNAL_H */

arch/x86/include/asm/kvm-x86-ops.h+1−0

@@ -99,6 +99,7 @@ KVM_X86_OP_NULL(post_block) · 98 unmodified lines
99	KVM_X86_OP_NULL(vcpu_blocking)	99	KVM_X86_OP_NULL(vcpu_blocking)
100	KVM_X86_OP_NULL(vcpu_unblocking)	100	KVM_X86_OP_NULL(vcpu_unblocking)
101	KVM_X86_OP_NULL(update_pi_irte)	101	KVM_X86_OP_NULL(update_pi_irte)
		102	KVM_X86_OP_NULL(start_assignment)
102	KVM_X86_OP_NULL(apicv_post_state_restore)	103	KVM_X86_OP_NULL(apicv_post_state_restore)
103	KVM_X86_OP_NULL(dy_apicv_has_pending_interrupt)	104	KVM_X86_OP_NULL(dy_apicv_has_pending_interrupt)
104	KVM_X86_OP_NULL(set_hv_timer)	105	KVM_X86_OP_NULL(set_hv_timer)

arch/x86/include/asm/kvm_host.h+1−0

@@ -1352,6 +1352,7 @@ struct kvm_x86_ops { · 1351 unmodified lines
1352		1352
1353	int (update_pi_irte)(struct kvm kvm, unsigned int host_irq,	1353	int (update_pi_irte)(struct kvm kvm, unsigned int host_irq,
1354	uint32_t guest_irq, bool set);	1354	uint32_t guest_irq, bool set);
		1355	void (start_assignment)(struct kvm kvm);
1355	void (apicv_post_state_restore)(struct kvm_vcpu vcpu);	1356	void (apicv_post_state_restore)(struct kvm_vcpu vcpu);
1356	bool (dy_apicv_has_pending_interrupt)(struct kvm_vcpu vcpu);	1357	bool (dy_apicv_has_pending_interrupt)(struct kvm_vcpu vcpu);
1357		1358

arch/x86/include/asm/thermal.h+3−1

 #define _ASM_X86_THERMAL_H
 #ifdef CONFIG_X86_THERMAL_VECTOR
+void therm_lvt_init(void);
 void intel_init_thermal(struct cpuinfo_x86 *c);
 bool x86_thermal_enabled(void);
 void intel_thermal_interrupt(void);
 #else
-static inline void intel_init_thermal(struct cpuinfo_x86 *c) { }
+static inline void therm_lvt_init(void)				{ }
+static inline void intel_init_thermal(struct cpuinfo_x86 *c)	{ }
 #endif
 #endif /* _ASM_X86_THERMAL_H */

arch/x86/kernel/alternative.c+46−18

@@ -182,42 +182,70 @@ done: · 181 unmodified lines
182	n_dspl, (unsigned long)orig_insn + n_dspl + repl_len);	182	n_dspl, (unsigned long)orig_insn + n_dspl + repl_len);
183	}	183	}
184		184
		185	/*
		186	* optimize_nops_range() - Optimize a sequence of single byte NOPs (0x90)
		187	*
		188	* @instr: instruction byte stream
		189	* @instrlen: length of the above
		190	* @off: offset within @instr where the first NOP has been detected
		191	*
		192	* Return: number of NOPs found (and replaced).
		193	*/
		194	static __always_inline int optimize_nops_range(u8 *instr, u8 instrlen, int off)
		195	{
		196	unsigned long flags;
		197	int i = off, nnops;
		198
		199	while (i < instrlen) {
		200	if (instr[i] != 0x90)
		201	break;
		202
		203	i++;
		204	}
		205
		206	nnops = i - off;
		207
		208	if (nnops <= 1)
		209	return nnops;
		210
		211	local_irq_save(flags);
		212	add_nops(instr + off, nnops);
		213	local_irq_restore(flags);
		214
		215	DUMP_BYTES(instr, instrlen, "%px: [%d:%d) optimized NOPs: ", instr, off, i);
		216
		217	return nnops;
		218	}
		219
185	/*	220	/*
186	* "noinline" to cause control flow change and thus invalidate I$ and	221	* "noinline" to cause control flow change and thus invalidate I$ and
187	* cause refetch after modification.	222	* cause refetch after modification.
188	*/	223	*/
189	static void __init_or_module noinline optimize_nops(struct alt_instr a, u8 instr)	224	static void __init_or_module noinline optimize_nops(struct alt_instr a, u8 instr)
190	{	225	{
191	unsigned long flags;
192	struct insn insn;	226	struct insn insn;
193	int nop, i = 0;	227	int i = 0;
194		228
195	/*	229	/*
196	* Jump over the non-NOP insns, the remaining bytes must be single-byte	230	* Jump over the non-NOP insns and optimize single-byte NOPs into bigger
197	* NOPs, optimize them.	231	* ones.
198	*/	232	*/
199	for (;;) {	233	for (;;) {
200	if (insn_decode_kernel(&insn, &instr[i]))	234	if (insn_decode_kernel(&insn, &instr[i]))
201	return;	235	return;
202		236
		237	/*
		238	* See if this and any potentially following NOPs can be
		239	* optimized.
		240	*/
203	if (insn.length == 1 && insn.opcode.bytes[0] == 0x90)	241	if (insn.length == 1 && insn.opcode.bytes[0] == 0x90)
204	break;	242	i += optimize_nops_range(instr, a->instrlen, i);
205		243	else
206	if ((i += insn.length) >= a->instrlen)	244	i += insn.length;
207	return;
208	}
209		245
210	for (nop = i; i < a->instrlen; i++) {	246	if (i >= a->instrlen)
211	if (WARN_ONCE(instr[i] != 0x90, "Not a NOP at 0x%px\n", &instr[i]))
212	return;	247	return;
213	}	248	}
214
215	local_irq_save(flags);
216	add_nops(instr + nop, i - nop);
217	local_irq_restore(flags);
218
219	DUMP_BYTES(instr, a->instrlen, "%px: [%d:%d) optimized NOPs: ",
220	instr, nop, a->instrlen);
221	}	249	}
222		250
223	/*	251	/*

arch/x86/kernel/apic/apic.c+1−0

@@ -2604,6 +2604,7 @@ static void __init apic_bsp_setup(bool upmode) · 2603 unmodified lines
2604	end_local_APIC_setup();	2604	end_local_APIC_setup();
2605	irq_remap_enable_fault_handling();	2605	irq_remap_enable_fault_handling();
2606	setup_IO_APIC();	2606	setup_IO_APIC();
		2607	lapic_update_legacy_vectors();
2607	}	2608	}
2608		2609
2609	#ifdef CONFIG_UP_LATE_INIT	2610	#ifdef CONFIG_UP_LATE_INIT

arch/x86/kernel/apic/vector.c+20−0

@@ -738,6 +738,26 @@ void lapic_assign_legacy_vector(unsigned int irq, bool replace) · 737 unmodified lines
738	irq_matrix_assign_system(vector_matrix, ISA_IRQ_VECTOR(irq), replace);	738	irq_matrix_assign_system(vector_matrix, ISA_IRQ_VECTOR(irq), replace);
739	}	739	}
740		740
		741	void __init lapic_update_legacy_vectors(void)
		742	{
		743	unsigned int i;
		744
		745	if (IS_ENABLED(CONFIG_X86_IO_APIC) && nr_ioapics > 0)
		746	return;
		747
		748	/*
		749	* If the IO/APIC is disabled via config, kernel command line or
		750	* lack of enumeration then all legacy interrupts are routed
		751	* through the PIC. Make sure that they are marked as legacy
		752	* vectors. PIC_CASCADE_IRQ has already been marked in
		753	* lapic_assign_system_vectors().
		754	*/
		755	for (i = 0; i < nr_legacy_irqs(); i++) {
		756	if (i != PIC_CASCADE_IR)
		757	lapic_assign_legacy_vector(i, true);
		758	}
		759	}
		760
741	void __init lapic_assign_system_vectors(void)	761	void __init lapic_assign_system_vectors(void)
742	{	762	{
743	unsigned int i, vector = 0;	763	unsigned int i, vector = 0;

arch/x86/kernel/cpu/perfctr-watchdog.c+2−2

@@ -63,7 +63,7 @@ static inline unsigned int nmi_perfctr_msr_to_bit(unsigned int msr) · 62 unmodified lines
63	case 15:	63	case 15:
64	return msr - MSR_P4_BPU_PERFCTR0;	64	return msr - MSR_P4_BPU_PERFCTR0;
65	}	65	}
66	fallthrough;	66	break;
67	case X86_VENDOR_ZHAOXIN:	67	case X86_VENDOR_ZHAOXIN:
68	case X86_VENDOR_CENTAUR:	68	case X86_VENDOR_CENTAUR:
69	return msr - MSR_ARCH_PERFMON_PERFCTR0;	69	return msr - MSR_ARCH_PERFMON_PERFCTR0;
@@ -96,7 +96,7 @@ static inline unsigned int nmi_evntsel_msr_to_bit(unsigned int msr) · 26 unmodified lines
96	case 15:	96	case 15:
97	return msr - MSR_P4_BSU_ESCR0;	97	return msr - MSR_P4_BSU_ESCR0;
98	}	98	}
99	fallthrough;	99	break;
100	case X86_VENDOR_ZHAOXIN:	100	case X86_VENDOR_ZHAOXIN:
101	case X86_VENDOR_CENTAUR:	101	case X86_VENDOR_CENTAUR:
102	return msr - MSR_ARCH_PERFMON_EVENTSEL0;	102	return msr - MSR_ARCH_PERFMON_EVENTSEL0;

arch/x86/kernel/cpu/sgx/virt.c+1−0

@@ -212,6 +212,7 @@ static int sgx_vepc_release(struct inode inode, struct file file) · 211 unmodified lines
212	list_splice_tail(&secs_pages, &zombie_secs_pages);	212	list_splice_tail(&secs_pages, &zombie_secs_pages);
213	mutex_unlock(&zombie_secs_pages_lock);	213	mutex_unlock(&zombie_secs_pages_lock);
214		214
		215	xa_destroy(&vepc->page_array);
215	kfree(vepc);	216	kfree(vepc);
216		217
217	return 0;	218	return 0;

arch/x86/kernel/fpu/signal.c+35−19

 		return 0;
 	}
-	if (!access_ok(buf, size))
+	if (!access_ok(buf, size)) {
-		return -EACCES;
+		ret = -EACCES;
+		goto out;
+	}
-	if (!static_cpu_has(X86_FEATURE_FPU))
+	if (!static_cpu_has(X86_FEATURE_FPU)) {
-		return fpregs_soft_set(current, NULL,
+		ret = fpregs_soft_set(current, NULL, 0,
-				       0, sizeof(struct user_i387_ia32_struct),
+				      sizeof(struct user_i387_ia32_struct),
-				       NULL, buf) != 0;
+				      NULL, buf);
+		goto out;
+	}
 	if (use_xsave()) {
 		struct _fpx_sw_bytes fx_sw_user;
 			fpregs_unlock();
 			return 0;
 		}
+		/*
+		 * The above did an FPU restore operation, restricted to
+		 * the user portion of the registers, and failed, but the
+		 * microcode might have modified the FPU registers
+		 * nevertheless.
+		 *
+		 * If the FPU registers do not belong to current, then
+		 * invalidate the FPU register state otherwise the task might
+		 * preempt current and return to user space with corrupted
+		 * FPU registers.
+		 *
+		 * In case current owns the FPU registers then no further
+		 * action is required. The fixup below will handle it
+		 * correctly.
+		 */
+		if (test_thread_flag(TIF_NEED_FPU_LOAD))
+			__cpu_invalidate_fpregs_state();
 		fpregs_unlock();
 	} else {
 		/*
 		 */
 		ret = __copy_from_user(&env, buf, sizeof(env));
 		if (ret)
-			goto err_out;
+			goto out;
 		envp = &env;
 	}
 	if (use_xsave() && !fx_only) {
 		u64 init_bv = xfeatures_mask_user() & ~user_xfeatures;
-		if (using_compacted_format()) {
+		ret = copy_user_to_xstate(&fpu->state.xsave, buf_fx);
-			ret = copy_user_to_xstate(&fpu->state.xsave, buf_fx);
-		} else {
-			ret = __copy_from_user(&fpu->state.xsave, buf_fx, state_size);
-			if (!ret && state_size > offsetof(struct xregs_state, header))
-				ret = validate_user_xstate_header(&fpu->state.xsave.header);
-		}
 		if (ret)
-			goto err_out;
+			goto out;
 		sanitize_restored_user_xstate(&fpu->state, envp, user_xfeatures,
 					      fx_only);
 		ret = __copy_from_user(&fpu->state.fxsave, buf_fx, state_size);
 		if (ret) {
 			ret = -EFAULT;
-			goto err_out;
+			goto out;
 		}
 		sanitize_restored_user_xstate(&fpu->state, envp, user_xfeatures,
 	} else {
 		ret = __copy_from_user(&fpu->state.fsave, buf_fx, state_size);
 		if (ret)
-			goto err_out;
+			goto out;
 		fpregs_lock();
 		ret = copy_kernel_to_fregs_err(&fpu->state.fsave);
 		fpregs_deactivate(fpu);
 	fpregs_unlock();
-err_out:
+out:
 	if (ret)
 		fpu__clear_user_states(fpu);
 	return ret;

arch/x86/kernel/fpu/xstate.c+0−57

@@ -1402,60 +1402,3 @@ int proc_pid_arch_status(struct seq_file m, struct pid_namespace ns, · 1401 unmodified lines
1402	return 0;	1402	return 0;
1403	}	1403	}
1404	#endif /* CONFIG_PROC_PID_ARCH_STATUS */	1404	#endif /* CONFIG_PROC_PID_ARCH_STATUS */
1405
1406	#ifdef CONFIG_IOMMU_SUPPORT
1407	void update_pasid(void)
1408	{
1409	u64 pasid_state;
1410	u32 pasid;
1411
1412	if (!cpu_feature_enabled(X86_FEATURE_ENQCMD))
1413	return;
1414
1415	if (!current->mm)
1416	return;
1417
1418	pasid = READ_ONCE(current->mm->pasid);
1419	/* Set the valid bit in the PASID MSR/state only for valid pasid. */
1420	pasid_state = pasid == PASID_DISABLED ?
1421	pasid : pasid \| MSR_IA32_PASID_VALID;
1422
1423	/*
1424	* No need to hold fregs_lock() since the task's fpstate won't
1425	* be changed by others (e.g. ptrace) while the task is being
1426	* switched to or is in IPI.
1427	*/
1428	if (!test_thread_flag(TIF_NEED_FPU_LOAD)) {
1429	/* The MSR is active and can be directly updated. */
1430	wrmsrl(MSR_IA32_PASID, pasid_state);
1431	} else {
1432	struct fpu *fpu = &current->thread.fpu;
1433	struct ia32_pasid_state *ppasid_state;
1434	struct xregs_state *xsave;
1435
1436	/*
1437	* The CPU's xstate registers are not currently active. Just
1438	* update the PASID state in the memory buffer here. The
1439	* PASID MSR will be loaded when returning to user mode.
1440	*/
1441	xsave = &fpu->state.xsave;
1442	xsave->header.xfeatures \|= XFEATURE_MASK_PASID;
1443	ppasid_state = get_xsave_addr(xsave, XFEATURE_PASID);
1444	/*
1445	* Since XFEATURE_MASK_PASID is set in xfeatures, ppasid_state
1446	* won't be NULL and no need to check its value.
1447	*
1448	* Only update the task's PASID state when it's different
1449	* from the mm's pasid.
1450	*/
1451	if (ppasid_state->pasid != pasid_state) {
1452	/*
1453	* Invalid fpregs so that state restoring will pick up
1454	* the PASID state.
1455	*/
1456	__fpu_invalidate_fpregs_state(fpu);
1457	ppasid_state->pasid = pasid_state;
1458	}
1459	}
1460	}
1461	#endif /* CONFIG_IOMMU_SUPPORT */

arch/x86/kernel/setup.c+30−14

 #include <asm/pci-direct.h>
 #include <asm/prom.h>
 #include <asm/proto.h>
+#include <asm/thermal.h>
 #include <asm/unwind.h>
 #include <asm/vsyscall.h>
 #include <linux/vmalloc.h>
 	 * them from accessing certain memory ranges, namely anything below
 	 * 1M and in the pages listed in bad_pages[] above.
 	 *
-	 * To avoid these pages being ever accessed by SNB gfx devices
+	 * To avoid these pages being ever accessed by SNB gfx devices reserve
-	 * reserve all memory below the 1 MB mark and bad_pages that have
+	 * bad_pages that have not already been reserved at boot time.
-	 * not already been reserved at boot time.
+	 * All memory below the 1 MB mark is anyway reserved later during
+	 * setup_arch(), so there is no need to reserve it here.
 	 */
-	memblock_reserve(0, 1<<20);
 	for (i = 0; i < ARRAY_SIZE(bad_pages); i++) {
 		if (memblock_reserve(bad_pages[i], PAGE_SIZE))
 	 * The first 4Kb of memory is a BIOS owned area, but generally it is
 	 * not listed as such in the E820 table.
 	 *
-	 * Reserve the first memory page and typically some additional
+	 * Reserve the first 64K of memory since some BIOSes are known to
-	 * memory (64KiB by default) since some BIOSes are known to corrupt
+	 * corrupt low memory. After the real mode trampoline is allocated the
-	 * low memory. See the Kconfig help text for X86_RESERVE_LOW.
+	 * rest of the memory below 640k is reserved.
 	 *
 	 * In addition, make sure page 0 is always reserved because on
 	 * systems with L1TF its contents can be leaked to user processes.
 	 */
-	memblock_reserve(0, ALIGN(reserve_low, PAGE_SIZE));
+	memblock_reserve(0, SZ_64K);
 	early_reserve_initrd();
 	reserve_ibft_region();
 	reserve_bios_regions();
+	trim_snb_memory();
 }
 /*
 			(max_pfn_mapped<<PAGE_SHIFT) - 1);
 #endif
-	reserve_real_mode();
 	/*
-	 * Reserving memory causing GPU hangs on Sandy Bridge integrated
+	 * Find free memory for the real mode trampoline and place it
-	 * graphics devices should be done after we allocated memory under
+	 * there.
-	 * 1M for the real mode trampoline.
+	 * If there is not enough free memory under 1M, on EFI-enabled
+	 * systems there will be additional attempt to reclaim the memory
+	 * for the real mode trampoline at efi_free_boot_services().
+	 *
+	 * Unconditionally reserve the entire first 1M of RAM because
+	 * BIOSes are know to corrupt low memory and several
+	 * hundred kilobytes are not worth complex detection what memory gets
+	 * clobbered. Moreover, on machines with SandyBridge graphics or in
+	 * setups that use crashkernel the entire 1M is reserved anyway.
 	 */
-	trim_snb_memory();
+	reserve_real_mode();
 	init_mem_mapping();
 	x86_init.timers.wallclock_init();
+	/*
+	 * This needs to run before setup_local_APIC() which soft-disables the
+	 * local APIC temporarily and that masks the thermal LVT interrupt,
+	 * leading to softlockups on machines which have configured SMI
+	 * interrupt delivery.
+	 */
+	therm_lvt_init();
 	mcheck_init();
 	register_refined_jiffies(CLOCK_TICK_RATE);

arch/x86/kvm/cpuid.c+1−0

@@ -655,6 +655,7 @@ static int __do_cpuid_func_emulated(struct kvm_cpuid_array *array, u32 func) · 654 unmodified lines
655	if (kvm_cpu_cap_has(X86_FEATURE_RDTSCP))	655	if (kvm_cpu_cap_has(X86_FEATURE_RDTSCP))
656	entry->ecx = F(RDPID);	656	entry->ecx = F(RDPID);
657	++array->nent;	657	++array->nent;
		658	break;
658	default:	659	default:
659	break;	660	break;
660	}	661	}

arch/x86/kvm/emulate.c+3−2

 	return rc;
 }
-int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len)
+int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len, int emulation_type)
 {
 	int rc = X86EMUL_CONTINUE;
 	int mode = ctxt->mode;
 	ctxt->execute = opcode.u.execute;
-	if (unlikely(ctxt->ud) && likely(!(ctxt->d & EmulateOnUD)))
+	if (unlikely(emulation_type & EMULTYPE_TRAP_UD) &&
+	    likely(!(ctxt->d & EmulateOnUD)))
 		return EMULATION_FAILED;
 	if (unlikely(ctxt->d &

arch/x86/kvm/hyperv.c+8−0

 {
 	struct kvm_hv *hv = to_kvm_hv(kvm);
 	u64 gfn;
+	int idx;
 	if (hv->hv_tsc_page_status == HV_TSC_PAGE_BROKEN ||
 	    hv->hv_tsc_page_status == HV_TSC_PAGE_UNSET ||
 	gfn = hv->hv_tsc_page >> HV_X64_MSR_TSC_REFERENCE_ADDRESS_SHIFT;
 	hv->tsc_ref.tsc_sequence = 0;
+	/*
+	 * Take the srcu lock as memslots will be accessed to check the gfn
+	 * cache generation against the memslots generation.
+	 */
+	idx = srcu_read_lock(&kvm->srcu);
 	if (kvm_write_guest(kvm, gfn_to_gpa(gfn),
 			    &hv->tsc_ref, sizeof(hv->tsc_ref.tsc_sequence)))
 		hv->hv_tsc_page_status = HV_TSC_PAGE_BROKEN;
+	srcu_read_unlock(&kvm->srcu, idx);
 out_unlock:
 	mutex_unlock(&hv->hv_lock);

arch/x86/kvm/kvm_emulate.h+1−2

 	int interruptibility;
 	bool perm_ok; /* do not check permissions if true */
-	bool ud;	/* inject an #UD if host doesn't support insn */
 	bool tf;	/* TF value before instruction (after for syscall/sysret) */
 	bool have_exception;
 #define X86EMUL_MODE_HOST X86EMUL_MODE_PROT64
 #endif
-int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len);
+int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len, int emulation_type);
 bool x86_page_table_writing_insn(struct x86_emulate_ctxt *ctxt);
 #define EMULATION_FAILED -1
 #define EMULATION_OK 0

arch/x86/kvm/lapic.c+26−10

 	if (!apic_x2apic_mode(apic))
 		valid_reg_mask |= APIC_REG_MASK(APIC_ARBPRI);
+	if (alignment + len > 4)
+		return 1;
 	if (offset > 0x3f0 || !(valid_reg_mask & APIC_REG_MASK(offset)))
 		return 1;
 static void cancel_hv_timer(struct kvm_lapic *apic);
+static void cancel_apic_timer(struct kvm_lapic *apic)
+{
+	hrtimer_cancel(&apic->lapic_timer.timer);
+	preempt_disable();
+	if (apic->lapic_timer.hv_timer_in_use)
+		cancel_hv_timer(apic);
+	preempt_enable();
+}
 static void apic_update_lvtt(struct kvm_lapic *apic)
 {
 	u32 timer_mode = kvm_lapic_get_reg(apic, APIC_LVTT) &
 	if (apic->lapic_timer.timer_mode != timer_mode) {
 		if (apic_lvtt_tscdeadline(apic) != (timer_mode ==
 				APIC_LVT_TIMER_TSCDEADLINE)) {
-			hrtimer_cancel(&apic->lapic_timer.timer);
+			cancel_apic_timer(apic);
-			preempt_disable();
-			if (apic->lapic_timer.hv_timer_in_use)
-				cancel_hv_timer(apic);
-			preempt_enable();
 			kvm_lapic_set_reg(apic, APIC_TMICT, 0);
 			apic->lapic_timer.period = 0;
 			apic->lapic_timer.tscdeadline = 0;
 	guest_tsc = kvm_read_l1_tsc(vcpu, rdtsc());
 	apic->lapic_timer.advance_expire_delta = guest_tsc - tsc_deadline;
+	if (lapic_timer_advance_dynamic) {
+		adjust_lapic_timer_advance(vcpu, apic->lapic_timer.advance_expire_delta);
+		/*
+		 * If the timer fired early, reread the TSC to account for the
+		 * overhead of the above adjustment to avoid waiting longer
+		 * than is necessary.
+		 */
+		if (guest_tsc < tsc_deadline)
+			guest_tsc = kvm_read_l1_tsc(vcpu, rdtsc());
+	}
 	if (guest_tsc < tsc_deadline)
 		__wait_lapic_expire(vcpu, tsc_deadline - guest_tsc);
-	if (lapic_timer_advance_dynamic)
-		adjust_lapic_timer_advance(vcpu, apic->lapic_timer.advance_expire_delta);
 }
 void kvm_wait_lapic_expire(struct kvm_vcpu *vcpu)
 	}
 	atomic_inc(&apic->lapic_timer.pending);
-	kvm_make_request(KVM_REQ_PENDING_TIMER, vcpu);
+	kvm_make_request(KVM_REQ_UNBLOCK, vcpu);
 	if (from_timer_fn)
 		kvm_vcpu_kick(vcpu);
 }
 		if (apic_lvtt_tscdeadline(apic))
 			break;
-		hrtimer_cancel(&apic->lapic_timer.timer);
+		cancel_apic_timer(apic);
 		kvm_lapic_set_reg(apic, APIC_TMICT, val);
 		start_apic_timer(apic);
 		break;

arch/x86/kvm/mmu/mmu.c+25−1

@@ -4739,9 +4739,33 @@ static void init_kvm_softmmu(struct kvm_vcpu *vcpu) · 4738 unmodified lines
4739	context->inject_page_fault = kvm_inject_page_fault;	4739	context->inject_page_fault = kvm_inject_page_fault;
4740	}	4740	}
4741		4741
		4742	static union kvm_mmu_role kvm_calc_nested_mmu_role(struct kvm_vcpu *vcpu)
		4743	{
		4744	union kvm_mmu_role role = kvm_calc_shadow_root_page_role_common(vcpu, false);
		4745
		4746	/*
		4747	* Nested MMUs are used only for walking L2's gva->gpa, they never have
		4748	* shadow pages of their own and so "direct" has no meaning. Set it
		4749	* to "true" to try to detect bogus usage of the nested MMU.
		4750	*/
		4751	role.base.direct = true;
		4752
		4753	if (!is_paging(vcpu))
		4754	role.base.level = 0;
		4755	else if (is_long_mode(vcpu))
		4756	role.base.level = is_la57_mode(vcpu) ? PT64_ROOT_5LEVEL :
		4757	PT64_ROOT_4LEVEL;
		4758	else if (is_pae(vcpu))
		4759	role.base.level = PT32E_ROOT_LEVEL;
		4760	else
		4761	role.base.level = PT32_ROOT_LEVEL;
		4762
		4763	return role;
		4764	}
		4765
4742	static void init_kvm_nested_mmu(struct kvm_vcpu *vcpu)	4766	static void init_kvm_nested_mmu(struct kvm_vcpu *vcpu)
4743	{	4767	{
4744	union kvm_mmu_role new_role = kvm_calc_mmu_role_common(vcpu, false);	4768	union kvm_mmu_role new_role = kvm_calc_nested_mmu_role(vcpu);
4745	struct kvm_mmu *g_context = &vcpu->arch.nested_mmu;	4769	struct kvm_mmu *g_context = &vcpu->arch.nested_mmu;
4746		4770
4747	if (new_role.as_u64 == g_context->mmu_role.as_u64)	4771	if (new_role.as_u64 == g_context->mmu_role.as_u64)

arch/x86/kvm/mmu/paging_tmpl.h+9−5

 	gpa_t pte_gpa[PT_MAX_FULL_LEVELS];
 	pt_element_t __user *ptep_user[PT_MAX_FULL_LEVELS];
 	bool pte_writable[PT_MAX_FULL_LEVELS];
-	unsigned pt_access;
+	unsigned int pt_access[PT_MAX_FULL_LEVELS];
-	unsigned pte_access;
+	unsigned int pte_access;
 	gfn_t gfn;
 	struct x86_exception fault;
 };
 		}
 		walker->ptes[walker->level - 1] = pte;
+		/* Convert to ACC_*_MASK flags for struct guest_walker.  */
+		walker->pt_access[walker->level - 1] = FNAME(gpte_access)(pt_access ^ walk_nx_mask);
 	} while (!is_last_gpte(mmu, walker->level, pte));
 	pte_pkey = FNAME(gpte_pkeys)(vcpu, pte);
 	accessed_dirty = have_ad ? pte_access & PT_GUEST_ACCESSED_MASK : 0;
 	/* Convert to ACC_*_MASK flags for struct guest_walker.  */
-	walker->pt_access = FNAME(gpte_access)(pt_access ^ walk_nx_mask);
 	walker->pte_access = FNAME(gpte_access)(pte_access ^ walk_nx_mask);
 	errcode = permission_fault(vcpu, mmu, walker->pte_access, pte_pkey, access);
 	if (unlikely(errcode))
 	}
 	pgprintk("%s: pte %llx pte_access %x pt_access %x\n",
-		 __func__, (u64)pte, walker->pte_access, walker->pt_access);
+		 __func__, (u64)pte, walker->pte_access,
+		 walker->pt_access[walker->level - 1]);
 	return 1;
 error:
 	bool huge_page_disallowed = exec && nx_huge_page_workaround_enabled;
 	struct kvm_mmu_page *sp = NULL;
 	struct kvm_shadow_walk_iterator it;
-	unsigned direct_access, access = gw->pt_access;
+	unsigned int direct_access, access;
 	int top_level, level, req_level, ret;
 	gfn_t base_gfn = gw->gfn;
 		sp = NULL;
 		if (!is_shadow_present_pte(*it.sptep)) {
 			table_gfn = gw->table_gfn[it.level - 2];
+			access = gw->pt_access[it.level - 2];
 			sp = kvm_mmu_get_page(vcpu, table_gfn, addr, it.level-1,
 					      false, access);
 		}

arch/x86/kvm/mmu/tdp_mmu.c+3−3

@@ -1192,9 +1192,9 @@ bool kvm_tdp_mmu_set_spte_gfn(struct kvm kvm, struct kvm_gfn_range range) · 1191 unmodified lines
1192	}	1192	}
1193		1193
1194	/*	1194	/*
1195	* Remove write access from all the SPTEs mapping GFNs [start, end). If	1195	* Remove write access from all SPTEs at or above min_level that map GFNs
1196	* skip_4k is set, SPTEs that map 4k pages, will not be write-protected.	1196	* [start, end). Returns true if an SPTE has been changed and the TLBs need to
1197	* Returns true if an SPTE has been changed and the TLBs need to be flushed.	1197	* be flushed.
1198	*/	1198	*/
1199	static bool wrprot_gfn_range(struct kvm kvm, struct kvm_mmu_page root,	1199	static bool wrprot_gfn_range(struct kvm kvm, struct kvm_mmu_page root,
1200	gfn_t start, gfn_t end, int min_level)	1200	gfn_t start, gfn_t end, int min_level)

arch/x86/kvm/svm/avic.c+5−7

 #include "svm.h"
 /* enable / disable AVIC */
-int avic;
+bool avic;
-#ifdef CONFIG_X86_LOCAL_APIC
+module_param(avic, bool, S_IRUGO);
-module_param(avic, int, S_IRUGO);
-#endif
 #define SVM_AVIC_DOORBELL	0xc001011b
 	return &avic_physical_id_table[index];
 }
-/**
+/*
  * Note:
  * AVIC hardware walks the nested page table to check permissions,
  * but does not use the SPA address specified in the leaf page
 	return ret;
 }
-/**
+/*
  * Note:
  * The HW cannot support posting multicast/broadcast
  * interrupts to a vCPU. So, we still use legacy interrupt
 	WRITE_ONCE(*(svm->avic_physical_id_cache), entry);
 }
-/**
+/*
  * This function is called during VCPU halt/unhalt.
  */
 static void avic_set_running(struct kvm_vcpu *vcpu, bool is_run)

arch/x86/kvm/svm/sev.c+17−9

 	sev->misc_cg = NULL;
 }
-static void sev_unbind_asid(struct kvm *kvm, unsigned int handle)
+static void sev_decommission(unsigned int handle)
 {
 	struct sev_data_decommission decommission;
+	if (!handle)
+		return;
+	decommission.handle = handle;
+	sev_guest_decommission(&decommission, NULL);
+}
+static void sev_unbind_asid(struct kvm *kvm, unsigned int handle)
+{
 	struct sev_data_deactivate deactivate;
 	if (!handle)
 	sev_guest_deactivate(&deactivate, NULL);
 	up_read(&sev_deactivate_lock);
-	/* decommission handle */
+	sev_decommission(handle);
-	decommission.handle = handle;
-	sev_guest_decommission(&decommission, NULL);
 }
 static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp)
 	/* Bind ASID to this guest */
 	ret = sev_bind_asid(kvm, start.handle, error);
-	if (ret)
+	if (ret) {
+		sev_decommission(start.handle);
 		goto e_free_session;
+	}
 	/* return handle to userspace */
 	params.handle = start.handle;
 	struct sev_data_send_start data;
 	int ret;
+	memset(&data, 0, sizeof(data));
 	data.handle = sev->handle;
 	ret = sev_issue_cmd(kvm, SEV_CMD_SEND_START, &data, &argp->error);
-	if (ret < 0)
-		return ret;
 	params->session_len = data.session_len;
 	if (copy_to_user((void __user *)(uintptr_t)argp->data, params,
 	struct sev_data_send_update_data data;
 	int ret;
+	memset(&data, 0, sizeof(data));
 	data.handle = sev->handle;
 	ret = sev_issue_cmd(kvm, SEV_CMD_SEND_UPDATE_DATA, &data, &argp->error);
-	if (ret < 0)
-		return ret;
 	params->hdr_len = data.hdr_len;
 	params->trans_len = data.trans_len;

arch/x86/kvm/svm/svm.c+1−3

 	}
 	if (avic) {
-		if (!npt_enabled ||
+		if (!npt_enabled || !boot_cpu_has(X86_FEATURE_AVIC)) {
-		    !boot_cpu_has(X86_FEATURE_AVIC) ||
-		    !IS_ENABLED(CONFIG_X86_LOCAL_APIC)) {
 			avic = false;
 		} else {
 			pr_info("AVIC enabled\n");

arch/x86/kvm/svm/svm.h+1−1

@@ -480,7 +480,7 @@ extern struct kvm_x86_nested_ops svm_nested_ops; · 479 unmodified lines
480		480
481	#define VMCB_AVIC_APIC_BAR_MASK 0xFFFFFFFFFF000ULL	481	#define VMCB_AVIC_APIC_BAR_MASK 0xFFFFFFFFFF000ULL
482		482
483	extern int avic;	483	extern bool avic;
484		484
485	static inline void avic_update_vapic_bar(struct vcpu_svm *svm, u64 data)	485	static inline void avic_update_vapic_bar(struct vcpu_svm *svm, u64 data)
486	{	486	{

arch/x86/kvm/trace.h+3−3

@@ -1550,16 +1550,16 @@ TRACE_EVENT(kvm_nested_vmenter_failed, · 1549 unmodified lines
1550	TP_ARGS(msg, err),	1550	TP_ARGS(msg, err),
1551		1551
1552	TP_STRUCT__entry(	1552	TP_STRUCT__entry(
1553	__field(const char *, msg)	1553	__string(msg, msg)
1554	__field(u32, err)	1554	__field(u32, err)
1555	),	1555	),
1556		1556
1557	TP_fast_assign(	1557	TP_fast_assign(
1558	__entry->msg = msg;	1558	__assign_str(msg, msg);
1559	__entry->err = err;	1559	__entry->err = err;
1560	),	1560	),
1561		1561
1562	TP_printk("%s%s", __entry->msg, !__entry->err ? "" :	1562	TP_printk("%s%s", __get_str(msg), !__entry->err ? "" :
1563	__print_symbolic(__entry->err, VMX_VMENTER_INSTRUCTION_ERRORS))	1563	__print_symbolic(__entry->err, VMX_VMENTER_INSTRUCTION_ERRORS))
1564	);	1564	);
1565		1565

arch/x86/kvm/vmx/capabilities.h+1−2

@@ -90,8 +90,7 @@ static inline bool cpu_has_vmx_preemption_timer(void) · 89 unmodified lines
90		90
91	static inline bool cpu_has_vmx_posted_intr(void)	91	static inline bool cpu_has_vmx_posted_intr(void)
92	{	92	{
93	return IS_ENABLED(CONFIG_X86_LOCAL_APIC) &&	93	return vmcs_config.pin_based_exec_ctrl & PIN_BASED_POSTED_INTR;
94	vmcs_config.pin_based_exec_ctrl & PIN_BASED_POSTED_INTR;
95	}	94	}
96		95
97	static inline bool cpu_has_load_ia32_efer(void)	96	static inline bool cpu_has_load_ia32_efer(void)

arch/x86/kvm/vmx/posted_intr.c+14−0

@@ -237,6 +237,20 @@ bool pi_has_pending_interrupt(struct kvm_vcpu *vcpu) · 236 unmodified lines
237	}	237	}
238		238
239		239
		240	/*
		241	* Bail out of the block loop if the VM has an assigned
		242	* device, but the blocking vCPU didn't reconfigure the
		243	* PI.NV to the wakeup vector, i.e. the assigned device
		244	* came along after the initial check in pi_pre_block().
		245	*/
		246	void vmx_pi_start_assignment(struct kvm *kvm)
		247	{
		248	if (!irq_remapping_cap(IRQ_POSTING_CAP))
		249	return;
		250
		251	kvm_make_all_cpus_request(kvm, KVM_REQ_UNBLOCK);
		252	}
		253
240	/*	254	/*
241	* pi_update_irte - set IRTE for Posted-Interrupts	255	* pi_update_irte - set IRTE for Posted-Interrupts
242	*	256	*

arch/x86/kvm/vmx/posted_intr.h+1−0

@@ -95,5 +95,6 @@ void __init pi_init_cpu(int cpu); · 94 unmodified lines
95	bool pi_has_pending_interrupt(struct kvm_vcpu *vcpu);	95	bool pi_has_pending_interrupt(struct kvm_vcpu *vcpu);
96	int pi_update_irte(struct kvm *kvm, unsigned int host_irq, uint32_t guest_irq,	96	int pi_update_irte(struct kvm *kvm, unsigned int host_irq, uint32_t guest_irq,
97	bool set);	97	bool set);
		98	void vmx_pi_start_assignment(struct kvm *kvm);
98		99
99	#endif /* __KVM_X86_VMX_POSTED_INTR_H */	100	#endif /* __KVM_X86_VMX_POSTED_INTR_H */

arch/x86/kvm/vmx/vmx.c+4−3

 	struct vcpu_vmx *vmx = to_vmx(vcpu);
 	struct kvm_run *kvm_run = vcpu->run;
 	u32 intr_info, ex_no, error_code;
-	unsigned long cr2, rip, dr6;
+	unsigned long cr2, dr6;
 	u32 vect_info;
 	vect_info = vmx->idt_vectoring_info;
 		vmx->vcpu.arch.event_exit_inst_len =
 			vmcs_read32(VM_EXIT_INSTRUCTION_LEN);
 		kvm_run->exit_reason = KVM_EXIT_DEBUG;
-		rip = kvm_rip_read(vcpu);
+		kvm_run->debug.arch.pc = kvm_get_linear_rip(vcpu);
-		kvm_run->debug.arch.pc = vmcs_readl(GUEST_CS_BASE) + rip;
 		kvm_run->debug.arch.exception = ex_no;
 		break;
 	case AC_VECTOR:
 	switch (kvm_get_apic_mode(vcpu)) {
 	case LAPIC_MODE_INVALID:
 		WARN_ONCE(true, "Invalid local APIC state");
+		break;
 	case LAPIC_MODE_DISABLED:
 		break;
 	case LAPIC_MODE_XAPIC:
 	.nested_ops = &vmx_nested_ops,
 	.update_pi_irte = pi_update_irte,
+	.start_assignment = vmx_pi_start_assignment,
 #ifdef CONFIG_X86_64
 	.set_hv_timer = vmx_set_hv_timer,

arch/x86/kvm/x86.c+37−15

 static void kvm_vcpu_flush_tlb_guest(struct kvm_vcpu *vcpu)
 {
 	++vcpu->stat.tlb_flush;
+	if (!tdp_enabled) {
+               /*
+		 * A TLB flush on behalf of the guest is equivalent to
+		 * INVPCID(all), toggling CR4.PGE, etc., which requires
+		 * a forced sync of the shadow page tables.  Unload the
+		 * entire MMU here and the subsequent load will sync the
+		 * shadow page tables, and also flush the TLB.
+		 */
+		kvm_mmu_unload(vcpu);
+		return;
+	}
 	static_call(kvm_x86_tlb_flush_guest)(vcpu);
 }
 	 * expensive IPIs.
 	 */
 	if (guest_pv_has(vcpu, KVM_FEATURE_PV_TLB_FLUSH)) {
+		u8 st_preempted = xchg(&st->preempted, 0);
 		trace_kvm_pv_tlb_flush(vcpu->vcpu_id,
-				       st->preempted & KVM_VCPU_FLUSH_TLB);
+				       st_preempted & KVM_VCPU_FLUSH_TLB);
-		if (xchg(&st->preempted, 0) & KVM_VCPU_FLUSH_TLB)
+		if (st_preempted & KVM_VCPU_FLUSH_TLB)
 			kvm_vcpu_flush_tlb_guest(vcpu);
+	} else {
+		st->preempted = 0;
 	}
 	vcpu->arch.st.preempted = 0;
 static void emulator_set_hflags(struct x86_emulate_ctxt *ctxt, unsigned emul_flags)
 {
-	emul_to_vcpu(ctxt)->arch.hflags = emul_flags;
+	struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
+	vcpu->arch.hflags = emul_flags;
+	kvm_mmu_reset_context(vcpu);
 }
 static int emulator_pre_leave_smm(struct x86_emulate_ctxt *ctxt,
 	BUILD_BUG_ON(HF_SMM_MASK != X86EMUL_SMM_MASK);
 	BUILD_BUG_ON(HF_SMM_INSIDE_NMI_MASK != X86EMUL_SMM_INSIDE_NMI_MASK);
+	ctxt->interruptibility = 0;
+	ctxt->have_exception = false;
+	ctxt->exception.vector = -1;
+	ctxt->perm_ok = false;
 	init_decode_cache(ctxt);
 	vcpu->arch.emulate_regs_need_sync_from_vcpu = false;
 }
 	    kvm_vcpu_check_breakpoint(vcpu, &r))
 		return r;
-	ctxt->interruptibility = 0;
+	r = x86_decode_insn(ctxt, insn, insn_len, emulation_type);
-	ctxt->have_exception = false;
-	ctxt->exception.vector = -1;
-	ctxt->perm_ok = false;
-	ctxt->ud = emulation_type & EMULTYPE_TRAP_UD;
-	r = x86_decode_insn(ctxt, insn, insn_len);
 	trace_kvm_emulate_insn_start(vcpu);
 	++vcpu->stat.insn_emulation;
 	kvm_x86_ops.hardware_enable = NULL;
 	kvm_mmu_module_exit();
 	free_percpu(user_return_msrs);
+	kmem_cache_destroy(x86_emulator_cache);
 	kmem_cache_destroy(x86_fpu_cache);
 #ifdef CONFIG_KVM_XEN
 	static_key_deferred_flush(&kvm_xen_enabled);
 	vcpu->stat.directed_yield_attempted++;
+	if (single_task_running())
+		goto no_yield;
 	rcu_read_lock();
 	map = rcu_dereference(vcpu->kvm->arch.apic_map);
 		if (r <= 0)
 			break;
-		kvm_clear_request(KVM_REQ_PENDING_TIMER, vcpu);
+		kvm_clear_request(KVM_REQ_UNBLOCK, vcpu);
 		if (kvm_cpu_has_pending_timer(vcpu))
 			kvm_inject_pending_timer_irqs(vcpu);
 	kvm_update_dr7(vcpu);
 	if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP)
-		vcpu->arch.singlestep_rip = kvm_rip_read(vcpu) +
+		vcpu->arch.singlestep_rip = kvm_get_linear_rip(vcpu);
-			get_segment_base(vcpu, VCPU_SREG_CS);
 	/*
 	 * Trigger an rflags update that will inject or remove the trace
 void kvm_arch_start_assignment(struct kvm *kvm)
 {
-	atomic_inc(&kvm->arch.assigned_device_count);
+	if (atomic_inc_return(&kvm->arch.assigned_device_count) == 1)
+		static_call_cond(kvm_x86_start_assignment)(kvm);
 }
 EXPORT_SYMBOL_GPL(kvm_arch_start_assignment);

arch/x86/mm/fault.c+2−2

@@ -836,8 +836,8 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code, · 835 unmodified lines
836		836
837	if (si_code == SEGV_PKUERR)	837	if (si_code == SEGV_PKUERR)
838	force_sig_pkuerr((void __user *)address, pkey);	838	force_sig_pkuerr((void __user *)address, pkey);
839		839	else
840	force_sig_fault(SIGSEGV, si_code, (void __user *)address);	840	force_sig_fault(SIGSEGV, si_code, (void __user *)address);
841		841
842	local_irq_disable();	842	local_irq_disable();
843	}	843	}

arch/x86/mm/ioremap.c+3−1

@@ -118,7 +118,9 @@ static void __ioremap_check_other(resource_size_t addr, struct ioremap_desc *des · 117 unmodified lines
118	if (!IS_ENABLED(CONFIG_EFI))	118	if (!IS_ENABLED(CONFIG_EFI))
119	return;	119	return;
120		120
121	if (efi_mem_type(addr) == EFI_RUNTIME_SERVICES_DATA)	121	if (efi_mem_type(addr) == EFI_RUNTIME_SERVICES_DATA \|\|
		122	(efi_mem_type(addr) == EFI_BOOT_SERVICES_DATA &&
		123	efi_mem_attributes(addr) & EFI_MEMORY_RUNTIME))
122	desc->flags \|= IORES_MAP_ENCRYPTED;	124	desc->flags \|= IORES_MAP_ENCRYPTED;
123	}	125	}
124		126

arch/x86/mm/mem_encrypt_identity.c+6−5

 #define AMD_SME_BIT	BIT(0)
 #define AMD_SEV_BIT	BIT(1)
-	/* Check the SEV MSR whether SEV or SME is enabled */
-	sev_status   = __rdmsr(MSR_AMD64_SEV);
-	feature_mask = (sev_status & MSR_AMD64_SEV_ENABLED) ? AMD_SEV_BIT : AMD_SME_BIT;
 	/*
 	 * Check for the SME/SEV feature:
 	 *   CPUID Fn8000_001F[EAX]
 	eax = 0x8000001f;
 	ecx = 0;
 	native_cpuid(&eax, &ebx, &ecx, &edx);
-	if (!(eax & feature_mask))
+	/* Check whether SEV or SME is supported */
+	if (!(eax & (AMD_SEV_BIT | AMD_SME_BIT)))
 		return;
 	me_mask = 1UL << (ebx & 0x3f);
+	/* Check the SEV MSR whether SEV or SME is enabled */
+	sev_status   = __rdmsr(MSR_AMD64_SEV);
+	feature_mask = (sev_status & MSR_AMD64_SEV_ENABLED) ? AMD_SEV_BIT : AMD_SME_BIT;
 	/* Check if memory encryption is enabled */
 	if (feature_mask == AMD_SME_BIT) {
 		/*

arch/x86/mm/numa.c+7−1

@@ -254,7 +254,13 @@ int __init numa_cleanup_meminfo(struct numa_meminfo *mi) · 253 unmodified lines
254		254
255	/* make sure all non-reserved blocks are inside the limits */	255	/* make sure all non-reserved blocks are inside the limits */
256	bi->start = max(bi->start, low);	256	bi->start = max(bi->start, low);
257	bi->end = min(bi->end, high);	257
		258	/* preserve info for non-RAM areas above 'max_pfn': */
		259	if (bi->end > high) {
		260	numa_add_memblk_to(bi->nid, high, bi->end,
		261	&numa_reserved_meminfo);
		262	bi->end = high;
		263	}
258		264
259	/* and there's no empty block */	265	/* and there's no empty block */
260	if (bi->start >= bi->end)	266	if (bi->start >= bi->end)

arch/x86/pci/fixup.c+44−0

@@ -779,4 +779,48 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD, 0x1571, pci_amd_enable_64bit_bar); · 778 unmodified lines
779	DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD, 0x15b1, pci_amd_enable_64bit_bar);	779	DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD, 0x15b1, pci_amd_enable_64bit_bar);
780	DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD, 0x1601, pci_amd_enable_64bit_bar);	780	DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD, 0x1601, pci_amd_enable_64bit_bar);
781		781
		782	#define RS690_LOWER_TOP_OF_DRAM2 0x30
		783	#define RS690_LOWER_TOP_OF_DRAM2_VALID 0x1
		784	#define RS690_UPPER_TOP_OF_DRAM2 0x31
		785	#define RS690_HTIU_NB_INDEX 0xA8
		786	#define RS690_HTIU_NB_INDEX_WR_ENABLE 0x100
		787	#define RS690_HTIU_NB_DATA 0xAC
		788
		789	/*
		790	* Some BIOS implementations support RAM above 4GB, but do not configure the
		791	* PCI host to respond to bus master accesses for these addresses. These
		792	* implementations set the TOP_OF_DRAM_SLOT1 register correctly, so PCI DMA
		793	* works as expected for addresses below 4GB.
		794	*
		795	* Reference: "AMD RS690 ASIC Family Register Reference Guide" (pg. 2-57)
		796	* https://www.amd.com/system/files/TechDocs/43372_rs690_rrg_3.00o.pdf
		797	*/
		798	static void rs690_fix_64bit_dma(struct pci_dev *pdev)
		799	{
		800	u32 val = 0;
		801	phys_addr_t top_of_dram = __pa(high_memory - 1) + 1;
		802
		803	if (top_of_dram <= (1ULL << 32))
		804	return;
		805
		806	pci_write_config_dword(pdev, RS690_HTIU_NB_INDEX,
		807	RS690_LOWER_TOP_OF_DRAM2);
		808	pci_read_config_dword(pdev, RS690_HTIU_NB_DATA, &val);
		809
		810	if (val)
		811	return;
		812
		813	pci_info(pdev, "Adjusting top of DRAM to %pa for 64-bit DMA support\n", &top_of_dram);
		814
		815	pci_write_config_dword(pdev, RS690_HTIU_NB_INDEX,
		816	RS690_UPPER_TOP_OF_DRAM2 \| RS690_HTIU_NB_INDEX_WR_ENABLE);
		817	pci_write_config_dword(pdev, RS690_HTIU_NB_DATA, top_of_dram >> 32);
		818
		819	pci_write_config_dword(pdev, RS690_HTIU_NB_INDEX,
		820	RS690_LOWER_TOP_OF_DRAM2 \| RS690_HTIU_NB_INDEX_WR_ENABLE);
		821	pci_write_config_dword(pdev, RS690_HTIU_NB_DATA,
		822	top_of_dram \| RS690_LOWER_TOP_OF_DRAM2_VALID);
		823	}
		824	DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7910, rs690_fix_64bit_dma);
		825
782	#endif	826	#endif

arch/x86/platform/efi/quirks.c+12−0

@@ -450,6 +450,18 @@ void __init efi_free_boot_services(void) · 449 unmodified lines
450	size -= rm_size;	450	size -= rm_size;
451	}	451	}
452		452
		453	/*
		454	* Don't free memory under 1M for two reasons:
		455	* - BIOS might clobber it
		456	* - Crash kernel needs it to be reserved
		457	*/
		458	if (start + size < SZ_1M)
		459	continue;
		460	if (start < SZ_1M) {
		461	size -= (SZ_1M - start);
		462	start = SZ_1M;
		463	}
		464
453	memblock_free_late(start, size);	465	memblock_free_late(start, size);
454	}	466	}
455		467

arch/x86/realmode/init.c+8−6

@@ -29,14 +29,16 @@ void __init reserve_real_mode(void) · 28 unmodified lines
29		29
30	/* Has to be under 1M so we can execute real-mode AP code. */	30	/* Has to be under 1M so we can execute real-mode AP code. */
31	mem = memblock_find_in_range(0, 1<<20, size, PAGE_SIZE);	31	mem = memblock_find_in_range(0, 1<<20, size, PAGE_SIZE);
32	if (!mem) {	32	if (!mem)
33	pr_info("No sub-1M memory is available for the trampoline\n");	33	pr_info("No sub-1M memory is available for the trampoline\n");
34	return;	34	else
35	}	35	set_real_mode_mem(mem);
36		36
37	memblock_reserve(mem, size);	37	/*
38	set_real_mode_mem(mem);	38	* Unconditionally reserve the entire fisrt 1M, see comment in
39	crash_reserve_low_1M();	39	* setup_arch().
		40	*/
		41	memblock_reserve(0, SZ_1M);
40	}	42	}
41		43
42	static void sme_sev_setup_real_mode(struct trampoline_header *th)	44	static void sme_sev_setup_real_mode(struct trampoline_header *th)

crypto/async_tx/async_xor.c+2−1

@@ -233,7 +233,8 @@ async_xor_offs(struct page *dest, unsigned int offset, · 232 unmodified lines
233	if (submit->flags & ASYNC_TX_XOR_DROP_DST) {	233	if (submit->flags & ASYNC_TX_XOR_DROP_DST) {
234	src_cnt--;	234	src_cnt--;
235	src_list++;	235	src_list++;
236	src_offs++;	236	if (src_offs)
		237	src_offs++;
237	}	238	}
238		239
239	/* wait for any prerequisite operations */	240	/* wait for any prerequisite operations */

drivers/acpi/acpi_apd.c+1−0

@@ -226,6 +226,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { · 225 unmodified lines
226	{ "AMDI0010", APD_ADDR(wt_i2c_desc) },	226	{ "AMDI0010", APD_ADDR(wt_i2c_desc) },
227	{ "AMD0020", APD_ADDR(cz_uart_desc) },	227	{ "AMD0020", APD_ADDR(cz_uart_desc) },
228	{ "AMDI0020", APD_ADDR(cz_uart_desc) },	228	{ "AMDI0020", APD_ADDR(cz_uart_desc) },
		229	{ "AMDI0022", APD_ADDR(cz_uart_desc) },
229	{ "AMD0030", },	230	{ "AMD0030", },
230	{ "AMD0040", APD_ADDR(fch_misc_desc)},	231	{ "AMD0040", APD_ADDR(fch_misc_desc)},
231	{ "HYGO0010", APD_ADDR(wt_i2c_desc) },	232	{ "HYGO0010", APD_ADDR(wt_i2c_desc) },

drivers/acpi/acpica/utdelete.c+8−0

@@ -285,6 +285,14 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object) · 284 unmodified lines
285	}	285	}
286	break;	286	break;
287		287
		288	case ACPI_TYPE_LOCAL_ADDRESS_HANDLER:
		289
		290	ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
		291	"***** Address handler %p\n", object));
		292
		293	acpi_os_delete_mutex(object->address_space.context_mutex);
		294	break;
		295
288	default:	296	default:
289		297
290	break;	298	break;

drivers/acpi/bus.c+8−19

 	if (ACPI_FAILURE(acpi_run_osc(handle, &context)))
 		return;
-	capbuf_ret = context.ret.pointer;
+	kfree(context.ret.pointer);
-	if (context.ret.length <= OSC_SUPPORT_DWORD) {
-		kfree(context.ret.pointer);
-		return;
-	}
-	/*
+	/* Now run _OSC again with query flag clear */
-	 * Now run _OSC again with query flag clear and with the caps
-	 * supported by both the OS and the platform.
-	 */
 	capbuf[OSC_QUERY_DWORD] = 0;
-	capbuf[OSC_SUPPORT_DWORD] = capbuf_ret[OSC_SUPPORT_DWORD];
-	kfree(context.ret.pointer);
 	if (ACPI_FAILURE(acpi_run_osc(handle, &context)))
 		return;
 	capbuf_ret = context.ret.pointer;
-	if (context.ret.length > OSC_SUPPORT_DWORD) {
+	osc_sb_apei_support_acked =
-		osc_sb_apei_support_acked =
+		capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_APEI_SUPPORT;
-			capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_APEI_SUPPORT;
+	osc_pc_lpi_support_confirmed =
-		osc_pc_lpi_support_confirmed =
+		capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_PCLPI_SUPPORT;
-			capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_PCLPI_SUPPORT;
+	osc_sb_native_usb4_support_confirmed =
-		osc_sb_native_usb4_support_confirmed =
+		capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_NATIVE_USB4_SUPPORT;
-			capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_NATIVE_USB4_SUPPORT;
-	}
 	kfree(context.ret.pointer);
 }

drivers/acpi/internal.h+2−2

drivers/acpi/power.c+46−13

@@ -52,6 +52,7 @@ struct acpi_power_resource { · 51 unmodified lines
52	u32 system_level;	52	u32 system_level;
53	u32 order;	53	u32 order;
54	unsigned int ref_count;	54	unsigned int ref_count;
		55	unsigned int users;
55	bool wakeup_enabled;	56	bool wakeup_enabled;
56	struct mutex resource_lock;	57	struct mutex resource_lock;
57	struct list_head dependents;	58	struct list_head dependents;
@@ -147,6 +148,7 @@ int acpi_extract_power_resources(union acpi_object *package, unsigned int start, · 89 unmodified lines
147		148
148	for (i = start; i < package->package.count; i++) {	149	for (i = start; i < package->package.count; i++) {
149	union acpi_object *element = &package->package.elements[i];	150	union acpi_object *element = &package->package.elements[i];
		151	struct acpi_device *rdev;
150	acpi_handle rhandle;	152	acpi_handle rhandle;
151		153
152	if (element->type != ACPI_TYPE_LOCAL_REFERENCE) {	154	if (element->type != ACPI_TYPE_LOCAL_REFERENCE) {
@@ -163,13 +165,16 @@ int acpi_extract_power_resources(union acpi_object *package, unsigned int start, · 10 unmodified lines
163	if (acpi_power_resource_is_dup(package, start, i))	165	if (acpi_power_resource_is_dup(package, start, i))
164	continue;	166	continue;
165		167
166	err = acpi_add_power_resource(rhandle);	168	rdev = acpi_add_power_resource(rhandle);
167	if (err)	169	if (!rdev) {
		170	err = -ENODEV;
168	break;	171	break;
169		172	}
170	err = acpi_power_resources_list_add(rhandle, list);	173	err = acpi_power_resources_list_add(rhandle, list);
171	if (err)	174	if (err)
172	break;	175	break;
		176
		177	to_power_resource(rdev)->users++;
173	}	178	}
174	if (err)	179	if (err)
175	acpi_power_resources_list_free(list);	180	acpi_power_resources_list_free(list);
@@ -907,7 +912,7 @@ static void acpi_power_add_resource_to_list(struct acpi_power_resource *resource · 731 unmodified lines
907	mutex_unlock(&power_resource_list_lock);	912	mutex_unlock(&power_resource_list_lock);
908	}	913	}
909		914
910	int acpi_add_power_resource(acpi_handle handle)	915	struct acpi_device *acpi_add_power_resource(acpi_handle handle)
911	{	916	{
912	struct acpi_power_resource *resource;	917	struct acpi_power_resource *resource;
913	struct acpi_device *device = NULL;	918	struct acpi_device *device = NULL;
@@ -918,11 +923,11 @@ int acpi_add_power_resource(acpi_handle handle) · 4 unmodified lines
918		923
919	acpi_bus_get_device(handle, &device);	924	acpi_bus_get_device(handle, &device);
920	if (device)	925	if (device)
921	return 0;	926	return device;
922		927
923	resource = kzalloc(sizeof(*resource), GFP_KERNEL);	928	resource = kzalloc(sizeof(*resource), GFP_KERNEL);
924	if (!resource)	929	if (!resource)
925	return -ENOMEM;	930	return NULL;
926		931
927	device = &resource->device;	932	device = &resource->device;
928	acpi_init_device_object(device, handle, ACPI_BUS_TYPE_POWER);	933	acpi_init_device_object(device, handle, ACPI_BUS_TYPE_POWER);
@@ -959,11 +964,11 @@ int acpi_add_power_resource(acpi_handle handle) · 30 unmodified lines
959		964
960	acpi_power_add_resource_to_list(resource);	965	acpi_power_add_resource_to_list(resource);
961	acpi_device_add_finalize(device);	966	acpi_device_add_finalize(device);
962	return 0;	967	return device;
963		968
964	err:	969	err:
965	acpi_release_power_resource(&device->dev);	970	acpi_release_power_resource(&device->dev);
966	return result;	971	return NULL;
967	}	972	}
968		973
969	#ifdef CONFIG_ACPI_SLEEP	974	#ifdef CONFIG_ACPI_SLEEP
@@ -997,7 +1002,38 @@ void acpi_resume_power_resources(void) · 27 unmodified lines
997	}	1002	}
998	#endif	1003	#endif
999		1004
1000	void acpi_turn_off_unused_power_resources(void)	1005	static void acpi_power_turn_off_if_unused(struct acpi_power_resource *resource,
		1006	bool init)
		1007	{
		1008	if (resource->ref_count > 0)
		1009	return;
		1010
		1011	if (init) {
		1012	if (resource->users > 0)
		1013	return;
		1014	} else {
		1015	int result, state;
		1016
		1017	result = acpi_power_get_state(resource->device.handle, &state);
		1018	if (result \|\| state == ACPI_POWER_RESOURCE_STATE_OFF)
		1019	return;
		1020	}
		1021
		1022	dev_info(&resource->device.dev, "Turning OFF\n");
		1023	__acpi_power_off(resource);
		1024	}
		1025
		1026	/**
		1027	* acpi_turn_off_unused_power_resources - Turn off power resources not in use.
		1028	* @init: Control switch.
		1029	*
		1030	* If @ainit is set, unconditionally turn off all of the ACPI power resources
		1031	* without any users.
		1032	*
		1033	* Otherwise, turn off all ACPI power resources without active references (that
		1034	* is, the ones that should be "off" at the moment) that are "on".
		1035	*/
		1036	void acpi_turn_off_unused_power_resources(bool init)
1001	{	1037	{
1002	struct acpi_power_resource *resource;	1038	struct acpi_power_resource *resource;
1003		1039
@@ -1006,10 +1042,7 @@ void acpi_turn_off_unused_power_resources(void) · 2 unmodified lines
1006	list_for_each_entry_reverse(resource, &acpi_power_resource_list, list_node) {	1042	list_for_each_entry_reverse(resource, &acpi_power_resource_list, list_node) {
1007	mutex_lock(&resource->resource_lock);	1043	mutex_lock(&resource->resource_lock);
1008		1044
1009	if (!resource->ref_count) {	1045	acpi_power_turn_off_if_unused(resource, init);
1010	dev_info(&resource->device.dev, "Turning OFF\n");
1011	__acpi_power_off(resource);
1012	}
1013		1046
1014	mutex_unlock(&resource->resource_lock);	1047	mutex_unlock(&resource->resource_lock);
1015	}	1048	}

drivers/acpi/scan.c+1−1

@@ -2360,7 +2360,7 @@ int __init acpi_scan_init(void) · 2359 unmodified lines
2360	}	2360	}
2361	}	2361	}
2362		2362
2363	acpi_turn_off_unused_power_resources();	2363	acpi_turn_off_unused_power_resources(true);
2364		2364
2365	acpi_scan_initialized = true;	2365	acpi_scan_initialized = true;
2366		2366

drivers/acpi/sleep.c+2−4

  */
 static void acpi_pm_end(void)
 {
-	acpi_turn_off_unused_power_resources();
+	acpi_turn_off_unused_power_resources(false);
 	acpi_scan_lock_release();
 	/*
 	 * This is necessary in case acpi_pm_finish() is not called during a
 		return;
 	acpi_get_table(ACPI_SIG_FACS, 1, (struct acpi_table_header **)&facs);
-	if (facs) {
+	if (facs)
 		s4_hardware_signature = facs->hardware_signature;
-		acpi_put_table((struct acpi_table_header *)facs);
-	}
 }
 #else /* !CONFIG_HIBERNATION */
 static inline void acpi_sleep_hibernate_setup(void) {}

drivers/base/core.c+36−32

 {
 	return srcu_read_lock_held(&device_links_srcu);
 }
+static void device_link_synchronize_removal(void)
+{
+	synchronize_srcu(&device_links_srcu);
+}
+static void device_link_remove_from_lists(struct device_link *link)
+{
+	list_del_rcu(&link->s_node);
+	list_del_rcu(&link->c_node);
+}
 #else /* !CONFIG_SRCU */
 static DECLARE_RWSEM(device_links_lock);
 	return lockdep_is_held(&device_links_lock);
 }
 #endif
+static inline void device_link_synchronize_removal(void)
+{
+}
+static void device_link_remove_from_lists(struct device_link *link)
+{
+	list_del(&link->s_node);
+	list_del(&link->c_node);
+}
 #endif /* !CONFIG_SRCU */
 static bool device_is_ancestor(struct device *dev, struct device *target)
 };
 ATTRIBUTE_GROUPS(devlink);
-static void device_link_free(struct device_link *link)
+static void device_link_release_fn(struct work_struct *work)
 {
+	struct device_link *link = container_of(work, struct device_link, rm_work);
+	/* Ensure that all references to the link object have been dropped. */
+	device_link_synchronize_removal();
 	while (refcount_dec_not_one(&link->rpm_active))
 		pm_runtime_put(link->supplier);
 	kfree(link);
 }
-#ifdef CONFIG_SRCU
-static void __device_link_free_srcu(struct rcu_head *rhead)
-{
-	device_link_free(container_of(rhead, struct device_link, rcu_head));
-}
 static void devlink_dev_release(struct device *dev)
 {
 	struct device_link *link = to_devlink(dev);
-	call_srcu(&device_links_srcu, &link->rcu_head, __device_link_free_srcu);
+	INIT_WORK(&link->rm_work, device_link_release_fn);
-}
+	/*
-#else
+	 * It may take a while to complete this work because of the SRCU
-static void devlink_dev_release(struct device *dev)
+	 * synchronization in device_link_release_fn() and if the consumer or
-{
+	 * supplier devices get deleted when it runs, so put it into the "long"
-	device_link_free(to_devlink(dev));
+	 * workqueue.
+	 */
+	queue_work(system_long_wq, &link->rm_work);
 }
-#endif
 static struct class devlink_class = {
 	.name = "devlink",
 }
 EXPORT_SYMBOL_GPL(device_link_add);
-#ifdef CONFIG_SRCU
 static void __device_link_del(struct kref *kref)
 {
 	struct device_link *link = container_of(kref, struct device_link, kref);
 	pm_runtime_drop_link(link);
-	list_del_rcu(&link->s_node);
+	device_link_remove_from_lists(link);
-	list_del_rcu(&link->c_node);
-	device_unregister(&link->link_dev);
-}
-#else /* !CONFIG_SRCU */
-static void __device_link_del(struct kref *kref)
-{
-	struct device_link *link = container_of(kref, struct device_link, kref);
-	dev_info(link->consumer, "Dropping the link to %s\n",
-		 dev_name(link->supplier));
-	pm_runtime_drop_link(link);
-	list_del(&link->s_node);
-	list_del(&link->c_node);
 	device_unregister(&link->link_dev);
 }
-#endif /* !CONFIG_SRCU */
 static void device_link_put_kref(struct device_link *link)
 {

drivers/base/memory.c+3−3

 	struct zone *zone;
 	int ret;
-	zone = page_zone(pfn_to_page(start_pfn));
 	/*
 	 * Unaccount before offlining, such that unpopulated zone and kthreads
 	 * can properly be torn down in offline_pages().
 	 */
-	if (nr_vmemmap_pages)
+	if (nr_vmemmap_pages) {
+		zone = page_zone(pfn_to_page(start_pfn));
 		adjust_present_page_count(zone, -nr_vmemmap_pages);
+	}
 	ret = offline_pages(start_pfn + nr_vmemmap_pages,
 			    nr_pages - nr_vmemmap_pages);

drivers/block/loop.c+7−18

 static int lo_open(struct block_device *bdev, fmode_t mode)
 {
-	struct loop_device *lo;
+	struct loop_device *lo = bdev->bd_disk->private_data;
 	int err;
-	/*
-	 * take loop_ctl_mutex to protect lo pointer from race with
-	 * loop_control_ioctl(LOOP_CTL_REMOVE), however, to reduce contention
-	 * release it prior to updating lo->lo_refcnt.
-	 */
-	err = mutex_lock_killable(&loop_ctl_mutex);
-	if (err)
-		return err;
-	lo = bdev->bd_disk->private_data;
-	if (!lo) {
-		mutex_unlock(&loop_ctl_mutex);
-		return -ENXIO;
-	}
 	err = mutex_lock_killable(&lo->lo_mutex);
-	mutex_unlock(&loop_ctl_mutex);
 	if (err)
 		return err;
-	atomic_inc(&lo->lo_refcnt);
+	if (lo->lo_state == Lo_deleting)
+		err = -ENXIO;
+	else
+		atomic_inc(&lo->lo_refcnt);
 	mutex_unlock(&lo->lo_mutex);
-	return 0;
+	return err;
 }
 static void lo_release(struct gendisk *disk, fmode_t mode)
 			mutex_unlock(&lo->lo_mutex);
 			break;
 		}
-		lo->lo_disk->private_data = NULL;
+		lo->lo_state = Lo_deleting;
 		mutex_unlock(&lo->lo_mutex);
 		idr_remove(&loop_index_idr, lo->lo_number);
 		loop_remove(lo);

drivers/block/loop.h+1−0

@@ -22,6 +22,7 @@ enum { · 21 unmodified lines
22	Lo_unbound,	22	Lo_unbound,
23	Lo_bound,	23	Lo_bound,
24	Lo_rundown,	24	Lo_rundown,
		25	Lo_deleting,
25	};	26	};
26		27
27	struct loop_func_table;	28	struct loop_func_table;

drivers/bluetooth/btusb.c+23−2

 	/* Realtek 8822CE Bluetooth devices */
 	{ USB_DEVICE(0x0bda, 0xb00c), .driver_info = BTUSB_REALTEK |
 						     BTUSB_WIDEBAND_SPEECH },
+	{ USB_DEVICE(0x0bda, 0xc822), .driver_info = BTUSB_REALTEK |
+						     BTUSB_WIDEBAND_SPEECH },
 	/* Realtek 8852AE Bluetooth devices */
 	{ USB_DEVICE(0x0bda, 0xc852), .driver_info = BTUSB_REALTEK |
 	}
 	btusb_setup_intel_newgen_get_fw_name(ver, fwname, sizeof(fwname), "sfi");
-	err = request_firmware(&fw, fwname, &hdev->dev);
+	err = firmware_request_nowarn(&fw, fwname, &hdev->dev);
 	if (err < 0) {
+		if (!test_bit(BTUSB_BOOTLOADER, &data->flags)) {
+			/* Firmware has already been loaded */
+			set_bit(BTUSB_FIRMWARE_LOADED, &data->flags);
+			return 0;
+		}
 		bt_dev_err(hdev, "Failed to load Intel firmware file %s (%d)",
 			   fwname, err);
 		return err;
 	}
 	err = btusb_setup_intel_new_get_fw_name(ver, params, fwname,
 						sizeof(fwname), "sfi");
 	if (err < 0) {
+		if (!test_bit(BTUSB_BOOTLOADER, &data->flags)) {
+			/* Firmware has already been loaded */
+			set_bit(BTUSB_FIRMWARE_LOADED, &data->flags);
+			return 0;
+		}
 		bt_dev_err(hdev, "Unsupported Intel firmware naming");
 		return -EINVAL;
 	}
-	err = request_firmware(&fw, fwname, &hdev->dev);
+	err = firmware_request_nowarn(&fw, fwname, &hdev->dev);
 	if (err < 0) {
+		if (!test_bit(BTUSB_BOOTLOADER, &data->flags)) {
+			/* Firmware has already been loaded */
+			set_bit(BTUSB_FIRMWARE_LOADED, &data->flags);
+			return 0;
+		}
 		bt_dev_err(hdev, "Failed to load Intel firmware file %s (%d)",
 			   fwname, err);
 		return err;

drivers/bus/mhi/pci_generic.c+38−4

@@ -311,8 +311,8 @@ static const struct mhi_channel_config mhi_foxconn_sdx55_channels[] = { · 310 unmodified lines
311	MHI_CHANNEL_CONFIG_DL(5, "DIAG", 32, 1),	311	MHI_CHANNEL_CONFIG_DL(5, "DIAG", 32, 1),
312	MHI_CHANNEL_CONFIG_UL(12, "MBIM", 32, 0),	312	MHI_CHANNEL_CONFIG_UL(12, "MBIM", 32, 0),
313	MHI_CHANNEL_CONFIG_DL(13, "MBIM", 32, 0),	313	MHI_CHANNEL_CONFIG_DL(13, "MBIM", 32, 0),
314	MHI_CHANNEL_CONFIG_UL(32, "AT", 32, 0),	314	MHI_CHANNEL_CONFIG_UL(32, "DUN", 32, 0),
315	MHI_CHANNEL_CONFIG_DL(33, "AT", 32, 0),	315	MHI_CHANNEL_CONFIG_DL(33, "DUN", 32, 0),
316	MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0_MBIM", 128, 2),	316	MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0_MBIM", 128, 2),
317	MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0_MBIM", 128, 3),	317	MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0_MBIM", 128, 3),
318	};	318	};
@@ -708,7 +708,7 @@ static void mhi_pci_remove(struct pci_dev *pdev) · 389 unmodified lines
708	struct mhi_pci_device *mhi_pdev = pci_get_drvdata(pdev);	708	struct mhi_pci_device *mhi_pdev = pci_get_drvdata(pdev);
709	struct mhi_controller *mhi_cntrl = &mhi_pdev->mhi_cntrl;	709	struct mhi_controller *mhi_cntrl = &mhi_pdev->mhi_cntrl;
710		710
711	del_timer(&mhi_pdev->health_check_timer);	711	del_timer_sync(&mhi_pdev->health_check_timer);
712	cancel_work_sync(&mhi_pdev->recovery_work);	712	cancel_work_sync(&mhi_pdev->recovery_work);
713		713
714	if (test_and_clear_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status)) {	714	if (test_and_clear_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status)) {
@@ -935,9 +935,43 @@ static int __maybe_unused mhi_pci_resume(struct device *dev) · 220 unmodified lines
935	return ret;	935	return ret;
936	}	936	}
937		937
		938	static int __maybe_unused mhi_pci_freeze(struct device *dev)
		939	{
		940	struct mhi_pci_device *mhi_pdev = dev_get_drvdata(dev);
		941	struct mhi_controller *mhi_cntrl = &mhi_pdev->mhi_cntrl;
		942
		943	/* We want to stop all operations, hibernation does not guarantee that
		944	* device will be in the same state as before freezing, especially if
		945	* the intermediate restore kernel reinitializes MHI device with new
		946	* context.
		947	*/
		948	if (test_and_clear_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status)) {
		949	mhi_power_down(mhi_cntrl, false);
		950	mhi_unprepare_after_power_down(mhi_cntrl);
		951	}
		952
		953	return 0;
		954	}
		955
		956	static int __maybe_unused mhi_pci_restore(struct device *dev)
		957	{
		958	struct mhi_pci_device *mhi_pdev = dev_get_drvdata(dev);
		959
		960	/* Reinitialize the device */
		961	queue_work(system_long_wq, &mhi_pdev->recovery_work);
		962
		963	return 0;
		964	}
		965
938	static const struct dev_pm_ops mhi_pci_pm_ops = {	966	static const struct dev_pm_ops mhi_pci_pm_ops = {
939	SET_RUNTIME_PM_OPS(mhi_pci_runtime_suspend, mhi_pci_runtime_resume, NULL)	967	SET_RUNTIME_PM_OPS(mhi_pci_runtime_suspend, mhi_pci_runtime_resume, NULL)
940	SET_SYSTEM_SLEEP_PM_OPS(mhi_pci_suspend, mhi_pci_resume)	968	#ifdef CONFIG_PM_SLEEP
		969	.suspend = mhi_pci_suspend,
		970	.resume = mhi_pci_resume,
		971	.freeze = mhi_pci_freeze,
		972	.thaw = mhi_pci_restore,
		973	.restore = mhi_pci_restore,
		974	#endif
941	};	975	};
942		976
943	static struct pci_driver mhi_pci_driver = {	977	static struct pci_driver mhi_pci_driver = {

drivers/bus/ti-sysc.c+54−6

 	return error;
 }
+static int sysc_reinit_module(struct sysc *ddata, bool leave_enabled)
+{
+	struct device *dev = ddata->dev;
+	int error;
+	/* Disable target module if it is enabled */
+	if (ddata->enabled) {
+		error = sysc_runtime_suspend(dev);
+		if (error)
+			dev_warn(dev, "reinit suspend failed: %i\n", error);
+	}
+	/* Enable target module */
+	error = sysc_runtime_resume(dev);
+	if (error)
+		dev_warn(dev, "reinit resume failed: %i\n", error);
+	if (leave_enabled)
+		return error;
+	/* Disable target module if no leave_enabled was set */
+	error = sysc_runtime_suspend(dev);
+	if (error)
+		dev_warn(dev, "reinit suspend failed: %i\n", error);
+	return error;
+}
 static int __maybe_unused sysc_noirq_suspend(struct device *dev)
 {
 	struct sysc *ddata;
 	    (SYSC_QUIRK_LEGACY_IDLE | SYSC_QUIRK_NO_IDLE))
 		return 0;
-	return pm_runtime_force_suspend(dev);
+	if (!ddata->enabled)
+		return 0;
+	ddata->needs_resume = 1;
+	return sysc_runtime_suspend(dev);
 }
 static int __maybe_unused sysc_noirq_resume(struct device *dev)
 {
 	struct sysc *ddata;
+	int error = 0;
 	ddata = dev_get_drvdata(dev);
 	    (SYSC_QUIRK_LEGACY_IDLE | SYSC_QUIRK_NO_IDLE))
 		return 0;
-	return pm_runtime_force_resume(dev);
+	if (ddata->cfg.quirks & SYSC_QUIRK_REINIT_ON_RESUME) {
+		error = sysc_reinit_module(ddata, ddata->needs_resume);
+		if (error)
+			dev_warn(dev, "noirq_resume failed: %i\n", error);
+	} else if (ddata->needs_resume) {
+		error = sysc_runtime_resume(dev);
+		if (error)
+			dev_warn(dev, "noirq_resume failed: %i\n", error);
+	}
+	ddata->needs_resume = 0;
+	return error;
 }
 static const struct dev_pm_ops sysc_pm_ops = {
 		   SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_LEGACY_IDLE),
 	/* Uarts on omap4 and later */
 	SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x50411e03, 0xffff00ff,
-		   SYSC_QUIRK_SWSUP_SIDLE_ACT | SYSC_QUIRK_LEGACY_IDLE),
+		   SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_LEGACY_IDLE),
 	SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x47422e03, 0xffffffff,
-		   SYSC_QUIRK_SWSUP_SIDLE_ACT | SYSC_QUIRK_LEGACY_IDLE),
+		   SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_LEGACY_IDLE),
 	/* Quirks that need to be set based on the module address */
 	SYSC_QUIRK("mcpdm", 0x40132000, 0, 0x10, -ENODEV, 0x50000800, 0xffffffff,
 		   SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY),
 	SYSC_QUIRK("tptc", 0, 0, -ENODEV, -ENODEV, 0x40007c00, 0xffffffff,
 		   SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY),
+	SYSC_QUIRK("sata", 0, 0xfc, 0x1100, -ENODEV, 0x5e412000, 0xffffffff,
+		   SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY),
 	SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, 0x14, 0x50700100, 0xffffffff,
 		   SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY),
 	SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, -ENODEV, 0x50700101, 0xffffffff,
 	SYSC_QUIRK("usb_otg_hs", 0, 0x400, 0x404, 0x408, 0x00000050,
 		   0xffffffff, SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY),
 	SYSC_QUIRK("usb_otg_hs", 0, 0, 0x10, -ENODEV, 0x4ea2080d, 0xffffffff,
-		   SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY),
+		   SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY |
+		   SYSC_QUIRK_REINIT_ON_RESUME),
 	SYSC_QUIRK("wdt", 0, 0, 0x10, 0x14, 0x502a0500, 0xfffff0f0,
 		   SYSC_MODULE_QUIRK_WDT),
 	/* PRUSS on am3, am4 and am5 */
 	SYSC_QUIRK("prcm", 0, 0, -ENODEV, -ENODEV, 0x40000400, 0xffffffff, 0),
 	SYSC_QUIRK("rfbi", 0x4832a800, 0, 0x10, 0x14, 0x00000010, 0xffffffff, 0),
 	SYSC_QUIRK("rfbi", 0x58002000, 0, 0x10, 0x14, 0x00000010, 0xffffffff, 0),
-	SYSC_QUIRK("sata", 0, 0xfc, 0x1100, -ENODEV, 0x5e412000, 0xffffffff, 0),
 	SYSC_QUIRK("scm", 0, 0, 0x10, -ENODEV, 0x40000900, 0xffffffff, 0),
 	SYSC_QUIRK("scm", 0, 0, -ENODEV, -ENODEV, 0x4e8b0100, 0xffffffff, 0),
 	SYSC_QUIRK("scm", 0, 0, -ENODEV, -ENODEV, 0x4f000100, 0xffffffff, 0),

drivers/cpufreq/Kconfig.arm+0−10

@@ -19,16 +19,6 @@ config ACPI_CPPC_CPUFREQ · 18 unmodified lines
19		19
20	If in doubt, say N.	20	If in doubt, say N.
21		21
22	config ACPI_CPPC_CPUFREQ_FIE
23	bool "Frequency Invariance support for CPPC cpufreq driver"
24	depends on ACPI_CPPC_CPUFREQ && GENERIC_ARCH_TOPOLOGY
25	default y
26	help
27	This extends frequency invariance support in the CPPC cpufreq driver,
28	by using CPPC delivered and reference performance counters.
29
30	If in doubt, say N.
31
32	config ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM	22	config ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM
33	tristate "Allwinner nvmem based SUN50I CPUFreq driver"	23	tristate "Allwinner nvmem based SUN50I CPUFreq driver"
34	depends on ARCH_SUNXI	24	depends on ARCH_SUNXI

drivers/cpufreq/cppc_cpufreq.c+12−233

@@ -10,18 +10,14 @@ · 9 unmodified lines
10		10
11	#define pr_fmt(fmt) "CPPC Cpufreq:" fmt	11	#define pr_fmt(fmt) "CPPC Cpufreq:" fmt
12		12
13	#include <linux/arch_topology.h>
14	#include <linux/kernel.h>	13	#include <linux/kernel.h>
15	#include <linux/module.h>	14	#include <linux/module.h>
16	#include <linux/delay.h>	15	#include <linux/delay.h>
17	#include <linux/cpu.h>	16	#include <linux/cpu.h>
18	#include <linux/cpufreq.h>	17	#include <linux/cpufreq.h>
19	#include <linux/dmi.h>	18	#include <linux/dmi.h>
20	#include <linux/irq_work.h>
21	#include <linux/kthread.h>
22	#include <linux/time.h>	19	#include <linux/time.h>
23	#include <linux/vmalloc.h>	20	#include <linux/vmalloc.h>
24	#include <uapi/linux/sched/types.h>
25		21
26	#include <asm/unaligned.h>	22	#include <asm/unaligned.h>
27		23
@@ -61,204 +57,6 @@ static struct cppc_workaround_oem_info wa_info[] = { · 33 unmodified lines
61	}	57	}
62	};	58	};
63		59
64	#ifdef CONFIG_ACPI_CPPC_CPUFREQ_FIE
65
66	/* Frequency invariance support */
67	struct cppc_freq_invariance {
68	int cpu;
69	struct irq_work irq_work;
70	struct kthread_work work;
71	struct cppc_perf_fb_ctrs prev_perf_fb_ctrs;
72	struct cppc_cpudata *cpu_data;
73	};
74
75	static DEFINE_PER_CPU(struct cppc_freq_invariance, cppc_freq_inv);
76	static struct kthread_worker *kworker_fie;
77	static bool fie_disabled;
78
79	static struct cpufreq_driver cppc_cpufreq_driver;
80	static unsigned int hisi_cppc_cpufreq_get_rate(unsigned int cpu);
81	static int cppc_perf_from_fbctrs(struct cppc_cpudata *cpu_data,
82	struct cppc_perf_fb_ctrs fb_ctrs_t0,
83	struct cppc_perf_fb_ctrs fb_ctrs_t1);
84
85	/**
86	* cppc_scale_freq_workfn - CPPC arch_freq_scale updater for frequency invariance
87	* @work: The work item.
88	*
89	* The CPPC driver register itself with the topology core to provide its own
90	* implementation (cppc_scale_freq_tick()) of topology_scale_freq_tick() which
91	* gets called by the scheduler on every tick.
92	*
93	* Note that the arch specific counters have higher priority than CPPC counters,
94	* if available, though the CPPC driver doesn't need to have any special
95	* handling for that.
96	*
97	* On an invocation of cppc_scale_freq_tick(), we schedule an irq work (since we
98	* reach here from hard-irq context), which then schedules a normal work item
99	* and cppc_scale_freq_workfn() updates the per_cpu arch_freq_scale variable
100	* based on the counter updates since the last tick.
101	*/
102	static void cppc_scale_freq_workfn(struct kthread_work *work)
103	{
104	struct cppc_freq_invariance *cppc_fi;
105	struct cppc_perf_fb_ctrs fb_ctrs = {0};
106	struct cppc_cpudata *cpu_data;
107	unsigned long local_freq_scale;
108	u64 perf;
109
110	cppc_fi = container_of(work, struct cppc_freq_invariance, work);
111	cpu_data = cppc_fi->cpu_data;
112
113	if (cppc_get_perf_ctrs(cppc_fi->cpu, &fb_ctrs)) {
114	pr_warn("%s: failed to read perf counters\n", __func__);
115	return;
116	}
117
118	cppc_fi->prev_perf_fb_ctrs = fb_ctrs;
119	perf = cppc_perf_from_fbctrs(cpu_data, cppc_fi->prev_perf_fb_ctrs,
120	fb_ctrs);
121
122	perf <<= SCHED_CAPACITY_SHIFT;
123	local_freq_scale = div64_u64(perf, cpu_data->perf_caps.highest_perf);
124	if (WARN_ON(local_freq_scale > 1024))
125	local_freq_scale = 1024;
126
127	per_cpu(arch_freq_scale, cppc_fi->cpu) = local_freq_scale;
128	}
129
130	static void cppc_irq_work(struct irq_work *irq_work)
131	{
132	struct cppc_freq_invariance *cppc_fi;
133
134	cppc_fi = container_of(irq_work, struct cppc_freq_invariance, irq_work);
135	kthread_queue_work(kworker_fie, &cppc_fi->work);
136	}
137
138	static void cppc_scale_freq_tick(void)
139	{
140	struct cppc_freq_invariance *cppc_fi = &per_cpu(cppc_freq_inv, smp_processor_id());
141
142	/*
143	* cppc_get_perf_ctrs() can potentially sleep, call that from the right
144	* context.
145	*/
146	irq_work_queue(&cppc_fi->irq_work);
147	}
148
149	static struct scale_freq_data cppc_sftd = {
150	.source = SCALE_FREQ_SOURCE_CPPC,
151	.set_freq_scale = cppc_scale_freq_tick,
152	};
153
154	static void cppc_freq_invariance_policy_init(struct cpufreq_policy *policy,
155	struct cppc_cpudata *cpu_data)
156	{
157	struct cppc_perf_fb_ctrs fb_ctrs = {0};
158	struct cppc_freq_invariance *cppc_fi;
159	int i, ret;
160
161	if (cppc_cpufreq_driver.get == hisi_cppc_cpufreq_get_rate)
162	return;
163
164	if (fie_disabled)
165	return;
166
167	for_each_cpu(i, policy->cpus) {
168	cppc_fi = &per_cpu(cppc_freq_inv, i);
169	cppc_fi->cpu = i;
170	cppc_fi->cpu_data = cpu_data;
171	kthread_init_work(&cppc_fi->work, cppc_scale_freq_workfn);
172	init_irq_work(&cppc_fi->irq_work, cppc_irq_work);
173
174	ret = cppc_get_perf_ctrs(i, &fb_ctrs);
175	if (ret) {
176	pr_warn("%s: failed to read perf counters: %d\n",
177	__func__, ret);
178	fie_disabled = true;
179	} else {
180	cppc_fi->prev_perf_fb_ctrs = fb_ctrs;
181	}
182	}
183	}
184
185	static void __init cppc_freq_invariance_init(void)
186	{
187	struct sched_attr attr = {
188	.size = sizeof(struct sched_attr),
189	.sched_policy = SCHED_DEADLINE,
190	.sched_nice = 0,
191	.sched_priority = 0,
192	/*
193	* Fake (unused) bandwidth; workaround to "fix"
194	* priority inheritance.
195	*/
196	.sched_runtime = 1000000,
197	.sched_deadline = 10000000,
198	.sched_period = 10000000,
199	};
200	int ret;
201
202	if (cppc_cpufreq_driver.get == hisi_cppc_cpufreq_get_rate)
203	return;
204
205	if (fie_disabled)
206	return;
207
208	kworker_fie = kthread_create_worker(0, "cppc_fie");
209	if (IS_ERR(kworker_fie))
210	return;
211
212	ret = sched_setattr_nocheck(kworker_fie->task, &attr);
213	if (ret) {
214	pr_warn("%s: failed to set SCHED_DEADLINE: %d\n", __func__,
215	ret);
216	kthread_destroy_worker(kworker_fie);
217	return;
218	}
219
220	/* Register for freq-invariance */
221	topology_set_scale_freq_source(&cppc_sftd, cpu_present_mask);
222	}
223
224	static void cppc_freq_invariance_exit(void)
225	{
226	struct cppc_freq_invariance *cppc_fi;
227	int i;
228
229	if (cppc_cpufreq_driver.get == hisi_cppc_cpufreq_get_rate)
230	return;
231
232	if (fie_disabled)
233	return;
234
235	topology_clear_scale_freq_source(SCALE_FREQ_SOURCE_CPPC, cpu_present_mask);
236
237	for_each_possible_cpu(i) {
238	cppc_fi = &per_cpu(cppc_freq_inv, i);
239	irq_work_sync(&cppc_fi->irq_work);
240	}
241
242	kthread_destroy_worker(kworker_fie);
243	kworker_fie = NULL;
244	}
245
246	#else
247	static inline void
248	cppc_freq_invariance_policy_init(struct cpufreq_policy *policy,
249	struct cppc_cpudata *cpu_data)
250	{
251	}
252
253	static inline void cppc_freq_invariance_init(void)
254	{
255	}
256
257	static inline void cppc_freq_invariance_exit(void)
258	{
259	}
260	#endif /* CONFIG_ACPI_CPPC_CPUFREQ_FIE */
261
262	/* Callback function used to retrieve the max frequency from DMI */	60	/* Callback function used to retrieve the max frequency from DMI */
263	static void cppc_find_dmi_mhz(const struct dmi_header dm, void private)	61	static void cppc_find_dmi_mhz(const struct dmi_header dm, void private)
264	{	62	{
@@ -547,12 +345,9 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy) · 282 unmodified lines
547	cpu_data->perf_ctrls.desired_perf = caps->highest_perf;	345	cpu_data->perf_ctrls.desired_perf = caps->highest_perf;
548		346
549	ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls);	347	ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls);
550	if (ret) {	348	if (ret)
551	pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n",	349	pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n",
552	caps->highest_perf, cpu, ret);	350	caps->highest_perf, cpu, ret);
553	} else {
554	cppc_freq_invariance_policy_init(policy, cpu_data);
555	}
556		351
557	return ret;	352	return ret;
558	}	353	}
@@ -565,12 +360,12 @@ static inline u64 get_delta(u64 t1, u64 t0) · 6 unmodified lines
565	return (u32)t1 - (u32)t0;	360	return (u32)t1 - (u32)t0;
566	}	361	}
567		362
568	static int cppc_perf_from_fbctrs(struct cppc_cpudata *cpu_data,	363	static int cppc_get_rate_from_fbctrs(struct cppc_cpudata *cpu_data,
569	struct cppc_perf_fb_ctrs fb_ctrs_t0,	364	struct cppc_perf_fb_ctrs fb_ctrs_t0,
570	struct cppc_perf_fb_ctrs fb_ctrs_t1)	365	struct cppc_perf_fb_ctrs fb_ctrs_t1)
571	{	366	{
572	u64 delta_reference, delta_delivered;	367	u64 delta_reference, delta_delivered;
573	u64 reference_perf;	368	u64 reference_perf, delivered_perf;
574		369
575	reference_perf = fb_ctrs_t0.reference_perf;	370	reference_perf = fb_ctrs_t0.reference_perf;
576		371
@@ -579,21 +374,12 @@ static int cppc_perf_from_fbctrs(struct cppc_cpudata *cpu_data, · 2 unmodified lines
579	delta_delivered = get_delta(fb_ctrs_t1.delivered,	374	delta_delivered = get_delta(fb_ctrs_t1.delivered,
580	fb_ctrs_t0.delivered);	375	fb_ctrs_t0.delivered);
581		376
582	/* Check to avoid divide-by zero and invalid delivered_perf */	377	/* Check to avoid divide-by zero */
583	if (!delta_reference \|\| !delta_delivered)	378	if (delta_reference \|\| delta_delivered)
584	return cpu_data->perf_ctrls.desired_perf;	379	delivered_perf = (reference_perf * delta_delivered) /
585		380	delta_reference;
586	return (reference_perf * delta_delivered) / delta_reference;	381	else
587	}	382	delivered_perf = cpu_data->perf_ctrls.desired_perf;
588
589	static int cppc_get_rate_from_fbctrs(struct cppc_cpudata *cpu_data,
590	struct cppc_perf_fb_ctrs fb_ctrs_t0,
591	struct cppc_perf_fb_ctrs fb_ctrs_t1)
592	{
593	u64 delivered_perf;
594
595	delivered_perf = cppc_perf_from_fbctrs(cpu_data, fb_ctrs_t0,
596	fb_ctrs_t1);
597		383
598	return cppc_cpufreq_perf_to_khz(cpu_data, delivered_perf);	384	return cppc_cpufreq_perf_to_khz(cpu_data, delivered_perf);
599	}	385	}
@@ -718,8 +504,6 @@ static void cppc_check_hisi_workaround(void) · 118 unmodified lines
718		504
719	static int __init cppc_cpufreq_init(void)	505	static int __init cppc_cpufreq_init(void)
720	{	506	{
721	int ret;
722
723	if ((acpi_disabled) \|\| !acpi_cpc_valid())	507	if ((acpi_disabled) \|\| !acpi_cpc_valid())
724	return -ENODEV;	508	return -ENODEV;
725		509
@@ -727,11 +511,7 @@ static int __init cppc_cpufreq_init(void) · 1 unmodified line
727		511
728	cppc_check_hisi_workaround();	512	cppc_check_hisi_workaround();
729		513
730	ret = cpufreq_register_driver(&cppc_cpufreq_driver);	514	return cpufreq_register_driver(&cppc_cpufreq_driver);
731	if (!ret)
732	cppc_freq_invariance_init();
733
734	return ret;
735	}	515	}
736		516
737	static inline void free_cpu_data(void)	517	static inline void free_cpu_data(void)
@@ -748,7 +528,6 @@ static inline void free_cpu_data(void) · 10 unmodified lines
748		528
749	static void __exit cppc_cpufreq_exit(void)	529	static void __exit cppc_cpufreq_exit(void)
750	{	530	{
751	cppc_freq_invariance_exit();
752	cpufreq_unregister_driver(&cppc_cpufreq_driver);	531	cpufreq_unregister_driver(&cppc_cpufreq_driver);
753		532
754	free_cpu_data();	533	free_cpu_data();

drivers/dma/Kconfig+2−0

 #devices
 config ALTERA_MSGDMA
 	tristate "Altera / Intel mSGDMA Engine"
+	depends on HAS_IOMEM
 	select DMA_ENGINE
 	help
 	  Enable support for Altera / Intel mSGDMA controller.
 config XILINX_ZYNQMP_DPDMA
 	tristate "Xilinx DPDMA Engine"
+	depends on HAS_IOMEM && OF
 	select DMA_ENGINE
 	select DMA_VIRTUAL_CHANNELS
 	help

drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c+3−0

 	}
 	if (priv->dpdmai_attr.version.major > DPDMAI_VER_MAJOR) {
+		err = -EINVAL;
 		dev_err(dev, "DPDMAI major version mismatch\n"
 			     "Found %u.%u, supported version is %u.%u\n",
 				priv->dpdmai_attr.version.major,
 	}
 	if (priv->dpdmai_attr.version.minor > DPDMAI_VER_MINOR) {
+		err = -EINVAL;
 		dev_err(dev, "DPDMAI minor version mismatch\n"
 			     "Found %u.%u, supported version is %u.%u\n",
 				priv->dpdmai_attr.version.major,
 		ppriv->store =
 			dpaa2_io_store_create(DPAA2_QDMA_STORE_SIZE, dev);
 		if (!ppriv->store) {
+			err = -ENOMEM;
 			dev_err(dev, "dpaa2_io_store_create() failed\n");
 			goto err_store;
 		}

drivers/dma/idxd/cdev.c+1−0

@@ -110,6 +110,7 @@ static int idxd_cdev_open(struct inode inode, struct file filp) · 109 unmodified lines
110	pasid = iommu_sva_get_pasid(sva);	110	pasid = iommu_sva_get_pasid(sva);
111	if (pasid == IOMMU_PASID_INVALID) {	111	if (pasid == IOMMU_PASID_INVALID) {
112	iommu_sva_unbind_device(sva);	112	iommu_sva_unbind_device(sva);
		113	rc = -EINVAL;
113	goto failed;	114	goto failed;
114	}	115	}
115		116

drivers/dma/idxd/init.c+62−5

 	return rc;
 }
+static void idxd_cleanup_interrupts(struct idxd_device *idxd)
+{
+	struct pci_dev *pdev = idxd->pdev;
+	struct idxd_irq_entry *irq_entry;
+	int i, msixcnt;
+	msixcnt = pci_msix_vec_count(pdev);
+	if (msixcnt <= 0)
+		return;
+	irq_entry = &idxd->irq_entries[0];
+	free_irq(irq_entry->vector, irq_entry);
+	for (i = 1; i < msixcnt; i++) {
+		irq_entry = &idxd->irq_entries[i];
+		if (idxd->hw.cmd_cap & BIT(IDXD_CMD_RELEASE_INT_HANDLE))
+			idxd_device_release_int_handle(idxd, idxd->int_handles[i],
+						       IDXD_IRQ_MSIX);
+		free_irq(irq_entry->vector, irq_entry);
+	}
+	idxd_mask_error_interrupts(idxd);
+	pci_free_irq_vectors(pdev);
+}
 static int idxd_setup_wqs(struct idxd_device *idxd)
 {
 	struct device *dev = &idxd->pdev->dev;
 		engine->idxd = idxd;
 		device_initialize(&engine->conf_dev);
 		engine->conf_dev.parent = &idxd->conf_dev;
+		engine->conf_dev.bus = &dsa_bus_type;
 		engine->conf_dev.type = &idxd_engine_device_type;
 		rc = dev_set_name(&engine->conf_dev, "engine%d.%d", idxd->id, engine->id);
 		if (rc < 0) {
 	return rc;
 }
+static void idxd_cleanup_internals(struct idxd_device *idxd)
+{
+	int i;
+	for (i = 0; i < idxd->max_groups; i++)
+		put_device(&idxd->groups[i]->conf_dev);
+	for (i = 0; i < idxd->max_engines; i++)
+		put_device(&idxd->engines[i]->conf_dev);
+	for (i = 0; i < idxd->max_wqs; i++)
+		put_device(&idxd->wqs[i]->conf_dev);
+	destroy_workqueue(idxd->wq);
+}
 static int idxd_setup_internals(struct idxd_device *idxd)
 {
 	struct device *dev = &idxd->pdev->dev;
 		dev_dbg(dev, "Loading RO device config\n");
 		rc = idxd_device_load_config(idxd);
 		if (rc < 0)
-			goto err;
+			goto err_config;
 	}
 	rc = idxd_setup_interrupts(idxd);
 	if (rc)
-		goto err;
+		goto err_config;
 	dev_dbg(dev, "IDXD interrupt setup complete.\n");
 	dev_dbg(dev, "IDXD device %d probed successfully\n", idxd->id);
 	return 0;
+ err_config:
+	idxd_cleanup_internals(idxd);
  err:
 	if (device_pasid_enabled(idxd))
 		idxd_disable_system_pasid(idxd);
 	return rc;
 }
+static void idxd_cleanup(struct idxd_device *idxd)
+{
+	struct device *dev = &idxd->pdev->dev;
+	perfmon_pmu_remove(idxd);
+	idxd_cleanup_interrupts(idxd);
+	idxd_cleanup_internals(idxd);
+	if (device_pasid_enabled(idxd))
+		idxd_disable_system_pasid(idxd);
+	iommu_dev_disable_feature(dev, IOMMU_DEV_FEAT_SVA);
+}
 static int idxd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
 	struct device *dev = &pdev->dev;
 	rc = idxd_register_devices(idxd);
 	if (rc) {
 		dev_err(dev, "IDXD sysfs setup failed\n");
-		goto err;
+		goto err_dev_register;
 	}
 	idxd->state = IDXD_DEV_CONF_READY;
 	return 0;
+ err_dev_register:
+	idxd_cleanup(idxd);
  err:
 	pci_iounmap(pdev, idxd->reg_base);
  err_iomap:
 	 * If the CPU does not support MOVDIR64B or ENQCMDS, there's no point in
 	 * enumerating the device. We can not utilize it.
 	 */
-	if (!boot_cpu_has(X86_FEATURE_MOVDIR64B)) {
+	if (!cpu_feature_enabled(X86_FEATURE_MOVDIR64B)) {
 		pr_warn("idxd driver failed to load without MOVDIR64B.\n");
 		return -ENODEV;
 	}
-	if (!boot_cpu_has(X86_FEATURE_ENQCMD))
+	if (!cpu_feature_enabled(X86_FEATURE_ENQCMD))
 		pr_warn("Platform does not have ENQCMD(S) support.\n");
 	else
 		support_enqcmd = true;
 static void __exit idxd_exit_module(void)
 {
+	idxd_unregister_driver();
 	pci_unregister_driver(&idxd_pci_driver);
 	idxd_cdev_remove();
 	idxd_unregister_bus_type();

drivers/dma/ipu/ipu_irq.c+1−1

@@ -230,7 +230,7 @@ out: · 229 unmodified lines
230	}	230	}
231		231
232	/**	232	/**
233	* ipu_irq_map() - map an IPU interrupt source to an IRQ number	233	* ipu_irq_unmap() - unmap an IPU interrupt source
234	* @source: interrupt source bit position (see ipu_irq_map())	234	* @source: interrupt source bit position (see ipu_irq_map())
235	* @return: 0 or negative error code	235	* @return: 0 or negative error code
236	*/	236	*/

drivers/dma/mediatek/mtk-uart-apdma.c+14−13

 static void mtk_uart_apdma_desc_free(struct virt_dma_desc *vd)
 {
-	struct dma_chan *chan = vd->tx.chan;
+	kfree(container_of(vd, struct mtk_uart_apdma_desc, vd));
-	struct mtk_chan *c = to_mtk_uart_apdma_chan(chan);
-	kfree(c->desc);
 }
 static void mtk_uart_apdma_start_tx(struct mtk_chan *c)
 static void mtk_uart_apdma_tx_handler(struct mtk_chan *c)
 {
-	struct mtk_uart_apdma_desc *d = c->desc;
 	mtk_uart_apdma_write(c, VFF_INT_FLAG, VFF_TX_INT_CLR_B);
 	mtk_uart_apdma_write(c, VFF_INT_EN, VFF_INT_EN_CLR_B);
 	mtk_uart_apdma_write(c, VFF_EN, VFF_EN_CLR_B);
-	list_del(&d->vd.node);
-	vchan_cookie_complete(&d->vd);
 }
 static void mtk_uart_apdma_rx_handler(struct mtk_chan *c)
 	c->rx_status = d->avail_len - cnt;
 	mtk_uart_apdma_write(c, VFF_RPT, wg);
+}
-	list_del(&d->vd.node);
+static void mtk_uart_apdma_chan_complete_handler(struct mtk_chan *c)
-	vchan_cookie_complete(&d->vd);
+{
+	struct mtk_uart_apdma_desc *d = c->desc;
+	if (d) {
+		list_del(&d->vd.node);
+		vchan_cookie_complete(&d->vd);
+		c->desc = NULL;
+	}
 }
 static irqreturn_t mtk_uart_apdma_irq_handler(int irq, void *dev_id)
 		mtk_uart_apdma_rx_handler(c);
 	else if (c->dir == DMA_MEM_TO_DEV)
 		mtk_uart_apdma_tx_handler(c);
+	mtk_uart_apdma_chan_complete_handler(c);
 	spin_unlock_irqrestore(&c->vc.lock, flags);
 	return IRQ_HANDLED;
 		return NULL;
 	/* Now allocate and setup the descriptor */
-	d = kzalloc(sizeof(*d), GFP_ATOMIC);
+	d = kzalloc(sizeof(*d), GFP_NOWAIT);
 	if (!d)
 		return NULL;
 	unsigned long flags;
 	spin_lock_irqsave(&c->vc.lock, flags);
-	if (vchan_issue_pending(&c->vc)) {
+	if (vchan_issue_pending(&c->vc) && !c->desc) {
 		vd = vchan_next_desc(&c->vc);
 		c->desc = to_mtk_uart_apdma_desc(&vd->tx);

drivers/dma/pl330.c+4−2

 	for (i = 0; i < len / period_len; i++) {
 		desc = pl330_get_desc(pch);
 		if (!desc) {
+			unsigned long iflags;
 			dev_err(pch->dmac->ddma.dev, "%s:%d Unable to fetch desc\n",
 				__func__, __LINE__);
 			if (!first)
 				return NULL;
-			spin_lock_irqsave(&pl330->pool_lock, flags);
+			spin_lock_irqsave(&pl330->pool_lock, iflags);
 			while (!list_empty(&first->node)) {
 				desc = list_entry(first->node.next,
 			list_move_tail(&first->node, &pl330->desc_pool);
-			spin_unlock_irqrestore(&pl330->pool_lock, flags);
+			spin_unlock_irqrestore(&pl330->pool_lock, iflags);
 			return NULL;
 		}

drivers/dma/qcom/Kconfig+1−0

@@ -33,6 +33,7 @@ config QCOM_GPI_DMA · 32 unmodified lines
33		33
34	config QCOM_HIDMA_MGMT	34	config QCOM_HIDMA_MGMT
35	tristate "Qualcomm Technologies HIDMA Management support"	35	tristate "Qualcomm Technologies HIDMA Management support"
		36	depends on HAS_IOMEM
36	select DMA_ENGINE	37	select DMA_ENGINE
37	help	38	help
38	Enable support for the Qualcomm Technologies HIDMA Management.	39	Enable support for the Qualcomm Technologies HIDMA Management.

drivers/dma/sf-pdma/Kconfig+1−0

@@ -1,5 +1,6 @@
1	config SF_PDMA	1	config SF_PDMA
2	tristate "Sifive PDMA controller driver"	2	tristate "Sifive PDMA controller driver"
		3	depends on HAS_IOMEM
3	select DMA_ENGINE	4	select DMA_ENGINE
4	select DMA_VIRTUAL_CHANNELS	5	select DMA_VIRTUAL_CHANNELS
5	help	6	help

drivers/dma/sh/rcar-dmac.c+1−1

@@ -1913,7 +1913,7 @@ static int rcar_dmac_probe(struct platform_device *pdev) · 1912 unmodified lines
1913		1913
1914	/* Enable runtime PM and initialize the device. */	1914	/* Enable runtime PM and initialize the device. */
1915	pm_runtime_enable(&pdev->dev);	1915	pm_runtime_enable(&pdev->dev);
1916	ret = pm_runtime_get_sync(&pdev->dev);	1916	ret = pm_runtime_resume_and_get(&pdev->dev);
1917	if (ret < 0) {	1917	if (ret < 0) {
1918	dev_err(&pdev->dev, "runtime PM get sync failed (%d)\n", ret);	1918	dev_err(&pdev->dev, "runtime PM get sync failed (%d)\n", ret);
1919	return ret;	1919	return ret;

drivers/dma/ste_dma40.c+3−0

@@ -3675,6 +3675,9 @@ static int __init d40_probe(struct platform_device *pdev) · 3674 unmodified lines
3675		3675
3676	kfree(base->lcla_pool.base_unaligned);	3676	kfree(base->lcla_pool.base_unaligned);
3677		3677
		3678	if (base->lcpa_base)
		3679	iounmap(base->lcpa_base);
		3680
3678	if (base->phy_lcpa)	3681	if (base->phy_lcpa)
3679	release_mem_region(base->phy_lcpa,	3682	release_mem_region(base->phy_lcpa,
3680	base->lcpa_size);	3683	base->lcpa_size);

drivers/dma/stm32-mdma.c+2−2

@@ -1452,7 +1452,7 @@ static int stm32_mdma_alloc_chan_resources(struct dma_chan *c) · 1451 unmodified lines
1452	return -ENOMEM;	1452	return -ENOMEM;
1453	}	1453	}
1454		1454
1455	ret = pm_runtime_get_sync(dmadev->ddev.dev);	1455	ret = pm_runtime_resume_and_get(dmadev->ddev.dev);
1456	if (ret < 0)	1456	if (ret < 0)
1457	return ret;	1457	return ret;
1458		1458
@@ -1718,7 +1718,7 @@ static int stm32_mdma_pm_suspend(struct device *dev) · 259 unmodified lines
1718	u32 ccr, id;	1718	u32 ccr, id;
1719	int ret;	1719	int ret;
1720		1720
1721	ret = pm_runtime_get_sync(dev);	1721	ret = pm_runtime_resume_and_get(dev);
1722	if (ret < 0)	1722	if (ret < 0)
1723	return ret;	1723	return ret;
1724		1724

drivers/dma/xilinx/xilinx_dpdma.c+28−3

 #define XILINX_DPDMA_CH_VDO				0x020
 #define XILINX_DPDMA_CH_PYLD_SZ				0x024
 #define XILINX_DPDMA_CH_DESC_ID				0x028
+#define XILINX_DPDMA_CH_DESC_ID_MASK			GENMASK(15, 0)
 /* DPDMA descriptor fields */
 #define XILINX_DPDMA_DESC_CONTROL_PREEMBLE		0xa5
 	 * will be used, but it should be enough.
 	 */
 	list_for_each_entry(sw_desc, &desc->descriptors, node)
-		sw_desc->hw.desc_id = desc->vdesc.tx.cookie;
+		sw_desc->hw.desc_id = desc->vdesc.tx.cookie
+				    & XILINX_DPDMA_CH_DESC_ID_MASK;
 	sw_desc = list_first_entry(&desc->descriptors,
 				   struct xilinx_dpdma_sw_desc, node);
 	if (!chan->running || !pending)
 		goto out;
-	desc_id = dpdma_read(chan->reg, XILINX_DPDMA_CH_DESC_ID);
+	desc_id = dpdma_read(chan->reg, XILINX_DPDMA_CH_DESC_ID)
+		& XILINX_DPDMA_CH_DESC_ID_MASK;
 	/* If the retrigger raced with vsync, retry at the next frame. */
 	sw_desc = list_first_entry(&pending->descriptors,
  */
 static void xilinx_dpdma_disable_irq(struct xilinx_dpdma_device *xdev)
 {
-	dpdma_write(xdev->reg, XILINX_DPDMA_IDS, XILINX_DPDMA_INTR_ERR_ALL);
+	dpdma_write(xdev->reg, XILINX_DPDMA_IDS, XILINX_DPDMA_INTR_ALL);
 	dpdma_write(xdev->reg, XILINX_DPDMA_EIDS, XILINX_DPDMA_EINTR_ALL);
 }
 	return dma_get_slave_channel(&xdev->chan[chan_id]->vchan.chan);
 }
+static void dpdma_hw_init(struct xilinx_dpdma_device *xdev)
+{
+	unsigned int i;
+	void __iomem *reg;
+	/* Disable all interrupts */
+	xilinx_dpdma_disable_irq(xdev);
+	/* Stop all channels */
+	for (i = 0; i < ARRAY_SIZE(xdev->chan); i++) {
+		reg = xdev->reg + XILINX_DPDMA_CH_BASE
+				+ XILINX_DPDMA_CH_OFFSET * i;
+		dpdma_clr(reg, XILINX_DPDMA_CH_CNTL, XILINX_DPDMA_CH_CNTL_ENABLE);
+	}
+	/* Clear the interrupt status registers */
+	dpdma_write(xdev->reg, XILINX_DPDMA_ISR, XILINX_DPDMA_INTR_ALL);
+	dpdma_write(xdev->reg, XILINX_DPDMA_EISR, XILINX_DPDMA_EINTR_ALL);
+}
 static int xilinx_dpdma_probe(struct platform_device *pdev)
 {
 	struct xilinx_dpdma_device *xdev;
 	if (IS_ERR(xdev->reg))
 		return PTR_ERR(xdev->reg);
+	dpdma_hw_init(xdev);
 	xdev->irq = platform_get_irq(pdev, 0);
 	if (xdev->irq < 0) {
 		dev_err(xdev->dev, "failed to get platform irq\n");

drivers/dma/xilinx/zynqmp_dma.c+1−1

@@ -468,7 +468,7 @@ static int zynqmp_dma_alloc_chan_resources(struct dma_chan *dchan) · 467 unmodified lines
468	struct zynqmp_dma_desc_sw *desc;	468	struct zynqmp_dma_desc_sw *desc;
469	int i, ret;	469	int i, ret;
470		470
471	ret = pm_runtime_get_sync(chan->dev);	471	ret = pm_runtime_resume_and_get(chan->dev);
472	if (ret < 0)	472	if (ret < 0)
473	return ret;	473	return ret;
474		474

drivers/firmware/efi/cper.c+1−3

 	if (!msg || !(mem->validation_bits & CPER_MEM_VALID_MODULE_HANDLE))
 		return 0;
-	n = 0;
+	len = CPER_REC_LEN;
-	len = CPER_REC_LEN - 1;
 	dmi_memdev_name(mem->mem_dev_handle, &bank, &device);
 	if (bank && device)
 		n = snprintf(msg, len, "DIMM location: %s %s ", bank, device);
 			     "DIMM location: not present. DMI handle: 0x%.4x ",
 			     mem->mem_dev_handle);
-	msg[n] = '\0';
 	return n;
 }

drivers/firmware/efi/fdtparams.c+3−0

@@ -98,6 +98,9 @@ u64 __init efi_get_fdt_params(struct efi_memory_map_data *mm) · 97 unmodified lines
98	BUILD_BUG_ON(ARRAY_SIZE(target) != ARRAY_SIZE(name));	98	BUILD_BUG_ON(ARRAY_SIZE(target) != ARRAY_SIZE(name));
99	BUILD_BUG_ON(ARRAY_SIZE(target) != ARRAY_SIZE(dt_params[0].params));	99	BUILD_BUG_ON(ARRAY_SIZE(target) != ARRAY_SIZE(dt_params[0].params));
100		100
		101	if (!fdt)
		102	return 0;
		103
101	for (i = 0; i < ARRAY_SIZE(dt_params); i++) {	104	for (i = 0; i < ARRAY_SIZE(dt_params); i++) {
102	node = fdt_path_offset(fdt, dt_params[i].path);	105	node = fdt_path_offset(fdt, dt_params[i].path);
103	if (node < 0)	106	if (node < 0)

drivers/firmware/efi/libstub/file.c+1−1

@@ -103,7 +103,7 @@ static int find_file_option(const efi_char16_t *cmdline, int cmdline_len, · 102 unmodified lines
103	return 0;	103	return 0;
104		104
105	/* Skip any leading slashes */	105	/* Skip any leading slashes */
106	while (cmdline[i] == L'/' \|\| cmdline[i] == L'\\')	106	while (i < cmdline_len && (cmdline[i] == L'/' \|\| cmdline[i] == L'\\'))
107	i++;	107	i++;
108		108
109	while (--result_len > 0 && i < cmdline_len) {	109	while (--result_len > 0 && i < cmdline_len) {

drivers/firmware/efi/memattr.c+0−5

 		return false;
 	}
-	if (!(in->attribute & (EFI_MEMORY_RO | EFI_MEMORY_XP))) {
-		pr_warn("Entry attributes invalid: RO and XP bits both cleared\n");
-		return false;
-	}
 	if (PAGE_SIZE > EFI_PAGE_SIZE &&
 	    (!PAGE_ALIGNED(in->phys_addr) ||
 	     !PAGE_ALIGNED(in->num_pages << EFI_PAGE_SHIFT))) {

drivers/gpio/gpio-wcd934x.c+1−1

@@ -7,7 +7,7 @@ · 6 unmodified lines
7	#include <linux/slab.h>	7	#include <linux/slab.h>
8	#include <linux/of_device.h>	8	#include <linux/of_device.h>
9		9
10	#define WCD_PIN_MASK(p) BIT(p - 1)	10	#define WCD_PIN_MASK(p) BIT(p)
11	#define WCD_REG_DIR_CTL_OFFSET 0x42	11	#define WCD_REG_DIR_CTL_OFFSET 0x42
12	#define WCD_REG_VAL_CTL_OFFSET 0x43	12	#define WCD_REG_VAL_CTL_OFFSET 0x43
13	#define WCD934X_NPINS 5	13	#define WCD934X_NPINS 5

drivers/gpu/drm/drm_auth.c+2−1

 void drm_master_release(struct drm_file *file_priv)
 {
 	struct drm_device *dev = file_priv->minor->dev;
-	struct drm_master *master = file_priv->master;
+	struct drm_master *master;
 	mutex_lock(&dev->master_mutex);
+	master = file_priv->master;
 	if (file_priv->magic)
 		idr_remove(&file_priv->master->magic_map, file_priv->magic);

drivers/gpu/drm/drm_ioctl.c+5−4

 		  struct drm_file *file_priv)
 {
 	struct drm_unique *u = data;
-	struct drm_master *master = file_priv->master;
+	struct drm_master *master;
-	mutex_lock(&master->dev->master_mutex);
+	mutex_lock(&dev->master_mutex);
+	master = file_priv->master;
 	if (u->unique_len >= master->unique_len) {
 		if (copy_to_user(u->unique, master->unique, master->unique_len)) {
-			mutex_unlock(&master->dev->master_mutex);
+			mutex_unlock(&dev->master_mutex);
 			return -EFAULT;
 		}
 	}
 	u->unique_len = master->unique_len;
-	mutex_unlock(&master->dev->master_mutex);
+	mutex_unlock(&dev->master_mutex);
 	return 0;
 }

drivers/gpu/drm/mcde/mcde_dsi.c+1−1

@@ -577,7 +577,7 @@ static void mcde_dsi_setup_video_mode(struct mcde_dsi *d, · 576 unmodified lines
577	* porches and sync.	577	* porches and sync.
578	*/	578	*/
579	/* (ps/s) / (pixels/s) = ps/pixels */	579	/* (ps/s) / (pixels/s) = ps/pixels */
580	pclk = DIV_ROUND_UP_ULL(1000000000000, mode->clock);	580	pclk = DIV_ROUND_UP_ULL(1000000000000, (mode->clock * 1000));
581	dev_dbg(d->dev, "picoseconds between two pixels: %llu\n",	581	dev_dbg(d->dev, "picoseconds between two pixels: %llu\n",
582	pclk);	582	pclk);
583		583

drivers/gpu/drm/meson/meson_drv.c+5−4

@@ -474,11 +474,12 @@ static int meson_probe_remote(struct platform_device *pdev, · 473 unmodified lines
474	static void meson_drv_shutdown(struct platform_device *pdev)	474	static void meson_drv_shutdown(struct platform_device *pdev)
475	{	475	{
476	struct meson_drm *priv = dev_get_drvdata(&pdev->dev);	476	struct meson_drm *priv = dev_get_drvdata(&pdev->dev);
477	struct drm_device *drm = priv->drm;
478		477
479	DRM_DEBUG_DRIVER("\n");	478	if (!priv)
480	drm_kms_helper_poll_fini(drm);	479	return;
481	drm_atomic_helper_shutdown(drm);	480
		481	drm_kms_helper_poll_fini(priv->drm);
		482	drm_atomic_helper_shutdown(priv->drm);
482	}	483	}
483		484
484	static int meson_drv_probe(struct platform_device *pdev)	485	static int meson_drv_probe(struct platform_device *pdev)

drivers/gpu/drm/msm/adreno/a6xx_gpu.c+114−41

@@ -157,7 +157,7 @@ static void a6xx_submit(struct msm_gpu gpu, struct msm_gem_submit submit) · 156 unmodified lines
157	* GPU registers so we need to add 0x1a800 to the register value on A630	157	* GPU registers so we need to add 0x1a800 to the register value on A630
158	* to get the right value from PM4.	158	* to get the right value from PM4.
159	*/	159	*/
160	get_stats_counter(ring, REG_A6XX_GMU_ALWAYS_ON_COUNTER_L + 0x1a800,	160	get_stats_counter(ring, REG_A6XX_CP_ALWAYS_ON_COUNTER_LO,
161	rbmemptr_stats(ring, index, alwayson_start));	161	rbmemptr_stats(ring, index, alwayson_start));
162		162
163	/* Invalidate CCU depth and color */	163	/* Invalidate CCU depth and color */
@@ -187,7 +187,7 @@ static void a6xx_submit(struct msm_gpu gpu, struct msm_gem_submit submit) · 23 unmodified lines
187		187
188	get_stats_counter(ring, REG_A6XX_RBBM_PERFCTR_CP_0_LO,	188	get_stats_counter(ring, REG_A6XX_RBBM_PERFCTR_CP_0_LO,
189	rbmemptr_stats(ring, index, cpcycles_end));	189	rbmemptr_stats(ring, index, cpcycles_end));
190	get_stats_counter(ring, REG_A6XX_GMU_ALWAYS_ON_COUNTER_L + 0x1a800,	190	get_stats_counter(ring, REG_A6XX_CP_ALWAYS_ON_COUNTER_LO,
191	rbmemptr_stats(ring, index, alwayson_end));	191	rbmemptr_stats(ring, index, alwayson_end));
192		192
193	/* Write the fence to the scratch register */	193	/* Write the fence to the scratch register */
@@ -206,8 +206,8 @@ static void a6xx_submit(struct msm_gpu gpu, struct msm_gem_submit submit) · 12 unmodified lines
206	OUT_RING(ring, submit->seqno);	206	OUT_RING(ring, submit->seqno);
207		207
208	trace_msm_gpu_submit_flush(submit,	208	trace_msm_gpu_submit_flush(submit,
209	gmu_read64(&a6xx_gpu->gmu, REG_A6XX_GMU_ALWAYS_ON_COUNTER_L,	209	gpu_read64(gpu, REG_A6XX_CP_ALWAYS_ON_COUNTER_LO,
210	REG_A6XX_GMU_ALWAYS_ON_COUNTER_H));	210	REG_A6XX_CP_ALWAYS_ON_COUNTER_HI));
211		211
212	a6xx_flush(gpu, ring);	212	a6xx_flush(gpu, ring);
213	}	213	}
@@ -462,6 +462,113 @@ static void a6xx_set_hwcg(struct msm_gpu *gpu, bool state) · 248 unmodified lines
462	gpu_write(gpu, REG_A6XX_RBBM_CLOCK_CNTL, state ? clock_cntl_on : 0);	462	gpu_write(gpu, REG_A6XX_RBBM_CLOCK_CNTL, state ? clock_cntl_on : 0);
463	}	463	}
464		464
		465	/* For a615, a616, a618, A619, a630, a640 and a680 */
		466	static const u32 a6xx_protect[] = {
		467	A6XX_PROTECT_RDONLY(0x00000, 0x04ff),
		468	A6XX_PROTECT_RDONLY(0x00501, 0x0005),
		469	A6XX_PROTECT_RDONLY(0x0050b, 0x02f4),
		470	A6XX_PROTECT_NORDWR(0x0050e, 0x0000),
		471	A6XX_PROTECT_NORDWR(0x00510, 0x0000),
		472	A6XX_PROTECT_NORDWR(0x00534, 0x0000),
		473	A6XX_PROTECT_NORDWR(0x00800, 0x0082),
		474	A6XX_PROTECT_NORDWR(0x008a0, 0x0008),
		475	A6XX_PROTECT_NORDWR(0x008ab, 0x0024),
		476	A6XX_PROTECT_RDONLY(0x008de, 0x00ae),
		477	A6XX_PROTECT_NORDWR(0x00900, 0x004d),
		478	A6XX_PROTECT_NORDWR(0x0098d, 0x0272),
		479	A6XX_PROTECT_NORDWR(0x00e00, 0x0001),
		480	A6XX_PROTECT_NORDWR(0x00e03, 0x000c),
		481	A6XX_PROTECT_NORDWR(0x03c00, 0x00c3),
		482	A6XX_PROTECT_RDONLY(0x03cc4, 0x1fff),
		483	A6XX_PROTECT_NORDWR(0x08630, 0x01cf),
		484	A6XX_PROTECT_NORDWR(0x08e00, 0x0000),
		485	A6XX_PROTECT_NORDWR(0x08e08, 0x0000),
		486	A6XX_PROTECT_NORDWR(0x08e50, 0x001f),
		487	A6XX_PROTECT_NORDWR(0x09624, 0x01db),
		488	A6XX_PROTECT_NORDWR(0x09e70, 0x0001),
		489	A6XX_PROTECT_NORDWR(0x09e78, 0x0187),
		490	A6XX_PROTECT_NORDWR(0x0a630, 0x01cf),
		491	A6XX_PROTECT_NORDWR(0x0ae02, 0x0000),
		492	A6XX_PROTECT_NORDWR(0x0ae50, 0x032f),
		493	A6XX_PROTECT_NORDWR(0x0b604, 0x0000),
		494	A6XX_PROTECT_NORDWR(0x0be02, 0x0001),
		495	A6XX_PROTECT_NORDWR(0x0be20, 0x17df),
		496	A6XX_PROTECT_NORDWR(0x0f000, 0x0bff),
		497	A6XX_PROTECT_RDONLY(0x0fc00, 0x1fff),
		498	A6XX_PROTECT_NORDWR(0x11c00, 0x0000), /* note: infinite range */
		499	};
		500
		501	/* These are for a620 and a650 */
		502	static const u32 a650_protect[] = {
		503	A6XX_PROTECT_RDONLY(0x00000, 0x04ff),
		504	A6XX_PROTECT_RDONLY(0x00501, 0x0005),
		505	A6XX_PROTECT_RDONLY(0x0050b, 0x02f4),
		506	A6XX_PROTECT_NORDWR(0x0050e, 0x0000),
		507	A6XX_PROTECT_NORDWR(0x00510, 0x0000),
		508	A6XX_PROTECT_NORDWR(0x00534, 0x0000),
		509	A6XX_PROTECT_NORDWR(0x00800, 0x0082),
		510	A6XX_PROTECT_NORDWR(0x008a0, 0x0008),
		511	A6XX_PROTECT_NORDWR(0x008ab, 0x0024),
		512	A6XX_PROTECT_RDONLY(0x008de, 0x00ae),
		513	A6XX_PROTECT_NORDWR(0x00900, 0x004d),
		514	A6XX_PROTECT_NORDWR(0x0098d, 0x0272),
		515	A6XX_PROTECT_NORDWR(0x00e00, 0x0001),
		516	A6XX_PROTECT_NORDWR(0x00e03, 0x000c),
		517	A6XX_PROTECT_NORDWR(0x03c00, 0x00c3),
		518	A6XX_PROTECT_RDONLY(0x03cc4, 0x1fff),
		519	A6XX_PROTECT_NORDWR(0x08630, 0x01cf),
		520	A6XX_PROTECT_NORDWR(0x08e00, 0x0000),
		521	A6XX_PROTECT_NORDWR(0x08e08, 0x0000),
		522	A6XX_PROTECT_NORDWR(0x08e50, 0x001f),
		523	A6XX_PROTECT_NORDWR(0x08e80, 0x027f),
		524	A6XX_PROTECT_NORDWR(0x09624, 0x01db),
		525	A6XX_PROTECT_NORDWR(0x09e60, 0x0011),
		526	A6XX_PROTECT_NORDWR(0x09e78, 0x0187),
		527	A6XX_PROTECT_NORDWR(0x0a630, 0x01cf),
		528	A6XX_PROTECT_NORDWR(0x0ae02, 0x0000),
		529	A6XX_PROTECT_NORDWR(0x0ae50, 0x032f),
		530	A6XX_PROTECT_NORDWR(0x0b604, 0x0000),
		531	A6XX_PROTECT_NORDWR(0x0b608, 0x0007),
		532	A6XX_PROTECT_NORDWR(0x0be02, 0x0001),
		533	A6XX_PROTECT_NORDWR(0x0be20, 0x17df),
		534	A6XX_PROTECT_NORDWR(0x0f000, 0x0bff),
		535	A6XX_PROTECT_RDONLY(0x0fc00, 0x1fff),
		536	A6XX_PROTECT_NORDWR(0x18400, 0x1fff),
		537	A6XX_PROTECT_NORDWR(0x1a800, 0x1fff),
		538	A6XX_PROTECT_NORDWR(0x1f400, 0x0443),
		539	A6XX_PROTECT_RDONLY(0x1f844, 0x007b),
		540	A6XX_PROTECT_NORDWR(0x1f887, 0x001b),
		541	A6XX_PROTECT_NORDWR(0x1f8c0, 0x0000), /* note: infinite range */
		542	};
		543
		544	static void a6xx_set_cp_protect(struct msm_gpu *gpu)
		545	{
		546	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
		547	const u32 *regs = a6xx_protect;
		548	unsigned i, count = ARRAY_SIZE(a6xx_protect), count_max = 32;
		549
		550	BUILD_BUG_ON(ARRAY_SIZE(a6xx_protect) > 32);
		551	BUILD_BUG_ON(ARRAY_SIZE(a650_protect) > 48);
		552
		553	if (adreno_is_a650(adreno_gpu)) {
		554	regs = a650_protect;
		555	count = ARRAY_SIZE(a650_protect);
		556	count_max = 48;
		557	}
		558
		559	/*
		560	* Enable access protection to privileged registers, fault on an access
		561	* protect violation and select the last span to protect from the start
		562	* address all the way to the end of the register address space
		563	*/
		564	gpu_write(gpu, REG_A6XX_CP_PROTECT_CNTL, BIT(0) \| BIT(1) \| BIT(3));
		565
		566	for (i = 0; i < count - 1; i++)
		567	gpu_write(gpu, REG_A6XX_CP_PROTECT(i), regs[i]);
		568	/* last CP_PROTECT to have "infinite" length on the last entry */
		569	gpu_write(gpu, REG_A6XX_CP_PROTECT(count_max - 1), regs[i]);
		570	}
		571
465	static void a6xx_set_ubwc_config(struct msm_gpu *gpu)	572	static void a6xx_set_ubwc_config(struct msm_gpu *gpu)
466	{	573	{
467	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);	574	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
@@ -489,7 +596,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu) · 21 unmodified lines
489	rgb565_predicator << 11 \| amsbc << 4 \| lower_bit << 1);	596	rgb565_predicator << 11 \| amsbc << 4 \| lower_bit << 1);
490	gpu_write(gpu, REG_A6XX_TPL1_NC_MODE_CNTL, lower_bit << 1);	597	gpu_write(gpu, REG_A6XX_TPL1_NC_MODE_CNTL, lower_bit << 1);
491	gpu_write(gpu, REG_A6XX_SP_NC_MODE_CNTL,	598	gpu_write(gpu, REG_A6XX_SP_NC_MODE_CNTL,
492	uavflagprd_inv >> 4 \| lower_bit << 1);	599	uavflagprd_inv << 4 \| lower_bit << 1);
493	gpu_write(gpu, REG_A6XX_UCHE_MODE_CNTL, lower_bit << 21);	600	gpu_write(gpu, REG_A6XX_UCHE_MODE_CNTL, lower_bit << 21);
494	}	601	}
495		602
@@ -776,41 +883,7 @@ static int a6xx_hw_init(struct msm_gpu *gpu) · 280 unmodified lines
776	}	883	}
777		884
778	/* Protect registers from the CP */	885	/* Protect registers from the CP */
779	gpu_write(gpu, REG_A6XX_CP_PROTECT_CNTL, 0x00000003);	886	a6xx_set_cp_protect(gpu);
780
781	gpu_write(gpu, REG_A6XX_CP_PROTECT(0),
782	A6XX_PROTECT_RDONLY(0x600, 0x51));
783	gpu_write(gpu, REG_A6XX_CP_PROTECT(1), A6XX_PROTECT_RW(0xae50, 0x2));
784	gpu_write(gpu, REG_A6XX_CP_PROTECT(2), A6XX_PROTECT_RW(0x9624, 0x13));
785	gpu_write(gpu, REG_A6XX_CP_PROTECT(3), A6XX_PROTECT_RW(0x8630, 0x8));
786	gpu_write(gpu, REG_A6XX_CP_PROTECT(4), A6XX_PROTECT_RW(0x9e70, 0x1));
787	gpu_write(gpu, REG_A6XX_CP_PROTECT(5), A6XX_PROTECT_RW(0x9e78, 0x187));
788	gpu_write(gpu, REG_A6XX_CP_PROTECT(6), A6XX_PROTECT_RW(0xf000, 0x810));
789	gpu_write(gpu, REG_A6XX_CP_PROTECT(7),
790	A6XX_PROTECT_RDONLY(0xfc00, 0x3));
791	gpu_write(gpu, REG_A6XX_CP_PROTECT(8), A6XX_PROTECT_RW(0x50e, 0x0));
792	gpu_write(gpu, REG_A6XX_CP_PROTECT(9), A6XX_PROTECT_RDONLY(0x50f, 0x0));
793	gpu_write(gpu, REG_A6XX_CP_PROTECT(10), A6XX_PROTECT_RW(0x510, 0x0));
794	gpu_write(gpu, REG_A6XX_CP_PROTECT(11),
795	A6XX_PROTECT_RDONLY(0x0, 0x4f9));
796	gpu_write(gpu, REG_A6XX_CP_PROTECT(12),
797	A6XX_PROTECT_RDONLY(0x501, 0xa));
798	gpu_write(gpu, REG_A6XX_CP_PROTECT(13),
799	A6XX_PROTECT_RDONLY(0x511, 0x44));
800	gpu_write(gpu, REG_A6XX_CP_PROTECT(14), A6XX_PROTECT_RW(0xe00, 0xe));
801	gpu_write(gpu, REG_A6XX_CP_PROTECT(15), A6XX_PROTECT_RW(0x8e00, 0x0));
802	gpu_write(gpu, REG_A6XX_CP_PROTECT(16), A6XX_PROTECT_RW(0x8e50, 0xf));
803	gpu_write(gpu, REG_A6XX_CP_PROTECT(17), A6XX_PROTECT_RW(0xbe02, 0x0));
804	gpu_write(gpu, REG_A6XX_CP_PROTECT(18),
805	A6XX_PROTECT_RW(0xbe20, 0x11f3));
806	gpu_write(gpu, REG_A6XX_CP_PROTECT(19), A6XX_PROTECT_RW(0x800, 0x82));
807	gpu_write(gpu, REG_A6XX_CP_PROTECT(20), A6XX_PROTECT_RW(0x8a0, 0x8));
808	gpu_write(gpu, REG_A6XX_CP_PROTECT(21), A6XX_PROTECT_RW(0x8ab, 0x19));
809	gpu_write(gpu, REG_A6XX_CP_PROTECT(22), A6XX_PROTECT_RW(0x900, 0x4d));
810	gpu_write(gpu, REG_A6XX_CP_PROTECT(23), A6XX_PROTECT_RW(0x98d, 0x76));
811	gpu_write(gpu, REG_A6XX_CP_PROTECT(24),
812	A6XX_PROTECT_RDONLY(0x980, 0x4));
813	gpu_write(gpu, REG_A6XX_CP_PROTECT(25), A6XX_PROTECT_RW(0xa630, 0x0));
814		887
815	/* Enable expanded apriv for targets that support it */	888	/* Enable expanded apriv for targets that support it */
816	if (gpu->hw_apriv) {	889	if (gpu->hw_apriv) {
@@ -1211,7 +1284,7 @@ static int a6xx_pm_suspend(struct msm_gpu *gpu) · 394 unmodified lines
1211	if (ret)	1284	if (ret)
1212	return ret;	1285	return ret;
1213		1286
1214	if (adreno_gpu->base.hw_apriv \|\| a6xx_gpu->has_whereami)	1287	if (a6xx_gpu->shadow_bo)
1215	for (i = 0; i < gpu->nr_rings; i++)	1288	for (i = 0; i < gpu->nr_rings; i++)
1216	a6xx_gpu->shadow[i] = 0;	1289	a6xx_gpu->shadow[i] = 0;
1217		1290

drivers/gpu/drm/msm/adreno/a6xx_gpu.h+1−1

@@ -44,7 +44,7 @@ struct a6xx_gpu { · 43 unmodified lines
44	* REG_CP_PROTECT_REG(n) - this will block both reads and writes for _len	44	* REG_CP_PROTECT_REG(n) - this will block both reads and writes for _len
45	* registers starting at _reg.	45	* registers starting at _reg.
46	*/	46	*/
47	#define A6XX_PROTECT_RW(_reg, _len) \	47	#define A6XX_PROTECT_NORDWR(_reg, _len) \
48	((1 << 31) \| \	48	((1 << 31) \| \
49	(((_len) & 0x3FFF) << 18) \| ((_reg) & 0x3FFFF))	49	(((_len) & 0x3FFF) << 18) \| ((_reg) & 0x3FFFF))
50		50

drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c+1−0

@@ -432,6 +432,7 @@ static unsigned long dsi_pll_10nm_vco_recalc_rate(struct clk_hw *hw, · 431 unmodified lines
432	pll_freq += div_u64(tmp64, multiplier);	432	pll_freq += div_u64(tmp64, multiplier);
433		433
434	vco_rate = pll_freq;	434	vco_rate = pll_freq;
		435	pll_10nm->vco_current_rate = vco_rate;
435		436
436	DBG("DSI PLL%d returning vco rate = %lu, dec = %x, frac = %x",	437	DBG("DSI PLL%d returning vco rate = %lu, dec = %x, frac = %x",
437	pll_10nm->phy->id, (unsigned long)vco_rate, dec, frac);	438	pll_10nm->phy->id, (unsigned long)vco_rate, dec, frac);

drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c+1−0

@@ -460,6 +460,7 @@ static unsigned long dsi_pll_7nm_vco_recalc_rate(struct clk_hw *hw, · 459 unmodified lines
460	pll_freq += div_u64(tmp64, multiplier);	460	pll_freq += div_u64(tmp64, multiplier);
461		461
462	vco_rate = pll_freq;	462	vco_rate = pll_freq;
		463	pll_7nm->vco_current_rate = vco_rate;
463		464
464	DBG("DSI PLL%d returning vco rate = %lu, dec = %x, frac = %x",	465	DBG("DSI PLL%d returning vco rate = %lu, dec = %x, frac = %x",
465	pll_7nm->phy->id, (unsigned long)vco_rate, dec, frac);	466	pll_7nm->phy->id, (unsigned long)vco_rate, dec, frac);

drivers/gpu/drm/msm/msm_gem.c+7−0

@@ -1240,6 +1240,13 @@ static struct drm_gem_object _msm_gem_new(struct drm_device dev, · 1239 unmodified lines
1240		1240
1241	to_msm_bo(obj)->vram_node = &vma->node;	1241	to_msm_bo(obj)->vram_node = &vma->node;
1242		1242
		1243	/* Call chain get_pages() -> update_inactive() tries to
		1244	* access msm_obj->mm_list, but it is not initialized yet.
		1245	* To avoid NULL pointer dereference error, initialize
		1246	* mm_list to be empty.
		1247	*/
		1248	INIT_LIST_HEAD(&msm_obj->mm_list);
		1249
1243	msm_gem_lock(obj);	1250	msm_gem_lock(obj);
1244	pages = get_pages(obj);	1251	pages = get_pages(obj);
1245	msm_gem_unlock(obj);	1252	msm_gem_unlock(obj);

drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c+27−4

@@ -209,7 +209,7 @@ static int sun8i_dw_hdmi_bind(struct device dev, struct device master, · 208 unmodified lines
209	goto err_disable_clk_tmds;	209	goto err_disable_clk_tmds;
210	}	210	}
211		211
212	ret = sun8i_hdmi_phy_probe(hdmi, phy_node);	212	ret = sun8i_hdmi_phy_get(hdmi, phy_node);
213	of_node_put(phy_node);	213	of_node_put(phy_node);
214	if (ret) {	214	if (ret) {
215	dev_err(dev, "Couldn't get the HDMI PHY\n");	215	dev_err(dev, "Couldn't get the HDMI PHY\n");
@@ -242,7 +242,6 @@ static int sun8i_dw_hdmi_bind(struct device dev, struct device master, · 26 unmodified lines
242		242
243	cleanup_encoder:	243	cleanup_encoder:
244	drm_encoder_cleanup(encoder);	244	drm_encoder_cleanup(encoder);
245	sun8i_hdmi_phy_remove(hdmi);
246	err_disable_clk_tmds:	245	err_disable_clk_tmds:
247	clk_disable_unprepare(hdmi->clk_tmds);	246	clk_disable_unprepare(hdmi->clk_tmds);
248	err_assert_ctrl_reset:	247	err_assert_ctrl_reset:
@@ -263,7 +262,6 @@ static void sun8i_dw_hdmi_unbind(struct device dev, struct device master, · 14 unmodified lines
263	struct sun8i_dw_hdmi *hdmi = dev_get_drvdata(dev);	262	struct sun8i_dw_hdmi *hdmi = dev_get_drvdata(dev);
264		263
265	dw_hdmi_unbind(hdmi->hdmi);	264	dw_hdmi_unbind(hdmi->hdmi);
266	sun8i_hdmi_phy_remove(hdmi);
267	clk_disable_unprepare(hdmi->clk_tmds);	265	clk_disable_unprepare(hdmi->clk_tmds);
268	reset_control_assert(hdmi->rst_ctrl);	266	reset_control_assert(hdmi->rst_ctrl);
269	gpiod_set_value(hdmi->ddc_en, 0);	267	gpiod_set_value(hdmi->ddc_en, 0);
@@ -320,7 +318,32 @@ static struct platform_driver sun8i_dw_hdmi_pltfm_driver = { · 50 unmodified lines
320	.of_match_table = sun8i_dw_hdmi_dt_ids,	318	.of_match_table = sun8i_dw_hdmi_dt_ids,
321	},	319	},
322	};	320	};
323	module_platform_driver(sun8i_dw_hdmi_pltfm_driver);	321
		322	static int __init sun8i_dw_hdmi_init(void)
		323	{
		324	int ret;
		325
		326	ret = platform_driver_register(&sun8i_dw_hdmi_pltfm_driver);
		327	if (ret)
		328	return ret;
		329
		330	ret = platform_driver_register(&sun8i_hdmi_phy_driver);
		331	if (ret) {
		332	platform_driver_unregister(&sun8i_dw_hdmi_pltfm_driver);
		333	return ret;
		334	}
		335
		336	return ret;
		337	}
		338
		339	static void __exit sun8i_dw_hdmi_exit(void)
		340	{
		341	platform_driver_unregister(&sun8i_dw_hdmi_pltfm_driver);
		342	platform_driver_unregister(&sun8i_hdmi_phy_driver);
		343	}
		344
		345	module_init(sun8i_dw_hdmi_init);
		346	module_exit(sun8i_dw_hdmi_exit);
324		347
325	MODULE_AUTHOR("Jernej Skrabec <jernej.skrabec@siol.net>");	348	MODULE_AUTHOR("Jernej Skrabec <jernej.skrabec@siol.net>");
326	MODULE_DESCRIPTION("Allwinner DW HDMI bridge");	349	MODULE_DESCRIPTION("Allwinner DW HDMI bridge");

drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h+3−2

 	struct gpio_desc		*ddc_en;
 };
+extern struct platform_driver sun8i_hdmi_phy_driver;
 static inline struct sun8i_dw_hdmi *
 encoder_to_sun8i_dw_hdmi(struct drm_encoder *encoder)
 {
 	return container_of(encoder, struct sun8i_dw_hdmi, encoder);
 }
-int sun8i_hdmi_phy_probe(struct sun8i_dw_hdmi *hdmi, struct device_node *node);
+int sun8i_hdmi_phy_get(struct sun8i_dw_hdmi *hdmi, struct device_node *node);
-void sun8i_hdmi_phy_remove(struct sun8i_dw_hdmi *hdmi);
 void sun8i_hdmi_phy_init(struct sun8i_hdmi_phy *phy);
 void sun8i_hdmi_phy_set_ops(struct sun8i_hdmi_phy *phy,

drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c+36−5

 #include <linux/delay.h>
 #include <linux/of_address.h>
+#include <linux/of_platform.h>
 #include "sun8i_dw_hdmi.h"
 	{ /* sentinel */ }
 };
-int sun8i_hdmi_phy_probe(struct sun8i_dw_hdmi *hdmi, struct device_node *node)
+int sun8i_hdmi_phy_get(struct sun8i_dw_hdmi *hdmi, struct device_node *node)
+{
+	struct platform_device *pdev = of_find_device_by_node(node);
+	struct sun8i_hdmi_phy *phy;
+	if (!pdev)
+		return -EPROBE_DEFER;
+	phy = platform_get_drvdata(pdev);
+	if (!phy)
+		return -EPROBE_DEFER;
+	hdmi->phy = phy;
+	put_device(&pdev->dev);
+	return 0;
+}
+static int sun8i_hdmi_phy_probe(struct platform_device *pdev)
 {
 	const struct of_device_id *match;
-	struct device *dev = hdmi->dev;
+	struct device *dev = &pdev->dev;
+	struct device_node *node = dev->of_node;
 	struct sun8i_hdmi_phy *phy;
 	struct resource res;
 	void __iomem *regs;
 		clk_prepare_enable(phy->clk_phy);
 	}
-	hdmi->phy = phy;
+	platform_set_drvdata(pdev, phy);
 	return 0;
 	return ret;
 }
-void sun8i_hdmi_phy_remove(struct sun8i_dw_hdmi *hdmi)
+static int sun8i_hdmi_phy_remove(struct platform_device *pdev)
 {
-	struct sun8i_hdmi_phy *phy = hdmi->phy;
+	struct sun8i_hdmi_phy *phy = platform_get_drvdata(pdev);
 	clk_disable_unprepare(phy->clk_mod);
 	clk_disable_unprepare(phy->clk_bus);
 	clk_put(phy->clk_pll1);
 	clk_put(phy->clk_mod);
 	clk_put(phy->clk_bus);
+	return 0;
 }
+struct platform_driver sun8i_hdmi_phy_driver = {
+	.probe  = sun8i_hdmi_phy_probe,
+	.remove = sun8i_hdmi_phy_remove,
+	.driver = {
+		.name = "sun8i-hdmi-phy",
+		.of_match_table = sun8i_hdmi_phy_of_table,
+	},
+};

drivers/gpu/drm/tegra/drm.h+1−1

@@ -25,7 +25,7 @@ · 24 unmodified lines
25	#include "trace.h"	25	#include "trace.h"
26		26
27	/* XXX move to include/uapi/drm/drm_fourcc.h? */	27	/* XXX move to include/uapi/drm/drm_fourcc.h? */
28	#define DRM_FORMAT_MOD_NVIDIA_SECTOR_LAYOUT BIT(22)	28	#define DRM_FORMAT_MOD_NVIDIA_SECTOR_LAYOUT BIT_ULL(22)
29		29
30	struct reset_control;	30	struct reset_control;
31		31

drivers/gpu/drm/tegra/hub.c+1−1

@@ -510,7 +510,7 @@ static void tegra_shared_plane_atomic_update(struct drm_plane *plane, · 509 unmodified lines
510	* dGPU sector layout.	510	* dGPU sector layout.
511	*/	511	*/
512	if (tegra_plane_state->tiling.sector_layout == TEGRA_BO_SECTOR_LAYOUT_GPU)	512	if (tegra_plane_state->tiling.sector_layout == TEGRA_BO_SECTOR_LAYOUT_GPU)
513	base \|= BIT(39);	513	base \|= BIT_ULL(39);
514	#endif	514	#endif
515		515
516	tegra_plane_writel(p, tegra_plane_state->format, DC_WIN_COLOR_DEPTH);	516	tegra_plane_writel(p, tegra_plane_state->format, DC_WIN_COLOR_DEPTH);

drivers/gpu/drm/tegra/sor.c+42−28

 		if (err < 0) {
 			dev_err(sor->dev, "failed to acquire SOR reset: %d\n",
 				err);
-			return err;
+			goto rpm_put;
 		}
 		err = reset_control_assert(sor->rst);
 		if (err < 0) {
 			dev_err(sor->dev, "failed to assert SOR reset: %d\n",
 				err);
-			return err;
+			goto rpm_put;
 		}
 	}
 	err = clk_prepare_enable(sor->clk);
 	if (err < 0) {
 		dev_err(sor->dev, "failed to enable clock: %d\n", err);
-		return err;
+		goto rpm_put;
 	}
 	usleep_range(1000, 3000);
 			dev_err(sor->dev, "failed to deassert SOR reset: %d\n",
 				err);
 			clk_disable_unprepare(sor->clk);
-			return err;
+			goto rpm_put;
 		}
 		reset_control_release(sor->rst);
 	}
 	return 0;
+rpm_put:
+	if (sor->rst)
+		pm_runtime_put(sor->dev);
+	return err;
 }
 static int tegra_sor_exit(struct host1x_client *client)
 		if (!sor->aux)
 			return -EPROBE_DEFER;
-		if (get_device(&sor->aux->ddc.dev)) {
+		if (get_device(sor->aux->dev))
-			if (try_module_get(sor->aux->ddc.owner))
+			sor->output.ddc = &sor->aux->ddc;
-				sor->output.ddc = &sor->aux->ddc;
-			else
-				put_device(&sor->aux->ddc.dev);
-		}
 	}
 	if (!sor->aux) {
 	err = tegra_sor_parse_dt(sor);
 	if (err < 0)
-		return err;
+		goto put_aux;
 	err = tegra_output_probe(&sor->output);
-	if (err < 0)
+	if (err < 0) {
-		return dev_err_probe(&pdev->dev, err,
+		dev_err_probe(&pdev->dev, err, "failed to probe output\n");
-				     "failed to probe output\n");
+		goto put_aux;
+	}
 	if (sor->ops && sor->ops->probe) {
 		err = sor->ops->probe(sor);
 	platform_set_drvdata(pdev, sor);
 	pm_runtime_enable(&pdev->dev);
-	INIT_LIST_HEAD(&sor->client.list);
+	host1x_client_init(&sor->client);
 	sor->client.ops = &sor_client_ops;
 	sor->client.dev = &pdev->dev;
-	err = host1x_client_register(&sor->client);
-	if (err < 0) {
-		dev_err(&pdev->dev, "failed to register host1x client: %d\n",
-			err);
-		goto rpm_disable;
-	}
 	/*
 	 * On Tegra210 and earlier, provide our own implementation for the
 	 * pad output clock.
 				      sor->index);
 		if (!name) {
 			err = -ENOMEM;
-			goto unregister;
+			goto uninit;
 		}
 		err = host1x_client_resume(&sor->client);
 		if (err < 0) {
 			dev_err(sor->dev, "failed to resume: %d\n", err);
-			goto unregister;
+			goto uninit;
 		}
 		sor->clk_pad = tegra_clk_sor_pad_register(sor, name);
 		err = PTR_ERR(sor->clk_pad);
 		dev_err(sor->dev, "failed to register SOR pad clock: %d\n",
 			err);
-		goto unregister;
+		goto uninit;
+	}
+	err = __host1x_client_register(&sor->client);
+	if (err < 0) {
+		dev_err(&pdev->dev, "failed to register host1x client: %d\n",
+			err);
+		goto uninit;
 	}
 	return 0;
-unregister:
+uninit:
-	host1x_client_unregister(&sor->client);
+	host1x_client_exit(&sor->client);
-rpm_disable:
 	pm_runtime_disable(&pdev->dev);
 remove:
+	if (sor->aux)
+		sor->output.ddc = NULL;
 	tegra_output_remove(&sor->output);
+put_aux:
+	if (sor->aux)
+		put_device(sor->aux->dev);
 	return err;
 }
 	pm_runtime_disable(&pdev->dev);
+	if (sor->aux) {
+		put_device(sor->aux->dev);
+		sor->output.ddc = NULL;
+	}
 	tegra_output_remove(&sor->output);
 	return 0;

drivers/gpu/drm/ttm/ttm_bo.c+4−1

 	if (!ttm_bo_evict_swapout_allowable(bo, ctx, &place, &locked, NULL))
 		return -EBUSY;
-	if (!ttm_bo_get_unless_zero(bo)) {
+	if (!bo->ttm || !ttm_tt_is_populated(bo->ttm) ||
+	    bo->ttm->page_flags & TTM_PAGE_FLAG_SG ||
+	    bo->ttm->page_flags & TTM_PAGE_FLAG_SWAPPED ||
+	    !ttm_bo_get_unless_zero(bo)) {
 		if (locked)
 			dma_resv_unlock(bo->base.resv);
 		return -EBUSY;

drivers/gpu/drm/ttm/ttm_device.c+1−7

 		for (j = 0; j < TTM_MAX_BO_PRIORITY; ++j) {
 			list_for_each_entry(bo, &man->lru[j], lru) {
-				uint32_t num_pages;
+				uint32_t num_pages = PFN_UP(bo->base.size);
-				if (!bo->ttm ||
-				    bo->ttm->page_flags & TTM_PAGE_FLAG_SG ||
-				    bo->ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)
-					continue;
-				num_pages = bo->ttm->num_pages;
 				ret = ttm_bo_swapout(bo, ctx, gfp_flags);
 				/* ttm_bo_swapout has dropped the lru_lock */
 				if (!ret)

drivers/gpu/drm/vc4/vc4_kms.c+1−1

@@ -372,7 +372,7 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state) · 371 unmodified lines
372	if (!old_hvs_state->fifo_state[channel].in_use)	372	if (!old_hvs_state->fifo_state[channel].in_use)
373	continue;	373	continue;
374		374
375	ret = drm_crtc_commit_wait(old_hvs_state->fifo_state[i].pending_commit);	375	ret = drm_crtc_commit_wait(old_hvs_state->fifo_state[channel].pending_commit);
376	if (ret)	376	if (ret)
377	drm_err(dev, "Timed out waiting for commit\n");	377	drm_err(dev, "Timed out waiting for commit\n");
378	}	378	}

drivers/gpu/host1x/bus.c+24−6

@@ -735,6 +735,29 @@ void host1x_driver_unregister(struct host1x_driver *driver) · 734 unmodified lines
735	}	735	}
736	EXPORT_SYMBOL(host1x_driver_unregister);	736	EXPORT_SYMBOL(host1x_driver_unregister);
737		737
		738	/**
		739	* __host1x_client_init() - initialize a host1x client
		740	* @client: host1x client
		741	* @key: lock class key for the client-specific mutex
		742	*/
		743	void __host1x_client_init(struct host1x_client client, struct lock_class_key key)
		744	{
		745	INIT_LIST_HEAD(&client->list);
		746	__mutex_init(&client->lock, "host1x client lock", key);
		747	client->usecount = 0;
		748	}
		749	EXPORT_SYMBOL(__host1x_client_init);
		750
		751	/**
		752	* host1x_client_exit() - uninitialize a host1x client
		753	* @client: host1x client
		754	*/
		755	void host1x_client_exit(struct host1x_client *client)
		756	{
		757	mutex_destroy(&client->lock);
		758	}
		759	EXPORT_SYMBOL(host1x_client_exit);
		760
738	/**	761	/**
739	* __host1x_client_register() - register a host1x client	762	* __host1x_client_register() - register a host1x client
740	* @client: host1x client	763	* @client: host1x client
@@ -747,16 +770,11 @@ EXPORT_SYMBOL(host1x_driver_unregister); · 6 unmodified lines
747	* device and call host1x_device_init(), which will in turn call each client's	770	* device and call host1x_device_init(), which will in turn call each client's
748	* &host1x_client_ops.init implementation.	771	* &host1x_client_ops.init implementation.
749	*/	772	*/
750	int __host1x_client_register(struct host1x_client *client,	773	int __host1x_client_register(struct host1x_client *client)
751	struct lock_class_key *key)
752	{	774	{
753	struct host1x *host1x;	775	struct host1x *host1x;
754	int err;	776	int err;
755		777
756	INIT_LIST_HEAD(&client->list);
757	__mutex_init(&client->lock, "host1x client lock", key);
758	client->usecount = 0;
759
760	mutex_lock(&devices_lock);	778	mutex_lock(&devices_lock);
761		779
762	list_for_each_entry(host1x, &devices, list) {	780	list_for_each_entry(host1x, &devices, list) {

drivers/hid/Kconfig+17−2

 	depends on HID
 config HID_A4TECH
-	tristate "A4 tech mice"
+	tristate "A4TECH mice"
 	depends on HID
 	default !EXPERT
 	help
-	Support for A4 tech X5 and WOP-35 / Trust 450L mice.
+	Support for some A4TECH mice with two scroll wheels.
 config HID_ACCUTOUCH
 	tristate "Accutouch touch device"
 	help
 	Support for Samsung InfraRed remote control or keyboards.
+config HID_SEMITEK
+	tristate "Semitek USB keyboards"
+	depends on HID
+	help
+	Support for Semitek USB keyboards that are not fully compliant
+	with the HID standard.
+	There are many variants, including:
+	- GK61, GK64, GK68, GK84, GK96, etc.
+	- SK61, SK64, SK68, SK84, SK96, etc.
+	- Dierya DK61/DK66
+	- Tronsmart TK09R
+	- Woo-dy
+	- X-Bows Nature/Knight
 config HID_SONY
 	tristate "Sony PS2/3/4 accessories"
 	depends on USB_HID

drivers/hid/Makefile+1−0

@@ -106,6 +106,7 @@ obj-$(CONFIG_HID_ROCCAT) += hid-roccat.o hid-roccat-common.o \ · 105 unmodified lines
106	obj-$(CONFIG_HID_RMI) += hid-rmi.o	106	obj-$(CONFIG_HID_RMI) += hid-rmi.o
107	obj-$(CONFIG_HID_SAITEK) += hid-saitek.o	107	obj-$(CONFIG_HID_SAITEK) += hid-saitek.o
108	obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o	108	obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o
		109	obj-$(CONFIG_HID_SEMITEK) += hid-semitek.o
109	obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o	110	obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o
110	obj-$(CONFIG_HID_SONY) += hid-sony.o	111	obj-$(CONFIG_HID_SONY) += hid-sony.o
111	obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o	112	obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o

drivers/hid/amd-sfh-hid/amd_sfh_client.c+10−9

 	sensor_index = req_node->sensor_idx;
 	report_id = req_node->report_id;
 	node_type = req_node->report_type;
+	kfree(req_node);
 	if (node_type == HID_FEATURE_REPORT) {
 		report_size = get_feature_report(sensor_index, report_id,
 	int rc, i;
 	dev = &privdata->pdev->dev;
-	cl_data = kzalloc(sizeof(*cl_data), GFP_KERNEL);
+	cl_data = devm_kzalloc(dev, sizeof(*cl_data), GFP_KERNEL);
 	if (!cl_data)
 		return -ENOMEM;
 			rc = -EINVAL;
 			goto cleanup;
 		}
-		cl_data->feature_report[i] = kzalloc(feature_report_size, GFP_KERNEL);
+		cl_data->feature_report[i] = devm_kzalloc(dev, feature_report_size, GFP_KERNEL);
 		if (!cl_data->feature_report[i]) {
 			rc = -ENOMEM;
 			goto cleanup;
 		}
-		cl_data->input_report[i] = kzalloc(input_report_size, GFP_KERNEL);
+		cl_data->input_report[i] = devm_kzalloc(dev, input_report_size, GFP_KERNEL);
 		if (!cl_data->input_report[i]) {
 			rc = -ENOMEM;
 			goto cleanup;
 		info.sensor_idx = cl_idx;
 		info.dma_address = cl_data->sensor_dma_addr[i];
-		cl_data->report_descr[i] = kzalloc(cl_data->report_descr_sz[i], GFP_KERNEL);
+		cl_data->report_descr[i] =
+			devm_kzalloc(dev, cl_data->report_descr_sz[i], GFP_KERNEL);
 		if (!cl_data->report_descr[i]) {
 			rc = -ENOMEM;
 			goto cleanup;
 					  cl_data->sensor_virt_addr[i],
 					  cl_data->sensor_dma_addr[i]);
 		}
-		kfree(cl_data->feature_report[i]);
+		devm_kfree(dev, cl_data->feature_report[i]);
-		kfree(cl_data->input_report[i]);
+		devm_kfree(dev, cl_data->input_report[i]);
-		kfree(cl_data->report_descr[i]);
+		devm_kfree(dev, cl_data->report_descr[i]);
 	}
-	kfree(cl_data);
+	devm_kfree(dev, cl_data);
 	return rc;
 }
 					  cl_data->sensor_dma_addr[i]);
 		}
 	}
-	kfree(cl_data);
 	return 0;
 }

drivers/hid/amd-sfh-hid/amd_sfh_hid.c+0−3

 	int i;
 	for (i = 0; i < cli_data->num_hid_devices; ++i) {
-		kfree(cli_data->feature_report[i]);
-		kfree(cli_data->input_report[i]);
-		kfree(cli_data->report_descr[i]);
 		if (cli_data->hid_sensor_hubs[i]) {
 			kfree(cli_data->hid_sensor_hubs[i]->driver_data);
 			hid_destroy_device(cli_data->hid_sensor_hubs[i]);

drivers/hid/hid-a4tech.c+2−0

 		.driver_data = A4_2WHEEL_MOUSE_HACK_B8 },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649),
 		.driver_data = A4_2WHEEL_MOUSE_HACK_B8 },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_NB_95),
+		.driver_data = A4_2WHEEL_MOUSE_HACK_B8 },
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, a4_devices);

drivers/hid/hid-asus.c+20−12

 #define QUIRK_T100_KEYBOARD		BIT(6)
 #define QUIRK_T100CHI			BIT(7)
 #define QUIRK_G752_KEYBOARD		BIT(8)
-#define QUIRK_T101HA_DOCK		BIT(9)
+#define QUIRK_T90CHI			BIT(9)
-#define QUIRK_T90CHI			BIT(10)
+#define QUIRK_MEDION_E1239T		BIT(10)
-#define QUIRK_MEDION_E1239T		BIT(11)
+#define QUIRK_ROG_NKEY_KEYBOARD		BIT(11)
-#define QUIRK_ROG_NKEY_KEYBOARD		BIT(12)
 #define I2C_KEYBOARD_QUIRKS			(QUIRK_FIX_NOTEBOOK_REPORT | \
 						 QUIRK_NO_INIT_REPORTS | \
 	if (drvdata->quirks & QUIRK_MEDION_E1239T)
 		return asus_e1239t_event(drvdata, data, size);
-	if (drvdata->quirks & QUIRK_ROG_NKEY_KEYBOARD) {
+	if (drvdata->quirks & QUIRK_USE_KBD_BACKLIGHT) {
 		/*
 		 * Skip these report ID, the device emits a continuous stream associated
 		 * with the AURA mode it is in which looks like an 'echo'.
 				return -1;
 			}
 		}
+		if (drvdata->quirks & QUIRK_ROG_NKEY_KEYBOARD) {
+			/*
+			 * G713 and G733 send these codes on some keypresses, depending on
+			 * the key pressed it can trigger a shutdown event if not caught.
+			*/
+			if(data[0] == 0x02 && data[1] == 0x30) {
+				return -1;
+			}
+		}
 	}
 	return 0;
 		return ret;
 	}
-	/* use hid-multitouch for T101HA touchpad */
-	if (id->driver_data & QUIRK_T101HA_DOCK &&
-	    hdev->collection->usage == HID_GD_MOUSE)
-		return -ENODEV;
 	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
 	if (ret) {
 		hid_err(hdev, "Asus hw start failed: %d\n", ret);
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
 		USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD),
 	  QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
-		USB_DEVICE_ID_ASUSTEK_T101HA_KEYBOARD), QUIRK_T101HA_DOCK },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_ASUS_AK1D) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },
 		USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD), QUIRK_T100CHI },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE_MEDION_E1239T),
 		QUIRK_MEDION_E1239T },
+	/*
+	 * Note bind to the HID_GROUP_GENERIC group, so that we only bind to the keyboard
+	 * part, while letting hid-multitouch.c handle the touchpad.
+	 */
+	{ HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
+		USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T101HA_KEYBOARD) },
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, asus_devices);

drivers/hid/hid-core.c+3−1

 	case BUS_I2C:
 		bus = "I2C";
 		break;
+	case BUS_VIRTUAL:
+		bus = "VIRTUAL";
+		break;
 	default:
 		bus = "<UNKNOWN>";
 	}
 	return 0;
 }
 EXPORT_SYMBOL_GPL(hid_check_keys_pressed);
 static int __init hid_init(void)

drivers/hid/hid-debug.c+3−0

 	[KEY_APPSELECT] = "AppSelect",
 	[KEY_SCREENSAVER] = "ScreenSaver",
 	[KEY_VOICECOMMAND] = "VoiceCommand",
+	[KEY_ASSISTANT] = "Assistant",
+	[KEY_KBD_LAYOUT_NEXT] = "KbdLayoutNext",
+	[KEY_EMOJI_PICKER] = "EmojiPicker",
 	[KEY_BRIGHTNESS_MIN] = "BrightnessMin",
 	[KEY_BRIGHTNESS_MAX] = "BrightnessMax",
 	[KEY_BRIGHTNESS_AUTO] = "BrightnessAuto",

drivers/hid/hid-ft260.c+16−13

 	u8 address;		/* 7-bit I2C address */
 	u8 flag;		/* I2C transaction condition */
 	u8 length;		/* data payload length */
-	u8 data[60];		/* data payload */
+	u8 data[FT260_WR_DATA_MAX]; /* data payload */
 } __packed;
 struct ft260_i2c_read_request_report {
 	ret = hid_hw_raw_request(hdev, report_id, buf, len, HID_FEATURE_REPORT,
 				 HID_REQ_GET_REPORT);
-	memcpy(data, buf, len);
+	if (likely(ret == len))
+		memcpy(data, buf, len);
+	else if (ret >= 0)
+		ret = -EIO;
 	kfree(buf);
 	return ret;
 }
 	ret = ft260_hid_feature_report_get(hdev, FT260_I2C_STATUS,
 					   (u8 *)&report, sizeof(report));
-	if (ret < 0) {
+	if (unlikely(ret < 0)) {
 		hid_err(hdev, "failed to retrieve status: %d\n", ret);
 		return ret;
 	}
 	struct ft260_i2c_write_request_report *rep =
 		(struct ft260_i2c_write_request_report *)dev->write_buf;
+	if (data_len >= sizeof(rep->data))
+		return -EINVAL;
 	rep->address = addr;
 	rep->data[0] = cmd;
 	rep->length = data_len + 1;
 	ret = ft260_hid_feature_report_get(hdev, FT260_SYSTEM_SETTINGS,
 					   (u8 *)cfg, len);
-	if (ret != len) {
+	if (ret < 0) {
 		hid_err(hdev, "failed to retrieve system status\n");
-		if (ret >= 0)
+		return ret;
-			return -EIO;
 	}
 	return 0;
 }
 	int ret;
 	ret = ft260_hid_feature_report_get(hdev, id, cfg, len);
-	if (ret != len && ret >= 0)
+	if (ret < 0)
-		return -EIO;
+		return ret;
 	return scnprintf(buf, PAGE_SIZE, "%hi\n", *field);
 }
 	int ret;
 	ret = ft260_hid_feature_report_get(hdev, id, cfg, len);
-	if (ret != len && ret >= 0)
+	if (ret < 0)
-		return -EIO;
+		return ret;
 	return scnprintf(buf, PAGE_SIZE, "%hi\n", le16_to_cpu(*field));
 }
 	ret = ft260_hid_feature_report_get(hdev, FT260_CHIP_VERSION,
 					   (u8 *)&version, sizeof(version));
-	if (ret != sizeof(version)) {
+	if (ret < 0) {
 		hid_err(hdev, "failed to retrieve chip version\n");
-		if (ret >= 0)
-			ret = -EIO;
 		goto err_hid_close;
 	}

drivers/hid/hid-gt683r.c+1−0

@@ -54,6 +54,7 @@ static const struct hid_device_id gt683r_led_id[] = { · 53 unmodified lines
54	{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) },	54	{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) },
55	{ }	55	{ }
56	};	56	};
		57	MODULE_DEVICE_TABLE(hid, gt683r_led_id);
57		58
58	static void gt683r_brightness_set(struct led_classdev *led_cdev,	59	static void gt683r_brightness_set(struct led_classdev *led_cdev,
59	enum led_brightness brightness)	60	enum led_brightness brightness)

drivers/hid/hid-ids.h+7−2

 #define USB_DEVICE_ID_A4TECH_WCP32PU	0x0006
 #define USB_DEVICE_ID_A4TECH_X5_005D	0x000a
 #define USB_DEVICE_ID_A4TECH_RP_649	0x001a
+#define USB_DEVICE_ID_A4TECH_NB_95	0x022b
 #define USB_VENDOR_ID_AASHIMA		0x06d6
 #define USB_DEVICE_ID_AASHIMA_GAMEPAD	0x0025
 #define USB_VENDOR_ID_CORSAIR		0x1b1c
 #define USB_DEVICE_ID_CORSAIR_K90	0x1b02
-#define USB_VENDOR_ID_CORSAIR           0x1b1c
 #define USB_DEVICE_ID_CORSAIR_K70R      0x1b09
 #define USB_DEVICE_ID_CORSAIR_K95RGB    0x1b11
 #define USB_DEVICE_ID_CORSAIR_M65RGB    0x1b12
 #define USB_DEVICE_ID_LENOVO_X1_COVER	0x6085
 #define USB_DEVICE_ID_LENOVO_X1_TAB	0x60a3
 #define USB_DEVICE_ID_LENOVO_X1_TAB3	0x60b5
+#define USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E	0x600e
 #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D	0x608d
 #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019	0x6019
 #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_602E	0x602e
 #define USB_DEVICE_ID_SAITEK_X52	0x075c
 #define USB_DEVICE_ID_SAITEK_X52_2	0x0255
 #define USB_DEVICE_ID_SAITEK_X52_PRO	0x0762
+#define USB_DEVICE_ID_SAITEK_X65	0x0b6a
 #define USB_VENDOR_ID_SAMSUNG		0x0419
 #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001
 #define USB_DEVICE_ID_SEMICO_USB_KEYKOARD	0x0023
 #define USB_DEVICE_ID_SEMICO_USB_KEYKOARD2	0x0027
+#define USB_VENDOR_ID_SEMITEK	0x1ea7
+#define USB_DEVICE_ID_SEMITEK_KEYBOARD	0x0907
 #define USB_VENDOR_ID_SENNHEISER	0x1395
 #define USB_DEVICE_ID_SENNHEISER_BTD500USB	0x002c
 #define USB_DEVICE_ID_SYNAPTICS_DELL_K12A	0x2819
 #define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012	0x2968
 #define USB_DEVICE_ID_SYNAPTICS_TP_V103	0x5710
+#define USB_DEVICE_ID_SYNAPTICS_DELL_K15A	0x6e21
 #define USB_DEVICE_ID_SYNAPTICS_ACER_ONE_S1002	0x73f4
 #define USB_DEVICE_ID_SYNAPTICS_ACER_ONE_S1003	0x73f5
 #define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5	0x81a7

drivers/hid/hid-input.c+3−0

@@ -964,6 +964,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel · 963 unmodified lines
964		964
965	case 0x0cd: map_key_clear(KEY_PLAYPAUSE); break;	965	case 0x0cd: map_key_clear(KEY_PLAYPAUSE); break;
966	case 0x0cf: map_key_clear(KEY_VOICECOMMAND); break;	966	case 0x0cf: map_key_clear(KEY_VOICECOMMAND); break;
		967
		968	case 0x0d9: map_key_clear(KEY_EMOJI_PICKER); break;
		969
967	case 0x0e0: map_abs_clear(ABS_VOLUME); break;	970	case 0x0e0: map_abs_clear(ABS_VOLUME); break;
968	case 0x0e2: map_key_clear(KEY_MUTE); break;	971	case 0x0e2: map_key_clear(KEY_MUTE); break;
969	case 0x0e5: map_key_clear(KEY_BASSBOOST); break;	972	case 0x0e5: map_key_clear(KEY_BASSBOOST); break;

drivers/hid/hid-logitech-hidpp.c+1−0

@@ -1263,6 +1263,7 @@ static int hidpp20_battery_map_status_voltage(u8 data[3], int *voltage, · 1262 unmodified lines
1263	int status;	1263	int status;
1264		1264
1265	long flags = (long) data[2];	1265	long flags = (long) data[2];
		1266	*level = POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN;
1266		1267
1267	if (flags & 0x80)	1268	if (flags & 0x80)
1268	switch (flags & 0x07) {	1269	switch (flags & 0x07) {

drivers/hid/hid-magicmouse.c+5−2

@@ -693,7 +693,7 @@ static int magicmouse_probe(struct hid_device *hdev, · 692 unmodified lines
693	if (id->vendor == USB_VENDOR_ID_APPLE &&	693	if (id->vendor == USB_VENDOR_ID_APPLE &&
694	id->product == USB_DEVICE_ID_APPLE_MAGICTRACKPAD2 &&	694	id->product == USB_DEVICE_ID_APPLE_MAGICTRACKPAD2 &&
695	hdev->type != HID_TYPE_USBMOUSE)	695	hdev->type != HID_TYPE_USBMOUSE)
696	return 0;	696	return -ENODEV;
697		697
698	msc = devm_kzalloc(&hdev->dev, sizeof(*msc), GFP_KERNEL);	698	msc = devm_kzalloc(&hdev->dev, sizeof(*msc), GFP_KERNEL);
699	if (msc == NULL) {	699	if (msc == NULL) {
@@ -779,7 +779,10 @@ err_stop_hw: · 79 unmodified lines
779	static void magicmouse_remove(struct hid_device *hdev)	779	static void magicmouse_remove(struct hid_device *hdev)
780	{	780	{
781	struct magicmouse_sc *msc = hid_get_drvdata(hdev);	781	struct magicmouse_sc *msc = hid_get_drvdata(hdev);
782	cancel_delayed_work_sync(&msc->work);	782
		783	if (msc)
		784	cancel_delayed_work_sync(&msc->work);
		785
783	hid_hw_stop(hdev);	786	hid_hw_stop(hdev);
784	}	787	}
785		788

drivers/hid/hid-multitouch.c+37−9

 #define MT_QUIRK_WIN8_PTP_BUTTONS	BIT(18)
 #define MT_QUIRK_SEPARATE_APP_REPORT	BIT(19)
 #define MT_QUIRK_FORCE_MULTI_INPUT	BIT(20)
+#define MT_QUIRK_DISABLE_WAKEUP		BIT(21)
 #define MT_INPUTMODE_TOUCHSCREEN	0x02
 #define MT_INPUTMODE_TOUCHPAD		0x03
 #define MT_CLS_EXPORT_ALL_INPUTS		0x0013
 /* reserved					0x0014 */
 #define MT_CLS_WIN_8_FORCE_MULTI_INPUT		0x0015
+#define MT_CLS_WIN_8_DISABLE_WAKEUP		0x0016
 /* vendor specific classes */
 #define MT_CLS_3M				0x0101
 			MT_QUIRK_WIN8_PTP_BUTTONS |
 			MT_QUIRK_FORCE_MULTI_INPUT,
 		.export_all_inputs = true },
+	{ .name = MT_CLS_WIN_8_DISABLE_WAKEUP,
+		.quirks = MT_QUIRK_ALWAYS_VALID |
+			MT_QUIRK_IGNORE_DUPLICATES |
+			MT_QUIRK_HOVERING |
+			MT_QUIRK_CONTACT_CNT_ACCURATE |
+			MT_QUIRK_STICKY_FINGERS |
+			MT_QUIRK_WIN8_PTP_BUTTONS |
+			MT_QUIRK_DISABLE_WAKEUP,
+		.export_all_inputs = true },
 	/*
 	 * vendor specific classes
 		if (!(HID_MAIN_ITEM_VARIABLE & field->flags))
 			continue;
-		for (n = 0; n < field->report_count; n++) {
+		if (field->logical == HID_DG_FINGER || td->hdev->group != HID_GROUP_MULTITOUCH_WIN_8) {
-			if (field->usage[n].hid == HID_DG_CONTACTID)
+			for (n = 0; n < field->report_count; n++) {
-				rdata->is_mt_collection = true;
+				if (field->usage[n].hid == HID_DG_CONTACTID) {
+					rdata->is_mt_collection = true;
+					break;
+				}
+			}
 		}
 	}
 			return 1;
 		case HID_DG_CONFIDENCE:
 			if ((cls->name == MT_CLS_WIN_8 ||
-			     cls->name == MT_CLS_WIN_8_FORCE_MULTI_INPUT) &&
+			     cls->name == MT_CLS_WIN_8_FORCE_MULTI_INPUT ||
+			     cls->name == MT_CLS_WIN_8_DISABLE_WAKEUP) &&
 				(field->application == HID_DG_TOUCHPAD ||
 				 field->application == HID_DG_TOUCHSCREEN))
 				app->quirks |= MT_QUIRK_CONFIDENCE;
 		/* we do not set suffix = "Touchscreen" */
 		hi->input->name = hdev->name;
 		break;
-	case HID_DG_STYLUS:
-		/* force BTN_STYLUS to allow tablet matching in udev */
-		__set_bit(BTN_STYLUS, hi->input->keybit);
-		break;
 	case HID_VD_ASUS_CUSTOM_MEDIA_KEYS:
 		suffix = "Custom Media Keys";
 		break;
+	case HID_DG_STYLUS:
+		/* force BTN_STYLUS to allow tablet matching in udev */
+		__set_bit(BTN_STYLUS, hi->input->keybit);
+		fallthrough;
 	case HID_DG_PEN:
 		suffix = "Stylus";
 		break;
 #ifdef CONFIG_PM
 static int mt_suspend(struct hid_device *hdev, pm_message_t state)
 {
+	struct mt_device *td = hid_get_drvdata(hdev);
 	/* High latency is desirable for power savings during S3/S0ix */
-	mt_set_modes(hdev, HID_LATENCY_HIGH, true, true);
+	if (td->mtclass.quirks & MT_QUIRK_DISABLE_WAKEUP)
+		mt_set_modes(hdev, HID_LATENCY_HIGH, false, false);
+	else
+		mt_set_modes(hdev, HID_LATENCY_HIGH, true, true);
 	return 0;
 }
 		MT_USB_DEVICE(USB_VENDOR_ID_ANTON,
 			USB_DEVICE_ID_ANTON_TOUCH_PAD) },
+	/* Asus T101HA */
+	{ .driver_data = MT_CLS_WIN_8_DISABLE_WAKEUP,
+		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,
+			   USB_VENDOR_ID_ASUSTEK,
+			   USB_DEVICE_ID_ASUSTEK_T101HA_KEYBOARD) },
 	/* Asus T304UA */
 	{ .driver_data = MT_CLS_ASUS,
 		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,

drivers/hid/hid-quirks.c+4−0

 	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912), HID_QUIRK_MULTI_INPUT },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M406XE), HID_QUIRK_MULTI_INPUT },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE_ID2), HID_QUIRK_ALWAYS_POLL },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E), HID_QUIRK_ALWAYS_POLL },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D), HID_QUIRK_ALWAYS_POLL },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019), HID_QUIRK_ALWAYS_POLL },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_602E), HID_QUIRK_ALWAYS_POLL },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X52), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X52_2), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X52_PRO), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X65), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD2), HID_QUIRK_NO_INIT_REPORTS },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD), HID_QUIRK_NO_INIT_REPORTS },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB), HID_QUIRK_NOGET },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_QUAD_HD), HID_QUIRK_NO_INIT_REPORTS },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_TP_V103), HID_QUIRK_NO_INIT_REPORTS },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DELL_K12A), HID_QUIRK_NO_INIT_REPORTS },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DELL_K15A), HID_QUIRK_NO_INIT_REPORTS },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD), HID_QUIRK_BADPAD },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS), HID_QUIRK_MULTI_INPUT },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TPV, USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8882), HID_QUIRK_NOGET },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_NB_95) },
 #endif
 #if IS_ENABLED(CONFIG_HID_ACCUTOUCH)
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_ACCUTOUCH_2216) },

drivers/hid/hid-semitek.c+40−0

@@ -0,0 +1,40 @@
	1	// SPDX-License-Identifier: GPL-2.0-or-later
	2	/*
	3	* HID driver for Semitek keyboards
	4	*
	5	* Copyright (c) 2021 Benjamin Moody
	6	*/
	7
	8	#include <linux/device.h>
	9	#include <linux/hid.h>
	10	#include <linux/module.h>
	11
	12	#include "hid-ids.h"
	13
	14	static __u8 semitek_report_fixup(struct hid_device hdev, __u8 *rdesc,
	15	unsigned int *rsize)
	16	{
	17	/* In the report descriptor for interface 2, fix the incorrect
	18	description of report ID 0x04 (the report contains a
	19	bitmask, not an array of keycodes.) */
	20	if (*rsize == 0xcb && rdesc[0x83] == 0x81 && rdesc[0x84] == 0x00) {
	21	hid_info(hdev, "fixing up Semitek report descriptor\n");
	22	rdesc[0x84] = 0x02;
	23	}
	24	return rdesc;
	25	}
	26
	27	static const struct hid_device_id semitek_devices[] = {
	28	{ HID_USB_DEVICE(USB_VENDOR_ID_SEMITEK, USB_DEVICE_ID_SEMITEK_KEYBOARD) },
	29	{ }
	30	};
	31	MODULE_DEVICE_TABLE(hid, semitek_devices);
	32
	33	static struct hid_driver semitek_driver = {
	34	.name = "semitek",
	35	.id_table = semitek_devices,
	36	.report_fixup = semitek_report_fixup,
	37	};
	38	module_hid_driver(semitek_driver);
	39
	40	MODULE_LICENSE("GPL");

drivers/hid/hid-sensor-custom.c+5−3

 	struct hid_sensor_custom *sensor_inst = dev_get_drvdata(dev);
 	int index, field_index, usage;
 	char name[HID_CUSTOM_NAME_LENGTH];
-	int value;
+	int value, ret;
 	if (sscanf(attr->attr.name, "feature-%x-%x-%s", &index, &usage,
 		   name) == 3) {
 		report_id = sensor_inst->fields[field_index].attribute.
 								report_id;
-		sensor_hub_set_feature(sensor_inst->hsdev, report_id,
+		ret = sensor_hub_set_feature(sensor_inst->hsdev, report_id,
-				       index, sizeof(value), &value);
+					     index, sizeof(value), &value);
+		if (ret)
+			return ret;
 	} else
 		return -EINVAL;

drivers/hid/hid-sensor-hub.c+9−4

 	buffer_size = buffer_size / sizeof(__s32);
 	if (buffer_size) {
 		for (i = 0; i < buffer_size; ++i) {
-			hid_set_field(report->field[field_index], i,
+			ret = hid_set_field(report->field[field_index], i,
-				      (__force __s32)cpu_to_le32(*buf32));
+					    (__force __s32)cpu_to_le32(*buf32));
+			if (ret)
+				goto done_proc;
 			++buf32;
 		}
 	}
 	if (remaining_bytes) {
 		value = 0;
 		memcpy(&value, (u8 *)buf32, remaining_bytes);
-		hid_set_field(report->field[field_index], i,
+		ret = hid_set_field(report->field[field_index], i,
-			      (__force __s32)cpu_to_le32(value));
+				    (__force __s32)cpu_to_le32(value));
+		if (ret)
+			goto done_proc;
 	}
 	hid_hw_request(hsdev->hdev, report, HID_REQ_SET_REPORT);
 	hid_hw_wait(hsdev->hdev);

drivers/hid/hid-thrustmaster.c+1−1

@@ -312,7 +312,7 @@ static int thrustmaster_probe(struct hid_device *hdev, const struct hid_device_i · 311 unmodified lines
312	}	312	}
313		313
314	tm_wheel->change_request = kzalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);	314	tm_wheel->change_request = kzalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);
315	if (!tm_wheel->model_request) {	315	if (!tm_wheel->change_request) {
316	ret = -ENOMEM;	316	ret = -ENOMEM;
317	goto error5;	317	goto error5;
318	}	318	}

drivers/hid/i2c-hid/i2c-hid-core.c+10−3

 #define I2C_HID_QUIRK_BOGUS_IRQ			BIT(4)
 #define I2C_HID_QUIRK_RESET_ON_RESUME		BIT(5)
 #define I2C_HID_QUIRK_BAD_INPUT_SIZE		BIT(6)
+#define I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET	BIT(7)
 /* flags */
 		 I2C_HID_QUIRK_RESET_ON_RESUME },
 	{ USB_VENDOR_ID_ITE, I2C_DEVICE_ID_ITE_LENOVO_LEGION_Y720,
 		I2C_HID_QUIRK_BAD_INPUT_SIZE },
+	/*
+	 * Sending the wakeup after reset actually break ELAN touchscreen controller
+	 */
+	{ USB_VENDOR_ID_ELAN, HID_ANY_ID,
+		 I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET },
 	{ 0, 0 }
 };
 	}
 	/* At least some SIS devices need this after reset */
-	ret = i2c_hid_set_power(client, I2C_HID_PWR_ON);
+	if (!(ihid->quirks & I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET))
+		ret = i2c_hid_set_power(client, I2C_HID_PWR_ON);
 out_unlock:
 	mutex_unlock(&ihid->reset_lock);
 	hid->vendor = le16_to_cpu(ihid->hdesc.wVendorID);
 	hid->product = le16_to_cpu(ihid->hdesc.wProductID);
-	snprintf(hid->name, sizeof(hid->name), "%s %04hX:%04hX",
+	snprintf(hid->name, sizeof(hid->name), "%s %04X:%04X",
-		 client->name, hid->vendor, hid->product);
+		 client->name, (u16)hid->vendor, (u16)hid->product);
 	strlcpy(hid->phys, dev_name(&client->dev), sizeof(hid->phys));
 	ihid->quirks = i2c_hid_lookup_quirk(hid->vendor, hid->product);

drivers/hid/intel-ish-hid/ipc/hw-ish.h+2−0

@@ -28,6 +28,8 @@ · 27 unmodified lines
28	#define EHL_Ax_DEVICE_ID 0x4BB3	28	#define EHL_Ax_DEVICE_ID 0x4BB3
29	#define TGL_LP_DEVICE_ID 0xA0FC	29	#define TGL_LP_DEVICE_ID 0xA0FC
30	#define TGL_H_DEVICE_ID 0x43FC	30	#define TGL_H_DEVICE_ID 0x43FC
		31	#define ADL_S_DEVICE_ID 0x7AF8
		32	#define ADL_P_DEVICE_ID 0x51FC
31		33
32	#define REVISION_ID_CHT_A0 0x6	34	#define REVISION_ID_CHT_A0 0x6
33	#define REVISION_ID_CHT_Ax_SI 0x0	35	#define REVISION_ID_CHT_Ax_SI 0x0

drivers/hid/intel-ish-hid/ipc/pci-ish.c+2−0

 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, EHL_Ax_DEVICE_ID)},
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, TGL_LP_DEVICE_ID)},
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, TGL_H_DEVICE_ID)},
+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, ADL_S_DEVICE_ID)},
+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, ADL_P_DEVICE_ID)},
 	{0, }
 };
 MODULE_DEVICE_TABLE(pci, ish_pci_tbl);

drivers/hid/surface-hid/surface_hid_core.c+3−3

@@ -168,9 +168,9 @@ int surface_hid_device_add(struct surface_hid_device *shid) · 167 unmodified lines
168		168
169	shid->hid->dev.parent = shid->dev;	169	shid->hid->dev.parent = shid->dev;
170	shid->hid->bus = BUS_HOST;	170	shid->hid->bus = BUS_HOST;
171	shid->hid->vendor = cpu_to_le16(shid->attrs.vendor);	171	shid->hid->vendor = get_unaligned_le16(&shid->attrs.vendor);
172	shid->hid->product = cpu_to_le16(shid->attrs.product);	172	shid->hid->product = get_unaligned_le16(&shid->attrs.product);
173	shid->hid->version = cpu_to_le16(shid->hid_desc.hid_version);	173	shid->hid->version = get_unaligned_le16(&shid->hid_desc.hid_version);
174	shid->hid->country = shid->hid_desc.country_code;	174	shid->hid->country = shid->hid_desc.country_code;
175		175
176	snprintf(shid->hid->name, sizeof(shid->hid->name), "Microsoft Surface %04X:%04X",	176	snprintf(shid->hid->name, sizeof(shid->hid->name), "Microsoft Surface %04X:%04X",

drivers/hid/usbhid/hid-core.c+1−1

@@ -374,7 +374,7 @@ static int hid_submit_ctrl(struct hid_device *hid) · 373 unmodified lines
374	raw_report = usbhid->ctrl[usbhid->ctrltail].raw_report;	374	raw_report = usbhid->ctrl[usbhid->ctrltail].raw_report;
375	dir = usbhid->ctrl[usbhid->ctrltail].dir;	375	dir = usbhid->ctrl[usbhid->ctrltail].dir;
376		376
377	len = ((report->size - 1) >> 3) + 1 + (report->id > 0);	377	len = hid_report_len(report);
378	if (dir == USB_DIR_OUT) {	378	if (dir == USB_DIR_OUT) {
379	usbhid->urbctrl->pipe = usb_sndctrlpipe(hid_to_usb_dev(hid), 0);	379	usbhid->urbctrl->pipe = usb_sndctrlpipe(hid_to_usb_dev(hid), 0);
380	usbhid->urbctrl->transfer_buffer_length = len;	380	usbhid->urbctrl->transfer_buffer_length = len;

drivers/hid/usbhid/hid-pidff.c+1−0

@@ -1292,6 +1292,7 @@ int hid_pidff_init(struct hid_device *hid) · 1291 unmodified lines
1292		1292
1293	if (pidff->pool[PID_DEVICE_MANAGED_POOL].value &&	1293	if (pidff->pool[PID_DEVICE_MANAGED_POOL].value &&
1294	pidff->pool[PID_DEVICE_MANAGED_POOL].value[0] == 0) {	1294	pidff->pool[PID_DEVICE_MANAGED_POOL].value[0] == 0) {
		1295	error = -EPERM;
1295	hid_notice(hid,	1296	hid_notice(hid,
1296	"device does not support device managed pool\n");	1297	"device does not support device managed pool\n");
1297	goto fail;	1298	goto fail;

drivers/hwmon/corsair-psu.c+14−0

@@ -771,6 +771,16 @@ static int corsairpsu_raw_event(struct hid_device hdev, struct hid_report repo · 770 unmodified lines
771	return 0;	771	return 0;
772	}	772	}
773		773
		774	#ifdef CONFIG_PM
		775	static int corsairpsu_resume(struct hid_device *hdev)
		776	{
		777	struct corsairpsu_data *priv = hid_get_drvdata(hdev);
		778
		779	/* some PSUs turn off the microcontroller during standby, so a reinit is required */
		780	return corsairpsu_init(priv);
		781	}
		782	#endif
		783
774	static const struct hid_device_id corsairpsu_idtable[] = {	784	static const struct hid_device_id corsairpsu_idtable[] = {
775	{ HID_USB_DEVICE(0x1b1c, 0x1c03) }, /* Corsair HX550i */	785	{ HID_USB_DEVICE(0x1b1c, 0x1c03) }, /* Corsair HX550i */
776	{ HID_USB_DEVICE(0x1b1c, 0x1c04) }, /* Corsair HX650i */	786	{ HID_USB_DEVICE(0x1b1c, 0x1c04) }, /* Corsair HX650i */
@@ -793,6 +803,10 @@ static struct hid_driver corsairpsu_driver = { · 16 unmodified lines
793	.probe = corsairpsu_probe,	803	.probe = corsairpsu_probe,
794	.remove = corsairpsu_remove,	804	.remove = corsairpsu_remove,
795	.raw_event = corsairpsu_raw_event,	805	.raw_event = corsairpsu_raw_event,
		806	#ifdef CONFIG_PM
		807	.resume = corsairpsu_resume,
		808	.reset_resume = corsairpsu_resume,
		809	#endif
796	};	810	};
797	module_hid_driver(corsairpsu_driver);	811	module_hid_driver(corsairpsu_driver);
798		812

drivers/hwmon/dell-smm-hwmon.c+2−2

@@ -838,10 +838,10 @@ static struct attribute *i8k_attrs[] = { · 837 unmodified lines
838	static umode_t i8k_is_visible(struct kobject kobj, struct attribute attr,	838	static umode_t i8k_is_visible(struct kobject kobj, struct attribute attr,
839	int index)	839	int index)
840	{	840	{
841	if (disallow_fan_support && index >= 8)	841	if (disallow_fan_support && index >= 20)
842	return 0;	842	return 0;
843	if (disallow_fan_type_call &&	843	if (disallow_fan_type_call &&
844	(index == 9 \|\| index == 12 \|\| index == 15))	844	(index == 21 \|\| index == 25 \|\| index == 28))
845	return 0;	845	return 0;
846	if (index >= 0 && index <= 1 &&	846	if (index >= 0 && index <= 1 &&
847	!(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP1))	847	!(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP1))

drivers/hwmon/pmbus/fsp-3y.c+25−7

 	struct pmbus_driver_info info;
 	int chip;
 	int page;
+	bool vout_linear_11;
 };
 #define to_fsp3y_data(x) container_of(x, struct fsp3y_data, info)
 	int rv;
 	/*
-	 * YH5151-E outputs vout in linear11. The conversion is done when
+	 * Inject an exponent for non-compliant YH5151-E.
-	 * reading. Here, we have to inject pmbus_core with the correct
-	 * exponent (it is -6).
 	 */
-	if (data->chip == yh5151e && reg == PMBUS_VOUT_MODE)
+	if (data->vout_linear_11 && reg == PMBUS_VOUT_MODE)
 		return 0x1A;
 	rv = set_page(client, page);
 		return rv;
 	/*
-	 * YH-5151E is non-compliant and outputs output voltages in linear11
+	 * Handle YH-5151E non-compliant linear11 vout voltage.
-	 * instead of linear16.
 	 */
-	if (data->chip == yh5151e && reg == PMBUS_READ_VOUT)
+	if (data->vout_linear_11 && reg == PMBUS_READ_VOUT)
 		rv = sign_extend32(rv, 10) & 0xffff;
 	return rv;
 	data->info = fsp3y_info[data->chip];
+	/*
+	 * YH-5151E sometimes reports vout in linear11 and sometimes in
+	 * linear16. This depends on the exact individual piece of hardware. One
+	 * YH-5151E can use linear16 and another might use linear11 instead.
+	 *
+	 * The format can be recognized by reading VOUT_MODE - if it doesn't
+	 * report a valid exponent, then vout uses linear11. Otherwise, the
+	 * device is compliant and uses linear16.
+	 */
+	data->vout_linear_11 = false;
+	if (data->chip == yh5151e) {
+		rv = i2c_smbus_read_byte_data(client, PMBUS_VOUT_MODE);
+		if (rv < 0)
+			return rv;
+		if (rv == 0xFF)
+			data->vout_linear_11 = true;
+	}
 	return pmbus_do_probe(client, &data->info);
 }

drivers/hwmon/pmbus/isl68137.c+2−2

@@ -244,8 +244,8 @@ static int isl68137_probe(struct i2c_client *client) · 243 unmodified lines
244	info->read_word_data = raa_dmpvr2_read_word_data;	244	info->read_word_data = raa_dmpvr2_read_word_data;
245	break;	245	break;
246	case raa_dmpvr2_2rail_nontc:	246	case raa_dmpvr2_2rail_nontc:
247	info->func[0] &= ~PMBUS_HAVE_TEMP;	247	info->func[0] &= ~PMBUS_HAVE_TEMP3;
248	info->func[1] &= ~PMBUS_HAVE_TEMP;	248	info->func[1] &= ~PMBUS_HAVE_TEMP3;
249	fallthrough;	249	fallthrough;
250	case raa_dmpvr2_2rail:	250	case raa_dmpvr2_2rail:
251	info->pages = 2;	251	info->pages = 2;

drivers/hwmon/pmbus/q54sj108a2.c+1−1

@@ -299,7 +299,7 @@ static int q54sj108a2_probe(struct i2c_client *client) · 298 unmodified lines
299	dev_err(&client->dev, "Failed to read Manufacturer ID\n");	299	dev_err(&client->dev, "Failed to read Manufacturer ID\n");
300	return ret;	300	return ret;
301	}	301	}
302	if (ret != 5 \|\| strncmp(buf, "DELTA", 5)) {	302	if (ret != 6 \|\| strncmp(buf, "DELTA", 5)) {
303	buf[ret] = '\0';	303	buf[ret] = '\0';
304	dev_err(dev, "Unsupported Manufacturer ID '%s'\n", buf);	304	dev_err(dev, "Unsupported Manufacturer ID '%s'\n", buf);
305	return -ENODEV;	305	return -ENODEV;

drivers/hwmon/scpi-hwmon.c+9−0

@@ -99,6 +99,15 @@ scpi_show_sensor(struct device dev, struct device_attribute attr, char *buf) · 98 unmodified lines
99		99
100	scpi_scale_reading(&value, sensor);	100	scpi_scale_reading(&value, sensor);
101		101
		102	/*
		103	* Temperature sensor values are treated as signed values based on
		104	* observation even though that is not explicitly specified, and
		105	* because an unsigned u64 temperature does not really make practical
		106	* sense especially when the temperature is below zero degrees Celsius.
		107	*/
		108	if (sensor->info.class == TEMPERATURE)
		109	return sprintf(buf, "%lld\n", (s64)value);
		110
102	return sprintf(buf, "%llu\n", value);	111	return sprintf(buf, "%llu\n", value);
103	}	112	}
104		113

drivers/hwmon/tps23861.c+15−2

 #define POWER_ENABLE			0x19
 #define TPS23861_NUM_PORTS		4
+#define TPS23861_GENERAL_MASK_1		0x17
+#define TPS23861_CURRENT_SHUNT_MASK	BIT(0)
 #define TEMPERATURE_LSB			652 /* 0.652 degrees Celsius */
 #define VOLTAGE_LSB			3662 /* 3.662 mV */
 #define SHUNT_RESISTOR_DEFAULT		255000 /* 255 mOhm */
-#define CURRENT_LSB_255			62260 /* 62.260 uA */
+#define CURRENT_LSB_250			62260 /* 62.260 uA */
-#define CURRENT_LSB_250			61039 /* 61.039 uA */
+#define CURRENT_LSB_255			61039 /* 61.039 uA */
 #define RESISTANCE_LSB			110966 /* 11.0966 Ohm*/
 #define RESISTANCE_LSB_LOW		157216 /* 15.7216 Ohm*/
 static struct regmap_config tps23861_regmap_config = {
 	.reg_bits = 8,
 	.val_bits = 8,
+	.max_register = 0x6f,
 };
 static int tps23861_read_temp(struct tps23861_data *data, long *val)
 	else
 		data->shunt_resistor = SHUNT_RESISTOR_DEFAULT;
+	if (data->shunt_resistor == SHUNT_RESISTOR_DEFAULT)
+		regmap_clear_bits(data->regmap,
+				  TPS23861_GENERAL_MASK_1,
+				  TPS23861_CURRENT_SHUNT_MASK);
+	else
+		regmap_set_bits(data->regmap,
+				TPS23861_GENERAL_MASK_1,
+				TPS23861_CURRENT_SHUNT_MASK);
 	hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name,
 							 data, &tps23861_chip_info,
 							 NULL);

drivers/i2c/busses/Kconfig+1−1

@@ -647,7 +647,7 @@ config I2C_HIGHLANDER · 646 unmodified lines
647		647
648	config I2C_HISI	648	config I2C_HISI
649	tristate "HiSilicon I2C controller"	649	tristate "HiSilicon I2C controller"
650	depends on ARM64 \|\| COMPILE_TEST	650	depends on (ARM64 && ACPI) \|\| COMPILE_TEST
651	help	651	help
652	Say Y here if you want to have Hisilicon I2C controller support	652	Say Y here if you want to have Hisilicon I2C controller support
653	available on the Kunpeng Server.	653	available on the Kunpeng Server.

drivers/i2c/busses/i2c-ali1563.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: GPL-2.0-only	1	// SPDX-License-Identifier: GPL-2.0-only
2	/**	2	/*
3	* i2c-ali1563.c - i2c driver for the ALi 1563 Southbridge	3	* i2c-ali1563.c - i2c driver for the ALi 1563 Southbridge
4	*	4	*
5	* Copyright (C) 2004 Patrick Mochel	5	* Copyright (C) 2004 Patrick Mochel

drivers/i2c/busses/i2c-altera.c+4−5

 #define ALTR_I2C_XFER_TIMEOUT	(msecs_to_jiffies(250))
 /**
- * altr_i2c_dev - I2C device context
+ * struct altr_i2c_dev - I2C device context
  * @base: pointer to register struct
  * @msg: pointer to current message
  * @msg_len: number of bytes transferred in msg
 	altr_i2c_int_enable(idev, ALTR_I2C_ALL_IRQ, false);
 }
-/**
+/*
  * altr_i2c_transfer - On the last byte to be transmitted, send
  * a Stop bit on the last byte.
  */
 		writel(data, idev->base + ALTR_I2C_TFR_CMD);
 }
-/**
+/*
  * altr_i2c_empty_rx_fifo - Fetch data from RX FIFO until end of
  * transfer. Send a Stop bit on the last byte.
  */
 	}
 }
-/**
+/*
  * altr_i2c_fill_tx_fifo - Fill TX FIFO from current message buffer.
- * @return: Number of bytes left to transfer.
  */
 static int altr_i2c_fill_tx_fifo(struct altr_i2c_dev *idev)
 {

drivers/i2c/busses/i2c-cadence.c+1−1

@@ -144,7 +144,7 @@ enum cdns_i2c_mode { · 143 unmodified lines
144	};	144	};
145		145
146	/**	146	/**
147	* enum cdns_i2c_slave_mode - Slave state when I2C is operating in slave mode	147	* enum cdns_i2c_slave_state - Slave state when I2C is operating in slave mode
148	*	148	*
149	* @CDNS_I2C_SLAVE_STATE_IDLE: I2C slave idle	149	* @CDNS_I2C_SLAVE_STATE_IDLE: I2C slave idle
150	* @CDNS_I2C_SLAVE_STATE_SEND: I2C slave sending data to master	150	* @CDNS_I2C_SLAVE_STATE_SEND: I2C slave sending data to master

drivers/i2c/busses/i2c-designware-master.c+1−1

@@ -165,7 +165,7 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) · 164 unmodified lines
165	}	165	}
166		166
167	/**	167	/**
168	* i2c_dw_init() - Initialize the designware I2C master hardware	168	* i2c_dw_init_master() - Initialize the designware I2C master hardware
169	* @dev: device private data	169	* @dev: device private data
170	*	170	*
171	* This functions configures and enables the I2C master.	171	* This functions configures and enables the I2C master.

drivers/i2c/busses/i2c-eg20t.c+2−1

 /**
  * struct adapter_info - This structure holds the adapter information for the
-			 PCH i2c controller
+ *			 PCH i2c controller
  * @pch_data:		stores a list of i2c_algo_pch_data
  * @pch_i2c_suspended:	specifies whether the system is suspended or not
  *			perhaps with more lines and words.
 /**
  * pch_i2c_writebytes() - write data to I2C bus in normal mode
  * @i2c_adap:	Pointer to the struct i2c_adapter.
+ * @msgs:	Pointer to the i2c message structure.
  * @last:	specifies whether last message or not.
  *		In the case of compound mode it will be 1 for last message,
  *		otherwise 0.

drivers/i2c/busses/i2c-i801.c+2−4

 		dev_err(&priv->pci_dev->dev, "Transaction timeout\n");
 		/* try to stop the current command */
 		dev_dbg(&priv->pci_dev->dev, "Terminating the current operation\n");
-		outb_p(inb_p(SMBHSTCNT(priv)) | SMBHSTCNT_KILL,
+		outb_p(SMBHSTCNT_KILL, SMBHSTCNT(priv));
-		       SMBHSTCNT(priv));
 		usleep_range(1000, 2000);
-		outb_p(inb_p(SMBHSTCNT(priv)) & (~SMBHSTCNT_KILL),
+		outb_p(0, SMBHSTCNT(priv));
-		       SMBHSTCNT(priv));
 		/* Check if it worked */
 		status = inb_p(SMBHSTSTS(priv));

drivers/i2c/busses/i2c-icy.c+0−1

@@ -123,7 +123,6 @@ static int icy_probe(struct zorro_dev *z, · 122 unmodified lines
123	{	123	{
124	struct icy_i2c *i2c;	124	struct icy_i2c *i2c;
125	struct i2c_algo_pcf_data *algo_data;	125	struct i2c_algo_pcf_data *algo_data;
126	struct fwnode_handle *new_fwnode;
127	struct i2c_board_info ltc2990_info = {	126	struct i2c_board_info ltc2990_info = {
128	.type = "ltc2990",	127	.type = "ltc2990",
129	.swnode = &icy_ltc2990_node,	128	.swnode = &icy_ltc2990_node,

drivers/i2c/busses/i2c-mpc.c+79−2

@@ -19,6 +19,7 @@ · 18 unmodified lines
19		19
20	#include <linux/clk.h>	20	#include <linux/clk.h>
21	#include <linux/io.h>	21	#include <linux/io.h>
		22	#include <linux/iopoll.h>
22	#include <linux/fsl_devices.h>	23	#include <linux/fsl_devices.h>
23	#include <linux/i2c.h>	24	#include <linux/i2c.h>
24	#include <linux/interrupt.h>	25	#include <linux/interrupt.h>
@@ -45,6 +46,7 @@ · 20 unmodified lines
45	#define CCR_MTX 0x10	46	#define CCR_MTX 0x10
46	#define CCR_TXAK 0x08	47	#define CCR_TXAK 0x08
47	#define CCR_RSTA 0x04	48	#define CCR_RSTA 0x04
		49	#define CCR_RSVD 0x02
48		50
49	#define CSR_MCF 0x80	51	#define CSR_MCF 0x80
50	#define CSR_MAAS 0x40	52	#define CSR_MAAS 0x40
@@ -97,7 +99,7 @@ struct mpc_i2c { · 46 unmodified lines
97	u32 block;	99	u32 block;
98	int rc;	100	int rc;
99	int expect_rxack;	101	int expect_rxack;
100		102	bool has_errata_A004447;
101	};	103	};
102		104
103	struct mpc_i2c_divider {	105	struct mpc_i2c_divider {
@@ -136,6 +138,75 @@ static void mpc_i2c_fixup(struct mpc_i2c *i2c) · 32 unmodified lines
136	}	138	}
137	}	139	}
138		140
		141	static int i2c_mpc_wait_sr(struct mpc_i2c *i2c, int mask)
		142	{
		143	void __iomem *addr = i2c->base + MPC_I2C_SR;
		144	u8 val;
		145
		146	return readb_poll_timeout(addr, val, val & mask, 0, 100);
		147	}
		148
		149	/*
		150	* Workaround for Erratum A004447. From the P2040CE Rev Q
		151	*
		152	* 1. Set up the frequency divider and sampling rate.
		153	* 2. I2CCR - a0h
		154	* 3. Poll for I2CSR[MBB] to get set.
		155	* 4. If I2CSR[MAL] is set (an indication that SDA is stuck low), then go to
		156	* step 5. If MAL is not set, then go to step 13.
		157	* 5. I2CCR - 00h
		158	* 6. I2CCR - 22h
		159	* 7. I2CCR - a2h
		160	* 8. Poll for I2CSR[MBB] to get set.
		161	* 9. Issue read to I2CDR.
		162	* 10. Poll for I2CSR[MIF] to be set.
		163	* 11. I2CCR - 82h
		164	* 12. Workaround complete. Skip the next steps.
		165	* 13. Issue read to I2CDR.
		166	* 14. Poll for I2CSR[MIF] to be set.
		167	* 15. I2CCR - 80h
		168	*/
		169	static void mpc_i2c_fixup_A004447(struct mpc_i2c *i2c)
		170	{
		171	int ret;
		172	u32 val;
		173
		174	writeccr(i2c, CCR_MEN \| CCR_MSTA);
		175	ret = i2c_mpc_wait_sr(i2c, CSR_MBB);
		176	if (ret) {
		177	dev_err(i2c->dev, "timeout waiting for CSR_MBB\n");
		178	return;
		179	}
		180
		181	val = readb(i2c->base + MPC_I2C_SR);
		182
		183	if (val & CSR_MAL) {
		184	writeccr(i2c, 0x00);
		185	writeccr(i2c, CCR_MSTA \| CCR_RSVD);
		186	writeccr(i2c, CCR_MEN \| CCR_MSTA \| CCR_RSVD);
		187	ret = i2c_mpc_wait_sr(i2c, CSR_MBB);
		188	if (ret) {
		189	dev_err(i2c->dev, "timeout waiting for CSR_MBB\n");
		190	return;
		191	}
		192	val = readb(i2c->base + MPC_I2C_DR);
		193	ret = i2c_mpc_wait_sr(i2c, CSR_MIF);
		194	if (ret) {
		195	dev_err(i2c->dev, "timeout waiting for CSR_MIF\n");
		196	return;
		197	}
		198	writeccr(i2c, CCR_MEN \| CCR_RSVD);
		199	} else {
		200	val = readb(i2c->base + MPC_I2C_DR);
		201	ret = i2c_mpc_wait_sr(i2c, CSR_MIF);
		202	if (ret) {
		203	dev_err(i2c->dev, "timeout waiting for CSR_MIF\n");
		204	return;
		205	}
		206	writeccr(i2c, CCR_MEN);
		207	}
		208	}
		209
139	#if defined(CONFIG_PPC_MPC52xx) \|\| defined(CONFIG_PPC_MPC512x)	210	#if defined(CONFIG_PPC_MPC52xx) \|\| defined(CONFIG_PPC_MPC512x)
140	static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] = {	211	static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] = {
141	{20, 0x20}, {22, 0x21}, {24, 0x22}, {26, 0x23},	212	{20, 0x20}, {22, 0x21}, {24, 0x22}, {26, 0x23},
@@ -670,7 +741,10 @@ static int fsl_i2c_bus_recovery(struct i2c_adapter *adap) · 528 unmodified lines
670	{	741	{
671	struct mpc_i2c *i2c = i2c_get_adapdata(adap);	742	struct mpc_i2c *i2c = i2c_get_adapdata(adap);
672		743
673	mpc_i2c_fixup(i2c);	744	if (i2c->has_errata_A004447)
		745	mpc_i2c_fixup_A004447(i2c);
		746	else
		747	mpc_i2c_fixup(i2c);
674		748
675	return 0;	749	return 0;
676	}	750	}
@@ -767,6 +841,9 @@ static int fsl_i2c_probe(struct platform_device *op) · 90 unmodified lines
767	}	841	}
768	dev_info(i2c->dev, "timeout %u us\n", mpc_ops.timeout * 1000000 / HZ);	842	dev_info(i2c->dev, "timeout %u us\n", mpc_ops.timeout * 1000000 / HZ);
769		843
		844	if (of_property_read_bool(op->dev.of_node, "fsl,i2c-erratum-a004447"))
		845	i2c->has_errata_A004447 = true;
		846
770	i2c->adap = mpc_ops;	847	i2c->adap = mpc_ops;
771	scnprintf(i2c->adap.name, sizeof(i2c->adap.name),	848	scnprintf(i2c->adap.name, sizeof(i2c->adap.name),
772	"MPC adapter (%s)", of_node_full_name(op->dev.of_node));	849	"MPC adapter (%s)", of_node_full_name(op->dev.of_node));

drivers/i2c/busses/i2c-mt65xx.c+5−0

 static void mtk_i2c_init_hw(struct mtk_i2c *i2c)
 {
 	u16 control_reg;
+	u16 intr_stat_reg;
+	mtk_i2c_writew(i2c, I2C_CHN_CLR_FLAG, OFFSET_START);
+	intr_stat_reg = mtk_i2c_readw(i2c, OFFSET_INTR_STAT);
+	mtk_i2c_writew(i2c, intr_stat_reg, OFFSET_INTR_STAT);
 	if (i2c->dev_comp->apdma_sync) {
 		writel(I2C_DMA_WARM_RST, i2c->pdmabase + OFFSET_RST);

drivers/i2c/busses/i2c-nomadik.c+1−1

@@ -159,7 +159,7 @@ struct i2c_nmk_client { · 158 unmodified lines
159	* @clk_freq: clock frequency for the operation mode	159	* @clk_freq: clock frequency for the operation mode
160	* @tft: Tx FIFO Threshold in bytes	160	* @tft: Tx FIFO Threshold in bytes
161	* @rft: Rx FIFO Threshold in bytes	161	* @rft: Rx FIFO Threshold in bytes
162	* @timeout Slave response timeout (ms)	162	* @timeout: Slave response timeout (ms)
163	* @sm: speed mode	163	* @sm: speed mode
164	* @stop: stop condition.	164	* @stop: stop condition.
165	* @xfer_complete: acknowledge completion for a I2C message.	165	* @xfer_complete: acknowledge completion for a I2C message.

drivers/i2c/busses/i2c-ocores.c+4−4

@@ -250,7 +250,7 @@ static irqreturn_t ocores_isr(int irq, void *dev_id) · 249 unmodified lines
250	}	250	}
251		251
252	/**	252	/**
253	* Process timeout event	253	* ocores_process_timeout() - Process timeout event
254	* @i2c: ocores I2C device instance	254	* @i2c: ocores I2C device instance
255	*/	255	*/
256	static void ocores_process_timeout(struct ocores_i2c *i2c)	256	static void ocores_process_timeout(struct ocores_i2c *i2c)
@@ -264,7 +264,7 @@ static void ocores_process_timeout(struct ocores_i2c *i2c) · 7 unmodified lines
264	}	264	}
265		265
266	/**	266	/**
267	* Wait until something change in a given register	267	* ocores_wait() - Wait until something change in a given register
268	* @i2c: ocores I2C device instance	268	* @i2c: ocores I2C device instance
269	* @reg: register to query	269	* @reg: register to query
270	* @mask: bitmask to apply on register value	270	* @mask: bitmask to apply on register value
@@ -296,7 +296,7 @@ static int ocores_wait(struct ocores_i2c *i2c, · 25 unmodified lines
296	}	296	}
297		297
298	/**	298	/**
299	* Wait until is possible to process some data	299	* ocores_poll_wait() - Wait until is possible to process some data
300	* @i2c: ocores I2C device instance	300	* @i2c: ocores I2C device instance
301	*	301	*
302	* Used when the device is in polling mode (interrupts disabled).	302	* Used when the device is in polling mode (interrupts disabled).
@@ -334,7 +334,7 @@ static int ocores_poll_wait(struct ocores_i2c *i2c) · 31 unmodified lines
334	}	334	}
335		335
336	/**	336	/**
337	* It handles an IRQ-less transfer	337	* ocores_process_polling() - It handles an IRQ-less transfer
338	* @i2c: ocores I2C device instance	338	* @i2c: ocores I2C device instance
339	*	339	*
340	* Even if IRQ are disabled, the I2C OpenCore IP behavior is exactly the same	340	* Even if IRQ are disabled, the I2C OpenCore IP behavior is exactly the same

drivers/i2c/busses/i2c-pnx.c+4−4

@@ -138,7 +138,7 @@ static inline void i2c_pnx_arm_timer(struct i2c_pnx_algo_data *alg_data) · 137 unmodified lines
138	/**	138	/**
139	* i2c_pnx_start - start a device	139	* i2c_pnx_start - start a device
140	* @slave_addr: slave address	140	* @slave_addr: slave address
141	* @adap: pointer to adapter structure	141	* @alg_data: pointer to local driver data structure
142	*	142	*
143	* Generate a START signal in the desired mode.	143	* Generate a START signal in the desired mode.
144	*/	144	*/
@@ -194,7 +194,7 @@ static int i2c_pnx_start(unsigned char slave_addr, · 49 unmodified lines
194		194
195	/**	195	/**
196	* i2c_pnx_stop - stop a device	196	* i2c_pnx_stop - stop a device
197	* @adap: pointer to I2C adapter structure	197	* @alg_data: pointer to local driver data structure
198	*	198	*
199	* Generate a STOP signal to terminate the master transaction.	199	* Generate a STOP signal to terminate the master transaction.
200	*/	200	*/
@@ -223,7 +223,7 @@ static void i2c_pnx_stop(struct i2c_pnx_algo_data *alg_data) · 22 unmodified lines
223		223
224	/**	224	/**
225	* i2c_pnx_master_xmit - transmit data to slave	225	* i2c_pnx_master_xmit - transmit data to slave
226	* @adap: pointer to I2C adapter structure	226	* @alg_data: pointer to local driver data structure
227	*	227	*
228	* Sends one byte of data to the slave	228	* Sends one byte of data to the slave
229	*/	229	*/
@@ -293,7 +293,7 @@ static int i2c_pnx_master_xmit(struct i2c_pnx_algo_data *alg_data) · 63 unmodified lines
293		293
294	/**	294	/**
295	* i2c_pnx_master_rcv - receive data from slave	295	* i2c_pnx_master_rcv - receive data from slave
296	* @adap: pointer to I2C adapter structure	296	* @alg_data: pointer to local driver data structure
297	*	297	*
298	* Reads one byte data from the slave	298	* Reads one byte data from the slave
299	*/	299	*/

drivers/i2c/busses/i2c-qcom-geni.c+21−2

 	[GP_IRQ0] = {-EIO, "Unknown I2C err GP_IRQ0"},
 	[NACK] = {-ENXIO, "NACK: slv unresponsive, check its power/reset-ln"},
 	[GP_IRQ2] = {-EIO, "Unknown I2C err GP IRQ2"},
-	[BUS_PROTO] = {-EPROTO, "Bus proto err, noisy/unepxected start/stop"},
+	[BUS_PROTO] = {-EPROTO, "Bus proto err, noisy/unexpected start/stop"},
 	[ARB_LOST] = {-EAGAIN, "Bus arbitration lost, clock line undriveable"},
 	[GP_IRQ5] = {-EIO, "Unknown I2C err GP IRQ5"},
 	[GENI_OVERRUN] = {-EIO, "Cmd overrun, check GENI cmd-state machine"},
 	return 0;
 }
+static void geni_i2c_shutdown(struct platform_device *pdev)
+{
+	struct geni_i2c_dev *gi2c = platform_get_drvdata(pdev);
+	/* Make client i2c transfers start failing */
+	i2c_mark_adapter_suspended(&gi2c->adap);
+}
 static int __maybe_unused geni_i2c_runtime_suspend(struct device *dev)
 {
 	int ret;
 {
 	struct geni_i2c_dev *gi2c = dev_get_drvdata(dev);
+	i2c_mark_adapter_suspended(&gi2c->adap);
 	if (!gi2c->suspended) {
 		geni_i2c_runtime_suspend(dev);
 		pm_runtime_disable(dev);
 	return 0;
 }
+static int __maybe_unused geni_i2c_resume_noirq(struct device *dev)
+{
+	struct geni_i2c_dev *gi2c = dev_get_drvdata(dev);
+	i2c_mark_adapter_resumed(&gi2c->adap);
+	return 0;
+}
 static const struct dev_pm_ops geni_i2c_pm_ops = {
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(geni_i2c_suspend_noirq, NULL)
+	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(geni_i2c_suspend_noirq, geni_i2c_resume_noirq)
 	SET_RUNTIME_PM_OPS(geni_i2c_runtime_suspend, geni_i2c_runtime_resume,
 									NULL)
 };
 static struct platform_driver geni_i2c_driver = {
 	.probe  = geni_i2c_probe,
 	.remove = geni_i2c_remove,
+	.shutdown = geni_i2c_shutdown,
 	.driver = {
 		.name = "geni_i2c",
 		.pm = &geni_i2c_pm_ops,

drivers/i2c/busses/i2c-s3c2410.c+3−0

 					 * forces us to send a new START
 					 * when we change direction
 					 */
+					dev_dbg(i2c->dev,
+						"missing START before write->read\n");
 					s3c24xx_i2c_stop(i2c, -EINVAL);
+					break;
 				}
 				goto retry_write;

drivers/i2c/busses/i2c-sh_mobile.c+1−1

@@ -807,7 +807,7 @@ static const struct sh_mobile_dt_config r8a7740_dt_config = { · 806 unmodified lines
807	static const struct of_device_id sh_mobile_i2c_dt_ids[] = {	807	static const struct of_device_id sh_mobile_i2c_dt_ids[] = {
808	{ .compatible = "renesas,iic-r8a73a4", .data = &fast_clock_dt_config },	808	{ .compatible = "renesas,iic-r8a73a4", .data = &fast_clock_dt_config },
809	{ .compatible = "renesas,iic-r8a7740", .data = &r8a7740_dt_config },	809	{ .compatible = "renesas,iic-r8a7740", .data = &r8a7740_dt_config },
810	{ .compatible = "renesas,iic-r8a774c0", .data = &fast_clock_dt_config },	810	{ .compatible = "renesas,iic-r8a774c0", .data = &v2_freq_calc_dt_config },
811	{ .compatible = "renesas,iic-r8a7790", .data = &v2_freq_calc_dt_config },	811	{ .compatible = "renesas,iic-r8a7790", .data = &v2_freq_calc_dt_config },
812	{ .compatible = "renesas,iic-r8a7791", .data = &v2_freq_calc_dt_config },	812	{ .compatible = "renesas,iic-r8a7791", .data = &v2_freq_calc_dt_config },
813	{ .compatible = "renesas,iic-r8a7792", .data = &v2_freq_calc_dt_config },	813	{ .compatible = "renesas,iic-r8a7792", .data = &v2_freq_calc_dt_config },

drivers/i2c/busses/i2c-st.c+2−2

@@ -524,7 +524,7 @@ static void st_i2c_handle_write(struct st_i2c_dev *i2c_dev) · 523 unmodified lines
524	}	524	}
525		525
526	/**	526	/**
527	* st_i2c_handle_write() - Handle FIFO enmpty interrupt in case of read	527	* st_i2c_handle_read() - Handle FIFO empty interrupt in case of read
528	* @i2c_dev: Controller's private data	528	* @i2c_dev: Controller's private data
529	*/	529	*/
530	static void st_i2c_handle_read(struct st_i2c_dev *i2c_dev)	530	static void st_i2c_handle_read(struct st_i2c_dev *i2c_dev)
@@ -558,7 +558,7 @@ static void st_i2c_handle_read(struct st_i2c_dev *i2c_dev) · 27 unmodified lines
558	}	558	}
559		559
560	/**	560	/**
561	* st_i2c_isr() - Interrupt routine	561	* st_i2c_isr_thread() - Interrupt routine
562	* @irq: interrupt number	562	* @irq: interrupt number
563	* @data: Controller's private data	563	* @data: Controller's private data
564	*/	564	*/

drivers/i2c/busses/i2c-stm32f4.c+1−1

@@ -313,7 +313,7 @@ static int stm32f4_i2c_wait_free_bus(struct stm32f4_i2c_dev *i2c_dev) · 312 unmodified lines
313	}	313	}
314		314
315	/**	315	/**
316	* stm32f4_i2c_write_ byte() - Write a byte in the data register	316	* stm32f4_i2c_write_byte() - Write a byte in the data register
317	* @i2c_dev: Controller's private data	317	* @i2c_dev: Controller's private data
318	* @byte: Data to write in the register	318	* @byte: Data to write in the register
319	*/	319	*/

drivers/i2c/busses/i2c-tegra-bpmp.c+2−2

@@ -65,7 +65,7 @@ static void tegra_bpmp_xlate_flags(u16 flags, u16 *out) · 64 unmodified lines
65	*out \|= SERIALI2C_RECV_LEN;	65	*out \|= SERIALI2C_RECV_LEN;
66	}	66	}
67		67
68	/**	68	/*
69	* The serialized I2C format is simply the following:	69	* The serialized I2C format is simply the following:
70	* [addr little-endian][flags little-endian][len little-endian][data if write]	70	* [addr little-endian][flags little-endian][len little-endian][data if write]
71	* [addr little-endian][flags little-endian][len little-endian][data if write]	71	* [addr little-endian][flags little-endian][len little-endian][data if write]
@@ -109,7 +109,7 @@ static void tegra_bpmp_serialize_i2c_msg(struct tegra_bpmp_i2c *i2c, · 37 unmodified lines
109	request->xfer.data_size = pos;	109	request->xfer.data_size = pos;
110	}	110	}
111		111
112	/**	112	/*
113	* The data in the BPMP -> CPU direction is composed of sequential blocks for	113	* The data in the BPMP -> CPU direction is composed of sequential blocks for
114	* those messages that have I2C_M_RD. So, for example, if you have:	114	* those messages that have I2C_M_RD. So, for example, if you have:
115	*	115	*

drivers/i2c/muxes/i2c-arb-gpio-challenge.c+2−2

@@ -34,7 +34,7 @@ struct i2c_arbitrator_data { · 33 unmodified lines
34	};	34	};
35		35
36		36
37	/**	37	/*
38	* i2c_arbitrator_select - claim the I2C bus	38	* i2c_arbitrator_select - claim the I2C bus
39	*	39	*
40	* Use the GPIO-based signalling protocol; return -EBUSY if we fail.	40	* Use the GPIO-based signalling protocol; return -EBUSY if we fail.
@@ -77,7 +77,7 @@ static int i2c_arbitrator_select(struct i2c_mux_core *muxc, u32 chan) · 36 unmodified lines
77	return -EBUSY;	77	return -EBUSY;
78	}	78	}
79		79
80	/**	80	/*
81	* i2c_arbitrator_deselect - release the I2C bus	81	* i2c_arbitrator_deselect - release the I2C bus
82	*	82	*
83	* Release the I2C bus using the GPIO-based signalling protocol.	83	* Release the I2C bus using the GPIO-based signalling protocol.

drivers/iio/adc/ad7124.c+20−16

 		if (ret)
 			goto err;
+		if (channel >= indio_dev->num_channels) {
+			dev_err(indio_dev->dev.parent,
+				"Channel index >= number of channels\n");
+			ret = -EINVAL;
+			goto err;
+		}
 		ret = of_property_read_u32_array(child, "diff-channels",
 						 ain, 2);
 		if (ret)
 	return ret;
 }
+static void ad7124_reg_disable(void *r)
+{
+	regulator_disable(r);
+}
 static int ad7124_probe(struct spi_device *spi)
 {
 	const struct ad7124_chip_info *info;
 		ret = regulator_enable(st->vref[i]);
 		if (ret)
 			return ret;
+		ret = devm_add_action_or_reset(&spi->dev, ad7124_reg_disable,
+					       st->vref[i]);
+		if (ret)
+			return ret;
 	}
 	st->mclk = devm_clk_get(&spi->dev, "mclk");
-	if (IS_ERR(st->mclk)) {
+	if (IS_ERR(st->mclk))
-		ret = PTR_ERR(st->mclk);
+		return PTR_ERR(st->mclk);
-		goto error_regulator_disable;
-	}
 	ret = clk_prepare_enable(st->mclk);
 	if (ret < 0)
-		goto error_regulator_disable;
+		return ret;
 	ret = ad7124_soft_reset(st);
 	if (ret < 0)
 	ad_sd_cleanup_buffer_and_trigger(indio_dev);
 error_clk_disable_unprepare:
 	clk_disable_unprepare(st->mclk);
-error_regulator_disable:
-	for (i = ARRAY_SIZE(st->vref) - 1; i >= 0; i--) {
-		if (!IS_ERR_OR_NULL(st->vref[i]))
-			regulator_disable(st->vref[i]);
-	}
 	return ret;
 }
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct ad7124_state *st = iio_priv(indio_dev);
-	int i;
 	iio_device_unregister(indio_dev);
 	ad_sd_cleanup_buffer_and_trigger(indio_dev);
 	clk_disable_unprepare(st->mclk);
-	for (i = ARRAY_SIZE(st->vref) - 1; i >= 0; i--) {
-		if (!IS_ERR_OR_NULL(st->vref[i]))
-			regulator_disable(st->vref[i]);
-	}
 	return 0;
 }

drivers/iio/adc/ad7192.c+10−9

@@ -912,7 +912,7 @@ static int ad7192_probe(struct spi_device *spi) · 911 unmodified lines
912	{	912	{
913	struct ad7192_state *st;	913	struct ad7192_state *st;
914	struct iio_dev *indio_dev;	914	struct iio_dev *indio_dev;
915	int ret, voltage_uv = 0;	915	int ret;
916		916
917	if (!spi->irq) {	917	if (!spi->irq) {
918	dev_err(&spi->dev, "no IRQ?\n");	918	dev_err(&spi->dev, "no IRQ?\n");
@@ -949,15 +949,12 @@ static int ad7192_probe(struct spi_device *spi) · 30 unmodified lines
949	goto error_disable_avdd;	949	goto error_disable_avdd;
950	}	950	}
951		951
952	voltage_uv = regulator_get_voltage(st->avdd);	952	ret = regulator_get_voltage(st->avdd);
953		953	if (ret < 0) {
954	if (voltage_uv > 0) {
955	st->int_vref_mv = voltage_uv / 1000;
956	} else {
957	ret = voltage_uv;
958	dev_err(&spi->dev, "Device tree error, reference voltage undefined\n");	954	dev_err(&spi->dev, "Device tree error, reference voltage undefined\n");
959	goto error_disable_avdd;	955	goto error_disable_avdd;
960	}	956	}
		957	st->int_vref_mv = ret / 1000;
961		958
962	spi_set_drvdata(spi, indio_dev);	959	spi_set_drvdata(spi, indio_dev);
963	st->chip_info = of_device_get_match_data(&spi->dev);	960	st->chip_info = of_device_get_match_data(&spi->dev);
@@ -1014,7 +1011,9 @@ static int ad7192_probe(struct spi_device *spi) · 50 unmodified lines
1014	return 0;	1011	return 0;
1015		1012
1016	error_disable_clk:	1013	error_disable_clk:
1017	clk_disable_unprepare(st->mclk);	1014	if (st->clock_sel == AD7192_CLK_EXT_MCLK1_2 \|\|
		1015	st->clock_sel == AD7192_CLK_EXT_MCLK2)
		1016	clk_disable_unprepare(st->mclk);
1018	error_remove_trigger:	1017	error_remove_trigger:
1019	ad_sd_cleanup_buffer_and_trigger(indio_dev);	1018	ad_sd_cleanup_buffer_and_trigger(indio_dev);
1020	error_disable_dvdd:	1019	error_disable_dvdd:
@@ -1031,7 +1030,9 @@ static int ad7192_remove(struct spi_device *spi) · 10 unmodified lines
1031	struct ad7192_state *st = iio_priv(indio_dev);	1030	struct ad7192_state *st = iio_priv(indio_dev);
1032		1031
1033	iio_device_unregister(indio_dev);	1032	iio_device_unregister(indio_dev);
1034	clk_disable_unprepare(st->mclk);	1033	if (st->clock_sel == AD7192_CLK_EXT_MCLK1_2 \|\|
		1034	st->clock_sel == AD7192_CLK_EXT_MCLK2)
		1035	clk_disable_unprepare(st->mclk);
1035	ad_sd_cleanup_buffer_and_trigger(indio_dev);	1036	ad_sd_cleanup_buffer_and_trigger(indio_dev);
1036		1037
1037	regulator_disable(st->dvdd);	1038	regulator_disable(st->dvdd);

drivers/iio/adc/ad7768-1.c+6−2

 	 * transfer buffers to live in their own cache lines.
 	 */
 	union {
+		struct {
+			__be32 chan;
+			s64 timestamp;
+		} scan;
 		__be32 d32;
 		u8 d8[2];
 	} data ____cacheline_aligned;
 	mutex_lock(&st->lock);
-	ret = spi_read(st->spi, &st->data.d32, 3);
+	ret = spi_read(st->spi, &st->data.scan.chan, 3);
 	if (ret < 0)
 		goto err_unlock;
-	iio_push_to_buffers_with_timestamp(indio_dev, &st->data.d32,
+	iio_push_to_buffers_with_timestamp(indio_dev, &st->data.scan,
 					   iio_get_time_ns(indio_dev));
 	iio_trigger_notify_done(indio_dev->trig);

drivers/iio/adc/ad7793.c+1−0

@@ -279,6 +279,7 @@ static int ad7793_setup(struct iio_dev *indio_dev, · 278 unmodified lines
279	id &= AD7793_ID_MASK;	279	id &= AD7793_ID_MASK;
280		280
281	if (id != st->chip_info->id) {	281	if (id != st->chip_info->id) {
		282	ret = -ENODEV;
282	dev_err(&st->sd.spi->dev, "device ID query failed\n");	283	dev_err(&st->sd.spi->dev, "device ID query failed\n");
283	goto out;	284	goto out;
284	}	285	}

drivers/iio/adc/ad7923.c+3−1

 	/*
 	 * DMA (thus cache coherency maintenance) requires the
 	 * transfer buffers to live in their own cache lines.
+	 * Ensure rx_buf can be directly used in iio_push_to_buffers_with_timetamp
+	 * Length = 8 channels + 4 extra for 8 byte timestamp
 	 */
-	__be16				rx_buf[4] ____cacheline_aligned;
+	__be16				rx_buf[12] ____cacheline_aligned;
 	__be16				tx_buf[4];
 };

drivers/iio/dac/ad5770r.c+11−5

 	device_for_each_child_node(&st->spi->dev, child) {
 		ret = fwnode_property_read_u32(child, "num", &num);
 		if (ret)
-			return ret;
+			goto err_child_out;
-		if (num >= AD5770R_MAX_CHANNELS)
+		if (num >= AD5770R_MAX_CHANNELS) {
-			return -EINVAL;
+			ret = -EINVAL;
+			goto err_child_out;
+		}
 		ret = fwnode_property_read_u32_array(child,
 						     "adi,range-microamp",
 						     tmp, 2);
 		if (ret)
-			return ret;
+			goto err_child_out;
 		min = tmp[0] / 1000;
 		max = tmp[1] / 1000;
 		ret = ad5770r_store_output_range(st, min, max, num);
 		if (ret)
-			return ret;
+			goto err_child_out;
 	}
+	return 0;
+err_child_out:
+	fwnode_handle_put(child);
 	return ret;
 }

drivers/iio/gyro/fxas21002c_core.c+2−0

 	ret = regmap_field_read(data->regmap_fields[F_TEMP], &temp);
 	if (ret < 0) {
 		dev_err(dev, "failed to read temp: %d\n", ret);
+		fxas21002c_pm_put(data);
 		goto data_unlock;
 	}
 			       &axis_be, sizeof(axis_be));
 	if (ret < 0) {
 		dev_err(dev, "failed to read axis: %d: %d\n", index, ret);
+		fxas21002c_pm_put(data);
 		goto data_unlock;
 	}

drivers/infiniband/core/uverbs_cmd.c+5−0

 		goto err_free_attr;
 	}
+	if (!rdma_is_port_valid(uobj->context->device, cmd.flow_attr.port)) {
+		err = -EINVAL;
+		goto err_uobj;
+	}
 	qp = uobj_get_obj_read(qp, UVERBS_OBJECT_QP, cmd.qp_handle, attrs);
 	if (!qp) {
 		err = -EINVAL;

drivers/infiniband/hw/mlx4/main.c+1−7

 	props->cq_caps.max_cq_moderation_count = MLX4_MAX_CQ_COUNT;
 	props->cq_caps.max_cq_moderation_period = MLX4_MAX_CQ_PERIOD;
-	if (!mlx4_is_slave(dev->dev))
-		err = mlx4_get_internal_clock_params(dev->dev, &clock_params);
 	if (uhw->outlen >= resp.response_length + sizeof(resp.hca_core_clock_offset)) {
 		resp.response_length += sizeof(resp.hca_core_clock_offset);
-		if (!err && !mlx4_is_slave(dev->dev)) {
+		if (!mlx4_get_internal_clock_params(dev->dev, &clock_params)) {
 			resp.comp_mask |= MLX4_IB_QUERY_DEV_RESP_MASK_CORE_CLOCK_OFFSET;
 			resp.hca_core_clock_offset = clock_params.offset % PAGE_SIZE;
 		}
 	struct mlx4_dev *dev = (to_mdev(qp->device))->dev;
 	int is_bonded = mlx4_is_bonded(dev);
-	if (!rdma_is_port_valid(qp->device, flow_attr->port))
-		return ERR_PTR(-EINVAL);
 	if (flow_attr->flags & ~IB_FLOW_ATTR_FLAGS_DONT_TRAP)
 		return ERR_PTR(-EOPNOTSUPP);

drivers/infiniband/hw/mlx5/cq.c+4−5

 	ib_umem_release(cq->buf.umem);
 }
-static void init_cq_frag_buf(struct mlx5_ib_cq *cq,
+static void init_cq_frag_buf(struct mlx5_ib_cq_buf *buf)
-			     struct mlx5_ib_cq_buf *buf)
 {
 	int i;
 	void *cqe;
 	struct mlx5_cqe64 *cqe64;
 	for (i = 0; i < buf->nent; i++) {
-		cqe = get_cqe(cq, i);
+		cqe = mlx5_frag_buf_get_wqe(&buf->fbc, i);
 		cqe64 = buf->cqe_size == 64 ? cqe : cqe + 64;
 		cqe64->op_own = MLX5_CQE_INVALID << 4;
 	}
 	if (err)
 		goto err_db;
-	init_cq_frag_buf(cq, &cq->buf);
+	init_cq_frag_buf(&cq->buf);
 	*inlen = MLX5_ST_SZ_BYTES(create_cq_in) +
 		 MLX5_FLD_SZ_BYTES(create_cq_in, pas[0]) *
 	if (err)
 		goto ex;
-	init_cq_frag_buf(cq, cq->resize_buf);
+	init_cq_frag_buf(cq->resize_buf);
 	return 0;

drivers/infiniband/hw/mlx5/doorbell.c+6−1

 	struct ib_umem	       *umem;
 	unsigned long		user_virt;
 	int			refcnt;
+	struct mm_struct	*mm;
 };
 int mlx5_ib_db_map_user(struct mlx5_ib_ucontext *context,
 	mutex_lock(&context->db_page_mutex);
 	list_for_each_entry(page, &context->db_page_list, list)
-		if (page->user_virt == (virt & PAGE_MASK))
+		if ((current->mm == page->mm) &&
+		    (page->user_virt == (virt & PAGE_MASK)))
 			goto found;
 	page = kmalloc(sizeof(*page), GFP_KERNEL);
 		kfree(page);
 		goto out;
 	}
+	mmgrab(current->mm);
+	page->mm = current->mm;
 	list_add(&page->list, &context->db_page_list);
 	if (!--db->u.user_page->refcnt) {
 		list_del(&db->u.user_page->list);
+		mmdrop(db->u.user_page->mm);
 		ib_umem_release(db->u.user_page->umem);
 		kfree(db->u.user_page);
 	}

drivers/infiniband/hw/mlx5/fs.c+8−3

 		goto free_ucmd;
 	}
-	if (flow_attr->port > dev->num_ports ||
+	if (flow_attr->flags &
-	    (flow_attr->flags &
+	    ~(IB_FLOW_ATTR_FLAGS_DONT_TRAP | IB_FLOW_ATTR_FLAGS_EGRESS)) {
-	     ~(IB_FLOW_ATTR_FLAGS_DONT_TRAP | IB_FLOW_ATTR_FLAGS_EGRESS))) {
 		err = -EINVAL;
 		goto free_ucmd;
 	}
 	if (err)
 		goto end;
+	if (obj->ns_type == MLX5_FLOW_NAMESPACE_FDB &&
+	    mlx5_eswitch_mode(dev->mdev) != MLX5_ESWITCH_OFFLOADS) {
+		err = -EINVAL;
+		goto end;
+	}
 	uobj->object = obj;
 	obj->mdev = dev->mdev;
 	atomic_set(&obj->usecnt, 0);

drivers/infiniband/hw/mlx5/mr.c+4−4

@@ -743,10 +743,10 @@ int mlx5_mr_cache_init(struct mlx5_ib_dev *dev) · 742 unmodified lines
743	ent->xlt = (1 << ent->order) * sizeof(struct mlx5_mtt) /	743	ent->xlt = (1 << ent->order) * sizeof(struct mlx5_mtt) /
744	MLX5_IB_UMR_OCTOWORD;	744	MLX5_IB_UMR_OCTOWORD;
745	ent->access_mode = MLX5_MKC_ACCESS_MODE_MTT;	745	ent->access_mode = MLX5_MKC_ACCESS_MODE_MTT;
746	if ((dev->mdev->profile->mask & MLX5_PROF_MASK_MR_CACHE) &&	746	if ((dev->mdev->profile.mask & MLX5_PROF_MASK_MR_CACHE) &&
747	!dev->is_rep && mlx5_core_is_pf(dev->mdev) &&	747	!dev->is_rep && mlx5_core_is_pf(dev->mdev) &&
748	mlx5_ib_can_load_pas_with_umr(dev, 0))	748	mlx5_ib_can_load_pas_with_umr(dev, 0))
749	ent->limit = dev->mdev->profile->mr_cache[i].limit;	749	ent->limit = dev->mdev->profile.mr_cache[i].limit;
750	else	750	else
751	ent->limit = 0;	751	ent->limit = 0;
752	spin_lock_irq(&ent->lock);	752	spin_lock_irq(&ent->lock);
@@ -1940,8 +1940,8 @@ int mlx5_ib_dereg_mr(struct ib_mr ibmr, struct ib_udata udata) · 1187 unmodified lines
1940	mlx5r_deref_wait_odp_mkey(&mr->mmkey);	1940	mlx5r_deref_wait_odp_mkey(&mr->mmkey);
1941		1941
1942	if (ibmr->type == IB_MR_TYPE_INTEGRITY) {	1942	if (ibmr->type == IB_MR_TYPE_INTEGRITY) {
1943	xa_cmpxchg(&dev->sig_mrs, mlx5_base_mkey(mr->mmkey.key), ibmr,	1943	xa_cmpxchg(&dev->sig_mrs, mlx5_base_mkey(mr->mmkey.key),
1944	NULL, GFP_KERNEL);	1944	mr->sig, NULL, GFP_KERNEL);
1945		1945
1946	if (mr->mtt_mr) {	1946	if (mr->mtt_mr) {
1947	rc = mlx5_ib_dereg_mr(&mr->mtt_mr->ibmr, NULL);	1947	rc = mlx5_ib_dereg_mr(&mr->mtt_mr->ibmr, NULL);

drivers/infiniband/ulp/ipoib/ipoib_netlink.c+1−0

@@ -163,6 +163,7 @@ static size_t ipoib_get_size(const struct net_device *dev) · 162 unmodified lines
163		163
164	static struct rtnl_link_ops ipoib_link_ops __read_mostly = {	164	static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
165	.kind = "ipoib",	165	.kind = "ipoib",
		166	.netns_refund = true,
166	.maxtype = IFLA_IPOIB_MAX,	167	.maxtype = IFLA_IPOIB_MAX,
167	.policy = ipoib_policy,	168	.policy = ipoib_policy,
168	.priv_size = sizeof(struct ipoib_dev_priv),	169	.priv_size = sizeof(struct ipoib_dev_priv),

drivers/interconnect/qcom/bcm-voter.c+3−1

 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
  */
 #include <asm/div64.h>
 	}
 	mutex_unlock(&bcm_voter_lock);
+	of_node_put(node);
 	return voter;
 }
 EXPORT_SYMBOL_GPL(of_bcm_voter_get);
 	{ .compatible = "qcom,bcm-voter" },
 	{ }
 };
+MODULE_DEVICE_TABLE(of, bcm_voter_of_match);
 static struct platform_driver qcom_icc_bcm_voter_driver = {
 	.probe = qcom_icc_bcm_voter_probe,

drivers/iommu/amd/iommu.c+3−1

 		 * The msb-bit must be clear on the address. Just set all the
 		 * lower bits.
 		 */
-		address |= 1ull << (msb_diff - 1);
+		address |= (1ull << msb_diff) - 1;
 	}
 	/* Clear bits 11:0 */
 	domain = iommu_get_domain_for_dev(dev);
 	if (domain->type == IOMMU_DOMAIN_DMA)
 		iommu_setup_dma_ops(dev, IOVA_START_PFN << PAGE_SHIFT, 0);
+	else
+		set_dma_ops(dev, NULL);
 }
 static void amd_iommu_release_device(struct device *dev)

drivers/iommu/intel/dmar.c+3−1

 		err = iommu_device_register(&iommu->iommu, &intel_iommu_ops, NULL);
 		if (err)
-			goto err_unmap;
+			goto err_sysfs;
 	}
 	drhd->iommu = iommu;
 	return 0;
+err_sysfs:
+	iommu_device_sysfs_remove(&iommu->iommu);
 err_unmap:
 	unmap_iommu(iommu);
 error_free_seq_id:

drivers/iommu/intel/iommu.c+7−2

 				    struct device *dev,
 				    u32 pasid)
 {
-	int flags = PASID_FLAG_SUPERVISOR_MODE;
 	struct dma_pte *pgd = domain->pgd;
 	int agaw, level;
+	int flags = 0;
 	/*
 	 * Skip top levels of page tables for iommu which has
 	if (level != 4 && level != 5)
 		return -EINVAL;
-	flags |= (level == 5) ? PASID_FLAG_FL5LP : 0;
+	if (pasid != PASID_RID2PASID)
+		flags |= PASID_FLAG_SUPERVISOR_MODE;
+	if (level == 5)
+		flags |= PASID_FLAG_FL5LP;
 	if (domain->domain.type == IOMMU_DOMAIN_UNMANAGED)
 		flags |= PASID_FLAG_PAGE_SNOOP;
 	if (!sinfo) {
 		sinfo = kzalloc(sizeof(*sinfo), GFP_ATOMIC);
+		if (!sinfo)
+			return -ENOMEM;
 		sinfo->domain = domain;
 		sinfo->pdev = dev;
 		list_add(&sinfo->link_phys, &info->subdevices);

drivers/iommu/intel/pasid.c+2−1

@@ -699,7 +699,8 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu, · 698 unmodified lines
699	* Since it is a second level only translation setup, we should	699	* Since it is a second level only translation setup, we should
700	* set SRE bit as well (addresses are expected to be GPAs).	700	* set SRE bit as well (addresses are expected to be GPAs).
701	*/	701	*/
702	pasid_set_sre(pte);	702	if (pasid != PASID_RID2PASID)
		703	pasid_set_sre(pte);
703	pasid_set_present(pte);	704	pasid_set_present(pte);
704	pasid_flush_caches(iommu, pte, pasid, did);	705	pasid_flush_caches(iommu, pte, pasid, did);
705		706

drivers/iommu/virtio-iommu.c+1−0

@@ -1136,6 +1136,7 @@ static struct virtio_device_id id_table[] = { · 1135 unmodified lines
1136	{ VIRTIO_ID_IOMMU, VIRTIO_DEV_ANY_ID },	1136	{ VIRTIO_ID_IOMMU, VIRTIO_DEV_ANY_ID },
1137	{ 0 },	1137	{ 0 },
1138	};	1138	};
		1139	MODULE_DEVICE_TABLE(virtio, id_table);
1139		1140
1140	static struct virtio_driver virtio_iommu_drv = {	1141	static struct virtio_driver virtio_iommu_drv = {
1141	.driver.name = KBUILD_MODNAME,	1142	.driver.name = KBUILD_MODNAME,

drivers/irqchip/irq-gic-v3.c+35−1

@@ -642,11 +642,45 @@ static inline void gic_handle_nmi(u32 irqnr, struct pt_regs *regs) · 641 unmodified lines
642	nmi_exit();	642	nmi_exit();
643	}	643	}
644		644
		645	static u32 do_read_iar(struct pt_regs *regs)
		646	{
		647	u32 iar;
		648
		649	if (gic_supports_nmi() && unlikely(!interrupts_enabled(regs))) {
		650	u64 pmr;
		651
		652	/*
		653	* We were in a context with IRQs disabled. However, the
		654	* entry code has set PMR to a value that allows any
		655	* interrupt to be acknowledged, and not just NMIs. This can
		656	* lead to surprising effects if the NMI has been retired in
		657	* the meantime, and that there is an IRQ pending. The IRQ
		658	* would then be taken in NMI context, something that nobody
		659	* wants to debug twice.
		660	*
		661	* Until we sort this, drop PMR again to a level that will
		662	* actually only allow NMIs before reading IAR, and then
		663	* restore it to what it was.
		664	*/
		665	pmr = gic_read_pmr();
		666	gic_pmr_mask_irqs();
		667	isb();
		668
		669	iar = gic_read_iar();
		670
		671	gic_write_pmr(pmr);
		672	} else {
		673	iar = gic_read_iar();
		674	}
		675
		676	return iar;
		677	}
		678
645	static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)	679	static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)
646	{	680	{
647	u32 irqnr;	681	u32 irqnr;
648		682
649	irqnr = gic_read_iar();	683	irqnr = do_read_iar(regs);
650		684
651	/* Check for special IDs first */	685	/* Check for special IDs first */
652	if ((irqnr >= 1020 && irqnr <= 1023))	686	if ((irqnr >= 1020 && irqnr <= 1023))

drivers/isdn/hardware/mISDN/netjet.c+0−1

@@ -1100,7 +1100,6 @@ nj_probe(struct pci_dev pdev, const struct pci_device_id ent) · 1099 unmodified lines
1100	card->typ = NETJET_S_TJ300;	1100	card->typ = NETJET_S_TJ300;
1101		1101
1102	card->base = pci_resource_start(pdev, 0);	1102	card->base = pci_resource_start(pdev, 0);
1103	card->irq = pdev->irq;
1104	pci_set_drvdata(pdev, card);	1103	pci_set_drvdata(pdev, card);
1105	err = setup_instance(card);	1104	err = setup_instance(card);
1106	if (err)	1105	if (err)

drivers/md/bcache/bcache.h+0−1

@@ -364,7 +364,6 @@ struct cached_dev { · 363 unmodified lines
364		364
365	/* The rest of this all shows up in sysfs */	365	/* The rest of this all shows up in sysfs */
366	unsigned int sequential_cutoff;	366	unsigned int sequential_cutoff;
367	unsigned int readahead;
368		367
369	unsigned int io_disable:1;	368	unsigned int io_disable:1;
370	unsigned int verify:1;	369	unsigned int verify:1;

drivers/md/bcache/request.c+7−13

 				 struct bio *bio, unsigned int sectors)
 {
 	int ret = MAP_CONTINUE;
-	unsigned int reada = 0;
 	struct cached_dev *dc = container_of(s->d, struct cached_dev, disk);
 	struct bio *miss, *cache_bio;
+	unsigned int size_limit;
 	s->cache_missed = 1;
 		goto out_submit;
 	}
-	if (!(bio->bi_opf & REQ_RAHEAD) &&
+	/* Limitation for valid replace key size and cache_bio bvecs number */
-	    !(bio->bi_opf & (REQ_META|REQ_PRIO)) &&
+	size_limit = min_t(unsigned int, BIO_MAX_VECS * PAGE_SECTORS,
-	    s->iop.c->gc_stats.in_use < CUTOFF_CACHE_READA)
+			   (1 << KEY_SIZE_BITS) - 1);
-		reada = min_t(sector_t, dc->readahead >> 9,
+	s->insert_bio_sectors = min3(size_limit, sectors, bio_sectors(bio));
-			      get_capacity(bio->bi_bdev->bd_disk) -
-			      bio_end_sector(bio));
-	s->insert_bio_sectors = min(sectors, bio_sectors(bio) + reada);
 	s->iop.replace_key = KEY(s->iop.inode,
 				 bio->bi_iter.bi_sector + s->insert_bio_sectors,
 	s->iop.replace = true;
-	miss = bio_next_split(bio, sectors, GFP_NOIO, &s->d->bio_split);
+	miss = bio_next_split(bio, s->insert_bio_sectors, GFP_NOIO,
+			      &s->d->bio_split);
 	/* btree_search_recurse()'s btree iterator is no good anymore */
 	ret = miss == bio ? MAP_DONE : -EINTR;
 	if (bch_bio_alloc_pages(cache_bio, __GFP_NOWARN|GFP_NOIO))
 		goto out_put;
-	if (reada)
-		bch_mark_cache_readahead(s->iop.c, s->d);
 	s->cache_miss	= miss;
 	s->iop.bio	= cache_bio;
 	bio_get(cache_bio);

drivers/md/bcache/stats.c+0−14

 read_attribute(cache_bypass_hits);
 read_attribute(cache_bypass_misses);
 read_attribute(cache_hit_ratio);
-read_attribute(cache_readaheads);
 read_attribute(cache_miss_collisions);
 read_attribute(bypassed);
 		    DIV_SAFE(var(cache_hits) * 100,
 			     var(cache_hits) + var(cache_misses)));
-	var_print(cache_readaheads);
 	var_print(cache_miss_collisions);
 	sysfs_hprint(bypassed,	var(sectors_bypassed) << 9);
 #undef var
 	&sysfs_cache_bypass_hits,
 	&sysfs_cache_bypass_misses,
 	&sysfs_cache_hit_ratio,
-	&sysfs_cache_readaheads,
 	&sysfs_cache_miss_collisions,
 	&sysfs_bypassed,
 	NULL
 	acc->total.cache_misses = 0;
 	acc->total.cache_bypass_hits = 0;
 	acc->total.cache_bypass_misses = 0;
-	acc->total.cache_readaheads = 0;
 	acc->total.cache_miss_collisions = 0;
 	acc->total.sectors_bypassed = 0;
 }
 		scale_stat(&stats->cache_misses);
 		scale_stat(&stats->cache_bypass_hits);
 		scale_stat(&stats->cache_bypass_misses);
-		scale_stat(&stats->cache_readaheads);
 		scale_stat(&stats->cache_miss_collisions);
 		scale_stat(&stats->sectors_bypassed);
 	}
 	move_stat(cache_misses);
 	move_stat(cache_bypass_hits);
 	move_stat(cache_bypass_misses);
-	move_stat(cache_readaheads);
 	move_stat(cache_miss_collisions);
 	move_stat(sectors_bypassed);
 	mark_cache_stats(&c->accounting.collector, hit, bypass);
 }
-void bch_mark_cache_readahead(struct cache_set *c, struct bcache_device *d)
-{
-	struct cached_dev *dc = container_of(d, struct cached_dev, disk);
-	atomic_inc(&dc->accounting.collector.cache_readaheads);
-	atomic_inc(&c->accounting.collector.cache_readaheads);
-}
 void bch_mark_cache_miss_collision(struct cache_set *c, struct bcache_device *d)
 {
 	struct cached_dev *dc = container_of(d, struct cached_dev, disk);

drivers/md/bcache/stats.h+0−1

@@ -7,7 +7,6 @@ struct cache_stat_collector { · 6 unmodified lines
7	atomic_t cache_misses;	7	atomic_t cache_misses;
8	atomic_t cache_bypass_hits;	8	atomic_t cache_bypass_hits;
9	atomic_t cache_bypass_misses;	9	atomic_t cache_bypass_misses;
10	atomic_t cache_readaheads;
11	atomic_t cache_miss_collisions;	10	atomic_t cache_miss_collisions;
12	atomic_t sectors_bypassed;	11	atomic_t sectors_bypassed;
13	};	12	};

drivers/md/bcache/sysfs.c+0−4

 rw_attribute(discard);
 rw_attribute(running);
 rw_attribute(label);
-rw_attribute(readahead);
 rw_attribute(errors);
 rw_attribute(io_error_limit);
 rw_attribute(io_error_halflife);
 	var_printf(partial_stripes_expensive,	"%u");
 	var_hprint(sequential_cutoff);
-	var_hprint(readahead);
 	sysfs_print(running,		atomic_read(&dc->running));
 	sysfs_print(state,		states[BDEV_STATE(&dc->sb)]);
 	sysfs_strtoul_clamp(sequential_cutoff,
 			    dc->sequential_cutoff,
 			    0, UINT_MAX);
-	d_strtoi_h(readahead);
 	if (attr == &sysfs_clear_stats)
 		bch_cache_accounting_clear(&dc->accounting);
 	&sysfs_running,
 	&sysfs_state,
 	&sysfs_label,
-	&sysfs_readahead,
 #ifdef CONFIG_BCACHE_DEBUG
 	&sysfs_verify,
 	&sysfs_bypass_torture_test,

drivers/md/dm-snap.c+2−1

@@ -859,7 +859,8 @@ static uint32_t __minimum_chunk_size(struct origin *o) · 858 unmodified lines
859		859
860	if (o)	860	if (o)
861	list_for_each_entry(snap, &o->snapshots, list)	861	list_for_each_entry(snap, &o->snapshots, list)
862	chunk_size = min(chunk_size, snap->store->chunk_size);	862	chunk_size = min_not_zero(chunk_size,
		863	snap->store->chunk_size);
863		864
864	return (uint32_t) chunk_size;	865	return (uint32_t) chunk_size;
865	}	866	}

drivers/md/dm-verity-verify-sig.c+1−1

@@ -15,7 +15,7 @@ · 14 unmodified lines
15	#define DM_VERITY_VERIFY_ERR(s) DM_VERITY_ROOT_HASH_VERIFICATION " " s	15	#define DM_VERITY_VERIFY_ERR(s) DM_VERITY_ROOT_HASH_VERIFICATION " " s
16		16
17	static bool require_signatures;	17	static bool require_signatures;
18	module_param(require_signatures, bool, false);	18	module_param(require_signatures, bool, 0444);
19	MODULE_PARM_DESC(require_signatures,	19	MODULE_PARM_DESC(require_signatures,
20	"Verify the roothash of dm-verity hash tree");	20	"Verify the roothash of dm-verity hash tree");
21		21

drivers/md/raid5.c+0−2

@@ -5311,8 +5311,6 @@ static int in_chunk_boundary(struct mddev mddev, struct bio bio) · 5310 unmodified lines
5311	unsigned int chunk_sectors;	5311	unsigned int chunk_sectors;
5312	unsigned int bio_sectors = bio_sectors(bio);	5312	unsigned int bio_sectors = bio_sectors(bio);
5313		5313
5314	WARN_ON_ONCE(bio->bi_bdev->bd_partno);
5315
5316	chunk_sectors = min(conf->chunk_sectors, conf->prev_chunk_sectors);	5314	chunk_sectors = min(conf->chunk_sectors, conf->prev_chunk_sectors);
5317	return chunk_sectors >=	5315	return chunk_sectors >=
5318	((sector & (chunk_sectors - 1)) + bio_sectors);	5316	((sector & (chunk_sectors - 1)) + bio_sectors);

drivers/misc/cardreader/rtl8411.c+1−0

@@ -468,6 +468,7 @@ static void rtl8411_init_common_params(struct rtsx_pcr *pcr) · 467 unmodified lines
468	pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B;	468	pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B;
469	pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D;	469	pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D;
470	pcr->aspm_en = ASPM_L1_EN;	470	pcr->aspm_en = ASPM_L1_EN;
		471	pcr->aspm_mode = ASPM_MODE_CFG;
471	pcr->tx_initial_phase = SET_CLOCK_PHASE(23, 7, 14);	472	pcr->tx_initial_phase = SET_CLOCK_PHASE(23, 7, 14);
472	pcr->rx_initial_phase = SET_CLOCK_PHASE(4, 3, 10);	473	pcr->rx_initial_phase = SET_CLOCK_PHASE(4, 3, 10);
473	pcr->ic_version = rtl8411_get_ic_version(pcr);	474	pcr->ic_version = rtl8411_get_ic_version(pcr);

drivers/misc/cardreader/rts5209.c+1−0

@@ -255,6 +255,7 @@ void rts5209_init_params(struct rtsx_pcr *pcr) · 254 unmodified lines
255	pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B;	255	pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B;
256	pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D;	256	pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D;
257	pcr->aspm_en = ASPM_L1_EN;	257	pcr->aspm_en = ASPM_L1_EN;
		258	pcr->aspm_mode = ASPM_MODE_CFG;
258	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 16);	259	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 16);
259	pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);	260	pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);
260		261

drivers/misc/cardreader/rts5227.c+2−0

 	pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B;
 	pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B;
 	pcr->aspm_en = ASPM_L1_EN;
+	pcr->aspm_mode = ASPM_MODE_CFG;
 	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 15);
 	pcr->rx_initial_phase = SET_CLOCK_PHASE(30, 7, 7);
 	rts5227_init_params(pcr);
 	pcr->ops = &rts522a_pcr_ops;
+	pcr->aspm_mode = ASPM_MODE_REG;
 	pcr->tx_initial_phase = SET_CLOCK_PHASE(20, 20, 11);
 	pcr->reg_pm_ctrl3 = RTS522A_PM_CTRL3;

drivers/misc/cardreader/rts5228.c+1−0

@@ -718,6 +718,7 @@ void rts5228_init_params(struct rtsx_pcr *pcr) · 717 unmodified lines
718	pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B;	718	pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B;
719	pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B;	719	pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B;
720	pcr->aspm_en = ASPM_L1_EN;	720	pcr->aspm_en = ASPM_L1_EN;
		721	pcr->aspm_mode = ASPM_MODE_REG;
721	pcr->tx_initial_phase = SET_CLOCK_PHASE(28, 27, 11);	722	pcr->tx_initial_phase = SET_CLOCK_PHASE(28, 27, 11);
722	pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);	723	pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);
723		724

drivers/misc/cardreader/rts5229.c+1−0

@@ -246,6 +246,7 @@ void rts5229_init_params(struct rtsx_pcr *pcr) · 245 unmodified lines
246	pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B;	246	pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B;
247	pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D;	247	pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D;
248	pcr->aspm_en = ASPM_L1_EN;	248	pcr->aspm_en = ASPM_L1_EN;
		249	pcr->aspm_mode = ASPM_MODE_CFG;
249	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 15);	250	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 15);
250	pcr->rx_initial_phase = SET_CLOCK_PHASE(30, 6, 6);	251	pcr->rx_initial_phase = SET_CLOCK_PHASE(30, 6, 6);
251		252

drivers/misc/cardreader/rts5249.c+3−0

 	pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B;
 	pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B;
 	pcr->aspm_en = ASPM_L1_EN;
+	pcr->aspm_mode = ASPM_MODE_CFG;
 	pcr->tx_initial_phase = SET_CLOCK_PHASE(1, 29, 16);
 	pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);
 void rts524a_init_params(struct rtsx_pcr *pcr)
 {
 	rts5249_init_params(pcr);
+	pcr->aspm_mode = ASPM_MODE_REG;
 	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 29, 11);
 	pcr->option.ltr_l1off_sspwrgate = LTR_L1OFF_SSPWRGATE_5250_DEF;
 	pcr->option.ltr_l1off_snooze_sspwrgate =
 void rts525a_init_params(struct rtsx_pcr *pcr)
 {
 	rts5249_init_params(pcr);
+	pcr->aspm_mode = ASPM_MODE_REG;
 	pcr->tx_initial_phase = SET_CLOCK_PHASE(25, 29, 11);
 	pcr->option.ltr_l1off_sspwrgate = LTR_L1OFF_SSPWRGATE_5250_DEF;
 	pcr->option.ltr_l1off_snooze_sspwrgate =

drivers/misc/cardreader/rts5260.c+1−0

@@ -628,6 +628,7 @@ void rts5260_init_params(struct rtsx_pcr *pcr) · 627 unmodified lines
628	pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B;	628	pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B;
629	pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B;	629	pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B;
630	pcr->aspm_en = ASPM_L1_EN;	630	pcr->aspm_en = ASPM_L1_EN;
		631	pcr->aspm_mode = ASPM_MODE_REG;
631	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 29, 11);	632	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 29, 11);
632	pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);	633	pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);
633		634

drivers/misc/cardreader/rts5261.c+1−0

@@ -783,6 +783,7 @@ void rts5261_init_params(struct rtsx_pcr *pcr) · 782 unmodified lines
783	pcr->sd30_drive_sel_1v8 = 0x00;	783	pcr->sd30_drive_sel_1v8 = 0x00;
784	pcr->sd30_drive_sel_3v3 = 0x00;	784	pcr->sd30_drive_sel_3v3 = 0x00;
785	pcr->aspm_en = ASPM_L1_EN;	785	pcr->aspm_en = ASPM_L1_EN;
		786	pcr->aspm_mode = ASPM_MODE_REG;
786	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 11);	787	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 11);
787	pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);	788	pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);
788		789

drivers/misc/cardreader/rtsx_pcr.c+31−13

 	if (pcr->aspm_enabled == enable)
 		return;
-	if (pcr->aspm_en & 0x02)
+	if (pcr->aspm_mode == ASPM_MODE_CFG) {
-		rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, FORCE_ASPM_CTL0 |
+		pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL,
-			FORCE_ASPM_CTL1, enable ? 0 : FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1);
+						PCI_EXP_LNKCTL_ASPMC,
-	else
+						enable ? pcr->aspm_en : 0);
-		rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, FORCE_ASPM_CTL0 |
+	} else if (pcr->aspm_mode == ASPM_MODE_REG) {
-			FORCE_ASPM_CTL1, FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1);
+		if (pcr->aspm_en & 0x02)
+			rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, FORCE_ASPM_CTL0 |
+				FORCE_ASPM_CTL1, enable ? 0 : FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1);
+		else
+			rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, FORCE_ASPM_CTL0 |
+				FORCE_ASPM_CTL1, FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1);
+	}
 	if (!enable && (pcr->aspm_en & 0x02))
 		mdelay(10);
 			return err;
 	}
-	rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0x30, 0x30);
+	if (pcr->aspm_mode == ASPM_MODE_REG)
+		rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0x30, 0x30);
 	/* No CD interrupt if probing driver with card inserted.
 	 * So we need to initialize pcr->card_exist here.
 static int rtsx_pci_init_chip(struct rtsx_pcr *pcr)
 {
 	int err;
+	u16 cfg_val;
+	u8 val;
 	spin_lock_init(&pcr->lock);
 	mutex_init(&pcr->pcr_mutex);
 	if (!pcr->slots)
 		return -ENOMEM;
+	if (pcr->aspm_mode == ASPM_MODE_CFG) {
+		pcie_capability_read_word(pcr->pci, PCI_EXP_LNKCTL, &cfg_val);
+		if (cfg_val & PCI_EXP_LNKCTL_ASPM_L1)
+			pcr->aspm_enabled = true;
+		else
+			pcr->aspm_enabled = false;
+	} else if (pcr->aspm_mode == ASPM_MODE_REG) {
+		rtsx_pci_read_register(pcr, ASPM_FORCE_CTL, &val);
+		if (val & FORCE_ASPM_CTL0 && val & FORCE_ASPM_CTL1)
+			pcr->aspm_enabled = false;
+		else
+			pcr->aspm_enabled = true;
+	}
 	if (pcr->ops->fetch_vendor_settings)
 		pcr->ops->fetch_vendor_settings(pcr);
 	struct pcr_handle *handle;
 	u32 base, len;
 	int ret, i, bar = 0;
-	u8 val;
 	dev_dbg(&(pcidev->dev),
 		": Realtek PCI-E Card Reader found at %s [%04x:%04x] (rev %x)\n",
 	pcr->host_cmds_addr = pcr->rtsx_resv_buf_addr;
 	pcr->host_sg_tbl_ptr = pcr->rtsx_resv_buf + HOST_CMDS_BUF_LEN;
 	pcr->host_sg_tbl_addr = pcr->rtsx_resv_buf_addr + HOST_CMDS_BUF_LEN;
-	rtsx_pci_read_register(pcr, ASPM_FORCE_CTL, &val);
-	if (val & FORCE_ASPM_CTL0 && val & FORCE_ASPM_CTL1)
-		pcr->aspm_enabled = false;
-	else
-		pcr->aspm_enabled = true;
 	pcr->card_inserted = 0;
 	pcr->card_removed = 0;
 	INIT_DELAYED_WORK(&pcr->carddet_work, rtsx_pci_card_detect);

drivers/misc/kgdbts.c+2−1

 		printk(KERN_INFO a);	\
 } while (0)
 #define v2printk(a...) do {		\
-	if (verbose > 1)		\
+	if (verbose > 1) {		\
 		printk(KERN_INFO a);	\
+	}				\
 	touch_nmi_watchdog();		\
 } while (0)
 #define eprintk(a...) do {		\

drivers/misc/mei/interrupt.c+3−0

@@ -277,6 +277,9 @@ static int mei_cl_irq_read(struct mei_cl cl, struct mei_cl_cb cb, · 276 unmodified lines
277	return ret;	277	return ret;
278	}	278	}
279		279
		280	pm_runtime_mark_last_busy(dev->dev);
		281	pm_request_autosuspend(dev->dev);
		282
280	list_move_tail(&cb->list, &cl->rd_pending);	283	list_move_tail(&cb->list, &cl->rd_pending);
281		284
282	return 0;	285	return 0;

drivers/mmc/host/renesas_sdhi_core.c+7−2

 	/* Issue CMD19 twice for each tap */
 	for (i = 0; i < 2 * priv->tap_num; i++) {
+		int cmd_error;
 		/* Set sampling clock position */
 		sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_TAPSET, i % priv->tap_num);
-		if (mmc_send_tuning(mmc, opcode, NULL) == 0)
+		if (mmc_send_tuning(mmc, opcode, &cmd_error) == 0)
 			set_bit(i, priv->taps);
 		if (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_SMPCMP) == 0)
 			set_bit(i, priv->smpcmp);
+		if (cmd_error)
+			mmc_abort_tuning(mmc, opcode);
 	}
 	ret = renesas_sdhi_select_tuning(host);
 	{ .soc_id = "r8a7795", .revision = "ES3.*", .data = &sdhi_quirks_bad_taps2367 },
 	{ .soc_id = "r8a7796", .revision = "ES1.[012]", .data = &sdhi_quirks_4tap_nohs400 },
 	{ .soc_id = "r8a7796", .revision = "ES1.*", .data = &sdhi_quirks_r8a7796_es13 },
-	{ .soc_id = "r8a7796", .revision = "ES3.*", .data = &sdhi_quirks_bad_taps1357 },
+	{ .soc_id = "r8a77961", .data = &sdhi_quirks_bad_taps1357 },
 	{ .soc_id = "r8a77965", .data = &sdhi_quirks_r8a77965 },
 	{ .soc_id = "r8a77980", .data = &sdhi_quirks_nohs400 },
 	{ .soc_id = "r8a77990", .data = &sdhi_quirks_r8a77990 },

drivers/mtd/nand/raw/cs553x_nand.c+11−1

 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
+#include <linux/mtd/nand-ecc-sw-hamming.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/iopoll.h>
 	return 0;
 }
+static int cs553x_ecc_correct(struct nand_chip *chip,
+			      unsigned char *buf,
+			      unsigned char *read_ecc,
+			      unsigned char *calc_ecc)
+{
+	return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc,
+				      chip->ecc.size, false);
+}
 static struct cs553x_nand_controller *controllers[4];
 static int cs553x_attach_chip(struct nand_chip *chip)
 	chip->ecc.bytes = 3;
 	chip->ecc.hwctl  = cs_enable_hwecc;
 	chip->ecc.calculate = cs_calculate_ecc;
-	chip->ecc.correct  = rawnand_sw_hamming_correct;
+	chip->ecc.correct  = cs553x_ecc_correct;
 	chip->ecc.strength = 1;
 	return 0;

drivers/mtd/nand/raw/fsmc_nand.c+11−1

 #include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
+#include <linux/mtd/nand-ecc-sw-hamming.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
 	return 0;
 }
+static int fsmc_correct_ecc1(struct nand_chip *chip,
+			     unsigned char *buf,
+			     unsigned char *read_ecc,
+			     unsigned char *calc_ecc)
+{
+	return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc,
+				      chip->ecc.size, false);
+}
 /* Count the number of 0's in buff upto a max of max_bits */
 static int count_written_bits(u8 *buff, int size, int max_bits)
 {
 	case NAND_ECC_ENGINE_TYPE_ON_HOST:
 		dev_info(host->dev, "Using 1-bit HW ECC scheme\n");
 		nand->ecc.calculate = fsmc_read_hwecc_ecc1;
-		nand->ecc.correct = rawnand_sw_hamming_correct;
+		nand->ecc.correct = fsmc_correct_ecc1;
 		nand->ecc.hwctl = fsmc_enable_hwecc;
 		nand->ecc.bytes = 3;
 		nand->ecc.strength = 1;

drivers/mtd/nand/raw/lpc32xx_slc.c+14−1

 #include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/mtd/lpc32xx_slc.h>
+#include <linux/mtd/nand-ecc-sw-hamming.h>
 #define LPC32XX_MODNAME		"lpc32xx-nand"
 	return 0;
 }
+/*
+ * Corrects the data
+ */
+static int lpc32xx_nand_ecc_correct(struct nand_chip *chip,
+				    unsigned char *buf,
+				    unsigned char *read_ecc,
+				    unsigned char *calc_ecc)
+{
+	return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc,
+				      chip->ecc.size, false);
+}
 /*
  * Read a single byte from NAND device
  */
 	chip->ecc.write_oob = lpc32xx_nand_write_oob_syndrome;
 	chip->ecc.read_oob = lpc32xx_nand_read_oob_syndrome;
 	chip->ecc.calculate = lpc32xx_nand_ecc_calculate;
-	chip->ecc.correct = rawnand_sw_hamming_correct;
+	chip->ecc.correct = lpc32xx_nand_ecc_correct;
 	chip->ecc.hwctl = lpc32xx_nand_ecc_enable;
 	/*

drivers/mtd/nand/raw/ndfc.c+11−1

 #include <linux/mtd/ndfc.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
+#include <linux/mtd/nand-ecc-sw-hamming.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <asm/io.h>
 	return 0;
 }
+static int ndfc_correct_ecc(struct nand_chip *chip,
+			    unsigned char *buf,
+			    unsigned char *read_ecc,
+			    unsigned char *calc_ecc)
+{
+	return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc,
+				      chip->ecc.size, false);
+}
 /*
  * Speedups for buffer read/write/verify
  *
 	chip->controller = &ndfc->ndfc_control;
 	chip->legacy.read_buf = ndfc_read_buf;
 	chip->legacy.write_buf = ndfc_write_buf;
-	chip->ecc.correct = rawnand_sw_hamming_correct;
+	chip->ecc.correct = ndfc_correct_ecc;
 	chip->ecc.hwctl = ndfc_enable_hwecc;
 	chip->ecc.calculate = ndfc_calculate_ecc;
 	chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_ON_HOST;

drivers/mtd/nand/raw/sharpsl.c+11−1

 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
+#include <linux/mtd/nand-ecc-sw-hamming.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/sharpsl.h>
 	return readb(sharpsl->io + ECCCNTR) != 0;
 }
+static int sharpsl_nand_correct_ecc(struct nand_chip *chip,
+				    unsigned char *buf,
+				    unsigned char *read_ecc,
+				    unsigned char *calc_ecc)
+{
+	return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc,
+				      chip->ecc.size, false);
+}
 static int sharpsl_attach_chip(struct nand_chip *chip)
 {
 	if (chip->ecc.engine_type != NAND_ECC_ENGINE_TYPE_ON_HOST)
 	chip->ecc.strength = 1;
 	chip->ecc.hwctl = sharpsl_nand_enable_hwecc;
 	chip->ecc.calculate = sharpsl_nand_calculate_ecc;
-	chip->ecc.correct = rawnand_sw_hamming_correct;
+	chip->ecc.correct = sharpsl_nand_correct_ecc;
 	return 0;
 }

drivers/mtd/nand/raw/tmio_nand.c+5−3

 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/mtd/mtd.h>
+#include <linux/mtd/nand-ecc-sw-hamming.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
 	int r0, r1;
 	/* assume ecc.size = 512 and ecc.bytes = 6 */
-	r0 = rawnand_sw_hamming_correct(chip, buf, read_ecc, calc_ecc);
+	r0 = ecc_sw_hamming_correct(buf, read_ecc, calc_ecc,
+				    chip->ecc.size, false);
 	if (r0 < 0)
 		return r0;
-	r1 = rawnand_sw_hamming_correct(chip, buf + 256, read_ecc + 3,
+	r1 = ecc_sw_hamming_correct(buf + 256, read_ecc + 3, calc_ecc + 3,
-					calc_ecc + 3);
+				    chip->ecc.size, false);
 	if (r1 < 0)
 		return r1;
 	return r0 + r1;

drivers/mtd/nand/raw/txx9ndfmc.c+3−2

 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
+#include <linux/mtd/nand-ecc-sw-hamming.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
 	int stat;
 	for (eccsize = chip->ecc.size; eccsize > 0; eccsize -= 256) {
-		stat = rawnand_sw_hamming_correct(chip, buf, read_ecc,
+		stat = ecc_sw_hamming_correct(buf, read_ecc, calc_ecc,
-						  calc_ecc);
+					      chip->ecc.size, false);
 		if (stat < 0)
 			return stat;
 		corrected += stat;

drivers/mtd/parsers/ofpart_core.c+14−12

 	if (!mtd_node)
 		return 0;
-	ofpart_node = of_get_child_by_name(mtd_node, "partitions");
+	if (!master->parent) { /* Master */
-	if (!ofpart_node && !master->parent) {
+		ofpart_node = of_get_child_by_name(mtd_node, "partitions");
-		/*
+		if (!ofpart_node) {
-		 * We might get here even when ofpart isn't used at all (e.g.,
+			/*
-		 * when using another parser), so don't be louder than
+			 * We might get here even when ofpart isn't used at all (e.g.,
-		 * KERN_DEBUG
+			 * when using another parser), so don't be louder than
-		 */
+			 * KERN_DEBUG
-		pr_debug("%s: 'partitions' subnode not found on %pOF. Trying to parse direct subnodes as partitions.\n",
+			 */
-			 master->name, mtd_node);
+			pr_debug("%s: 'partitions' subnode not found on %pOF. Trying to parse direct subnodes as partitions.\n",
+				master->name, mtd_node);
+			ofpart_node = mtd_node;
+			dedicated = false;
+		}
+	} else { /* Partition */
 		ofpart_node = mtd_node;
-		dedicated = false;
 	}
-	if (!ofpart_node)
-		return 0;
 	of_id = of_match_node(parse_ofpart_match_table, ofpart_node);
 	if (dedicated && !of_id) {

drivers/net/appletalk/cops.c+2−2

 			break;
 	}
+	dev->base_addr = ioaddr;
 	/* Reserve any actual interrupt. */
 	if (dev->irq) {
 		retval = request_irq(dev->irq, cops_interrupt, 0, dev->name, dev);
 			goto err_out;
 	}
-	dev->base_addr = ioaddr;
         lp = netdev_priv(dev);
         spin_lock_init(&lp->lock);

drivers/net/bonding/bond_main.c+1−1

 	slave->bond = bond;
 	slave->dev = slave_dev;
+	INIT_DELAYED_WORK(&slave->notify_work, bond_netdev_notify_work);
 	if (bond_kobj_init(slave))
 		return NULL;
 			return NULL;
 		}
 	}
-	INIT_DELAYED_WORK(&slave->notify_work, bond_netdev_notify_work);
 	return slave;
 }

drivers/net/caif/caif_serial.c+1−0

@@ -350,6 +350,7 @@ static int ldisc_open(struct tty_struct *tty) · 349 unmodified lines
350	rtnl_lock();	350	rtnl_lock();
351	result = register_netdevice(dev);	351	result = register_netdevice(dev);
352	if (result) {	352	if (result) {
		353	tty_kref_put(tty);
353	rtnl_unlock();	354	rtnl_unlock();
354	free_netdev(dev);	355	free_netdev(dev);
355	return -ENODEV;	356	return -ENODEV;

drivers/net/can/usb/mcba_usb.c+15−2

 	bool can_ka_first_pass;
 	bool can_speed_check;
 	atomic_t free_ctx_cnt;
+	void *rxbuf[MCBA_MAX_RX_URBS];
+	dma_addr_t rxbuf_dma[MCBA_MAX_RX_URBS];
 };
 /* CAN frame */
 	for (i = 0; i < MCBA_MAX_RX_URBS; i++) {
 		struct urb *urb = NULL;
 		u8 *buf;
+		dma_addr_t buf_dma;
 		/* create a URB, and a buffer for it */
 		urb = usb_alloc_urb(0, GFP_KERNEL);
 		}
 		buf = usb_alloc_coherent(priv->udev, MCBA_USB_RX_BUFF_SIZE,
-					 GFP_KERNEL, &urb->transfer_dma);
+					 GFP_KERNEL, &buf_dma);
 		if (!buf) {
 			netdev_err(netdev, "No memory left for USB buffer\n");
 			usb_free_urb(urb);
 		if (err) {
 			usb_unanchor_urb(urb);
 			usb_free_coherent(priv->udev, MCBA_USB_RX_BUFF_SIZE,
-					  buf, urb->transfer_dma);
+					  buf, buf_dma);
 			usb_free_urb(urb);
 			break;
 		}
+		priv->rxbuf[i] = buf;
+		priv->rxbuf_dma[i] = buf_dma;
 		/* Drop reference, USB core will take care of freeing it */
 		usb_free_urb(urb);
 	}
 static void mcba_urb_unlink(struct mcba_priv *priv)
 {
+	int i;
 	usb_kill_anchored_urbs(&priv->rx_submitted);
+	for (i = 0; i < MCBA_MAX_RX_URBS; ++i)
+		usb_free_coherent(priv->udev, MCBA_USB_RX_BUFF_SIZE,
+				  priv->rxbuf[i], priv->rxbuf_dma[i]);
 	usb_kill_anchored_urbs(&priv->tx_submitted);
 }

drivers/net/dsa/bcm_sf2.c+2−3

 	bcm_sf2_sw_mac_link_set(ds, port, interface, true);
 	if (port != core_readl(priv, CORE_IMP0_PRT_ID)) {
-		u32 reg_rgmii_ctrl;
+		u32 reg_rgmii_ctrl = 0;
 		u32 reg, offset;
-		reg_rgmii_ctrl = bcm_sf2_reg_rgmii_cntrl(priv, port);
 		if (priv->type == BCM4908_DEVICE_ID ||
 		    priv->type == BCM7445_DEVICE_ID)
 			offset = CORE_STS_OVERRIDE_GMIIP_PORT(port);
 		    interface == PHY_INTERFACE_MODE_RGMII_TXID ||
 		    interface == PHY_INTERFACE_MODE_MII ||
 		    interface == PHY_INTERFACE_MODE_REVMII) {
+			reg_rgmii_ctrl = bcm_sf2_reg_rgmii_cntrl(priv, port);
 			reg = reg_readl(priv, reg_rgmii_ctrl);
 			reg &= ~(RX_PAUSE_EN | TX_PAUSE_EN);

drivers/net/dsa/microchip/ksz9477.c+1−0

@@ -1530,6 +1530,7 @@ static const struct ksz_chip_data ksz9477_switch_chips[] = { · 1529 unmodified lines
1530	.num_statics = 16,	1530	.num_statics = 16,
1531	.cpu_ports = 0x7F, /* can be configured as cpu port */	1531	.cpu_ports = 0x7F, /* can be configured as cpu port */
1532	.port_cnt = 7, /* total physical port count */	1532	.port_cnt = 7, /* total physical port count */
		1533	.phy_errata_9477 = true,
1533	},	1534	},
1534	};	1535	};
1535		1536

drivers/net/dsa/mt7530.c+0−8

@@ -1262,14 +1262,6 @@ mt7530_port_set_vlan_aware(struct dsa_switch *ds, int port) · 1261 unmodified lines
1262	{	1262	{
1263	struct mt7530_priv *priv = ds->priv;	1263	struct mt7530_priv *priv = ds->priv;
1264		1264
1265	/* The real fabric path would be decided on the membership in the
1266	* entry of VLAN table. PCR_MATRIX set up here with ALL_MEMBERS
1267	* means potential VLAN can be consisting of certain subset of all
1268	* ports.
1269	*/
1270	mt7530_rmw(priv, MT7530_PCR_P(port),
1271	PCR_MATRIX_MASK, PCR_MATRIX(MT7530_ALL_MEMBERS));
1272
1273	/* Trapped into security mode allows packet forwarding through VLAN	1265	/* Trapped into security mode allows packet forwarding through VLAN
1274	* table lookup. CPU port is set to fallback mode to let untagged	1266	* table lookup. CPU port is set to fallback mode to let untagged
1275	* frames pass through.	1267	* frames pass through.

drivers/net/dsa/ocelot/felix_vsc9959.c+10−5

 	if (taprio->num_entries > VSC9959_TAS_GCL_ENTRY_MAX)
 		return -ERANGE;
-	/* Set port num and disable ALWAYS_GUARD_BAND_SCH_Q, which means set
+	/* Enable guard band. The switch will schedule frames without taking
-	 * guard band to be implemented for nonschedule queues to schedule
+	 * their length into account. Thus we'll always need to enable the
-	 * queues transition.
+	 * guard band which reserves the time of a maximum sized frame at the
+	 * end of the time window.
+	 *
+	 * Although the ALWAYS_GUARD_BAND_SCH_Q bit is global for all ports, we
+	 * need to set PORT_NUM, because subsequent writes to PARAM_CFG_REG_n
+	 * operate on the port number.
 	 */
-	ocelot_rmw(ocelot,
+	ocelot_rmw(ocelot, QSYS_TAS_PARAM_CFG_CTRL_PORT_NUM(port) |
-		   QSYS_TAS_PARAM_CFG_CTRL_PORT_NUM(port),
+		   QSYS_TAS_PARAM_CFG_CTRL_ALWAYS_GUARD_BAND_SCH_Q,
 		   QSYS_TAS_PARAM_CFG_CTRL_PORT_NUM_M |
 		   QSYS_TAS_PARAM_CFG_CTRL_ALWAYS_GUARD_BAND_SCH_Q,
 		   QSYS_TAS_PARAM_CFG_CTRL);

drivers/net/dsa/sja1105/sja1105_dynamic_config.c+19−4

 	SJA1105_HOSTCMD_INVALIDATE = 4,
 };
+/* Command and entry overlap */
 static void
-sja1105_vl_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,
+sja1105et_vl_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,
-			      enum packing_op op)
+				enum packing_op op)
 {
 	const int size = SJA1105_SIZE_DYN_CMD;
 	sja1105_packing(buf, &cmd->index,    9,  0, size, op);
 }
+/* Command and entry are separate */
+static void
+sja1105pqrs_vl_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,
+				  enum packing_op op)
+{
+	u8 *p = buf + SJA1105_SIZE_VL_LOOKUP_ENTRY;
+	const int size = SJA1105_SIZE_DYN_CMD;
+	sja1105_packing(p, &cmd->valid,   31, 31, size, op);
+	sja1105_packing(p, &cmd->errors,  30, 30, size, op);
+	sja1105_packing(p, &cmd->rdwrset, 29, 29, size, op);
+	sja1105_packing(p, &cmd->index,    9,  0, size, op);
+}
 static size_t sja1105et_vl_lookup_entry_packing(void *buf, void *entry_ptr,
 						enum packing_op op)
 {
 const struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN] = {
 	[BLK_IDX_VL_LOOKUP] = {
 		.entry_packing = sja1105et_vl_lookup_entry_packing,
-		.cmd_packing = sja1105_vl_lookup_cmd_packing,
+		.cmd_packing = sja1105et_vl_lookup_cmd_packing,
 		.access = OP_WRITE,
 		.max_entry_count = SJA1105_MAX_VL_LOOKUP_COUNT,
 		.packed_size = SJA1105ET_SIZE_VL_LOOKUP_DYN_CMD,
 const struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN] = {
 	[BLK_IDX_VL_LOOKUP] = {
 		.entry_packing = sja1105_vl_lookup_entry_packing,
-		.cmd_packing = sja1105_vl_lookup_cmd_packing,
+		.cmd_packing = sja1105pqrs_vl_lookup_cmd_packing,
 		.access = (OP_READ | OP_WRITE),
 		.max_entry_count = SJA1105_MAX_VL_LOOKUP_COUNT,
 		.packed_size = SJA1105PQRS_SIZE_VL_LOOKUP_DYN_CMD,

drivers/net/dsa/sja1105/sja1105_main.c+51−23

@@ -26,6 +26,7 @@ · 25 unmodified lines
26	#include "sja1105_tas.h"	26	#include "sja1105_tas.h"
27		27
28	#define SJA1105_UNKNOWN_MULTICAST 0x010000000000ull	28	#define SJA1105_UNKNOWN_MULTICAST 0x010000000000ull
		29	#define SJA1105_DEFAULT_VLAN (VLAN_N_VID - 1)
29		30
30	static const struct dsa_switch_ops sja1105_switch_ops;	31	static const struct dsa_switch_ops sja1105_switch_ops;
31		32
@@ -207,6 +208,7 @@ static int sja1105_init_mii_settings(struct sja1105_private *priv, · 175 unmodified lines
207	default:	208	default:
208	dev_err(dev, "Unsupported PHY mode %s!\n",	209	dev_err(dev, "Unsupported PHY mode %s!\n",
209	phy_modes(ports[i].phy_mode));	210	phy_modes(ports[i].phy_mode));
		211	return -EINVAL;
210	}	212	}
211		213
212	/* Even though the SerDes port is able to drive SGMII autoneg	214	/* Even though the SerDes port is able to drive SGMII autoneg
@@ -321,6 +323,13 @@ static int sja1105_init_l2_lookup_params(struct sja1105_private *priv) · 108 unmodified lines
321	return 0;	323	return 0;
322	}	324	}
323		325
		326	/* Set up a default VLAN for untagged traffic injected from the CPU
		327	* using management routes (e.g. STP, PTP) as opposed to tag_8021q.
		328	* All DT-defined ports are members of this VLAN, and there are no
		329	* restrictions on forwarding (since the CPU selects the destination).
		330	* Frames from this VLAN will always be transmitted as untagged, and
		331	* neither the bridge nor the 8021q module cannot create this VLAN ID.
		332	*/
324	static int sja1105_init_static_vlan(struct sja1105_private *priv)	333	static int sja1105_init_static_vlan(struct sja1105_private *priv)
325	{	334	{
326	struct sja1105_table *table;	335	struct sja1105_table *table;
@@ -330,17 +339,13 @@ static int sja1105_init_static_vlan(struct sja1105_private *priv) · 3 unmodified lines
330	.vmemb_port = 0,	339	.vmemb_port = 0,
331	.vlan_bc = 0,	340	.vlan_bc = 0,
332	.tag_port = 0,	341	.tag_port = 0,
333	.vlanid = 1,	342	.vlanid = SJA1105_DEFAULT_VLAN,
334	};	343	};
335	struct dsa_switch *ds = priv->ds;	344	struct dsa_switch *ds = priv->ds;
336	int port;	345	int port;
337		346
338	table = &priv->static_config.tables[BLK_IDX_VLAN_LOOKUP];	347	table = &priv->static_config.tables[BLK_IDX_VLAN_LOOKUP];
339		348
340	/* The static VLAN table will only contain the initial pvid of 1.
341	* All other VLANs are to be configured through dynamic entries,
342	* and kept in the static configuration table as backing memory.
343	*/
344	if (table->entry_count) {	349	if (table->entry_count) {
345	kfree(table->entries);	350	kfree(table->entries);
346	table->entry_count = 0;	351	table->entry_count = 0;
@@ -353,9 +358,6 @@ static int sja1105_init_static_vlan(struct sja1105_private *priv) · 6 unmodified lines
353		358
354	table->entry_count = 1;	359	table->entry_count = 1;
355		360
356	/* VLAN 1: all DT-defined ports are members; no restrictions on
357	* forwarding; always transmit as untagged.
358	*/
359	for (port = 0; port < ds->num_ports; port++) {	361	for (port = 0; port < ds->num_ports; port++) {
360	struct sja1105_bridge_vlan *v;	362	struct sja1105_bridge_vlan *v;
361		363
@@ -366,15 +368,12 @@ static int sja1105_init_static_vlan(struct sja1105_private *priv) · 4 unmodified lines
366	pvid.vlan_bc \|= BIT(port);	368	pvid.vlan_bc \|= BIT(port);
367	pvid.tag_port &= ~BIT(port);	369	pvid.tag_port &= ~BIT(port);
368		370
369	/* Let traffic that don't need dsa_8021q (e.g. STP, PTP) be
370	* transmitted as untagged.
371	*/
372	v = kzalloc(sizeof(*v), GFP_KERNEL);	371	v = kzalloc(sizeof(*v), GFP_KERNEL);
373	if (!v)	372	if (!v)
374	return -ENOMEM;	373	return -ENOMEM;
375		374
376	v->port = port;	375	v->port = port;
377	v->vid = 1;	376	v->vid = SJA1105_DEFAULT_VLAN;
378	v->untagged = true;	377	v->untagged = true;
379	if (dsa_is_cpu_port(ds, port))	378	if (dsa_is_cpu_port(ds, port))
380	v->pvid = true;	379	v->pvid = true;
@@ -2817,11 +2816,22 @@ static int sja1105_vlan_add_one(struct dsa_switch *ds, int port, u16 vid, · 2436 unmodified lines
2817	bool pvid = flags & BRIDGE_VLAN_INFO_PVID;	2816	bool pvid = flags & BRIDGE_VLAN_INFO_PVID;
2818	struct sja1105_bridge_vlan *v;	2817	struct sja1105_bridge_vlan *v;
2819		2818
2820	list_for_each_entry(v, vlan_list, list)	2819	list_for_each_entry(v, vlan_list, list) {
2821	if (v->port == port && v->vid == vid &&	2820	if (v->port == port && v->vid == vid) {
2822	v->untagged == untagged && v->pvid == pvid)
2823	/* Already added */	2821	/* Already added */
2824	return 0;	2822	if (v->untagged == untagged && v->pvid == pvid)
		2823	/* Nothing changed */
		2824	return 0;
		2825
		2826	/* It's the same VLAN, but some of the flags changed
		2827	* and the user did not bother to delete it first.
		2828	* Update it and trigger sja1105_build_vlan_table.
		2829	*/
		2830	v->untagged = untagged;
		2831	v->pvid = pvid;
		2832	return 1;
		2833	}
		2834	}
2825		2835
2826	v = kzalloc(sizeof(*v), GFP_KERNEL);	2836	v = kzalloc(sizeof(*v), GFP_KERNEL);
2827	if (!v) {	2837	if (!v) {
@@ -2976,13 +2986,13 @@ static int sja1105_setup(struct dsa_switch *ds) · 148 unmodified lines
2976	rc = sja1105_static_config_load(priv, ports);	2986	rc = sja1105_static_config_load(priv, ports);
2977	if (rc < 0) {	2987	if (rc < 0) {
2978	dev_err(ds->dev, "Failed to load static config: %d\n", rc);	2988	dev_err(ds->dev, "Failed to load static config: %d\n", rc);
2979	return rc;	2989	goto out_ptp_clock_unregister;
2980	}	2990	}
2981	/* Configure the CGU (PHY link modes and speeds) */	2991	/* Configure the CGU (PHY link modes and speeds) */
2982	rc = sja1105_clocking_setup(priv);	2992	rc = sja1105_clocking_setup(priv);
2983	if (rc < 0) {	2993	if (rc < 0) {
2984	dev_err(ds->dev, "Failed to configure MII clocking: %d\n", rc);	2994	dev_err(ds->dev, "Failed to configure MII clocking: %d\n", rc);
2985	return rc;	2995	goto out_static_config_free;
2986	}	2996	}
2987	/* On SJA1105, VLAN filtering per se is always enabled in hardware.	2997	/* On SJA1105, VLAN filtering per se is always enabled in hardware.
2988	* The only thing we can do to disable it is lie about what the 802.1Q	2998	* The only thing we can do to disable it is lie about what the 802.1Q
@@ -3003,7 +3013,7 @@ static int sja1105_setup(struct dsa_switch *ds) · 14 unmodified lines
3003		3013
3004	rc = sja1105_devlink_setup(ds);	3014	rc = sja1105_devlink_setup(ds);
3005	if (rc < 0)	3015	if (rc < 0)
3006	return rc;	3016	goto out_static_config_free;
3007		3017
3008	/* The DSA/switchdev model brings up switch ports in standalone mode by	3018	/* The DSA/switchdev model brings up switch ports in standalone mode by
3009	* default, and that means vlan_filtering is 0 since they're not under	3019	* default, and that means vlan_filtering is 0 since they're not under
@@ -3012,6 +3022,17 @@ static int sja1105_setup(struct dsa_switch *ds) · 2 unmodified lines
3012	rtnl_lock();	3022	rtnl_lock();
3013	rc = sja1105_setup_8021q_tagging(ds, true);	3023	rc = sja1105_setup_8021q_tagging(ds, true);
3014	rtnl_unlock();	3024	rtnl_unlock();
		3025	if (rc)
		3026	goto out_devlink_teardown;
		3027
		3028	return 0;
		3029
		3030	out_devlink_teardown:
		3031	sja1105_devlink_teardown(ds);
		3032	out_ptp_clock_unregister:
		3033	sja1105_ptp_clock_unregister(ds);
		3034	out_static_config_free:
		3035	sja1105_static_config_free(&priv->static_config);
3015		3036
3016	return rc;	3037	return rc;
3017	}	3038	}
@@ -3646,8 +3667,10 @@ static int sja1105_probe(struct spi_device *spi) · 628 unmodified lines
3646	priv->cbs = devm_kcalloc(dev, priv->info->num_cbs_shapers,	3667	priv->cbs = devm_kcalloc(dev, priv->info->num_cbs_shapers,
3647	sizeof(struct sja1105_cbs_entry),	3668	sizeof(struct sja1105_cbs_entry),
3648	GFP_KERNEL);	3669	GFP_KERNEL);
3649	if (!priv->cbs)	3670	if (!priv->cbs) {
3650	return -ENOMEM;	3671	rc = -ENOMEM;
		3672	goto out_unregister_switch;
		3673	}
3651	}	3674	}
3652		3675
3653	/* Connections between dsa_port and sja1105_port */	3676	/* Connections between dsa_port and sja1105_port */
@@ -3672,7 +3695,7 @@ static int sja1105_probe(struct spi_device *spi) · 18 unmodified lines
3672	dev_err(ds->dev,	3695	dev_err(ds->dev,
3673	"failed to create deferred xmit thread: %d\n",	3696	"failed to create deferred xmit thread: %d\n",
3674	rc);	3697	rc);
3675	goto out;	3698	goto out_destroy_workers;
3676	}	3699	}
3677	skb_queue_head_init(&sp->xmit_queue);	3700	skb_queue_head_init(&sp->xmit_queue);
3678	sp->xmit_tpid = ETH_P_SJA1105;	3701	sp->xmit_tpid = ETH_P_SJA1105;
@@ -3682,7 +3705,8 @@ static int sja1105_probe(struct spi_device *spi) · 3 unmodified lines
3682	}	3705	}
3683		3706
3684	return 0;	3707	return 0;
3685	out:	3708
		3709	out_destroy_workers:
3686	while (port-- > 0) {	3710	while (port-- > 0) {
3687	struct sja1105_port *sp = &priv->ports[port];	3711	struct sja1105_port *sp = &priv->ports[port];
3688		3712
@@ -3691,6 +3715,10 @@ out: · 2 unmodified lines
3691		3715
3692	kthread_destroy_worker(sp->xmit_worker);	3716	kthread_destroy_worker(sp->xmit_worker);
3693	}	3717	}
		3718
		3719	out_unregister_switch:
		3720	dsa_unregister_switch(ds);
		3721
3694	return rc;	3722	return rc;
3695	}	3723	}
3696		3724

drivers/net/ethernet/amazon/ena/ena_netdev.c+28−26

 static int ena_xdp_tx_map_frame(struct ena_ring *xdp_ring,
 				struct ena_tx_buffer *tx_info,
 				struct xdp_frame *xdpf,
-				void **push_hdr,
+				struct ena_com_tx_ctx *ena_tx_ctx)
-				u32 *push_len)
 {
 	struct ena_adapter *adapter = xdp_ring->adapter;
 	struct ena_com_buf *ena_buf;
-	dma_addr_t dma = 0;
+	int push_len = 0;
+	dma_addr_t dma;
+	void *data;
 	u32 size;
 	tx_info->xdpf = xdpf;
+	data = tx_info->xdpf->data;
 	size = tx_info->xdpf->len;
-	ena_buf = tx_info->bufs;
-	/* llq push buffer */
+	if (xdp_ring->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) {
-	*push_len = min_t(u32, size, xdp_ring->tx_max_header_size);
+		/* Designate part of the packet for LLQ */
-	*push_hdr = tx_info->xdpf->data;
+		push_len = min_t(u32, size, xdp_ring->tx_max_header_size);
+		ena_tx_ctx->push_header = data;
+		size -= push_len;
+		data += push_len;
+	}
+	ena_tx_ctx->header_len = push_len;
-	if (size - *push_len > 0) {
+	if (size > 0) {
 		dma = dma_map_single(xdp_ring->dev,
-				     *push_hdr + *push_len,
+				     data,
-				     size - *push_len,
+				     size,
 				     DMA_TO_DEVICE);
 		if (unlikely(dma_mapping_error(xdp_ring->dev, dma)))
 			goto error_report_dma_error;
-		tx_info->map_linear_data = 1;
+		tx_info->map_linear_data = 0;
-		tx_info->num_of_bufs = 1;
-	}
-	ena_buf->paddr = dma;
+		ena_buf = tx_info->bufs;
-	ena_buf->len = size;
+		ena_buf->paddr = dma;
+		ena_buf->len = size;
+		ena_tx_ctx->ena_bufs = ena_buf;
+		ena_tx_ctx->num_bufs = tx_info->num_of_bufs = 1;
+	}
 	return 0;
 			  &xdp_ring->syncp);
 	netif_warn(adapter, tx_queued, adapter->netdev, "Failed to map xdp buff\n");
-	xdp_return_frame_rx_napi(tx_info->xdpf);
-	tx_info->xdpf = NULL;
-	tx_info->num_of_bufs = 0;
 	return -EINVAL;
 }
 	struct ena_com_tx_ctx ena_tx_ctx = {};
 	struct ena_tx_buffer *tx_info;
 	u16 next_to_use, req_id;
-	void *push_hdr;
-	u32 push_len;
 	int rc;
 	next_to_use = xdp_ring->next_to_use;
 	tx_info = &xdp_ring->tx_buffer_info[req_id];
 	tx_info->num_of_bufs = 0;
-	rc = ena_xdp_tx_map_frame(xdp_ring, tx_info, xdpf, &push_hdr, &push_len);
+	rc = ena_xdp_tx_map_frame(xdp_ring, tx_info, xdpf, &ena_tx_ctx);
 	if (unlikely(rc))
 		return rc;
-	ena_tx_ctx.ena_bufs = tx_info->bufs;
-	ena_tx_ctx.push_header = push_hdr;
-	ena_tx_ctx.num_bufs = tx_info->num_of_bufs;
 	ena_tx_ctx.req_id = req_id;
-	ena_tx_ctx.header_len = push_len;
 	rc = ena_xmit_common(dev,
 			     xdp_ring,

drivers/net/ethernet/atheros/alx/main.c+1−0

@@ -1849,6 +1849,7 @@ out_free_netdev: · 1848 unmodified lines
1849	free_netdev(netdev);	1849	free_netdev(netdev);
1850	out_pci_release:	1850	out_pci_release:
1851	pci_release_mem_regions(pdev);	1851	pci_release_mem_regions(pdev);
		1852	pci_disable_pcie_error_reporting(pdev);
1852	out_pci_disable:	1853	out_pci_disable:
1853	pci_disable_device(pdev);	1854	pci_disable_device(pdev);
1854	return err;	1855	return err;

drivers/net/ethernet/broadcom/bnx2.c+1−1

 		BNX2_WR(bp, PCI_COMMAND, reg);
 	} else if ((BNX2_CHIP_ID(bp) == BNX2_CHIP_ID_5706_A1) &&
 		!(bp->flags & BNX2_FLAG_PCIX)) {
 		dev_err(&pdev->dev,
 			"5706 A1 can only be used in a PCIX bus, aborting\n");
+		rc = -EPERM;
 		goto err_out_unmap;
 	}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c+3−1

@@ -1223,8 +1223,10 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param, · 1222 unmodified lines
1223	goto failed;	1223	goto failed;
1224		1224
1225	/* SR-IOV capability was enabled but there are no VFs*/	1225	/* SR-IOV capability was enabled but there are no VFs*/
1226	if (iov->total == 0)	1226	if (iov->total == 0) {
		1227	err = -EINVAL;
1227	goto failed;	1228	goto failed;
		1229	}
1228		1230
1229	iov->nr_virtfn = min_t(u16, iov->total, num_vfs_param);	1231	iov->nr_virtfn = min_t(u16, iov->total, num_vfs_param);
1230		1232

drivers/net/ethernet/broadcom/bnxt/bnxt.c+117−29

@@ -282,7 +282,8 @@ static bool bnxt_vf_pciid(enum board_idx idx) · 281 unmodified lines
282	{	282	{
283	return (idx == NETXTREME_C_VF \|\| idx == NETXTREME_E_VF \|\|	283	return (idx == NETXTREME_C_VF \|\| idx == NETXTREME_E_VF \|\|
284	idx == NETXTREME_S_VF \|\| idx == NETXTREME_C_VF_HV \|\|	284	idx == NETXTREME_S_VF \|\| idx == NETXTREME_C_VF_HV \|\|
285	idx == NETXTREME_E_VF_HV \|\| idx == NETXTREME_E_P5_VF);	285	idx == NETXTREME_E_VF_HV \|\| idx == NETXTREME_E_P5_VF \|\|
		286	idx == NETXTREME_E_P5_VF_HV);
286	}	287	}
287		288
288	#define DB_CP_REARM_FLAGS (DB_KEY_CP \| DB_IDX_VALID)	289	#define DB_CP_REARM_FLAGS (DB_KEY_CP \| DB_IDX_VALID)
@@ -6932,17 +6933,10 @@ ctx_err: · 6643 unmodified lines
6932	static void bnxt_hwrm_set_pg_attr(struct bnxt_ring_mem_info rmem, u8 pg_attr,	6933	static void bnxt_hwrm_set_pg_attr(struct bnxt_ring_mem_info rmem, u8 pg_attr,
6933	__le64 *pg_dir)	6934	__le64 *pg_dir)
6934	{	6935	{
6935	u8 pg_size = 0;
6936
6937	if (!rmem->nr_pages)	6936	if (!rmem->nr_pages)
6938	return;	6937	return;
6939		6938
6940	if (BNXT_PAGE_SHIFT == 13)	6939	BNXT_SET_CTX_PAGE_ATTR(*pg_attr);
6941	pg_size = 1 << 4;
6942	else if (BNXT_PAGE_SIZE == 16)
6943	pg_size = 2 << 4;
6944
6945	*pg_attr = pg_size;
6946	if (rmem->depth >= 1) {	6940	if (rmem->depth >= 1) {
6947	if (rmem->depth == 2)	6941	if (rmem->depth == 2)
6948	*pg_attr \|= 2;	6942	*pg_attr \|= 2;
@@ -7314,7 +7308,7 @@ skip_rdma: · 365 unmodified lines
7314	entries_sp = ctx->vnic_max_vnic_entries + ctx->qp_max_l2_entries +	7308	entries_sp = ctx->vnic_max_vnic_entries + ctx->qp_max_l2_entries +
7315	2 * (extra_qps + ctx->qp_min_qp1_entries) + min;	7309	2 * (extra_qps + ctx->qp_min_qp1_entries) + min;
7316	entries_sp = roundup(entries_sp, ctx->tqm_entries_multiple);	7310	entries_sp = roundup(entries_sp, ctx->tqm_entries_multiple);
7317	entries = ctx->qp_max_l2_entries + extra_qps + ctx->qp_min_qp1_entries;	7311	entries = ctx->qp_max_l2_entries + 2 * (extra_qps + ctx->qp_min_qp1_entries);
7318	entries = roundup(entries, ctx->tqm_entries_multiple);	7312	entries = roundup(entries, ctx->tqm_entries_multiple);
7319	entries = clamp_t(u32, entries, min, ctx->tqm_max_entries_per_ring);	7313	entries = clamp_t(u32, entries, min, ctx->tqm_max_entries_per_ring);
7320	for (i = 0; i < ctx->tqm_fp_rings_count + 1; i++) {	7314	for (i = 0; i < ctx->tqm_fp_rings_count + 1; i++) {
@@ -10785,37 +10779,125 @@ static int bnxt_set_features(struct net_device *dev, netdev_features_t features) · 3464 unmodified lines
10785	return rc;	10779	return rc;
10786	}	10780	}
10787		10781
		10782	static bool bnxt_exthdr_check(struct bnxt bp, struct sk_buff skb, int nw_off,
		10783	u8 **nextp)
		10784	{
		10785	struct ipv6hdr ip6h = (struct ipv6hdr )(skb->data + nw_off);
		10786	int hdr_count = 0;
		10787	u8 *nexthdr;
		10788	int start;
		10789
		10790	/* Check that there are at most 2 IPv6 extension headers, no
		10791	* fragment header, and each is <= 64 bytes.
		10792	*/
		10793	start = nw_off + sizeof(*ip6h);
		10794	nexthdr = &ip6h->nexthdr;
		10795	while (ipv6_ext_hdr(*nexthdr)) {
		10796	struct ipv6_opt_hdr *hp;
		10797	int hdrlen;
		10798
		10799	if (hdr_count >= 3 \|\| *nexthdr == NEXTHDR_NONE \|\|
		10800	*nexthdr == NEXTHDR_FRAGMENT)
		10801	return false;
		10802	hp = __skb_header_pointer(NULL, start, sizeof(*hp), skb->data,
		10803	skb_headlen(skb), NULL);
		10804	if (!hp)
		10805	return false;
		10806	if (*nexthdr == NEXTHDR_AUTH)
		10807	hdrlen = ipv6_authlen(hp);
		10808	else
		10809	hdrlen = ipv6_optlen(hp);
		10810
		10811	if (hdrlen > 64)
		10812	return false;
		10813	nexthdr = &hp->nexthdr;
		10814	start += hdrlen;
		10815	hdr_count++;
		10816	}
		10817	if (nextp) {
		10818	/* Caller will check inner protocol */
		10819	if (skb->encapsulation) {
		10820	*nextp = nexthdr;
		10821	return true;
		10822	}
		10823	*nextp = NULL;
		10824	}
		10825	/* Only support TCP/UDP for non-tunneled ipv6 and inner ipv6 */
		10826	return nexthdr == IPPROTO_TCP \|\| nexthdr == IPPROTO_UDP;
		10827	}
		10828
		10829	/* For UDP, we can only handle 1 Vxlan port and 1 Geneve port. */
		10830	static bool bnxt_udp_tunl_check(struct bnxt bp, struct sk_buff skb)
		10831	{
		10832	struct udphdr *uh = udp_hdr(skb);
		10833	__be16 udp_port = uh->dest;
		10834
		10835	if (udp_port != bp->vxlan_port && udp_port != bp->nge_port)
		10836	return false;
		10837	if (skb->inner_protocol_type == ENCAP_TYPE_ETHER) {
		10838	struct ethhdr *eh = inner_eth_hdr(skb);
		10839
		10840	switch (eh->h_proto) {
		10841	case htons(ETH_P_IP):
		10842	return true;
		10843	case htons(ETH_P_IPV6):
		10844	return bnxt_exthdr_check(bp, skb,
		10845	skb_inner_network_offset(skb),
		10846	NULL);
		10847	}
		10848	}
		10849	return false;
		10850	}
		10851
		10852	static bool bnxt_tunl_check(struct bnxt bp, struct sk_buff skb, u8 l4_proto)
		10853	{
		10854	switch (l4_proto) {
		10855	case IPPROTO_UDP:
		10856	return bnxt_udp_tunl_check(bp, skb);
		10857	case IPPROTO_IPIP:
		10858	return true;
		10859	case IPPROTO_GRE: {
		10860	switch (skb->inner_protocol) {
		10861	default:
		10862	return false;
		10863	case htons(ETH_P_IP):
		10864	return true;
		10865	case htons(ETH_P_IPV6):
		10866	fallthrough;
		10867	}
		10868	}
		10869	case IPPROTO_IPV6:
		10870	/* Check ext headers of inner ipv6 */
		10871	return bnxt_exthdr_check(bp, skb, skb_inner_network_offset(skb),
		10872	NULL);
		10873	}
		10874	return false;
		10875	}
		10876
10788	static netdev_features_t bnxt_features_check(struct sk_buff *skb,	10877	static netdev_features_t bnxt_features_check(struct sk_buff *skb,
10789	struct net_device *dev,	10878	struct net_device *dev,
10790	netdev_features_t features)	10879	netdev_features_t features)
10791	{	10880	{
10792	struct bnxt *bp;	10881	struct bnxt *bp = netdev_priv(dev);
10793	__be16 udp_port;	10882	u8 *l4_proto;
10794	u8 l4_proto = 0;
10795		10883
10796	features = vlan_features_check(skb, features);	10884	features = vlan_features_check(skb, features);
10797	if (!skb->encapsulation)
10798	return features;
10799
10800	switch (vlan_get_protocol(skb)) {	10885	switch (vlan_get_protocol(skb)) {
10801	case htons(ETH_P_IP):	10886	case htons(ETH_P_IP):
10802	l4_proto = ip_hdr(skb)->protocol;	10887	if (!skb->encapsulation)
		10888	return features;
		10889	l4_proto = &ip_hdr(skb)->protocol;
		10890	if (bnxt_tunl_check(bp, skb, *l4_proto))
		10891	return features;
10803	break;	10892	break;
10804	case htons(ETH_P_IPV6):	10893	case htons(ETH_P_IPV6):
10805	l4_proto = ipv6_hdr(skb)->nexthdr;	10894	if (!bnxt_exthdr_check(bp, skb, skb_network_offset(skb),
		10895	&l4_proto))
		10896	break;
		10897	if (!l4_proto \|\| bnxt_tunl_check(bp, skb, *l4_proto))
		10898	return features;
10806	break;	10899	break;
10807	default:
10808	return features;
10809	}	10900	}
10810
10811	if (l4_proto != IPPROTO_UDP)
10812	return features;
10813
10814	bp = netdev_priv(dev);
10815	/* For UDP, we can only handle 1 Vxlan port and 1 Geneve port. */
10816	udp_port = udp_hdr(skb)->dest;
10817	if (udp_port == bp->vxlan_port \|\| udp_port == bp->nge_port)
10818	return features;
10819	return features & ~(NETIF_F_CSUM_MASK \| NETIF_F_GSO_MASK);	10901	return features & ~(NETIF_F_CSUM_MASK \| NETIF_F_GSO_MASK);
10820	}	10902	}
10821		10903
@@ -11668,6 +11750,8 @@ static void bnxt_fw_init_one_p3(struct bnxt *bp) · 846 unmodified lines
11668	bnxt_hwrm_coal_params_qcaps(bp);	11750	bnxt_hwrm_coal_params_qcaps(bp);
11669	}	11751	}
11670		11752
		11753	static int bnxt_probe_phy(struct bnxt *bp, bool fw_dflt);
		11754
11671	static int bnxt_fw_init_one(struct bnxt *bp)	11755	static int bnxt_fw_init_one(struct bnxt *bp)
11672	{	11756	{
11673	int rc;	11757	int rc;
@@ -11682,6 +11766,9 @@ static int bnxt_fw_init_one(struct bnxt *bp) · 8 unmodified lines
11682	netdev_err(bp->dev, "Firmware init phase 2 failed\n");	11766	netdev_err(bp->dev, "Firmware init phase 2 failed\n");
11683	return rc;	11767	return rc;
11684	}	11768	}
		11769	rc = bnxt_probe_phy(bp, false);
		11770	if (rc)
		11771	return rc;
11685	rc = bnxt_approve_mac(bp, bp->dev->dev_addr, false);	11772	rc = bnxt_approve_mac(bp, bp->dev->dev_addr, false);
11686	if (rc)	11773	if (rc)
11687	return rc;	11774	return rc;
@@ -13073,6 +13160,7 @@ init_err_pci_clean: · 1385 unmodified lines
13073	bnxt_hwrm_func_drv_unrgtr(bp);	13160	bnxt_hwrm_func_drv_unrgtr(bp);
13074	bnxt_free_hwrm_short_cmd_req(bp);	13161	bnxt_free_hwrm_short_cmd_req(bp);
13075	bnxt_free_hwrm_resources(bp);	13162	bnxt_free_hwrm_resources(bp);
		13163	bnxt_ethtool_free(bp);
13076	kfree(bp->fw_health);	13164	kfree(bp->fw_health);
13077	bp->fw_health = NULL;	13165	bp->fw_health = NULL;
13078	bnxt_cleanup_pci(bp);	13166	bnxt_cleanup_pci(bp);

drivers/net/ethernet/broadcom/bnxt/bnxt.h+10−0

@@ -1457,6 +1457,16 @@ struct bnxt_ctx_pg_info { · 1456 unmodified lines
1457		1457
1458	#define BNXT_BACKING_STORE_CFG_LEGACY_LEN 256	1458	#define BNXT_BACKING_STORE_CFG_LEGACY_LEN 256
1459		1459
		1460	#define BNXT_SET_CTX_PAGE_ATTR(attr) \
		1461	do { \
		1462	if (BNXT_PAGE_SIZE == 0x2000) \
		1463	attr = FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_8K; \
		1464	else if (BNXT_PAGE_SIZE == 0x10000) \
		1465	attr = FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_64K; \
		1466	else \
		1467	attr = FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_4K; \
		1468	} while (0)
		1469
1460	struct bnxt_ctx_mem_info {	1470	struct bnxt_ctx_mem_info {
1461	u32 qp_max_entries;	1471	u32 qp_max_entries;
1462	u16 qp_min_qp1_entries;	1472	u16 qp_min_qp1_entries;

drivers/net/ethernet/cadence/macb_main.c+3−0

@@ -2867,6 +2867,9 @@ static struct net_device_stats gem_get_stats(struct macb bp) · 2866 unmodified lines
2867	struct gem_stats *hwstat = &bp->hw_stats.gem;	2867	struct gem_stats *hwstat = &bp->hw_stats.gem;
2868	struct net_device_stats *nstat = &bp->dev->stats;	2868	struct net_device_stats *nstat = &bp->dev->stats;
2869		2869
		2870	if (!netif_running(bp->dev))
		2871	return nstat;
		2872
2870	gem_update_stats(bp);	2873	gem_update_stats(bp);
2871		2874
2872	nstat->rx_errors = (hwstat->rx_frame_check_sequence_errors +	2875	nstat->rx_errors = (hwstat->rx_frame_check_sequence_errors +

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h+0−2

 			  bool persistent, u8 *smt_idx);
 int cxgb4_get_msix_idx_from_bmap(struct adapter *adap);
 void cxgb4_free_msix_idx_in_bmap(struct adapter *adap, u32 msix_idx);
-int cxgb_open(struct net_device *dev);
-int cxgb_close(struct net_device *dev);
 void cxgb4_enable_rx(struct adapter *adap, struct sge_rspq *q);
 void cxgb4_quiesce_rx(struct sge_rspq *q);
 int cxgb4_port_mirror_alloc(struct net_device *dev);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c+35−13

 		return ret;
 	}
-	spin_lock_bh(&adap->win0_lock);
+	/* We have to RESET the chip/firmware because we need the
+	 * chip in uninitialized state for loading new PHY image.
+	 * Otherwise, the running firmware will only store the PHY
+	 * image in local RAM which will be lost after next reset.
+	 */
+	ret = t4_fw_reset(adap, adap->mbox, PIORSTMODE_F | PIORST_F);
+	if (ret < 0) {
+		dev_err(adap->pdev_dev,
+			"Set FW to RESET for flashing PHY FW failed. ret: %d\n",
+			ret);
+		return ret;
+	}
 	ret = t4_load_phy_fw(adap, MEMWIN_NIC, NULL, data, size);
-	spin_unlock_bh(&adap->win0_lock);
+	if (ret < 0) {
-	if (ret)
+		dev_err(adap->pdev_dev, "Failed to load PHY FW. ret: %d\n",
-		dev_err(adap->pdev_dev, "Failed to load PHY FW\n");
+			ret);
+		return ret;
+	}
-	return ret;
+	return 0;
 }
 static int cxgb4_ethtool_flash_fw(struct net_device *netdev,
 						   u32 ftid)
 {
 	struct tid_info *t = &adap->tids;
-	struct filter_entry *f;
-	if (ftid < t->nhpftids)
+	if (ftid >= t->hpftid_base && ftid < t->hpftid_base + t->nhpftids)
-		f = &adap->tids.hpftid_tab[ftid];
+		return &t->hpftid_tab[ftid - t->hpftid_base];
-	else if (ftid < t->nftids)
-		f = &adap->tids.ftid_tab[ftid - t->nhpftids];
-	else
-		f = lookup_tid(&adap->tids, ftid);
-	return f;
+	if (ftid >= t->ftid_base && ftid < t->ftid_base + t->nftids)
+		return &t->ftid_tab[ftid - t->ftid_base];
+	return lookup_tid(t, ftid);
 }
 static void cxgb4_fill_filter_rule(struct ethtool_rx_flow_spec *fs,
 	filter_id = filter_info->loc_array[cmd->fs.location];
 	f = cxgb4_get_filter_entry(adapter, filter_id);
+	if (f->fs.prio)
+		filter_id -= adapter->tids.hpftid_base;
+	else if (!f->fs.hash)
+		filter_id -= (adapter->tids.ftid_base - adapter->tids.nhpftids);
 	ret = cxgb4_flow_rule_destroy(dev, f->fs.tc_prio, &f->fs, filter_id);
 	if (ret)
 		goto err;
 	filter_info = &adapter->ethtool_filters->port[pi->port_id];
+	if (fs.prio)
+		tid += adapter->tids.hpftid_base;
+	else if (!fs.hash)
+		tid += (adapter->tids.ftid_base - adapter->tids.nhpftids);
 	filter_info->loc_array[cmd->fs.location] = tid;
 	set_bit(cmd->fs.location, filter_info->bmap);
 	filter_info->in_use++;

drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c+2−2

@@ -198,7 +198,7 @@ static void set_nat_params(struct adapter adap, struct filter_entry f, · 197 unmodified lines
198	WORD_MASK, f->fs.nat_lip[3] \|	198	WORD_MASK, f->fs.nat_lip[3] \|
199	f->fs.nat_lip[2] << 8 \|	199	f->fs.nat_lip[2] << 8 \|
200	f->fs.nat_lip[1] << 16 \|	200	f->fs.nat_lip[1] << 16 \|
201	(u64)f->fs.nat_lip[0] << 25, 1);	201	(u64)f->fs.nat_lip[0] << 24, 1);
202	}	202	}
203	}	203	}
204		204
@@ -1042,7 +1042,7 @@ void clear_all_filters(struct adapter *adapter) · 837 unmodified lines
1042	cxgb4_del_filter(dev, f->tid, &f->fs);	1042	cxgb4_del_filter(dev, f->tid, &f->fs);
1043	}	1043	}
1044		1044
1045	sb = t4_read_reg(adapter, LE_DB_SRVR_START_INDEX_A);	1045	sb = adapter->tids.stid_base;
1046	for (i = 0; i < sb; i++) {	1046	for (i = 0; i < sb; i++) {
1047	f = (struct filter_entry *)adapter->tids.tid_tab[i];	1047	f = (struct filter_entry *)adapter->tids.tid_tab[i];
1048		1048

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c+3−5

 /*
  * net_device operations
  */
-int cxgb_open(struct net_device *dev)
+static int cxgb_open(struct net_device *dev)
 {
 	struct port_info *pi = netdev_priv(dev);
 	struct adapter *adapter = pi->adapter;
 	return err;
 }
-int cxgb_close(struct net_device *dev)
+static int cxgb_close(struct net_device *dev)
 {
 	struct port_info *pi = netdev_priv(dev);
 	struct adapter *adapter = pi->adapter;
 	/* Load PHY Firmware onto adapter.
 	 */
-	spin_lock_bh(&adap->win0_lock);
 	ret = t4_load_phy_fw(adap, MEMWIN_NIC, phy_info->phy_fw_version,
 			     (u8 *)phyf->data, phyf->size);
-	spin_unlock_bh(&adap->win0_lock);
 	if (ret < 0)
 		dev_err(adap->pdev_dev, "PHY Firmware transfer error %d\n",
 			-ret);
 	adap->uld[CXGB4_ULD_KTLS].tlsdev_ops->tls_dev_del(netdev, tls_ctx,
 							  direction);
-	cxgb4_set_ktls_feature(adap, FW_PARAMS_PARAM_DEV_KTLS_HW_DISABLE);
 out_unlock:
+	cxgb4_set_ktls_feature(adap, FW_PARAMS_PARAM_DEV_KTLS_HW_DISABLE);
 	mutex_unlock(&uld_mutex);
 }

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c+5−9

 	if (!ch_flower)
 		return -ENOENT;
+	rhashtable_remove_fast(&adap->flower_tbl, &ch_flower->node,
+			       adap->flower_ht_params);
 	ret = cxgb4_flow_rule_destroy(dev, ch_flower->fs.tc_prio,
 				      &ch_flower->fs, ch_flower->filter_id);
 	if (ret)
-		goto err;
+		netdev_err(dev, "Flow rule destroy failed for tid: %u, ret: %d",
+			   ch_flower->filter_id, ret);
-	ret = rhashtable_remove_fast(&adap->flower_tbl, &ch_flower->node,
-				     adap->flower_ht_params);
-	if (ret) {
-		netdev_err(dev, "Flow remove from rhashtable failed");
-		goto err;
-	}
 	kfree_rcu(ch_flower, rcu);
-err:
 	return ret;
 }

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c+6−3

 	 * down before configuring tc params.
 	 */
 	if (netif_running(dev)) {
-		cxgb_close(dev);
+		netif_tx_stop_all_queues(dev);
+		netif_carrier_off(dev);
 		needs_bring_up = true;
 	}
 	}
 out:
-	if (needs_bring_up)
+	if (needs_bring_up) {
-		cxgb_open(dev);
+		netif_tx_start_all_queues(dev);
+		netif_carrier_on(dev);
+	}
 	mutex_unlock(&adap->tc_mqprio->mqprio_mutex);
 	return ret;

drivers/net/ethernet/chelsio/cxgb4/sge.c+6−0

 	if (!eosw_txq)
 		return -ENOMEM;
+	if (!(adap->flags & CXGB4_FW_OK)) {
+		/* Don't stall caller when access to FW is lost */
+		complete(&eosw_txq->completion);
+		return -EIO;
+	}
 	skb = alloc_skb(len, GFP_KERNEL);
 	if (!skb)
 		return -ENOMEM;

drivers/net/ethernet/chelsio/cxgb4/t4_hw.c+29−17

  *	@addr: the start address to write
  *	@n: length of data to write in bytes
  *	@data: the data to write
+ *	@byte_oriented: whether to store data as bytes or as words
  *
  *	Writes up to a page of data (256 bytes) to the serial flash starting
  *	at the given address.  All the data must be written to the same page.
+ *	If @byte_oriented is set the write data is stored as byte stream
+ *	(i.e. matches what on disk), otherwise in big-endian.
  */
 static int t4_write_flash(struct adapter *adapter, unsigned int addr,
-			  unsigned int n, const u8 *data)
+			  unsigned int n, const u8 *data, bool byte_oriented)
 {
-	int ret;
-	u32 buf[64];
 	unsigned int i, c, left, val, offset = addr & 0xff;
+	u32 buf[64];
+	int ret;
 	if (addr >= adapter->params.sf_size || offset + n > SF_PAGE_SIZE)
 		return -EINVAL;
 	    (ret = sf1_write(adapter, 4, 1, 1, val)) != 0)
 		goto unlock;
-	for (left = n; left; left -= c) {
+	for (left = n; left; left -= c, data += c) {
 		c = min(left, 4U);
-		for (val = 0, i = 0; i < c; ++i)
+		for (val = 0, i = 0; i < c; ++i) {
-			val = (val << 8) + *data++;
+			if (byte_oriented)
+				val = (val << 8) + data[i];
+			else
+				val = (val << 8) + data[c - i - 1];
+		}
 		ret = sf1_write(adapter, c, c != left, 1, val);
 		if (ret)
 	t4_write_reg(adapter, SF_OP_A, 0);    /* unlock SF */
 	/* Read the page to verify the write succeeded */
-	ret = t4_read_flash(adapter, addr & ~0xff, ARRAY_SIZE(buf), buf, 1);
+	ret = t4_read_flash(adapter, addr & ~0xff, ARRAY_SIZE(buf), buf,
+			    byte_oriented);
 	if (ret)
 		return ret;
 	 */
 	memcpy(first_page, fw_data, SF_PAGE_SIZE);
 	((struct fw_hdr *)first_page)->fw_ver = cpu_to_be32(0xffffffff);
-	ret = t4_write_flash(adap, fw_start, SF_PAGE_SIZE, first_page);
+	ret = t4_write_flash(adap, fw_start, SF_PAGE_SIZE, first_page, true);
 	if (ret)
 		goto out;
 	for (size -= SF_PAGE_SIZE; size; size -= SF_PAGE_SIZE) {
 		addr += SF_PAGE_SIZE;
 		fw_data += SF_PAGE_SIZE;
-		ret = t4_write_flash(adap, addr, SF_PAGE_SIZE, fw_data);
+		ret = t4_write_flash(adap, addr, SF_PAGE_SIZE, fw_data, true);
 		if (ret)
 			goto out;
 	}
-	ret = t4_write_flash(adap,
+	ret = t4_write_flash(adap, fw_start + offsetof(struct fw_hdr, fw_ver),
-			     fw_start + offsetof(struct fw_hdr, fw_ver),
+			     sizeof(hdr->fw_ver), (const u8 *)&hdr->fw_ver,
-			     sizeof(hdr->fw_ver), (const u8 *)&hdr->fw_ver);
+			     true);
 out:
 	if (ret)
 		dev_err(adap->pdev_dev, "firmware download failed, error %d\n",
 	/* Copy the supplied PHY Firmware image to the adapter memory location
 	 * allocated by the adapter firmware.
 	 */
+	spin_lock_bh(&adap->win0_lock);
 	ret = t4_memory_rw(adap, win, mtype, maddr,
 			   phy_fw_size, (__be32 *)phy_fw_data,
 			   T4_MEMORY_WRITE);
+	spin_unlock_bh(&adap->win0_lock);
 	if (ret)
 		return ret;
 			n = size - i;
 		else
 			n = SF_PAGE_SIZE;
-		ret = t4_write_flash(adap, addr, n, cfg_data);
+		ret = t4_write_flash(adap, addr, n, cfg_data, true);
 		if (ret)
 			goto out;
 	for (size -= SF_PAGE_SIZE; size; size -= SF_PAGE_SIZE) {
 		addr += SF_PAGE_SIZE;
 		boot_data += SF_PAGE_SIZE;
-		ret = t4_write_flash(adap, addr, SF_PAGE_SIZE, boot_data);
+		ret = t4_write_flash(adap, addr, SF_PAGE_SIZE, boot_data,
+				     false);
 		if (ret)
 			goto out;
 	}
 	ret = t4_write_flash(adap, boot_sector, SF_PAGE_SIZE,
-			     (const u8 *)header);
+			     (const u8 *)header, false);
 out:
 	if (ret)
 	for (i = 0; i < size; i += SF_PAGE_SIZE) {
 		n = min_t(u32, size - i, SF_PAGE_SIZE);
-		ret = t4_write_flash(adap, addr, n, cfg_data);
+		ret = t4_write_flash(adap, addr, n, cfg_data, false);
 		if (ret)
 			goto out;
 	for (i = 0; i < npad; i++) {
 		u8 data = 0;
-		ret = t4_write_flash(adap, cfg_addr + size + i, 1, &data);
+		ret = t4_write_flash(adap, cfg_addr + size + i, 1, &data,
+				     false);
 		if (ret)
 			goto out;
 	}

drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c+79−1

 }
 static int chcr_init_tcb_fields(struct chcr_ktls_info *tx_info);
+static void clear_conn_resources(struct chcr_ktls_info *tx_info);
 /*
  * chcr_ktls_save_keys: calculate and save crypto keys.
  * @tx_info - driver specific tls info.
 				chcr_get_ktls_tx_context(tls_ctx);
 	struct chcr_ktls_info *tx_info = tx_ctx->chcr_info;
 	struct ch_ktls_port_stats_debug *port_stats;
+	struct chcr_ktls_uld_ctx *u_ctx;
 	if (!tx_info)
 		return;
+	u_ctx = tx_info->adap->uld[CXGB4_ULD_KTLS].handle;
+	if (u_ctx && u_ctx->detach)
+		return;
 	/* clear l2t entry */
 	if (tx_info->l2te)
 		cxgb4_l2t_release(tx_info->l2te);
 	if (tx_info->tid != -1) {
 		cxgb4_remove_tid(&tx_info->adap->tids, tx_info->tx_chan,
 				 tx_info->tid, tx_info->ip_family);
+		xa_erase(&u_ctx->tid_list, tx_info->tid);
 	}
 	port_stats = &tx_info->adap->ch_ktls_stats.ktls_port[tx_info->port_id];
 	struct tls_context *tls_ctx = tls_get_ctx(sk);
 	struct ch_ktls_port_stats_debug *port_stats;
 	struct chcr_ktls_ofld_ctx_tx *tx_ctx;
+	struct chcr_ktls_uld_ctx *u_ctx;
 	struct chcr_ktls_info *tx_info;
 	struct dst_entry *dst;
 	struct adapter *adap;
 	adap = pi->adapter;
 	port_stats = &adap->ch_ktls_stats.ktls_port[pi->port_id];
 	atomic64_inc(&port_stats->ktls_tx_connection_open);
+	u_ctx = adap->uld[CXGB4_ULD_KTLS].handle;
 	if (direction == TLS_OFFLOAD_CTX_DIR_RX) {
 		pr_err("not expecting for RX direction\n");
 	if (tx_ctx->chcr_info)
 		goto out;
+	if (u_ctx && u_ctx->detach)
+		goto out;
 	tx_info = kvzalloc(sizeof(*tx_info), GFP_KERNEL);
 	if (!tx_info)
 		goto out;
 	cxgb4_remove_tid(&tx_info->adap->tids, tx_info->tx_chan,
 			 tx_info->tid, tx_info->ip_family);
+	xa_erase(&u_ctx->tid_list, tx_info->tid);
 put_module:
 	/* release module refcount */
 	module_put(THIS_MODULE);
 {
 	const struct cpl_act_open_rpl *p = (void *)input;
 	struct chcr_ktls_info *tx_info = NULL;
+	struct chcr_ktls_ofld_ctx_tx *tx_ctx;
+	struct chcr_ktls_uld_ctx *u_ctx;
 	unsigned int atid, tid, status;
+	struct tls_context *tls_ctx;
 	struct tid_info *t;
+	int ret = 0;
 	tid = GET_TID(p);
 	status = AOPEN_STATUS_G(ntohl(p->atid_status));
 	if (!status) {
 		tx_info->tid = tid;
 		cxgb4_insert_tid(t, tx_info, tx_info->tid, tx_info->ip_family);
+		/* Adding tid */
+		tls_ctx = tls_get_ctx(tx_info->sk);
+		tx_ctx = chcr_get_ktls_tx_context(tls_ctx);
+		u_ctx = adap->uld[CXGB4_ULD_KTLS].handle;
+		if (u_ctx) {
+			ret = xa_insert_bh(&u_ctx->tid_list, tid, tx_ctx,
+					   GFP_NOWAIT);
+			if (ret < 0) {
+				pr_err("%s: Failed to allocate tid XA entry = %d\n",
+				       __func__, tx_info->tid);
+				tx_info->open_state = CH_KTLS_OPEN_FAILURE;
+				goto out;
+			}
+		}
 		tx_info->open_state = CH_KTLS_OPEN_SUCCESS;
 	} else {
 		tx_info->open_state = CH_KTLS_OPEN_FAILURE;
 	}
+out:
 	spin_unlock(&tx_info->lock);
 	complete(&tx_info->completion);
-	return 0;
+	return ret;
 }
 /*
 		goto out;
 	}
 	u_ctx->lldi = *lldi;
+	u_ctx->detach = false;
+	xa_init_flags(&u_ctx->tid_list, XA_FLAGS_LOCK_BH);
 out:
 	return u_ctx;
 }
 	return 0;
 }
+static void clear_conn_resources(struct chcr_ktls_info *tx_info)
+{
+	/* clear l2t entry */
+	if (tx_info->l2te)
+		cxgb4_l2t_release(tx_info->l2te);
+#if IS_ENABLED(CONFIG_IPV6)
+	/* clear clip entry */
+	if (tx_info->ip_family == AF_INET6)
+		cxgb4_clip_release(tx_info->netdev, (const u32 *)
+				   &tx_info->sk->sk_v6_rcv_saddr,
+				   1);
+#endif
+	/* clear tid */
+	if (tx_info->tid != -1)
+		cxgb4_remove_tid(&tx_info->adap->tids, tx_info->tx_chan,
+				 tx_info->tid, tx_info->ip_family);
+}
+static void ch_ktls_reset_all_conn(struct chcr_ktls_uld_ctx *u_ctx)
+{
+	struct ch_ktls_port_stats_debug *port_stats;
+	struct chcr_ktls_ofld_ctx_tx *tx_ctx;
+	struct chcr_ktls_info *tx_info;
+	unsigned long index;
+	xa_for_each(&u_ctx->tid_list, index, tx_ctx) {
+		tx_info = tx_ctx->chcr_info;
+		clear_conn_resources(tx_info);
+		port_stats = &tx_info->adap->ch_ktls_stats.ktls_port[tx_info->port_id];
+		atomic64_inc(&port_stats->ktls_tx_connection_close);
+		kvfree(tx_info);
+		tx_ctx->chcr_info = NULL;
+		/* release module refcount */
+		module_put(THIS_MODULE);
+	}
+}
 static int chcr_ktls_uld_state_change(void *handle, enum cxgb4_state new_state)
 {
 	struct chcr_ktls_uld_ctx *u_ctx = handle;
 	case CXGB4_STATE_DETACH:
 		pr_info("%s: Down\n", pci_name(u_ctx->lldi.pdev));
 		mutex_lock(&dev_mutex);
+		u_ctx->detach = true;
 		list_del(&u_ctx->entry);
+		ch_ktls_reset_all_conn(u_ctx);
+		xa_destroy(&u_ctx->tid_list);
 		mutex_unlock(&dev_mutex);
 		break;
 	default:
 		adap = pci_get_drvdata(u_ctx->lldi.pdev);
 		memset(&adap->ch_ktls_stats, 0, sizeof(adap->ch_ktls_stats));
 		list_del(&u_ctx->entry);
+		xa_destroy(&u_ctx->tid_list);
 		kfree(u_ctx);
 	}
 	mutex_unlock(&dev_mutex);

drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.h+2−0

@@ -75,6 +75,8 @@ struct chcr_ktls_ofld_ctx_tx { · 74 unmodified lines
75	struct chcr_ktls_uld_ctx {	75	struct chcr_ktls_uld_ctx {
76	struct list_head entry;	76	struct list_head entry;
77	struct cxgb4_lld_info lldi;	77	struct cxgb4_lld_info lldi;
		78	struct xarray tid_list;
		79	bool detach;
78	};	80	};
79		81
80	static inline struct chcr_ktls_ofld_ctx_tx *	82	static inline struct chcr_ktls_ofld_ctx_tx *

drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c+4−2

 			cerr = put_cmsg(msg, SOL_TLS, TLS_GET_RECORD_TYPE,
 					sizeof(thdr->type), &thdr->type);
-			if (cerr && thdr->type != TLS_RECORD_TYPE_DATA)
+			if (cerr && thdr->type != TLS_RECORD_TYPE_DATA) {
-				return -EIO;
+				copied = -EIO;
+				break;
+			}
 			/*  don't send tls header, skip copy */
 			goto skip_copy;
 		}

drivers/net/ethernet/ec_bhf.c+3−1

 	struct ec_bhf_priv *priv = netdev_priv(net_dev);
 	unregister_netdev(net_dev);
-	free_netdev(net_dev);
 	pci_iounmap(dev, priv->dma_io);
 	pci_iounmap(dev, priv->io);
+	free_netdev(net_dev);
 	pci_release_regions(dev);
 	pci_clear_master(dev);
 	pci_disable_device(dev);

drivers/net/ethernet/emulex/benet/be_main.c+1−0

@@ -5897,6 +5897,7 @@ drv_cleanup: · 5896 unmodified lines
5897	unmap_bars:	5897	unmap_bars:
5898	be_unmap_pci_bars(adapter);	5898	be_unmap_pci_bars(adapter);
5899	free_netdev:	5899	free_netdev:
		5900	pci_disable_pcie_error_reporting(pdev);
5900	free_netdev(netdev);	5901	free_netdev(netdev);
5901	rel_reg:	5902	rel_reg:
5902	pci_release_regions(pdev);	5903	pci_release_regions(pdev);

drivers/net/ethernet/freescale/fec_main.c+19−5

 }
 /* ------------------------------------------------------------------------- */
-static void fec_get_mac(struct net_device *ndev)
+static int fec_get_mac(struct net_device *ndev)
 {
 	struct fec_enet_private *fep = netdev_priv(ndev);
 	unsigned char *iap, tmpaddr[ETH_ALEN];
 			ret = of_get_mac_address(np, tmpaddr);
 			if (!ret)
 				iap = tmpaddr;
+			else if (ret == -EPROBE_DEFER)
+				return ret;
 		}
 	}
 		eth_hw_addr_random(ndev);
 		dev_info(&fep->pdev->dev, "Using random MAC address: %pM\n",
 			 ndev->dev_addr);
-		return;
+		return 0;
 	}
 	memcpy(ndev->dev_addr, iap, ETH_ALEN);
 	/* Adjust MAC if using macaddr */
 	if (iap == macaddr)
 		 ndev->dev_addr[ETH_ALEN-1] = macaddr[ETH_ALEN-1] + fep->dev_id;
+	return 0;
 }
 /* ------------------------------------------------------------------------- */
 		return ret;
 	}
-	fec_enet_alloc_queue(ndev);
+	ret = fec_enet_alloc_queue(ndev);
+	if (ret)
+		return ret;
 	bd_size = (fep->total_tx_ring_size + fep->total_rx_ring_size) * dsize;
 	cbd_base = dmam_alloc_coherent(&fep->pdev->dev, bd_size, &bd_dma,
 				       GFP_KERNEL);
 	if (!cbd_base) {
-		return -ENOMEM;
+		ret = -ENOMEM;
+		goto free_queue_mem;
 	}
 	/* Get the Ethernet address */
-	fec_get_mac(ndev);
+	ret = fec_get_mac(ndev);
+	if (ret)
+		goto free_queue_mem;
 	/* make sure MAC we just acquired is programmed into the hw */
 	fec_set_mac_address(ndev, NULL);
 		fec_enet_update_ethtool_stats(ndev);
 	return 0;
+free_queue_mem:
+	fec_enet_free_queue(ndev);
+	return ret;
 }
 #ifdef CONFIG_OF

drivers/net/ethernet/freescale/fec_ptp.c+5−3

 {
 	struct fec_enet_private *fep =
 		container_of(cc, struct fec_enet_private, cc);
-	const struct platform_device_id *id_entry =
-		platform_get_device_id(fep->pdev);
 	u32 tempval;
 	tempval = readl(fep->hwp + FEC_ATIME_CTRL);
 	tempval |= FEC_T_CTRL_CAPTURE;
 	writel(tempval, fep->hwp + FEC_ATIME_CTRL);
-	if (id_entry->driver_data & FEC_QUIRK_BUG_CAPTURE)
+	if (fep->quirks & FEC_QUIRK_BUG_CAPTURE)
 		udelay(1);
 	return readl(fep->hwp + FEC_ATIME);
 	fep->ptp_caps.enable = fec_ptp_enable;
 	fep->cycle_speed = clk_get_rate(fep->clk_ptp);
+	if (!fep->cycle_speed) {
+		fep->cycle_speed = NSEC_PER_SEC;
+		dev_err(&fep->pdev->dev, "clk_ptp clock rate is zero\n");
+	}
 	fep->ptp_inc = NSEC_PER_SEC / fep->cycle_speed;
 	spin_lock_init(&fep->tmreg_lock);

drivers/net/ethernet/google/gve/gve_main.c+12−9

 	/* Double check we have no extra work.
 	 * Ensure unmask synchronizes with checking for work.
 	 */
-	dma_rmb();
+	mb();
 	if (block->tx)
 		reschedule |= gve_tx_poll(block, -1);
 	if (block->rx)
 		int vecs_left = new_num_ntfy_blks % 2;
 		priv->num_ntfy_blks = new_num_ntfy_blks;
+		priv->mgmt_msix_idx = priv->num_ntfy_blks;
 		priv->tx_cfg.max_queues = min_t(int, priv->tx_cfg.max_queues,
 						vecs_per_type);
 		priv->rx_cfg.max_queues = min_t(int, priv->rx_cfg.max_queues,
 {
 	int i;
-	/* Free the irqs */
+	if (priv->msix_vectors) {
-	for (i = 0; i < priv->num_ntfy_blks; i++) {
+		/* Free the irqs */
-		struct gve_notify_block *block = &priv->ntfy_blocks[i];
+		for (i = 0; i < priv->num_ntfy_blks; i++) {
-		int msix_idx = i;
+			struct gve_notify_block *block = &priv->ntfy_blocks[i];
+			int msix_idx = i;
-		irq_set_affinity_hint(priv->msix_vectors[msix_idx].vector,
+			irq_set_affinity_hint(priv->msix_vectors[msix_idx].vector,
-				      NULL);
+					      NULL);
-		free_irq(priv->msix_vectors[msix_idx].vector, block);
+			free_irq(priv->msix_vectors[msix_idx].vector, block);
+		}
+		free_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, priv);
 	}
 	dma_free_coherent(&priv->pdev->dev,
 			  priv->num_ntfy_blks * sizeof(*priv->ntfy_blocks),
 			  priv->ntfy_blocks, priv->ntfy_block_bus);
 	priv->ntfy_blocks = NULL;
-	free_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, priv);
 	pci_disable_msix(priv->pdev);
 	kvfree(priv->msix_vectors);
 	priv->msix_vectors = NULL;

drivers/net/ethernet/google/gve/gve_tx.c+7−3

@@ -212,10 +212,11 @@ static int gve_tx_alloc_ring(struct gve_priv *priv, int idx) · 211 unmodified lines
212	tx->dev = &priv->pdev->dev;	212	tx->dev = &priv->pdev->dev;
213	if (!tx->raw_addressing) {	213	if (!tx->raw_addressing) {
214	tx->tx_fifo.qpl = gve_assign_tx_qpl(priv);	214	tx->tx_fifo.qpl = gve_assign_tx_qpl(priv);
215		215	if (!tx->tx_fifo.qpl)
		216	goto abort_with_desc;
216	/* map Tx FIFO */	217	/* map Tx FIFO */
217	if (gve_tx_fifo_init(priv, &tx->tx_fifo))	218	if (gve_tx_fifo_init(priv, &tx->tx_fifo))
218	goto abort_with_desc;	219	goto abort_with_qpl;
219	}	220	}
220		221
221	tx->q_resources =	222	tx->q_resources =
@@ -236,6 +237,9 @@ static int gve_tx_alloc_ring(struct gve_priv *priv, int idx) · 14 unmodified lines
236	abort_with_fifo:	237	abort_with_fifo:
237	if (!tx->raw_addressing)	238	if (!tx->raw_addressing)
238	gve_tx_fifo_release(priv, &tx->tx_fifo);	239	gve_tx_fifo_release(priv, &tx->tx_fifo);
		240	abort_with_qpl:
		241	if (!tx->raw_addressing)
		242	gve_unassign_qpl(priv, tx->tx_fifo.qpl->id);
239	abort_with_desc:	243	abort_with_desc:
240	dma_free_coherent(hdev, bytes, tx->desc, tx->bus);	244	dma_free_coherent(hdev, bytes, tx->desc, tx->bus);
241	tx->desc = NULL;	245	tx->desc = NULL;
@@ -589,7 +593,7 @@ netdev_tx_t gve_tx(struct sk_buff skb, struct net_device dev) · 347 unmodified lines
589	struct gve_tx_ring *tx;	593	struct gve_tx_ring *tx;
590	int nsegs;	594	int nsegs;
591		595
592	WARN(skb_get_queue_mapping(skb) > priv->tx_cfg.num_queues,	596	WARN(skb_get_queue_mapping(skb) >= priv->tx_cfg.num_queues,
593	"skb queue index out of range");	597	"skb queue index out of range");
594	tx = &priv->tx[skb_get_queue_mapping(skb)];	598	tx = &priv->tx[skb_get_queue_mapping(skb)];
595	if (unlikely(gve_maybe_stop_tx(tx, skb))) {	599	if (unlikely(gve_maybe_stop_tx(tx, skb))) {

drivers/net/ethernet/hisilicon/hns/hns_ethtool.c+3−3

@@ -192,7 +192,7 @@ static int hns_nic_get_link_ksettings(struct net_device *net_dev, · 191 unmodified lines
192	}	192	}
193		193
194	/**	194	/**
195	*hns_nic_set_link_settings - implement ethtool set link ksettings	195	*hns_nic_set_link_ksettings - implement ethtool set link ksettings
196	*@net_dev: net_device	196	*@net_dev: net_device
197	*@cmd: ethtool_link_ksettings	197	*@cmd: ethtool_link_ksettings
198	*retuen 0 - success , negative --fail	198	*retuen 0 - success , negative --fail
@@ -827,7 +827,7 @@ hns_get_channels(struct net_device net_dev, struct ethtool_channels ch) · 628 unmodified lines
827	}	827	}
828		828
829	/**	829	/**
830	* get_ethtool_stats - get detail statistics.	830	* hns_get_ethtool_stats - get detail statistics.
831	* @netdev: net device	831	* @netdev: net device
832	* @stats: statistics info.	832	* @stats: statistics info.
833	* @data: statistics data.	833	* @data: statistics data.
@@ -885,7 +885,7 @@ static void hns_get_ethtool_stats(struct net_device *netdev, · 51 unmodified lines
885	}	885	}
886		886
887	/**	887	/**
888	* get_strings: Return a set of strings that describe the requested objects	888	* hns_get_strings: Return a set of strings that describe the requested objects
889	* @netdev: net device	889	* @netdev: net device
890	* @stringset: string set ID.	890	* @stringset: string set ID.
891	* @data: objects data.	891	* @data: objects data.

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c+51−59

 	struct hnae3_ae_dev *ae_dev = pci_get_drvdata(priv->ae_handle->pdev);
 	struct hns3_enet_coalesce *tx_coal = &tqp_vector->tx_group.coal;
 	struct hns3_enet_coalesce *rx_coal = &tqp_vector->rx_group.coal;
+	struct hns3_enet_coalesce *ptx_coal = &priv->tx_coal;
+	struct hns3_enet_coalesce *prx_coal = &priv->rx_coal;
-	/* initialize the configuration for interrupt coalescing.
+	tx_coal->adapt_enable = ptx_coal->adapt_enable;
-	 * 1. GL (Interrupt Gap Limiter)
+	rx_coal->adapt_enable = prx_coal->adapt_enable;
-	 * 2. RL (Interrupt Rate Limiter)
-	 * 3. QL (Interrupt Quantity Limiter)
-	 *
-	 * Default: enable interrupt coalescing self-adaptive and GL
-	 */
-	tx_coal->adapt_enable = 1;
-	rx_coal->adapt_enable = 1;
-	tx_coal->int_gl = HNS3_INT_GL_50K;
+	tx_coal->int_gl = ptx_coal->int_gl;
-	rx_coal->int_gl = HNS3_INT_GL_50K;
+	rx_coal->int_gl = prx_coal->int_gl;
-	rx_coal->flow_level = HNS3_FLOW_LOW;
+	rx_coal->flow_level = prx_coal->flow_level;
-	tx_coal->flow_level = HNS3_FLOW_LOW;
+	tx_coal->flow_level = ptx_coal->flow_level;
 	/* device version above V3(include V3), GL can configure 1us
 	 * unit, so uses 1us unit.
 		rx_coal->ql_enable = 1;
 		tx_coal->int_ql_max = ae_dev->dev_specs.int_ql_max;
 		rx_coal->int_ql_max = ae_dev->dev_specs.int_ql_max;
-		tx_coal->int_ql = HNS3_INT_QL_DEFAULT_CFG;
+		tx_coal->int_ql = ptx_coal->int_ql;
-		rx_coal->int_ql = HNS3_INT_QL_DEFAULT_CFG;
+		rx_coal->int_ql = prx_coal->int_ql;
 	}
 }
 	      l4.udp->dest == htons(4790))))
 		return false;
-	skb_checksum_help(skb);
 	return true;
 }
 			/* the stack computes the IP header already,
 			 * driver calculate l4 checksum when not TSO.
 			 */
-			skb_checksum_help(skb);
+			return skb_checksum_help(skb);
-			return 0;
 		}
 		hns3_set_outer_l2l3l4(skb, ol4_proto, ol_type_vlan_len_msec);
 		break;
 	case IPPROTO_UDP:
 		if (hns3_tunnel_csum_bug(skb))
-			break;
+			return skb_checksum_help(skb);
 		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);
 		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4T_S,
 		/* the stack computes the IP header already,
 		 * driver calculate l4 checksum when not TSO.
 		 */
-		skb_checksum_help(skb);
+		return skb_checksum_help(skb);
-		return 0;
 	}
 	return 0;
 	return ret;
 }
+static void hns3_nic_init_coal_cfg(struct hns3_nic_priv *priv)
+{
+	struct hnae3_ae_dev *ae_dev = pci_get_drvdata(priv->ae_handle->pdev);
+	struct hns3_enet_coalesce *tx_coal = &priv->tx_coal;
+	struct hns3_enet_coalesce *rx_coal = &priv->rx_coal;
+	/* initialize the configuration for interrupt coalescing.
+	 * 1. GL (Interrupt Gap Limiter)
+	 * 2. RL (Interrupt Rate Limiter)
+	 * 3. QL (Interrupt Quantity Limiter)
+	 *
+	 * Default: enable interrupt coalescing self-adaptive and GL
+	 */
+	tx_coal->adapt_enable = 1;
+	rx_coal->adapt_enable = 1;
+	tx_coal->int_gl = HNS3_INT_GL_50K;
+	rx_coal->int_gl = HNS3_INT_GL_50K;
+	rx_coal->flow_level = HNS3_FLOW_LOW;
+	tx_coal->flow_level = HNS3_FLOW_LOW;
+	if (ae_dev->dev_specs.int_ql_max) {
+		tx_coal->int_ql = HNS3_INT_QL_DEFAULT_CFG;
+		rx_coal->int_ql = HNS3_INT_QL_DEFAULT_CFG;
+	}
+}
 static int hns3_nic_alloc_vector_data(struct hns3_nic_priv *priv)
 {
 	struct hnae3_handle *h = priv->ae_handle;
 		goto out_get_ring_cfg;
 	}
+	hns3_nic_init_coal_cfg(priv);
 	ret = hns3_nic_alloc_vector_data(priv);
 	if (ret) {
 		ret = -ENOMEM;
 	if (ret)
 		goto out_init_phy;
-	ret = register_netdev(netdev);
-	if (ret) {
-		dev_err(priv->dev, "probe register netdev fail!\n");
-		goto out_reg_netdev_fail;
-	}
 	/* the device can work without cpu rmap, only aRFS needs it */
 	ret = hns3_set_rx_cpu_rmap(netdev);
 	if (ret)
 	if (ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V3)
 		set_bit(HNAE3_PFLAG_LIMIT_PROMISC, &handle->supported_pflags);
+	ret = register_netdev(netdev);
+	if (ret) {
+		dev_err(priv->dev, "probe register netdev fail!\n");
+		goto out_reg_netdev_fail;
+	}
 	if (netif_msg_drv(handle))
 		hns3_info_show(priv);
 	return ret;
+out_reg_netdev_fail:
+	hns3_dbg_uninit(handle);
 out_client_start:
 	hns3_free_rx_cpu_rmap(netdev);
 	hns3_nic_uninit_irq(priv);
 out_init_irq_fail:
-	unregister_netdev(netdev);
-out_reg_netdev_fail:
 	hns3_uninit_phy(netdev);
 out_init_phy:
 	hns3_uninit_all_ring(priv);
 	return 0;
 }
-static void hns3_store_coal(struct hns3_nic_priv *priv)
-{
-	/* ethtool only support setting and querying one coal
-	 * configuration for now, so save the vector 0' coal
-	 * configuration here in order to restore it.
-	 */
-	memcpy(&priv->tx_coal, &priv->tqp_vector[0].tx_group.coal,
-	       sizeof(struct hns3_enet_coalesce));
-	memcpy(&priv->rx_coal, &priv->tqp_vector[0].rx_group.coal,
-	       sizeof(struct hns3_enet_coalesce));
-}
-static void hns3_restore_coal(struct hns3_nic_priv *priv)
-{
-	u16 vector_num = priv->vector_num;
-	int i;
-	for (i = 0; i < vector_num; i++) {
-		memcpy(&priv->tqp_vector[i].tx_group.coal, &priv->tx_coal,
-		       sizeof(struct hns3_enet_coalesce));
-		memcpy(&priv->tqp_vector[i].rx_group.coal, &priv->rx_coal,
-		       sizeof(struct hns3_enet_coalesce));
-	}
-}
 static int hns3_reset_notify_down_enet(struct hnae3_handle *handle)
 {
 	struct hnae3_knic_private_info *kinfo = &handle->kinfo;
 	if (ret)
 		goto err_put_ring;
-	hns3_restore_coal(priv);
 	ret = hns3_nic_init_vector_data(priv);
 	if (ret)
 		goto err_dealloc_vector;
 	hns3_nic_uninit_vector_data(priv);
-	hns3_store_coal(priv);
 	hns3_nic_dealloc_vector_data(priv);
 	hns3_uninit_all_ring(priv);

drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c+23−41

 		h->ae_algo->ops->get_channels(h, ch);
 }
-static int hns3_get_coalesce_per_queue(struct net_device *netdev, u32 queue,
+static int hns3_get_coalesce(struct net_device *netdev,
-				       struct ethtool_coalesce *cmd)
+			     struct ethtool_coalesce *cmd)
 {
-	struct hns3_enet_tqp_vector *tx_vector, *rx_vector;
 	struct hns3_nic_priv *priv = netdev_priv(netdev);
+	struct hns3_enet_coalesce *tx_coal = &priv->tx_coal;
+	struct hns3_enet_coalesce *rx_coal = &priv->rx_coal;
 	struct hnae3_handle *h = priv->ae_handle;
-	u16 queue_num = h->kinfo.num_tqps;
 	if (hns3_nic_resetting(netdev))
 		return -EBUSY;
-	if (queue >= queue_num) {
+	cmd->use_adaptive_tx_coalesce = tx_coal->adapt_enable;
-		netdev_err(netdev,
+	cmd->use_adaptive_rx_coalesce = rx_coal->adapt_enable;
-			   "Invalid queue value %u! Queue max id=%u\n",
-			   queue, queue_num - 1);
-		return -EINVAL;
-	}
-	tx_vector = priv->ring[queue].tqp_vector;
-	rx_vector = priv->ring[queue_num + queue].tqp_vector;
-	cmd->use_adaptive_tx_coalesce =
+	cmd->tx_coalesce_usecs = tx_coal->int_gl;
-			tx_vector->tx_group.coal.adapt_enable;
+	cmd->rx_coalesce_usecs = rx_coal->int_gl;
-	cmd->use_adaptive_rx_coalesce =
-			rx_vector->rx_group.coal.adapt_enable;
-	cmd->tx_coalesce_usecs = tx_vector->tx_group.coal.int_gl;
-	cmd->rx_coalesce_usecs = rx_vector->rx_group.coal.int_gl;
 	cmd->tx_coalesce_usecs_high = h->kinfo.int_rl_setting;
 	cmd->rx_coalesce_usecs_high = h->kinfo.int_rl_setting;
-	cmd->tx_max_coalesced_frames = tx_vector->tx_group.coal.int_ql;
+	cmd->tx_max_coalesced_frames = tx_coal->int_ql;
-	cmd->rx_max_coalesced_frames = rx_vector->rx_group.coal.int_ql;
+	cmd->rx_max_coalesced_frames = rx_coal->int_ql;
 	return 0;
 }
-static int hns3_get_coalesce(struct net_device *netdev,
-			     struct ethtool_coalesce *cmd)
-{
-	return hns3_get_coalesce_per_queue(netdev, 0, cmd);
-}
 static int hns3_check_gl_coalesce_para(struct net_device *netdev,
 				       struct ethtool_coalesce *cmd)
 {
 		return ret;
 	}
-	ret = hns3_check_ql_coalesce_param(netdev, cmd);
+	return hns3_check_ql_coalesce_param(netdev, cmd);
-	if (ret)
-		return ret;
-	if (cmd->use_adaptive_tx_coalesce == 1 ||
-	    cmd->use_adaptive_rx_coalesce == 1) {
-		netdev_info(netdev,
-			    "adaptive-tx=%u and adaptive-rx=%u, tx_usecs or rx_usecs will changed dynamically.\n",
-			    cmd->use_adaptive_tx_coalesce,
-			    cmd->use_adaptive_rx_coalesce);
-	}
-	return 0;
 }
 static void hns3_set_coalesce_per_queue(struct net_device *netdev,
 			     struct ethtool_coalesce *cmd)
 {
 	struct hnae3_handle *h = hns3_get_handle(netdev);
+	struct hns3_nic_priv *priv = netdev_priv(netdev);
+	struct hns3_enet_coalesce *tx_coal = &priv->tx_coal;
+	struct hns3_enet_coalesce *rx_coal = &priv->rx_coal;
 	u16 queue_num = h->kinfo.num_tqps;
 	int ret;
 	int i;
 	h->kinfo.int_rl_setting =
 		hns3_rl_round_down(cmd->rx_coalesce_usecs_high);
+	tx_coal->adapt_enable = cmd->use_adaptive_tx_coalesce;
+	rx_coal->adapt_enable = cmd->use_adaptive_rx_coalesce;
+	tx_coal->int_gl = cmd->tx_coalesce_usecs;
+	rx_coal->int_gl = cmd->rx_coalesce_usecs;
+	tx_coal->int_ql = cmd->tx_max_coalesced_frames;
+	rx_coal->int_ql = cmd->rx_max_coalesced_frames;
 	for (i = 0; i < queue_num; i++)
 		hns3_set_coalesce_per_queue(netdev, cmd, i);

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c+3−1

 	unsigned int flag;
 	int ret = 0;
-	memset(&resp_msg, 0, sizeof(resp_msg));
 	/* handle all the mailbox requests in the queue */
 	while (!hclge_cmd_crq_empty(&hdev->hw)) {
 		if (test_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state)) {
 		trace_hclge_pf_mbx_get(hdev, req);
+		/* clear the resp_msg before processing every mailbox message */
+		memset(&resp_msg, 0, sizeof(resp_msg));
 		switch (req->msg.code) {
 		case HCLGE_MBX_MAP_RING_TO_VECTOR:
 			ret = hclge_map_unmap_ring_to_vf_vector(vport, true,

drivers/net/ethernet/intel/i40e/i40e_txrx.c+6−1

 	case XDP_TX:
 		xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index];
 		result = i40e_xmit_xdp_tx_ring(xdp, xdp_ring);
+		if (result == I40E_XDP_CONSUMED)
+			goto out_failure;
 		break;
 	case XDP_REDIRECT:
 		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);
-		result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED;
+		if (err)
+			goto out_failure;
+		result = I40E_XDP_REDIR;
 		break;
 	default:
 		bpf_warn_invalid_xdp_action(act);
 		fallthrough;
 	case XDP_ABORTED:
+out_failure:
 		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);
 		fallthrough; /* handle aborts by dropping packet */
 	case XDP_DROP:

drivers/net/ethernet/intel/i40e/i40e_xsk.c+6−2

 	if (likely(act == XDP_REDIRECT)) {
 		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);
-		result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED;
+		if (err)
+			goto out_failure;
 		rcu_read_unlock();
-		return result;
+		return I40E_XDP_REDIR;
 	}
 	switch (act) {
 	case XDP_TX:
 		xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index];
 		result = i40e_xmit_xdp_tx_ring(xdp, xdp_ring);
+		if (result == I40E_XDP_CONSUMED)
+			goto out_failure;
 		break;
 	default:
 		bpf_warn_invalid_xdp_action(act);
 		fallthrough;
 	case XDP_ABORTED:
+out_failure:
 		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);
 		fallthrough; /* handle aborts by dropping packet */
 	case XDP_DROP:

drivers/net/ethernet/intel/ice/ice.h+5−3

 	struct ice_tc_cfg tc_cfg;
 	struct bpf_prog *xdp_prog;
 	struct ice_ring **xdp_rings;	 /* XDP ring array */
+	unsigned long *af_xdp_zc_qps;	 /* tracks AF_XDP ZC enabled qps */
 	u16 num_xdp_txq;		 /* Used XDP queues */
 	u8 xdp_mapping_mode;		 /* ICE_MAP_MODE_[CONTIG|SCATTER] */
  */
 static inline struct xsk_buff_pool *ice_xsk_pool(struct ice_ring *ring)
 {
+	struct ice_vsi *vsi = ring->vsi;
 	u16 qid = ring->q_index;
 	if (ice_ring_is_xdp(ring))
-		qid -= ring->vsi->num_xdp_txq;
+		qid -= vsi->num_xdp_txq;
-	if (!ice_is_xdp_ena_vsi(ring->vsi))
+	if (!ice_is_xdp_ena_vsi(vsi) || !test_bit(qid, vsi->af_xdp_zc_qps))
 		return NULL;
-	return xsk_get_pool_from_qid(ring->vsi->netdev, qid);
+	return xsk_get_pool_from_qid(vsi->netdev, qid);
 }
 /**

drivers/net/ethernet/intel/ice/ice_ethtool.c+6−45

@@ -1773,49 +1773,6 @@ ice_phy_type_to_ethtool(struct net_device *netdev, · 1772 unmodified lines
1773	ice_ethtool_advertise_link_mode(ICE_AQ_LINK_SPEED_100GB,	1773	ice_ethtool_advertise_link_mode(ICE_AQ_LINK_SPEED_100GB,
1774	100000baseKR4_Full);	1774	100000baseKR4_Full);
1775	}	1775	}
1776
1777	/* Autoneg PHY types */
1778	if (phy_types_low & ICE_PHY_TYPE_LOW_100BASE_TX \|\|
1779	phy_types_low & ICE_PHY_TYPE_LOW_1000BASE_T \|\|
1780	phy_types_low & ICE_PHY_TYPE_LOW_1000BASE_KX \|\|
1781	phy_types_low & ICE_PHY_TYPE_LOW_2500BASE_T \|\|
1782	phy_types_low & ICE_PHY_TYPE_LOW_2500BASE_KX \|\|
1783	phy_types_low & ICE_PHY_TYPE_LOW_5GBASE_T \|\|
1784	phy_types_low & ICE_PHY_TYPE_LOW_5GBASE_KR \|\|
1785	phy_types_low & ICE_PHY_TYPE_LOW_10GBASE_T \|\|
1786	phy_types_low & ICE_PHY_TYPE_LOW_10GBASE_KR_CR1 \|\|
1787	phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_T \|\|
1788	phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_CR \|\|
1789	phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_CR_S \|\|
1790	phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_CR1 \|\|
1791	phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_KR \|\|
1792	phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_KR_S \|\|
1793	phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_KR1 \|\|
1794	phy_types_low & ICE_PHY_TYPE_LOW_40GBASE_CR4 \|\|
1795	phy_types_low & ICE_PHY_TYPE_LOW_40GBASE_KR4) {
1796	ethtool_link_ksettings_add_link_mode(ks, supported,
1797	Autoneg);
1798	ethtool_link_ksettings_add_link_mode(ks, advertising,
1799	Autoneg);
1800	}
1801	if (phy_types_low & ICE_PHY_TYPE_LOW_50GBASE_CR2 \|\|
1802	phy_types_low & ICE_PHY_TYPE_LOW_50GBASE_KR2 \|\|
1803	phy_types_low & ICE_PHY_TYPE_LOW_50GBASE_CP \|\|
1804	phy_types_low & ICE_PHY_TYPE_LOW_50GBASE_KR_PAM4) {
1805	ethtool_link_ksettings_add_link_mode(ks, supported,
1806	Autoneg);
1807	ethtool_link_ksettings_add_link_mode(ks, advertising,
1808	Autoneg);
1809	}
1810	if (phy_types_low & ICE_PHY_TYPE_LOW_100GBASE_CR4 \|\|
1811	phy_types_low & ICE_PHY_TYPE_LOW_100GBASE_KR4 \|\|
1812	phy_types_low & ICE_PHY_TYPE_LOW_100GBASE_KR_PAM4 \|\|
1813	phy_types_low & ICE_PHY_TYPE_LOW_100GBASE_CP2) {
1814	ethtool_link_ksettings_add_link_mode(ks, supported,
1815	Autoneg);
1816	ethtool_link_ksettings_add_link_mode(ks, advertising,
1817	Autoneg);
1818	}
1819	}	1776	}
1820		1777
1821	#define TEST_SET_BITS_TIMEOUT 50	1778	#define TEST_SET_BITS_TIMEOUT 50
@@ -1972,9 +1929,7 @@ ice_get_link_ksettings(struct net_device *netdev, · 150 unmodified lines
1972	ks->base.port = PORT_TP;	1929	ks->base.port = PORT_TP;
1973	break;	1930	break;
1974	case ICE_MEDIA_BACKPLANE:	1931	case ICE_MEDIA_BACKPLANE:
1975	ethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);
1976	ethtool_link_ksettings_add_link_mode(ks, supported, Backplane);	1932	ethtool_link_ksettings_add_link_mode(ks, supported, Backplane);
1977	ethtool_link_ksettings_add_link_mode(ks, advertising, Autoneg);
1978	ethtool_link_ksettings_add_link_mode(ks, advertising,	1933	ethtool_link_ksettings_add_link_mode(ks, advertising,
1979	Backplane);	1934	Backplane);
1980	ks->base.port = PORT_NONE;	1935	ks->base.port = PORT_NONE;
@@ -2049,6 +2004,12 @@ ice_get_link_ksettings(struct net_device *netdev, · 68 unmodified lines
2049	if (caps->link_fec_options & ICE_AQC_PHY_FEC_25G_RS_CLAUSE91_EN)	2004	if (caps->link_fec_options & ICE_AQC_PHY_FEC_25G_RS_CLAUSE91_EN)
2050	ethtool_link_ksettings_add_link_mode(ks, supported, FEC_RS);	2005	ethtool_link_ksettings_add_link_mode(ks, supported, FEC_RS);
2051		2006
		2007	/* Set supported and advertised autoneg */
		2008	if (ice_is_phy_caps_an_enabled(caps)) {
		2009	ethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);
		2010	ethtool_link_ksettings_add_link_mode(ks, advertising, Autoneg);
		2011	}
		2012
2052	done:	2013	done:
2053	kfree(caps);	2014	kfree(caps);
2054	return err;	2015	return err;

drivers/net/ethernet/intel/ice/ice_hw_autogen.h+1−0

@@ -31,6 +31,7 @@ · 30 unmodified lines
31	#define PF_FW_ATQLEN_ATQOVFL_M BIT(29)	31	#define PF_FW_ATQLEN_ATQOVFL_M BIT(29)
32	#define PF_FW_ATQLEN_ATQCRIT_M BIT(30)	32	#define PF_FW_ATQLEN_ATQCRIT_M BIT(30)
33	#define VF_MBX_ARQLEN(_VF) (0x0022BC00 + ((_VF) * 4))	33	#define VF_MBX_ARQLEN(_VF) (0x0022BC00 + ((_VF) * 4))
		34	#define VF_MBX_ATQLEN(_VF) (0x0022A800 + ((_VF) * 4))
34	#define PF_FW_ATQLEN_ATQENABLE_M BIT(31)	35	#define PF_FW_ATQLEN_ATQENABLE_M BIT(31)
35	#define PF_FW_ATQT 0x00080400	36	#define PF_FW_ATQT 0x00080400
36	#define PF_MBX_ARQBAH 0x0022E400	37	#define PF_MBX_ARQBAH 0x0022E400

drivers/net/ethernet/intel/ice/ice_lib.c+22−8

 	if (!vsi->q_vectors)
 		goto err_vectors;
+	vsi->af_xdp_zc_qps = bitmap_zalloc(max_t(int, vsi->alloc_txq, vsi->alloc_rxq), GFP_KERNEL);
+	if (!vsi->af_xdp_zc_qps)
+		goto err_zc_qps;
 	return 0;
+err_zc_qps:
+	devm_kfree(dev, vsi->q_vectors);
 err_vectors:
 	devm_kfree(dev, vsi->rxq_map);
 err_rxq_map:
 		break;
 	case ICE_VSI_VF:
 		vf = &pf->vf[vsi->vf_id];
+		if (vf->num_req_qs)
+			vf->num_vf_qs = vf->num_req_qs;
 		vsi->alloc_txq = vf->num_vf_qs;
 		vsi->alloc_rxq = vf->num_vf_qs;
 		/* pf->num_msix_per_vf includes (VF miscellaneous vector +
 	dev = ice_pf_to_dev(pf);
+	if (vsi->af_xdp_zc_qps) {
+		bitmap_free(vsi->af_xdp_zc_qps);
+		vsi->af_xdp_zc_qps = NULL;
+	}
 	/* free the ring and vector containers */
 	if (vsi->q_vectors) {
 		devm_kfree(dev, vsi->q_vectors);
  * ice_vsi_cfg_txqs - Configure the VSI for Tx
  * @vsi: the VSI being configured
  * @rings: Tx ring array to be configured
+ * @count: number of Tx ring array elements
  *
  * Return 0 on success and a negative value on error
  * Configure the Tx VSI for operation.
  */
 static int
-ice_vsi_cfg_txqs(struct ice_vsi *vsi, struct ice_ring **rings)
+ice_vsi_cfg_txqs(struct ice_vsi *vsi, struct ice_ring **rings, u16 count)
 {
 	struct ice_aqc_add_tx_qgrp *qg_buf;
 	u16 q_idx = 0;
 	qg_buf->num_txqs = 1;
-	for (q_idx = 0; q_idx < vsi->num_txq; q_idx++) {
+	for (q_idx = 0; q_idx < count; q_idx++) {
 		err = ice_vsi_cfg_txq(vsi, rings[q_idx], qg_buf);
 		if (err)
 			goto err_cfg_txqs;
  */
 int ice_vsi_cfg_lan_txqs(struct ice_vsi *vsi)
 {
-	return ice_vsi_cfg_txqs(vsi, vsi->tx_rings);
+	return ice_vsi_cfg_txqs(vsi, vsi->tx_rings, vsi->num_txq);
 }
 /**
 	int ret;
 	int i;
-	ret = ice_vsi_cfg_txqs(vsi, vsi->xdp_rings);
+	ret = ice_vsi_cfg_txqs(vsi, vsi->xdp_rings, vsi->num_xdp_txq);
 	if (ret)
 		return ret;
  * @rst_src: reset source
  * @rel_vmvf_num: Relative ID of VF/VM
  * @rings: Tx ring array to be stopped
+ * @count: number of Tx ring array elements
  */
 static int
 ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,
-		      u16 rel_vmvf_num, struct ice_ring **rings)
+		      u16 rel_vmvf_num, struct ice_ring **rings, u16 count)
 {
 	u16 q_idx;
 	if (vsi->num_txq > ICE_LAN_TXQ_MAX_QDIS)
 		return -EINVAL;
-	for (q_idx = 0; q_idx < vsi->num_txq; q_idx++) {
+	for (q_idx = 0; q_idx < count; q_idx++) {
 		struct ice_txq_meta txq_meta = { };
 		int status;
 ice_vsi_stop_lan_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,
 			  u16 rel_vmvf_num)
 {
-	return ice_vsi_stop_tx_rings(vsi, rst_src, rel_vmvf_num, vsi->tx_rings);
+	return ice_vsi_stop_tx_rings(vsi, rst_src, rel_vmvf_num, vsi->tx_rings, vsi->num_txq);
 }
 /**
  */
 int ice_vsi_stop_xdp_tx_rings(struct ice_vsi *vsi)
 {
-	return ice_vsi_stop_tx_rings(vsi, ICE_NO_RESET, 0, vsi->xdp_rings);
+	return ice_vsi_stop_tx_rings(vsi, ICE_NO_RESET, 0, vsi->xdp_rings, vsi->num_xdp_txq);
 }
 /**

drivers/net/ethernet/intel/ice/ice_main.c+15−0

@@ -2555,6 +2555,20 @@ ice_xdp_setup_prog(struct ice_vsi vsi, struct bpf_prog prog, · 2554 unmodified lines
2555	return (ret \|\| xdp_ring_err) ? -ENOMEM : 0;	2555	return (ret \|\| xdp_ring_err) ? -ENOMEM : 0;
2556	}	2556	}
2557		2557
		2558	/**
		2559	* ice_xdp_safe_mode - XDP handler for safe mode
		2560	* @dev: netdevice
		2561	* @xdp: XDP command
		2562	*/
		2563	static int ice_xdp_safe_mode(struct net_device __always_unused *dev,
		2564	struct netdev_bpf *xdp)
		2565	{
		2566	NL_SET_ERR_MSG_MOD(xdp->extack,
		2567	"Please provide working DDP firmware package in order to use XDP\n"
		2568	"Refer to Documentation/networking/device_drivers/ethernet/intel/ice.rst");
		2569	return -EOPNOTSUPP;
		2570	}
		2571
2558	/**	2572	/**
2559	* ice_xdp - implements XDP handler	2573	* ice_xdp - implements XDP handler
2560	* @dev: netdevice	2574	* @dev: netdevice
@@ -6937,6 +6951,7 @@ static const struct net_device_ops ice_netdev_safe_mode_ops = { · 4376 unmodified lines
6937	.ndo_change_mtu = ice_change_mtu,	6951	.ndo_change_mtu = ice_change_mtu,
6938	.ndo_get_stats64 = ice_get_stats64,	6952	.ndo_get_stats64 = ice_get_stats64,
6939	.ndo_tx_timeout = ice_tx_timeout,	6953	.ndo_tx_timeout = ice_tx_timeout,
		6954	.ndo_bpf = ice_xdp_safe_mode,
6940	};	6955	};
6941		6956
6942	static const struct net_device_ops ice_netdev_ops = {	6957	static const struct net_device_ops ice_netdev_ops = {

drivers/net/ethernet/intel/ice/ice_txrx.c+13−4

 	    struct bpf_prog *xdp_prog)
 {
 	struct ice_ring *xdp_ring;
-	int err;
+	int err, result;
 	u32 act;
 	act = bpf_prog_run_xdp(xdp_prog, xdp);
 		return ICE_XDP_PASS;
 	case XDP_TX:
 		xdp_ring = rx_ring->vsi->xdp_rings[smp_processor_id()];
-		return ice_xmit_xdp_buff(xdp, xdp_ring);
+		result = ice_xmit_xdp_buff(xdp, xdp_ring);
+		if (result == ICE_XDP_CONSUMED)
+			goto out_failure;
+		return result;
 	case XDP_REDIRECT:
 		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);
-		return !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED;
+		if (err)
+			goto out_failure;
+		return ICE_XDP_REDIR;
 	default:
 		bpf_warn_invalid_xdp_action(act);
 		fallthrough;
 	case XDP_ABORTED:
+out_failure:
 		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);
 		fallthrough;
 	case XDP_DROP:
 	struct ice_tx_offload_params offload = { 0 };
 	struct ice_vsi *vsi = tx_ring->vsi;
 	struct ice_tx_buf *first;
+	struct ethhdr *eth;
 	unsigned int count;
 	int tso, csum;
 		goto out_drop;
 	/* allow CONTROL frames egress from main VSI if FW LLDP disabled */
-	if (unlikely(skb->priority == TC_PRIO_CONTROL &&
+	eth = (struct ethhdr *)skb_mac_header(skb);
+	if (unlikely((skb->priority == TC_PRIO_CONTROL ||
+		      eth->h_proto == htons(ETH_P_LLDP)) &&
 		     vsi->type == ICE_VSI_PF &&
 		     vsi->port_info->qos_cfg.is_sw_lldp))
 		offload.cd_qw1 |= (u64)(ICE_TX_DESC_DTYPE_CTX |

drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c+13−6

@@ -713,13 +713,15 @@ static void ice_trigger_vf_reset(struct ice_vf *vf, bool is_vflr, bool is_pfr) · 712 unmodified lines
713	*/	713	*/
714	clear_bit(ICE_VF_STATE_INIT, vf->vf_states);	714	clear_bit(ICE_VF_STATE_INIT, vf->vf_states);
715		715
716	/* VF_MBX_ARQLEN is cleared by PFR, so the driver needs to clear it	716	/* VF_MBX_ARQLEN and VF_MBX_ATQLEN are cleared by PFR, so the driver
717	* in the case of VFR. If this is done for PFR, it can mess up VF	717	* needs to clear them in the case of VFR/VFLR. If this is done for
718	* resets because the VF driver may already have started cleanup	718	* PFR, it can mess up VF resets because the VF driver may already
719	* by the time we get here.	719	* have started cleanup by the time we get here.
720	*/	720	*/
721	if (!is_pfr)	721	if (!is_pfr) {
722	wr32(hw, VF_MBX_ARQLEN(vf->vf_id), 0);	722	wr32(hw, VF_MBX_ARQLEN(vf->vf_id), 0);
		723	wr32(hw, VF_MBX_ATQLEN(vf->vf_id), 0);
		724	}
723		725
724	/* In the case of a VFLR, the HW has already reset the VF and we	726	/* In the case of a VFLR, the HW has already reset the VF and we
725	* just need to clean up, so don't hit the VFRTRIG register.	727	* just need to clean up, so don't hit the VFRTRIG register.
@@ -1698,7 +1700,12 @@ bool ice_reset_vf(struct ice_vf *vf, bool is_vflr) · 972 unmodified lines
1698	ice_vf_ctrl_vsi_release(vf);	1700	ice_vf_ctrl_vsi_release(vf);
1699		1701
1700	ice_vf_pre_vsi_rebuild(vf);	1702	ice_vf_pre_vsi_rebuild(vf);
1701	ice_vf_rebuild_vsi_with_release(vf);	1703
		1704	if (ice_vf_rebuild_vsi_with_release(vf)) {
		1705	dev_err(dev, "Failed to release and setup the VF%u's VSI\n", vf->vf_id);
		1706	return false;
		1707	}
		1708
1702	ice_vf_post_vsi_rebuild(vf);	1709	ice_vf_post_vsi_rebuild(vf);
1703		1710
1704	/* if the VF has been reset allow it to come up again */	1711	/* if the VF has been reset allow it to come up again */

drivers/net/ethernet/intel/ice/ice_xsk.c+9−2

 	if (!pool)
 		return -EINVAL;
+	clear_bit(qid, vsi->af_xdp_zc_qps);
 	xsk_pool_dma_unmap(pool, ICE_RX_DMA_ATTR);
 	return 0;
 	if (err)
 		return err;
+	set_bit(qid, vsi->af_xdp_zc_qps);
 	return 0;
 }
 	if (likely(act == XDP_REDIRECT)) {
 		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);
-		result = !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED;
+		if (err)
+			goto out_failure;
 		rcu_read_unlock();
-		return result;
+		return ICE_XDP_REDIR;
 	}
 	switch (act) {
 	case XDP_TX:
 		xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->q_index];
 		result = ice_xmit_xdp_buff(xdp, xdp_ring);
+		if (result == ICE_XDP_CONSUMED)
+			goto out_failure;
 		break;
 	default:
 		bpf_warn_invalid_xdp_action(act);
 		fallthrough;
 	case XDP_ABORTED:
+out_failure:
 		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);
 		fallthrough;
 	case XDP_DROP:

drivers/net/ethernet/intel/igb/igb.h+1−1

@@ -749,7 +749,7 @@ void igb_ptp_rx_hang(struct igb_adapter *adapter); · 748 unmodified lines
749	void igb_ptp_tx_hang(struct igb_adapter *adapter);	749	void igb_ptp_tx_hang(struct igb_adapter *adapter);
750	void igb_ptp_rx_rgtstamp(struct igb_q_vector q_vector, struct sk_buff skb);	750	void igb_ptp_rx_rgtstamp(struct igb_q_vector q_vector, struct sk_buff skb);
751	int igb_ptp_rx_pktstamp(struct igb_q_vector q_vector, void va,	751	int igb_ptp_rx_pktstamp(struct igb_q_vector q_vector, void va,
752	struct sk_buff *skb);	752	ktime_t *timestamp);
753	int igb_ptp_set_ts_config(struct net_device netdev, struct ifreq ifr);	753	int igb_ptp_set_ts_config(struct net_device netdev, struct ifreq ifr);
754	int igb_ptp_get_ts_config(struct net_device netdev, struct ifreq ifr);	754	int igb_ptp_get_ts_config(struct net_device netdev, struct ifreq ifr);
755	void igb_set_flag_queue_pairs(struct igb_adapter *, const u32);	755	void igb_set_flag_queue_pairs(struct igb_adapter *, const u32);

drivers/net/ethernet/intel/igb/igb_main.c+32−23

 static struct sk_buff *igb_construct_skb(struct igb_ring *rx_ring,
 					 struct igb_rx_buffer *rx_buffer,
 					 struct xdp_buff *xdp,
-					 union e1000_adv_rx_desc *rx_desc)
+					 ktime_t timestamp)
 {
 #if (PAGE_SIZE < 8192)
 	unsigned int truesize = igb_rx_pg_size(rx_ring) / 2;
 	if (unlikely(!skb))
 		return NULL;
-	if (unlikely(igb_test_staterr(rx_desc, E1000_RXDADV_STAT_TSIP))) {
+	if (timestamp)
-		if (!igb_ptp_rx_pktstamp(rx_ring->q_vector, xdp->data, skb)) {
+		skb_hwtstamps(skb)->hwtstamp = timestamp;
-			xdp->data += IGB_TS_HDR_LEN;
-			size -= IGB_TS_HDR_LEN;
-		}
-	}
 	/* Determine available headroom for copy */
 	headlen = size;
 static struct sk_buff *igb_build_skb(struct igb_ring *rx_ring,
 				     struct igb_rx_buffer *rx_buffer,
 				     struct xdp_buff *xdp,
-				     union e1000_adv_rx_desc *rx_desc)
+				     ktime_t timestamp)
 {
 #if (PAGE_SIZE < 8192)
 	unsigned int truesize = igb_rx_pg_size(rx_ring) / 2;
 	if (metasize)
 		skb_metadata_set(skb, metasize);
-	/* pull timestamp out of packet data */
+	if (timestamp)
-	if (igb_test_staterr(rx_desc, E1000_RXDADV_STAT_TSIP)) {
+		skb_hwtstamps(skb)->hwtstamp = timestamp;
-		if (!igb_ptp_rx_pktstamp(rx_ring->q_vector, skb->data, skb))
-			__skb_pull(skb, IGB_TS_HDR_LEN);
-	}
 	/* update buffer offset */
 #if (PAGE_SIZE < 8192)
 		break;
 	case XDP_TX:
 		result = igb_xdp_xmit_back(adapter, xdp);
+		if (result == IGB_XDP_CONSUMED)
+			goto out_failure;
 		break;
 	case XDP_REDIRECT:
 		err = xdp_do_redirect(adapter->netdev, xdp, xdp_prog);
-		if (!err)
+		if (err)
-			result = IGB_XDP_REDIR;
+			goto out_failure;
-		else
+		result = IGB_XDP_REDIR;
-			result = IGB_XDP_CONSUMED;
 		break;
 	default:
 		bpf_warn_invalid_xdp_action(act);
 		fallthrough;
 	case XDP_ABORTED:
+out_failure:
 		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);
 		fallthrough;
 	case XDP_DROP:
 	while (likely(total_packets < budget)) {
 		union e1000_adv_rx_desc *rx_desc;
 		struct igb_rx_buffer *rx_buffer;
+		ktime_t timestamp = 0;
+		int pkt_offset = 0;
 		unsigned int size;
+		void *pktbuf;
 		/* return some buffers to hardware, one at a time is too slow */
 		if (cleaned_count >= IGB_RX_BUFFER_WRITE) {
 		dma_rmb();
 		rx_buffer = igb_get_rx_buffer(rx_ring, size, &rx_buf_pgcnt);
+		pktbuf = page_address(rx_buffer->page) + rx_buffer->page_offset;
+		/* pull rx packet timestamp if available and valid */
+		if (igb_test_staterr(rx_desc, E1000_RXDADV_STAT_TSIP)) {
+			int ts_hdr_len;
+			ts_hdr_len = igb_ptp_rx_pktstamp(rx_ring->q_vector,
+							 pktbuf, &timestamp);
+			pkt_offset += ts_hdr_len;
+			size -= ts_hdr_len;
+		}
 		/* retrieve a buffer from the ring */
 		if (!skb) {
-			unsigned int offset = igb_rx_offset(rx_ring);
+			unsigned char *hard_start = pktbuf - igb_rx_offset(rx_ring);
-			unsigned char *hard_start;
+			unsigned int offset = pkt_offset + igb_rx_offset(rx_ring);
-			hard_start = page_address(rx_buffer->page) +
-				     rx_buffer->page_offset - offset;
 			xdp_prepare_buff(&xdp, hard_start, offset, size, true);
 #if (PAGE_SIZE > 4096)
 			/* At larger PAGE_SIZE, frame_sz depend on len size */
 		} else if (skb)
 			igb_add_rx_frag(rx_ring, rx_buffer, skb, size);
 		else if (ring_uses_build_skb(rx_ring))
-			skb = igb_build_skb(rx_ring, rx_buffer, &xdp, rx_desc);
+			skb = igb_build_skb(rx_ring, rx_buffer, &xdp,
+					    timestamp);
 		else
 			skb = igb_construct_skb(rx_ring, rx_buffer,
-						&xdp, rx_desc);
+						&xdp, timestamp);
 		/* exit if we failed to retrieve a buffer */
 		if (!skb) {

drivers/net/ethernet/intel/igb/igb_ptp.c+10−13

 	dev_kfree_skb_any(skb);
 }
-#define IGB_RET_PTP_DISABLED 1
-#define IGB_RET_PTP_INVALID 2
 /**
  * igb_ptp_rx_pktstamp - retrieve Rx per packet timestamp
  * @q_vector: Pointer to interrupt specific structure
  * @va: Pointer to address containing Rx buffer
- * @skb: Buffer containing timestamp and packet
+ * @timestamp: Pointer where timestamp will be stored
  *
  * This function is meant to retrieve a timestamp from the first buffer of an
  * incoming frame.  The value is stored in little endian format starting on
  * byte 8
  *
- * Returns: 0 if success, nonzero if failure
+ * Returns: The timestamp header length or 0 if not available
  **/
 int igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, void *va,
-			struct sk_buff *skb)
+			ktime_t *timestamp)
 {
 	struct igb_adapter *adapter = q_vector->adapter;
+	struct skb_shared_hwtstamps ts;
 	__le64 *regval = (__le64 *)va;
 	int adjust = 0;
 	if (!(adapter->ptp_flags & IGB_PTP_ENABLED))
-		return IGB_RET_PTP_DISABLED;
+		return 0;
 	/* The timestamp is recorded in little endian format.
 	 * DWORD: 0        1        2        3
 	/* check reserved dwords are zero, be/le doesn't matter for zero */
 	if (regval[0])
-		return IGB_RET_PTP_INVALID;
+		return 0;
-	igb_ptp_systim_to_hwtstamp(adapter, skb_hwtstamps(skb),
+	igb_ptp_systim_to_hwtstamp(adapter, &ts, le64_to_cpu(regval[1]));
-				   le64_to_cpu(regval[1]));
 	/* adjust timestamp for the RX latency based on link speed */
 	if (adapter->hw.mac.type == e1000_i210) {
 			break;
 		}
 	}
-	skb_hwtstamps(skb)->hwtstamp =
-		ktime_sub_ns(skb_hwtstamps(skb)->hwtstamp, adjust);
-	return 0;
+	*timestamp = ktime_sub_ns(ts.hwtstamp, adjust);
+	return IGB_TS_HDR_LEN;
 }
 /**

drivers/net/ethernet/intel/igc/igc_main.c+5−6

 		break;
 	case XDP_TX:
 		if (igc_xdp_xmit_back(adapter, xdp) < 0)
-			res = IGC_XDP_CONSUMED;
+			goto out_failure;
-		else
+		res = IGC_XDP_TX;
-			res = IGC_XDP_TX;
 		break;
 	case XDP_REDIRECT:
 		if (xdp_do_redirect(adapter->netdev, xdp, prog) < 0)
-			res = IGC_XDP_CONSUMED;
+			goto out_failure;
-		else
+		res = IGC_XDP_REDIRECT;
-			res = IGC_XDP_REDIRECT;
 		break;
 	default:
 		bpf_warn_invalid_xdp_action(act);
 		fallthrough;
 	case XDP_ABORTED:
+out_failure:
 		trace_xdp_exception(adapter->netdev, prog, act);
 		fallthrough;
 	case XDP_DROP:

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c+8−8

 		break;
 	case XDP_TX:
 		xdpf = xdp_convert_buff_to_frame(xdp);
-		if (unlikely(!xdpf)) {
+		if (unlikely(!xdpf))
-			result = IXGBE_XDP_CONSUMED;
+			goto out_failure;
-			break;
-		}
 		result = ixgbe_xmit_xdp_ring(adapter, xdpf);
+		if (result == IXGBE_XDP_CONSUMED)
+			goto out_failure;
 		break;
 	case XDP_REDIRECT:
 		err = xdp_do_redirect(adapter->netdev, xdp, xdp_prog);
-		if (!err)
+		if (err)
-			result = IXGBE_XDP_REDIR;
+			goto out_failure;
-		else
+		result = IXGBE_XDP_REDIR;
-			result = IXGBE_XDP_CONSUMED;
 		break;
 	default:
 		bpf_warn_invalid_xdp_action(act);
 		fallthrough;
 	case XDP_ABORTED:
+out_failure:
 		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);
 		fallthrough; /* handle aborts by dropping packet */
 	case XDP_DROP:

drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c+7−9

 	return err;
 }
-static s32 ixgbe_set_vf_lpe(struct ixgbe_adapter *adapter, u32 *msgbuf, u32 vf)
+static int ixgbe_set_vf_lpe(struct ixgbe_adapter *adapter, u32 max_frame, u32 vf)
 {
 	struct ixgbe_hw *hw = &adapter->hw;
-	int max_frame = msgbuf[1];
 	u32 max_frs;
+	if (max_frame < ETH_MIN_MTU || max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE) {
+		e_err(drv, "VF max_frame %d out of range\n", max_frame);
+		return -EINVAL;
+	}
 	/*
 	 * For 82599EB we have to keep all PFs and VFs operating with
 	 * the same max_frame value in order to avoid sending an oversize
 		}
 	}
-	/* MTU < 68 is an error and causes problems on some kernels */
-	if (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE) {
-		e_err(drv, "VF max_frame %d out of range\n", max_frame);
-		return -EINVAL;
-	}
 	/* pull current max frame size from hardware */
 	max_frs = IXGBE_READ_REG(hw, IXGBE_MAXFRS);
 	max_frs &= IXGBE_MHADD_MFS_MASK;
 		retval = ixgbe_set_vf_vlan_msg(adapter, msgbuf, vf);
 		break;
 	case IXGBE_VF_SET_LPE:
-		retval = ixgbe_set_vf_lpe(adapter, msgbuf, vf);
+		retval = ixgbe_set_vf_lpe(adapter, msgbuf[1], vf);
 		break;
 	case IXGBE_VF_SET_MACVLAN:
 		retval = ixgbe_set_vf_macvlan_msg(adapter, msgbuf, vf);

drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c+8−6

 	if (likely(act == XDP_REDIRECT)) {
 		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);
-		result = !err ? IXGBE_XDP_REDIR : IXGBE_XDP_CONSUMED;
+		if (err)
+			goto out_failure;
 		rcu_read_unlock();
-		return result;
+		return IXGBE_XDP_REDIR;
 	}
 	switch (act) {
 		break;
 	case XDP_TX:
 		xdpf = xdp_convert_buff_to_frame(xdp);
-		if (unlikely(!xdpf)) {
+		if (unlikely(!xdpf))
-			result = IXGBE_XDP_CONSUMED;
+			goto out_failure;
-			break;
-		}
 		result = ixgbe_xmit_xdp_ring(adapter, xdpf);
+		if (result == IXGBE_XDP_CONSUMED)
+			goto out_failure;
 		break;
 	default:
 		bpf_warn_invalid_xdp_action(act);
 		fallthrough;
 	case XDP_ABORTED:
+out_failure:
 		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);
 		fallthrough; /* handle aborts by dropping packet */
 	case XDP_DROP:

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c+3−0

 	case XDP_TX:
 		xdp_ring = adapter->xdp_ring[rx_ring->queue_index];
 		result = ixgbevf_xmit_xdp_ring(xdp_ring, xdp);
+		if (result == IXGBEVF_XDP_CONSUMED)
+			goto out_failure;
 		break;
 	default:
 		bpf_warn_invalid_xdp_action(act);
 		fallthrough;
 	case XDP_ABORTED:
+out_failure:
 		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);
 		fallthrough; /* handle aborts by dropping packet */
 	case XDP_DROP:

drivers/net/ethernet/korina.c+6−6

@@ -1315,23 +1315,23 @@ static int korina_probe(struct platform_device *pdev) · 1314 unmodified lines
1315	lp->tx_irq = platform_get_irq_byname(pdev, "tx");	1315	lp->tx_irq = platform_get_irq_byname(pdev, "tx");
1316		1316
1317	p = devm_platform_ioremap_resource_byname(pdev, "emac");	1317	p = devm_platform_ioremap_resource_byname(pdev, "emac");
1318	if (!p) {	1318	if (IS_ERR(p)) {
1319	printk(KERN_ERR DRV_NAME ": cannot remap registers\n");	1319	printk(KERN_ERR DRV_NAME ": cannot remap registers\n");
1320	return -ENOMEM;	1320	return PTR_ERR(p);
1321	}	1321	}
1322	lp->eth_regs = p;	1322	lp->eth_regs = p;
1323		1323
1324	p = devm_platform_ioremap_resource_byname(pdev, "dma_rx");	1324	p = devm_platform_ioremap_resource_byname(pdev, "dma_rx");
1325	if (!p) {	1325	if (IS_ERR(p)) {
1326	printk(KERN_ERR DRV_NAME ": cannot remap Rx DMA registers\n");	1326	printk(KERN_ERR DRV_NAME ": cannot remap Rx DMA registers\n");
1327	return -ENOMEM;	1327	return PTR_ERR(p);
1328	}	1328	}
1329	lp->rx_dma_regs = p;	1329	lp->rx_dma_regs = p;
1330		1330
1331	p = devm_platform_ioremap_resource_byname(pdev, "dma_tx");	1331	p = devm_platform_ioremap_resource_byname(pdev, "dma_tx");
1332	if (!p) {	1332	if (IS_ERR(p)) {
1333	printk(KERN_ERR DRV_NAME ": cannot remap Tx DMA registers\n");	1333	printk(KERN_ERR DRV_NAME ": cannot remap Tx DMA registers\n");
1334	return -ENOMEM;	1334	return PTR_ERR(p);
1335	}	1335	}
1336	lp->tx_dma_regs = p;	1336	lp->tx_dma_regs = p;
1337		1337

drivers/net/ethernet/lantiq_xrx200.c+11−6

 static int xrx200_alloc_skb(struct xrx200_chan *ch)
 {
+	struct sk_buff *skb = ch->skb[ch->dma.desc];
+	dma_addr_t mapping;
 	int ret = 0;
 	ch->skb[ch->dma.desc] = netdev_alloc_skb_ip_align(ch->priv->net_dev,
 		goto skip;
 	}
-	ch->dma.desc_base[ch->dma.desc].addr = dma_map_single(ch->priv->dev,
+	mapping = dma_map_single(ch->priv->dev, ch->skb[ch->dma.desc]->data,
-			ch->skb[ch->dma.desc]->data, XRX200_DMA_DATA_LEN,
+				 XRX200_DMA_DATA_LEN, DMA_FROM_DEVICE);
-			DMA_FROM_DEVICE);
+	if (unlikely(dma_mapping_error(ch->priv->dev, mapping))) {
-	if (unlikely(dma_mapping_error(ch->priv->dev,
-				       ch->dma.desc_base[ch->dma.desc].addr))) {
 		dev_kfree_skb_any(ch->skb[ch->dma.desc]);
+		ch->skb[ch->dma.desc] = skb;
 		ret = -ENOMEM;
 		goto skip;
 	}
+	ch->dma.desc_base[ch->dma.desc].addr = mapping;
+	/* Make sure the address is written before we give it to HW */
+	wmb();
 skip:
 	ch->dma.desc_base[ch->dma.desc].ctl =
 		LTQ_DMA_OWN | LTQ_DMA_RX_OFFSET(NET_IP_ALIGN) |
 	ch->dma.desc %= LTQ_DESC_NUM;
 	if (ret) {
+		net_dev->stats.rx_dropped++;
 		netdev_err(net_dev, "failed to allocate new rx buffer\n");
 		return ret;
 	}
 	struct xrx200_chan *ch = ptr;
 	if (napi_schedule_prep(&ch->napi)) {
-		__napi_schedule(&ch->napi);
 		ltq_dma_disable_irq(&ch->dma);
+		__napi_schedule(&ch->napi);
 	}
 	ltq_dma_ack_irq(&ch->dma);

drivers/net/ethernet/marvell/mvpp2/mvpp2.h+22−0

@@ -993,6 +993,14 @@ enum mvpp22_ptp_packet_format { · 992 unmodified lines
993		993
994	#define MVPP2_DESC_DMA_MASK DMA_BIT_MASK(40)	994	#define MVPP2_DESC_DMA_MASK DMA_BIT_MASK(40)
995		995
		996	/* Buffer header info bits */
		997	#define MVPP2_B_HDR_INFO_MC_ID_MASK 0xfff
		998	#define MVPP2_B_HDR_INFO_MC_ID(info) ((info) & MVPP2_B_HDR_INFO_MC_ID_MASK)
		999	#define MVPP2_B_HDR_INFO_LAST_OFFS 12
		1000	#define MVPP2_B_HDR_INFO_LAST_MASK BIT(12)
		1001	#define MVPP2_B_HDR_INFO_IS_LAST(info) \
		1002	(((info) & MVPP2_B_HDR_INFO_LAST_MASK) >> MVPP2_B_HDR_INFO_LAST_OFFS)
		1003
996	struct mvpp2_tai;	1004	struct mvpp2_tai;
997		1005
998	/* Definitions */	1006	/* Definitions */
@@ -1002,6 +1010,20 @@ struct mvpp2_rss_table { · 3 unmodified lines
1002	u32 indir[MVPP22_RSS_TABLE_ENTRIES];	1010	u32 indir[MVPP22_RSS_TABLE_ENTRIES];
1003	};	1011	};
1004		1012
		1013	struct mvpp2_buff_hdr {
		1014	__le32 next_phys_addr;
		1015	__le32 next_dma_addr;
		1016	__le16 byte_count;
		1017	__le16 info;
		1018	__le16 reserved1; /* bm_qset (for future use, BM) */
		1019	u8 next_phys_addr_high;
		1020	u8 next_dma_addr_high;
		1021	__le16 reserved2;
		1022	__le16 reserved3;
		1023	__le16 reserved4;
		1024	__le16 reserved5;
		1025	};
		1026
1005	/* Shared Packet Processor resources */	1027	/* Shared Packet Processor resources */
1006	struct mvpp2 {	1028	struct mvpp2 {
1007	/* Shared registers' base addresses */	1029	/* Shared registers' base addresses */

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c+45−9

@@ -3839,6 +3839,35 @@ mvpp2_run_xdp(struct mvpp2_port port, struct mvpp2_rx_queue rxq, · 3838 unmodified lines
3839	return ret;	3839	return ret;
3840	}	3840	}
3841		3841
		3842	static void mvpp2_buff_hdr_pool_put(struct mvpp2_port port, struct mvpp2_rx_desc rx_desc,
		3843	int pool, u32 rx_status)
		3844	{
		3845	phys_addr_t phys_addr, phys_addr_next;
		3846	dma_addr_t dma_addr, dma_addr_next;
		3847	struct mvpp2_buff_hdr *buff_hdr;
		3848
		3849	phys_addr = mvpp2_rxdesc_dma_addr_get(port, rx_desc);
		3850	dma_addr = mvpp2_rxdesc_cookie_get(port, rx_desc);
		3851
		3852	do {
		3853	buff_hdr = (struct mvpp2_buff_hdr *)phys_to_virt(phys_addr);
		3854
		3855	phys_addr_next = le32_to_cpu(buff_hdr->next_phys_addr);
		3856	dma_addr_next = le32_to_cpu(buff_hdr->next_dma_addr);
		3857
		3858	if (port->priv->hw_version >= MVPP22) {
		3859	phys_addr_next \|= ((u64)buff_hdr->next_phys_addr_high << 32);
		3860	dma_addr_next \|= ((u64)buff_hdr->next_dma_addr_high << 32);
		3861	}
		3862
		3863	mvpp2_bm_pool_put(port, pool, dma_addr, phys_addr);
		3864
		3865	phys_addr = phys_addr_next;
		3866	dma_addr = dma_addr_next;
		3867
		3868	} while (!MVPP2_B_HDR_INFO_IS_LAST(le16_to_cpu(buff_hdr->info)));
		3869	}
		3870
3842	/* Main rx processing */	3871	/* Main rx processing */
3843	static int mvpp2_rx(struct mvpp2_port port, struct napi_struct napi,	3872	static int mvpp2_rx(struct mvpp2_port port, struct napi_struct napi,
3844	int rx_todo, struct mvpp2_rx_queue *rxq)	3873	int rx_todo, struct mvpp2_rx_queue *rxq)
@@ -3885,14 +3914,6 @@ static int mvpp2_rx(struct mvpp2_port port, struct napi_struct napi, · 40 unmodified lines
3885	MVPP2_RXD_BM_POOL_ID_OFFS;	3914	MVPP2_RXD_BM_POOL_ID_OFFS;
3886	bm_pool = &port->priv->bm_pools[pool];	3915	bm_pool = &port->priv->bm_pools[pool];
3887		3916
3888	/* In case of an error, release the requested buffer pointer
3889	* to the Buffer Manager. This request process is controlled
3890	* by the hardware, and the information about the buffer is
3891	* comprised by the RX descriptor.
3892	*/
3893	if (rx_status & MVPP2_RXD_ERR_SUMMARY)
3894	goto err_drop_frame;
3895
3896	if (port->priv->percpu_pools) {	3917	if (port->priv->percpu_pools) {
3897	pp = port->priv->page_pool[pool];	3918	pp = port->priv->page_pool[pool];
3898	dma_dir = page_pool_get_dma_dir(pp);	3919	dma_dir = page_pool_get_dma_dir(pp);
@@ -3904,6 +3925,18 @@ static int mvpp2_rx(struct mvpp2_port port, struct napi_struct napi, · 5 unmodified lines
3904	rx_bytes + MVPP2_MH_SIZE,	3925	rx_bytes + MVPP2_MH_SIZE,
3905	dma_dir);	3926	dma_dir);
3906		3927
		3928	/* Buffer header not supported */
		3929	if (rx_status & MVPP2_RXD_BUF_HDR)
		3930	goto err_drop_frame;
		3931
		3932	/* In case of an error, release the requested buffer pointer
		3933	* to the Buffer Manager. This request process is controlled
		3934	* by the hardware, and the information about the buffer is
		3935	* comprised by the RX descriptor.
		3936	*/
		3937	if (rx_status & MVPP2_RXD_ERR_SUMMARY)
		3938	goto err_drop_frame;
		3939
3907	/* Prefetch header */	3940	/* Prefetch header */
3908	prefetch(data);	3941	prefetch(data);
3909		3942
@@ -3985,7 +4018,10 @@ err_drop_frame: · 75 unmodified lines
3985	dev->stats.rx_errors++;	4018	dev->stats.rx_errors++;
3986	mvpp2_rx_error(port, rx_desc);	4019	mvpp2_rx_error(port, rx_desc);
3987	/* Return the buffer to the pool */	4020	/* Return the buffer to the pool */
3988	mvpp2_bm_pool_put(port, pool, dma_addr, phys_addr);	4021	if (rx_status & MVPP2_RXD_BUF_HDR)
		4022	mvpp2_buff_hdr_pool_put(port, rx_desc, pool, rx_status);
		4023	else
		4024	mvpp2_bm_pool_put(port, pool, dma_addr, phys_addr);
3989	}	4025	}
3990		4026
3991	rcu_read_unlock();	4027	rcu_read_unlock();

drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c+4−0

@@ -786,6 +786,10 @@ static int otx2_set_rxfh_context(struct net_device dev, const u32 indir, · 785 unmodified lines
786	if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)	786	if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
787	return -EOPNOTSUPP;	787	return -EOPNOTSUPP;
788		788
		789	if (*rss_context != ETH_RXFH_CONTEXT_ALLOC &&
		790	*rss_context >= MAX_RSS_GROUPS)
		791	return -EINVAL;
		792
789	rss = &pfvf->hw.rss_info;	793	rss = &pfvf->hw.rss_info;
790		794
791	if (!rss->enable) {	795	if (!rss->enable) {

drivers/net/ethernet/mediatek/mtk_eth_soc.c+52−25

@@ -681,32 +681,53 @@ static int mtk_set_mac_address(struct net_device dev, void p) · 680 unmodified lines
681	void mtk_stats_update_mac(struct mtk_mac *mac)	681	void mtk_stats_update_mac(struct mtk_mac *mac)
682	{	682	{
683	struct mtk_hw_stats *hw_stats = mac->hw_stats;	683	struct mtk_hw_stats *hw_stats = mac->hw_stats;
684	unsigned int base = MTK_GDM1_TX_GBCNT;	684	struct mtk_eth *eth = mac->hw;
685	u64 stats;
686
687	base += hw_stats->reg_offset;
688		685
689	u64_stats_update_begin(&hw_stats->syncp);	686	u64_stats_update_begin(&hw_stats->syncp);
690		687
691	hw_stats->rx_bytes += mtk_r32(mac->hw, base);	688	if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) {
692	stats = mtk_r32(mac->hw, base + 0x04);	689	hw_stats->tx_packets += mtk_r32(mac->hw, MT7628_SDM_TPCNT);
693	if (stats)	690	hw_stats->tx_bytes += mtk_r32(mac->hw, MT7628_SDM_TBCNT);
694	hw_stats->rx_bytes += (stats << 32);	691	hw_stats->rx_packets += mtk_r32(mac->hw, MT7628_SDM_RPCNT);
695	hw_stats->rx_packets += mtk_r32(mac->hw, base + 0x08);	692	hw_stats->rx_bytes += mtk_r32(mac->hw, MT7628_SDM_RBCNT);
696	hw_stats->rx_overflow += mtk_r32(mac->hw, base + 0x10);	693	hw_stats->rx_checksum_errors +=
697	hw_stats->rx_fcs_errors += mtk_r32(mac->hw, base + 0x14);	694	mtk_r32(mac->hw, MT7628_SDM_CS_ERR);
698	hw_stats->rx_short_errors += mtk_r32(mac->hw, base + 0x18);	695	} else {
699	hw_stats->rx_long_errors += mtk_r32(mac->hw, base + 0x1c);	696	unsigned int offs = hw_stats->reg_offset;
700	hw_stats->rx_checksum_errors += mtk_r32(mac->hw, base + 0x20);	697	u64 stats;
701	hw_stats->rx_flow_control_packets +=	698
702	mtk_r32(mac->hw, base + 0x24);	699	hw_stats->rx_bytes += mtk_r32(mac->hw,
703	hw_stats->tx_skip += mtk_r32(mac->hw, base + 0x28);	700	MTK_GDM1_RX_GBCNT_L + offs);
704	hw_stats->tx_collisions += mtk_r32(mac->hw, base + 0x2c);	701	stats = mtk_r32(mac->hw, MTK_GDM1_RX_GBCNT_H + offs);
705	hw_stats->tx_bytes += mtk_r32(mac->hw, base + 0x30);	702	if (stats)
706	stats = mtk_r32(mac->hw, base + 0x34);	703	hw_stats->rx_bytes += (stats << 32);
707	if (stats)	704	hw_stats->rx_packets +=
708	hw_stats->tx_bytes += (stats << 32);	705	mtk_r32(mac->hw, MTK_GDM1_RX_GPCNT + offs);
709	hw_stats->tx_packets += mtk_r32(mac->hw, base + 0x38);	706	hw_stats->rx_overflow +=
		707	mtk_r32(mac->hw, MTK_GDM1_RX_OERCNT + offs);
		708	hw_stats->rx_fcs_errors +=
		709	mtk_r32(mac->hw, MTK_GDM1_RX_FERCNT + offs);
		710	hw_stats->rx_short_errors +=
		711	mtk_r32(mac->hw, MTK_GDM1_RX_SERCNT + offs);
		712	hw_stats->rx_long_errors +=
		713	mtk_r32(mac->hw, MTK_GDM1_RX_LENCNT + offs);
		714	hw_stats->rx_checksum_errors +=
		715	mtk_r32(mac->hw, MTK_GDM1_RX_CERCNT + offs);
		716	hw_stats->rx_flow_control_packets +=
		717	mtk_r32(mac->hw, MTK_GDM1_RX_FCCNT + offs);
		718	hw_stats->tx_skip +=
		719	mtk_r32(mac->hw, MTK_GDM1_TX_SKIPCNT + offs);
		720	hw_stats->tx_collisions +=
		721	mtk_r32(mac->hw, MTK_GDM1_TX_COLCNT + offs);
		722	hw_stats->tx_bytes +=
		723	mtk_r32(mac->hw, MTK_GDM1_TX_GBCNT_L + offs);
		724	stats = mtk_r32(mac->hw, MTK_GDM1_TX_GBCNT_H + offs);
		725	if (stats)
		726	hw_stats->tx_bytes += (stats << 32);
		727	hw_stats->tx_packets +=
		728	mtk_r32(mac->hw, MTK_GDM1_TX_GPCNT + offs);
		729	}
		730
710	u64_stats_update_end(&hw_stats->syncp);	731	u64_stats_update_end(&hw_stats->syncp);
711	}	732	}
712		733
@@ -2423,7 +2444,8 @@ static void mtk_dim_rx(struct work_struct *work) · 1710 unmodified lines
2423	val \|= cur << MTK_PDMA_DELAY_RX_PINT_SHIFT;	2444	val \|= cur << MTK_PDMA_DELAY_RX_PINT_SHIFT;
2424		2445
2425	mtk_w32(eth, val, MTK_PDMA_DELAY_INT);	2446	mtk_w32(eth, val, MTK_PDMA_DELAY_INT);
2426	mtk_w32(eth, val, MTK_QDMA_DELAY_INT);	2447	if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA))
		2448	mtk_w32(eth, val, MTK_QDMA_DELAY_INT);
2427		2449
2428	spin_unlock_bh(&eth->dim_lock);	2450	spin_unlock_bh(&eth->dim_lock);
2429		2451
@@ -2452,7 +2474,8 @@ static void mtk_dim_tx(struct work_struct *work) · 22 unmodified lines
2452	val \|= cur << MTK_PDMA_DELAY_TX_PINT_SHIFT;	2474	val \|= cur << MTK_PDMA_DELAY_TX_PINT_SHIFT;
2453		2475
2454	mtk_w32(eth, val, MTK_PDMA_DELAY_INT);	2476	mtk_w32(eth, val, MTK_PDMA_DELAY_INT);
2455	mtk_w32(eth, val, MTK_QDMA_DELAY_INT);	2477	if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA))
		2478	mtk_w32(eth, val, MTK_QDMA_DELAY_INT);
2456		2479
2457	spin_unlock_bh(&eth->dim_lock);	2480	spin_unlock_bh(&eth->dim_lock);
2458		2481
@@ -2480,6 +2503,10 @@ static int mtk_hw_init(struct mtk_eth *eth) · 21 unmodified lines
2480	goto err_disable_pm;	2503	goto err_disable_pm;
2481	}	2504	}
2482		2505
		2506	/* set interrupt delays based on current Net DIM sample */
		2507	mtk_dim_rx(&eth->rx_dim.work);
		2508	mtk_dim_tx(&eth->tx_dim.work);
		2509
2483	/* disable delay and normal interrupt */	2510	/* disable delay and normal interrupt */
2484	mtk_tx_irq_disable(eth, ~0);	2511	mtk_tx_irq_disable(eth, ~0);
2485	mtk_rx_irq_disable(eth, ~0);	2512	mtk_rx_irq_disable(eth, ~0);

drivers/net/ethernet/mediatek/mtk_eth_soc.h+22−2

@@ -278,8 +278,21 @@ · 277 unmodified lines
278	/* QDMA FQ Free Page Buffer Length Register */	278	/* QDMA FQ Free Page Buffer Length Register */
279	#define MTK_QDMA_FQ_BLEN 0x1B2C	279	#define MTK_QDMA_FQ_BLEN 0x1B2C
280		280
281	/* GMA1 Received Good Byte Count Register */	281	/* GMA1 counter / statics register */
282	#define MTK_GDM1_TX_GBCNT 0x2400	282	#define MTK_GDM1_RX_GBCNT_L 0x2400
		283	#define MTK_GDM1_RX_GBCNT_H 0x2404
		284	#define MTK_GDM1_RX_GPCNT 0x2408
		285	#define MTK_GDM1_RX_OERCNT 0x2410
		286	#define MTK_GDM1_RX_FERCNT 0x2414
		287	#define MTK_GDM1_RX_SERCNT 0x2418
		288	#define MTK_GDM1_RX_LENCNT 0x241c
		289	#define MTK_GDM1_RX_CERCNT 0x2420
		290	#define MTK_GDM1_RX_FCCNT 0x2424
		291	#define MTK_GDM1_TX_SKIPCNT 0x2428
		292	#define MTK_GDM1_TX_COLCNT 0x242c
		293	#define MTK_GDM1_TX_GBCNT_L 0x2430
		294	#define MTK_GDM1_TX_GBCNT_H 0x2434
		295	#define MTK_GDM1_TX_GPCNT 0x2438
283	#define MTK_STAT_OFFSET 0x40	296	#define MTK_STAT_OFFSET 0x40
284		297
285	/* QDMA descriptor txd4 */	298	/* QDMA descriptor txd4 */
@@ -502,6 +515,13 @@ · 216 unmodified lines
502	#define MT7628_SDM_MAC_ADRL (MT7628_SDM_OFFSET + 0x0c)	515	#define MT7628_SDM_MAC_ADRL (MT7628_SDM_OFFSET + 0x0c)
503	#define MT7628_SDM_MAC_ADRH (MT7628_SDM_OFFSET + 0x10)	516	#define MT7628_SDM_MAC_ADRH (MT7628_SDM_OFFSET + 0x10)
504		517
		518	/* Counter / stat register */
		519	#define MT7628_SDM_TPCNT (MT7628_SDM_OFFSET + 0x100)
		520	#define MT7628_SDM_TBCNT (MT7628_SDM_OFFSET + 0x104)
		521	#define MT7628_SDM_RPCNT (MT7628_SDM_OFFSET + 0x108)
		522	#define MT7628_SDM_RBCNT (MT7628_SDM_OFFSET + 0x10c)
		523	#define MT7628_SDM_CS_ERR (MT7628_SDM_OFFSET + 0x110)
		524
505	struct mtk_rx_dma {	525	struct mtk_rx_dma {
506	unsigned int rxd1;	526	unsigned int rxd1;
507	unsigned int rxd2;	527	unsigned int rxd2;

drivers/net/ethernet/mellanox/mlx4/en_ethtool.c+1−3

 	return ret;
 }
-#define MLX4_EEPROM_PAGE_LEN 256
 static int mlx4_en_get_module_info(struct net_device *dev,
 				   struct ethtool_modinfo *modinfo)
 {
 		break;
 	case MLX4_MODULE_ID_SFP:
 		modinfo->type = ETH_MODULE_SFF_8472;
-		modinfo->eeprom_len = MLX4_EEPROM_PAGE_LEN;
+		modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN;
 		break;
 	default:
 		return -EINVAL;

drivers/net/ethernet/mellanox/mlx4/fw.c+3−0

 #define QUERY_DEV_CAP_MAD_DEMUX_OFFSET		0xb0
 #define QUERY_DEV_CAP_DMFS_HIGH_RATE_QPN_BASE_OFFSET	0xa8
 #define QUERY_DEV_CAP_DMFS_HIGH_RATE_QPN_RANGE_OFFSET	0xac
+#define QUERY_DEV_CAP_MAP_CLOCK_TO_USER 0xc1
 #define QUERY_DEV_CAP_QP_RATE_LIMIT_NUM_OFFSET	0xcc
 #define QUERY_DEV_CAP_QP_RATE_LIMIT_MAX_OFFSET	0xd0
 #define QUERY_DEV_CAP_QP_RATE_LIMIT_MIN_OFFSET	0xd2
 	if (mlx4_is_mfunc(dev))
 		disable_unsupported_roce_caps(outbox);
+	MLX4_GET(field, outbox, QUERY_DEV_CAP_MAP_CLOCK_TO_USER);
+	dev_cap->map_clock_to_user = field & 0x80;
 	MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_QP_OFFSET);
 	dev_cap->reserved_qps = 1 << (field & 0xf);
 	MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_QP_OFFSET);

drivers/net/ethernet/mellanox/mlx4/fw.h+1−0

@@ -131,6 +131,7 @@ struct mlx4_dev_cap { · 130 unmodified lines
131	u32 health_buffer_addrs;	131	u32 health_buffer_addrs;
132	struct mlx4_port_cap port_cap[MLX4_MAX_PORTS + 1];	132	struct mlx4_port_cap port_cap[MLX4_MAX_PORTS + 1];
133	bool wol_port[MLX4_MAX_PORTS + 1];	133	bool wol_port[MLX4_MAX_PORTS + 1];
		134	bool map_clock_to_user;
134	};	135	};
135		136
136	struct mlx4_func_cap {	137	struct mlx4_func_cap {

drivers/net/ethernet/mellanox/mlx4/main.c+6−0

 		}
 	}
+	dev->caps.map_clock_to_user  = dev_cap->map_clock_to_user;
 	dev->caps.uar_page_size	     = PAGE_SIZE;
 	dev->caps.num_uars	     = dev_cap->uar_size / PAGE_SIZE;
 	dev->caps.local_ca_ack_delay = dev_cap->local_ca_ack_delay;
 	if (mlx4_is_slave(dev))
 		return -EOPNOTSUPP;
+	if (!dev->caps.map_clock_to_user) {
+		mlx4_dbg(dev, "Map clock to user is not supported.\n");
+		return -EOPNOTSUPP;
+	}
 	if (!params)
 		return -EINVAL;

drivers/net/ethernet/mellanox/mlx4/port.c+103−4

@@ -1973,6 +1973,7 @@ EXPORT_SYMBOL(mlx4_get_roce_gid_from_slave); · 1972 unmodified lines
1973	#define I2C_ADDR_LOW 0x50	1973	#define I2C_ADDR_LOW 0x50
1974	#define I2C_ADDR_HIGH 0x51	1974	#define I2C_ADDR_HIGH 0x51
1975	#define I2C_PAGE_SIZE 256	1975	#define I2C_PAGE_SIZE 256
		1976	#define I2C_HIGH_PAGE_SIZE 128
1976		1977
1977	/* Module Info Data */	1978	/* Module Info Data */
1978	struct mlx4_cable_info {	1979	struct mlx4_cable_info {
@@ -2026,6 +2027,88 @@ static inline const char *cable_info_mad_err_str(u16 mad_status) · 47 unmodified lines
2026	return "Unknown Error";	2027	return "Unknown Error";
2027	}	2028	}
2028		2029
		2030	static int mlx4_get_module_id(struct mlx4_dev dev, u8 port, u8 module_id)
		2031	{
		2032	struct mlx4_cmd_mailbox inbox, outbox;
		2033	struct mlx4_mad_ifc inmad, outmad;
		2034	struct mlx4_cable_info *cable_info;
		2035	int ret;
		2036
		2037	inbox = mlx4_alloc_cmd_mailbox(dev);
		2038	if (IS_ERR(inbox))
		2039	return PTR_ERR(inbox);
		2040
		2041	outbox = mlx4_alloc_cmd_mailbox(dev);
		2042	if (IS_ERR(outbox)) {
		2043	mlx4_free_cmd_mailbox(dev, inbox);
		2044	return PTR_ERR(outbox);
		2045	}
		2046
		2047	inmad = (struct mlx4_mad_ifc *)(inbox->buf);
		2048	outmad = (struct mlx4_mad_ifc *)(outbox->buf);
		2049
		2050	inmad->method = 0x1; /* Get */
		2051	inmad->class_version = 0x1;
		2052	inmad->mgmt_class = 0x1;
		2053	inmad->base_version = 0x1;
		2054	inmad->attr_id = cpu_to_be16(0xFF60); /* Module Info */
		2055
		2056	cable_info = (struct mlx4_cable_info *)inmad->data;
		2057	cable_info->dev_mem_address = 0;
		2058	cable_info->page_num = 0;
		2059	cable_info->i2c_addr = I2C_ADDR_LOW;
		2060	cable_info->size = cpu_to_be16(1);
		2061
		2062	ret = mlx4_cmd_box(dev, inbox->dma, outbox->dma, port, 3,
		2063	MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C,
		2064	MLX4_CMD_NATIVE);
		2065	if (ret)
		2066	goto out;
		2067
		2068	if (be16_to_cpu(outmad->status)) {
		2069	/* Mad returned with bad status */
		2070	ret = be16_to_cpu(outmad->status);
		2071	mlx4_warn(dev,
		2072	"MLX4_CMD_MAD_IFC Get Module ID attr(%x) port(%d) i2c_addr(%x) offset(%d) size(%d): Response Mad Status(%x) - %s\n",
		2073	0xFF60, port, I2C_ADDR_LOW, 0, 1, ret,
		2074	cable_info_mad_err_str(ret));
		2075	ret = -ret;
		2076	goto out;
		2077	}
		2078	cable_info = (struct mlx4_cable_info *)outmad->data;
		2079	*module_id = cable_info->data[0];
		2080	out:
		2081	mlx4_free_cmd_mailbox(dev, inbox);
		2082	mlx4_free_cmd_mailbox(dev, outbox);
		2083	return ret;
		2084	}
		2085
		2086	static void mlx4_sfp_eeprom_params_set(u8 i2c_addr, u8 page_num, u16 *offset)
		2087	{
		2088	*i2c_addr = I2C_ADDR_LOW;
		2089	*page_num = 0;
		2090
		2091	if (*offset < I2C_PAGE_SIZE)
		2092	return;
		2093
		2094	*i2c_addr = I2C_ADDR_HIGH;
		2095	*offset -= I2C_PAGE_SIZE;
		2096	}
		2097
		2098	static void mlx4_qsfp_eeprom_params_set(u8 i2c_addr, u8 page_num, u16 *offset)
		2099	{
		2100	/* Offsets 0-255 belong to page 0.
		2101	* Offsets 256-639 belong to pages 01, 02, 03.
		2102	* For example, offset 400 is page 02: 1 + (400 - 256) / 128 = 2
		2103	*/
		2104	if (*offset < I2C_PAGE_SIZE)
		2105	*page_num = 0;
		2106	else
		2107	page_num = 1 + (offset - I2C_PAGE_SIZE) / I2C_HIGH_PAGE_SIZE;
		2108	*i2c_addr = I2C_ADDR_LOW;
		2109	offset -= page_num * I2C_HIGH_PAGE_SIZE;
		2110	}
		2111
2029	/**	2112	/**
2030	* mlx4_get_module_info - Read cable module eeprom data	2113	* mlx4_get_module_info - Read cable module eeprom data
2031	* @dev: mlx4_dev.	2114	* @dev: mlx4_dev.
@@ -2045,12 +2128,30 @@ int mlx4_get_module_info(struct mlx4_dev *dev, u8 port, · 13 unmodified lines
2045	struct mlx4_cmd_mailbox inbox, outbox;	2128	struct mlx4_cmd_mailbox inbox, outbox;
2046	struct mlx4_mad_ifc inmad, outmad;	2129	struct mlx4_mad_ifc inmad, outmad;
2047	struct mlx4_cable_info *cable_info;	2130	struct mlx4_cable_info *cable_info;
2048	u16 i2c_addr;	2131	u8 module_id, i2c_addr, page_num;
2049	int ret;	2132	int ret;
2050		2133
2051	if (size > MODULE_INFO_MAX_READ)	2134	if (size > MODULE_INFO_MAX_READ)
2052	size = MODULE_INFO_MAX_READ;	2135	size = MODULE_INFO_MAX_READ;
2053		2136
		2137	ret = mlx4_get_module_id(dev, port, &module_id);
		2138	if (ret)
		2139	return ret;
		2140
		2141	switch (module_id) {
		2142	case MLX4_MODULE_ID_SFP:
		2143	mlx4_sfp_eeprom_params_set(&i2c_addr, &page_num, &offset);
		2144	break;
		2145	case MLX4_MODULE_ID_QSFP:
		2146	case MLX4_MODULE_ID_QSFP_PLUS:
		2147	case MLX4_MODULE_ID_QSFP28:
		2148	mlx4_qsfp_eeprom_params_set(&i2c_addr, &page_num, &offset);
		2149	break;
		2150	default:
		2151	mlx4_err(dev, "Module ID not recognized: %#x\n", module_id);
		2152	return -EINVAL;
		2153	}
		2154
2054	inbox = mlx4_alloc_cmd_mailbox(dev);	2155	inbox = mlx4_alloc_cmd_mailbox(dev);
2055	if (IS_ERR(inbox))	2156	if (IS_ERR(inbox))
2056	return PTR_ERR(inbox);	2157	return PTR_ERR(inbox);
@@ -2076,11 +2177,9 @@ int mlx4_get_module_info(struct mlx4_dev *dev, u8 port, · 19 unmodified lines
2076	*/	2177	*/
2077	size -= offset + size - I2C_PAGE_SIZE;	2178	size -= offset + size - I2C_PAGE_SIZE;
2078		2179
2079	i2c_addr = I2C_ADDR_LOW;
2080
2081	cable_info = (struct mlx4_cable_info *)inmad->data;	2180	cable_info = (struct mlx4_cable_info *)inmad->data;
2082	cable_info->dev_mem_address = cpu_to_be16(offset);	2181	cable_info->dev_mem_address = cpu_to_be16(offset);
2083	cable_info->page_num = 0;	2182	cable_info->page_num = page_num;
2084	cable_info->i2c_addr = i2c_addr;	2183	cable_info->i2c_addr = i2c_addr;
2085	cable_info->size = cpu_to_be16(size);	2184	cable_info->size = cpu_to_be16(size);
2086		2185

drivers/net/ethernet/mellanox/mlx5/core/dev.c+19−0

 	int ret = 0, i;
 	mutex_lock(&mlx5_intf_mutex);
+	priv->flags &= ~MLX5_PRIV_FLAGS_DETACH;
 	for (i = 0; i < ARRAY_SIZE(mlx5_adev_devices); i++) {
 		if (!priv->adev[i]) {
 			bool is_supported = false;
 			}
 		} else {
 			adev = &priv->adev[i]->adev;
+			/* Pay attention that this is not PCI driver that
+			 * mlx5_core_dev is connected, but auxiliary driver.
+			 *
+			 * Here we can race of module unload with devlink
+			 * reload, but we don't need to take extra lock because
+			 * we are holding global mlx5_intf_mutex.
+			 */
+			if (!adev->dev.driver)
+				continue;
 			adrv = to_auxiliary_drv(adev->dev.driver);
 			if (adrv->resume)
 			continue;
 		adev = &priv->adev[i]->adev;
+		/* Auxiliary driver was unbind manually through sysfs */
+		if (!adev->dev.driver)
+			goto skip_suspend;
 		adrv = to_auxiliary_drv(adev->dev.driver);
 		if (adrv->suspend) {
 			continue;
 		}
+skip_suspend:
 		del_adev(&priv->adev[i]->adev);
 		priv->adev[i] = NULL;
 	}
+	priv->flags |= MLX5_PRIV_FLAGS_DETACH;
 	mutex_unlock(&mlx5_intf_mutex);
 }
 	struct mlx5_priv *priv = &dev->priv;
 	lockdep_assert_held(&mlx5_intf_mutex);
+	if (priv->flags & MLX5_PRIV_FLAGS_DETACH)
+		return 0;
 	delete_drivers(dev);
 	if (priv->flags & MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV)

drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c+2−0

@@ -64,6 +64,8 @@ struct devlink_port mlx5e_get_devlink_port(struct net_device dev) · 63 unmodified lines
64	struct mlx5e_priv *priv = netdev_priv(dev);	64	struct mlx5e_priv *priv = netdev_priv(dev);
65	struct devlink_port *port;	65	struct devlink_port *port;
66		66
		67	if (!netif_device_present(dev))
		68	return NULL;
67	port = mlx5e_devlink_get_dl_port(priv);	69	port = mlx5e_devlink_get_dl_port(priv);
68	if (port->registered)	70	if (port->registered)
69	return port;	71	return port;

drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c+0−1

@@ -1,7 +1,6 @@
1	// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB	1	// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
2	// Copyright (c) 2020 Mellanox Technologies	2	// Copyright (c) 2020 Mellanox Technologies
3		3
4	#include <linux/ptp_classify.h>
5	#include "en/ptp.h"	4	#include "en/ptp.h"
6	#include "en/txrx.h"	5	#include "en/txrx.h"
7	#include "en/params.h"	6	#include "en/params.h"

drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h+22−0

@@ -6,6 +6,7 @@ · 5 unmodified lines
6		6
7	#include "en.h"	7	#include "en.h"
8	#include "en_stats.h"	8	#include "en_stats.h"
		9	#include <linux/ptp_classify.h>
9		10
10	struct mlx5e_ptpsq {	11	struct mlx5e_ptpsq {
11	struct mlx5e_txqsq txqsq;	12	struct mlx5e_txqsq txqsq;
@@ -43,6 +44,27 @@ struct mlx5e_ptp { · 31 unmodified lines
43	DECLARE_BITMAP(state, MLX5E_PTP_STATE_NUM_STATES);	44	DECLARE_BITMAP(state, MLX5E_PTP_STATE_NUM_STATES);
44	};	45	};
45		46
		47	static inline bool mlx5e_use_ptpsq(struct sk_buff *skb)
		48	{
		49	struct flow_keys fk;
		50
		51	if (!(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP))
		52	return false;
		53
		54	if (!skb_flow_dissect_flow_keys(skb, &fk, 0))
		55	return false;
		56
		57	if (fk.basic.n_proto == htons(ETH_P_1588))
		58	return true;
		59
		60	if (fk.basic.n_proto != htons(ETH_P_IP) &&
		61	fk.basic.n_proto != htons(ETH_P_IPV6))
		62	return false;
		63
		64	return (fk.basic.ip_proto == IPPROTO_UDP &&
		65	fk.ports.dst == htons(PTP_EV_PORT));
		66	}
		67
46	int mlx5e_ptp_open(struct mlx5e_priv priv, struct mlx5e_params params,	68	int mlx5e_ptp_open(struct mlx5e_priv priv, struct mlx5e_params params,
47	u8 lag_port, struct mlx5e_ptp **cp);	69	u8 lag_port, struct mlx5e_ptp **cp);
48	void mlx5e_ptp_close(struct mlx5e_ptp *c);	70	void mlx5e_ptp_close(struct mlx5e_ptp *c);

drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c+2−0

@@ -223,6 +223,8 @@ static void mlx5e_rep_changelowerstate_event(struct net_device netdev, void pt · 222 unmodified lines
223	rpriv = priv->ppriv;	223	rpriv = priv->ppriv;
224	fwd_vport_num = rpriv->rep->vport;	224	fwd_vport_num = rpriv->rep->vport;
225	lag_dev = netdev_master_upper_dev_get(netdev);	225	lag_dev = netdev_master_upper_dev_get(netdev);
		226	if (!lag_dev)
		227	return;
226		228
227	netdev_dbg(netdev, "lag_dev(%s)'s slave vport(%d) is txable(%d)\n",	229	netdev_dbg(netdev, "lag_dev(%s)'s slave vport(%d) is txable(%d)\n",
228	lag_dev->name, fwd_vport_num, net_lag_port_dev_txable(netdev));	230	lag_dev->name, fwd_vport_num, net_lag_port_dev_txable(netdev));

drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c+6−9

 							     work);
 	struct mlx5e_neigh_hash_entry *nhe = update_work->nhe;
 	struct neighbour *n = update_work->n;
+	struct mlx5e_encap_entry *e = NULL;
 	bool neigh_connected, same_dev;
-	struct mlx5e_encap_entry *e;
 	unsigned char ha[ETH_ALEN];
-	struct mlx5e_priv *priv;
 	u8 nud_state, dead;
 	rtnl_lock();
 	if (!same_dev)
 		goto out;
-	list_for_each_entry(e, &nhe->encap_list, encap_list) {
+	/* mlx5e_get_next_init_encap() releases previous encap before returning
-		if (!mlx5e_encap_take(e))
+	 * the next one.
-			continue;
+	 */
+	while ((e = mlx5e_get_next_init_encap(nhe, e)) != NULL)
+		mlx5e_rep_update_flows(netdev_priv(e->out_dev), e, neigh_connected, ha);
-		priv = netdev_priv(e->out_dev);
-		mlx5e_rep_update_flows(priv, e, neigh_connected, ha);
-		mlx5e_encap_put(priv, e);
-	}
 out:
 	rtnl_unlock();
 	mlx5e_release_neigh_update_work(update_work);

drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c+2−6

 	ASSERT_RTNL();
-	/* wait for encap to be fully initialized */
-	wait_for_completion(&e->res_ready);
 	mutex_lock(&esw->offloads.encap_tbl_lock);
 	encap_connected = !!(e->flags & MLX5_ENCAP_ENTRY_VALID);
-	if (e->compl_result < 0 || (encap_connected == neigh_connected &&
+	if (encap_connected == neigh_connected && ether_addr_equal(e->h_dest, ha))
-				    ether_addr_equal(e->h_dest, ha)))
 		goto unlock;
 	mlx5e_take_all_encap_flows(e, &flow_list);
 		struct mlx5_eswitch *esw;
 		u32 zone_restore_id;
-		tc_skb_ext = skb_ext_add(skb, TC_SKB_EXT);
+		tc_skb_ext = tc_skb_ext_alloc(skb);
 		if (!tc_skb_ext) {
 			WARN_ON(1);
 			return false;

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c+31−4

 		mlx5e_take_tmp_flow(flow, flow_list, 0);
 }
+typedef bool (match_cb)(struct mlx5e_encap_entry *);
 static struct mlx5e_encap_entry *
-mlx5e_get_next_valid_encap(struct mlx5e_neigh_hash_entry *nhe,
+mlx5e_get_next_matching_encap(struct mlx5e_neigh_hash_entry *nhe,
-			   struct mlx5e_encap_entry *e)
+			      struct mlx5e_encap_entry *e,
+			      match_cb match)
 {
 	struct mlx5e_encap_entry *next = NULL;
 	/* wait for encap to be fully initialized */
 	wait_for_completion(&next->res_ready);
 	/* continue searching if encap entry is not in valid state after completion */
-	if (!(next->flags & MLX5_ENCAP_ENTRY_VALID)) {
+	if (!match(next)) {
 		e = next;
 		goto retry;
 	}
 	return next;
 }
+static bool mlx5e_encap_valid(struct mlx5e_encap_entry *e)
+{
+	return e->flags & MLX5_ENCAP_ENTRY_VALID;
+}
+static struct mlx5e_encap_entry *
+mlx5e_get_next_valid_encap(struct mlx5e_neigh_hash_entry *nhe,
+			   struct mlx5e_encap_entry *e)
+{
+	return mlx5e_get_next_matching_encap(nhe, e, mlx5e_encap_valid);
+}
+static bool mlx5e_encap_initialized(struct mlx5e_encap_entry *e)
+{
+	return e->compl_result >= 0;
+}
+struct mlx5e_encap_entry *
+mlx5e_get_next_init_encap(struct mlx5e_neigh_hash_entry *nhe,
+			  struct mlx5e_encap_entry *e)
+{
+	return mlx5e_get_next_matching_encap(nhe, e, mlx5e_encap_initialized);
+}
 void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe)
 {
 	struct mlx5e_neigh *m_neigh = &nhe->m_neigh;
 	fen_info = container_of(info, struct fib_entry_notifier_info, info);
 	fib_dev = fib_info_nh(fen_info->fi, 0)->fib_nh_dev;
-	if (fib_dev->netdev_ops != &mlx5e_netdev_ops ||
+	if (!fib_dev || fib_dev->netdev_ops != &mlx5e_netdev_ops ||
 	    fen_info->dst_len != 32)
 		return NULL;

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c+0−3

@@ -532,9 +532,6 @@ void mlx5e_ipsec_build_netdev(struct mlx5e_priv *priv) · 531 unmodified lines
532	struct mlx5_core_dev *mdev = priv->mdev;	532	struct mlx5_core_dev *mdev = priv->mdev;
533	struct net_device *netdev = priv->netdev;	533	struct net_device *netdev = priv->netdev;
534		534
535	if (!priv->ipsec)
536	return;
537
538	if (!(mlx5_accel_ipsec_device_caps(mdev) & MLX5_ACCEL_IPSEC_CAP_ESP) \|\|	535	if (!(mlx5_accel_ipsec_device_caps(mdev) & MLX5_ACCEL_IPSEC_CAP_ESP) \|\|
539	!MLX5_CAP_ETH(mdev, swp)) {	536	!MLX5_CAP_ETH(mdev, swp)) {
540	mlx5_core_dbg(mdev, "mlx5e: ESP and SWP offload not supported\n");	537	mlx5_core_dbg(mdev, "mlx5e: ESP and SWP offload not supported\n");

drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c+1−1

@@ -356,7 +356,7 @@ err: · 355 unmodified lines
356		356
357	int mlx5e_arfs_create_tables(struct mlx5e_priv *priv)	357	int mlx5e_arfs_create_tables(struct mlx5e_priv *priv)
358	{	358	{
359	int err = 0;	359	int err = -ENOMEM;
360	int i;	360	int i;
361		361
362	if (!(priv->netdev->hw_features & NETIF_F_NTUPLE))	362	if (!(priv->netdev->hw_features & NETIF_F_NTUPLE))

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c+10−2

 {
 	struct mlx5e_priv *priv = netdev_priv(netdev);
 	struct mlx5_core_dev *mdev = priv->mdev;
+	unsigned long fec_bitmap;
 	u16 fec_policy = 0;
 	int mode;
 	int err;
-	if (bitmap_weight((unsigned long *)&fecparam->fec,
+	bitmap_from_arr32(&fec_bitmap, &fecparam->fec, sizeof(fecparam->fec) * BITS_PER_BYTE);
-			  ETHTOOL_FEC_LLRS_BIT + 1) > 1)
+	if (bitmap_weight(&fec_bitmap, ETHTOOL_FEC_LLRS_BIT + 1) > 1)
 		return -EOPNOTSUPP;
 	for (mode = 0; mode < ARRAY_SIZE(pplm_fec_2_ethtool); mode++) {
 	if (curr_val == new_val)
 		return 0;
+	if (new_val && !priv->profile->rx_ptp_support &&
+	    priv->tstamp.rx_filter != HWTSTAMP_FILTER_NONE) {
+		netdev_err(priv->netdev,
+			   "Profile doesn't support enabling of CQE compression while hardware time-stamping is enabled.\n");
+		return -EINVAL;
+	}
 	new_params = priv->channels.params;
 	MLX5E_SET_PFLAG(&new_params, MLX5E_PFLAG_RX_CQE_COMPRESS, new_val);
 	if (priv->tstamp.rx_filter != HWTSTAMP_FILTER_NONE)

drivers/net/ethernet/mellanox/mlx5/core/en_fs.c+1−0

@@ -35,6 +35,7 @@ · 34 unmodified lines
35	#include <linux/ipv6.h>	35	#include <linux/ipv6.h>
36	#include <linux/tcp.h>	36	#include <linux/tcp.h>
37	#include <linux/mlx5/fs.h>	37	#include <linux/mlx5/fs.h>
		38	#include <linux/mlx5/mpfs.h>
38	#include "en.h"	39	#include "en.h"
39	#include "en_rep.h"	40	#include "en_rep.h"
40	#include "lib/mpfs.h"	41	#include "lib/mpfs.h"

drivers/net/ethernet/mellanox/mlx5/core/en_main.c+81−33

 void mlx5e_activate_rq(struct mlx5e_rq *rq)
 {
 	set_bit(MLX5E_RQ_STATE_ENABLED, &rq->state);
-	if (rq->icosq)
+	if (rq->icosq) {
 		mlx5e_trigger_irq(rq->icosq);
-	else
+	} else {
+		local_bh_disable();
 		napi_schedule(rq->cq.napi);
+		local_bh_enable();
+	}
 }
 void mlx5e_deactivate_rq(struct mlx5e_rq *rq)
 	int err;
 	old_num_txqs = netdev->real_num_tx_queues;
-	old_ntc = netdev->num_tc;
+	old_ntc = netdev->num_tc ? : 1;
 	nch = priv->channels.params.num_channels;
 	ntc = priv->channels.params.num_tc;
 	num_rxqs = nch * priv->profile->rq_groups;
-	if (priv->channels.params.ptp_rx)
-		num_rxqs++;
 	mlx5e_netdev_set_tcs(netdev, nch, ntc);
 			netdev_warn(netdev, "Disabling rxhash, not supported when CQE compress is active\n");
 	}
+	if (mlx5e_is_uplink_rep(priv)) {
+		features &= ~NETIF_F_HW_TLS_RX;
+		if (netdev->features & NETIF_F_HW_TLS_RX)
+			netdev_warn(netdev, "Disabling hw_tls_rx, not supported in switchdev mode\n");
+		features &= ~NETIF_F_HW_TLS_TX;
+		if (netdev->features & NETIF_F_HW_TLS_TX)
+			netdev_warn(netdev, "Disabling hw_tls_tx, not supported in switchdev mode\n");
+	}
 	mutex_unlock(&priv->state_lock);
 	return features;
 	return mlx5e_ptp_rx_manage_fs(priv, set);
 }
-int mlx5e_hwstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr)
+static int mlx5e_hwstamp_config_no_ptp_rx(struct mlx5e_priv *priv, bool rx_filter)
+{
+	bool rx_cqe_compress_def = priv->channels.params.rx_cqe_compress_def;
+	int err;
+	if (!rx_filter)
+		/* Reset CQE compression to Admin default */
+		return mlx5e_modify_rx_cqe_compression_locked(priv, rx_cqe_compress_def);
+	if (!MLX5E_GET_PFLAG(&priv->channels.params, MLX5E_PFLAG_RX_CQE_COMPRESS))
+		return 0;
+	/* Disable CQE compression */
+	netdev_warn(priv->netdev, "Disabling RX cqe compression\n");
+	err = mlx5e_modify_rx_cqe_compression_locked(priv, false);
+	if (err)
+		netdev_err(priv->netdev, "Failed disabling cqe compression err=%d\n", err);
+	return err;
+}
+static int mlx5e_hwstamp_config_ptp_rx(struct mlx5e_priv *priv, bool ptp_rx)
 {
 	struct mlx5e_params new_params;
+	if (ptp_rx == priv->channels.params.ptp_rx)
+		return 0;
+	new_params = priv->channels.params;
+	new_params.ptp_rx = ptp_rx;
+	return mlx5e_safe_switch_params(priv, &new_params, mlx5e_ptp_rx_manage_fs_ctx,
+					&new_params.ptp_rx, true);
+}
+int mlx5e_hwstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr)
+{
 	struct hwtstamp_config config;
 	bool rx_cqe_compress_def;
+	bool ptp_rx;
 	int err;
 	if (!MLX5_CAP_GEN(priv->mdev, device_frequency_khz) ||
 	}
 	mutex_lock(&priv->state_lock);
-	new_params = priv->channels.params;
 	rx_cqe_compress_def = priv->channels.params.rx_cqe_compress_def;
 	/* RX HW timestamp */
 	switch (config.rx_filter) {
 	case HWTSTAMP_FILTER_NONE:
-		new_params.ptp_rx = false;
+		ptp_rx = false;
 		break;
 	case HWTSTAMP_FILTER_ALL:
 	case HWTSTAMP_FILTER_SOME:
 	case HWTSTAMP_FILTER_PTP_V2_SYNC:
 	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:
 	case HWTSTAMP_FILTER_NTP_ALL:
-		new_params.ptp_rx = rx_cqe_compress_def;
 		config.rx_filter = HWTSTAMP_FILTER_ALL;
+		/* ptp_rx is set if both HW TS is set and CQE
+		 * compression is set
+		 */
+		ptp_rx = rx_cqe_compress_def;
 		break;
 	default:
-		mutex_unlock(&priv->state_lock);
+		err = -ERANGE;
-		return -ERANGE;
+		goto err_unlock;
 	}
-	if (new_params.ptp_rx == priv->channels.params.ptp_rx)
+	if (!priv->profile->rx_ptp_support)
-		goto out;
+		err = mlx5e_hwstamp_config_no_ptp_rx(priv,
+						     config.rx_filter != HWTSTAMP_FILTER_NONE);
+	else
+		err = mlx5e_hwstamp_config_ptp_rx(priv, ptp_rx);
+	if (err)
+		goto err_unlock;
-	err = mlx5e_safe_switch_params(priv, &new_params, mlx5e_ptp_rx_manage_fs_ctx,
-				       &new_params.ptp_rx, true);
-	if (err) {
-		mutex_unlock(&priv->state_lock);
-		return err;
-	}
-out:
 	memcpy(&priv->tstamp, &config, sizeof(config));
 	mutex_unlock(&priv->state_lock);
 	return copy_to_user(ifr->ifr_data, &config,
 			    sizeof(config)) ? -EFAULT : 0;
+err_unlock:
+	mutex_unlock(&priv->state_lock);
+	return err;
 }
 int mlx5e_hwstamp_get(struct mlx5e_priv *priv, struct ifreq *ifr)
 	}
 	if (mlx5_vxlan_allowed(mdev->vxlan) || mlx5_geneve_tx_allowed(mdev)) {
-		netdev->hw_features     |= NETIF_F_GSO_UDP_TUNNEL |
+		netdev->hw_features     |= NETIF_F_GSO_UDP_TUNNEL;
-					   NETIF_F_GSO_UDP_TUNNEL_CSUM;
+		netdev->hw_enc_features |= NETIF_F_GSO_UDP_TUNNEL;
-		netdev->hw_enc_features |= NETIF_F_GSO_UDP_TUNNEL |
+		netdev->vlan_features |= NETIF_F_GSO_UDP_TUNNEL;
-					   NETIF_F_GSO_UDP_TUNNEL_CSUM;
-		netdev->gso_partial_features = NETIF_F_GSO_UDP_TUNNEL_CSUM;
-		netdev->vlan_features |= NETIF_F_GSO_UDP_TUNNEL |
-					 NETIF_F_GSO_UDP_TUNNEL_CSUM;
 	}
 	if (mlx5e_tunnel_proto_supported_tx(mdev, IPPROTO_GRE)) {
-		netdev->hw_features     |= NETIF_F_GSO_GRE |
+		netdev->hw_features     |= NETIF_F_GSO_GRE;
-					   NETIF_F_GSO_GRE_CSUM;
+		netdev->hw_enc_features |= NETIF_F_GSO_GRE;
-		netdev->hw_enc_features |= NETIF_F_GSO_GRE |
+		netdev->gso_partial_features |= NETIF_F_GSO_GRE;
-					   NETIF_F_GSO_GRE_CSUM;
-		netdev->gso_partial_features |= NETIF_F_GSO_GRE |
-						NETIF_F_GSO_GRE_CSUM;
 	}
 	if (mlx5e_tunnel_proto_supported_tx(mdev, IPPROTO_IPIP)) {
 	rtnl_unlock();
 }
+static void mlx5e_reset_channels(struct net_device *netdev)
+{
+	netdev_reset_tc(netdev);
+}
 int mlx5e_attach_netdev(struct mlx5e_priv *priv)
 {
 	const bool take_rtnl = priv->netdev->reg_state == NETREG_REGISTERED;
 	profile->cleanup_tx(priv);
 out:
+	mlx5e_reset_channels(priv->netdev);
 	set_bit(MLX5E_STATE_DESTROYING, &priv->state);
 	cancel_work_sync(&priv->update_stats_work);
 	return err;
 	profile->cleanup_rx(priv);
 	profile->cleanup_tx(priv);
+	mlx5e_reset_channels(priv->netdev);
 	cancel_work_sync(&priv->update_stats_work);
 }

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c+32−7

 		      struct netlink_ext_ack *extack)
 {
 	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
-	struct net_device *out_dev, *encap_dev = NULL;
 	struct mlx5e_tc_flow_parse_attr *parse_attr;
 	struct mlx5_flow_attr *attr = flow->attr;
 	bool vf_tun = false, encap_valid = true;
+	struct net_device *encap_dev = NULL;
 	struct mlx5_esw_flow_attr *esw_attr;
 	struct mlx5_fc *counter = NULL;
 	struct mlx5e_rep_priv *rpriv;
 	esw_attr = attr->esw_attr;
 	for (out_index = 0; out_index < MLX5_MAX_FLOW_FWD_VPORTS; out_index++) {
+		struct net_device *out_dev;
 		int mirred_ifindex;
 		if (!(esw_attr->dests[out_index].flags & MLX5_ESW_DEST_ENCAP))
 			continue;
 		mirred_ifindex = parse_attr->mirred_ifindex[out_index];
-		out_dev = __dev_get_by_index(dev_net(priv->netdev),
+		out_dev = dev_get_by_index(dev_net(priv->netdev), mirred_ifindex);
-					     mirred_ifindex);
+		if (!out_dev) {
+			NL_SET_ERR_MSG_MOD(extack, "Requested mirred device not found");
+			err = -ENODEV;
+			goto err_out;
+		}
 		err = mlx5e_attach_encap(priv, flow, out_dev, out_index,
 					 extack, &encap_dev, &encap_valid);
+		dev_put(out_dev);
 		if (err)
 			goto err_out;
 		esw_attr->dests[out_index].mdev = out_priv->mdev;
 	}
+	if (vf_tun && esw_attr->out_count > 1) {
+		NL_SET_ERR_MSG_MOD(extack, "VF tunnel encap with mirroring is not supported");
+		err = -EOPNOTSUPP;
+		goto err_out;
+	}
 	err = mlx5_eswitch_add_vlan_action(esw, attr);
 	if (err)
 		goto err_out;
 				    misc_parameters_3);
 	struct flow_rule *rule = flow_cls_offload_flow_rule(f);
 	struct flow_dissector *dissector = rule->match.dissector;
+	enum fs_flow_table_type fs_type;
 	u16 addr_type = 0;
 	u8 ip_proto = 0;
 	u8 *match_level;
 	int err;
+	fs_type = mlx5e_is_eswitch_flow(flow) ? FS_FT_FDB : FS_FT_NIC_RX;
 	match_level = outer_match_level;
 	if (dissector->used_keys &
 		if (match.mask->vlan_id ||
 		    match.mask->vlan_priority ||
 		    match.mask->vlan_tpid) {
+			if (!MLX5_CAP_FLOWTABLE_TYPE(priv->mdev, ft_field_support.outer_second_vid,
+						     fs_type)) {
+				NL_SET_ERR_MSG_MOD(extack,
+						   "Matching on CVLAN is not supported");
+				return -EOPNOTSUPP;
+			}
 			if (match.key->vlan_tpid == htons(ETH_P_8021AD)) {
 				MLX5_SET(fte_match_set_misc, misc_c,
 					 outer_second_svlan_tag, 1);
 	if (err)
 		return err;
-	*out_dev = dev_get_by_index_rcu(dev_net(vlan_dev),
+	rcu_read_lock();
-					dev_get_iflink(vlan_dev));
+	*out_dev = dev_get_by_index_rcu(dev_net(vlan_dev), dev_get_iflink(vlan_dev));
+	rcu_read_unlock();
+	if (!*out_dev)
+		return -ENODEV;
 	if (is_vlan_dev(*out_dev))
 		err = add_vlan_push_action(priv, attr, out_dev, action);
 	list_for_each_entry_safe(hpe, tmp, &init_wait_list, dead_peer_wait_list) {
 		wait_for_completion(&hpe->res_ready);
 		if (!IS_ERR_OR_NULL(hpe->hp) && hpe->peer_vhca_id == peer_vhca_id)
-			hpe->hp->pair->peer_gone = true;
+			mlx5_core_hairpin_clear_dead_peer(hpe->hp->pair);
 		mlx5e_hairpin_put(priv, hpe);
 	}
 	if (mapped_obj.type == MLX5_MAPPED_OBJ_CHAIN) {
 		chain = mapped_obj.chain;
-		tc_skb_ext = skb_ext_add(skb, TC_SKB_EXT);
+		tc_skb_ext = tc_skb_ext_alloc(skb);
 		if (WARN_ON(!tc_skb_ext))
 			return false;

drivers/net/ethernet/mellanox/mlx5/core/en_tc.h+3−0

@@ -178,6 +178,9 @@ void mlx5e_take_all_encap_flows(struct mlx5e_encap_entry e, struct list_head f · 177 unmodified lines
178	void mlx5e_put_flow_list(struct mlx5e_priv priv, struct list_head flow_list);	178	void mlx5e_put_flow_list(struct mlx5e_priv priv, struct list_head flow_list);
179		179
180	struct mlx5e_neigh_hash_entry;	180	struct mlx5e_neigh_hash_entry;
		181	struct mlx5e_encap_entry *
		182	mlx5e_get_next_init_encap(struct mlx5e_neigh_hash_entry *nhe,
		183	struct mlx5e_encap_entry *e);
181	void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe);	184	void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe);
182		185
183	void mlx5e_tc_reoffload_flows_work(struct work_struct *work);	186	void mlx5e_tc_reoffload_flows_work(struct work_struct *work);

drivers/net/ethernet/mellanox/mlx5/core/en_tx.c+3−22

 #include <linux/tcp.h>
 #include <linux/if_vlan.h>
-#include <linux/ptp_classify.h>
 #include <net/geneve.h>
 #include <net/dsfield.h>
 #include "en.h"
 }
 #endif
-static bool mlx5e_use_ptpsq(struct sk_buff *skb)
-{
-	struct flow_keys fk;
-	if (!skb_flow_dissect_flow_keys(skb, &fk, 0))
-		return false;
-	if (fk.basic.n_proto == htons(ETH_P_1588))
-		return true;
-	if (fk.basic.n_proto != htons(ETH_P_IP) &&
-	    fk.basic.n_proto != htons(ETH_P_IPV6))
-		return false;
-	return (fk.basic.ip_proto == IPPROTO_UDP &&
-		fk.ports.dst == htons(PTP_EV_PORT));
-}
 static u16 mlx5e_select_ptpsq(struct net_device *dev, struct sk_buff *skb)
 {
 	struct mlx5e_priv *priv = netdev_priv(dev);
 		}
 		ptp_channel = READ_ONCE(priv->channels.ptp);
-		if (unlikely(ptp_channel) &&
+		if (unlikely(ptp_channel &&
-		    test_bit(MLX5E_PTP_STATE_TX, ptp_channel->state) &&
+			     test_bit(MLX5E_PTP_STATE_TX, ptp_channel->state) &&
-		    mlx5e_use_ptpsq(skb))
+			     mlx5e_use_ptpsq(skb)))
 			return mlx5e_select_ptpsq(dev, skb);
 		txq_ix = netdev_pick_tx(dev, skb, NULL);

drivers/net/ethernet/mellanox/mlx5/core/eq.c+4−2

 	eqe = next_eqe_sw(eq);
 	if (!eqe)
-		return 0;
+		goto out;
 	do {
 		struct mlx5_core_cq *cq;
 		++eq->cons_index;
 	} while ((++num_eqes < MLX5_EQ_POLLING_BUDGET) && (eqe = next_eqe_sw(eq)));
+out:
 	eq_update_ci(eq, 1);
 	if (cqn != -1)
 		++eq->cons_index;
 	} while ((++num_eqes < MLX5_EQ_POLLING_BUDGET) && (eqe = next_eqe_sw(eq)));
-	eq_update_ci(eq, 1);
 out:
+	eq_update_ci(eq, 1);
 	mlx5_eq_async_int_unlock(eq_async, recovery, &flags);
 	return unlikely(recovery) ? num_eqes : 0;

drivers/net/ethernet/mellanox/mlx5/core/eswitch.c+7−0

 #include <linux/mlx5/mlx5_ifc.h>
 #include <linux/mlx5/vport.h>
 #include <linux/mlx5/fs.h>
+#include <linux/mlx5/mpfs.h>
 #include "esw/acl/lgcy.h"
 #include "esw/legacy.h"
 #include "mlx5_core.h"
 			goto err_vhca_mapping;
 	}
+	/* External controller host PF has factory programmed MAC.
+	 * Read it from the device.
+	 */
+	if (mlx5_core_is_ecpf(esw->dev) && vport_num == MLX5_VPORT_PF)
+		mlx5_query_nic_vport_mac_address(esw->dev, vport_num, true, vport->info.mac);
 	esw_vport_change_handle_locked(vport);
 	esw->enabled_vports++;

drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c+2−1

 			 struct mlx5_fs_chains *chains,
 			 int i)
 {
-	flow_act->flags |= FLOW_ACT_IGNORE_FLOW_LEVEL;
+	if (mlx5_chains_ignore_flow_level_supported(chains))
+		flow_act->flags |= FLOW_ACT_IGNORE_FLOW_LEVEL;
 	dest[i].type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
 	dest[i].ft = mlx5_chains_get_tc_end_ft(chains);
 }

drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c+26−35

 {
 	struct mlx5_flow_table_attr ft_attr = {};
 	struct mlx5_flow_namespace *root_ns;
-	int err;
+	int err, err2;
 	root_ns = mlx5_get_flow_namespace(dev, MLX5_FLOW_NAMESPACE_FDB);
 	if (!root_ns) {
 	/* As this is the terminating action then the termination table is the
 	 * same prio as the slow path
 	 */
-	ft_attr.flags = MLX5_FLOW_TABLE_TERMINATION |
+	ft_attr.flags = MLX5_FLOW_TABLE_TERMINATION | MLX5_FLOW_TABLE_UNMANAGED |
 			MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT;
-	ft_attr.prio = FDB_SLOW_PATH;
+	ft_attr.prio = FDB_TC_OFFLOAD;
 	ft_attr.max_fte = 1;
+	ft_attr.level = 1;
 	ft_attr.autogroup.max_num_groups = 1;
 	tt->termtbl = mlx5_create_auto_grouped_flow_table(root_ns, &ft_attr);
 	if (IS_ERR(tt->termtbl)) {
-		esw_warn(dev, "Failed to create termination table (error %d)\n",
+		err = PTR_ERR(tt->termtbl);
-			 IS_ERR(tt->termtbl));
+		esw_warn(dev, "Failed to create termination table, err %pe\n", tt->termtbl);
-		return -EOPNOTSUPP;
+		return err;
 	}
 	tt->rule = mlx5_add_flow_rules(tt->termtbl, NULL, flow_act,
 				       &tt->dest, 1);
 	if (IS_ERR(tt->rule)) {
-		esw_warn(dev, "Failed to create termination table rule (error %d)\n",
+		err = PTR_ERR(tt->rule);
-			 IS_ERR(tt->rule));
+		esw_warn(dev, "Failed to create termination table rule, err %pe\n", tt->rule);
 		goto add_flow_err;
 	}
 	return 0;
 add_flow_err:
-	err = mlx5_destroy_flow_table(tt->termtbl);
+	err2 = mlx5_destroy_flow_table(tt->termtbl);
-	if (err)
+	if (err2)
-		esw_warn(dev, "Failed to destroy termination table\n");
+		esw_warn(dev, "Failed to destroy termination table, err %d\n", err2);
-	return -EOPNOTSUPP;
+	return err;
 }
 static struct mlx5_termtbl_handle *
 	}
 }
-static bool mlx5_eswitch_termtbl_is_encap_reformat(struct mlx5_pkt_reformat *rt)
-{
-	switch (rt->reformat_type) {
-	case MLX5_REFORMAT_TYPE_L2_TO_VXLAN:
-	case MLX5_REFORMAT_TYPE_L2_TO_NVGRE:
-	case MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL:
-	case MLX5_REFORMAT_TYPE_L2_TO_L3_TUNNEL:
-		return true;
-	default:
-		return false;
-	}
-}
 static void
 mlx5_eswitch_termtbl_actions_move(struct mlx5_flow_act *src,
 				  struct mlx5_flow_act *dst)
 			memset(&src->vlan[1], 0, sizeof(src->vlan[1]));
 		}
 	}
-	if (src->action & MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT &&
-	    mlx5_eswitch_termtbl_is_encap_reformat(src->pkt_reformat)) {
-		src->action &= ~MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT;
-		dst->action |= MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT;
-		dst->pkt_reformat = src->pkt_reformat;
-		src->pkt_reformat = NULL;
-	}
 }
 static bool mlx5_eswitch_offload_is_uplink_port(const struct mlx5_eswitch *esw,
 	int i;
 	if (!MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, termination_table) ||
+	    !MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, ignore_flow_level) ||
 	    attr->flags & MLX5_ESW_ATTR_FLAG_SLOW_PATH ||
 	    !mlx5_eswitch_offload_is_uplink_port(esw, spec))
 		return false;
 		if (dest[i].type != MLX5_FLOW_DESTINATION_TYPE_VPORT)
 			continue;
+		if (attr->dests[num_vport_dests].flags & MLX5_ESW_DEST_ENCAP) {
+			term_tbl_act.action |= MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT;
+			term_tbl_act.pkt_reformat = attr->dests[num_vport_dests].pkt_reformat;
+		} else {
+			term_tbl_act.action &= ~MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT;
+			term_tbl_act.pkt_reformat = NULL;
+		}
 		/* get the terminating table for the action list */
 		tt = mlx5_eswitch_termtbl_get_create(esw, &term_tbl_act,
 						     &dest[i], attr);
 		if (IS_ERR(tt)) {
-			esw_warn(esw->dev, "Failed to get termination table (error %d)\n",
+			esw_warn(esw->dev, "Failed to get termination table, err %pe\n", tt);
-				 IS_ERR(tt));
 			goto revert_changes;
 		}
 		attr->dests[num_vport_dests].termtbl = tt;
 		goto revert_changes;
 	/* create the FTE */
+	flow_act->action &= ~MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT;
+	flow_act->pkt_reformat = NULL;
+	flow_act->flags |= FLOW_ACT_IGNORE_FLOW_LEVEL;
 	rule = mlx5_add_flow_rules(fdb, spec, flow_act, dest, num_dest);
 	if (IS_ERR(rule))
 		goto revert_changes;

drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c+3−0

@@ -349,6 +349,9 @@ static void mlx5_sync_reset_abort_event(struct work_struct *work) · 348 unmodified lines
349	reset_abort_work);	349	reset_abort_work);
350	struct mlx5_core_dev *dev = fw_reset->dev;	350	struct mlx5_core_dev *dev = fw_reset->dev;
351		351
		352	if (!test_bit(MLX5_FW_RESET_FLAGS_RESET_REQUESTED, &fw_reset->reset_flags))
		353	return;
		354
352	mlx5_sync_reset_clear_reset_requested(dev, true);	355	mlx5_sync_reset_clear_reset_requested(dev, true);
353	mlx5_core_warn(dev, "PCI Sync FW Update Reset Aborted.\n");	356	mlx5_core_warn(dev, "PCI Sync FW Update Reset Aborted.\n");
354	}	357	}

drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c+6−0

 	struct lag_mp *mp = &ldev->lag_mp;
 	int err;
+	/* always clear mfi, as it might become stale when a route delete event
+	 * has been missed
+	 */
+	mp->mfi = NULL;
 	if (mp->fib_nb.notifier_call)
 		return 0;
 	unregister_fib_notifier(&init_net, &mp->fib_nb);
 	destroy_workqueue(mp->wq);
 	mp->fib_nb.notifier_call = NULL;
+	mp->mfi = NULL;
 }

drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c+1−1

@@ -107,7 +107,7 @@ bool mlx5_chains_prios_supported(struct mlx5_fs_chains *chains) · 106 unmodified lines
107	return chains->flags & MLX5_CHAINS_AND_PRIOS_SUPPORTED;	107	return chains->flags & MLX5_CHAINS_AND_PRIOS_SUPPORTED;
108	}	108	}
109		109
110	static bool mlx5_chains_ignore_flow_level_supported(struct mlx5_fs_chains *chains)	110	bool mlx5_chains_ignore_flow_level_supported(struct mlx5_fs_chains *chains)
111	{	111	{
112	return chains->flags & MLX5_CHAINS_IGNORE_FLOW_LEVEL_SUPPORTED;	112	return chains->flags & MLX5_CHAINS_IGNORE_FLOW_LEVEL_SUPPORTED;
113	}	113	}

drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.h+5−0

 bool
 mlx5_chains_prios_supported(struct mlx5_fs_chains *chains);
+bool mlx5_chains_ignore_flow_level_supported(struct mlx5_fs_chains *chains);
 bool
 mlx5_chains_backwards_supported(struct mlx5_fs_chains *chains);
 u32
 #else /* CONFIG_MLX5_CLS_ACT */
+static inline bool
+mlx5_chains_ignore_flow_level_supported(struct mlx5_fs_chains *chains)
+{ return false; }
 static inline struct mlx5_flow_table *
 mlx5_chains_get_table(struct mlx5_fs_chains *chains, u32 chain, u32 prio,
 		      u32 level) { return ERR_PTR(-EOPNOTSUPP); }

drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c+3−0

 #include <linux/etherdevice.h>
 #include <linux/mlx5/driver.h>
 #include <linux/mlx5/mlx5_ifc.h>
+#include <linux/mlx5/mpfs.h>
 #include <linux/mlx5/eswitch.h>
 #include "mlx5_core.h"
 #include "lib/mpfs.h"
 	mutex_unlock(&mpfs->lock);
 	return err;
 }
+EXPORT_SYMBOL(mlx5_mpfs_add_mac);
 int mlx5_mpfs_del_mac(struct mlx5_core_dev *dev, u8 *mac)
 {
 	mutex_unlock(&mpfs->lock);
 	return err;
 }
+EXPORT_SYMBOL(mlx5_mpfs_del_mac);

drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h+1−4

 #ifdef CONFIG_MLX5_MPFS
 int  mlx5_mpfs_init(struct mlx5_core_dev *dev);
 void mlx5_mpfs_cleanup(struct mlx5_core_dev *dev);
-int  mlx5_mpfs_add_mac(struct mlx5_core_dev *dev, u8 *mac);
-int  mlx5_mpfs_del_mac(struct mlx5_core_dev *dev, u8 *mac);
 #else /* #ifndef CONFIG_MLX5_MPFS */
 static inline int  mlx5_mpfs_init(struct mlx5_core_dev *dev) { return 0; }
 static inline void mlx5_mpfs_cleanup(struct mlx5_core_dev *dev) {}
-static inline int  mlx5_mpfs_add_mac(struct mlx5_core_dev *dev, u8 *mac) { return 0; }
-static inline int  mlx5_mpfs_del_mac(struct mlx5_core_dev *dev, u8 *mac) { return 0; }
 #endif
 #endif

drivers/net/ethernet/mellanox/mlx5/core/main.c+7−7

 static int handle_hca_cap(struct mlx5_core_dev *dev, void *set_ctx)
 {
-	struct mlx5_profile *prof = dev->profile;
+	struct mlx5_profile *prof = &dev->profile;
 	void *set_hca_cap;
 	int err;
 		 to_fw_pkey_sz(dev, 128));
 	/* Check log_max_qp from HCA caps to set in current profile */
-	if (MLX5_CAP_GEN_MAX(dev, log_max_qp) < profile[prof_sel].log_max_qp) {
+	if (MLX5_CAP_GEN_MAX(dev, log_max_qp) < prof->log_max_qp) {
 		mlx5_core_warn(dev, "log_max_qp value in current profile is %d, changing it to HCA capability limit (%d)\n",
-			       profile[prof_sel].log_max_qp,
+			       prof->log_max_qp,
 			       MLX5_CAP_GEN_MAX(dev, log_max_qp));
-		profile[prof_sel].log_max_qp = MLX5_CAP_GEN_MAX(dev, log_max_qp);
+		prof->log_max_qp = MLX5_CAP_GEN_MAX(dev, log_max_qp);
 	}
 	if (prof->mask & MLX5_PROF_MASK_QP_SIZE)
 		MLX5_SET(cmd_hca_cap, set_hca_cap, log_max_qp,
 	err = mlx5_core_set_hca_defaults(dev);
 	if (err) {
 		mlx5_core_err(dev, "Failed to set hca defaults\n");
-		goto err_sriov;
+		goto err_set_hca;
 	}
 	mlx5_vhca_event_start(dev);
 	mlx5_sf_hw_table_destroy(dev);
 err_vhca:
 	mlx5_vhca_event_stop(dev);
+err_set_hca:
 	mlx5_cleanup_fs(dev);
 err_fs:
 	mlx5_accel_tls_cleanup(dev);
 	struct mlx5_priv *priv = &dev->priv;
 	int err;
-	dev->profile = &profile[profile_idx];
+	memcpy(&dev->profile, &profile[profile_idx], sizeof(dev->profile));
 	INIT_LIST_HEAD(&priv->ctx_list);
 	spin_lock_init(&priv->ctx_lock);
 	mutex_init(&dev->intf_state_mutex);

drivers/net/ethernet/mellanox/mlx5/core/mr.c+1−1

@@ -54,7 +54,7 @@ int mlx5_core_create_mkey(struct mlx5_core_dev *dev, · 53 unmodified lines
54	mkey_index = MLX5_GET(create_mkey_out, lout, mkey_index);	54	mkey_index = MLX5_GET(create_mkey_out, lout, mkey_index);
55	mkey->iova = MLX5_GET64(mkc, mkc, start_addr);	55	mkey->iova = MLX5_GET64(mkc, mkc, start_addr);
56	mkey->size = MLX5_GET64(mkc, mkc, len);	56	mkey->size = MLX5_GET64(mkc, mkc, len);
57	mkey->key \|= mlx5_idx_to_mkey(mkey_index);	57	mkey->key = (u32)mlx5_mkey_variant(mkey->key) \| mlx5_idx_to_mkey(mkey_index);
58	mkey->pd = MLX5_GET(mkc, mkc, pd);	58	mkey->pd = MLX5_GET(mkc, mkc, pd);
59	init_waitqueue_head(&mkey->wait);	59	init_waitqueue_head(&mkey->wait);
60		60

drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c+17−5

 int mlx5_set_msix_vec_count(struct mlx5_core_dev *dev, int function_id,
 			    int msix_vec_count)
 {
-	int sz = MLX5_ST_SZ_BYTES(set_hca_cap_in);
+	int query_sz = MLX5_ST_SZ_BYTES(query_hca_cap_out);
+	int set_sz = MLX5_ST_SZ_BYTES(set_hca_cap_in);
+	void *hca_cap = NULL, *query_cap = NULL, *cap;
 	int num_vf_msix, min_msix, max_msix;
-	void *hca_cap, *cap;
 	int ret;
 	num_vf_msix = MLX5_CAP_GEN_MAX(dev, num_total_dynamic_vf_msix);
 	if (msix_vec_count > max_msix)
 		return -EOVERFLOW;
-	hca_cap = kzalloc(sz, GFP_KERNEL);
+	query_cap = kzalloc(query_sz, GFP_KERNEL);
-	if (!hca_cap)
+	hca_cap = kzalloc(set_sz, GFP_KERNEL);
-		return -ENOMEM;
+	if (!hca_cap || !query_cap) {
+		ret = -ENOMEM;
+		goto out;
+	}
+	ret = mlx5_vport_get_other_func_cap(dev, function_id, query_cap);
+	if (ret)
+		goto out;
 	cap = MLX5_ADDR_OF(set_hca_cap_in, hca_cap, capability);
+	memcpy(cap, MLX5_ADDR_OF(query_hca_cap_out, query_cap, capability),
+	       MLX5_UN_SZ_BYTES(hca_cap_union));
 	MLX5_SET(cmd_hca_cap, cap, dynamic_msix_table_size, msix_vec_count);
 	MLX5_SET(set_hca_cap_in, hca_cap, opcode, MLX5_CMD_OP_SET_HCA_CAP);
 	MLX5_SET(set_hca_cap_in, hca_cap, op_mod,
 		 MLX5_SET_HCA_CAP_OP_MOD_GENERAL_DEVICE << 1);
 	ret = mlx5_cmd_exec_in(dev, set_hca_cap, hca_cap);
+out:
 	kfree(hca_cap);
+	kfree(query_cap);
 	return ret;
 }

drivers/net/ethernet/mellanox/mlx5/core/rdma.c+3−0

@@ -156,6 +156,9 @@ void mlx5_rdma_enable_roce(struct mlx5_core_dev *dev) · 155 unmodified lines
156	{	156	{
157	int err;	157	int err;
158		158
		159	if (!MLX5_CAP_GEN(dev, roce))
		160	return;
		161
159	err = mlx5_nic_vport_enable_roce(dev);	162	err = mlx5_nic_vport_enable_roce(dev);
160	if (err) {	163	if (err) {
161	mlx5_core_err(dev, "Failed to enable RoCE: %d\n", err);	164	mlx5_core_err(dev, "Failed to enable RoCE: %d\n", err);

drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c+1−0

@@ -163,6 +163,7 @@ mlx5_sf_dev_state_change_handler(struct notifier_block *nb, unsigned long event_ · 162 unmodified lines
163	sf_index = event->function_id - base_id;	163	sf_index = event->function_id - base_id;
164	sf_dev = xa_load(&table->devices, sf_index);	164	sf_dev = xa_load(&table->devices, sf_index);
165	switch (event->new_vhca_state) {	165	switch (event->new_vhca_state) {
		166	case MLX5_VHCA_STATE_INVALID:
166	case MLX5_VHCA_STATE_ALLOCATED:	167	case MLX5_VHCA_STATE_ALLOCATED:
167	if (sf_dev)	168	if (sf_dev)
168	mlx5_sf_dev_del(table->dev, sf_dev, sf_index);	169	mlx5_sf_dev_del(table->dev, sf_dev, sf_index);

drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c+11−7

 	switch (hw_state) {
 	case MLX5_VHCA_STATE_ACTIVE:
 	case MLX5_VHCA_STATE_IN_USE:
-	case MLX5_VHCA_STATE_TEARDOWN_REQUEST:
 		return DEVLINK_PORT_FN_STATE_ACTIVE;
 	case MLX5_VHCA_STATE_INVALID:
 	case MLX5_VHCA_STATE_ALLOCATED:
+	case MLX5_VHCA_STATE_TEARDOWN_REQUEST:
 	default:
 		return DEVLINK_PORT_FN_STATE_INACTIVE;
 	}
 	return err;
 }
-static int mlx5_sf_activate(struct mlx5_core_dev *dev, struct mlx5_sf *sf)
+static int mlx5_sf_activate(struct mlx5_core_dev *dev, struct mlx5_sf *sf,
+			    struct netlink_ext_ack *extack)
 {
 	int err;
 	if (mlx5_sf_is_active(sf))
 		return 0;
-	if (sf->hw_state != MLX5_VHCA_STATE_ALLOCATED)
+	if (sf->hw_state != MLX5_VHCA_STATE_ALLOCATED) {
-		return -EINVAL;
+		NL_SET_ERR_MSG_MOD(extack, "SF is inactivated but it is still attached");
+		return -EBUSY;
+	}
 	err = mlx5_cmd_sf_enable_hca(dev, sf->hw_fn_id);
 	if (err)
 static int mlx5_sf_state_set(struct mlx5_core_dev *dev, struct mlx5_sf_table *table,
 			     struct mlx5_sf *sf,
-			     enum devlink_port_fn_state state)
+			     enum devlink_port_fn_state state,
+			     struct netlink_ext_ack *extack)
 {
 	int err = 0;
 	if (state == mlx5_sf_to_devlink_state(sf->hw_state))
 		goto out;
 	if (state == DEVLINK_PORT_FN_STATE_ACTIVE)
-		err = mlx5_sf_activate(dev, sf);
+		err = mlx5_sf_activate(dev, sf, extack);
 	else if (state == DEVLINK_PORT_FN_STATE_INACTIVE)
 		err = mlx5_sf_deactivate(dev, sf);
 	else
 		goto out;
 	}
-	err = mlx5_sf_state_set(dev, table, sf, state);
+	err = mlx5_sf_state_set(dev, table, sf, state, extack);
 out:
 	mlx5_sf_table_put(table);
 	return err;

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_fw.c+2−1

@@ -112,7 +112,8 @@ int mlx5dr_fw_create_md_tbl(struct mlx5dr_domain *dmn, · 111 unmodified lines
112	int ret;	112	int ret;
113		113
114	ft_attr.table_type = MLX5_FLOW_TABLE_TYPE_FDB;	114	ft_attr.table_type = MLX5_FLOW_TABLE_TYPE_FDB;
115	ft_attr.level = dmn->info.caps.max_ft_level - 2;	115	ft_attr.level = min_t(int, dmn->info.caps.max_ft_level - 2,
		116	MLX5_FT_MAX_MULTIPATH_LEVEL);
116	ft_attr.reformat_en = reformat_req;	117	ft_attr.reformat_en = reformat_req;
117	ft_attr.decap_en = reformat_req;	118	ft_attr.decap_en = reformat_req;
118		119

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c+16−10

 	if (hw_action_sz / DR_STE_ACTION_DOUBLE_SZ < DR_STE_DECAP_L3_ACTION_NUM)
 		return -EINVAL;
-	memcpy(padded_data, data, data_sz);
+	inline_data_sz =
+		MLX5_FLD_SZ_BYTES(ste_double_action_insert_with_inline_v1, inline_data);
+	/* Add an alignment padding  */
+	memcpy(padded_data + data_sz % inline_data_sz, data, data_sz);
 	/* Remove L2L3 outer headers */
 	MLX5_SET(ste_single_action_remove_header_v1, hw_action, action_id,
 	hw_action += DR_STE_ACTION_DOUBLE_SZ;
 	used_actions++; /* Remove and NOP are a single double action */
-	inline_data_sz =
+	/* Point to the last dword of the header */
-		MLX5_FLD_SZ_BYTES(ste_double_action_insert_with_inline_v1, inline_data);
+	data_ptr += (data_sz / inline_data_sz) * inline_data_sz;
-	/* Add the new header inline + 2 extra bytes */
+	/* Add the new header using inline action 4Byte at a time, the header
+	 * is added in reversed order to the beginning of the packet to avoid
+	 * incorrect parsing by the HW. Since header is 14B or 18B an extra
+	 * two bytes are padded and later removed.
+	 */
 	for (i = 0; i < data_sz / inline_data_sz + 1; i++) {
 		void *addr_inline;
 		MLX5_SET(ste_double_action_insert_with_inline_v1, hw_action, action_id,
 			 DR_STE_V1_ACTION_ID_INSERT_INLINE);
 		/* The hardware expects here offset to words (2 bytes) */
-		MLX5_SET(ste_double_action_insert_with_inline_v1, hw_action, start_offset,
+		MLX5_SET(ste_double_action_insert_with_inline_v1, hw_action, start_offset, 0);
-			 i * 2);
 		/* Copy bytes one by one to avoid endianness problem */
 		addr_inline = MLX5_ADDR_OF(ste_double_action_insert_with_inline_v1,
 					   hw_action, inline_data);
-		memcpy(addr_inline, data_ptr, inline_data_sz);
+		memcpy(addr_inline, data_ptr - i * inline_data_sz, inline_data_sz);
 		hw_action += DR_STE_ACTION_DOUBLE_SZ;
-		data_ptr += inline_data_sz;
 		used_actions++;
 	}
-	/* Remove 2 extra bytes */
+	/* Remove first 2 extra bytes */
 	MLX5_SET(ste_single_action_remove_header_size_v1, hw_action, action_id,
 		 DR_STE_V1_ACTION_ID_REMOVE_BY_SIZE);
-	MLX5_SET(ste_single_action_remove_header_size_v1, hw_action, start_offset, data_sz / 2);
+	MLX5_SET(ste_single_action_remove_header_size_v1, hw_action, start_offset, 0);
 	/* The hardware expects here size in words (2 bytes) */
 	MLX5_SET(ste_single_action_remove_header_size_v1, hw_action, remove_size, 1);
 	used_actions++;

drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h+5−4

 static inline bool
 mlx5dr_is_supported(struct mlx5_core_dev *dev)
 {
-	return MLX5_CAP_ESW_FLOWTABLE_FDB(dev, sw_owner) ||
+	return MLX5_CAP_GEN(dev, roce) &&
-	       (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, sw_owner_v2) &&
+	       (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, sw_owner) ||
-		(MLX5_CAP_GEN(dev, steering_format_version) <=
+		(MLX5_CAP_ESW_FLOWTABLE_FDB(dev, sw_owner_v2) &&
-		 MLX5_STEERING_FORMAT_CONNECTX_6DX));
+		 (MLX5_CAP_GEN(dev, steering_format_version) <=
+		  MLX5_STEERING_FORMAT_CONNECTX_6DX)));
 }
 /* buddy functions & structure */

drivers/net/ethernet/mellanox/mlx5/core/transobj.c+24−6

 	return err;
 }
+static void mlx5_hairpin_unpair_peer_sq(struct mlx5_hairpin *hp)
+{
+	int i;
+	for (i = 0; i < hp->num_channels; i++)
+		mlx5_hairpin_modify_sq(hp->peer_mdev, hp->sqn[i], MLX5_SQC_STATE_RDY,
+				       MLX5_SQC_STATE_RST, 0, 0);
+}
 static void mlx5_hairpin_unpair_queues(struct mlx5_hairpin *hp)
 {
 	int i;
 	for (i = 0; i < hp->num_channels; i++)
 		mlx5_hairpin_modify_rq(hp->func_mdev, hp->rqn[i], MLX5_RQC_STATE_RDY,
 				       MLX5_RQC_STATE_RST, 0, 0);
 	/* unset peer SQs */
-	if (hp->peer_gone)
+	if (!hp->peer_gone)
-		return;
+		mlx5_hairpin_unpair_peer_sq(hp);
-	for (i = 0; i < hp->num_channels; i++)
-		mlx5_hairpin_modify_sq(hp->peer_mdev, hp->sqn[i], MLX5_SQC_STATE_RDY,
-				       MLX5_SQC_STATE_RST, 0, 0);
 }
 struct mlx5_hairpin *
 	mlx5_hairpin_destroy_queues(hp);
 	kfree(hp);
 }
+void mlx5_core_hairpin_clear_dead_peer(struct mlx5_hairpin *hp)
+{
+	int i;
+	mlx5_hairpin_unpair_peer_sq(hp);
+	/* destroy peer SQ */
+	for (i = 0; i < hp->num_channels; i++)
+		mlx5_core_destroy_sq(hp->peer_mdev, hp->sqn[i]);
+	hp->peer_gone = true;
+}

drivers/net/ethernet/mellanox/mlx5/core/vport.c+0−2

@@ -465,8 +465,6 @@ int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev, · 464 unmodified lines
465	void *in;	465	void *in;
466	int err;	466	int err;
467		467
468	if (!vport)
469	return -EINVAL;
470	if (!MLX5_CAP_GEN(mdev, vport_group_manager))	468	if (!MLX5_CAP_GEN(mdev, vport_group_manager))
471	return -EACCES;	469	return -EACCES;
472		470

drivers/net/ethernet/mellanox/mlxsw/core_thermal.c+4−2

 							MLXSW_THERMAL_TRIP_MASK,
 							module_tz,
 							&mlxsw_thermal_module_ops,
-							NULL, 0, 0);
+							NULL, 0,
+							module_tz->parent->polling_delay);
 	if (IS_ERR(module_tz->tzdev)) {
 		err = PTR_ERR(module_tz->tzdev);
 		return err;
 						MLXSW_THERMAL_TRIP_MASK,
 						gearbox_tz,
 						&mlxsw_thermal_gearbox_ops,
-						NULL, 0, 0);
+						NULL, 0,
+						gearbox_tz->parent->polling_delay);
 	if (IS_ERR(gearbox_tz->tzdev))
 		return PTR_ERR(gearbox_tz->tzdev);

drivers/net/ethernet/mellanox/mlxsw/reg.h+1−1

@@ -3907,7 +3907,7 @@ MLXSW_ITEM32(reg, qeec, max_shaper_bs, 0x1C, 0, 6); · 3906 unmodified lines
3907	#define MLXSW_REG_QEEC_HIGHEST_SHAPER_BS 25	3907	#define MLXSW_REG_QEEC_HIGHEST_SHAPER_BS 25
3908	#define MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP1 5	3908	#define MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP1 5
3909	#define MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP2 11	3909	#define MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP2 11
3910	#define MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP3 5	3910	#define MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP3 11
3911		3911
3912	static inline void mlxsw_reg_qeec_pack(char *payload, u8 local_port,	3912	static inline void mlxsw_reg_qeec_pack(char *payload, u8 local_port,
3913	enum mlxsw_reg_qeec_hr hr, u8 index,	3913	enum mlxsw_reg_qeec_hr hr, u8 index,

drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c+4−1

 			   u8 band, u32 child_handle)
 {
 	struct mlxsw_sp_qdisc *old_qdisc;
+	u32 parent;
 	if (band < mlxsw_sp_qdisc->num_classes &&
 	    mlxsw_sp_qdisc->qdiscs[band].handle == child_handle)
 	if (old_qdisc)
 		mlxsw_sp_qdisc_destroy(mlxsw_sp_port, old_qdisc);
-	mlxsw_sp_qdisc = mlxsw_sp_qdisc->ops->find_class(mlxsw_sp_qdisc, band);
+	parent = TC_H_MAKE(mlxsw_sp_qdisc->handle, band + 1);
+	mlxsw_sp_qdisc = mlxsw_sp_qdisc->ops->find_class(mlxsw_sp_qdisc,
+							 parent);
 	if (!WARN_ON(!mlxsw_sp_qdisc))
 		mlxsw_sp_qdisc_destroy(mlxsw_sp_port, mlxsw_sp_qdisc);

drivers/net/ethernet/microchip/encx24j600.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: GPL-2.0-or-later	1	// SPDX-License-Identifier: GPL-2.0-or-later
2	/**	2	/*
3	* Microchip ENCX24J600 ethernet driver	3	* Microchip ENCX24J600 ethernet driver
4	*	4	*
5	* Copyright (C) 2015 Gridpoint	5	* Copyright (C) 2015 Gridpoint

drivers/net/ethernet/microchip/encx24j600_hw.h+1−1

@@ -1,5 +1,5 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 */
2	/**	2	/*
3	* encx24j600_hw.h: Register definitions	3	* encx24j600_hw.h: Register definitions
4	*	4	*
5	*/	5	*/

drivers/net/ethernet/mscc/ocelot.c+5−0

 int ocelot_port_flush(struct ocelot *ocelot, int port)
 {
+	unsigned int pause_ena;
 	int err, val;
 	/* Disable dequeuing from the egress queues */
 		       QSYS_PORT_MODE, port);
 	/* Disable flow control */
+	ocelot_fields_read(ocelot, port, SYS_PAUSE_CFG_PAUSE_ENA, &pause_ena);
 	ocelot_fields_write(ocelot, port, SYS_PAUSE_CFG_PAUSE_ENA, 0);
 	/* Disable priority flow control */
 	/* Clear flushing again. */
 	ocelot_rmw_gix(ocelot, 0, REW_PORT_CFG_FLUSH_ENA, REW_PORT_CFG, port);
+	/* Re-enable flow control */
+	ocelot_fields_write(ocelot, port, SYS_PAUSE_CFG_PAUSE_ENA, pause_ena);
 	return err;
 }
 EXPORT_SYMBOL(ocelot_port_flush);

drivers/net/ethernet/myricom/myri10ge/myri10ge.c+1−0

@@ -3815,6 +3815,7 @@ static int myri10ge_probe(struct pci_dev pdev, const struct pci_device_id ent) · 3814 unmodified lines
3815	dev_err(&pdev->dev,	3815	dev_err(&pdev->dev,
3816	"invalid sram_size %dB or board span %ldB\n",	3816	"invalid sram_size %dB or board span %ldB\n",
3817	mgp->sram_size, mgp->board_span);	3817	mgp->sram_size, mgp->board_span);
		3818	status = -EINVAL;
3818	goto abort_with_ioremap;	3819	goto abort_with_ioremap;
3819	}	3820	}
3820	memcpy_fromio(mgp->eeprom_strings,	3821	memcpy_fromio(mgp->eeprom_strings,

drivers/net/ethernet/pensando/Kconfig+1−0

@@ -20,6 +20,7 @@ if NET_VENDOR_PENSANDO · 19 unmodified lines
20	config IONIC	20	config IONIC
21	tristate "Pensando Ethernet IONIC Support"	21	tristate "Pensando Ethernet IONIC Support"
22	depends on 64BIT && PCI	22	depends on 64BIT && PCI
		23	depends on PTP_1588_CLOCK \|\| !PTP_1588_CLOCK
23	select NET_DEVLINK	24	select NET_DEVLINK
24	select DIMLIB	25	select DIMLIB
25	help	26	help

drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c+2−0

@@ -1602,6 +1602,8 @@ err_out_free_netdev: · 1601 unmodified lines
1602	free_netdev(netdev);	1602	free_netdev(netdev);
1603		1603
1604	err_out_free_res:	1604	err_out_free_res:
		1605	if (NX_IS_REVISION_P3(pdev->revision))
		1606	pci_disable_pcie_error_reporting(pdev);
1605	pci_release_regions(pdev);	1607	pci_release_regions(pdev);
1606		1608
1607	err_out_disable_pdev:	1609	err_out_disable_pdev:

drivers/net/ethernet/qlogic/qed/qed_dcbx.c+3−1

 		p_hwfn->p_dcbx_info->set.ver_num |= DCBX_CONFIG_VERSION_STATIC;
 	p_hwfn->p_dcbx_info->set.enabled = dcbx_info->operational.enabled;
+	BUILD_BUG_ON(sizeof(dcbx_info->operational.params) !=
+		     sizeof(p_hwfn->p_dcbx_info->set.config.params));
 	memcpy(&p_hwfn->p_dcbx_info->set.config.params,
 	       &dcbx_info->operational.params,
-	       sizeof(struct qed_dcbx_admin_params));
+	       sizeof(p_hwfn->p_dcbx_info->set.config.params));
 	p_hwfn->p_dcbx_info->set.config.valid = true;
 	memcpy(params, &p_hwfn->p_dcbx_info->set, sizeof(struct qed_dcbx_set));

drivers/net/ethernet/qlogic/qla3xxx.c+1−1

@@ -114,7 +114,7 @@ static int ql_sem_spinlock(struct ql3_adapter *qdev, · 113 unmodified lines
114	value = readl(&port_regs->CommonRegs.semaphoreReg);	114	value = readl(&port_regs->CommonRegs.semaphoreReg);
115	if ((value & (sem_mask >> 16)) == sem_bits)	115	if ((value & (sem_mask >> 16)) == sem_bits)
116	return 0;	116	return 0;
117	ssleep(1);	117	mdelay(1000);
118	} while (--seconds);	118	} while (--seconds);
119	return -1;	119	return -1;
120	}	120	}

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c+1−0

@@ -2690,6 +2690,7 @@ err_out_free_hw_res: · 2689 unmodified lines
2690	kfree(ahw);	2690	kfree(ahw);
2691		2691
2692	err_out_free_res:	2692	err_out_free_res:
		2693	pci_disable_pcie_error_reporting(pdev);
2693	pci_release_regions(pdev);	2694	pci_release_regions(pdev);
2694		2695
2695	err_out_disable_pdev:	2696	err_out_disable_pdev:

drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c+9−9

 			      struct rtnl_link_stats64 *s)
 {
 	struct rmnet_priv *priv = netdev_priv(dev);
-	struct rmnet_vnd_stats total_stats;
+	struct rmnet_vnd_stats total_stats = { };
 	struct rmnet_pcpu_stats *pcpu_ptr;
+	struct rmnet_vnd_stats snapshot;
 	unsigned int cpu, start;
-	memset(&total_stats, 0, sizeof(struct rmnet_vnd_stats));
 	for_each_possible_cpu(cpu) {
 		pcpu_ptr = per_cpu_ptr(priv->pcpu_stats, cpu);
 		do {
 			start = u64_stats_fetch_begin_irq(&pcpu_ptr->syncp);
-			total_stats.rx_pkts += pcpu_ptr->stats.rx_pkts;
+			snapshot = pcpu_ptr->stats;	/* struct assignment */
-			total_stats.rx_bytes += pcpu_ptr->stats.rx_bytes;
-			total_stats.tx_pkts += pcpu_ptr->stats.tx_pkts;
-			total_stats.tx_bytes += pcpu_ptr->stats.tx_bytes;
 		} while (u64_stats_fetch_retry_irq(&pcpu_ptr->syncp, start));
-		total_stats.tx_drops += pcpu_ptr->stats.tx_drops;
+		total_stats.rx_pkts += snapshot.rx_pkts;
+		total_stats.rx_bytes += snapshot.rx_bytes;
+		total_stats.tx_pkts += snapshot.tx_pkts;
+		total_stats.tx_bytes += snapshot.tx_bytes;
+		total_stats.tx_drops += snapshot.tx_drops;
 	}
 	s->rx_packets = total_stats.rx_pkts;
 	}
 	return 0;
 }

drivers/net/ethernet/realtek/r8169_main.c+1−1

@@ -1671,7 +1671,7 @@ static void rtl8169_get_strings(struct net_device dev, u32 stringset, u8 data) · 1670 unmodified lines
1671	{	1671	{
1672	switch(stringset) {	1672	switch(stringset) {
1673	case ETH_SS_STATS:	1673	case ETH_SS_STATS:
1674	memcpy(data, *rtl8169_gstrings, sizeof(rtl8169_gstrings));	1674	memcpy(data, rtl8169_gstrings, sizeof(rtl8169_gstrings));
1675	break;	1675	break;
1676	}	1676	}
1677	}	1677	}

drivers/net/ethernet/renesas/sh_eth.c+1−1

@@ -2287,7 +2287,7 @@ static void sh_eth_get_strings(struct net_device ndev, u32 stringset, u8 data) · 2286 unmodified lines
2287	{	2287	{
2288	switch (stringset) {	2288	switch (stringset) {
2289	case ETH_SS_STATS:	2289	case ETH_SS_STATS:
2290	memcpy(data, *sh_eth_gstrings_stats,	2290	memcpy(data, sh_eth_gstrings_stats,
2291	sizeof(sh_eth_gstrings_stats));	2291	sizeof(sh_eth_gstrings_stats));
2292	break;	2292	break;
2293	}	2293	}

drivers/net/ethernet/sfc/nic.c+1−0

@@ -90,6 +90,7 @@ int efx_nic_init_interrupt(struct efx_nic *efx) · 89 unmodified lines
90	efx->pci_dev->irq);	90	efx->pci_dev->irq);
91	goto fail1;	91	goto fail1;
92	}	92	}
		93	efx->irqs_hooked = true;
93	return 0;	94	return 0;
94	}	95	}
95		96

drivers/net/ethernet/stmicro/stmmac/dwmac1000.h+4−4

@@ -76,10 +76,10 @@ enum power_event { · 75 unmodified lines
76	#define LPI_CTRL_STATUS_TLPIEN 0x00000001 /* Transmit LPI Entry */	76	#define LPI_CTRL_STATUS_TLPIEN 0x00000001 /* Transmit LPI Entry */
77		77
78	/* GMAC HW ADDR regs */	78	/* GMAC HW ADDR regs */
79	#define GMAC_ADDR_HIGH(reg) (((reg > 15) ? 0x00000800 : 0x00000040) + \	79	#define GMAC_ADDR_HIGH(reg) ((reg > 15) ? 0x00000800 + (reg - 16) * 8 : \
80	(reg * 8))	80	0x00000040 + (reg * 8))
81	#define GMAC_ADDR_LOW(reg) (((reg > 15) ? 0x00000804 : 0x00000044) + \	81	#define GMAC_ADDR_LOW(reg) ((reg > 15) ? 0x00000804 + (reg - 16) * 8 : \
82	(reg * 8))	82	0x00000044 + (reg * 8))
83	#define GMAC_MAX_PERFECT_ADDRESSES 1	83	#define GMAC_MAX_PERFECT_ADDRESSES 1
84		84
85	#define GMAC_PCS_BASE 0x000000c0 /* PCS register base */	85	#define GMAC_PCS_BASE 0x000000c0 /* PCS register base */

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c+25−13

  */
 static int stmmac_init_phy(struct net_device *dev)
 {
-	struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
 	struct stmmac_priv *priv = netdev_priv(dev);
 	struct device_node *node;
 	int ret;
 		ret = phylink_connect_phy(priv->phylink, phydev);
 	}
-	phylink_ethtool_get_wol(priv->phylink, &wol);
+	if (!priv->plat->pmt) {
-	device_set_wakeup_capable(priv->device, !!wol.supported);
+		struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
+		phylink_ethtool_get_wol(priv->phylink, &wol);
+		device_set_wakeup_capable(priv->device, !!wol.supported);
+	}
 	return ret;
 }
 	priv->phylink_config.dev = &priv->dev->dev;
 	priv->phylink_config.type = PHYLINK_NETDEV;
 	priv->phylink_config.pcs_poll = true;
-	priv->phylink_config.ovr_an_inband =
+	if (priv->plat->mdio_bus_data)
-		priv->plat->mdio_bus_data->xpcs_an_inband;
+		priv->phylink_config.ovr_an_inband =
+			priv->plat->mdio_bus_data->xpcs_an_inband;
 	if (!fwnode)
 		fwnode = dev_fwnode(priv->device);
 	struct stmmac_priv *priv = netdev_priv(ndev);
 	int ret = 0;
+	ret = pm_runtime_get_sync(priv->device);
+	if (ret < 0) {
+		pm_runtime_put_noidle(priv->device);
+		return ret;
+	}
 	ret = eth_mac_addr(ndev, addr);
 	if (ret)
-		return ret;
+		goto set_mac_error;
 	stmmac_set_umac_addr(priv, priv->hw, ndev->dev_addr, 0);
+set_mac_error:
+	pm_runtime_put(priv->device);
 	return ret;
 }
 	bool is_double = false;
 	int ret;
-	ret = pm_runtime_get_sync(priv->device);
-	if (ret < 0) {
-		pm_runtime_put_noidle(priv->device);
-		return ret;
-	}
 	if (be16_to_cpu(proto) == ETH_P_8021AD)
 		is_double = true;
 	bool is_double = false;
 	int ret;
+	ret = pm_runtime_get_sync(priv->device);
+	if (ret < 0) {
+		pm_runtime_put_noidle(priv->device);
+		return ret;
+	}
 	if (be16_to_cpu(proto) == ETH_P_8021AD)
 		is_double = true;
 	stmmac_napi_del(ndev);
 error_hw_init:
 	destroy_workqueue(priv->wq);
-	stmmac_bus_clks_config(priv, false);
 	bitmap_free(priv->af_xdp_zc_qps);
 	return ret;

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c+2−0

 void stmmac_remove_config_dt(struct platform_device *pdev,
 			     struct plat_stmmacenet_data *plat)
 {
+	clk_disable_unprepare(plat->stmmac_clk);
+	clk_disable_unprepare(plat->pclk);
 	of_node_put(plat->phy_node);
 	of_node_put(plat->mdio_node);
 }

drivers/net/ethernet/ti/netcp_core.c+2−2

@@ -1350,8 +1350,8 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe) · 1349 unmodified lines
1350	tx_pipe->dma_queue = knav_queue_open(name, tx_pipe->dma_queue_id,	1350	tx_pipe->dma_queue = knav_queue_open(name, tx_pipe->dma_queue_id,
1351	KNAV_QUEUE_SHARED);	1351	KNAV_QUEUE_SHARED);
1352	if (IS_ERR(tx_pipe->dma_queue)) {	1352	if (IS_ERR(tx_pipe->dma_queue)) {
1353	dev_err(dev, "Could not open DMA queue for channel \"%s\": %d\n",	1353	dev_err(dev, "Could not open DMA queue for channel \"%s\": %pe\n",
1354	name, ret);	1354	name, tx_pipe->dma_queue);
1355	ret = PTR_ERR(tx_pipe->dma_queue);	1355	ret = PTR_ERR(tx_pipe->dma_queue);
1356	goto err;	1356	goto err;
1357	}	1357	}

drivers/net/ethernet/xilinx/ll_temac_main.c+24−3

 	stat = be32_to_cpu(cur_p->app0);
 	while (stat & STS_CTRL_APP0_CMPLT) {
+		/* Make sure that the other fields are read after bd is
+		 * released by dma
+		 */
+		rmb();
 		dma_unmap_single(ndev->dev.parent, be32_to_cpu(cur_p->phys),
 				 be32_to_cpu(cur_p->len), DMA_TO_DEVICE);
 		skb = (struct sk_buff *)ptr_from_txbd(cur_p);
 		if (skb)
 			dev_consume_skb_irq(skb);
-		cur_p->app0 = 0;
 		cur_p->app1 = 0;
 		cur_p->app2 = 0;
 		cur_p->app3 = 0;
 		ndev->stats.tx_packets++;
 		ndev->stats.tx_bytes += be32_to_cpu(cur_p->len);
+		/* app0 must be visible last, as it is used to flag
+		 * availability of the bd
+		 */
+		smp_mb();
+		cur_p->app0 = 0;
 		lp->tx_bd_ci++;
 		if (lp->tx_bd_ci >= lp->tx_bd_num)
 			lp->tx_bd_ci = 0;
 		if (cur_p->app0)
 			return NETDEV_TX_BUSY;
+		/* Make sure to read next bd app0 after this one */
+		rmb();
 		tail++;
 		if (tail >= lp->tx_bd_num)
 			tail = 0;
 		smp_mb();
 		/* Space might have just been freed - check again */
-		if (temac_check_tx_bd_space(lp, num_frag))
+		if (temac_check_tx_bd_space(lp, num_frag + 1))
 			return NETDEV_TX_BUSY;
 		netif_wake_queue(ndev);
 		return NETDEV_TX_OK;
 	}
 	cur_p->phys = cpu_to_be32(skb_dma_addr);
-	ptr_to_txbd((void *)skb, cur_p);
 	for (ii = 0; ii < num_frag; ii++) {
 		if (++lp->tx_bd_tail >= lp->tx_bd_num)
 	}
 	cur_p->app0 |= cpu_to_be32(STS_CTRL_APP0_EOP);
+	/* Mark last fragment with skb address, so it can be consumed
+	 * in temac_start_xmit_done()
+	 */
+	ptr_to_txbd((void *)skb, cur_p);
 	tail_p = lp->tx_bd_p + sizeof(*lp->tx_bd_v) * lp->tx_bd_tail;
 	lp->tx_bd_tail++;
 	if (lp->tx_bd_tail >= lp->tx_bd_num)
 	wmb();
 	lp->dma_out(lp, TX_TAILDESC_PTR, tail_p); /* DMA start */
+	if (temac_check_tx_bd_space(lp, MAX_SKB_FRAGS + 1)) {
+		netdev_info(ndev, "%s -> netif_stop_queue\n", __func__);
+		netif_stop_queue(ndev);
+	}
 	return NETDEV_TX_OK;
 }

drivers/net/hamradio/mkiss.c+1−0

@@ -799,6 +799,7 @@ static void mkiss_close(struct tty_struct *tty) · 798 unmodified lines
799	ax->tty = NULL;	799	ax->tty = NULL;
800		800
801	unregister_netdev(ax->dev);	801	unregister_netdev(ax->dev);
		802	free_netdev(ax->dev);
802	}	803	}
803		804
804	/* Perform I/O control on an active ax25 channel. */	805	/* Perform I/O control on an active ax25 channel. */

drivers/net/ieee802154/mrf24j40.c+2−2

 #include <linux/spi/spi.h>
 #include <linux/interrupt.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
-#include <linux/of.h>
 #include <linux/regmap.h>
 #include <linux/ieee802154.h>
 #include <linux/irq.h>
 static struct spi_driver mrf24j40_driver = {
 	.driver = {
-		.of_match_table = of_match_ptr(mrf24j40_of_match),
+		.of_match_table = mrf24j40_of_match,
 		.name = "mrf24j40",
 	},
 	.id_table = mrf24j40_ids,

drivers/net/ipa/ipa.h+2−0

  * @mem_virt:		Virtual address of IPA-local memory space
  * @mem_offset:		Offset from @mem_virt used for access to IPA memory
  * @mem_size:		Total size (bytes) of memory at @mem_virt
+ * @mem_count:		Number of entries in the mem array
  * @mem:		Array of IPA-local memory region descriptors
  * @imem_iova:		I/O virtual address of IPA region in IMEM
  * @imem_size:		Size of IMEM region
 	void *mem_virt;
 	u32 mem_offset;
 	u32 mem_size;
+	u32 mem_count;
 	const struct ipa_mem *mem;
 	unsigned long imem_iova;

drivers/net/ipa/ipa_mem.c+2−1

 	 * for the region, write "canary" values in the space prior to
 	 * the region's base address.
 	 */
-	for (mem_id = 0; mem_id < IPA_MEM_COUNT; mem_id++) {
+	for (mem_id = 0; mem_id < ipa->mem_count; mem_id++) {
 		const struct ipa_mem *mem = &ipa->mem[mem_id];
 		u16 canary_count;
 		__le32 *canary;
 	ipa->mem_size = resource_size(res);
 	/* The ipa->mem[] array is indexed by enum ipa_mem_id values */
+	ipa->mem_count = mem_data->local_count;
 	ipa->mem = mem_data->local;
 	ret = ipa_imem_init(ipa, mem_data->imem_addr, mem_data->imem_size);

drivers/net/mdio/mdio-octeon.c+0−2

 	return 0;
 fail_register:
-	mdiobus_free(bus->mii_bus);
 	smi_en.u64 = 0;
 	oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN);
 	return err;
 	bus = platform_get_drvdata(pdev);
 	mdiobus_unregister(bus->mii_bus);
-	mdiobus_free(bus->mii_bus);
 	smi_en.u64 = 0;
 	oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN);
 	return 0;

drivers/net/mdio/mdio-thunder.c+0−1

@@ -126,7 +126,6 @@ static void thunder_mdiobus_pci_remove(struct pci_dev *pdev) · 125 unmodified lines
126	continue;	126	continue;
127		127
128	mdiobus_unregister(bus->mii_bus);	128	mdiobus_unregister(bus->mii_bus);
129	mdiobus_free(bus->mii_bus);
130	oct_mdio_writeq(0, bus->register_base + SMI_EN);	129	oct_mdio_writeq(0, bus->register_base + SMI_EN);
131	}	130	}
132	pci_release_regions(pdev);	131	pci_release_regions(pdev);

drivers/net/mhi/net.c+1−1

@@ -49,7 +49,7 @@ static int mhi_ndo_stop(struct net_device *ndev) · 48 unmodified lines
49	return 0;	49	return 0;
50	}	50	}
51		51
52	static int mhi_ndo_xmit(struct sk_buff skb, struct net_device ndev)	52	static netdev_tx_t mhi_ndo_xmit(struct sk_buff skb, struct net_device ndev)
53	{	53	{
54	struct mhi_net_dev *mhi_netdev = netdev_priv(ndev);	54	struct mhi_net_dev *mhi_netdev = netdev_priv(ndev);
55	const struct mhi_net_proto *proto = mhi_netdev->proto;	55	const struct mhi_net_proto *proto = mhi_netdev->proto;

drivers/net/phy/dp83867.c+1−5

 {
 	int err;
-	err = phy_write(phydev, DP83867_CTRL, DP83867_SW_RESET);
+	err = phy_write(phydev, DP83867_CTRL, DP83867_SW_RESTART);
 	if (err < 0)
 		return err;
 	usleep_range(10, 20);
-	/* After reset FORCE_LINK_GOOD bit is set. Although the
-	 * default value should be unset. Disable FORCE_LINK_GOOD
-	 * for the phy to work properly.
-	 */
 	return phy_modify(phydev, MII_DP83867_PHYCTRL,
 			 DP83867_PHYCR_FORCE_LINK_GOOD, 0);
 }

drivers/net/phy/mdio_bus.c+2−1

@@ -607,7 +607,8 @@ void mdiobus_unregister(struct mii_bus *bus) · 606 unmodified lines
607	struct mdio_device *mdiodev;	607	struct mdio_device *mdiodev;
608	int i;	608	int i;
609		609
610	BUG_ON(bus->state != MDIOBUS_REGISTERED);	610	if (WARN_ON_ONCE(bus->state != MDIOBUS_REGISTERED))
		611	return;
611	bus->state = MDIOBUS_UNREGISTERED;	612	bus->state = MDIOBUS_UNREGISTERED;
612		613
613	for (i = 0; i < PHY_MAX_ADDR; i++) {	614	for (i = 0; i < PHY_MAX_ADDR; i++) {

drivers/net/usb/cdc_eem.c+2−2

  * for transport over USB using a simpler USB device model than the
  * previous CDC "Ethernet Control Model" (ECM, or "CDC Ethernet").
  *
- * For details, see www.usb.org/developers/devclass_docs/CDC_EEM10.pdf
+ * For details, see https://usb.org/sites/default/files/CDC_EEM10.pdf
  *
  * This version has been tested with GIGAntIC WuaoW SIM Smart Card on 2.6.24,
  * 2.6.27 and 2.6.30rc2 kernel.
 	}
 	skb2 = skb_copy_expand(skb, EEM_HEAD, ETH_FCS_LEN + padlen, flags);
+	dev_kfree_skb_any(skb);
 	if (!skb2)
 		return NULL;
-	dev_kfree_skb_any(skb);
 	skb = skb2;
 done:

drivers/net/usb/cdc_ncm.c+1−1

@@ -1880,7 +1880,7 @@ static void cdc_ncm_status(struct usbnet dev, struct urb urb) · 1879 unmodified lines
1880	static const struct driver_info cdc_ncm_info = {	1880	static const struct driver_info cdc_ncm_info = {
1881	.description = "CDC NCM",	1881	.description = "CDC NCM",
1882	.flags = FLAG_POINTTOPOINT \| FLAG_NO_SETINT \| FLAG_MULTI_PACKET	1882	.flags = FLAG_POINTTOPOINT \| FLAG_NO_SETINT \| FLAG_MULTI_PACKET
1883	\| FLAG_LINK_INTR,	1883	\| FLAG_LINK_INTR \| FLAG_ETHER,
1884	.bind = cdc_ncm_bind,	1884	.bind = cdc_ncm_bind,
1885	.unbind = cdc_ncm_unbind,	1885	.unbind = cdc_ncm_unbind,
1886	.manage_power = usbnet_manage_power,	1886	.manage_power = usbnet_manage_power,

drivers/net/usb/hso.c+22−23

@@ -1689,7 +1689,7 @@ static int hso_serial_tiocmset(struct tty_struct *tty, · 1688 unmodified lines
1689	spin_unlock_irqrestore(&serial->serial_lock, flags);	1689	spin_unlock_irqrestore(&serial->serial_lock, flags);
1690		1690
1691	return usb_control_msg(serial->parent->usb,	1691	return usb_control_msg(serial->parent->usb,
1692	usb_rcvctrlpipe(serial->parent->usb, 0), 0x22,	1692	usb_sndctrlpipe(serial->parent->usb, 0), 0x22,
1693	0x21, val, if_num, NULL, 0,	1693	0x21, val, if_num, NULL, 0,
1694	USB_CTRL_SET_TIMEOUT);	1694	USB_CTRL_SET_TIMEOUT);
1695	}	1695	}
@@ -2436,7 +2436,7 @@ static int hso_rfkill_set_block(void *data, bool blocked) · 740 unmodified lines
2436	if (hso_dev->usb_gone)	2436	if (hso_dev->usb_gone)
2437	rv = 0;	2437	rv = 0;
2438	else	2438	else
2439	rv = usb_control_msg(hso_dev->usb, usb_rcvctrlpipe(hso_dev->usb, 0),	2439	rv = usb_control_msg(hso_dev->usb, usb_sndctrlpipe(hso_dev->usb, 0),
2440	enabled ? 0x82 : 0x81, 0x40, 0, 0, NULL, 0,	2440	enabled ? 0x82 : 0x81, 0x40, 0, 0, NULL, 0,
2441	USB_CTRL_SET_TIMEOUT);	2441	USB_CTRL_SET_TIMEOUT);
2442	mutex_unlock(&hso_dev->mutex);	2442	mutex_unlock(&hso_dev->mutex);
@@ -2618,32 +2618,31 @@ static struct hso_device *hso_create_bulk_serial_device( · 175 unmodified lines
2618	num_urbs = 2;	2618	num_urbs = 2;
2619	serial->tiocmget = kzalloc(sizeof(struct hso_tiocmget),	2619	serial->tiocmget = kzalloc(sizeof(struct hso_tiocmget),
2620	GFP_KERNEL);	2620	GFP_KERNEL);
		2621	if (!serial->tiocmget)
		2622	goto exit;
2621	serial->tiocmget->serial_state_notification	2623	serial->tiocmget->serial_state_notification
2622	= kzalloc(sizeof(struct hso_serial_state_notification),	2624	= kzalloc(sizeof(struct hso_serial_state_notification),
2623	GFP_KERNEL);	2625	GFP_KERNEL);
2624	/* it isn't going to break our heart if serial->tiocmget	2626	if (!serial->tiocmget->serial_state_notification)
2625	* allocation fails don't bother checking this.	2627	goto exit;
2626	*/	2628	tiocmget = serial->tiocmget;
2627	if (serial->tiocmget && serial->tiocmget->serial_state_notification) {	2629	tiocmget->endp = hso_get_ep(interface,
2628	tiocmget = serial->tiocmget;	2630	USB_ENDPOINT_XFER_INT,
2629	tiocmget->endp = hso_get_ep(interface,	2631	USB_DIR_IN);
2630	USB_ENDPOINT_XFER_INT,	2632	if (!tiocmget->endp) {
2631	USB_DIR_IN);	2633	dev_err(&interface->dev, "Failed to find INT IN ep\n");
2632	if (!tiocmget->endp) {	2634	goto exit;
2633	dev_err(&interface->dev, "Failed to find INT IN ep\n");
2634	goto exit;
2635	}
2636
2637	tiocmget->urb = usb_alloc_urb(0, GFP_KERNEL);
2638	if (tiocmget->urb) {
2639	mutex_init(&tiocmget->mutex);
2640	init_waitqueue_head(&tiocmget->waitq);
2641	} else
2642	hso_free_tiomget(serial);
2643	}	2635	}
2644	}	2636
2645	else	2637	tiocmget->urb = usb_alloc_urb(0, GFP_KERNEL);
		2638	if (!tiocmget->urb)
		2639	goto exit;
		2640
		2641	mutex_init(&tiocmget->mutex);
		2642	init_waitqueue_head(&tiocmget->waitq);
		2643	} else {
2646	num_urbs = 1;	2644	num_urbs = 1;
		2645	}
2647		2646
2648	if (hso_serial_common_create(serial, num_urbs, BULK_URB_RX_SIZE,	2647	if (hso_serial_common_create(serial, num_urbs, BULK_URB_RX_SIZE,
2649	BULK_URB_TX_SIZE))	2648	BULK_URB_TX_SIZE))

drivers/net/usb/lan78xx.c+1−0

@@ -1645,6 +1645,7 @@ static const struct ethtool_ops lan78xx_ethtool_ops = { · 1644 unmodified lines
1645	.get_strings = lan78xx_get_strings,	1645	.get_strings = lan78xx_get_strings,
1646	.get_wol = lan78xx_get_wol,	1646	.get_wol = lan78xx_get_wol,
1647	.set_wol = lan78xx_set_wol,	1647	.set_wol = lan78xx_set_wol,
		1648	.get_ts_info = ethtool_op_get_ts_info,
1648	.get_eee = lan78xx_get_eee,	1649	.get_eee = lan78xx_get_eee,
1649	.set_eee = lan78xx_set_eee,	1650	.set_eee = lan78xx_set_eee,
1650	.get_pauseparam = lan78xx_get_pause,	1651	.get_pauseparam = lan78xx_get_pause,

drivers/net/usb/qmi_wwan.c+1−1

@@ -575,7 +575,7 @@ static int qmi_wwan_rx_fixup(struct usbnet dev, struct sk_buff skb) · 574 unmodified lines
575		575
576	if (info->flags & QMI_WWAN_FLAG_PASS_THROUGH) {	576	if (info->flags & QMI_WWAN_FLAG_PASS_THROUGH) {
577	skb->protocol = htons(ETH_P_MAP);	577	skb->protocol = htons(ETH_P_MAP);
578	return (netif_rx(skb) == NET_RX_SUCCESS);	578	return 1;
579	}	579	}
580		580
581	switch (skb->data[0] & 0xf0) {	581	switch (skb->data[0] & 0xf0) {

drivers/net/usb/r8152.c+38−6

 	tp->coalesce = 15000;	/* 15 us */
 }
+static bool rtl_check_vendor_ok(struct usb_interface *intf)
+{
+	struct usb_host_interface *alt = intf->cur_altsetting;
+	struct usb_endpoint_descriptor *in, *out, *intr;
+	if (usb_find_common_endpoints(alt, &in, &out, &intr, NULL) < 0) {
+		dev_err(&intf->dev, "Expected endpoints are not found\n");
+		return false;
+	}
+	/* Check Rx endpoint address */
+	if (usb_endpoint_num(in) != 1) {
+		dev_err(&intf->dev, "Invalid Rx endpoint address\n");
+		return false;
+	}
+	/* Check Tx endpoint address */
+	if (usb_endpoint_num(out) != 2) {
+		dev_err(&intf->dev, "Invalid Tx endpoint address\n");
+		return false;
+	}
+	/* Check interrupt endpoint address */
+	if (usb_endpoint_num(intr) != 3) {
+		dev_err(&intf->dev, "Invalid interrupt endpoint address\n");
+		return false;
+	}
+	return true;
+}
 static bool rtl_vendor_mode(struct usb_interface *intf)
 {
 	struct usb_host_interface *alt = intf->cur_altsetting;
 	int i, num_configs;
 	if (alt->desc.bInterfaceClass == USB_CLASS_VENDOR_SPEC)
-		return true;
+		return rtl_check_vendor_ok(intf);
 	/* The vendor mode is not always config #1, so to find it out. */
 	udev = interface_to_usbdev(intf);
 	c = udev->config;
 	num_configs = udev->descriptor.bNumConfigurations;
+	if (num_configs < 2)
+		return false;
 	for (i = 0; i < num_configs; (i++, c++)) {
 		struct usb_interface_descriptor	*desc = NULL;
 		}
 	}
-	WARN_ON_ONCE(i == num_configs);
+	if (i == num_configs)
+		dev_err(&intf->dev, "Unexpected Device\n");
 	return false;
 }
 {
 	switch (stringset) {
 	case ETH_SS_STATS:
-		memcpy(data, *rtl8152_gstrings, sizeof(rtl8152_gstrings));
+		memcpy(data, rtl8152_gstrings, sizeof(rtl8152_gstrings));
 		break;
 	}
 }
 	if (!rtl_vendor_mode(intf))
 		return -ENODEV;
-	if (intf->cur_altsetting->desc.bNumEndpoints < 3)
-		return -ENODEV;
 	usb_reset_device(udev);
 	netdev = alloc_etherdev(sizeof(struct r8152));
 	if (!netdev) {

drivers/net/usb/smsc75xx.c+9−3

 	ret = smsc75xx_wait_ready(dev, 0);
 	if (ret < 0) {
 		netdev_warn(dev->net, "device not ready in smsc75xx_bind\n");
-		return ret;
+		goto free_pdata;
 	}
 	smsc75xx_init_mac_address(dev);
 	ret = smsc75xx_reset(dev);
 	if (ret < 0) {
 		netdev_warn(dev->net, "smsc75xx_reset error %d\n", ret);
-		return ret;
+		goto cancel_work;
 	}
 	dev->net->netdev_ops = &smsc75xx_netdev_ops;
 	dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
 	dev->net->max_mtu = MAX_SINGLE_PACKET_SIZE;
 	return 0;
+cancel_work:
+	cancel_work_sync(&pdata->set_multicast);
+free_pdata:
+	kfree(pdata);
+	dev->data[0] = 0;
+	return ret;
 }
 static void smsc75xx_unbind(struct usbnet *dev, struct usb_interface *intf)
 		cancel_work_sync(&pdata->set_multicast);
 		netif_dbg(dev, ifdown, dev->net, "free pdata\n");
 		kfree(pdata);
-		pdata = NULL;
 		dev->data[0] = 0;
 	}
 }

drivers/net/virtio_net.c+8−12

 	/* If headroom is not 0, there is an offset between the beginning of the
 	 * data and the allocated space, otherwise the data and the allocated
 	 * space are aligned.
+	 *
+	 * Buffers with headroom use PAGE_SIZE as alloc size, see
+	 * add_recvbuf_mergeable() + get_mergeable_buf_len()
 	 */
-	if (headroom) {
+	truesize = headroom ? PAGE_SIZE : truesize;
-		/* Buffers with headroom use PAGE_SIZE as alloc size,
+	tailroom = truesize - len - headroom - (hdr_padded_len - hdr_len);
-		 * see add_recvbuf_mergeable() + get_mergeable_buf_len()
+	buf = p - headroom;
-		 */
-		truesize = PAGE_SIZE;
-		tailroom = truesize - len - offset;
-		buf = page_address(page);
-	} else {
-		tailroom = truesize - len;
-		buf = p;
-	}
 	len -= hdr_len;
 	offset += hdr_padded_len;
 				put_page(page);
 				head_skb = page_to_skb(vi, rq, xdp_page, offset,
 						       len, PAGE_SIZE, false,
-						       metasize, headroom);
+						       metasize,
+						       VIRTIO_XDP_HEADROOM);
 				return head_skb;
 			}
 			break;

drivers/net/vrf.c+2−4

 	dev->flags = IFF_MASTER | IFF_NOARP;
-	/* MTU is irrelevant for VRF device; set to 64k similar to lo */
-	dev->mtu = 64 * 1024;
 	/* similarly, oper state is irrelevant; set to up to avoid confusion */
 	dev->operstate = IF_OPER_UP;
 	netdev_lockdep_set_classes(dev);
 	 * which breaks networking.
 	 */
 	dev->min_mtu = IPV6_MIN_MTU;
-	dev->max_mtu = ETH_MAX_MTU;
+	dev->max_mtu = IP6_MAX_MTU;
+	dev->mtu = dev->max_mtu;
 }
 static int vrf_validate(struct nlattr *tb[], struct nlattr *data[],

drivers/net/wireguard/Makefile+1−2

@@ -1,5 +1,4 @@
1	ccflags-y := -O3	1	ccflags-y := -D'pr_fmt(fmt)=KBUILD_MODNAME ": " fmt'
2	ccflags-y += -D'pr_fmt(fmt)=KBUILD_MODNAME ": " fmt'
3	ccflags-$(CONFIG_WIREGUARD_DEBUG) += -DDEBUG	2	ccflags-$(CONFIG_WIREGUARD_DEBUG) += -DDEBUG
4	wireguard-y := main.o	3	wireguard-y := main.o
5	wireguard-y += noise.o	4	wireguard-y += noise.o

drivers/net/wireguard/allowedips.c+99−90

@@ -6,6 +6,8 @@ · 5 unmodified lines
6	#include "allowedips.h"	6	#include "allowedips.h"
7	#include "peer.h"	7	#include "peer.h"
8		8
		9	static struct kmem_cache *node_cache;
		10
9	static void swap_endian(u8 dst, const u8 src, u8 bits)	11	static void swap_endian(u8 dst, const u8 src, u8 bits)
10	{	12	{
11	if (bits == 32) {	13	if (bits == 32) {
@@ -28,8 +30,11 @@ static void copy_and_assign_cidr(struct allowedips_node node, const u8 src, · 16 unmodified lines
28	node->bitlen = bits;	30	node->bitlen = bits;
29	memcpy(node->bits, src, bits / 8U);	31	memcpy(node->bits, src, bits / 8U);
30	}	32	}
31	#define CHOOSE_NODE(parent, key) \	33
32	parent->bit[(key[parent->bit_at_a] >> parent->bit_at_b) & 1]	34	static inline u8 choose(struct allowedips_node node, const u8 key)
		35	{
		36	return (key[node->bit_at_a] >> node->bit_at_b) & 1;
		37	}
33		38
34	static void push_rcu(struct allowedips_node **stack,	39	static void push_rcu(struct allowedips_node **stack,
35	struct allowedips_node __rcu p, unsigned int len)	40	struct allowedips_node __rcu p, unsigned int len)
@@ -40,6 +45,11 @@ static void push_rcu(struct allowedips_node **stack, · 4 unmodified lines
40	}	45	}
41	}	46	}
42		47
		48	static void node_free_rcu(struct rcu_head *rcu)
		49	{
		50	kmem_cache_free(node_cache, container_of(rcu, struct allowedips_node, rcu));
		51	}
		52
43	static void root_free_rcu(struct rcu_head *rcu)	53	static void root_free_rcu(struct rcu_head *rcu)
44	{	54	{
45	struct allowedips_node node, stack[128] = {	55	struct allowedips_node node, stack[128] = {
@@ -49,7 +59,7 @@ static void root_free_rcu(struct rcu_head *rcu) · 3 unmodified lines
49	while (len > 0 && (node = stack[--len])) {	59	while (len > 0 && (node = stack[--len])) {
50	push_rcu(stack, node->bit[0], &len);	60	push_rcu(stack, node->bit[0], &len);
51	push_rcu(stack, node->bit[1], &len);	61	push_rcu(stack, node->bit[1], &len);
52	kfree(node);	62	kmem_cache_free(node_cache, node);
53	}	63	}
54	}	64	}
55		65
@@ -66,60 +76,6 @@ static void root_remove_peer_lists(struct allowedips_node *root) · 10 unmodified lines
66	}	76	}
67	}	77	}
68		78
69	static void walk_remove_by_peer(struct allowedips_node __rcu **top,
70	struct wg_peer peer, struct mutex lock)
71	{
72	#define REF(p) rcu_access_pointer(p)
73	#define DEREF(p) rcu_dereference_protected(*(p), lockdep_is_held(lock))
74	#define PUSH(p) ({ \
75	WARN_ON(IS_ENABLED(DEBUG) && len >= 128); \
76	stack[len++] = p; \
77	})
78
79	struct allowedips_node __rcu stack[128], nptr;
80	struct allowedips_node node, prev;
81	unsigned int len;
82
83	if (unlikely(!peer \|\| !REF(*top)))
84	return;
85
86	for (prev = NULL, len = 0, PUSH(top); len > 0; prev = node) {
87	nptr = stack[len - 1];
88	node = DEREF(nptr);
89	if (!node) {
90	--len;
91	continue;
92	}
93	if (!prev \|\| REF(prev->bit[0]) == node \|\|
94	REF(prev->bit[1]) == node) {
95	if (REF(node->bit[0]))
96	PUSH(&node->bit[0]);
97	else if (REF(node->bit[1]))
98	PUSH(&node->bit[1]);
99	} else if (REF(node->bit[0]) == prev) {
100	if (REF(node->bit[1]))
101	PUSH(&node->bit[1]);
102	} else {
103	if (rcu_dereference_protected(node->peer,
104	lockdep_is_held(lock)) == peer) {
105	RCU_INIT_POINTER(node->peer, NULL);
106	list_del_init(&node->peer_list);
107	if (!node->bit[0] \|\| !node->bit[1]) {
108	rcu_assign_pointer(*nptr, DEREF(
109	&node->bit[!REF(node->bit[0])]));
110	kfree_rcu(node, rcu);
111	node = DEREF(nptr);
112	}
113	}
114	--len;
115	}
116	}
117
118	#undef REF
119	#undef DEREF
120	#undef PUSH
121	}
122
123	static unsigned int fls128(u64 a, u64 b)	79	static unsigned int fls128(u64 a, u64 b)
124	{	80	{
125	return a ? fls64(a) + 64U : fls64(b);	81	return a ? fls64(a) + 64U : fls64(b);
@@ -159,7 +115,7 @@ static struct allowedips_node find_node(struct allowedips_node trie, u8 bits, · 33 unmodified lines
159	found = node;	115	found = node;
160	if (node->cidr == bits)	116	if (node->cidr == bits)
161	break;	117	break;
162	node = rcu_dereference_bh(CHOOSE_NODE(node, key));	118	node = rcu_dereference_bh(node->bit[choose(node, key)]);
163	}	119	}
164	return found;	120	return found;
165	}	121	}
@@ -191,8 +147,7 @@ static bool node_placement(struct allowedips_node __rcu trie, const u8 key, · 25 unmodified lines
191	u8 cidr, u8 bits, struct allowedips_node **rnode,	147	u8 cidr, u8 bits, struct allowedips_node **rnode,
192	struct mutex *lock)	148	struct mutex *lock)
193	{	149	{
194	struct allowedips_node *node = rcu_dereference_protected(trie,	150	struct allowedips_node *node = rcu_dereference_protected(trie, lockdep_is_held(lock));
195	lockdep_is_held(lock));
196	struct allowedips_node *parent = NULL;	151	struct allowedips_node *parent = NULL;
197	bool exact = false;	152	bool exact = false;
198		153
@@ -202,13 +157,24 @@ static bool node_placement(struct allowedips_node __rcu trie, const u8 key, · 3 unmodified lines
202	exact = true;	157	exact = true;
203	break;	158	break;
204	}	159	}
205	node = rcu_dereference_protected(CHOOSE_NODE(parent, key),	160	node = rcu_dereference_protected(parent->bit[choose(parent, key)], lockdep_is_held(lock));
206	lockdep_is_held(lock));
207	}	161	}
208	*rnode = parent;	162	*rnode = parent;
209	return exact;	163	return exact;
210	}	164	}
211		165
		166	static inline void connect_node(struct allowedips_node *parent, u8 bit, struct allowedips_node node)
		167	{
		168	node->parent_bit_packed = (unsigned long)parent \| bit;
		169	rcu_assign_pointer(*parent, node);
		170	}
		171
		172	static inline void choose_and_connect_node(struct allowedips_node parent, struct allowedips_node node)
		173	{
		174	u8 bit = choose(parent, node->bits);
		175	connect_node(&parent->bit[bit], bit, node);
		176	}
		177
212	static int add(struct allowedips_node __rcu *trie, u8 bits, const u8 key,	178	static int add(struct allowedips_node __rcu *trie, u8 bits, const u8 key,
213	u8 cidr, struct wg_peer peer, struct mutex lock)	179	u8 cidr, struct wg_peer peer, struct mutex lock)
214	{	180	{
@@ -218,13 +184,13 @@ static int add(struct allowedips_node __rcu *trie, u8 bits, const u8 key, · 3 unmodified lines
218	return -EINVAL;	184	return -EINVAL;
219		185
220	if (!rcu_access_pointer(*trie)) {	186	if (!rcu_access_pointer(*trie)) {
221	node = kzalloc(sizeof(*node), GFP_KERNEL);	187	node = kmem_cache_zalloc(node_cache, GFP_KERNEL);
222	if (unlikely(!node))	188	if (unlikely(!node))
223	return -ENOMEM;	189	return -ENOMEM;
224	RCU_INIT_POINTER(node->peer, peer);	190	RCU_INIT_POINTER(node->peer, peer);
225	list_add_tail(&node->peer_list, &peer->allowedips_list);	191	list_add_tail(&node->peer_list, &peer->allowedips_list);
226	copy_and_assign_cidr(node, key, cidr, bits);	192	copy_and_assign_cidr(node, key, cidr, bits);
227	rcu_assign_pointer(*trie, node);	193	connect_node(trie, 2, node);
228	return 0;	194	return 0;
229	}	195	}
230	if (node_placement(*trie, key, cidr, bits, &node, lock)) {	196	if (node_placement(*trie, key, cidr, bits, &node, lock)) {
@@ -233,7 +199,7 @@ static int add(struct allowedips_node __rcu *trie, u8 bits, const u8 key, · 2 unmodified lines
233	return 0;	199	return 0;
234	}	200	}
235		201
236	newnode = kzalloc(sizeof(*newnode), GFP_KERNEL);	202	newnode = kmem_cache_zalloc(node_cache, GFP_KERNEL);
237	if (unlikely(!newnode))	203	if (unlikely(!newnode))
238	return -ENOMEM;	204	return -ENOMEM;
239	RCU_INIT_POINTER(newnode->peer, peer);	205	RCU_INIT_POINTER(newnode->peer, peer);
@@ -243,10 +209,10 @@ static int add(struct allowedips_node __rcu *trie, u8 bits, const u8 key, · 3 unmodified lines
243	if (!node) {	209	if (!node) {
244	down = rcu_dereference_protected(*trie, lockdep_is_held(lock));	210	down = rcu_dereference_protected(*trie, lockdep_is_held(lock));
245	} else {	211	} else {
246	down = rcu_dereference_protected(CHOOSE_NODE(node, key),	212	const u8 bit = choose(node, key);
247	lockdep_is_held(lock));	213	down = rcu_dereference_protected(node->bit[bit], lockdep_is_held(lock));
248	if (!down) {	214	if (!down) {
249	rcu_assign_pointer(CHOOSE_NODE(node, key), newnode);	215	connect_node(&node->bit[bit], bit, newnode);
250	return 0;	216	return 0;
251	}	217	}
252	}	218	}
@@ -254,30 +220,29 @@ static int add(struct allowedips_node __rcu *trie, u8 bits, const u8 key, · 1 unmodified line
254	parent = node;	220	parent = node;
255		221
256	if (newnode->cidr == cidr) {	222	if (newnode->cidr == cidr) {
257	rcu_assign_pointer(CHOOSE_NODE(newnode, down->bits), down);	223	choose_and_connect_node(newnode, down);
258	if (!parent)	224	if (!parent)
259	rcu_assign_pointer(*trie, newnode);	225	connect_node(trie, 2, newnode);
260	else	226	else
261	rcu_assign_pointer(CHOOSE_NODE(parent, newnode->bits),	227	choose_and_connect_node(parent, newnode);
262	newnode);	228	return 0;
263	} else {	229	}
264	node = kzalloc(sizeof(*node), GFP_KERNEL);
265	if (unlikely(!node)) {
266	list_del(&newnode->peer_list);
267	kfree(newnode);
268	return -ENOMEM;
269	}
270	INIT_LIST_HEAD(&node->peer_list);
271	copy_and_assign_cidr(node, newnode->bits, cidr, bits);
272		230
273	rcu_assign_pointer(CHOOSE_NODE(node, down->bits), down);	231	node = kmem_cache_zalloc(node_cache, GFP_KERNEL);
274	rcu_assign_pointer(CHOOSE_NODE(node, newnode->bits), newnode);	232	if (unlikely(!node)) {
275	if (!parent)	233	list_del(&newnode->peer_list);
276	rcu_assign_pointer(*trie, node);	234	kmem_cache_free(node_cache, newnode);
277	else	235	return -ENOMEM;
278	rcu_assign_pointer(CHOOSE_NODE(parent, node->bits),
279	node);
280	}	236	}
		237	INIT_LIST_HEAD(&node->peer_list);
		238	copy_and_assign_cidr(node, newnode->bits, cidr, bits);
		239
		240	choose_and_connect_node(node, down);
		241	choose_and_connect_node(node, newnode);
		242	if (!parent)
		243	connect_node(trie, 2, node);
		244	else
		245	choose_and_connect_node(parent, node);
281	return 0;	246	return 0;
282	}	247	}
283		248
@@ -335,9 +300,41 @@ int wg_allowedips_insert_v6(struct allowedips table, const struct in6_addr ip, · 51 unmodified lines
335	void wg_allowedips_remove_by_peer(struct allowedips *table,	300	void wg_allowedips_remove_by_peer(struct allowedips *table,
336	struct wg_peer peer, struct mutex lock)	301	struct wg_peer peer, struct mutex lock)
337	{	302	{
		303	struct allowedips_node node, child, *parent_bit, parent, *tmp;
		304	bool free_parent;
		305
		306	if (list_empty(&peer->allowedips_list))
		307	return;
338	++table->seq;	308	++table->seq;
339	walk_remove_by_peer(&table->root4, peer, lock);	309	list_for_each_entry_safe(node, tmp, &peer->allowedips_list, peer_list) {
340	walk_remove_by_peer(&table->root6, peer, lock);	310	list_del_init(&node->peer_list);
		311	RCU_INIT_POINTER(node->peer, NULL);
		312	if (node->bit[0] && node->bit[1])
		313	continue;
		314	child = rcu_dereference_protected(node->bit[!rcu_access_pointer(node->bit[0])],
		315	lockdep_is_held(lock));
		316	if (child)
		317	child->parent_bit_packed = node->parent_bit_packed;
		318	parent_bit = (struct allowedips_node **)(node->parent_bit_packed & ~3UL);
		319	*parent_bit = child;
		320	parent = (void *)parent_bit -
		321	offsetof(struct allowedips_node, bit[node->parent_bit_packed & 1]);
		322	free_parent = !rcu_access_pointer(node->bit[0]) &&
		323	!rcu_access_pointer(node->bit[1]) &&
		324	(node->parent_bit_packed & 3) <= 1 &&
		325	!rcu_access_pointer(parent->peer);
		326	if (free_parent)
		327	child = rcu_dereference_protected(
		328	parent->bit[!(node->parent_bit_packed & 1)],
		329	lockdep_is_held(lock));
		330	call_rcu(&node->rcu, node_free_rcu);
		331	if (!free_parent)
		332	continue;
		333	if (child)
		334	child->parent_bit_packed = parent->parent_bit_packed;
		335	(struct allowedips_node *)(parent->parent_bit_packed & ~3UL) = child;
		336	call_rcu(&parent->rcu, node_free_rcu);
		337	}
341	}	338	}
342		339
343	int wg_allowedips_read_node(struct allowedips_node node, u8 ip[16], u8 cidr)	340	int wg_allowedips_read_node(struct allowedips_node node, u8 ip[16], u8 cidr)
@@ -374,4 +371,16 @@ struct wg_peer wg_allowedips_lookup_src(struct allowedips table, · 30 unmodified lines
374	return NULL;	371	return NULL;
375	}	372	}
376		373
		374	int __init wg_allowedips_slab_init(void)
		375	{
		376	node_cache = KMEM_CACHE(allowedips_node, 0);
		377	return node_cache ? 0 : -ENOMEM;
		378	}
		379
		380	void wg_allowedips_slab_uninit(void)
		381	{
		382	rcu_barrier();
		383	kmem_cache_destroy(node_cache);
		384	}
		385
377	#include "selftest/allowedips.c"	386	#include "selftest/allowedips.c"

drivers/net/wireguard/allowedips.h+7−7

 struct allowedips_node {
 	struct wg_peer __rcu *peer;
 	struct allowedips_node __rcu *bit[2];
-	/* While it may seem scandalous that we waste space for v4,
-	 * we're alloc'ing to the nearest power of 2 anyway, so this
-	 * doesn't actually make a difference.
-	 */
-	u8 bits[16] __aligned(__alignof(u64));
 	u8 cidr, bit_at_a, bit_at_b, bitlen;
+	u8 bits[16] __aligned(__alignof(u64));
-	/* Keep rarely used list at bottom to be beyond cache line. */
+	/* Keep rarely used members at bottom to be beyond cache line. */
+	unsigned long parent_bit_packed;
 	union {
 		struct list_head peer_list;
 		struct rcu_head rcu;
 	struct allowedips_node __rcu *root4;
 	struct allowedips_node __rcu *root6;
 	u64 seq;
-};
+} __aligned(4); /* We pack the lower 2 bits of &root, but m68k only gives 16-bit alignment. */
 void wg_allowedips_init(struct allowedips *table);
 void wg_allowedips_free(struct allowedips *table, struct mutex *mutex);
 bool wg_allowedips_selftest(void);
 #endif
+int wg_allowedips_slab_init(void);
+void wg_allowedips_slab_uninit(void);
 #endif /* _WG_ALLOWEDIPS_H */

drivers/net/wireguard/main.c+16−1

 {
 	int ret;
+	ret = wg_allowedips_slab_init();
+	if (ret < 0)
+		goto err_allowedips;
 #ifdef DEBUG
+	ret = -ENOTRECOVERABLE;
 	if (!wg_allowedips_selftest() || !wg_packet_counter_selftest() ||
 	    !wg_ratelimiter_selftest())
-		return -ENOTRECOVERABLE;
+		goto err_peer;
 #endif
 	wg_noise_init();
+	ret = wg_peer_init();
+	if (ret < 0)
+		goto err_peer;
 	ret = wg_device_init();
 	if (ret < 0)
 		goto err_device;
 err_netlink:
 	wg_device_uninit();
 err_device:
+	wg_peer_uninit();
+err_peer:
+	wg_allowedips_slab_uninit();
+err_allowedips:
 	return ret;
 }
 {
 	wg_genetlink_uninit();
 	wg_device_uninit();
+	wg_peer_uninit();
+	wg_allowedips_slab_uninit();
 }
 module_init(mod_init);

drivers/net/wireguard/peer.c+20−7

 #include <linux/rcupdate.h>
 #include <linux/list.h>
+static struct kmem_cache *peer_cache;
 static atomic64_t peer_counter = ATOMIC64_INIT(0);
 struct wg_peer *wg_peer_create(struct wg_device *wg,
 	if (wg->num_peers >= MAX_PEERS_PER_DEVICE)
 		return ERR_PTR(ret);
-	peer = kzalloc(sizeof(*peer), GFP_KERNEL);
+	peer = kmem_cache_zalloc(peer_cache, GFP_KERNEL);
 	if (unlikely(!peer))
 		return ERR_PTR(ret);
-	if (dst_cache_init(&peer->endpoint_cache, GFP_KERNEL))
+	if (unlikely(dst_cache_init(&peer->endpoint_cache, GFP_KERNEL)))
 		goto err;
 	peer->device = wg;
 	return peer;
 err:
-	kfree(peer);
+	kmem_cache_free(peer_cache, peer);
 	return ERR_PTR(ret);
 }
 	/* Mark as dead, so that we don't allow jumping contexts after. */
 	WRITE_ONCE(peer->is_dead, true);
-	/* The caller must now synchronize_rcu() for this to take effect. */
+	/* The caller must now synchronize_net() for this to take effect. */
 }
 static void peer_remove_after_dead(struct wg_peer *peer)
 	lockdep_assert_held(&peer->device->device_update_lock);
 	peer_make_dead(peer);
-	synchronize_rcu();
+	synchronize_net();
 	peer_remove_after_dead(peer);
 }
 		peer_make_dead(peer);
 		list_add_tail(&peer->peer_list, &dead_peers);
 	}
-	synchronize_rcu();
+	synchronize_net();
 	list_for_each_entry_safe(peer, temp, &dead_peers, peer_list)
 		peer_remove_after_dead(peer);
 }
 	/* The final zeroing takes care of clearing any remaining handshake key
 	 * material and other potentially sensitive information.
 	 */
-	kfree_sensitive(peer);
+	memzero_explicit(peer, sizeof(*peer));
+	kmem_cache_free(peer_cache, peer);
 }
 static void kref_release(struct kref *refcount)
 		return;
 	kref_put(&peer->refcount, kref_release);
 }
+int __init wg_peer_init(void)
+{
+	peer_cache = KMEM_CACHE(wg_peer, 0);
+	return peer_cache ? 0 : -ENOMEM;
+}
+void wg_peer_uninit(void)
+{
+	kmem_cache_destroy(peer_cache);
+}

drivers/net/wireguard/peer.h+3−0

@@ -80,4 +80,7 @@ void wg_peer_put(struct wg_peer *peer); · 79 unmodified lines
80	void wg_peer_remove(struct wg_peer *peer);	80	void wg_peer_remove(struct wg_peer *peer);
81	void wg_peer_remove_all(struct wg_device *wg);	81	void wg_peer_remove_all(struct wg_device *wg);
82		82
		83	int wg_peer_init(void);
		84	void wg_peer_uninit(void);
		85
83	#endif /* _WG_PEER_H */	86	#endif /* _WG_PEER_H */

drivers/net/wireguard/selftest/allowedips.c+79−86

@@ -19,32 +19,22 @@ · 18 unmodified lines
19		19
20	#include <linux/siphash.h>	20	#include <linux/siphash.h>
21		21
22	static __init void swap_endian_and_apply_cidr(u8 dst, const u8 src, u8 bits,
23	u8 cidr)
24	{
25	swap_endian(dst, src, bits);
26	memset(dst + (cidr + 7) / 8, 0, bits / 8 - (cidr + 7) / 8);
27	if (cidr)
28	dst[(cidr + 7) / 8 - 1] &= ~0U << ((8 - (cidr % 8)) % 8);
29	}
30
31	static __init void print_node(struct allowedips_node *node, u8 bits)	22	static __init void print_node(struct allowedips_node *node, u8 bits)
32	{	23	{
33	char *fmt_connection = KERN_DEBUG "\t\"%p/%d\" -> \"%p/%d\";\n";	24	char *fmt_connection = KERN_DEBUG "\t\"%p/%d\" -> \"%p/%d\";\n";
34	char *fmt_declaration = KERN_DEBUG	25	char *fmt_declaration = KERN_DEBUG "\t\"%p/%d\"[style=%s, color=\"#%06x\"];\n";
35	"\t\"%p/%d\"[style=%s, color=\"#%06x\"];\n";	26	u8 ip1[16], ip2[16], cidr1, cidr2;
36	char *style = "dotted";	27	char *style = "dotted";
37	u8 ip1[16], ip2[16];
38	u32 color = 0;	28	u32 color = 0;
39		29
		30	if (node == NULL)
		31	return;
40	if (bits == 32) {	32	if (bits == 32) {
41	fmt_connection = KERN_DEBUG "\t\"%pI4/%d\" -> \"%pI4/%d\";\n";	33	fmt_connection = KERN_DEBUG "\t\"%pI4/%d\" -> \"%pI4/%d\";\n";
42	fmt_declaration = KERN_DEBUG	34	fmt_declaration = KERN_DEBUG "\t\"%pI4/%d\"[style=%s, color=\"#%06x\"];\n";
43	"\t\"%pI4/%d\"[style=%s, color=\"#%06x\"];\n";
44	} else if (bits == 128) {	35	} else if (bits == 128) {
45	fmt_connection = KERN_DEBUG "\t\"%pI6/%d\" -> \"%pI6/%d\";\n";	36	fmt_connection = KERN_DEBUG "\t\"%pI6/%d\" -> \"%pI6/%d\";\n";
46	fmt_declaration = KERN_DEBUG	37	fmt_declaration = KERN_DEBUG "\t\"%pI6/%d\"[style=%s, color=\"#%06x\"];\n";
47	"\t\"%pI6/%d\"[style=%s, color=\"#%06x\"];\n";
48	}	38	}
49	if (node->peer) {	39	if (node->peer) {
50	hsiphash_key_t key = { { 0 } };	40	hsiphash_key_t key = { { 0 } };
@@ -55,24 +45,20 @@ static __init void print_node(struct allowedips_node *node, u8 bits) · 4 unmodified lines
55	hsiphash_1u32(0xabad1dea, &key) % 200;	45	hsiphash_1u32(0xabad1dea, &key) % 200;
56	style = "bold";	46	style = "bold";
57	}	47	}
58	swap_endian_and_apply_cidr(ip1, node->bits, bits, node->cidr);	48	wg_allowedips_read_node(node, ip1, &cidr1);
59	printk(fmt_declaration, ip1, node->cidr, style, color);	49	printk(fmt_declaration, ip1, cidr1, style, color);
60	if (node->bit[0]) {	50	if (node->bit[0]) {
61	swap_endian_and_apply_cidr(ip2,	51	wg_allowedips_read_node(rcu_dereference_raw(node->bit[0]), ip2, &cidr2);
62	rcu_dereference_raw(node->bit[0])->bits, bits,	52	printk(fmt_connection, ip1, cidr1, ip2, cidr2);
63	node->cidr);
64	printk(fmt_connection, ip1, node->cidr, ip2,
65	rcu_dereference_raw(node->bit[0])->cidr);
66	print_node(rcu_dereference_raw(node->bit[0]), bits);
67	}	53	}
68	if (node->bit[1]) {	54	if (node->bit[1]) {
69	swap_endian_and_apply_cidr(ip2,	55	wg_allowedips_read_node(rcu_dereference_raw(node->bit[1]), ip2, &cidr2);
70	rcu_dereference_raw(node->bit[1])->bits,	56	printk(fmt_connection, ip1, cidr1, ip2, cidr2);
71	bits, node->cidr);
72	printk(fmt_connection, ip1, node->cidr, ip2,
73	rcu_dereference_raw(node->bit[1])->cidr);
74	print_node(rcu_dereference_raw(node->bit[1]), bits);
75	}	57	}
		58	if (node->bit[0])
		59	print_node(rcu_dereference_raw(node->bit[0]), bits);
		60	if (node->bit[1])
		61	print_node(rcu_dereference_raw(node->bit[1]), bits);
76	}	62	}
77		63
78	static __init void print_tree(struct allowedips_node __rcu *top, u8 bits)	64	static __init void print_tree(struct allowedips_node __rcu *top, u8 bits)
@@ -121,8 +107,8 @@ static __init inline union nf_inet_addr horrible_cidr_to_mask(u8 cidr) · 42 unmodified lines
121	{	107	{
122	union nf_inet_addr mask;	108	union nf_inet_addr mask;
123		109
124	memset(&mask, 0x00, 128 / 8);	110	memset(&mask, 0, sizeof(mask));
125	memset(&mask, 0xff, cidr / 8);	111	memset(&mask.all, 0xff, cidr / 8);
126	if (cidr % 32)	112	if (cidr % 32)
127	mask.all[cidr / 32] = (__force u32)htonl(	113	mask.all[cidr / 32] = (__force u32)htonl(
128	(0xFFFFFFFFUL << (32 - (cidr % 32))) & 0xFFFFFFFFUL);	114	(0xFFFFFFFFUL << (32 - (cidr % 32))) & 0xFFFFFFFFUL);
@@ -149,42 +135,36 @@ horrible_mask_self(struct horrible_allowedips_node *node) · 20 unmodified lines
149	}	135	}
150		136
151	static __init inline bool	137	static __init inline bool
152	horrible_match_v4(const struct horrible_allowedips_node *node,	138	horrible_match_v4(const struct horrible_allowedips_node node, struct in_addr ip)
153	struct in_addr *ip)
154	{	139	{
155	return (ip->s_addr & node->mask.ip) == node->ip.ip;	140	return (ip->s_addr & node->mask.ip) == node->ip.ip;
156	}	141	}
157		142
158	static __init inline bool	143	static __init inline bool
159	horrible_match_v6(const struct horrible_allowedips_node *node,	144	horrible_match_v6(const struct horrible_allowedips_node node, struct in6_addr ip)
160	struct in6_addr *ip)
161	{	145	{
162	return (ip->in6_u.u6_addr32[0] & node->mask.ip6[0]) ==	146	return (ip->in6_u.u6_addr32[0] & node->mask.ip6[0]) == node->ip.ip6[0] &&
163	node->ip.ip6[0] &&	147	(ip->in6_u.u6_addr32[1] & node->mask.ip6[1]) == node->ip.ip6[1] &&
164	(ip->in6_u.u6_addr32[1] & node->mask.ip6[1]) ==	148	(ip->in6_u.u6_addr32[2] & node->mask.ip6[2]) == node->ip.ip6[2] &&
165	node->ip.ip6[1] &&
166	(ip->in6_u.u6_addr32[2] & node->mask.ip6[2]) ==
167	node->ip.ip6[2] &&
168	(ip->in6_u.u6_addr32[3] & node->mask.ip6[3]) == node->ip.ip6[3];	149	(ip->in6_u.u6_addr32[3] & node->mask.ip6[3]) == node->ip.ip6[3];
169	}	150	}
170		151
171	static __init void	152	static __init void
172	horrible_insert_ordered(struct horrible_allowedips *table,	153	horrible_insert_ordered(struct horrible_allowedips table, struct horrible_allowedips_node node)
173	struct horrible_allowedips_node *node)
174	{	154	{
175	struct horrible_allowedips_node other = NULL, where = NULL;	155	struct horrible_allowedips_node other = NULL, where = NULL;
176	u8 my_cidr = horrible_mask_to_cidr(node->mask);	156	u8 my_cidr = horrible_mask_to_cidr(node->mask);
177		157
178	hlist_for_each_entry(other, &table->head, table) {	158	hlist_for_each_entry(other, &table->head, table) {
179	if (!memcmp(&other->mask, &node->mask,	159	if (other->ip_version == node->ip_version &&
180	sizeof(union nf_inet_addr)) &&	160	!memcmp(&other->mask, &node->mask, sizeof(union nf_inet_addr)) &&
181	!memcmp(&other->ip, &node->ip,	161	!memcmp(&other->ip, &node->ip, sizeof(union nf_inet_addr))) {
182	sizeof(union nf_inet_addr)) &&
183	other->ip_version == node->ip_version) {
184	other->value = node->value;	162	other->value = node->value;
185	kfree(node);	163	kfree(node);
186	return;	164	return;
187	}	165	}
		166	}
		167	hlist_for_each_entry(other, &table->head, table) {
188	where = other;	168	where = other;
189	if (horrible_mask_to_cidr(other->mask) <= my_cidr)	169	if (horrible_mask_to_cidr(other->mask) <= my_cidr)
190	break;	170	break;
@@ -201,8 +181,7 @@ static __init int · 10 unmodified lines
201	horrible_allowedips_insert_v4(struct horrible_allowedips *table,	181	horrible_allowedips_insert_v4(struct horrible_allowedips *table,
202	struct in_addr ip, u8 cidr, void value)	182	struct in_addr ip, u8 cidr, void value)
203	{	183	{
204	struct horrible_allowedips_node node = kzalloc(sizeof(node),	184	struct horrible_allowedips_node node = kzalloc(sizeof(node), GFP_KERNEL);
205	GFP_KERNEL);
206		185
207	if (unlikely(!node))	186	if (unlikely(!node))
208	return -ENOMEM;	187	return -ENOMEM;
@@ -219,8 +198,7 @@ static __init int · 10 unmodified lines
219	horrible_allowedips_insert_v6(struct horrible_allowedips *table,	198	horrible_allowedips_insert_v6(struct horrible_allowedips *table,
220	struct in6_addr ip, u8 cidr, void value)	199	struct in6_addr ip, u8 cidr, void value)
221	{	200	{
222	struct horrible_allowedips_node node = kzalloc(sizeof(node),	201	struct horrible_allowedips_node node = kzalloc(sizeof(node), GFP_KERNEL);
223	GFP_KERNEL);
224		202
225	if (unlikely(!node))	203	if (unlikely(!node))
226	return -ENOMEM;	204	return -ENOMEM;
@@ -234,39 +212,43 @@ horrible_allowedips_insert_v6(struct horrible_allowedips *table, · 7 unmodified lines
234	}	212	}
235		213
236	static __init void *	214	static __init void *
237	horrible_allowedips_lookup_v4(struct horrible_allowedips *table,	215	horrible_allowedips_lookup_v4(struct horrible_allowedips table, struct in_addr ip)
238	struct in_addr *ip)
239	{	216	{
240	struct horrible_allowedips_node *node;	217	struct horrible_allowedips_node *node;
241	void *ret = NULL;
242		218
243	hlist_for_each_entry(node, &table->head, table) {	219	hlist_for_each_entry(node, &table->head, table) {
244	if (node->ip_version != 4)	220	if (node->ip_version == 4 && horrible_match_v4(node, ip))
245	continue;	221	return node->value;
246	if (horrible_match_v4(node, ip)) {
247	ret = node->value;
248	break;
249	}
250	}	222	}
251	return ret;	223	return NULL;
252	}	224	}
253		225
254	static __init void *	226	static __init void *
255	horrible_allowedips_lookup_v6(struct horrible_allowedips *table,	227	horrible_allowedips_lookup_v6(struct horrible_allowedips table, struct in6_addr ip)
256	struct in6_addr *ip)
257	{	228	{
258	struct horrible_allowedips_node *node;	229	struct horrible_allowedips_node *node;
259	void *ret = NULL;
260		230
261	hlist_for_each_entry(node, &table->head, table) {	231	hlist_for_each_entry(node, &table->head, table) {
262	if (node->ip_version != 6)	232	if (node->ip_version == 6 && horrible_match_v6(node, ip))
		233	return node->value;
		234	}
		235	return NULL;
		236	}
		237
		238
		239	static __init void
		240	horrible_allowedips_remove_by_value(struct horrible_allowedips table, void value)
		241	{
		242	struct horrible_allowedips_node *node;
		243	struct hlist_node *h;
		244
		245	hlist_for_each_entry_safe(node, h, &table->head, table) {
		246	if (node->value != value)
263	continue;	247	continue;
264	if (horrible_match_v6(node, ip)) {	248	hlist_del(&node->table);
265	ret = node->value;	249	kfree(node);
266	break;
267	}
268	}	250	}
269	return ret;	251
270	}	252	}
271		253
272	static __init bool randomized_test(void)	254	static __init bool randomized_test(void)
@@ -296,6 +278,7 @@ static __init bool randomized_test(void) · 23 unmodified lines
296	goto free;	278	goto free;
297	}	279	}
298	kref_init(&peers[i]->refcount);	280	kref_init(&peers[i]->refcount);
		281	INIT_LIST_HEAD(&peers[i]->allowedips_list);
299	}	282	}
300		283
301	mutex_lock(&mutex);	284	mutex_lock(&mutex);
@@ -333,7 +316,7 @@ static __init bool randomized_test(void) · 31 unmodified lines
333	if (wg_allowedips_insert_v4(&t,	316	if (wg_allowedips_insert_v4(&t,
334	(struct in_addr *)mutated,	317	(struct in_addr *)mutated,
335	cidr, peer, &mutex) < 0) {	318	cidr, peer, &mutex) < 0) {
336	pr_err("allowedips random malloc: FAIL\n");	319	pr_err("allowedips random self-test malloc: FAIL\n");
337	goto free_locked;	320	goto free_locked;
338	}	321	}
339	if (horrible_allowedips_insert_v4(&h,	322	if (horrible_allowedips_insert_v4(&h,
@@ -396,23 +379,33 @@ static __init bool randomized_test(void) · 56 unmodified lines
396	print_tree(t.root6, 128);	379	print_tree(t.root6, 128);
397	}	380	}
398		381
399	for (i = 0; i < NUM_QUERIES; ++i) {	382	for (j = 0;; ++j) {
400	prandom_bytes(ip, 4);	383	for (i = 0; i < NUM_QUERIES; ++i) {
401	if (lookup(t.root4, 32, ip) !=	384	prandom_bytes(ip, 4);
402	horrible_allowedips_lookup_v4(&h, (struct in_addr *)ip)) {	385	if (lookup(t.root4, 32, ip) != horrible_allowedips_lookup_v4(&h, (struct in_addr *)ip)) {
403	pr_err("allowedips random self-test: FAIL\n");	386	horrible_allowedips_lookup_v4(&h, (struct in_addr *)ip);
404	goto free;	387	pr_err("allowedips random v4 self-test: FAIL\n");
		388	goto free;
		389	}
		390	prandom_bytes(ip, 16);
		391	if (lookup(t.root6, 128, ip) != horrible_allowedips_lookup_v6(&h, (struct in6_addr *)ip)) {
		392	pr_err("allowedips random v6 self-test: FAIL\n");
		393	goto free;
		394	}
405	}	395	}
		396	if (j >= NUM_PEERS)
		397	break;
		398	mutex_lock(&mutex);
		399	wg_allowedips_remove_by_peer(&t, peers[j], &mutex);
		400	mutex_unlock(&mutex);
		401	horrible_allowedips_remove_by_value(&h, peers[j]);
406	}	402	}
407		403
408	for (i = 0; i < NUM_QUERIES; ++i) {	404	if (t.root4 \|\| t.root6) {
409	prandom_bytes(ip, 16);	405	pr_err("allowedips random self-test removal: FAIL\n");
410	if (lookup(t.root6, 128, ip) !=	406	goto free;
411	horrible_allowedips_lookup_v6(&h, (struct in6_addr *)ip)) {
412	pr_err("allowedips random self-test: FAIL\n");
413	goto free;
414	}
415	}	407	}
		408
416	ret = true;	409	ret = true;
417		410
418	free:	411	free:

drivers/net/wireguard/socket.c+1−1

@@ -430,7 +430,7 @@ void wg_socket_reinit(struct wg_device wg, struct sock new4, · 429 unmodified lines
430	if (new4)	430	if (new4)
431	wg->incoming_port = ntohs(inet_sk(new4)->inet_sport);	431	wg->incoming_port = ntohs(inet_sk(new4)->inet_sport);
432	mutex_unlock(&wg->socket_update_lock);	432	mutex_unlock(&wg->socket_update_lock);
433	synchronize_rcu();	433	synchronize_net();
434	sock_free(old4);	434	sock_free(old4);
435	sock_free(old6);	435	sock_free(old6);
436	}	436	}

drivers/net/wireless/ath/ath10k/htt.h+1−0

@@ -845,6 +845,7 @@ enum htt_security_types { · 844 unmodified lines
845		845
846	#define ATH10K_HTT_TXRX_PEER_SECURITY_MAX 2	846	#define ATH10K_HTT_TXRX_PEER_SECURITY_MAX 2
847	#define ATH10K_TXRX_NUM_EXT_TIDS 19	847	#define ATH10K_TXRX_NUM_EXT_TIDS 19
		848	#define ATH10K_TXRX_NON_QOS_TID 16
848		849
849	enum htt_security_flags {	850	enum htt_security_flags {
850	#define HTT_SECURITY_TYPE_MASK 0x7F	851	#define HTT_SECURITY_TYPE_MASK 0x7F

drivers/net/wireless/ath/ath10k/htt_rx.c+191−10

@@ -1746,16 +1746,97 @@ static void ath10k_htt_rx_h_csum_offload(struct sk_buff *msdu) · 1745 unmodified lines
1746	msdu->ip_summed = ath10k_htt_rx_get_csum_state(msdu);	1746	msdu->ip_summed = ath10k_htt_rx_get_csum_state(msdu);
1747	}	1747	}
1748		1748
		1749	static u64 ath10k_htt_rx_h_get_pn(struct ath10k ar, struct sk_buff skb,
		1750	u16 offset,
		1751	enum htt_rx_mpdu_encrypt_type enctype)
		1752	{
		1753	struct ieee80211_hdr *hdr;
		1754	u64 pn = 0;
		1755	u8 *ehdr;
		1756
		1757	hdr = (struct ieee80211_hdr *)(skb->data + offset);
		1758	ehdr = skb->data + offset + ieee80211_hdrlen(hdr->frame_control);
		1759
		1760	if (enctype == HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2) {
		1761	pn = ehdr[0];
		1762	pn \|= (u64)ehdr[1] << 8;
		1763	pn \|= (u64)ehdr[4] << 16;
		1764	pn \|= (u64)ehdr[5] << 24;
		1765	pn \|= (u64)ehdr[6] << 32;
		1766	pn \|= (u64)ehdr[7] << 40;
		1767	}
		1768	return pn;
		1769	}
		1770
		1771	static bool ath10k_htt_rx_h_frag_multicast_check(struct ath10k *ar,
		1772	struct sk_buff *skb,
		1773	u16 offset)
		1774	{
		1775	struct ieee80211_hdr *hdr;
		1776
		1777	hdr = (struct ieee80211_hdr *)(skb->data + offset);
		1778	return !is_multicast_ether_addr(hdr->addr1);
		1779	}
		1780
		1781	static bool ath10k_htt_rx_h_frag_pn_check(struct ath10k *ar,
		1782	struct sk_buff *skb,
		1783	u16 peer_id,
		1784	u16 offset,
		1785	enum htt_rx_mpdu_encrypt_type enctype)
		1786	{
		1787	struct ath10k_peer *peer;
		1788	union htt_rx_pn_t *last_pn, new_pn = {0};
		1789	struct ieee80211_hdr *hdr;
		1790	bool more_frags;
		1791	u8 tid, frag_number;
		1792	u32 seq;
		1793
		1794	peer = ath10k_peer_find_by_id(ar, peer_id);
		1795	if (!peer) {
		1796	ath10k_dbg(ar, ATH10K_DBG_HTT, "invalid peer for frag pn check\n");
		1797	return false;
		1798	}
		1799
		1800	hdr = (struct ieee80211_hdr *)(skb->data + offset);
		1801	if (ieee80211_is_data_qos(hdr->frame_control))
		1802	tid = ieee80211_get_tid(hdr);
		1803	else
		1804	tid = ATH10K_TXRX_NON_QOS_TID;
		1805
		1806	last_pn = &peer->frag_tids_last_pn[tid];
		1807	new_pn.pn48 = ath10k_htt_rx_h_get_pn(ar, skb, offset, enctype);
		1808	more_frags = ieee80211_has_morefrags(hdr->frame_control);
		1809	frag_number = le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG;
		1810	seq = (__le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4;
		1811
		1812	if (frag_number == 0) {
		1813	last_pn->pn48 = new_pn.pn48;
		1814	peer->frag_tids_seq[tid] = seq;
		1815	} else {
		1816	if (seq != peer->frag_tids_seq[tid])
		1817	return false;
		1818
		1819	if (new_pn.pn48 != last_pn->pn48 + 1)
		1820	return false;
		1821
		1822	last_pn->pn48 = new_pn.pn48;
		1823	}
		1824
		1825	return true;
		1826	}
		1827
1749	static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,	1828	static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,
1750	struct sk_buff_head *amsdu,	1829	struct sk_buff_head *amsdu,
1751	struct ieee80211_rx_status *status,	1830	struct ieee80211_rx_status *status,
1752	bool fill_crypt_header,	1831	bool fill_crypt_header,
1753	u8 *rx_hdr,	1832	u8 *rx_hdr,
1754	enum ath10k_pkt_rx_err *err)	1833	enum ath10k_pkt_rx_err *err,
		1834	u16 peer_id,
		1835	bool frag)
1755	{	1836	{
1756	struct sk_buff *first;	1837	struct sk_buff *first;
1757	struct sk_buff *last;	1838	struct sk_buff *last;
1758	struct sk_buff *msdu;	1839	struct sk_buff msdu, temp;
1759	struct htt_rx_desc *rxd;	1840	struct htt_rx_desc *rxd;
1760	struct ieee80211_hdr *hdr;	1841	struct ieee80211_hdr *hdr;
1761	enum htt_rx_mpdu_encrypt_type enctype;	1842	enum htt_rx_mpdu_encrypt_type enctype;
@@ -1768,6 +1849,7 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar, · 6 unmodified lines
1768	bool is_decrypted;	1849	bool is_decrypted;
1769	bool is_mgmt;	1850	bool is_mgmt;
1770	u32 attention;	1851	u32 attention;
		1852	bool frag_pn_check = true, multicast_check = true;
1771		1853
1772	if (skb_queue_empty(amsdu))	1854	if (skb_queue_empty(amsdu))
1773	return;	1855	return;
@@ -1866,7 +1948,37 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar, · 92 unmodified lines
1866	}	1948	}
1867		1949
1868	skb_queue_walk(amsdu, msdu) {	1950	skb_queue_walk(amsdu, msdu) {
		1951	if (frag && !fill_crypt_header && is_decrypted &&
		1952	enctype == HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2)
		1953	frag_pn_check = ath10k_htt_rx_h_frag_pn_check(ar,
		1954	msdu,
		1955	peer_id,
		1956	0,
		1957	enctype);
		1958
		1959	if (frag)
		1960	multicast_check = ath10k_htt_rx_h_frag_multicast_check(ar,
		1961	msdu,
		1962	0);
		1963
		1964	if (!frag_pn_check \|\| !multicast_check) {
		1965	/* Discard the fragment with invalid PN or multicast DA
		1966	*/
		1967	temp = msdu->prev;
		1968	__skb_unlink(msdu, amsdu);
		1969	dev_kfree_skb_any(msdu);
		1970	msdu = temp;
		1971	frag_pn_check = true;
		1972	multicast_check = true;
		1973	continue;
		1974	}
		1975
1869	ath10k_htt_rx_h_csum_offload(msdu);	1976	ath10k_htt_rx_h_csum_offload(msdu);
		1977
		1978	if (frag && !fill_crypt_header &&
		1979	enctype == HTT_RX_MPDU_ENCRYPT_TKIP_WPA)
		1980	status->flag &= ~RX_FLAG_MMIC_STRIPPED;
		1981
1870	ath10k_htt_rx_h_undecap(ar, msdu, status, first_hdr, enctype,	1982	ath10k_htt_rx_h_undecap(ar, msdu, status, first_hdr, enctype,
1871	is_decrypted);	1983	is_decrypted);
1872		1984
@@ -1884,6 +1996,11 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar, · 11 unmodified lines
1884		1996
1885	hdr = (void *)msdu->data;	1997	hdr = (void *)msdu->data;
1886	hdr->frame_control &= ~__cpu_to_le16(IEEE80211_FCTL_PROTECTED);	1998	hdr->frame_control &= ~__cpu_to_le16(IEEE80211_FCTL_PROTECTED);
		1999
		2000	if (frag && !fill_crypt_header &&
		2001	enctype == HTT_RX_MPDU_ENCRYPT_TKIP_WPA)
		2002	status->flag &= ~RX_FLAG_IV_STRIPPED &
		2003	~RX_FLAG_MMIC_STRIPPED;
1887	}	2004	}
1888	}	2005	}
1889		2006
@@ -1991,14 +2108,62 @@ static void ath10k_htt_rx_h_unchain(struct ath10k *ar, · 101 unmodified lines
1991	ath10k_unchain_msdu(amsdu, unchain_cnt);	2108	ath10k_unchain_msdu(amsdu, unchain_cnt);
1992	}	2109	}
1993		2110
		2111	static bool ath10k_htt_rx_validate_amsdu(struct ath10k *ar,
		2112	struct sk_buff_head *amsdu)
		2113	{
		2114	u8 *subframe_hdr;
		2115	struct sk_buff *first;
		2116	bool is_first, is_last;
		2117	struct htt_rx_desc *rxd;
		2118	struct ieee80211_hdr *hdr;
		2119	size_t hdr_len, crypto_len;
		2120	enum htt_rx_mpdu_encrypt_type enctype;
		2121	int bytes_aligned = ar->hw_params.decap_align_bytes;
		2122
		2123	first = skb_peek(amsdu);
		2124
		2125	rxd = (void )first->data - sizeof(rxd);
		2126	hdr = (void *)rxd->rx_hdr_status;
		2127
		2128	is_first = !!(rxd->msdu_end.common.info0 &
		2129	__cpu_to_le32(RX_MSDU_END_INFO0_FIRST_MSDU));
		2130	is_last = !!(rxd->msdu_end.common.info0 &
		2131	__cpu_to_le32(RX_MSDU_END_INFO0_LAST_MSDU));
		2132
		2133	/* Return in case of non-aggregated msdu */
		2134	if (is_first && is_last)
		2135	return true;
		2136
		2137	/* First msdu flag is not set for the first msdu of the list */
		2138	if (!is_first)
		2139	return false;
		2140
		2141	enctype = MS(__le32_to_cpu(rxd->mpdu_start.info0),
		2142	RX_MPDU_START_INFO0_ENCRYPT_TYPE);
		2143
		2144	hdr_len = ieee80211_hdrlen(hdr->frame_control);
		2145	crypto_len = ath10k_htt_rx_crypto_param_len(ar, enctype);
		2146
		2147	subframe_hdr = (u8 *)hdr + round_up(hdr_len, bytes_aligned) +
		2148	crypto_len;
		2149
		2150	/* Validate if the amsdu has a proper first subframe.
		2151	* There are chances a single msdu can be received as amsdu when
		2152	* the unauthenticated amsdu flag of a QoS header
		2153	* gets flipped in non-SPP AMSDU's, in such cases the first
		2154	* subframe has llc/snap header in place of a valid da.
		2155	* return false if the da matches rfc1042 pattern
		2156	*/
		2157	if (ether_addr_equal(subframe_hdr, rfc1042_header))
		2158	return false;
		2159
		2160	return true;
		2161	}
		2162
1994	static bool ath10k_htt_rx_amsdu_allowed(struct ath10k *ar,	2163	static bool ath10k_htt_rx_amsdu_allowed(struct ath10k *ar,
1995	struct sk_buff_head *amsdu,	2164	struct sk_buff_head *amsdu,
1996	struct ieee80211_rx_status *rx_status)	2165	struct ieee80211_rx_status *rx_status)
1997	{	2166	{
1998	/* FIXME: It might be a good idea to do some fuzzy-testing to drop
1999	* invalid/dangerous frames.
2000	*/
2001
2002	if (!rx_status->freq) {	2167	if (!rx_status->freq) {
2003	ath10k_dbg(ar, ATH10K_DBG_HTT, "no channel configured; ignoring frame(s)!\n");	2168	ath10k_dbg(ar, ATH10K_DBG_HTT, "no channel configured; ignoring frame(s)!\n");
2004	return false;	2169	return false;
@@ -2009,6 +2174,11 @@ static bool ath10k_htt_rx_amsdu_allowed(struct ath10k *ar, · 4 unmodified lines
2009	return false;	2174	return false;
2010	}	2175	}
2011		2176
		2177	if (!ath10k_htt_rx_validate_amsdu(ar, amsdu)) {
		2178	ath10k_dbg(ar, ATH10K_DBG_HTT, "invalid amsdu received\n");
		2179	return false;
		2180	}
		2181
2012	return true;	2182	return true;
2013	}	2183	}
2014		2184
@@ -2071,7 +2241,8 @@ static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt) · 56 unmodified lines
2071	ath10k_htt_rx_h_unchain(ar, &amsdu, &drop_cnt, &unchain_cnt);	2241	ath10k_htt_rx_h_unchain(ar, &amsdu, &drop_cnt, &unchain_cnt);
2072		2242
2073	ath10k_htt_rx_h_filter(ar, &amsdu, rx_status, &drop_cnt_filter);	2243	ath10k_htt_rx_h_filter(ar, &amsdu, rx_status, &drop_cnt_filter);
2074	ath10k_htt_rx_h_mpdu(ar, &amsdu, rx_status, true, first_hdr, &err);	2244	ath10k_htt_rx_h_mpdu(ar, &amsdu, rx_status, true, first_hdr, &err, 0,
		2245	false);
2075	msdus_to_queue = skb_queue_len(&amsdu);	2246	msdus_to_queue = skb_queue_len(&amsdu);
2076	ath10k_htt_rx_h_enqueue(ar, &amsdu, rx_status);	2247	ath10k_htt_rx_h_enqueue(ar, &amsdu, rx_status);
2077		2248
@@ -2204,6 +2375,11 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt, · 126 unmodified lines
2204	fw_desc = &rx->fw_desc;	2375	fw_desc = &rx->fw_desc;
2205	rx_desc_len = fw_desc->len;	2376	rx_desc_len = fw_desc->len;
2206		2377
		2378	if (fw_desc->u.bits.discard) {
		2379	ath10k_dbg(ar, ATH10K_DBG_HTT, "htt discard mpdu\n");
		2380	goto err;
		2381	}
		2382
2207	/* I have not yet seen any case where num_mpdu_ranges > 1.	2383	/* I have not yet seen any case where num_mpdu_ranges > 1.
2208	* qcacld does not seem handle that case either, so we introduce the	2384	* qcacld does not seem handle that case either, so we introduce the
2209	* same limitiation here as well.	2385	* same limitiation here as well.
@@ -2509,6 +2685,13 @@ static bool ath10k_htt_rx_proc_rx_frag_ind_hl(struct ath10k_htt *htt, · 299 unmodified lines
2509	rx_desc = (struct htt_hl_rx_desc *)(skb->data + tot_hdr_len);	2685	rx_desc = (struct htt_hl_rx_desc *)(skb->data + tot_hdr_len);
2510	rx_desc_info = __le32_to_cpu(rx_desc->info);	2686	rx_desc_info = __le32_to_cpu(rx_desc->info);
2511		2687
		2688	hdr = (struct ieee80211_hdr )((u8 )rx_desc + rx_hl->fw_desc.len);
		2689
		2690	if (is_multicast_ether_addr(hdr->addr1)) {
		2691	/* Discard the fragment with multicast DA */
		2692	goto err;
		2693	}
		2694
2512	if (!MS(rx_desc_info, HTT_RX_DESC_HL_INFO_ENCRYPTED)) {	2695	if (!MS(rx_desc_info, HTT_RX_DESC_HL_INFO_ENCRYPTED)) {
2513	spin_unlock_bh(&ar->data_lock);	2696	spin_unlock_bh(&ar->data_lock);
2514	return ath10k_htt_rx_proc_rx_ind_hl(htt, &resp->rx_ind_hl, skb,	2697	return ath10k_htt_rx_proc_rx_ind_hl(htt, &resp->rx_ind_hl, skb,
@@ -2516,8 +2699,6 @@ static bool ath10k_htt_rx_proc_rx_frag_ind_hl(struct ath10k_htt *htt, · 1 unmodified line
2516	HTT_RX_NON_TKIP_MIC);	2699	HTT_RX_NON_TKIP_MIC);
2517	}	2700	}
2518		2701
2519	hdr = (struct ieee80211_hdr )((u8 )rx_desc + rx_hl->fw_desc.len);
2520
2521	if (ieee80211_has_retry(hdr->frame_control))	2702	if (ieee80211_has_retry(hdr->frame_control))
2522	goto err;	2703	goto err;
2523		2704
@@ -3027,7 +3208,7 @@ static int ath10k_htt_rx_in_ord_ind(struct ath10k ar, struct sk_buff skb) · 503 unmodified lines
3027	ath10k_htt_rx_h_ppdu(ar, &amsdu, status, vdev_id);	3208	ath10k_htt_rx_h_ppdu(ar, &amsdu, status, vdev_id);
3028	ath10k_htt_rx_h_filter(ar, &amsdu, status, NULL);	3209	ath10k_htt_rx_h_filter(ar, &amsdu, status, NULL);
3029	ath10k_htt_rx_h_mpdu(ar, &amsdu, status, false, NULL,	3210	ath10k_htt_rx_h_mpdu(ar, &amsdu, status, false, NULL,
3030	NULL);	3211	NULL, peer_id, frag);
3031	ath10k_htt_rx_h_enqueue(ar, &amsdu, status);	3212	ath10k_htt_rx_h_enqueue(ar, &amsdu, status);
3032	break;	3213	break;
3033	case -EAGAIN:	3214	case -EAGAIN:

drivers/net/wireless/ath/ath10k/rx_desc.h+13−1

@@ -1282,7 +1282,19 @@ struct fw_rx_desc_base { · 1281 unmodified lines
1282	#define FW_RX_DESC_UDP (1 << 6)	1282	#define FW_RX_DESC_UDP (1 << 6)
1283		1283
1284	struct fw_rx_desc_hl {	1284	struct fw_rx_desc_hl {
1285	u8 info0;	1285	union {
		1286	struct {
		1287	u8 discard:1,
		1288	forward:1,
		1289	any_err:1,
		1290	dup_err:1,
		1291	reserved:1,
		1292	inspect:1,
		1293	extension:2;
		1294	} bits;
		1295	u8 info0;
		1296	} u;
		1297
1286	u8 version;	1298	u8 version;
1287	u8 len;	1299	u8 len;
1288	u8 flags;	1300	u8 flags;

drivers/net/wireless/ath/ath11k/dp_rx.c+34−0

@@ -260,6 +260,16 @@ static void ath11k_dp_rxdesc_set_msdu_len(struct ath11k_base *ab, · 259 unmodified lines
260	ab->hw_params.hw_ops->rx_desc_set_msdu_len(desc, len);	260	ab->hw_params.hw_ops->rx_desc_set_msdu_len(desc, len);
261	}	261	}
262		262
		263	static bool ath11k_dp_rx_h_attn_is_mcbc(struct ath11k_base *ab,
		264	struct hal_rx_desc *desc)
		265	{
		266	struct rx_attention *attn = ath11k_dp_rx_get_attention(ab, desc);
		267
		268	return ath11k_dp_rx_h_msdu_end_first_msdu(ab, desc) &&
		269	(!!FIELD_GET(RX_ATTENTION_INFO1_MCAST_BCAST,
		270	__le32_to_cpu(attn->info1)));
		271	}
		272
263	static void ath11k_dp_service_mon_ring(struct timer_list *t)	273	static void ath11k_dp_service_mon_ring(struct timer_list *t)
264	{	274	{
265	struct ath11k_base *ab = from_timer(ab, t, mon_reap_timer);	275	struct ath11k_base *ab = from_timer(ab, t, mon_reap_timer);
@@ -852,6 +862,24 @@ static void ath11k_dp_rx_frags_cleanup(struct dp_rx_tid *rx_tid, bool rel_link_d · 586 unmodified lines
852	__skb_queue_purge(&rx_tid->rx_frags);	862	__skb_queue_purge(&rx_tid->rx_frags);
853	}	863	}
854		864
		865	void ath11k_peer_frags_flush(struct ath11k ar, struct ath11k_peer peer)
		866	{
		867	struct dp_rx_tid *rx_tid;
		868	int i;
		869
		870	lockdep_assert_held(&ar->ab->base_lock);
		871
		872	for (i = 0; i <= IEEE80211_NUM_TIDS; i++) {
		873	rx_tid = &peer->rx_tid[i];
		874
		875	spin_unlock_bh(&ar->ab->base_lock);
		876	del_timer_sync(&rx_tid->frag_timer);
		877	spin_lock_bh(&ar->ab->base_lock);
		878
		879	ath11k_dp_rx_frags_cleanup(rx_tid, true);
		880	}
		881	}
		882
855	void ath11k_peer_rx_tid_cleanup(struct ath11k ar, struct ath11k_peer peer)	883	void ath11k_peer_rx_tid_cleanup(struct ath11k ar, struct ath11k_peer peer)
856	{	884	{
857	struct dp_rx_tid *rx_tid;	885	struct dp_rx_tid *rx_tid;
@@ -3450,6 +3478,7 @@ static int ath11k_dp_rx_frag_h_mpdu(struct ath11k *ar, · 2592 unmodified lines
3450	u8 tid;	3478	u8 tid;
3451	int ret = 0;	3479	int ret = 0;
3452	bool more_frags;	3480	bool more_frags;
		3481	bool is_mcbc;
3453		3482
3454	rx_desc = (struct hal_rx_desc *)msdu->data;	3483	rx_desc = (struct hal_rx_desc *)msdu->data;
3455	peer_id = ath11k_dp_rx_h_mpdu_start_peer_id(ar->ab, rx_desc);	3484	peer_id = ath11k_dp_rx_h_mpdu_start_peer_id(ar->ab, rx_desc);
@@ -3457,6 +3486,11 @@ static int ath11k_dp_rx_frag_h_mpdu(struct ath11k *ar, · 1 unmodified line
3457	seqno = ath11k_dp_rx_h_mpdu_start_seq_no(ar->ab, rx_desc);	3486	seqno = ath11k_dp_rx_h_mpdu_start_seq_no(ar->ab, rx_desc);
3458	frag_no = ath11k_dp_rx_h_mpdu_start_frag_no(ar->ab, msdu);	3487	frag_no = ath11k_dp_rx_h_mpdu_start_frag_no(ar->ab, msdu);
3459	more_frags = ath11k_dp_rx_h_mpdu_start_more_frags(ar->ab, msdu);	3488	more_frags = ath11k_dp_rx_h_mpdu_start_more_frags(ar->ab, msdu);
		3489	is_mcbc = ath11k_dp_rx_h_attn_is_mcbc(ar->ab, rx_desc);
		3490
		3491	/* Multicast/Broadcast fragments are not expected */
		3492	if (is_mcbc)
		3493	return -EINVAL;
3460		3494
3461	if (!ath11k_dp_rx_h_mpdu_start_seq_ctrl_valid(ar->ab, rx_desc) \|\|	3495	if (!ath11k_dp_rx_h_mpdu_start_seq_ctrl_valid(ar->ab, rx_desc) \|\|
3462	!ath11k_dp_rx_h_mpdu_start_fc_valid(ar->ab, rx_desc) \|\|	3496	!ath11k_dp_rx_h_mpdu_start_fc_valid(ar->ab, rx_desc) \|\|

drivers/net/wireless/ath/ath11k/dp_rx.h+1−0

@@ -49,6 +49,7 @@ int ath11k_dp_peer_rx_pn_replay_config(struct ath11k_vif *arvif, · 48 unmodified lines
49	const u8 *peer_addr,	49	const u8 *peer_addr,
50	enum set_key_cmd key_cmd,	50	enum set_key_cmd key_cmd,
51	struct ieee80211_key_conf *key);	51	struct ieee80211_key_conf *key);
		52	void ath11k_peer_frags_flush(struct ath11k ar, struct ath11k_peer peer);
52	void ath11k_peer_rx_tid_cleanup(struct ath11k ar, struct ath11k_peer peer);	53	void ath11k_peer_rx_tid_cleanup(struct ath11k ar, struct ath11k_peer peer);
53	void ath11k_peer_rx_tid_delete(struct ath11k *ar,	54	void ath11k_peer_rx_tid_delete(struct ath11k *ar,
54	struct ath11k_peer *peer, u8 tid);	55	struct ath11k_peer *peer, u8 tid);

drivers/net/wireless/ath/ath11k/mac.c+6−0

 	 */
 	spin_lock_bh(&ab->base_lock);
 	peer = ath11k_peer_find(ab, arvif->vdev_id, peer_addr);
+	/* flush the fragments cache during key (re)install to
+	 * ensure all frags in the new frag list belong to the same key.
+	 */
+	if (peer && cmd == SET_KEY)
+		ath11k_peer_frags_flush(ar, peer);
 	spin_unlock_bh(&ab->base_lock);
 	if (!peer) {

drivers/net/wireless/mac80211_hwsim.c+5−0

 static void mac80211_hwsim_stop(struct ieee80211_hw *hw)
 {
 	struct mac80211_hwsim_data *data = hw->priv;
 	data->started = false;
 	hrtimer_cancel(&data->beacon_timer);
+	while (!skb_queue_empty(&data->pending))
+		ieee80211_free_txskb(hw, skb_dequeue(&data->pending));
 	wiphy_dbg(hw->wiphy, "%s\n", __func__);
 }

drivers/net/wireless/mediatek/mt76/mac80211.c+26−0

@@ -514,10 +514,36 @@ EXPORT_SYMBOL_GPL(mt76_free_device); · 513 unmodified lines
514	static void mt76_rx_release_amsdu(struct mt76_phy *phy, enum mt76_rxq_id q)	514	static void mt76_rx_release_amsdu(struct mt76_phy *phy, enum mt76_rxq_id q)
515	{	515	{
516	struct sk_buff *skb = phy->rx_amsdu[q].head;	516	struct sk_buff *skb = phy->rx_amsdu[q].head;
		517	struct mt76_rx_status status = (struct mt76_rx_status )skb->cb;
517	struct mt76_dev *dev = phy->dev;	518	struct mt76_dev *dev = phy->dev;
518		519
519	phy->rx_amsdu[q].head = NULL;	520	phy->rx_amsdu[q].head = NULL;
520	phy->rx_amsdu[q].tail = NULL;	521	phy->rx_amsdu[q].tail = NULL;
		522
		523	/*
		524	* Validate if the amsdu has a proper first subframe.
		525	* A single MSDU can be parsed as A-MSDU when the unauthenticated A-MSDU
		526	* flag of the QoS header gets flipped. In such cases, the first
		527	* subframe has a LLC/SNAP header in the location of the destination
		528	* address.
		529	*/
		530	if (skb_shinfo(skb)->frag_list) {
		531	int offset = 0;
		532
		533	if (!(status->flag & RX_FLAG_8023)) {
		534	offset = ieee80211_get_hdrlen_from_skb(skb);
		535
		536	if ((status->flag &
		537	(RX_FLAG_DECRYPTED \| RX_FLAG_IV_STRIPPED)) ==
		538	RX_FLAG_DECRYPTED)
		539	offset += 8;
		540	}
		541
		542	if (ether_addr_equal(skb->data + offset, rfc1042_header)) {
		543	dev_kfree_skb(skb);
		544	return;
		545	}
		546	}
521	__skb_queue_tail(&dev->rx_skb[q], skb);	547	__skb_queue_tail(&dev->rx_skb[q], skb);
522	}	548	}
523		549

drivers/net/wireless/mediatek/mt76/mt7615/init.c+0−1

@@ -510,7 +510,6 @@ void mt7615_init_device(struct mt7615_dev *dev) · 509 unmodified lines
510	mutex_init(&dev->pm.mutex);	510	mutex_init(&dev->pm.mutex);
511	init_waitqueue_head(&dev->pm.wait);	511	init_waitqueue_head(&dev->pm.wait);
512	spin_lock_init(&dev->pm.txq_lock);	512	spin_lock_init(&dev->pm.txq_lock);
513	set_bit(MT76_STATE_PM, &dev->mphy.state);
514	INIT_DELAYED_WORK(&dev->mphy.mac_work, mt7615_mac_work);	513	INIT_DELAYED_WORK(&dev->mphy.mac_work, mt7615_mac_work);
515	INIT_DELAYED_WORK(&dev->phy.scan_work, mt7615_scan_work);	514	INIT_DELAYED_WORK(&dev->phy.scan_work, mt7615_scan_work);
516	INIT_DELAYED_WORK(&dev->coredump.work, mt7615_coredump_work);	515	INIT_DELAYED_WORK(&dev->coredump.work, mt7615_coredump_work);

drivers/net/wireless/mediatek/mt76/mt7615/mac.c+3−2

 			napi_schedule(&dev->mt76.napi[i]);
 		mt76_connac_pm_dequeue_skbs(mphy, &dev->pm);
 		mt76_queue_tx_cleanup(dev, dev->mt76.q_mcu[MT_MCUQ_WM], false);
-		ieee80211_queue_delayed_work(mphy->hw, &mphy->mac_work,
+		if (test_bit(MT76_STATE_RUNNING, &mphy->state))
-					     MT7615_WATCHDOG_TIME);
+			ieee80211_queue_delayed_work(mphy->hw, &mphy->mac_work,
+						     MT7615_WATCHDOG_TIME);
 	}
 	ieee80211_wake_queues(mphy->hw);

drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c+12−7

 	return ret;
 }
-static int mt7663s_mcu_drv_pmctrl(struct mt7615_dev *dev)
+static int __mt7663s_mcu_drv_pmctrl(struct mt7615_dev *dev)
 {
 	struct sdio_func *func = dev->mt76.sdio.func;
 	struct mt76_phy *mphy = &dev->mt76.phy;
 	u32 status;
 	int ret;
-	if (!test_and_clear_bit(MT76_STATE_PM, &mphy->state))
-		goto out;
 	sdio_claim_host(func);
 	sdio_writel(func, WHLPCR_FW_OWN_REQ_CLR, MCR_WHLPCR, NULL);
 	}
 	sdio_release_host(func);
-out:
 	dev->pm.last_activity = jiffies;
 	return 0;
 }
+static int mt7663s_mcu_drv_pmctrl(struct mt7615_dev *dev)
+{
+	struct mt76_phy *mphy = &dev->mt76.phy;
+	if (test_and_clear_bit(MT76_STATE_PM, &mphy->state))
+		return __mt7663s_mcu_drv_pmctrl(dev);
+	return 0;
+}
 static int mt7663s_mcu_fw_pmctrl(struct mt7615_dev *dev)
 {
 	struct sdio_func *func = dev->mt76.sdio.func;
 	struct mt7615_mcu_ops *mcu_ops;
 	int ret;
-	ret = mt7663s_mcu_drv_pmctrl(dev);
+	ret = __mt7663s_mcu_drv_pmctrl(dev);
 	if (ret)
 		return ret;

drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c+0−3

@@ -55,10 +55,7 @@ int mt7663u_mcu_init(struct mt7615_dev *dev) · 54 unmodified lines
55		55
56	dev->mt76.mcu_ops = &mt7663u_mcu_ops,	56	dev->mt76.mcu_ops = &mt7663u_mcu_ops,
57		57
58	/* usb does not support runtime-pm */
59	clear_bit(MT76_STATE_PM, &dev->mphy.state);
60	mt76_set(dev, MT_UDMA_TX_QSEL, MT_FW_DL_EN);	58	mt76_set(dev, MT_UDMA_TX_QSEL, MT_FW_DL_EN);
61
62	if (test_and_clear_bit(MT76_STATE_POWER_OFF, &dev->mphy.state)) {	59	if (test_and_clear_bit(MT76_STATE_POWER_OFF, &dev->mphy.state)) {
63	mt7615_mcu_restart(&dev->mt76);	60	mt7615_mcu_restart(&dev->mt76);
64	if (!mt76_poll_msec(dev, MT_CONN_ON_MISC,	61	if (!mt76_poll_msec(dev, MT_CONN_ON_MISC,

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c+4−0

 	phy->phy_type = mt76_connac_get_phy_mode_v2(mphy, vif, band, sta);
 	phy->basic_rate = cpu_to_le16((u16)vif->bss_conf.basic_rates);
 	phy->rcpi = rcpi;
+	phy->ampdu = FIELD_PREP(IEEE80211_HT_AMPDU_PARM_FACTOR,
+				sta->ht_cap.ampdu_factor) |
+		     FIELD_PREP(IEEE80211_HT_AMPDU_PARM_DENSITY,
+				sta->ht_cap.ampdu_density);
 	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_RA, sizeof(*ra_info));
 	ra_info = (struct sta_rec_ra_info *)tlv;

drivers/net/wireless/mediatek/mt76/mt76x0/pci.c+77−4

@@ -87,7 +87,7 @@ static const struct ieee80211_ops mt76x0e_ops = { · 86 unmodified lines
87	.reconfig_complete = mt76x02_reconfig_complete,	87	.reconfig_complete = mt76x02_reconfig_complete,
88	};	88	};
89		89
90	static int mt76x0e_register_device(struct mt76x02_dev *dev)	90	static int mt76x0e_init_hardware(struct mt76x02_dev *dev, bool resume)
91	{	91	{
92	int err;	92	int err;
93		93
@@ -100,9 +100,11 @@ static int mt76x0e_register_device(struct mt76x02_dev *dev) · 6 unmodified lines
100	if (err < 0)	100	if (err < 0)
101	return err;	101	return err;
102		102
103	err = mt76x02_dma_init(dev);	103	if (!resume) {
104	if (err < 0)	104	err = mt76x02_dma_init(dev);
105	return err;	105	if (err < 0)
		106	return err;
		107	}
106		108
107	err = mt76x0_init_hardware(dev);	109	err = mt76x0_init_hardware(dev);
108	if (err < 0)	110	if (err < 0)
@@ -123,6 +125,17 @@ static int mt76x0e_register_device(struct mt76x02_dev *dev) · 14 unmodified lines
123	mt76_clear(dev, 0x110, BIT(9));	125	mt76_clear(dev, 0x110, BIT(9));
124	mt76_set(dev, MT_MAX_LEN_CFG, BIT(13));	126	mt76_set(dev, MT_MAX_LEN_CFG, BIT(13));
125		127
		128	return 0;
		129	}
		130
		131	static int mt76x0e_register_device(struct mt76x02_dev *dev)
		132	{
		133	int err;
		134
		135	err = mt76x0e_init_hardware(dev, false);
		136	if (err < 0)
		137	return err;
		138
126	err = mt76x0_register_device(dev);	139	err = mt76x0_register_device(dev);
127	if (err < 0)	140	if (err < 0)
128	return err;	141	return err;
@@ -167,6 +180,8 @@ mt76x0e_probe(struct pci_dev pdev, const struct pci_device_id id) · 38 unmodified lines
167	if (ret)	180	if (ret)
168	return ret;	181	return ret;
169		182
		183	mt76_pci_disable_aspm(pdev);
		184
170	mdev = mt76_alloc_device(&pdev->dev, sizeof(*dev), &mt76x0e_ops,	185	mdev = mt76_alloc_device(&pdev->dev, sizeof(*dev), &mt76x0e_ops,
171	&drv_ops);	186	&drv_ops);
172	if (!mdev)	187	if (!mdev)
@@ -220,6 +235,60 @@ mt76x0e_remove(struct pci_dev *pdev) · 47 unmodified lines
220	mt76_free_device(mdev);	235	mt76_free_device(mdev);
221	}	236	}
222		237
		238	#ifdef CONFIG_PM
		239	static int mt76x0e_suspend(struct pci_dev *pdev, pm_message_t state)
		240	{
		241	struct mt76_dev *mdev = pci_get_drvdata(pdev);
		242	struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);
		243	int i;
		244
		245	mt76_worker_disable(&mdev->tx_worker);
		246	for (i = 0; i < ARRAY_SIZE(mdev->phy.q_tx); i++)
		247	mt76_queue_tx_cleanup(dev, mdev->phy.q_tx[i], true);
		248	for (i = 0; i < ARRAY_SIZE(mdev->q_mcu); i++)
		249	mt76_queue_tx_cleanup(dev, mdev->q_mcu[i], true);
		250	napi_disable(&mdev->tx_napi);
		251
		252	mt76_for_each_q_rx(mdev, i)
		253	napi_disable(&mdev->napi[i]);
		254
		255	mt76x02_dma_disable(dev);
		256	mt76x02_mcu_cleanup(dev);
		257	mt76x0_chip_onoff(dev, false, false);
		258
		259	pci_enable_wake(pdev, pci_choose_state(pdev, state), true);
		260	pci_save_state(pdev);
		261
		262	return pci_set_power_state(pdev, pci_choose_state(pdev, state));
		263	}
		264
		265	static int mt76x0e_resume(struct pci_dev *pdev)
		266	{
		267	struct mt76_dev *mdev = pci_get_drvdata(pdev);
		268	struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);
		269	int err, i;
		270
		271	err = pci_set_power_state(pdev, PCI_D0);
		272	if (err)
		273	return err;
		274
		275	pci_restore_state(pdev);
		276
		277	mt76_worker_enable(&mdev->tx_worker);
		278
		279	mt76_for_each_q_rx(mdev, i) {
		280	mt76_queue_rx_reset(dev, i);
		281	napi_enable(&mdev->napi[i]);
		282	napi_schedule(&mdev->napi[i]);
		283	}
		284
		285	napi_enable(&mdev->tx_napi);
		286	napi_schedule(&mdev->tx_napi);
		287
		288	return mt76x0e_init_hardware(dev, true);
		289	}
		290	#endif /* CONFIG_PM */
		291
223	static const struct pci_device_id mt76x0e_device_table[] = {	292	static const struct pci_device_id mt76x0e_device_table[] = {
224	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7610) },	293	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7610) },
225	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7630) },	294	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7630) },
@@ -237,6 +306,10 @@ static struct pci_driver mt76x0e_driver = { · 11 unmodified lines
237	.id_table = mt76x0e_device_table,	306	.id_table = mt76x0e_device_table,
238	.probe = mt76x0e_probe,	307	.probe = mt76x0e_probe,
239	.remove = mt76x0e_remove,	308	.remove = mt76x0e_remove,
		309	#ifdef CONFIG_PM
		310	.suspend = mt76x0e_suspend,
		311	.resume = mt76x0e_resume,
		312	#endif /* CONFIG_PM */
240	};	313	};
241		314
242	module_pci_driver(mt76x0e_driver);	315	module_pci_driver(mt76x0e_driver);

drivers/net/wireless/mediatek/mt76/mt7921/init.c+2−2

@@ -76,8 +76,8 @@ mt7921_init_wiphy(struct ieee80211_hw *hw) · 75 unmodified lines
76	struct wiphy *wiphy = hw->wiphy;	76	struct wiphy *wiphy = hw->wiphy;
77		77
78	hw->queues = 4;	78	hw->queues = 4;
79	hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;	79	hw->max_rx_aggregation_subframes = 64;
80	hw->max_tx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;	80	hw->max_tx_aggregation_subframes = 128;
81		81
82	hw->radiotap_timestamp.units_pos =	82	hw->radiotap_timestamp.units_pos =
83	IEEE80211_RADIOTAP_TIMESTAMP_UNIT_US;	83	IEEE80211_RADIOTAP_TIMESTAMP_UNIT_US;

drivers/net/wireless/mediatek/mt76/mt7921/mac.c+3−2

 			napi_schedule(&dev->mt76.napi[i]);
 		mt76_connac_pm_dequeue_skbs(mphy, &dev->pm);
 		mt7921_tx_cleanup(dev);
-		ieee80211_queue_delayed_work(mphy->hw, &mphy->mac_work,
+		if (test_bit(MT76_STATE_RUNNING, &mphy->state))
-					     MT7921_WATCHDOG_TIME);
+			ieee80211_queue_delayed_work(mphy->hw, &mphy->mac_work,
+						     MT7921_WATCHDOG_TIME);
 	}
 	ieee80211_wake_queues(mphy->hw);

drivers/net/wireless/mediatek/mt76/mt7921/main.c+1−2

@@ -74,8 +74,7 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band, · 73 unmodified lines
74	IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G;	74	IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G;
75	else if (band == NL80211_BAND_5GHZ)	75	else if (band == NL80211_BAND_5GHZ)
76	he_cap_elem->phy_cap_info[0] =	76	he_cap_elem->phy_cap_info[0] =
77	IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G \|	77	IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G;
78	IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G;
79		78
80	he_cap_elem->phy_cap_info[1] =	79	he_cap_elem->phy_cap_info[1] =
81	IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD;	80	IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD;

drivers/net/wireless/mediatek/mt76/mt7921/mcu.c+10−7

 mt7921_mcu_tx_rate_report(struct mt7921_dev *dev, struct sk_buff *skb,
 			  u16 wlan_idx)
 {
-	struct mt7921_mcu_wlan_info_event *wtbl_info =
+	struct mt7921_mcu_wlan_info_event *wtbl_info;
-		(struct mt7921_mcu_wlan_info_event *)(skb->data);
-	struct rate_info rate = {};
-	u8 curr_idx = wtbl_info->rate_info.rate_idx;
-	u16 curr = le16_to_cpu(wtbl_info->rate_info.rate[curr_idx]);
-	struct mt7921_mcu_peer_cap peer = wtbl_info->peer_cap;
 	struct mt76_phy *mphy = &dev->mphy;
 	struct mt7921_sta_stats *stats;
+	struct rate_info rate = {};
 	struct mt7921_sta *msta;
 	struct mt76_wcid *wcid;
+	u8 idx;
 	if (wlan_idx >= MT76_N_WCIDS)
 		return;
+	wtbl_info = (struct mt7921_mcu_wlan_info_event *)skb->data;
+	idx = wtbl_info->rate_info.rate_idx;
+	if (idx >= ARRAY_SIZE(wtbl_info->rate_info.rate))
+		return;
 	rcu_read_lock();
 	wcid = rcu_dereference(dev->mt76.wcid[wlan_idx]);
 	stats = &msta->stats;
 	/* current rate */
-	mt7921_mcu_tx_rate_parse(mphy, &peer, &rate, curr);
+	mt7921_mcu_tx_rate_parse(mphy, &wtbl_info->peer_cap, &rate,
+				 le16_to_cpu(wtbl_info->rate_info.rate[idx]));
 	stats->tx_rate = rate;
 out:
 	rcu_read_unlock();

drivers/net/xen-netback/interface.c+6−0

 {
 	if (queue->task) {
 		kthread_stop(queue->task);
+		put_task_struct(queue->task);
 		queue->task = NULL;
 	}
 	if (IS_ERR(task))
 		goto kthread_err;
 	queue->task = task;
+	/*
+	 * Take a reference to the task in order to prevent it from being freed
+	 * if the thread function returns before kthread_stop is called.
+	 */
+	get_task_struct(task);
 	task = kthread_run(xenvif_dealloc_kthread, queue,
 			   "%s-dealloc", queue->name);

drivers/nfc/nfcmrvl/fw_dnld.h+1−1

@@ -1,4 +1,4 @@
1	/**	1	/*
2	* Marvell NFC driver: Firmware downloader	2	* Marvell NFC driver: Firmware downloader
3	*	3	*
4	* Copyright (C) 2015, Marvell International Ltd.	4	* Copyright (C) 2015, Marvell International Ltd.

drivers/nfc/nfcmrvl/i2c.c+1−1

@@ -1,4 +1,4 @@
1	/**	1	/*
2	* Marvell NFC-over-I2C driver: I2C interface related functions	2	* Marvell NFC-over-I2C driver: I2C interface related functions
3	*	3	*
4	* Copyright (C) 2015, Marvell International Ltd.	4	* Copyright (C) 2015, Marvell International Ltd.

drivers/nfc/nfcmrvl/nfcmrvl.h+1−1

@@ -1,4 +1,4 @@
1	/**	1	/*
2	* Marvell NFC driver	2	* Marvell NFC driver
3	*	3	*
4	* Copyright (C) 2014-2015, Marvell International Ltd.	4	* Copyright (C) 2014-2015, Marvell International Ltd.

drivers/nfc/nfcmrvl/spi.c+1−1

@@ -1,4 +1,4 @@
1	/**	1	/*
2	* Marvell NFC-over-SPI driver: SPI interface related functions	2	* Marvell NFC-over-SPI driver: SPI interface related functions
3	*	3	*
4	* Copyright (C) 2015, Marvell International Ltd.	4	* Copyright (C) 2015, Marvell International Ltd.

drivers/nfc/nfcmrvl/uart.c+1−1

@@ -1,4 +1,4 @@
1	/**	1	/*
2	* Marvell NFC-over-UART driver	2	* Marvell NFC-over-UART driver
3	*	3	*
4	* Copyright (C) 2015, Marvell International Ltd.	4	* Copyright (C) 2015, Marvell International Ltd.

drivers/nfc/nfcmrvl/usb.c+1−1

@@ -1,4 +1,4 @@
1	/**	1	/*
2	* Marvell NFC-over-USB driver: USB interface related functions	2	* Marvell NFC-over-USB driver: USB interface related functions
3	*	3	*
4	* Copyright (C) 2014, Marvell International Ltd.	4	* Copyright (C) 2014, Marvell International Ltd.

drivers/nvme/host/Kconfig+2−1

 config NVME_TCP
 	tristate "NVM Express over Fabrics TCP host driver"
 	depends on INET
-	depends on BLK_DEV_NVME
+	depends on BLOCK
+	select NVME_CORE
 	select NVME_FABRICS
 	select CRYPTO
 	select CRYPTO_CRC32C

drivers/nvme/host/core.c+3−1

 	cdev_init(cdev, fops);
 	cdev->owner = owner;
 	ret = cdev_device_add(cdev, cdev_device);
-	if (ret)
+	if (ret) {
+		put_device(cdev_device);
 		ida_simple_remove(&nvme_ns_chr_minor_ida, minor);
+	}
 	return ret;
 }

drivers/nvme/host/fabrics.c+5−0

 			cmd->connect.recfmt);
 		break;
+	case NVME_SC_HOST_PATH_ERROR:
+		dev_err(ctrl->device,
+			"Connect command failed: host path error\n");
+		break;
 	default:
 		dev_err(ctrl->device,
 			"Connect command failed, error wo/DNR bit: %d\n",

drivers/nvme/host/fc.c+17−8

 	if (ctrl->ctrl.icdoff) {
 		dev_err(ctrl->ctrl.device, "icdoff %d is not supported!\n",
 				ctrl->ctrl.icdoff);
+		ret = NVME_SC_INVALID_FIELD | NVME_SC_DNR;
 		goto out_disconnect_admin_queue;
 	}
 	if (!(ctrl->ctrl.sgls & ((1 << 0) | (1 << 1)))) {
 		dev_err(ctrl->ctrl.device,
 			"Mandatory sgls are not supported!\n");
+		ret = NVME_SC_INVALID_FIELD | NVME_SC_DNR;
 		goto out_disconnect_admin_queue;
 	}
 	if (ctrl->ctrl.state != NVME_CTRL_CONNECTING)
 		return;
-	if (portptr->port_state == FC_OBJSTATE_ONLINE)
+	if (portptr->port_state == FC_OBJSTATE_ONLINE) {
 		dev_info(ctrl->ctrl.device,
 			"NVME-FC{%d}: reset: Reconnect attempt failed (%d)\n",
 			ctrl->cnum, status);
-	else if (time_after_eq(jiffies, rport->dev_loss_end))
+		if (status > 0 && (status & NVME_SC_DNR))
+			recon = false;
+	} else if (time_after_eq(jiffies, rport->dev_loss_end))
 		recon = false;
 	if (recon && nvmf_should_reconnect(&ctrl->ctrl)) {
 		queue_delayed_work(nvme_wq, &ctrl->connect_work, recon_delay);
 	} else {
-		if (portptr->port_state == FC_OBJSTATE_ONLINE)
+		if (portptr->port_state == FC_OBJSTATE_ONLINE) {
-			dev_warn(ctrl->ctrl.device,
+			if (status > 0 && (status & NVME_SC_DNR))
-				"NVME-FC{%d}: Max reconnect attempts (%d) "
+				dev_warn(ctrl->ctrl.device,
-				"reached.\n",
+					 "NVME-FC{%d}: reconnect failure\n",
-				ctrl->cnum, ctrl->ctrl.nr_reconnects);
+					 ctrl->cnum);
-		else
+			else
+				dev_warn(ctrl->ctrl.device,
+					 "NVME-FC{%d}: Max reconnect attempts "
+					 "(%d) reached.\n",
+					 ctrl->cnum, ctrl->ctrl.nr_reconnects);
+		} else
 			dev_warn(ctrl->ctrl.device,
 				"NVME-FC{%d}: dev_loss_tmo (%d) expired "
 				"while waiting for remoteport connectivity.\n",

drivers/nvme/host/rdma.c+3−2

 		int count)
 {
 	struct nvme_sgl_desc *sg = &c->common.dptr.sgl;
-	struct scatterlist *sgl = req->data_sgl.sg_table.sgl;
 	struct ib_sge *sge = &req->sge[1];
+	struct scatterlist *sgl;
 	u32 len = 0;
 	int i;
-	for (i = 0; i < count; i++, sgl++, sge++) {
+	for_each_sg(req->data_sgl.sg_table.sgl, sgl, count, i) {
 		sge->addr = sg_dma_address(sgl);
 		sge->length = sg_dma_len(sgl);
 		sge->lkey = queue->device->pd->local_dma_lkey;
 		len += sge->length;
+		sge++;
 	}
 	sg->addr = cpu_to_le64(queue->ctrl->ctrl.icdoff);

drivers/nvme/target/core.c+27−21

@@ -388,10 +388,10 @@ static void nvmet_keep_alive_timer(struct work_struct *work) · 387 unmodified lines
388	{	388	{
389	struct nvmet_ctrl *ctrl = container_of(to_delayed_work(work),	389	struct nvmet_ctrl *ctrl = container_of(to_delayed_work(work),
390	struct nvmet_ctrl, ka_work);	390	struct nvmet_ctrl, ka_work);
391	bool cmd_seen = ctrl->cmd_seen;	391	bool reset_tbkas = ctrl->reset_tbkas;
392		392
393	ctrl->cmd_seen = false;	393	ctrl->reset_tbkas = false;
394	if (cmd_seen) {	394	if (reset_tbkas) {
395	pr_debug("ctrl %d reschedule traffic based keep-alive timer\n",	395	pr_debug("ctrl %d reschedule traffic based keep-alive timer\n",
396	ctrl->cntlid);	396	ctrl->cntlid);
397	schedule_delayed_work(&ctrl->ka_work, ctrl->kato * HZ);	397	schedule_delayed_work(&ctrl->ka_work, ctrl->kato * HZ);
@@ -804,6 +804,13 @@ void nvmet_sq_destroy(struct nvmet_sq *sq) · 406 unmodified lines
804	percpu_ref_exit(&sq->ref);	804	percpu_ref_exit(&sq->ref);
805		805
806	if (ctrl) {	806	if (ctrl) {
		807	/*
		808	* The teardown flow may take some time, and the host may not
		809	* send us keep-alive during this period, hence reset the
		810	* traffic based keep-alive timer so we don't trigger a
		811	* controller teardown as a result of a keep-alive expiration.
		812	*/
		813	ctrl->reset_tbkas = true;
807	nvmet_ctrl_put(ctrl);	814	nvmet_ctrl_put(ctrl);
808	sq->ctrl = NULL; /* allows reusing the queue later */	815	sq->ctrl = NULL; /* allows reusing the queue later */
809	}	816	}
@@ -952,7 +959,7 @@ bool nvmet_req_init(struct nvmet_req req, struct nvmet_cq cq, · 142 unmodified lines
952	}	959	}
953		960
954	if (sq->ctrl)	961	if (sq->ctrl)
955	sq->ctrl->cmd_seen = true;	962	sq->ctrl->reset_tbkas = true;
956		963
957	return true;	964	return true;
958		965
@@ -998,19 +1005,23 @@ static unsigned int nvmet_data_transfer_len(struct nvmet_req *req) · 39 unmodified lines
998	return req->transfer_len - req->metadata_len;	1005	return req->transfer_len - req->metadata_len;
999	}	1006	}
1000		1007
1001	static int nvmet_req_alloc_p2pmem_sgls(struct nvmet_req *req)	1008	static int nvmet_req_alloc_p2pmem_sgls(struct pci_dev *p2p_dev,
		1009	struct nvmet_req *req)
1002	{	1010	{
1003	req->sg = pci_p2pmem_alloc_sgl(req->p2p_dev, &req->sg_cnt,	1011	req->sg = pci_p2pmem_alloc_sgl(p2p_dev, &req->sg_cnt,
1004	nvmet_data_transfer_len(req));	1012	nvmet_data_transfer_len(req));
1005	if (!req->sg)	1013	if (!req->sg)
1006	goto out_err;	1014	goto out_err;
1007		1015
1008	if (req->metadata_len) {	1016	if (req->metadata_len) {
1009	req->metadata_sg = pci_p2pmem_alloc_sgl(req->p2p_dev,	1017	req->metadata_sg = pci_p2pmem_alloc_sgl(p2p_dev,
1010	&req->metadata_sg_cnt, req->metadata_len);	1018	&req->metadata_sg_cnt, req->metadata_len);
1011	if (!req->metadata_sg)	1019	if (!req->metadata_sg)
1012	goto out_free_sg;	1020	goto out_free_sg;
1013	}	1021	}
		1022
		1023	req->p2p_dev = p2p_dev;
		1024
1014	return 0;	1025	return 0;
1015	out_free_sg:	1026	out_free_sg:
1016	pci_p2pmem_free_sgl(req->p2p_dev, req->sg);	1027	pci_p2pmem_free_sgl(req->p2p_dev, req->sg);
@@ -1018,25 +1029,19 @@ out_err: · 1 unmodified line
1018	return -ENOMEM;	1029	return -ENOMEM;
1019	}	1030	}
1020		1031
1021	static bool nvmet_req_find_p2p_dev(struct nvmet_req *req)	1032	static struct pci_dev nvmet_req_find_p2p_dev(struct nvmet_req req)
1022	{	1033	{
1023	if (!IS_ENABLED(CONFIG_PCI_P2PDMA))	1034	if (!IS_ENABLED(CONFIG_PCI_P2PDMA) \|\|
1024	return false;	1035	!req->sq->ctrl \|\| !req->sq->qid \|\| !req->ns)
1025		1036	return NULL;
1026	if (req->sq->ctrl && req->sq->qid && req->ns) {	1037	return radix_tree_lookup(&req->sq->ctrl->p2p_ns_map, req->ns->nsid);
1027	req->p2p_dev = radix_tree_lookup(&req->sq->ctrl->p2p_ns_map,
1028	req->ns->nsid);
1029	if (req->p2p_dev)
1030	return true;
1031	}
1032
1033	req->p2p_dev = NULL;
1034	return false;
1035	}	1038	}
1036		1039
1037	int nvmet_req_alloc_sgls(struct nvmet_req *req)	1040	int nvmet_req_alloc_sgls(struct nvmet_req *req)
1038	{	1041	{
1039	if (nvmet_req_find_p2p_dev(req) && !nvmet_req_alloc_p2pmem_sgls(req))	1042	struct pci_dev *p2p_dev = nvmet_req_find_p2p_dev(req);
		1043
		1044	if (p2p_dev && !nvmet_req_alloc_p2pmem_sgls(p2p_dev, req))
1040	return 0;	1045	return 0;
1041		1046
1042	req->sg = sgl_alloc(nvmet_data_transfer_len(req), GFP_KERNEL,	1047	req->sg = sgl_alloc(nvmet_data_transfer_len(req), GFP_KERNEL,
@@ -1065,6 +1070,7 @@ void nvmet_req_free_sgls(struct nvmet_req *req) · 22 unmodified lines
1065	pci_p2pmem_free_sgl(req->p2p_dev, req->sg);	1070	pci_p2pmem_free_sgl(req->p2p_dev, req->sg);
1066	if (req->metadata_sg)	1071	if (req->metadata_sg)
1067	pci_p2pmem_free_sgl(req->p2p_dev, req->metadata_sg);	1072	pci_p2pmem_free_sgl(req->p2p_dev, req->metadata_sg);
		1073	req->p2p_dev = NULL;
1068	} else {	1074	} else {
1069	sgl_free(req->sg);	1075	sgl_free(req->sg);
1070	if (req->metadata_sg)	1076	if (req->metadata_sg)

drivers/nvme/target/loop.c+8−3

 static void nvme_loop_destroy_admin_queue(struct nvme_loop_ctrl *ctrl)
 {
-	clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags);
+	if (!test_and_clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags))
+		return;
 	nvmet_sq_destroy(&ctrl->queues[0].nvme_sq);
 	blk_cleanup_queue(ctrl->ctrl.admin_q);
 	blk_cleanup_queue(ctrl->ctrl.fabrics_q);
 		clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[i].flags);
 		nvmet_sq_destroy(&ctrl->queues[i].nvme_sq);
 	}
+	ctrl->ctrl.queue_count = 1;
 }
 static int nvme_loop_init_io_queues(struct nvme_loop_ctrl *ctrl)
 	return 0;
 out_cleanup_queue:
+	clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags);
 	blk_cleanup_queue(ctrl->ctrl.admin_q);
 out_cleanup_fabrics_q:
 	blk_cleanup_queue(ctrl->ctrl.fabrics_q);
 	nvme_loop_shutdown_ctrl(ctrl);
 	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING)) {
-		/* state change failure should never happen */
+		if (ctrl->ctrl.state != NVME_CTRL_DELETING &&
-		WARN_ON_ONCE(1);
+		    ctrl->ctrl.state != NVME_CTRL_DELETING_NOIO)
+			/* state change failure for non-deleted ctrl? */
+			WARN_ON_ONCE(1);
 		return;
 	}

drivers/nvme/target/nvmet.h+1−1

@@ -167,7 +167,7 @@ struct nvmet_ctrl { · 166 unmodified lines
167	struct nvmet_subsys *subsys;	167	struct nvmet_subsys *subsys;
168	struct nvmet_sq **sqs;	168	struct nvmet_sq **sqs;
169		169
170	bool cmd_seen;	170	bool reset_tbkas;
171		171
172	struct mutex lock;	172	struct mutex lock;
173	u64 cap;	173	u64 cap;

drivers/nvme/target/tcp.c+1−1

@@ -550,7 +550,7 @@ static void nvmet_tcp_queue_response(struct nvmet_req *req) · 549 unmodified lines
550	* nvmet_req_init is completed.	550	* nvmet_req_init is completed.
551	*/	551	*/
552	if (queue->rcv_state == NVMET_TCP_RECV_PDU &&	552	if (queue->rcv_state == NVMET_TCP_RECV_PDU &&
553	len && len < cmd->req.port->inline_data_size &&	553	len && len <= cmd->req.port->inline_data_size &&
554	nvme_is_write(cmd->req.cmd))	554	nvme_is_write(cmd->req.cmd))
555	return;	555	return;
556	}	556	}

drivers/pci/controller/dwc/Makefile+2−1

 obj-$(CONFIG_PCIE_KIRIN) += pcie-kirin.o
 obj-$(CONFIG_PCIE_HISI_STB) += pcie-histb.o
 obj-$(CONFIG_PCI_MESON) += pci-meson.o
+obj-$(CONFIG_PCIE_TEGRA194) += pcie-tegra194.o
 obj-$(CONFIG_PCIE_UNIPHIER) += pcie-uniphier.o
 obj-$(CONFIG_PCIE_UNIPHIER_EP) += pcie-uniphier-ep.o
 ifdef CONFIG_PCI_QUIRKS
 obj-$(CONFIG_ARM64) += pcie-al.o
 obj-$(CONFIG_ARM64) += pcie-hisi.o
-obj-$(CONFIG_ARM64) += pcie-tegra194.o
+obj-$(CONFIG_ARM64) += pcie-tegra194-acpi.o
 endif
 endif

drivers/pci/controller/dwc/pcie-tegra194-acpi.c+108−0

@@ -0,0 +1,108 @@
	1	// SPDX-License-Identifier: GPL-2.0+
	2	/*
	3	* ACPI quirks for Tegra194 PCIe host controller
	4	*
	5	* Copyright (C) 2021 NVIDIA Corporation.
	6	*
	7	* Author: Vidya Sagar <vidyas@nvidia.com>
	8	*/
	9
	10	#include <linux/pci.h>
	11	#include <linux/pci-acpi.h>
	12	#include <linux/pci-ecam.h>
	13
	14	#include "pcie-designware.h"
	15
	16	struct tegra194_pcie_ecam {
	17	void __iomem *config_base;
	18	void __iomem *iatu_base;
	19	void __iomem *dbi_base;
	20	};
	21
	22	static int tegra194_acpi_init(struct pci_config_window *cfg)
	23	{
	24	struct device *dev = cfg->parent;
	25	struct tegra194_pcie_ecam *pcie_ecam;
	26
	27	pcie_ecam = devm_kzalloc(dev, sizeof(*pcie_ecam), GFP_KERNEL);
	28	if (!pcie_ecam)
	29	return -ENOMEM;
	30
	31	pcie_ecam->config_base = cfg->win;
	32	pcie_ecam->iatu_base = cfg->win + SZ_256K;
	33	pcie_ecam->dbi_base = cfg->win + SZ_512K;
	34	cfg->priv = pcie_ecam;
	35
	36	return 0;
	37	}
	38
	39	static void atu_reg_write(struct tegra194_pcie_ecam *pcie_ecam, int index,
	40	u32 val, u32 reg)
	41	{
	42	u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index);
	43
	44	writel(val, pcie_ecam->iatu_base + offset + reg);
	45	}
	46
	47	static void program_outbound_atu(struct tegra194_pcie_ecam *pcie_ecam,
	48	int index, int type, u64 cpu_addr,
	49	u64 pci_addr, u64 size)
	50	{
	51	atu_reg_write(pcie_ecam, index, lower_32_bits(cpu_addr),
	52	PCIE_ATU_LOWER_BASE);
	53	atu_reg_write(pcie_ecam, index, upper_32_bits(cpu_addr),
	54	PCIE_ATU_UPPER_BASE);
	55	atu_reg_write(pcie_ecam, index, lower_32_bits(pci_addr),
	56	PCIE_ATU_LOWER_TARGET);
	57	atu_reg_write(pcie_ecam, index, lower_32_bits(cpu_addr + size - 1),
	58	PCIE_ATU_LIMIT);
	59	atu_reg_write(pcie_ecam, index, upper_32_bits(pci_addr),
	60	PCIE_ATU_UPPER_TARGET);
	61	atu_reg_write(pcie_ecam, index, type, PCIE_ATU_CR1);
	62	atu_reg_write(pcie_ecam, index, PCIE_ATU_ENABLE, PCIE_ATU_CR2);
	63	}
	64
	65	static void __iomem tegra194_map_bus(struct pci_bus bus,
	66	unsigned int devfn, int where)
	67	{
	68	struct pci_config_window *cfg = bus->sysdata;
	69	struct tegra194_pcie_ecam *pcie_ecam = cfg->priv;
	70	u32 busdev;
	71	int type;
	72
	73	if (bus->number < cfg->busr.start \|\| bus->number > cfg->busr.end)
	74	return NULL;
	75
	76	if (bus->number == cfg->busr.start) {
	77	if (PCI_SLOT(devfn) == 0)
	78	return pcie_ecam->dbi_base + where;
	79	else
	80	return NULL;
	81	}
	82
	83	busdev = PCIE_ATU_BUS(bus->number) \| PCIE_ATU_DEV(PCI_SLOT(devfn)) \|
	84	PCIE_ATU_FUNC(PCI_FUNC(devfn));
	85
	86	if (bus->parent->number == cfg->busr.start) {
	87	if (PCI_SLOT(devfn) == 0)
	88	type = PCIE_ATU_TYPE_CFG0;
	89	else
	90	return NULL;
	91	} else {
	92	type = PCIE_ATU_TYPE_CFG1;
	93	}
	94
	95	program_outbound_atu(pcie_ecam, 0, type, cfg->res.start, busdev,
	96	SZ_256K);
	97
	98	return pcie_ecam->config_base + where;
	99	}
	100
	101	const struct pci_ecam_ops tegra194_pcie_ops = {
	102	.init = tegra194_acpi_init,
	103	.pci_ops = {
	104	.map_bus = tegra194_map_bus,
	105	.read = pci_generic_config_read,
	106	.write = pci_generic_config_write,
	107	}
	108	};

drivers/pci/controller/dwc/pcie-tegra194.c+18−120

@@ -22,8 +22,6 @@ · 21 unmodified lines
22	#include <linux/of_irq.h>	22	#include <linux/of_irq.h>
23	#include <linux/of_pci.h>	23	#include <linux/of_pci.h>
24	#include <linux/pci.h>	24	#include <linux/pci.h>
25	#include <linux/pci-acpi.h>
26	#include <linux/pci-ecam.h>
27	#include <linux/phy/phy.h>	25	#include <linux/phy/phy.h>
28	#include <linux/pinctrl/consumer.h>	26	#include <linux/pinctrl/consumer.h>
29	#include <linux/platform_device.h>	27	#include <linux/platform_device.h>
@@ -247,24 +245,6 @@ static const unsigned int pcie_gen_freq[] = { · 217 unmodified lines
247	GEN4_CORE_CLK_FREQ	245	GEN4_CORE_CLK_FREQ
248	};	246	};
249		247
250	static const u32 event_cntr_ctrl_offset[] = {
251	0x1d8,
252	0x1a8,
253	0x1a8,
254	0x1a8,
255	0x1c4,
256	0x1d8
257	};
258
259	static const u32 event_cntr_data_offset[] = {
260	0x1dc,
261	0x1ac,
262	0x1ac,
263	0x1ac,
264	0x1c8,
265	0x1dc
266	};
267
268	struct tegra_pcie_dw {	248	struct tegra_pcie_dw {
269	struct device *dev;	249	struct device *dev;
270	struct resource *appl_res;	250	struct resource *appl_res;
@@ -313,104 +293,6 @@ struct tegra_pcie_dw_of_data { · 42 unmodified lines
313	enum dw_pcie_device_mode mode;	293	enum dw_pcie_device_mode mode;
314	};	294	};
315		295
316	#if defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS)
317	struct tegra194_pcie_ecam {
318	void __iomem *config_base;
319	void __iomem *iatu_base;
320	void __iomem *dbi_base;
321	};
322
323	static int tegra194_acpi_init(struct pci_config_window *cfg)
324	{
325	struct device *dev = cfg->parent;
326	struct tegra194_pcie_ecam *pcie_ecam;
327
328	pcie_ecam = devm_kzalloc(dev, sizeof(*pcie_ecam), GFP_KERNEL);
329	if (!pcie_ecam)
330	return -ENOMEM;
331
332	pcie_ecam->config_base = cfg->win;
333	pcie_ecam->iatu_base = cfg->win + SZ_256K;
334	pcie_ecam->dbi_base = cfg->win + SZ_512K;
335	cfg->priv = pcie_ecam;
336
337	return 0;
338	}
339
340	static void atu_reg_write(struct tegra194_pcie_ecam *pcie_ecam, int index,
341	u32 val, u32 reg)
342	{
343	u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index);
344
345	writel(val, pcie_ecam->iatu_base + offset + reg);
346	}
347
348	static void program_outbound_atu(struct tegra194_pcie_ecam *pcie_ecam,
349	int index, int type, u64 cpu_addr,
350	u64 pci_addr, u64 size)
351	{
352	atu_reg_write(pcie_ecam, index, lower_32_bits(cpu_addr),
353	PCIE_ATU_LOWER_BASE);
354	atu_reg_write(pcie_ecam, index, upper_32_bits(cpu_addr),
355	PCIE_ATU_UPPER_BASE);
356	atu_reg_write(pcie_ecam, index, lower_32_bits(pci_addr),
357	PCIE_ATU_LOWER_TARGET);
358	atu_reg_write(pcie_ecam, index, lower_32_bits(cpu_addr + size - 1),
359	PCIE_ATU_LIMIT);
360	atu_reg_write(pcie_ecam, index, upper_32_bits(pci_addr),
361	PCIE_ATU_UPPER_TARGET);
362	atu_reg_write(pcie_ecam, index, type, PCIE_ATU_CR1);
363	atu_reg_write(pcie_ecam, index, PCIE_ATU_ENABLE, PCIE_ATU_CR2);
364	}
365
366	static void __iomem tegra194_map_bus(struct pci_bus bus,
367	unsigned int devfn, int where)
368	{
369	struct pci_config_window *cfg = bus->sysdata;
370	struct tegra194_pcie_ecam *pcie_ecam = cfg->priv;
371	u32 busdev;
372	int type;
373
374	if (bus->number < cfg->busr.start \|\| bus->number > cfg->busr.end)
375	return NULL;
376
377	if (bus->number == cfg->busr.start) {
378	if (PCI_SLOT(devfn) == 0)
379	return pcie_ecam->dbi_base + where;
380	else
381	return NULL;
382	}
383
384	busdev = PCIE_ATU_BUS(bus->number) \| PCIE_ATU_DEV(PCI_SLOT(devfn)) \|
385	PCIE_ATU_FUNC(PCI_FUNC(devfn));
386
387	if (bus->parent->number == cfg->busr.start) {
388	if (PCI_SLOT(devfn) == 0)
389	type = PCIE_ATU_TYPE_CFG0;
390	else
391	return NULL;
392	} else {
393	type = PCIE_ATU_TYPE_CFG1;
394	}
395
396	program_outbound_atu(pcie_ecam, 0, type, cfg->res.start, busdev,
397	SZ_256K);
398
399	return pcie_ecam->config_base + where;
400	}
401
402	const struct pci_ecam_ops tegra194_pcie_ops = {
403	.init = tegra194_acpi_init,
404	.pci_ops = {
405	.map_bus = tegra194_map_bus,
406	.read = pci_generic_config_read,
407	.write = pci_generic_config_write,
408	}
409	};
410	#endif /* defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS) */
411
412	#ifdef CONFIG_PCIE_TEGRA194
413
414	static inline struct tegra_pcie_dw to_tegra_pcie(struct dw_pcie pci)	296	static inline struct tegra_pcie_dw to_tegra_pcie(struct dw_pcie pci)
415	{	297	{
416	return container_of(pci, struct tegra_pcie_dw, pci);	298	return container_of(pci, struct tegra_pcie_dw, pci);
@@ -694,6 +576,24 @@ static struct pci_ops tegra_pci_ops = { · 277 unmodified lines
694	};	576	};
695		577
696	#if defined(CONFIG_PCIEASPM)	578	#if defined(CONFIG_PCIEASPM)
		579	static const u32 event_cntr_ctrl_offset[] = {
		580	0x1d8,
		581	0x1a8,
		582	0x1a8,
		583	0x1a8,
		584	0x1c4,
		585	0x1d8
		586	};
		587
		588	static const u32 event_cntr_data_offset[] = {
		589	0x1dc,
		590	0x1ac,
		591	0x1ac,
		592	0x1ac,
		593	0x1c8,
		594	0x1dc
		595	};
		596
697	static void disable_aspm_l11(struct tegra_pcie_dw *pcie)	597	static void disable_aspm_l11(struct tegra_pcie_dw *pcie)
698	{	598	{
699	u32 val;	599	u32 val;
@@ -2411,5 +2311,3 @@ MODULE_DEVICE_TABLE(of, tegra_pcie_dw_of_match); · 1711 unmodified lines
2411	MODULE_AUTHOR("Vidya Sagar <vidyas@nvidia.com>");	2311	MODULE_AUTHOR("Vidya Sagar <vidyas@nvidia.com>");
2412	MODULE_DESCRIPTION("NVIDIA PCIe host controller driver");	2312	MODULE_DESCRIPTION("NVIDIA PCIe host controller driver");
2413	MODULE_LICENSE("GPL v2");	2313	MODULE_LICENSE("GPL v2");
2414
2415	#endif /* CONFIG_PCIE_TEGRA194 */

drivers/pci/controller/pci-aardvark.c+40−9

 		udelay(PIO_RETRY_DELAY);
 	}
-	dev_err(dev, "config read/write timed out\n");
+	dev_err(dev, "PIO read/write transfer time out\n");
 	return -ETIMEDOUT;
 }
 	return true;
 }
+static bool advk_pcie_pio_is_running(struct advk_pcie *pcie)
+{
+	struct device *dev = &pcie->pdev->dev;
+	/*
+	 * Trying to start a new PIO transfer when previous has not completed
+	 * cause External Abort on CPU which results in kernel panic:
+	 *
+	 *     SError Interrupt on CPU0, code 0xbf000002 -- SError
+	 *     Kernel panic - not syncing: Asynchronous SError Interrupt
+	 *
+	 * Functions advk_pcie_rd_conf() and advk_pcie_wr_conf() are protected
+	 * by raw_spin_lock_irqsave() at pci_lock_config() level to prevent
+	 * concurrent calls at the same time. But because PIO transfer may take
+	 * about 1.5s when link is down or card is disconnected, it means that
+	 * advk_pcie_wait_pio() does not always have to wait for completion.
+	 *
+	 * Some versions of ARM Trusted Firmware handles this External Abort at
+	 * EL3 level and mask it to prevent kernel panic. Relevant TF-A commit:
+	 * https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=3c7dcdac5c50
+	 */
+	if (advk_readl(pcie, PIO_START)) {
+		dev_err(dev, "Previous PIO read/write transfer is still running\n");
+		return true;
+	}
+	return false;
+}
 static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn,
 			     int where, int size, u32 *val)
 {
 		return pci_bridge_emul_conf_read(&pcie->bridge, where,
 						 size, val);
-	/* Start PIO */
+	if (advk_pcie_pio_is_running(pcie)) {
-	advk_writel(pcie, 0, PIO_START);
+		*val = 0xffffffff;
-	advk_writel(pcie, 1, PIO_ISR);
+		return PCIBIOS_SET_FAILED;
+	}
 	/* Program the control register */
 	reg = advk_readl(pcie, PIO_CTRL);
 	/* Program the data strobe */
 	advk_writel(pcie, 0xf, PIO_WR_DATA_STRB);
-	/* Start the transfer */
+	/* Clear PIO DONE ISR and start the transfer */
+	advk_writel(pcie, 1, PIO_ISR);
 	advk_writel(pcie, 1, PIO_START);
 	ret = advk_pcie_wait_pio(pcie);
 	if (where % size)
 		return PCIBIOS_SET_FAILED;
-	/* Start PIO */
+	if (advk_pcie_pio_is_running(pcie))
-	advk_writel(pcie, 0, PIO_START);
+		return PCIBIOS_SET_FAILED;
-	advk_writel(pcie, 1, PIO_ISR);
 	/* Program the control register */
 	reg = advk_readl(pcie, PIO_CTRL);
 	/* Program the data strobe */
 	advk_writel(pcie, data_strobe, PIO_WR_DATA_STRB);
-	/* Start the transfer */
+	/* Clear PIO DONE ISR and start the transfer */
+	advk_writel(pcie, 1, PIO_ISR);
 	advk_writel(pcie, 1, PIO_START);
 	ret = advk_pcie_wait_pio(pcie);

drivers/pci/of.c+9−0

 #endif
 }
+bool pci_host_of_has_msi_map(struct device *dev)
+{
+	if (dev && dev->of_node)
+		return of_get_property(dev->of_node, "msi-map", NULL);
+	return false;
+}
 static inline int __of_pci_pci_compare(struct device_node *node,
 				       unsigned int data)
 {
 				dev_warn(dev, "More than one I/O resource converted for %pOF. CPU base address for old range lost!\n",
 					 dev_node);
 			*io_base = range.cpu_addr;
+		} else if (resource_type(res) == IORESOURCE_MEM) {
+			res->flags &= ~IORESOURCE_MEM_64;
 		}
 		pci_add_resource_offset(resources, res,	res->start - range.pci_addr);

drivers/pci/probe.c+2−1

@@ -925,7 +925,8 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) · 924 unmodified lines
925	device_enable_async_suspend(bus->bridge);	925	device_enable_async_suspend(bus->bridge);
926	pci_set_bus_of_node(bus);	926	pci_set_bus_of_node(bus);
927	pci_set_bus_msi_domain(bus);	927	pci_set_bus_msi_domain(bus);
928	if (bridge->msi_domain && !dev_get_msi_domain(&bus->dev))	928	if (bridge->msi_domain && !dev_get_msi_domain(&bus->dev) &&
		929	!pci_host_of_has_msi_map(parent))
929	bus->bus_flags \|= PCI_BUS_FLAGS_NO_MSI;	930	bus->bus_flags \|= PCI_BUS_FLAGS_NO_MSI;
930		931
931	if (!parent)	932	if (!parent)

drivers/pci/quirks.c+92−1

@@ -3546,6 +3546,18 @@ static void quirk_no_bus_reset(struct pci_dev *dev) · 3545 unmodified lines
3546	dev->dev_flags \|= PCI_DEV_FLAGS_NO_BUS_RESET;	3546	dev->dev_flags \|= PCI_DEV_FLAGS_NO_BUS_RESET;
3547	}	3547	}
3548		3548
		3549	/*
		3550	* Some NVIDIA GPU devices do not work with bus reset, SBR needs to be
		3551	* prevented for those affected devices.
		3552	*/
		3553	static void quirk_nvidia_no_bus_reset(struct pci_dev *dev)
		3554	{
		3555	if ((dev->device & 0xffc0) == 0x2340)
		3556	quirk_no_bus_reset(dev);
		3557	}
		3558	DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
		3559	quirk_nvidia_no_bus_reset);
		3560
3549	/*	3561	/*
3550	* Some Atheros AR9xxx and QCA988x chips do not behave after a bus reset.	3562	* Some Atheros AR9xxx and QCA988x chips do not behave after a bus reset.
3551	* The device will throw a Link Down error on AER-capable systems and	3563	* The device will throw a Link Down error on AER-capable systems and
@@ -3566,6 +3578,16 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0034, quirk_no_bus_reset); · 14 unmodified lines
3566	*/	3578	*/
3567	DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CAVIUM, 0xa100, quirk_no_bus_reset);	3579	DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CAVIUM, 0xa100, quirk_no_bus_reset);
3568		3580
		3581	/*
		3582	* Some TI KeyStone C667X devices do not support bus/hot reset. The PCIESS
		3583	* automatically disables LTSSM when Secondary Bus Reset is received and
		3584	* the device stops working. Prevent bus reset for these devices. With
		3585	* this change, the device can be assigned to VMs with VFIO, but it will
		3586	* leak state between VMs. Reference
		3587	* https://e2e.ti.com/support/processors/f/791/t/954382
		3588	*/
		3589	DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, 0xb005, quirk_no_bus_reset);
		3590
3569	static void quirk_no_pm_reset(struct pci_dev *dev)	3591	static void quirk_no_pm_reset(struct pci_dev *dev)
3570	{	3592	{
3571	/*	3593	/*
@@ -3901,6 +3923,69 @@ static int delay_250ms_after_flr(struct pci_dev *dev, int probe) · 329 unmodified lines
3901	return 0;	3923	return 0;
3902	}	3924	}
3903		3925
		3926	#define PCI_DEVICE_ID_HINIC_VF 0x375E
		3927	#define HINIC_VF_FLR_TYPE 0x1000
		3928	#define HINIC_VF_FLR_CAP_BIT (1UL << 30)
		3929	#define HINIC_VF_OP 0xE80
		3930	#define HINIC_VF_FLR_PROC_BIT (1UL << 18)
		3931	#define HINIC_OPERATION_TIMEOUT 15000 /* 15 seconds */
		3932
		3933	/* Device-specific reset method for Huawei Intelligent NIC virtual functions */
		3934	static int reset_hinic_vf_dev(struct pci_dev *pdev, int probe)
		3935	{
		3936	unsigned long timeout;
		3937	void __iomem *bar;
		3938	u32 val;
		3939
		3940	if (probe)
		3941	return 0;
		3942
		3943	bar = pci_iomap(pdev, 0, 0);
		3944	if (!bar)
		3945	return -ENOTTY;
		3946
		3947	/* Get and check firmware capabilities */
		3948	val = ioread32be(bar + HINIC_VF_FLR_TYPE);
		3949	if (!(val & HINIC_VF_FLR_CAP_BIT)) {
		3950	pci_iounmap(pdev, bar);
		3951	return -ENOTTY;
		3952	}
		3953
		3954	/* Set HINIC_VF_FLR_PROC_BIT for the start of FLR */
		3955	val = ioread32be(bar + HINIC_VF_OP);
		3956	val = val \| HINIC_VF_FLR_PROC_BIT;
		3957	iowrite32be(val, bar + HINIC_VF_OP);
		3958
		3959	pcie_flr(pdev);
		3960
		3961	/*
		3962	* The device must recapture its Bus and Device Numbers after FLR
		3963	* in order generate Completions. Issue a config write to let the
		3964	* device capture this information.
		3965	*/
		3966	pci_write_config_word(pdev, PCI_VENDOR_ID, 0);
		3967
		3968	/* Firmware clears HINIC_VF_FLR_PROC_BIT when reset is complete */
		3969	timeout = jiffies + msecs_to_jiffies(HINIC_OPERATION_TIMEOUT);
		3970	do {
		3971	val = ioread32be(bar + HINIC_VF_OP);
		3972	if (!(val & HINIC_VF_FLR_PROC_BIT))
		3973	goto reset_complete;
		3974	msleep(20);
		3975	} while (time_before(jiffies, timeout));
		3976
		3977	val = ioread32be(bar + HINIC_VF_OP);
		3978	if (!(val & HINIC_VF_FLR_PROC_BIT))
		3979	goto reset_complete;
		3980
		3981	pci_warn(pdev, "Reset dev timeout, FLR ack reg: %#010x\n", val);
		3982
		3983	reset_complete:
		3984	pci_iounmap(pdev, bar);
		3985
		3986	return 0;
		3987	}
		3988
3904	static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {	3989	static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {
3905	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82599_SFP_VF,	3990	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82599_SFP_VF,
3906	reset_intel_82599_sfp_virtfn },	3991	reset_intel_82599_sfp_virtfn },
@@ -3913,6 +3998,8 @@ static const struct pci_dev_reset_methods pci_dev_reset_methods[] = { · 6 unmodified lines
3913	{ PCI_VENDOR_ID_INTEL, 0x0a54, delay_250ms_after_flr },	3998	{ PCI_VENDOR_ID_INTEL, 0x0a54, delay_250ms_after_flr },
3914	{ PCI_VENDOR_ID_CHELSIO, PCI_ANY_ID,	3999	{ PCI_VENDOR_ID_CHELSIO, PCI_ANY_ID,
3915	reset_chelsio_generic_dev },	4000	reset_chelsio_generic_dev },
		4001	{ PCI_VENDOR_ID_HUAWEI, PCI_DEVICE_ID_HINIC_VF,
		4002	reset_hinic_vf_dev },
3916	{ 0 }	4003	{ 0 }
3917	};	4004	};
3918		4005
@@ -4753,6 +4840,8 @@ static const struct pci_dev_acs_enabled { · 834 unmodified lines
4753	{ PCI_VENDOR_ID_AMPERE, 0xE00A, pci_quirk_xgene_acs },	4840	{ PCI_VENDOR_ID_AMPERE, 0xE00A, pci_quirk_xgene_acs },
4754	{ PCI_VENDOR_ID_AMPERE, 0xE00B, pci_quirk_xgene_acs },	4841	{ PCI_VENDOR_ID_AMPERE, 0xE00B, pci_quirk_xgene_acs },
4755	{ PCI_VENDOR_ID_AMPERE, 0xE00C, pci_quirk_xgene_acs },	4842	{ PCI_VENDOR_ID_AMPERE, 0xE00C, pci_quirk_xgene_acs },
		4843	/* Broadcom multi-function device */
		4844	{ PCI_VENDOR_ID_BROADCOM, 0x16D7, pci_quirk_mf_endpoint_acs },
4756	{ PCI_VENDOR_ID_BROADCOM, 0xD714, pci_quirk_brcm_acs },	4845	{ PCI_VENDOR_ID_BROADCOM, 0xD714, pci_quirk_brcm_acs },
4757	/* Amazon Annapurna Labs */	4846	/* Amazon Annapurna Labs */
4758	{ PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031, pci_quirk_al_acs },	4847	{ PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031, pci_quirk_al_acs },
@@ -5154,7 +5243,8 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422, quirk_no_ext_tags); · 395 unmodified lines
5154	static void quirk_amd_harvest_no_ats(struct pci_dev *pdev)	5243	static void quirk_amd_harvest_no_ats(struct pci_dev *pdev)
5155	{	5244	{
5156	if ((pdev->device == 0x7312 && pdev->revision != 0x00) \|\|	5245	if ((pdev->device == 0x7312 && pdev->revision != 0x00) \|\|
5157	(pdev->device == 0x7340 && pdev->revision != 0xc5))	5246	(pdev->device == 0x7340 && pdev->revision != 0xc5) \|\|
		5247	(pdev->device == 0x7341 && pdev->revision != 0x00))
5158	return;	5248	return;
5159		5249
5160	if (pdev->device == 0x15d8) {	5250	if (pdev->device == 0x15d8) {
@@ -5181,6 +5271,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x6900, quirk_amd_harvest_no_ats); · 20 unmodified lines
5181	DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7312, quirk_amd_harvest_no_ats);	5271	DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7312, quirk_amd_harvest_no_ats);
5182	/* AMD Navi14 dGPU */	5272	/* AMD Navi14 dGPU */
5183	DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7340, quirk_amd_harvest_no_ats);	5273	DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7340, quirk_amd_harvest_no_ats);
		5274	DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7341, quirk_amd_harvest_no_ats);
5184	/* AMD Raven platform iGPU */	5275	/* AMD Raven platform iGPU */
5185	DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x15d8, quirk_amd_harvest_no_ats);	5276	DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x15d8, quirk_amd_harvest_no_ats);
5186	#endif /* CONFIG_PCI_ATS */	5277	#endif /* CONFIG_PCI_ATS */

drivers/phy/broadcom/phy-brcm-usb-init.h+2−2

@@ -78,7 +78,7 @@ static inline u32 brcm_usb_readl(void __iomem *addr) · 77 unmodified lines
78	* Other architectures (e.g., ARM) either do not support big endian, or	78	* Other architectures (e.g., ARM) either do not support big endian, or
79	* else leave I/O in little endian mode.	79	* else leave I/O in little endian mode.
80	*/	80	*/
81	if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(__BIG_ENDIAN))	81	if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))
82	return __raw_readl(addr);	82	return __raw_readl(addr);
83	else	83	else
84	return readl_relaxed(addr);	84	return readl_relaxed(addr);
@@ -87,7 +87,7 @@ static inline u32 brcm_usb_readl(void __iomem *addr) · 2 unmodified lines
87	static inline void brcm_usb_writel(u32 val, void __iomem *addr)	87	static inline void brcm_usb_writel(u32 val, void __iomem *addr)
88	{	88	{
89	/* See brcmnand_readl() comments */	89	/* See brcmnand_readl() comments */
90	if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(__BIG_ENDIAN))	90	if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))
91	__raw_writel(val, addr);	91	__raw_writel(val, addr);
92	else	92	else
93	writel_relaxed(val, addr);	93	writel_relaxed(val, addr);

drivers/phy/cadence/phy-cadence-sierra.c+1−0

@@ -940,6 +940,7 @@ static int cdns_sierra_phy_probe(struct platform_device *pdev) · 939 unmodified lines
940	sp->nsubnodes = node;	940	sp->nsubnodes = node;
941		941
942	if (sp->num_lanes > SIERRA_MAX_LANES) {	942	if (sp->num_lanes > SIERRA_MAX_LANES) {
		943	ret = -EINVAL;
943	dev_err(dev, "Invalid lane configuration\n");	944	dev_err(dev, "Invalid lane configuration\n");
944	goto put_child2;	945	goto put_child2;
945	}	946	}

drivers/phy/mediatek/phy-mtk-tphy.c+2−0

@@ -949,6 +949,8 @@ static int mtk_phy_init(struct phy *phy) · 948 unmodified lines
949	break;	949	break;
950	default:	950	default:
951	dev_err(tphy->dev, "incompatible PHY type\n");	951	dev_err(tphy->dev, "incompatible PHY type\n");
		952	clk_disable_unprepare(instance->ref_clk);
		953	clk_disable_unprepare(instance->da_ref_clk);
952	return -EINVAL;	954	return -EINVAL;
953	}	955	}
954		956

drivers/phy/microchip/sparx5_serdes.c+4−0

 	priv->coreclock = clock;
 	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!iores) {
+		dev_err(priv->dev, "Invalid resource\n");
+		return -EINVAL;
+	}
 	iomem = devm_ioremap(priv->dev, iores->start, resource_size(iores));
 	if (IS_ERR(iomem)) {
 		dev_err(priv->dev, "Unable to get serdes registers: %s\n",

drivers/phy/ralink/phy-mt7621-pci.c+1−1

@@ -341,7 +341,7 @@ static struct platform_driver mt7621_pci_phy_driver = { · 340 unmodified lines
341	.probe = mt7621_pci_phy_probe,	341	.probe = mt7621_pci_phy_probe,
342	.driver = {	342	.driver = {
343	.name = "mt7621-pci-phy",	343	.name = "mt7621-pci-phy",
344	.of_match_table = of_match_ptr(mt7621_pci_phy_ids),	344	.of_match_table = mt7621_pci_phy_ids,
345	},	345	},
346	};	346	};
347		347

drivers/phy/ti/phy-j721e-wiz.c+1−0

@@ -1212,6 +1212,7 @@ static int wiz_probe(struct platform_device *pdev) · 1211 unmodified lines
1212		1212
1213	if (wiz->typec_dir_delay < WIZ_TYPEC_DIR_DEBOUNCE_MIN \|\|	1213	if (wiz->typec_dir_delay < WIZ_TYPEC_DIR_DEBOUNCE_MIN \|\|
1214	wiz->typec_dir_delay > WIZ_TYPEC_DIR_DEBOUNCE_MAX) {	1214	wiz->typec_dir_delay > WIZ_TYPEC_DIR_DEBOUNCE_MAX) {
		1215	ret = -EINVAL;
1215	dev_err(dev, "Invalid typec-dir-debounce property\n");	1216	dev_err(dev, "Invalid typec-dir-debounce property\n");
1216	goto err_addr_to_resource;	1217	goto err_addr_to_resource;
1217	}	1218	}

drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c+2−2

@@ -2702,8 +2702,8 @@ static int aspeed_g5_sig_expr_eval(struct aspeed_pinmux_data *ctx, · 2701 unmodified lines
2702	}	2702	}
2703		2703
2704	/**	2704	/**
2705	* Configure a pin's signal by applying an expression's descriptor state for	2705	* aspeed_g5_sig_expr_set() - Configure a pin's signal by applying an
2706	* all descriptors in the expression.	2706	* expression's descriptor state for all descriptors in the expression.
2707	*	2707	*
2708	* @ctx: The pinmux context	2708	* @ctx: The pinmux context
2709	* @expr: The expression associated with the function whose signal is to be	2709	* @expr: The expression associated with the function whose signal is to be

drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c+2−2

@@ -2611,8 +2611,8 @@ static struct aspeed_pin_config aspeed_g6_configs[] = { · 2610 unmodified lines
2611	};	2611	};
2612		2612
2613	/**	2613	/**
2614	* Configure a pin's signal by applying an expression's descriptor state for	2614	* aspeed_g6_sig_expr_set() - Configure a pin's signal by applying an
2615	* all descriptors in the expression.	2615	* expression's descriptor state for all descriptors in the expression.
2616	*	2616	*
2617	* @ctx: The pinmux context	2617	* @ctx: The pinmux context
2618	* @expr: The expression associated with the function whose signal is to be	2618	* @expr: The expression associated with the function whose signal is to be

drivers/pinctrl/aspeed/pinctrl-aspeed.c+2−1

@@ -108,7 +108,8 @@ static int aspeed_sig_expr_disable(struct aspeed_pinmux_data *ctx, · 107 unmodified lines
108	}	108	}
109		109
110	/**	110	/**
111	* Disable a signal on a pin by disabling all provided signal expressions.	111	* aspeed_disable_sig() - Disable a signal on a pin by disabling all provided
		112	* signal expressions.
112	*	113	*
113	* @ctx: The pinmux context	114	* @ctx: The pinmux context
114	* @exprs: The list of signal expressions (from a priority level on a pin)	115	* @exprs: The list of signal expressions (from a priority level on a pin)

drivers/pinctrl/aspeed/pinmux-aspeed.c+2−1

@@ -21,7 +21,8 @@ static inline void aspeed_sig_desc_print_val( · 20 unmodified lines
21	}	21	}
22		22
23	/**	23	/**
24	* Query the enabled or disabled state of a signal descriptor	24	* aspeed_sig_desc_eval() - Query the enabled or disabled state of a signal
		25	* descriptor.
25	*	26	*
26	* @desc: The signal descriptor of interest	27	* @desc: The signal descriptor of interest
27	* @enabled: True to query the enabled state, false to query disabled state	28	* @enabled: True to query the enabled state, false to query disabled state

drivers/pinctrl/qcom/Kconfig+1−1

@@ -223,7 +223,7 @@ config PINCTRL_SC7280 · 222 unmodified lines
223	config PINCTRL_SC8180X	223	config PINCTRL_SC8180X
224	tristate "Qualcomm Technologies Inc SC8180x pin controller driver"	224	tristate "Qualcomm Technologies Inc SC8180x pin controller driver"
225	depends on GPIOLIB && (OF \|\| ACPI)	225	depends on GPIOLIB && (OF \|\| ACPI)
226	select PINCTRL_MSM	226	depends on PINCTRL_MSM
227	help	227	help
228	This is the pinctrl, pinmux, pinconf and gpiolib driver for the	228	This is the pinctrl, pinmux, pinconf and gpiolib driver for the
229	Qualcomm Technologies Inc TLMM block found on the Qualcomm	229	Qualcomm Technologies Inc TLMM block found on the Qualcomm

drivers/pinctrl/qcom/pinctrl-sdx55.c+9−9

@@ -410,15 +410,15 @@ static const char * const gpio_groups[] = { · 409 unmodified lines
410	"gpio29", "gpio30", "gpio31", "gpio32", "gpio33", "gpio34", "gpio35",	410	"gpio29", "gpio30", "gpio31", "gpio32", "gpio33", "gpio34", "gpio35",
411	"gpio36", "gpio37", "gpio38", "gpio39", "gpio40", "gpio41", "gpio42",	411	"gpio36", "gpio37", "gpio38", "gpio39", "gpio40", "gpio41", "gpio42",
412	"gpio43", "gpio44", "gpio45", "gpio46", "gpio47", "gpio48", "gpio49",	412	"gpio43", "gpio44", "gpio45", "gpio46", "gpio47", "gpio48", "gpio49",
413	"gpio50", "gpio51", "gpio52", "gpio52", "gpio53", "gpio53", "gpio54",	413	"gpio50", "gpio51", "gpio52", "gpio53", "gpio54", "gpio55", "gpio56",
414	"gpio55", "gpio56", "gpio57", "gpio58", "gpio59", "gpio60", "gpio61",	414	"gpio57", "gpio58", "gpio59", "gpio60", "gpio61", "gpio62", "gpio63",
415	"gpio62", "gpio63", "gpio64", "gpio65", "gpio66", "gpio67", "gpio68",	415	"gpio64", "gpio65", "gpio66", "gpio67", "gpio68", "gpio69", "gpio70",
416	"gpio69", "gpio70", "gpio71", "gpio72", "gpio73", "gpio74", "gpio75",	416	"gpio71", "gpio72", "gpio73", "gpio74", "gpio75", "gpio76", "gpio77",
417	"gpio76", "gpio77", "gpio78", "gpio79", "gpio80", "gpio81", "gpio82",	417	"gpio78", "gpio79", "gpio80", "gpio81", "gpio82", "gpio83", "gpio84",
418	"gpio83", "gpio84", "gpio85", "gpio86", "gpio87", "gpio88", "gpio89",	418	"gpio85", "gpio86", "gpio87", "gpio88", "gpio89", "gpio90", "gpio91",
419	"gpio90", "gpio91", "gpio92", "gpio93", "gpio94", "gpio95", "gpio96",	419	"gpio92", "gpio93", "gpio94", "gpio95", "gpio96", "gpio97", "gpio98",
420	"gpio97", "gpio98", "gpio99", "gpio100", "gpio101", "gpio102",	420	"gpio99", "gpio100", "gpio101", "gpio102", "gpio103", "gpio104",
421	"gpio103", "gpio104", "gpio105", "gpio106", "gpio107",	421	"gpio105", "gpio106", "gpio107",
422	};	422	};
423		423
424	static const char * const qdss_stm_groups[] = {	424	static const char * const qdss_stm_groups[] = {

drivers/pinctrl/ralink/pinctrl-rt2880.c+1−1

@@ -127,7 +127,7 @@ static int rt2880_pmx_group_enable(struct pinctrl_dev *pctrldev, · 126 unmodified lines
127	if (p->groups[group].enabled) {	127	if (p->groups[group].enabled) {
128	dev_err(p->dev, "%s is already enabled\n",	128	dev_err(p->dev, "%s is already enabled\n",
129	p->groups[group].name);	129	p->groups[group].name);
130	return -EBUSY;	130	return 0;
131	}	131	}
132		132
133	p->groups[group].enabled = 1;	133	p->groups[group].enabled = 1;

drivers/platform/mellanox/mlxreg-hotplug.c+2−2

 	err = devm_request_irq(&pdev->dev, priv->irq,
 			       mlxreg_hotplug_irq_handler, IRQF_TRIGGER_FALLING
-			       | IRQF_SHARED | IRQF_NO_AUTOEN,
+			       | IRQF_SHARED, "mlxreg-hotplug", priv);
-			       "mlxreg-hotplug", priv);
 	if (err) {
 		dev_err(&pdev->dev, "Failed to request irq: %d\n", err);
 		return err;
 	}
+	disable_irq(priv->irq);
 	spin_lock_init(&priv->lock);
 	INIT_DELAYED_WORK(&priv->dwork_irq, mlxreg_hotplug_work_handler);
 	dev_set_drvdata(&pdev->dev, priv);

drivers/platform/surface/aggregator/controller.c+1−1

@@ -1907,7 +1907,7 @@ static int ssam_ssh_event_disable(struct ssam_controller *ctrl, · 1906 unmodified lines
1907	{	1907	{
1908	int status;	1908	int status;
1909		1909
1910	status = __ssam_ssh_event_request(ctrl, reg, reg.cid_enable, id, flags);	1910	status = __ssam_ssh_event_request(ctrl, reg, reg.cid_disable, id, flags);
1911		1911
1912	if (status < 0 && status != -EINVAL) {	1912	if (status < 0 && status != -EINVAL) {
1913	ssam_err(ctrl,	1913	ssam_err(ctrl,

drivers/platform/surface/surface_aggregator_registry.c+5−2

 	NULL,
 };
-/* Devices for Surface Laptop 3. */
+/* Devices for Surface Laptop 3 and 4. */
 static const struct software_node *ssam_node_group_sl3[] = {
 	&ssam_node_root,
 	&ssam_node_bat_ac,
 	/* Surface Laptop 3 (13", Intel) */
 	{ "MSHW0114", (unsigned long)ssam_node_group_sl3 },
-	/* Surface Laptop 3 (15", AMD) */
+	/* Surface Laptop 3 (15", AMD) and 4 (15", AMD) */
 	{ "MSHW0110", (unsigned long)ssam_node_group_sl3 },
+	/* Surface Laptop 4 (13", Intel) */
+	{ "MSHW0250", (unsigned long)ssam_node_group_sl3 },
 	/* Surface Laptop Go 1 */
 	{ "MSHW0118", (unsigned long)ssam_node_group_slg1 },

drivers/platform/surface/surface_dtx.c+1−0

@@ -427,6 +427,7 @@ static int surface_dtx_open(struct inode inode, struct file file) · 426 unmodified lines
427	*/	427	*/
428	if (test_bit(SDTX_DEVICE_SHUTDOWN_BIT, &ddev->flags)) {	428	if (test_bit(SDTX_DEVICE_SHUTDOWN_BIT, &ddev->flags)) {
429	up_write(&ddev->client_lock);	429	up_write(&ddev->client_lock);
		430	mutex_destroy(&client->read_lock);
430	sdtx_device_put(client->ddev);	431	sdtx_device_put(client->ddev);
431	kfree(client);	432	kfree(client);
432	return -ENODEV;	433	return -ENODEV;

drivers/platform/x86/thinkpad_acpi.c+1−0

@@ -8853,6 +8853,7 @@ static const struct tpacpi_quirk fan_quirk_table[] __initconst = { · 8852 unmodified lines
8853	TPACPI_Q_LNV3('N', '2', 'O', TPACPI_FAN_2CTL), /* P1 / X1 Extreme (2nd gen) */	8853	TPACPI_Q_LNV3('N', '2', 'O', TPACPI_FAN_2CTL), /* P1 / X1 Extreme (2nd gen) */
8854	TPACPI_Q_LNV3('N', '2', 'V', TPACPI_FAN_2CTL), /* P1 / X1 Extreme (3nd gen) */	8854	TPACPI_Q_LNV3('N', '2', 'V', TPACPI_FAN_2CTL), /* P1 / X1 Extreme (3nd gen) */
8855	TPACPI_Q_LNV3('N', '3', '0', TPACPI_FAN_2CTL), /* P15 (1st gen) / P15v (1st gen) */	8855	TPACPI_Q_LNV3('N', '3', '0', TPACPI_FAN_2CTL), /* P15 (1st gen) / P15v (1st gen) */
		8856	TPACPI_Q_LNV3('N', '3', '2', TPACPI_FAN_2CTL), /* X1 Carbon (9th gen) */
8856	};	8857	};
8857		8858
8858	static int __init fan_init(struct ibm_init_struct *iibm)	8859	static int __init fan_init(struct ibm_init_struct *iibm)

drivers/ptp/ptp_clock.c+3−3

@@ -63,7 +63,7 @@ static void enqueue_external_timestamp(struct timestamp_event_queue *queue, · 62 unmodified lines
63	spin_unlock_irqrestore(&queue->lock, flags);	63	spin_unlock_irqrestore(&queue->lock, flags);
64	}	64	}
65		65
66	s32 scaled_ppm_to_ppb(long ppm)	66	long scaled_ppm_to_ppb(long ppm)
67	{	67	{
68	/*	68	/*
69	* The 'freq' field in the 'struct timex' is in parts per	69	* The 'freq' field in the 'struct timex' is in parts per
@@ -80,7 +80,7 @@ s32 scaled_ppm_to_ppb(long ppm) · 10 unmodified lines
80	s64 ppb = 1 + ppm;	80	s64 ppb = 1 + ppm;
81	ppb *= 125;	81	ppb *= 125;
82	ppb >>= 13;	82	ppb >>= 13;
83	return (s32) ppb;	83	return (long) ppb;
84	}	84	}
85	EXPORT_SYMBOL(scaled_ppm_to_ppb);	85	EXPORT_SYMBOL(scaled_ppm_to_ppb);
86		86
@@ -138,7 +138,7 @@ static int ptp_clock_adjtime(struct posix_clock pc, struct __kernel_timex tx) · 51 unmodified lines
138	delta = ktime_to_ns(kt);	138	delta = ktime_to_ns(kt);
139	err = ops->adjtime(ops, delta);	139	err = ops->adjtime(ops, delta);
140	} else if (tx->modes & ADJ_FREQUENCY) {	140	} else if (tx->modes & ADJ_FREQUENCY) {
141	s32 ppb = scaled_ppm_to_ppb(tx->freq);	141	long ppb = scaled_ppm_to_ppb(tx->freq);
142	if (ppb > ops->max_adj \|\| ppb < -ops->max_adj)	142	if (ppb > ops->max_adj \|\| ppb < -ops->max_adj)
143	return -ERANGE;	143	return -ERANGE;
144	if (ops->adjfine)	144	if (ops->adjfine)

drivers/ptp/ptp_ocp.c+3−1

 	if (!bp->base) {
 		dev_err(&pdev->dev, "io_remap bar0\n");
 		err = -ENOMEM;
-		goto out;
+		goto out_release_regions;
 	}
 	bp->reg = bp->base + OCP_REGISTER_OFFSET;
 	bp->tod = bp->base + TOD_REGISTER_OFFSET;
 	return 0;
 out:
+	pci_iounmap(pdev, bp->base);
+out_release_regions:
 	pci_release_regions(pdev);
 out_disable:
 	pci_disable_device(pdev);

drivers/regulator/Kconfig+1−1

@@ -1031,7 +1031,7 @@ config REGULATOR_RT5033 · 1030 unmodified lines
1031	current source, LDO and Buck.	1031	current source, LDO and Buck.
1032		1032
1033	config REGULATOR_RTMV20	1033	config REGULATOR_RTMV20
1034	tristate "RTMV20 Laser Diode Regulator"	1034	tristate "Richtek RTMV20 Laser Diode Regulator"
1035	depends on I2C	1035	depends on I2C
1036	select REGMAP_I2C	1036	select REGMAP_I2C
1037	help	1037	help

drivers/regulator/atc260x-regulator.c+10−9

 static const struct linear_range atc2609a_ldo_voltage_ranges0[] = {
 	REGULATOR_LINEAR_RANGE(700000, 0, 15, 100000),
-	REGULATOR_LINEAR_RANGE(2100000, 16, 28, 100000),
+	REGULATOR_LINEAR_RANGE(2100000, 0, 12, 100000),
 };
 static const struct linear_range atc2609a_ldo_voltage_ranges1[] = {
 	REGULATOR_LINEAR_RANGE(850000, 0, 15, 100000),
-	REGULATOR_LINEAR_RANGE(2100000, 16, 27, 100000),
+	REGULATOR_LINEAR_RANGE(2100000, 0, 11, 100000),
 };
 static const unsigned int atc260x_ldo_voltage_range_sel[] = {
-	0x0, 0x1,
+	0x0, 0x20,
 };
 static int atc260x_dcdc_set_voltage_time_sel(struct regulator_dev *rdev,
 	.owner = THIS_MODULE, \
 }
-#define atc2609a_reg_desc_ldo_range_pick(num, n_range) { \
+#define atc2609a_reg_desc_ldo_range_pick(num, n_range, n_volt) { \
 	.name = "LDO"#num, \
 	.supply_name = "ldo"#num, \
 	.of_match = of_match_ptr("ldo"#num), \
 	.type = REGULATOR_VOLTAGE, \
 	.linear_ranges = atc2609a_ldo_voltage_ranges##n_range, \
 	.n_linear_ranges = ARRAY_SIZE(atc2609a_ldo_voltage_ranges##n_range), \
+	.n_voltages = n_volt, \
 	.vsel_reg = ATC2609A_PMU_LDO##num##_CTL0, \
 	.vsel_mask = GENMASK(4, 1), \
 	.vsel_range_reg = ATC2609A_PMU_LDO##num##_CTL0, \
 	atc2609a_reg_desc_ldo_bypass(0),
 	atc2609a_reg_desc_ldo_bypass(1),
 	atc2609a_reg_desc_ldo_bypass(2),
-	atc2609a_reg_desc_ldo_range_pick(3, 0),
+	atc2609a_reg_desc_ldo_range_pick(3, 0, 29),
-	atc2609a_reg_desc_ldo_range_pick(4, 0),
+	atc2609a_reg_desc_ldo_range_pick(4, 0, 29),
 	atc2609a_reg_desc_ldo(5),
-	atc2609a_reg_desc_ldo_range_pick(6, 1),
+	atc2609a_reg_desc_ldo_range_pick(6, 1, 28),
-	atc2609a_reg_desc_ldo_range_pick(7, 0),
+	atc2609a_reg_desc_ldo_range_pick(7, 0, 29),
-	atc2609a_reg_desc_ldo_range_pick(8, 0),
+	atc2609a_reg_desc_ldo_range_pick(8, 0, 29),
 	atc2609a_reg_desc_ldo_fixed(9),
 };

drivers/regulator/bd718x7-regulator.c+1−1

@@ -334,7 +334,7 @@ BD718XX_OPS(bd71837_buck_regulator_ops, regulator_list_voltage_linear_range, · 333 unmodified lines
334	NULL);	334	NULL);
335		335
336	BD718XX_OPS(bd71837_buck_regulator_nolinear_ops, regulator_list_voltage_table,	336	BD718XX_OPS(bd71837_buck_regulator_nolinear_ops, regulator_list_voltage_table,
337	regulator_map_voltage_ascend, bd718xx_set_voltage_sel_restricted,	337	regulator_map_voltage_ascend, bd71837_set_voltage_sel_restricted,
338	regulator_get_voltage_sel_regmap, regulator_set_voltage_time_sel,	338	regulator_get_voltage_sel_regmap, regulator_set_voltage_time_sel,
339	NULL);	339	NULL);
340	/*	340	/*

drivers/regulator/core.c+6−0

 	 * and we have control then make sure it is enabled.
 	 */
 	if (rdev->constraints->always_on || rdev->constraints->boot_on) {
+		/* If we want to enable this regulator, make sure that we know
+		 * the supplying regulator.
+		 */
+		if (rdev->supply_name && !rdev->supply)
+			return -EPROBE_DEFER;
 		if (rdev->supply) {
 			ret = regulator_enable(rdev->supply);
 			if (ret < 0) {

drivers/regulator/cros-ec-regulator.c+2−1

@@ -225,8 +225,9 @@ static int cros_ec_regulator_probe(struct platform_device *pdev) · 224 unmodified lines
225		225
226	drvdata->dev = devm_regulator_register(dev, &drvdata->desc, &cfg);	226	drvdata->dev = devm_regulator_register(dev, &drvdata->desc, &cfg);
227	if (IS_ERR(drvdata->dev)) {	227	if (IS_ERR(drvdata->dev)) {
		228	ret = PTR_ERR(drvdata->dev);
228	dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);	229	dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);
229	return PTR_ERR(drvdata->dev);	230	return ret;
230	}	231	}
231		232
232	platform_set_drvdata(pdev, drvdata);	233	platform_set_drvdata(pdev, drvdata);

drivers/regulator/da9121-regulator.c+7−3

 	case DA9121_BUCK_MODE_FORCE_PFM:
 		return REGULATOR_MODE_STANDBY;
 	default:
-		return -EINVAL;
+		return REGULATOR_MODE_INVALID;
 	}
 }
 {
 	struct da9121 *chip = rdev_get_drvdata(rdev);
 	int id = rdev_get_id(rdev);
-	unsigned int val;
+	unsigned int val, mode;
 	int ret = 0;
 	ret = regmap_read(chip->regmap, da9121_mode_field[id].reg, &val);
 		return -EINVAL;
 	}
-	return da9121_map_mode(val & da9121_mode_field[id].msk);
+	mode = da9121_map_mode(val & da9121_mode_field[id].msk);
+	if (mode == REGULATOR_MODE_INVALID)
+		return -EINVAL;
+	return mode;
 }
 static const struct regulator_ops da9121_buck_ops = {

drivers/regulator/fan53555.c+1−2

 #define FAN53555_NVOLTAGES	64	/* Numbers of voltages */
 #define FAN53526_NVOLTAGES	128
-#define TCS4525_NVOLTAGES	127	/* Numbers of voltages */
 #define TCS_VSEL_NSEL_MASK	0x7f
 #define TCS_VSEL0_MODE		(1 << 7)
 	/* Init voltage range and step */
 	di->vsel_min = 600000;
 	di->vsel_step = 6250;
-	di->vsel_count = TCS4525_NVOLTAGES;
+	di->vsel_count = FAN53526_NVOLTAGES;
 	return 0;
 }

drivers/regulator/fan53880.c+3−0

 		      REGULATOR_LINEAR_RANGE(800000, 0xf, 0x73, 25000),	\
 		},							\
 		.n_linear_ranges = 2,					\
+		.n_voltages =	   0x74,				\
 		.vsel_reg =	   FAN53880_LDO ## _num ## VOUT,	\
 		.vsel_mask =	   0x7f,				\
 		.enable_reg =	   FAN53880_ENABLE,			\
 		      REGULATOR_LINEAR_RANGE(600000, 0x1f, 0xf7, 12500),
 		},
 		.n_linear_ranges = 2,
+		.n_voltages =	   0xf8,
 		.vsel_reg =	   FAN53880_BUCKVOUT,
 		.vsel_mask =	   0x7f,
 		.enable_reg =	   FAN53880_ENABLE,
 		      REGULATOR_LINEAR_RANGE(3000000, 0x4, 0x70, 25000),
 		},
 		.n_linear_ranges = 2,
+		.n_voltages =	   0x71,
 		.vsel_reg =	   FAN53880_BOOSTVOUT,
 		.vsel_mask =	   0x7f,
 		.enable_reg =	   FAN53880_ENABLE_BOOST,

drivers/regulator/fixed.c+6−1

 {
 	struct fixed_voltage_data *priv = rdev_get_drvdata(rdev);
 	struct device *dev = rdev->dev.parent;
+	int ret;
+	ret = dev_pm_genpd_set_performance_state(dev, 0);
+	if (ret)
+		return ret;
 	priv->enable_counter--;
-	return dev_pm_genpd_set_performance_state(dev, 0);
+	return 0;
 }
 static int reg_is_enabled(struct regulator_dev *rdev)

drivers/regulator/helpers.c+1−1

@@ -948,7 +948,7 @@ int regulator_set_ramp_delay_regmap(struct regulator_dev *rdev, int ramp_delay) · 947 unmodified lines
948	int ret;	948	int ret;
949	unsigned int sel;	949	unsigned int sel;
950		950
951	if (!rdev->desc->n_ramp_values)	951	if (WARN_ON(!rdev->desc->n_ramp_values \|\| !rdev->desc->ramp_delay_table))
952	return -EINVAL;	952	return -EINVAL;
953		953
954	ret = find_closest_bigger(ramp_delay, rdev->desc->ramp_delay_table,	954	ret = find_closest_bigger(ramp_delay, rdev->desc->ramp_delay_table,

drivers/regulator/hi6421v600-regulator.c+2−2

@@ -3,7 +3,7 @@ · 2 unmodified lines
3	// Device driver for regulators in Hisi IC	3	// Device driver for regulators in Hisi IC
4	//	4	//
5	// Copyright (c) 2013 Linaro Ltd.	5	// Copyright (c) 2013 Linaro Ltd.
6	// Copyright (c) 2011 Hisilicon.	6	// Copyright (c) 2011 HiSilicon Ltd.
7	// Copyright (c) 2020-2021 Huawei Technologies Co., Ltd	7	// Copyright (c) 2020-2021 Huawei Technologies Co., Ltd
8	//	8	//
9	// Guodong Xu <guodong.xu@linaro.org>	9	// Guodong Xu <guodong.xu@linaro.org>
@@ -83,7 +83,7 @@ static const unsigned int ldo34_voltages[] = { · 73 unmodified lines
83	.owner = THIS_MODULE, \	83	.owner = THIS_MODULE, \
84	.volt_table = vtable, \	84	.volt_table = vtable, \
85	.n_voltages = ARRAY_SIZE(vtable), \	85	.n_voltages = ARRAY_SIZE(vtable), \
86	.vsel_mask = (1 << (ARRAY_SIZE(vtable) - 1)) - 1, \	86	.vsel_mask = ARRAY_SIZE(vtable) - 1, \
87	.vsel_reg = vreg, \	87	.vsel_reg = vreg, \
88	.enable_reg = ereg, \	88	.enable_reg = ereg, \
89	.enable_mask = emask, \	89	.enable_mask = emask, \

drivers/regulator/hi655x-regulator.c+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2	//	2	//
3	// Device driver for regulators in Hi655x IC	3	// Device driver for regulators in Hi655x IC
4	//	4	//
5	// Copyright (c) 2016 Hisilicon.	5	// Copyright (c) 2016 HiSilicon Ltd.
6	//	6	//
7	// Authors:	7	// Authors:
8	// Chen Feng <puck.chen@hisilicon.com>	8	// Chen Feng <puck.chen@hisilicon.com>

drivers/regulator/max77620-regulator.c+11−6

 	config.dev = dev;
 	config.driver_data = pmic;
+	/*
+	 * Set of_node_reuse flag to prevent driver core from attempting to
+	 * claim any pinmux resources already claimed by the parent device.
+	 * Otherwise PMIC driver will fail to re-probe.
+	 */
+	device_set_of_node_from_dev(&pdev->dev, pdev->dev.parent);
 	for (id = 0; id < MAX77620_NUM_REGS; id++) {
 		struct regulator_dev *rdev;
 		struct regulator_desc *rdesc;
 			return ret;
 		rdev = devm_regulator_register(dev, rdesc, &config);
-		if (IS_ERR(rdev)) {
+		if (IS_ERR(rdev))
-			ret = PTR_ERR(rdev);
+			return dev_err_probe(dev, PTR_ERR(rdev),
-			dev_err(dev, "Regulator registration %s failed: %d\n",
+					     "Regulator registration %s failed\n",
-				rdesc->name, ret);
+					     rdesc->name);
-			return ret;
-		}
 	}
 	return 0;

drivers/regulator/mt6315-regulator.c+1−1

@@ -59,7 +59,7 @@ static const struct linear_range mt_volt_range1[] = { · 58 unmodified lines
59	REGULATOR_LINEAR_RANGE(0, 0, 0xbf, 6250),	59	REGULATOR_LINEAR_RANGE(0, 0, 0xbf, 6250),
60	};	60	};
61		61
62	static unsigned int mt6315_map_mode(u32 mode)	62	static unsigned int mt6315_map_mode(unsigned int mode)
63	{	63	{
64	switch (mode) {	64	switch (mode) {
65	case MT6315_BUCK_MODE_AUTO:	65	case MT6315_BUCK_MODE_AUTO:

drivers/regulator/rt4801-regulator.c+2−2

@@ -66,7 +66,7 @@ static int rt4801_enable(struct regulator_dev *rdev) · 65 unmodified lines
66	struct gpio_descs *gpios = priv->enable_gpios;	66	struct gpio_descs *gpios = priv->enable_gpios;
67	int id = rdev_get_id(rdev), ret;	67	int id = rdev_get_id(rdev), ret;
68		68
69	if (gpios->ndescs <= id) {	69	if (!gpios \|\| gpios->ndescs <= id) {
70	dev_warn(&rdev->dev, "no dedicated gpio can control\n");	70	dev_warn(&rdev->dev, "no dedicated gpio can control\n");
71	goto bypass_gpio;	71	goto bypass_gpio;
72	}	72	}
@@ -88,7 +88,7 @@ static int rt4801_disable(struct regulator_dev *rdev) · 15 unmodified lines
88	struct gpio_descs *gpios = priv->enable_gpios;	88	struct gpio_descs *gpios = priv->enable_gpios;
89	int id = rdev_get_id(rdev);	89	int id = rdev_get_id(rdev);
90		90
91	if (gpios->ndescs <= id) {	91	if (!gpios \|\| gpios->ndescs <= id) {
92	dev_warn(&rdev->dev, "no dedicated gpio can control\n");	92	dev_warn(&rdev->dev, "no dedicated gpio can control\n");
93	goto bypass_gpio;	93	goto bypass_gpio;
94	}	94	}

drivers/regulator/rtmv20-regulator.c+42−2

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	#define RTMV20_REG_LDIRQ 0x30	27	#define RTMV20_REG_LDIRQ 0x30
28	#define RTMV20_REG_LDSTAT 0x40	28	#define RTMV20_REG_LDSTAT 0x40
29	#define RTMV20_REG_LDMASK 0x50	29	#define RTMV20_REG_LDMASK 0x50
		30	#define RTMV20_MAX_REGS (RTMV20_REG_LDMASK + 1)
30		31
31	#define RTMV20_VID_MASK GENMASK(7, 4)	32	#define RTMV20_VID_MASK GENMASK(7, 4)
32	#define RICHTEK_VID 0x80	33	#define RICHTEK_VID 0x80
@@ -103,9 +104,47 @@ static int rtmv20_lsw_disable(struct regulator_dev *rdev) · 70 unmodified lines
103	return 0;	104	return 0;
104	}	105	}
105		106
		107	static int rtmv20_lsw_set_current_limit(struct regulator_dev *rdev, int min_uA,
		108	int max_uA)
		109	{
		110	int sel;
		111
		112	if (min_uA > RTMV20_LSW_MAXUA \|\| max_uA < RTMV20_LSW_MINUA)
		113	return -EINVAL;
		114
		115	if (max_uA > RTMV20_LSW_MAXUA)
		116	max_uA = RTMV20_LSW_MAXUA;
		117
		118	sel = (max_uA - RTMV20_LSW_MINUA) / RTMV20_LSW_STEPUA;
		119
		120	/* Ensure the selected setting is still in range */
		121	if ((sel * RTMV20_LSW_STEPUA + RTMV20_LSW_MINUA) < min_uA)
		122	return -EINVAL;
		123
		124	sel <<= ffs(rdev->desc->csel_mask) - 1;
		125
		126	return regmap_update_bits(rdev->regmap, rdev->desc->csel_reg,
		127	rdev->desc->csel_mask, sel);
		128	}
		129
		130	static int rtmv20_lsw_get_current_limit(struct regulator_dev *rdev)
		131	{
		132	unsigned int val;
		133	int ret;
		134
		135	ret = regmap_read(rdev->regmap, rdev->desc->csel_reg, &val);
		136	if (ret)
		137	return ret;
		138
		139	val &= rdev->desc->csel_mask;
		140	val >>= ffs(rdev->desc->csel_mask) - 1;
		141
		142	return val * RTMV20_LSW_STEPUA + RTMV20_LSW_MINUA;
		143	}
		144
106	static const struct regulator_ops rtmv20_regulator_ops = {	145	static const struct regulator_ops rtmv20_regulator_ops = {
107	.set_current_limit = regulator_set_current_limit_regmap,	146	.set_current_limit = rtmv20_lsw_set_current_limit,
108	.get_current_limit = regulator_get_current_limit_regmap,	147	.get_current_limit = rtmv20_lsw_get_current_limit,
109	.enable = rtmv20_lsw_enable,	148	.enable = rtmv20_lsw_enable,
110	.disable = rtmv20_lsw_disable,	149	.disable = rtmv20_lsw_disable,
111	.is_enabled = regulator_is_enabled_regmap,	150	.is_enabled = regulator_is_enabled_regmap,
@@ -275,6 +314,7 @@ static const struct regmap_config rtmv20_regmap_config = { · 163 unmodified lines
275	.val_bits = 8,	314	.val_bits = 8,
276	.cache_type = REGCACHE_RBTREE,	315	.cache_type = REGCACHE_RBTREE,
277	.max_register = RTMV20_REG_LDMASK,	316	.max_register = RTMV20_REG_LDMASK,
		317	.num_reg_defaults_raw = RTMV20_MAX_REGS,
278		318
279	.writeable_reg = rtmv20_is_accessible_reg,	319	.writeable_reg = rtmv20_is_accessible_reg,
280	.readable_reg = rtmv20_is_accessible_reg,	320	.readable_reg = rtmv20_is_accessible_reg,

drivers/regulator/scmi-regulator.c+1−1

@@ -173,7 +173,7 @@ scmi_config_linear_regulator_mappings(struct scmi_regulator *sreg, · 172 unmodified lines
173	sreg->desc.uV_step =	173	sreg->desc.uV_step =
174	vinfo->levels_uv[SCMI_VOLTAGE_SEGMENT_STEP];	174	vinfo->levels_uv[SCMI_VOLTAGE_SEGMENT_STEP];
175	sreg->desc.linear_min_sel = 0;	175	sreg->desc.linear_min_sel = 0;
176	sreg->desc.n_voltages = delta_uV / sreg->desc.uV_step;	176	sreg->desc.n_voltages = (delta_uV / sreg->desc.uV_step) + 1;
177	sreg->desc.ops = &scmi_reg_linear_ops;	177	sreg->desc.ops = &scmi_reg_linear_ops;
178	}	178	}
179		179

drivers/s390/block/dasd_diag.c+7−1

 	blk_queue_segment_boundary(q, PAGE_SIZE - 1);
 }
+static int dasd_diag_pe_handler(struct dasd_device *device,
+				__u8 tbvpm, __u8 fcsecpm)
+{
+	return dasd_generic_verify_path(device, tbvpm);
+}
 static struct dasd_discipline dasd_diag_discipline = {
 	.owner = THIS_MODULE,
 	.name = "DIAG",
 	.ebcname = "DIAG",
 	.check_device = dasd_diag_check_device,
-	.verify_path = dasd_generic_verify_path,
+	.pe_handler = dasd_diag_pe_handler,
 	.fill_geometry = dasd_diag_fill_geometry,
 	.setup_blk_queue = dasd_diag_setup_blk_queue,
 	.start_IO = dasd_start_diag,

drivers/s390/block/dasd_fba.c+7−1

 	blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);
 }
+static int dasd_fba_pe_handler(struct dasd_device *device,
+			       __u8 tbvpm, __u8 fcsecpm)
+{
+	return dasd_generic_verify_path(device, tbvpm);
+}
 static struct dasd_discipline dasd_fba_discipline = {
 	.owner = THIS_MODULE,
 	.name = "FBA ",
 	.ebcname = "FBA ",
 	.check_device = dasd_fba_check_characteristics,
 	.do_analysis = dasd_fba_do_analysis,
-	.verify_path = dasd_generic_verify_path,
+	.pe_handler = dasd_fba_pe_handler,
 	.setup_blk_queue = dasd_fba_setup_blk_queue,
 	.fill_geometry = dasd_fba_fill_geometry,
 	.start_IO = dasd_start_IO,

drivers/s390/block/dasd_int.h+0−1

@@ -297,7 +297,6 @@ struct dasd_discipline { · 296 unmodified lines
297	* e.g. verify that new path is compatible with the current	297	* e.g. verify that new path is compatible with the current
298	* configuration.	298	* configuration.
299	*/	299	*/
300	int (verify_path)(struct dasd_device , __u8);
301	int (pe_handler)(struct dasd_device , __u8, __u8);	300	int (pe_handler)(struct dasd_device , __u8, __u8);
302		301
303	/*	302	/*

drivers/s390/cio/vfio_ccw_cp.c+4−0

 	static DEFINE_RATELIMIT_STATE(ratelimit_state, 5 * HZ, 1);
 	int ret;
+	/* this is an error in the caller */
+	if (cp->initialized)
+		return -EBUSY;
 	/*
 	 * We only support prefetching the channel program. We assume all channel
 	 * programs executed by supported guests likewise support prefetching.

drivers/s390/cio/vfio_ccw_drv.c+10−2

 	struct vfio_ccw_private *private;
 	struct irb *irb;
 	bool is_final;
+	bool cp_is_finished = false;
 	private = container_of(work, struct vfio_ccw_private, io_work);
 	irb = &private->irb;
 		     (SCSW_ACTL_DEVACT | SCSW_ACTL_SCHACT));
 	if (scsw_is_solicited(&irb->scsw)) {
 		cp_update_scsw(&private->cp, &irb->scsw);
-		if (is_final && private->state == VFIO_CCW_STATE_CP_PENDING)
+		if (is_final && private->state == VFIO_CCW_STATE_CP_PENDING) {
 			cp_free(&private->cp);
+			cp_is_finished = true;
+		}
 	}
 	mutex_lock(&private->io_mutex);
 	memcpy(private->io_region->irb_area, irb, sizeof(*irb));
 	mutex_unlock(&private->io_mutex);
-	if (private->mdev && is_final)
+	/*
+	 * Reset to IDLE only if processing of a channel program
+	 * has finished. Do not overwrite a possible processing
+	 * state if the final interrupt was for HSCH or CSCH.
+	 */
+	if (private->mdev && cp_is_finished)
 		private->state = VFIO_CCW_STATE_IDLE;
 	if (private->io_trigger)

drivers/s390/cio/vfio_ccw_fsm.c+1−0

@@ -318,6 +318,7 @@ static void fsm_io_request(struct vfio_ccw_private *private, · 317 unmodified lines
318	}	318	}
319		319
320	err_out:	320	err_out:
		321	private->state = VFIO_CCW_STATE_IDLE;
321	trace_vfio_ccw_fsm_io_request(scsw->cmd.fctl, schid,	322	trace_vfio_ccw_fsm_io_request(scsw->cmd.fctl, schid,
322	io_region->ret_code, errstr);	323	io_region->ret_code, errstr);
323	}	324	}

drivers/s390/cio/vfio_ccw_ops.c+0−2

@@ -279,8 +279,6 @@ static ssize_t vfio_ccw_mdev_write_io_region(struct vfio_ccw_private *private, · 278 unmodified lines
279	}	279	}
280		280
281	vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_IO_REQ);	281	vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_IO_REQ);
282	if (region->ret_code != 0)
283	private->state = VFIO_CCW_STATE_IDLE;
284	ret = (region->ret_code != 0) ? region->ret_code : count;	282	ret = (region->ret_code != 0) ? region->ret_code : count;
285		283
286	out_unlock:	284	out_unlock:

drivers/s390/crypto/ap_queue.c+9−2

 {
 	struct ap_queue_status status;
 	struct ap_message *ap_msg;
+	bool found = false;
 	status = ap_dqap(aq->qid, &aq->reply->psmid,
 			 aq->reply->msg, aq->reply->len);
 	switch (status.response_code) {
 	case AP_RESPONSE_NORMAL:
-		aq->queue_count--;
+		aq->queue_count = max_t(int, 0, aq->queue_count - 1);
 		if (aq->queue_count > 0)
 			mod_timer(&aq->timeout,
 				  jiffies + aq->request_timeout);
 			list_del_init(&ap_msg->list);
 			aq->pendingq_count--;
 			ap_msg->receive(aq, ap_msg, aq->reply);
+			found = true;
 			break;
 		}
+		if (!found) {
+			AP_DBF_WARN("%s unassociated reply psmid=0x%016llx on 0x%02x.%04x\n",
+				    __func__, aq->reply->psmid,
+				    AP_QID_CARD(aq->qid), AP_QID_QUEUE(aq->qid));
+		}
 		fallthrough;
 	case AP_RESPONSE_NO_PENDING_REPLY:
 		if (!status.queue_empty || aq->queue_count <= 0)
 			   ap_msg->flags & AP_MSG_FLAG_SPECIAL);
 	switch (status.response_code) {
 	case AP_RESPONSE_NORMAL:
-		aq->queue_count++;
+		aq->queue_count = max_t(int, 1, aq->queue_count + 1);
 		if (aq->queue_count == 1)
 			mod_timer(&aq->timeout, jiffies + aq->request_timeout);
 		list_move_tail(&ap_msg->list, &aq->pendingq);

drivers/scsi/aic7xxx/aicasm/aicasm_gram.y+0−1

@@ -58,7 +58,6 @@ · 57 unmodified lines
58	#include "aicasm_symbol.h"	58	#include "aicasm_symbol.h"
59	#include "aicasm_insformat.h"	59	#include "aicasm_insformat.h"
60		60
61	int yylineno;
62	char *yyfilename;	61	char *yyfilename;
63	char stock_prefix[] = "aic_";	62	char stock_prefix[] = "aic_";
64	char *prefix = stock_prefix;	63	char *prefix = stock_prefix;

drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h+1−1

@@ -108,7 +108,7 @@ struct macro_arg { · 107 unmodified lines
108	regex_t arg_regex;	108	regex_t arg_regex;
109	char *replacement_text;	109	char *replacement_text;
110	};	110	};
111	STAILQ_HEAD(macro_arg_list, macro_arg) args;	111	STAILQ_HEAD(macro_arg_list, macro_arg);
112		112
113	struct macro_info {	113	struct macro_info {
114	struct macro_arg_list args;	114	struct macro_arg_list args;

drivers/scsi/aic7xxx/scsi_message.h+11−0

@@ -3,6 +3,17 @@ · 2 unmodified lines
3	* $FreeBSD: src/sys/cam/scsi/scsi_message.h,v 1.2 2000/05/01 20:21:29 peter Exp $	3	* $FreeBSD: src/sys/cam/scsi/scsi_message.h,v 1.2 2000/05/01 20:21:29 peter Exp $
4	*/	4	*/
5		5
		6	/* Messages (1 byte) / / I/T (M)andatory or (O)ptional */
		7	#define MSG_SAVEDATAPOINTER 0x02 /* O/O */
		8	#define MSG_RESTOREPOINTERS 0x03 /* O/O */
		9	#define MSG_DISCONNECT 0x04 /* O/O */
		10	#define MSG_MESSAGE_REJECT 0x07 /* M/M */
		11	#define MSG_NOOP 0x08 /* M/M */
		12
		13	/* Messages (2 byte) */
		14	#define MSG_SIMPLE_Q_TAG 0x20 /* O/O */
		15	#define MSG_IGN_WIDE_RESIDUE 0x23 /* O/O */
		16
6	/* Identify message / / M/M */	17	/* Identify message / / M/M */
7	#define MSG_IDENTIFYFLAG 0x80	18	#define MSG_IDENTIFYFLAG 0x80
8	#define MSG_IDENTIFY_DISCFLAG 0x40	19	#define MSG_IDENTIFY_DISCFLAG 0x40

drivers/scsi/bnx2fc/bnx2fc_io.c+1−0

@@ -1220,6 +1220,7 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd) · 1219 unmodified lines
1220	was a result from the ABTS request rather than the CLEANUP	1220	was a result from the ABTS request rather than the CLEANUP
1221	request */	1221	request */
1222	set_bit(BNX2FC_FLAG_IO_CLEANUP, &io_req->req_flags);	1222	set_bit(BNX2FC_FLAG_IO_CLEANUP, &io_req->req_flags);
		1223	rc = FAILED;
1223	goto done;	1224	goto done;
1224	}	1225	}
1225		1226

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c+4−4

@@ -4811,14 +4811,14 @@ hisi_sas_v3_destroy_irqs(struct pci_dev pdev, struct hisi_hba hisi_hba) · 4810 unmodified lines
4811	{	4811	{
4812	int i;	4812	int i;
4813		4813
4814	free_irq(pci_irq_vector(pdev, 1), hisi_hba);	4814	devm_free_irq(&pdev->dev, pci_irq_vector(pdev, 1), hisi_hba);
4815	free_irq(pci_irq_vector(pdev, 2), hisi_hba);	4815	devm_free_irq(&pdev->dev, pci_irq_vector(pdev, 2), hisi_hba);
4816	free_irq(pci_irq_vector(pdev, 11), hisi_hba);	4816	devm_free_irq(&pdev->dev, pci_irq_vector(pdev, 11), hisi_hba);
4817	for (i = 0; i < hisi_hba->cq_nvecs; i++) {	4817	for (i = 0; i < hisi_hba->cq_nvecs; i++) {
4818	struct hisi_sas_cq *cq = &hisi_hba->cq[i];	4818	struct hisi_sas_cq *cq = &hisi_hba->cq[i];
4819	int nr = hisi_sas_intr_conv ? 16 : 16 + i;	4819	int nr = hisi_sas_intr_conv ? 16 : 16 + i;
4820		4820
4821	free_irq(pci_irq_vector(pdev, nr), cq);	4821	devm_free_irq(&pdev->dev, pci_irq_vector(pdev, nr), cq);
4822	}	4822	}
4823	pci_free_irq_vectors(pdev);	4823	pci_free_irq_vectors(pdev);
4824	}	4824	}

drivers/scsi/hosts.c+26−21

 	device_enable_async_suspend(&shost->shost_dev);
+	get_device(&shost->shost_gendev);
 	error = device_add(&shost->shost_dev);
 	if (error)
 		goto out_del_gendev;
-	get_device(&shost->shost_gendev);
 	if (shost->transportt->host_size) {
 		shost->shost_data = kzalloc(shost->transportt->host_size,
 					 GFP_KERNEL);
 		if (!shost->work_q) {
 			error = -EINVAL;
-			goto out_free_shost_data;
+			goto out_del_dev;
 		}
 	}
 	error = scsi_sysfs_add_host(shost);
 	if (error)
-		goto out_destroy_host;
+		goto out_del_dev;
 	scsi_proc_host_add(shost);
 	scsi_autopm_put_host(shost);
 	return error;
- out_destroy_host:
+	/*
-	if (shost->work_q)
+	 * Any host allocation in this function will be freed in
-		destroy_workqueue(shost->work_q);
+	 * scsi_host_dev_release().
- out_free_shost_data:
+	 */
-	kfree(shost->shost_data);
  out_del_dev:
 	device_del(&shost->shost_dev);
  out_del_gendev:
+	/*
+	 * Host state is SHOST_RUNNING so we have to explicitly release
+	 * ->shost_dev.
+	 */
+	put_device(&shost->shost_dev);
 	device_del(&shost->shost_gendev);
  out_disable_runtime_pm:
 	device_disable_async_suspend(&shost->shost_gendev);
 	pm_runtime_disable(&shost->shost_gendev);
 	pm_runtime_set_suspended(&shost->shost_gendev);
 	pm_runtime_put_noidle(&shost->shost_gendev);
-	scsi_mq_destroy_tags(shost);
  fail:
 	return error;
 }
 	ida_simple_remove(&host_index_ida, shost->host_no);
-	if (parent)
+	if (shost->shost_state != SHOST_CREATED)
 		put_device(parent);
 	kfree(shost);
 }
 	mutex_init(&shost->scan_mutex);
 	index = ida_simple_get(&host_index_ida, 0, 0, GFP_KERNEL);
-	if (index < 0)
+	if (index < 0) {
-		goto fail_kfree;
+		kfree(shost);
+		return NULL;
+	}
 	shost->host_no = index;
 	shost->dma_channel = 0xff;
 		shost_printk(KERN_WARNING, shost,
 			"error handler thread failed to spawn, error = %ld\n",
 			PTR_ERR(shost->ehandler));
-		goto fail_index_remove;
+		goto fail;
 	}
 	shost->tmf_work_q = alloc_workqueue("scsi_tmf_%d",
 	if (!shost->tmf_work_q) {
 		shost_printk(KERN_WARNING, shost,
 			     "failed to create tmf workq\n");
-		goto fail_kthread;
+		goto fail;
 	}
 	scsi_proc_hostdir_add(shost->hostt);
 	return shost;
+ fail:
+	/*
+	 * Host state is still SHOST_CREATED and that is enough to release
+	 * ->shost_gendev. scsi_host_dev_release() will free
+	 * dev_name(&shost->shost_dev).
+	 */
+	put_device(&shost->shost_gendev);
- fail_kthread:
-	kthread_stop(shost->ehandler);
- fail_index_remove:
-	ida_simple_remove(&host_index_ida, shost->host_no);
- fail_kfree:
-	kfree(shost);
 	return NULL;
 }
 EXPORT_SYMBOL(scsi_host_alloc);

drivers/scsi/libsas/sas_port.c+2−2

@@ -25,7 +25,7 @@ static bool phy_is_wideport_member(struct asd_sas_port *port, struct asd_sas_phy · 24 unmodified lines
25		25
26	static void sas_resume_port(struct asd_sas_phy *phy)	26	static void sas_resume_port(struct asd_sas_phy *phy)
27	{	27	{
28	struct domain_device *dev;	28	struct domain_device dev, n;
29	struct asd_sas_port *port = phy->port;	29	struct asd_sas_port *port = phy->port;
30	struct sas_ha_struct *sas_ha = phy->ha;	30	struct sas_ha_struct *sas_ha = phy->ha;
31	struct sas_internal *si = to_sas_internal(sas_ha->core.shost->transportt);	31	struct sas_internal *si = to_sas_internal(sas_ha->core.shost->transportt);
@@ -44,7 +44,7 @@ static void sas_resume_port(struct asd_sas_phy *phy) · 12 unmodified lines
44	* 1/ presume every device came back	44	* 1/ presume every device came back
45	* 2/ force the next revalidation to check all expander phys	45	* 2/ force the next revalidation to check all expander phys
46	*/	46	*/
47	list_for_each_entry(dev, &port->dev_list, dev_list_node) {	47	list_for_each_entry_safe(dev, n, &port->dev_list, dev_list_node) {
48	int i, rc;	48	int i, rc;
49		49
50	rc = sas_notify_lldd_dev_found(dev);	50	rc = sas_notify_lldd_dev_found(dev);

drivers/scsi/lpfc/lpfc_sli.c+1−3

 	abtswqe = &abtsiocb->wqe;
 	memset(abtswqe, 0, sizeof(*abtswqe));
-	if (lpfc_is_link_up(phba))
+	if (!lpfc_is_link_up(phba))
 		bf_set(abort_cmd_ia, &abtswqe->abort_cmd, 1);
-	else
-		bf_set(abort_cmd_ia, &abtswqe->abort_cmd, 0);
 	bf_set(abort_cmd_criteria, &abtswqe->abort_cmd, T_XRI_TAG);
 	abtswqe->abort_cmd.rsrvd5 = 0;
 	abtswqe->abort_cmd.wqe_com.abort_tag = xritag;

drivers/scsi/qedf/qedf_main.c+9−11

 		fcoe_wwn_to_str(vport->port_name, buf, sizeof(buf));
 		QEDF_WARN(&(base_qedf->dbg_ctx), "Failed to create vport, "
 			   "WWPN (0x%s) already exists.\n", buf);
-		goto err1;
+		return rc;
 	}
 	if (atomic_read(&base_qedf->link_state) != QEDF_LINK_UP) {
 		QEDF_WARN(&(base_qedf->dbg_ctx), "Cannot create vport "
 			   "because link is not up.\n");
-		rc = -EIO;
+		return -EIO;
-		goto err1;
 	}
 	vn_port = libfc_vport_create(vport, sizeof(struct qedf_ctx));
 	if (!vn_port) {
 		QEDF_WARN(&(base_qedf->dbg_ctx), "Could not create lport "
 			   "for vport.\n");
-		rc = -ENOMEM;
+		return -ENOMEM;
-		goto err1;
 	}
 	fcoe_wwn_to_str(vport->port_name, buf, sizeof(buf));
 	if (rc) {
 		QEDF_ERR(&(base_qedf->dbg_ctx), "Could not allocate memory "
 		    "for lport stats.\n");
-		goto err2;
+		goto err;
 	}
 	fc_set_wwnn(vn_port, vport->node_name);
 	if (rc) {
 		QEDF_WARN(&base_qedf->dbg_ctx,
 			  "Error adding Scsi_Host rc=0x%x.\n", rc);
-		goto err2;
+		goto err;
 	}
 	/* Set default dev_loss_tmo based on module parameter */
 	vport_qedf->dbg_ctx.host_no = vn_port->host->host_no;
 	vport_qedf->dbg_ctx.pdev = base_qedf->pdev;
-err2:
+	return 0;
+err:
 	scsi_host_put(vn_port->host);
-err1:
 	return rc;
 }
 	fc_lport_free_stats(vn_port);
 	/* Release Scsi_Host */
-	if (vn_port->host)
+	scsi_host_put(vn_port->host);
-		scsi_host_put(vn_port->host);
 out:
 	return 0;

drivers/scsi/qla2xxx/qla_target.c+2−0

 		return;
 	}
+	mutex_lock(&tgt->ha->optrom_mutex);
 	mutex_lock(&vha->vha_tgt.tgt_mutex);
 	tgt->tgt_stop = 0;
 	tgt->tgt_stopped = 1;
 	mutex_unlock(&vha->vha_tgt.tgt_mutex);
+	mutex_unlock(&tgt->ha->optrom_mutex);
 	ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00c, "Stop of tgt %p finished\n",
 	    tgt);

drivers/scsi/scsi_devinfo.c+1−0

@@ -184,6 +184,7 @@ static struct { · 183 unmodified lines
184	{"HP", "C3323-300", "4269", BLIST_NOTQ},	184	{"HP", "C3323-300", "4269", BLIST_NOTQ},
185	{"HP", "C5713A", NULL, BLIST_NOREPORTLUN},	185	{"HP", "C5713A", NULL, BLIST_NOREPORTLUN},
186	{"HP", "DISK-SUBSYSTEM", "*", BLIST_REPORTLUN2},	186	{"HP", "DISK-SUBSYSTEM", "*", BLIST_REPORTLUN2},
		187	{"HPE", "OPEN-", "*", BLIST_REPORTLUN2 \| BLIST_TRY_VPD_PAGES},
187	{"IBM", "AuSaV1S2", NULL, BLIST_FORCELUN},	188	{"IBM", "AuSaV1S2", NULL, BLIST_FORCELUN},
188	{"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN \| BLIST_LARGELUN},	189	{"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN \| BLIST_LARGELUN},
189	{"IBM", "2105", NULL, BLIST_RETRY_HWERROR},	190	{"IBM", "2105", NULL, BLIST_RETRY_HWERROR},

drivers/scsi/ufs/ufs-mediatek.c+14−1

 	ret = ufshcd_dme_get(hba, UIC_ARG_MIB(PA_LOCALVERINFO), &ver);
 	if (!ret) {
-		if (ver >= UFS_UNIPRO_VER_1_8)
+		if (ver >= UFS_UNIPRO_VER_1_8) {
 			host->hw_ver.major = 3;
+			/*
+			 * Fix HCI version for some platforms with
+			 * incorrect version
+			 */
+			if (hba->ufs_version < ufshci_version(3, 0))
+				hba->ufs_version = ufshci_version(3, 0);
+		}
 	}
 }
+static u32 ufs_mtk_get_ufs_hci_version(struct ufs_hba *hba)
+{
+	return hba->ufs_version;
+}
 /**
  * ufs_mtk_init - find other essential mmio bases
  * @hba: host controller instance
 static const struct ufs_hba_variant_ops ufs_hba_mtk_vops = {
 	.name                = "mediatek.ufshci",
 	.init                = ufs_mtk_init,
+	.get_ufs_hci_version = ufs_mtk_get_ufs_hci_version,
 	.setup_clocks        = ufs_mtk_setup_clocks,
 	.hce_enable_notify   = ufs_mtk_hce_enable_notify,
 	.link_startup_notify = ufs_mtk_link_startup_notify,

drivers/scsi/vmw_pvscsi.c+7−1

 		case BTSTAT_SUCCESS:
 		case BTSTAT_LINKED_COMMAND_COMPLETED:
 		case BTSTAT_LINKED_COMMAND_COMPLETED_WITH_FLAG:
-			/* If everything went fine, let's move on..  */
+			/*
+			 * Commands like INQUIRY may transfer less data than
+			 * requested by the initiator via bufflen. Set residual
+			 * count to make upper layer aware of the actual amount
+			 * of data returned.
+			 */
+			scsi_set_resid(cmd, scsi_bufflen(cmd) - e->dataLen);
 			cmd->result = (DID_OK << 16);
 			break;

drivers/soc/amlogic/meson-clk-measure.c+1−3

 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	base = devm_ioremap_resource(&pdev->dev, res);
-	if (IS_ERR(base)) {
+	if (IS_ERR(base))
-		dev_err(&pdev->dev, "io resource mapping failed\n");
 		return PTR_ERR(base);
-	}
 	priv->regmap = devm_regmap_init_mmio(&pdev->dev, base,
 					     &meson_clk_msr_regmap_config);

drivers/soundwire/qcom.c+10−2

 	ret = of_property_read_u8_array(np, "qcom,ports-block-pack-mode",
 					bp_mode, nports);
-	if (ret)
+	if (ret) {
-		return ret;
+		u32 version;
+		ctrl->reg_read(ctrl, SWRM_COMP_HW_VERSION, &version);
+		if (version <= 0x01030000)
+			memset(bp_mode, SWR_INVALID_PARAM, QCOM_SDW_MAX_PORTS);
+		else
+			return ret;
+	}
 	memset(hstart, SWR_INVALID_PARAM, QCOM_SDW_MAX_PORTS);
 	of_property_read_u8_array(np, "qcom,ports-hstart", hstart, nports);

drivers/spi/Kconfig+1−1

@@ -65,7 +65,7 @@ config SPI_ALTERA · 64 unmodified lines
65	This is the driver for the Altera SPI Controller.	65	This is the driver for the Altera SPI Controller.
66		66
67	config SPI_ALTERA_CORE	67	config SPI_ALTERA_CORE
68	tristate "Altera SPI Controller core code"	68	tristate "Altera SPI Controller core code" if COMPILE_TEST
69	select REGMAP	69	select REGMAP
70	help	70	help
71	"The core code for the Altera SPI Controller"	71	"The core code for the Altera SPI Controller"

drivers/spi/spi-bcm2835.c+8−2

 #define BCM2835_SPI_FIFO_SIZE		64
 #define BCM2835_SPI_FIFO_SIZE_3_4	48
 #define BCM2835_SPI_DMA_MIN_LENGTH	96
-#define BCM2835_SPI_NUM_CS		4   /* raise as necessary */
+#define BCM2835_SPI_NUM_CS		24  /* raise as necessary */
 #define BCM2835_SPI_MODE_BITS	(SPI_CPOL | SPI_CPHA | SPI_CS_HIGH \
 				| SPI_NO_CS | SPI_3WIRE)
 	struct gpio_chip *chip;
 	u32 cs;
+	if (spi->chip_select >= BCM2835_SPI_NUM_CS) {
+		dev_err(&spi->dev, "only %d chip-selects supported\n",
+			BCM2835_SPI_NUM_CS - 1);
+		return -EINVAL;
+	}
 	/*
 	 * Precalculate SPI slave's CS register value for ->prepare_message():
 	 * The driver always uses software-controlled GPIO chip select, hence
 	ctlr->use_gpio_descriptors = true;
 	ctlr->mode_bits = BCM2835_SPI_MODE_BITS;
 	ctlr->bits_per_word_mask = SPI_BPW_MASK(8);
-	ctlr->num_chipselect = BCM2835_SPI_NUM_CS;
+	ctlr->num_chipselect = 3;
 	ctlr->setup = bcm2835_spi_setup;
 	ctlr->transfer_one = bcm2835_spi_transfer_one;
 	ctlr->handle_err = bcm2835_spi_handle_err;

drivers/spi/spi-bitbang.c+14−4

 {
 	struct spi_bitbang_cs	*cs = spi->controller_state;
 	struct spi_bitbang	*bitbang;
+	bool			initial_setup = false;
+	int			retval;
 	bitbang = spi_master_get_devdata(spi->master);
 		if (!cs)
 			return -ENOMEM;
 		spi->controller_state = cs;
+		initial_setup = true;
 	}
 	/* per-word shift register access, in hardware or bitbanging */
 	cs->txrx_word = bitbang->txrx_word[spi->mode & (SPI_CPOL|SPI_CPHA)];
-	if (!cs->txrx_word)
+	if (!cs->txrx_word) {
-		return -EINVAL;
+		retval = -EINVAL;
+		goto err_free;
+	}
 	if (bitbang->setup_transfer) {
-		int retval = bitbang->setup_transfer(spi, NULL);
+		retval = bitbang->setup_transfer(spi, NULL);
 		if (retval < 0)
-			return retval;
+			goto err_free;
 	}
 	dev_dbg(&spi->dev, "%s, %u nsec/bit\n", __func__, 2 * cs->nsecs);
 	return 0;
+err_free:
+	if (initial_setup)
+		kfree(cs);
+	return retval;
 }
 EXPORT_SYMBOL_GPL(spi_bitbang_setup);

drivers/spi/spi-fsl-dspi.c+3−1

 	ret = spi_register_controller(ctlr);
 	if (ret != 0) {
 		dev_err(&pdev->dev, "Problem registering DSPI ctlr\n");
-		goto out_free_irq;
+		goto out_release_dma;
 	}
 	return ret;
+out_release_dma:
+	dspi_release_dma(dspi);
 out_free_irq:
 	if (dspi->irq)
 		free_irq(dspi->irq, dspi);

drivers/spi/spi-fsl-spi.c+4−0

 {
 	struct mpc8xxx_spi *mpc8xxx_spi;
 	struct fsl_spi_reg __iomem *reg_base;
+	bool initial_setup = false;
 	int retval;
 	u32 hw_mode;
 	struct spi_mpc8xxx_cs *cs = spi_get_ctldata(spi);
 		if (!cs)
 			return -ENOMEM;
 		spi_set_ctldata(spi, cs);
+		initial_setup = true;
 	}
 	mpc8xxx_spi = spi_master_get_devdata(spi->master);
 	retval = fsl_spi_setup_transfer(spi, NULL);
 	if (retval < 0) {
 		cs->hw_mode = hw_mode; /* Restore settings */
+		if (initial_setup)
+			kfree(cs);
 		return retval;
 	}

drivers/spi/spi-omap-uwire.c+8−1

 static int uwire_setup(struct spi_device *spi)
 {
 	struct uwire_state *ust = spi->controller_state;
+	bool initial_setup = false;
+	int status;
 	if (ust == NULL) {
 		ust = kzalloc(sizeof(*ust), GFP_KERNEL);
 		if (ust == NULL)
 			return -ENOMEM;
 		spi->controller_state = ust;
+		initial_setup = true;
 	}
-	return uwire_setup_transfer(spi, NULL);
+	status = uwire_setup_transfer(spi, NULL);
+	if (status && initial_setup)
+		kfree(ust);
+	return status;
 }
 static void uwire_cleanup(struct spi_device *spi)

drivers/spi/spi-omap2-mcspi.c+20−13

 	}
 }
+static void omap2_mcspi_cleanup(struct spi_device *spi)
+{
+	struct omap2_mcspi_cs	*cs;
+	if (spi->controller_state) {
+		/* Unlink controller state from context save list */
+		cs = spi->controller_state;
+		list_del(&cs->node);
+		kfree(cs);
+	}
+}
 static int omap2_mcspi_setup(struct spi_device *spi)
 {
+	bool			initial_setup = false;
 	int			ret;
 	struct omap2_mcspi	*mcspi = spi_master_get_devdata(spi->master);
 	struct omap2_mcspi_regs	*ctx = &mcspi->ctx;
 		spi->controller_state = cs;
 		/* Link this to context save list */
 		list_add_tail(&cs->node, &ctx->cs);
+		initial_setup = true;
 	}
 	ret = pm_runtime_get_sync(mcspi->dev);
 	if (ret < 0) {
 		pm_runtime_put_noidle(mcspi->dev);
+		if (initial_setup)
+			omap2_mcspi_cleanup(spi);
 		return ret;
 	}
 	ret = omap2_mcspi_setup_transfer(spi, NULL);
+	if (ret && initial_setup)
+		omap2_mcspi_cleanup(spi);
 	pm_runtime_mark_last_busy(mcspi->dev);
 	pm_runtime_put_autosuspend(mcspi->dev);
 	return ret;
 }
-static void omap2_mcspi_cleanup(struct spi_device *spi)
-{
-	struct omap2_mcspi_cs	*cs;
-	if (spi->controller_state) {
-		/* Unlink controller state from context save list */
-		cs = spi->controller_state;
-		list_del(&cs->node);
-		kfree(cs);
-	}
-}
 static irqreturn_t omap2_mcspi_irq_handler(int irq, void *data)
 {
 	struct omap2_mcspi *mcspi = data;

drivers/spi/spi-pxa2xx.c+8−1

 		chip->gpio_cs_inverted = spi->mode & SPI_CS_HIGH;
 		err = gpiod_direction_output(gpiod, !chip->gpio_cs_inverted);
+		if (err)
+			gpiod_put(chip->gpiod_cs);
 	}
 	return err;
 	struct driver_data *drv_data =
 		spi_controller_get_devdata(spi->controller);
 	uint tx_thres, tx_hi_thres, rx_thres;
+	int err;
 	switch (drv_data->ssp_type) {
 	case QUARK_X1000_SSP:
 	if (drv_data->ssp_type == CE4100_SSP)
 		return 0;
-	return setup_cs(spi, chip, chip_info);
+	err = setup_cs(spi, chip, chip_info);
+	if (err)
+		kfree(chip);
+	return err;
 }
 static void cleanup(struct spi_device *spi)

drivers/spi/spi-sc18is602.c+8−1

 static int sc18is602_check_transfer(struct spi_device *spi,
 				    struct spi_transfer *t, int tlen)
 {
-	if (t && t->len + tlen > SC18IS602_BUFSIZ)
+	if (t && t->len + tlen > SC18IS602_BUFSIZ + 1)
 		return -EINVAL;
 	return 0;
 	return status;
 }
+static size_t sc18is602_max_transfer_size(struct spi_device *spi)
+{
+	return SC18IS602_BUFSIZ;
+}
 static int sc18is602_setup(struct spi_device *spi)
 {
 	struct sc18is602 *hw = spi_master_get_devdata(spi->master);
 	master->bits_per_word_mask = SPI_BPW_MASK(8);
 	master->setup = sc18is602_setup;
 	master->transfer_one_message = sc18is602_transfer_one;
+	master->max_transfer_size = sc18is602_max_transfer_size;
+	master->max_message_size = sc18is602_max_transfer_size;
 	master->dev.of_node = np;
 	master->min_speed_hz = hw->freq / 128;
 	master->max_speed_hz = hw->freq / 4;

drivers/spi/spi-sprd.c+1−0

@@ -1068,6 +1068,7 @@ static const struct of_device_id sprd_spi_of_match[] = { · 1067 unmodified lines
1068	{ .compatible = "sprd,sc9860-spi", },	1068	{ .compatible = "sprd,sc9860-spi", },
1069	{ /* sentinel */ }	1069	{ /* sentinel */ }
1070	};	1070	};
		1071	MODULE_DEVICE_TABLE(of, sprd_spi_of_match);
1071		1072
1072	static struct platform_driver sprd_spi_driver = {	1073	static struct platform_driver sprd_spi_driver = {
1073	.driver = {	1074	.driver = {

drivers/spi/spi-stm32-qspi.c+4−1

 	int err = 0;
 	if (!op->data.nbytes)
-		return stm32_qspi_wait_nobusy(qspi);
+		goto wait_nobusy;
 	if (readl_relaxed(qspi->io_base + QSPI_SR) & SR_TCF)
 		goto out;
 out:
 	/* clear flags */
 	writel_relaxed(FCR_CTCF | FCR_CTEF, qspi->io_base + QSPI_FCR);
+wait_nobusy:
+	if (!err)
+		err = stm32_qspi_wait_nobusy(qspi);
 	return err;
 }

drivers/spi/spi-zynq-qspi.c+8−8

 }
 /**
- * zynq_qspi_setup - Configure the QSPI controller
+ * zynq_qspi_setup_op - Configure the QSPI controller
  * @spi:	Pointer to the spi_device structure
  *
  * Sets the operational mode of QSPI controller for the next QSPI transfer, baud
 	struct zynq_qspi *xqspi = spi_controller_get_devdata(mem->spi->master);
 	int err = 0, i;
 	u8 *tmpbuf;
-	u8 opcode = op->cmd.opcode;
 	dev_dbg(xqspi->dev, "cmd:%#x mode:%d.%d.%d.%d\n",
-		opcode, op->cmd.buswidth, op->addr.buswidth,
+		op->cmd.opcode, op->cmd.buswidth, op->addr.buswidth,
 		op->dummy.buswidth, op->data.buswidth);
 	zynq_qspi_chipselect(mem->spi, true);
 	zynq_qspi_config_op(xqspi, mem->spi);
-	if (op->cmd.nbytes) {
+	if (op->cmd.opcode) {
 		reinit_completion(&xqspi->data_completion);
-		xqspi->txbuf = &opcode;
+		xqspi->txbuf = (u8 *)&op->cmd.opcode;
 		xqspi->rxbuf = NULL;
 		xqspi->tx_bytes = op->cmd.nbytes;
 		xqspi->rx_bytes = op->cmd.nbytes;
 	xqspi->irq = platform_get_irq(pdev, 0);
 	if (xqspi->irq <= 0) {
 		ret = -ENXIO;
-		goto remove_master;
+		goto clk_dis_all;
 	}
 	ret = devm_request_irq(&pdev->dev, xqspi->irq, zynq_qspi_irq,
 			       0, pdev->name, xqspi);
 	if (ret != 0) {
 		ret = -ENXIO;
 		dev_err(&pdev->dev, "request_irq failed\n");
-		goto remove_master;
+		goto clk_dis_all;
 	}
 	ret = of_property_read_u32(np, "num-cs",
 	if (ret < 0) {
 		ctlr->num_chipselect = 1;
 	} else if (num_cs > ZYNQ_QSPI_MAX_NUM_CS) {
+		ret = -EINVAL;
 		dev_err(&pdev->dev, "only 2 chip selects are available\n");
-		goto remove_master;
+		goto clk_dis_all;
 	} else {
 		ctlr->num_chipselect = num_cs;
 	}

drivers/spi/spi.c+38−13

 {
 	struct spi_device	*spi = to_spi_device(dev);
-	/* spi controllers may cleanup for released devices */
-	if (spi->controller->cleanup)
-		spi->controller->cleanup(spi);
 	spi_controller_put(spi->controller);
 	kfree(spi->driver_override);
 	kfree(spi);
 	return 0;
 }
+static void spi_cleanup(struct spi_device *spi)
+{
+	if (spi->controller->cleanup)
+		spi->controller->cleanup(spi);
+}
 /**
  * spi_add_device - Add spi_device allocated with spi_alloc_device
  * @spi: spi_device to register
 	/* Device may be bound to an active driver when this returns */
 	status = device_add(&spi->dev);
-	if (status < 0)
+	if (status < 0) {
 		dev_err(dev, "can't add %s, status %d\n",
 				dev_name(&spi->dev), status);
-	else
+		spi_cleanup(spi);
+	} else {
 		dev_dbg(dev, "registered child %s\n", dev_name(&spi->dev));
+	}
 done:
 	mutex_unlock(&spi_add_lock);
 	if (ACPI_COMPANION(&spi->dev))
 		acpi_device_clear_enumerated(ACPI_COMPANION(&spi->dev));
 	device_remove_software_node(&spi->dev);
-	device_unregister(&spi->dev);
+	device_del(&spi->dev);
+	spi_cleanup(spi);
+	put_device(&spi->dev);
 }
 EXPORT_SYMBOL_GPL(spi_unregister_device);
 	if (spi->cs_gpiod || gpio_is_valid(spi->cs_gpio)) {
 		if (!(spi->mode & SPI_NO_CS)) {
-			if (spi->cs_gpiod)
+			if (spi->cs_gpiod) {
-				/* polarity handled by gpiolib */
+				/*
-				gpiod_set_value_cansleep(spi->cs_gpiod, activate);
+				 * Historically ACPI has no means of the GPIO polarity and
-			else
+				 * thus the SPISerialBus() resource defines it on the per-chip
+				 * basis. In order to avoid a chain of negations, the GPIO
+				 * polarity is considered being Active High. Even for the cases
+				 * when _DSD() is involved (in the updated versions of ACPI)
+				 * the GPIO CS polarity must be defined Active High to avoid
+				 * ambiguity. That's why we use enable, that takes SPI_CS_HIGH
+				 * into account.
+				 */
+				if (has_acpi_companion(&spi->dev))
+					gpiod_set_value_cansleep(spi->cs_gpiod, !enable);
+				else
+					/* Polarity handled by GPIO library */
+					gpiod_set_value_cansleep(spi->cs_gpiod, activate);
+			} else {
 				/*
 				 * invert the enable line, as active low is
 				 * default for SPI.
 				 */
 				gpio_set_value_cansleep(spi->cs_gpio, !enable);
+			}
 		}
 		/* Some SPI masters need both GPIO CS & slave_select */
 		if ((spi->controller->flags & SPI_MASTER_GPIO_SS) &&
 	if (spi->controller->set_cs_timing &&
 	    !(spi->cs_gpiod || gpio_is_valid(spi->cs_gpio))) {
+		mutex_lock(&spi->controller->io_mutex);
 		if (spi->controller->auto_runtime_pm) {
 			status = pm_runtime_get_sync(parent);
 			if (status < 0) {
+				mutex_unlock(&spi->controller->io_mutex);
 				pm_runtime_put_noidle(parent);
 				dev_err(&spi->controller->dev, "Failed to power device: %d\n",
 					status);
 								hold, inactive);
 			pm_runtime_mark_last_busy(parent);
 			pm_runtime_put_autosuspend(parent);
-			return status;
 		} else {
-			return spi->controller->set_cs_timing(spi, setup, hold,
+			status = spi->controller->set_cs_timing(spi, setup, hold,
 							      inactive);
 		}
+		mutex_unlock(&spi->controller->io_mutex);
+		return status;
 	}
 	if ((setup && setup->unit == SPI_DELAY_UNIT_SCK) ||

drivers/staging/emxx_udc/emxx_udc.c+2−2

@@ -2064,7 +2064,7 @@ static int _nbu2ss_nuke(struct nbu2ss_udc *udc, · 2063 unmodified lines
2064	struct nbu2ss_ep *ep,	2064	struct nbu2ss_ep *ep,
2065	int status)	2065	int status)
2066	{	2066	{
2067	struct nbu2ss_req *req;	2067	struct nbu2ss_req req, n;
2068		2068
2069	/* Endpoint Disable */	2069	/* Endpoint Disable */
2070	_nbu2ss_epn_exit(udc, ep);	2070	_nbu2ss_epn_exit(udc, ep);
@@ -2076,7 +2076,7 @@ static int _nbu2ss_nuke(struct nbu2ss_udc *udc, · 5 unmodified lines
2076	return 0;	2076	return 0;
2077		2077
2078	/* called with irqs blocked */	2078	/* called with irqs blocked */
2079	list_for_each_entry(req, &ep->queue, queue) {	2079	list_for_each_entry_safe(req, n, &ep->queue, queue) {
2080	_nbu2ss_ep_done(ep, req, status);	2080	_nbu2ss_ep_done(ep, req, status);
2081	}	2081	}
2082		2082

drivers/staging/iio/cdc/ad7746.c+0−1

@@ -700,7 +700,6 @@ static int ad7746_probe(struct i2c_client *client, · 699 unmodified lines
700	indio_dev->num_channels = ARRAY_SIZE(ad7746_channels);	700	indio_dev->num_channels = ARRAY_SIZE(ad7746_channels);
701	else	701	else
702	indio_dev->num_channels = ARRAY_SIZE(ad7746_channels) - 2;	702	indio_dev->num_channels = ARRAY_SIZE(ad7746_channels) - 2;
703	indio_dev->num_channels = ARRAY_SIZE(ad7746_channels);
704	indio_dev->modes = INDIO_DIRECT_MODE;	703	indio_dev->modes = INDIO_DIRECT_MODE;
705		704
706	if (pdata) {	705	if (pdata) {

drivers/staging/ralink-gdma/ralink-gdma.c+0−2

 // SPDX-License-Identifier: GPL-2.0+
 /*
- *  Copyright (C) 2013, Lars-Peter Clausen <lars@metafoo.de>
  *  GDMA4740 DMAC support
  */
 };
 module_platform_driver(gdma_dma_driver);
-MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
 MODULE_DESCRIPTION("Ralink/MTK DMA driver");
 MODULE_LICENSE("GPL v2");

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c+3−3

@@ -2091,7 +2091,7 @@ void rtw_cfg80211_indicate_sta_assoc(struct adapter padapter, u8 pmgmt_frame, · 2090 unmodified lines
2091	struct net_device *ndev = padapter->pnetdev;	2091	struct net_device *ndev = padapter->pnetdev;
2092		2092
2093	{	2093	{
2094	struct station_info sinfo;	2094	struct station_info sinfo = {};
2095	u8 ie_offset;	2095	u8 ie_offset;
2096	if (GetFrameSubType(pmgmt_frame) == WIFI_ASSOCREQ)	2096	if (GetFrameSubType(pmgmt_frame) == WIFI_ASSOCREQ)
2097	ie_offset = _ASOCREQ_IE_OFFSET_;	2097	ie_offset = _ASOCREQ_IE_OFFSET_;
@@ -2284,7 +2284,7 @@ static int rtw_cfg80211_add_monitor_if(struct adapter padapter, char name, str · 186 unmodified lines
2284	mon_wdev->iftype = NL80211_IFTYPE_MONITOR;	2284	mon_wdev->iftype = NL80211_IFTYPE_MONITOR;
2285	mon_ndev->ieee80211_ptr = mon_wdev;	2285	mon_ndev->ieee80211_ptr = mon_wdev;
2286		2286
2287	ret = register_netdevice(mon_ndev);	2287	ret = cfg80211_register_netdevice(mon_ndev);
2288	if (ret) {	2288	if (ret) {
2289	goto out;	2289	goto out;
2290	}	2290	}
@@ -2360,7 +2360,7 @@ static int cfg80211_rtw_del_virtual_intf(struct wiphy *wiphy, · 69 unmodified lines
2360	adapter = rtw_netdev_priv(ndev);	2360	adapter = rtw_netdev_priv(ndev);
2361	pwdev_priv = adapter_wdev_data(adapter);	2361	pwdev_priv = adapter_wdev_data(adapter);
2362		2362
2363	unregister_netdevice(ndev);	2363	cfg80211_unregister_netdevice(ndev);
2364		2364
2365	if (ndev == pwdev_priv->pmon_ndev) {	2365	if (ndev == pwdev_priv->pmon_ndev) {
2366	pwdev_priv->pmon_ndev = NULL;	2366	pwdev_priv->pmon_ndev = NULL;

drivers/target/target_core_iblock.c+2−2

@@ -204,11 +204,11 @@ static struct se_dev_plug iblock_plug_device(struct se_device se_dev) · 203 unmodified lines
204	struct iblock_dev_plug *ib_dev_plug;	204	struct iblock_dev_plug *ib_dev_plug;
205		205
206	/*	206	/*
207	* Each se_device has a per cpu work this can be run from. Wwe	207	* Each se_device has a per cpu work this can be run from. We
208	* shouldn't have multiple threads on the same cpu calling this	208	* shouldn't have multiple threads on the same cpu calling this
209	* at the same time.	209	* at the same time.
210	*/	210	*/
211	ib_dev_plug = &ib_dev->ibd_plug[smp_processor_id()];	211	ib_dev_plug = &ib_dev->ibd_plug[raw_smp_processor_id()];
212	if (test_and_set_bit(IBD_PLUGF_PLUGGED, &ib_dev_plug->flags))	212	if (test_and_set_bit(IBD_PLUGF_PLUGGED, &ib_dev_plug->flags))
213	return NULL;	213	return NULL;
214		214

drivers/target/target_core_transport.c+2−4

@@ -1416,7 +1416,7 @@ void __target_init_cmd( · 1415 unmodified lines
1416	cmd->orig_fe_lun = unpacked_lun;	1416	cmd->orig_fe_lun = unpacked_lun;
1417		1417
1418	if (!(cmd->se_cmd_flags & SCF_USE_CPUID))	1418	if (!(cmd->se_cmd_flags & SCF_USE_CPUID))
1419	cmd->cpuid = smp_processor_id();	1419	cmd->cpuid = raw_smp_processor_id();
1420		1420
1421	cmd->state_active = false;	1421	cmd->state_active = false;
1422	}	1422	}
@@ -3121,9 +3121,7 @@ __transport_wait_for_tasks(struct se_cmd *cmd, bool fabric_stop, · 1698 unmodified lines
3121	__releases(&cmd->t_state_lock)	3121	__releases(&cmd->t_state_lock)
3122	__acquires(&cmd->t_state_lock)	3122	__acquires(&cmd->t_state_lock)
3123	{	3123	{
3124		3124	lockdep_assert_held(&cmd->t_state_lock);
3125	assert_spin_locked(&cmd->t_state_lock);
3126	WARN_ON_ONCE(!irqs_disabled());
3127		3125
3128	if (fabric_stop)	3126	if (fabric_stop)
3129	cmd->transport_state \|= CMD_T_FABRIC_STOP;	3127	cmd->transport_state \|= CMD_T_FABRIC_STOP;

drivers/target/target_core_user.c+7−5

 	dpi = dbi * udev->data_pages_per_blk;
 	/* Count the number of already allocated pages */
 	xas_set(&xas, dpi);
+	rcu_read_lock();
 	for (cnt = 0; xas_next(&xas) && cnt < page_cnt;)
 		cnt++;
+	rcu_read_unlock();
 	for (i = cnt; i < page_cnt; i++) {
 		/* try to get new page from the mm */
 				  struct scatterlist *sg, unsigned int sg_nents,
 				  struct iovec **iov, size_t data_len)
 {
-	XA_STATE(xas, &udev->data_pages, 0);
 	/* start value of dbi + 1 must not be a valid dbi */
 	int dbi = -2;
 	size_t page_remaining, cp_len;
-	int page_cnt, page_inx;
+	int page_cnt, page_inx, dpi;
 	struct sg_mapping_iter sg_iter;
 	unsigned int sg_flags;
 	struct page *page;
 		if (page_cnt > udev->data_pages_per_blk)
 			page_cnt = udev->data_pages_per_blk;
-		xas_set(&xas, dbi * udev->data_pages_per_blk);
+		dpi = dbi * udev->data_pages_per_blk;
-		for (page_inx = 0; page_inx < page_cnt && data_len; page_inx++) {
+		for (page_inx = 0; page_inx < page_cnt && data_len;
-			page = xas_next(&xas);
+		     page_inx++, dpi++) {
+			page = xa_load(&udev->data_pages, dpi);
 			if (direction == TCMU_DATA_AREA_TO_SG)
 				flush_dcache_page(page);

drivers/tee/optee/call.c+4−2

 	struct optee_msg_arg *msg_arg;
 	phys_addr_t msg_parg;
 	struct optee_session *sess = NULL;
+	uuid_t client_uuid;
 	/* +2 for the meta parameters added below */
 	shm = get_msg_arg(ctx, arg->num_params + 2, &msg_arg, &msg_parg);
 	memcpy(&msg_arg->params[0].u.value, arg->uuid, sizeof(arg->uuid));
 	msg_arg->params[1].u.value.c = arg->clnt_login;
-	rc = tee_session_calc_client_uuid((uuid_t *)&msg_arg->params[1].u.value,
+	rc = tee_session_calc_client_uuid(&client_uuid, arg->clnt_login,
-					  arg->clnt_login, arg->clnt_uuid);
+					  arg->clnt_uuid);
 	if (rc)
 		goto out;
+	export_uuid(msg_arg->params[1].u.octets, &client_uuid);
 	rc = optee_to_msg_param(msg_arg->params + 2, arg->num_params, param);
 	if (rc)

drivers/tee/optee/optee_msg.h+4−2

 #include <linux/types.h>
 /*
- * This file defines the OP-TEE message protocol used to communicate
+ * This file defines the OP-TEE message protocol (ABI) used to communicate
  * with an instance of OP-TEE running in secure world.
  *
  * This file is divided into two sections.
  * @tmem:	parameter by temporary memory reference
  * @rmem:	parameter by registered memory reference
  * @value:	parameter by opaque value
+ * @octets:	parameter by octet string
  *
  * @attr & OPTEE_MSG_ATTR_TYPE_MASK indicates if tmem, rmem or value is used in
- * the union. OPTEE_MSG_ATTR_TYPE_VALUE_* indicates value,
+ * the union. OPTEE_MSG_ATTR_TYPE_VALUE_* indicates value or octets,
  * OPTEE_MSG_ATTR_TYPE_TMEM_* indicates @tmem and
  * OPTEE_MSG_ATTR_TYPE_RMEM_* indicates @rmem,
  * OPTEE_MSG_ATTR_TYPE_NONE indicates that none of the members are used.
 		struct optee_msg_param_tmem tmem;
 		struct optee_msg_param_rmem rmem;
 		struct optee_msg_param_value value;
+		u8 octets[24];
 	} u;
 };

drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c+4−0

 	if (ACPI_FAILURE(status))
 		trip_cnt = 0;
 	else {
+		int i;
 		int34x_thermal_zone->aux_trips =
 			kcalloc(trip_cnt,
 				sizeof(*int34x_thermal_zone->aux_trips),
 		}
 		trip_mask = BIT(trip_cnt) - 1;
 		int34x_thermal_zone->aux_trip_nr = trip_cnt;
+		for (i = 0; i < trip_cnt; ++i)
+			int34x_thermal_zone->aux_trips[i] = THERMAL_TEMP_INVALID;
 	}
 	trip_cnt = int340x_thermal_read_trips(int34x_thermal_zone);

drivers/thermal/intel/therm_throt.c+11−4

 	return atomic_read(&therm_throt_en);
 }
+void __init therm_lvt_init(void)
+{
+	/*
+	 * This function is only called on boot CPU. Save the init thermal
+	 * LVT value on BSP and use that value to restore APs' thermal LVT
+	 * entry BIOS programmed later
+	 */
+	if (intel_thermal_supported(&boot_cpu_data))
+		lvtthmr_init = apic_read(APIC_LVTTHMR);
+}
 void intel_init_thermal(struct cpuinfo_x86 *c)
 {
 	unsigned int cpu = smp_processor_id();
 	if (!intel_thermal_supported(c))
 		return;
-	/* On the BSP? */
-	if (c == &boot_cpu_data)
-		lvtthmr_init = apic_read(APIC_LVTTHMR);
 	/*
 	 * First check if its enabled already, in which case there might
 	 * be some SMM goo which handles it, so we can't even put a handler

drivers/thermal/intel/x86_pkg_temp_thermal.c+1−1

@@ -166,7 +166,7 @@ static int sys_get_trip_temp(struct thermal_zone_device *tzd, · 165 unmodified lines
166	if (thres_reg_value)	166	if (thres_reg_value)
167	temp = zonedev->tj_max - thres_reg_value 1000;	167	temp = zonedev->tj_max - thres_reg_value 1000;
168	else	168	else
169	*temp = 0;	169	*temp = THERMAL_TEMP_INVALID;
170	pr_debug("sys_get_trip_temp %d\n", *temp);	170	pr_debug("sys_get_trip_temp %d\n", *temp);
171		171
172	return 0;	172	return 0;

drivers/thermal/qcom/qcom-spmi-adc-tm5.c+1−1

@@ -441,7 +441,7 @@ static int adc_tm5_get_dt_channel_data(struct adc_tm5_chip *adc_tm, · 440 unmodified lines
441		441
442	if (args.args_count != 1 \|\| args.args[0] >= ADC5_MAX_CHANNEL) {	442	if (args.args_count != 1 \|\| args.args[0] >= ADC5_MAX_CHANNEL) {
443	dev_err(dev, "%s: invalid ADC channel number %d\n", name, chan);	443	dev_err(dev, "%s: invalid ADC channel number %d\n", name, chan);
444	return ret;	444	return -EINVAL;
445	}	445	}
446	channel->adc_channel = args.args[0];	446	channel->adc_channel = args.args[0];
447		447

drivers/thermal/ti-soc-thermal/ti-bandgap.c+1−1

@@ -770,7 +770,7 @@ static int ti_bandgap_tshut_init(struct ti_bandgap *bgp, · 769 unmodified lines
770	}	770	}
771		771
772	/**	772	/**
773	* ti_bandgap_alert_init() - setup and initialize talert handling	773	* ti_bandgap_talert_init() - setup and initialize talert handling
774	* @bgp: pointer to struct ti_bandgap	774	* @bgp: pointer to struct ti_bandgap
775	* @pdev: pointer to device struct platform_device	775	* @pdev: pointer to device struct platform_device
776	*	776	*

drivers/thunderbolt/dma_port.c+6−5

 			void *buf, size_t size)
 {
 	unsigned int retries = DMA_PORT_RETRIES;
-	unsigned int offset;
-	offset = address & 3;
-	address = address & ~3;
 	do {
-		u32 nbytes = min_t(u32, size, MAIL_DATA_DWORDS * 4);
+		unsigned int offset;
+		size_t nbytes;
 		int ret;
+		offset = address & 3;
+		nbytes = min_t(size_t, size + offset, MAIL_DATA_DWORDS * 4);
 		ret = dma_port_flash_read_block(dma, address, dma->buf,
 						ALIGN(nbytes, 4));
 		if (ret) {
 			return ret;
 		}
+		nbytes -= offset;
 		memcpy(buf, dma->buf + offset, nbytes);
 		size -= nbytes;

drivers/thunderbolt/usb4.c+5−4

 	unsigned int retries = USB4_DATA_RETRIES;
 	unsigned int offset;
-	offset = address & 3;
-	address = address & ~3;
 	do {
-		size_t nbytes = min_t(size_t, size, USB4_DATA_DWORDS * 4);
 		unsigned int dwaddress, dwords;
 		u8 data[USB4_DATA_DWORDS * 4];
+		size_t nbytes;
 		int ret;
+		offset = address & 3;
+		nbytes = min_t(size_t, size + offset, USB4_DATA_DWORDS * 4);
 		dwaddress = address / 4;
 		dwords = ALIGN(nbytes, 4) / 4;
 			return ret;
 		}
+		nbytes -= offset;
 		memcpy(buf, data + offset, nbytes);
 		size -= nbytes;

drivers/tty/serial/8250/8250.h+17−15

@@ -7,6 +7,7 @@ · 6 unmodified lines
7	* Copyright (C) 2001 Russell King.	7	* Copyright (C) 2001 Russell King.
8	*/	8	*/
9		9
		10	#include <linux/bits.h>
10	#include <linux/serial_8250.h>	11	#include <linux/serial_8250.h>
11	#include <linux/serial_reg.h>	12	#include <linux/serial_reg.h>
12	#include <linux/dmaengine.h>	13	#include <linux/dmaengine.h>
@@ -70,24 +71,25 @@ struct serial8250_config { · 57 unmodified lines
70	unsigned int flags;	71	unsigned int flags;
71	};	72	};
72		73
73	#define UART_CAP_FIFO (1 << 8) /* UART has FIFO */	74	#define UART_CAP_FIFO BIT(8) /* UART has FIFO */
74	#define UART_CAP_EFR (1 << 9) /* UART has EFR */	75	#define UART_CAP_EFR BIT(9) /* UART has EFR */
75	#define UART_CAP_SLEEP (1 << 10) /* UART has IER sleep */	76	#define UART_CAP_SLEEP BIT(10) /* UART has IER sleep */
76	#define UART_CAP_AFE (1 << 11) /* MCR-based hw flow control */	77	#define UART_CAP_AFE BIT(11) /* MCR-based hw flow control */
77	#define UART_CAP_UUE (1 << 12) /* UART needs IER bit 6 set (Xscale) */	78	#define UART_CAP_UUE BIT(12) /* UART needs IER bit 6 set (Xscale) */
78	#define UART_CAP_RTOIE (1 << 13) /* UART needs IER bit 4 set (Xscale, Tegra) */	79	#define UART_CAP_RTOIE BIT(13) /* UART needs IER bit 4 set (Xscale, Tegra) */
79	#define UART_CAP_HFIFO (1 << 14) /* UART has a "hidden" FIFO */	80	#define UART_CAP_HFIFO BIT(14) /* UART has a "hidden" FIFO */
80	#define UART_CAP_RPM (1 << 15) /* Runtime PM is active while idle */	81	#define UART_CAP_RPM BIT(15) /* Runtime PM is active while idle */
81	#define UART_CAP_IRDA (1 << 16) /* UART supports IrDA line discipline */	82	#define UART_CAP_IRDA BIT(16) /* UART supports IrDA line discipline */
82	#define UART_CAP_MINI (1 << 17) /* Mini UART on BCM283X family lacks:	83	#define UART_CAP_MINI BIT(17) /* Mini UART on BCM283X family lacks:
83	* STOP PARITY EPAR SPAR WLEN5 WLEN6	84	* STOP PARITY EPAR SPAR WLEN5 WLEN6
84	*/	85	*/
85		86
86	#define UART_BUG_QUOT (1 << 0) /* UART has buggy quot LSB */	87	#define UART_BUG_QUOT BIT(0) /* UART has buggy quot LSB */
87	#define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */	88	#define UART_BUG_TXEN BIT(1) /* UART has buggy TX IIR status */
88	#define UART_BUG_NOMSR (1 << 2) /* UART has buggy MSR status bits (Au1x00) */	89	#define UART_BUG_NOMSR BIT(2) /* UART has buggy MSR status bits (Au1x00) */
89	#define UART_BUG_THRE (1 << 3) /* UART has buggy THRE reassertion */	90	#define UART_BUG_THRE BIT(3) /* UART has buggy THRE reassertion */
90	#define UART_BUG_PARITY (1 << 4) /* UART mishandles parity if FIFO enabled */	91	#define UART_BUG_PARITY BIT(4) /* UART mishandles parity if FIFO enabled */
		92	#define UART_BUG_TXRACE BIT(5) /* UART Tx fails to set remote DR */
91		93
92		94
93	#ifdef CONFIG_SERIAL_8250_SHARE_IRQ	95	#ifdef CONFIG_SERIAL_8250_SHARE_IRQ

drivers/tty/serial/8250/8250_aspeed_vuart.c+1−0

@@ -437,6 +437,7 @@ static int aspeed_vuart_probe(struct platform_device *pdev) · 436 unmodified lines
437	port.port.status = UPSTAT_SYNC_FIFO;	437	port.port.status = UPSTAT_SYNC_FIFO;
438	port.port.dev = &pdev->dev;	438	port.port.dev = &pdev->dev;
439	port.port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_8250_CONSOLE);	439	port.port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_8250_CONSOLE);
		440	port.bugs \|= UART_BUG_TXRACE;
440		441
441	rc = sysfs_create_group(&vuart->dev->kobj, &aspeed_vuart_attr_group);	442	rc = sysfs_create_group(&vuart->dev->kobj, &aspeed_vuart_attr_group);
442	if (rc < 0)	443	if (rc < 0)

drivers/tty/serial/8250/8250_dw.c+1−0

@@ -714,6 +714,7 @@ static const struct acpi_device_id dw8250_acpi_match[] = { · 713 unmodified lines
714	{ "APMC0D08", 0},	714	{ "APMC0D08", 0},
715	{ "AMD0020", 0 },	715	{ "AMD0020", 0 },
716	{ "AMDI0020", 0 },	716	{ "AMDI0020", 0 },
		717	{ "AMDI0022", 0 },
717	{ "BRCM2032", 0 },	718	{ "BRCM2032", 0 },
718	{ "HISI0031", 0 },	719	{ "HISI0031", 0 },
719	{ },	720	{ },

drivers/tty/serial/8250/8250_exar.c+5−1

 {
 	struct exar8250 *priv = pci_get_drvdata(pcidev);
 	struct uart_8250_port *port = serial8250_get_port(priv->line[0]);
-	struct platform_device *pdev = port->port.private_data;
+	struct platform_device *pdev;
+	pdev = port->port.private_data;
+	if (!pdev)
+		return;
 	device_remove_software_node(&pdev->dev);
 	platform_device_unregister(pdev);

drivers/tty/serial/8250/8250_pci.c+35−12

 	int			line[];
 };
+#define PCI_DEVICE_ID_HPE_PCI_SERIAL	0x37e
 static const struct pci_device_id pci_use_msi[] = {
 	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9900,
 			 0xA000, 0x1000) },
 			 0xA000, 0x1000) },
 	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9922,
 			 0xA000, 0x1000) },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_HP_3PAR, PCI_DEVICE_ID_HPE_PCI_SERIAL,
+			 PCI_ANY_ID, PCI_ANY_ID) },
 	{ }
 };
 		.init		= pci_hp_diva_init,
 		.setup		= pci_hp_diva_setup,
 	},
+	/*
+	 * HPE PCI serial device
+	 */
+	{
+		.vendor         = PCI_VENDOR_ID_HP_3PAR,
+		.device         = PCI_DEVICE_ID_HPE_PCI_SERIAL,
+		.subvendor      = PCI_ANY_ID,
+		.subdevice      = PCI_ANY_ID,
+		.setup		= pci_hp_diva_setup,
+	},
 	/*
 	 * Intel
 	 */
 	uart.port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
 	uart.port.uartclk = board->base_baud * 16;
-	if (pci_match_id(pci_use_msi, dev)) {
+	if (board->flags & FL_NOIRQ) {
-		dev_dbg(&dev->dev, "Using MSI(-X) interrupts\n");
+		uart.port.irq = 0;
-		pci_set_master(dev);
-		rc = pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_ALL_TYPES);
 	} else {
-		dev_dbg(&dev->dev, "Using legacy interrupts\n");
+		if (pci_match_id(pci_use_msi, dev)) {
-		rc = pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_LEGACY);
+			dev_dbg(&dev->dev, "Using MSI(-X) interrupts\n");
-	}
+			pci_set_master(dev);
-	if (rc < 0) {
+			rc = pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_ALL_TYPES);
-		kfree(priv);
+		} else {
-		priv = ERR_PTR(rc);
+			dev_dbg(&dev->dev, "Using legacy interrupts\n");
-		goto err_deinit;
+			rc = pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_LEGACY);
+		}
+		if (rc < 0) {
+			kfree(priv);
+			priv = ERR_PTR(rc);
+			goto err_deinit;
+		}
+		uart.port.irq = pci_irq_vector(dev, 0);
 	}
-	uart.port.irq = pci_irq_vector(dev, 0);
 	uart.port.dev = &dev->dev;
 	for (i = 0; i < nr_ports; i++) {
 	{	PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA_AUX,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 		pbn_b2_1_115200 },
+	/* HPE PCI serial device */
+	{	PCI_VENDOR_ID_HP_3PAR, PCI_DEVICE_ID_HPE_PCI_SERIAL,
+		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+		pbn_b1_1_115200 },
 	{	PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM2,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

drivers/tty/serial/8250/8250_port.c+12−0

@@ -1809,6 +1809,18 @@ void serial8250_tx_chars(struct uart_8250_port *up) · 1808 unmodified lines
1809	count = up->tx_loadsz;	1809	count = up->tx_loadsz;
1810	do {	1810	do {
1811	serial_out(up, UART_TX, xmit->buf[xmit->tail]);	1811	serial_out(up, UART_TX, xmit->buf[xmit->tail]);
		1812	if (up->bugs & UART_BUG_TXRACE) {
		1813	/*
		1814	* The Aspeed BMC virtual UARTs have a bug where data
		1815	* may get stuck in the BMC's Tx FIFO from bursts of
		1816	* writes on the APB interface.
		1817	*
		1818	* Delay back-to-back writes by a read cycle to avoid
		1819	* stalling the VUART. Read a register that won't have
		1820	* side-effects and discard the result.
		1821	*/
		1822	serial_in(up, UART_SCR);
		1823	}
1812	xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);	1824	xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
1813	port->icount.tx++;	1825	port->icount.tx++;
1814	if (uart_circ_empty(xmit))	1826	if (uart_circ_empty(xmit))

drivers/tty/serial/rp2.c+17−35

@@ -195,7 +195,6 @@ struct rp2_card { · 194 unmodified lines
195	void __iomem *bar0;	195	void __iomem *bar0;
196	void __iomem *bar1;	196	void __iomem *bar1;
197	spinlock_t card_lock;	197	spinlock_t card_lock;
198	struct completion fw_loaded;
199	};	198	};
200		199
201	#define RP_ID(prod) PCI_VDEVICE(RP, (prod))	200	#define RP_ID(prod) PCI_VDEVICE(RP, (prod))
@@ -662,17 +661,10 @@ static void rp2_remove_ports(struct rp2_card *card) · 460 unmodified lines
662	card->initialized_ports = 0;	661	card->initialized_ports = 0;
663	}	662	}
664		663
665	static void rp2_fw_cb(const struct firmware fw, void context)	664	static int rp2_load_firmware(struct rp2_card card, const struct firmware fw)
666	{	665	{
667	struct rp2_card *card = context;
668	resource_size_t phys_base;	666	resource_size_t phys_base;
669	int i, rc = -ENOENT;	667	int i, rc = 0;
670
671	if (!fw) {
672	dev_err(&card->pdev->dev, "cannot find '%s' firmware image\n",
673	RP2_FW_NAME);
674	goto no_fw;
675	}
676		668
677	phys_base = pci_resource_start(card->pdev, 1);	669	phys_base = pci_resource_start(card->pdev, 1);
678		670
@@ -718,23 +710,13 @@ static void rp2_fw_cb(const struct firmware fw, void context) · 39 unmodified lines
718	card->initialized_ports++;	710	card->initialized_ports++;
719	}	711	}
720		712
721	release_firmware(fw);	713	return rc;
722	no_fw:
723	/*
724	* rp2_fw_cb() is called from a workqueue long after rp2_probe()
725	* has already returned success. So if something failed here,
726	* we'll just leave the now-dormant device in place until somebody
727	* unbinds it.
728	*/
729	if (rc)
730	dev_warn(&card->pdev->dev, "driver initialization failed\n");
731
732	complete(&card->fw_loaded);
733	}	714	}
734		715
735	static int rp2_probe(struct pci_dev *pdev,	716	static int rp2_probe(struct pci_dev *pdev,
736	const struct pci_device_id *id)	717	const struct pci_device_id *id)
737	{	718	{
		719	const struct firmware *fw;
738	struct rp2_card *card;	720	struct rp2_card *card;
739	struct rp2_uart_port *ports;	721	struct rp2_uart_port *ports;
740	void __iomem * const *bars;	722	void __iomem * const *bars;
@@ -745,7 +727,6 @@ static int rp2_probe(struct pci_dev *pdev, · 4 unmodified lines
745	return -ENOMEM;	727	return -ENOMEM;
746	pci_set_drvdata(pdev, card);	728	pci_set_drvdata(pdev, card);
747	spin_lock_init(&card->card_lock);	729	spin_lock_init(&card->card_lock);
748	init_completion(&card->fw_loaded);
749		730
750	rc = pcim_enable_device(pdev);	731	rc = pcim_enable_device(pdev);
751	if (rc)	732	if (rc)
@@ -778,21 +759,23 @@ static int rp2_probe(struct pci_dev *pdev, · 26 unmodified lines
778	return -ENOMEM;	759	return -ENOMEM;
779	card->ports = ports;	760	card->ports = ports;
780		761
781	rc = devm_request_irq(&pdev->dev, pdev->irq, rp2_uart_interrupt,	762	rc = request_firmware(&fw, RP2_FW_NAME, &pdev->dev);
782	IRQF_SHARED, DRV_NAME, card);	763	if (rc < 0) {
783	if (rc)	764	dev_err(&pdev->dev, "cannot find '%s' firmware image\n",
		765	RP2_FW_NAME);
784	return rc;	766	return rc;
		767	}
785		768
786	/*	769	rc = rp2_load_firmware(card, fw);
787	* Only catastrophic errors (e.g. ENOMEM) are reported here.	770
788	* If the FW image is missing, we'll find out in rp2_fw_cb()	771	release_firmware(fw);
789	* and print an error message.	772	if (rc < 0)
790	*/	773	return rc;
791	rc = request_firmware_nowait(THIS_MODULE, 1, RP2_FW_NAME, &pdev->dev,	774
792	GFP_KERNEL, card, rp2_fw_cb);	775	rc = devm_request_irq(&pdev->dev, pdev->irq, rp2_uart_interrupt,
		776	IRQF_SHARED, DRV_NAME, card);
793	if (rc)	777	if (rc)
794	return rc;	778	return rc;
795	dev_dbg(&pdev->dev, "waiting for firmware blob...\n");
796		779
797	return 0;	780	return 0;
798	}	781	}
@@ -801,7 +784,6 @@ static void rp2_remove(struct pci_dev *pdev) · 2 unmodified lines
801	{	784	{
802	struct rp2_card *card = pci_get_drvdata(pdev);	785	struct rp2_card *card = pci_get_drvdata(pdev);
803		786
804	wait_for_completion(&card->fw_loaded);
805	rp2_remove_ports(card);	787	rp2_remove_ports(card);
806	}	788	}
807		789

drivers/tty/serial/serial-tegra.c+1−1

@@ -338,7 +338,7 @@ static void tegra_uart_fifo_reset(struct tegra_uart_port *tup, u8 fcr_bits) · 337 unmodified lines
338		338
339	do {	339	do {
340	lsr = tegra_uart_read(tup, UART_LSR);	340	lsr = tegra_uart_read(tup, UART_LSR);
341	if ((lsr \| UART_LSR_TEMT) && !(lsr & UART_LSR_DR))	341	if ((lsr & UART_LSR_TEMT) && !(lsr & UART_LSR_DR))
342	break;	342	break;
343	udelay(1);	343	udelay(1);
344	} while (--tmout);	344	} while (--tmout);

drivers/tty/serial/serial_core.c+5−3

 		goto check_and_exit;
 	}
-	retval = security_locked_down(LOCKDOWN_TIOCSSERIAL);
+	if (change_irq || change_port) {
-	if (retval && (change_irq || change_port))
+		retval = security_locked_down(LOCKDOWN_TIOCSSERIAL);
-		goto exit;
+		if (retval)
+			goto exit;
+	}
 	/*
 	 * Ask the low level driver to verify the settings.

drivers/tty/serial/sh-sci.c+2−2

 {
 	unsigned int bits;
+	if (rx_trig >= port->fifosize)
+		rx_trig = port->fifosize - 1;
 	if (rx_trig < 1)
 		rx_trig = 1;
-	if (rx_trig >= port->fifosize)
-		rx_trig = port->fifosize;
 	/* HSCIF can be set to an arbitrary level. */
 	if (sci_getreg(port, HSRTRGR)->size) {

drivers/usb/cdns3/cdns3-gadget.c+6−6

 		else
 			mask = BIT(priv_ep->num);
-		if (priv_ep->type != USB_ENDPOINT_XFER_ISOC) {
+		if (priv_ep->type != USB_ENDPOINT_XFER_ISOC  && !priv_ep->dir) {
 			cdns3_set_register_bit(&regs->tdl_from_trb, mask);
 			cdns3_set_register_bit(&regs->tdl_beh, mask);
 			cdns3_set_register_bit(&regs->tdl_beh2, mask);
 	case USB_ENDPOINT_XFER_INT:
 		ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_INT);
-		if ((priv_dev->dev_ver == DEV_VER_V2 && !priv_ep->dir) ||
+		if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)
-		    priv_dev->dev_ver > DEV_VER_V2)
 			ep_cfg |= EP_CFG_TDL_CHK;
 		break;
 	case USB_ENDPOINT_XFER_BULK:
 		ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_BULK);
-		if ((priv_dev->dev_ver == DEV_VER_V2  && !priv_ep->dir) ||
+		if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)
-		    priv_dev->dev_ver > DEV_VER_V2)
 			ep_cfg |= EP_CFG_TDL_CHK;
 		break;
 	default:
 	pm_runtime_get_sync(cdns->dev);
 	ret = cdns3_gadget_start(cdns);
-	if (ret)
+	if (ret) {
+		pm_runtime_put_sync(cdns->dev);
 		return ret;
+	}
 	/*
 	 * Because interrupt line can be shared with other components in

drivers/usb/cdns3/cdnsp-gadget.c+7−7

@@ -422,17 +422,17 @@ unmap: · 421 unmodified lines
422	int cdnsp_ep_dequeue(struct cdnsp_ep pep, struct cdnsp_request preq)	422	int cdnsp_ep_dequeue(struct cdnsp_ep pep, struct cdnsp_request preq)
423	{	423	{
424	struct cdnsp_device *pdev = pep->pdev;	424	struct cdnsp_device *pdev = pep->pdev;
425	int ret;	425	int ret_stop = 0;
		426	int ret_rem;
426		427
427	trace_cdnsp_request_dequeue(preq);	428	trace_cdnsp_request_dequeue(preq);
428		429
429	if (GET_EP_CTX_STATE(pep->out_ctx) == EP_STATE_RUNNING) {	430	if (GET_EP_CTX_STATE(pep->out_ctx) == EP_STATE_RUNNING)
430	ret = cdnsp_cmd_stop_ep(pdev, pep);	431	ret_stop = cdnsp_cmd_stop_ep(pdev, pep);
431	if (ret)	432
432	return ret;	433	ret_rem = cdnsp_remove_request(pdev, preq, pep);
433	}
434		434
435	return cdnsp_remove_request(pdev, preq, pep);	435	return ret_rem ? ret_rem : ret_stop;
436	}	436	}
437		437
438	static void cdnsp_zero_in_ctx(struct cdnsp_device *pdev)	438	static void cdnsp_zero_in_ctx(struct cdnsp_device *pdev)

drivers/usb/cdns3/cdnsp-ring.c+4−3

 {
 	struct cdnsp_device *pdev = (struct cdnsp_device *)data;
 	union cdnsp_trb *event_ring_deq;
+	unsigned long flags;
 	int counter = 0;
-	spin_lock(&pdev->lock);
+	spin_lock_irqsave(&pdev->lock, flags);
 	if (pdev->cdnsp_state & (CDNSP_STATE_HALTED | CDNSP_STATE_DYING)) {
 		cdnsp_died(pdev);
-		spin_unlock(&pdev->lock);
+		spin_unlock_irqrestore(&pdev->lock, flags);
 		return IRQ_HANDLED;
 	}
 	cdnsp_update_erst_dequeue(pdev, event_ring_deq, 1);
-	spin_unlock(&pdev->lock);
+	spin_unlock_irqrestore(&pdev->lock, flags);
 	return IRQ_HANDLED;
 }

drivers/usb/chipidea/udc.c+1−0

@@ -2061,6 +2061,7 @@ static int udc_start(struct ci_hdrc *ci) · 2060 unmodified lines
2061	ci->gadget.name = ci->platdata->name;	2061	ci->gadget.name = ci->platdata->name;
2062	ci->gadget.otg_caps = otg_caps;	2062	ci->gadget.otg_caps = otg_caps;
2063	ci->gadget.sg_supported = 1;	2063	ci->gadget.sg_supported = 1;
		2064	ci->gadget.irq = ci->irq;
2064		2065
2065	if (ci->platdata->flags & CI_HDRC_REQUIRES_ALIGNED_DMA)	2066	if (ci->platdata->flags & CI_HDRC_REQUIRES_ALIGNED_DMA)
2066	ci->gadget.quirk_avoids_skb_reserve = 1;	2067	ci->gadget.quirk_avoids_skb_reserve = 1;

drivers/usb/chipidea/usbmisc_imx.c+14−2

 	int val;
 	unsigned long flags;
+	/* Clear VDATSRCENB0 to disable VDP_SRC and IDM_SNK required by BC 1.2 spec */
+	spin_lock_irqsave(&usbmisc->lock, flags);
+	val = readl(usbmisc->base + MX7D_USB_OTG_PHY_CFG2);
+	val &= ~MX7D_USB_OTG_PHY_CFG2_CHRG_VDATSRCENB0;
+	writel(val, usbmisc->base + MX7D_USB_OTG_PHY_CFG2);
+	spin_unlock_irqrestore(&usbmisc->lock, flags);
+	/* TVDMSRC_DIS */
+	msleep(20);
 	/* VDM_SRC is connected to D- and IDP_SINK is connected to D+ */
 	spin_lock_irqsave(&usbmisc->lock, flags);
 	val = readl(usbmisc->base + MX7D_USB_OTG_PHY_CFG2);
 				usbmisc->base + MX7D_USB_OTG_PHY_CFG2);
 	spin_unlock_irqrestore(&usbmisc->lock, flags);
-	usleep_range(1000, 2000);
+	/* TVDMSRC_ON */
+	msleep(40);
 	/*
 	 * Per BC 1.2, check voltage of D+:
 				usbmisc->base + MX7D_USB_OTG_PHY_CFG2);
 	spin_unlock_irqrestore(&usbmisc->lock, flags);
-	usleep_range(1000, 2000);
+	/* TVDPSRC_ON */
+	msleep(40);
 	/* Check if D- is less than VDAT_REF to determine an SDP per BC 1.2 */
 	val = readl(usbmisc->base + MX7D_USB_OTG_PHY_STATUS);

drivers/usb/core/devio.c+8−3

@@ -1218,7 +1218,12 @@ static int do_proc_bulk(struct usb_dev_state *ps, · 1217 unmodified lines
1218	ret = usbfs_increase_memory_usage(len1 + sizeof(struct urb));	1218	ret = usbfs_increase_memory_usage(len1 + sizeof(struct urb));
1219	if (ret)	1219	if (ret)
1220	return ret;	1220	return ret;
1221	tbuf = kmalloc(len1, GFP_KERNEL);	1221
		1222	/*
		1223	* len1 can be almost arbitrarily large. Don't WARN if it's
		1224	* too big, just fail the request.
		1225	*/
		1226	tbuf = kmalloc(len1, GFP_KERNEL \| __GFP_NOWARN);
1222	if (!tbuf) {	1227	if (!tbuf) {
1223	ret = -ENOMEM;	1228	ret = -ENOMEM;
1224	goto done;	1229	goto done;
@@ -1696,7 +1701,7 @@ static int proc_do_submiturb(struct usb_dev_state ps, struct usbdevfs_urb uurb · 471 unmodified lines
1696	if (num_sgs) {	1701	if (num_sgs) {
1697	as->urb->sg = kmalloc_array(num_sgs,	1702	as->urb->sg = kmalloc_array(num_sgs,
1698	sizeof(struct scatterlist),	1703	sizeof(struct scatterlist),
1699	GFP_KERNEL);	1704	GFP_KERNEL \| __GFP_NOWARN);
1700	if (!as->urb->sg) {	1705	if (!as->urb->sg) {
1701	ret = -ENOMEM;	1706	ret = -ENOMEM;
1702	goto error;	1707	goto error;
@@ -1731,7 +1736,7 @@ static int proc_do_submiturb(struct usb_dev_state ps, struct usbdevfs_urb uurb · 28 unmodified lines
1731	(uurb_start - as->usbm->vm_start);	1736	(uurb_start - as->usbm->vm_start);
1732	} else {	1737	} else {
1733	as->urb->transfer_buffer = kmalloc(uurb->buffer_length,	1738	as->urb->transfer_buffer = kmalloc(uurb->buffer_length,
1734	GFP_KERNEL);	1739	GFP_KERNEL \| __GFP_NOWARN);
1735	if (!as->urb->transfer_buffer) {	1740	if (!as->urb->transfer_buffer) {
1736	ret = -ENOMEM;	1741	ret = -ENOMEM;
1737	goto error;	1742	goto error;

drivers/usb/core/hub.c+7−0

 #define USB_VENDOR_GENESYS_LOGIC		0x05e3
 #define USB_VENDOR_SMSC				0x0424
 #define USB_PRODUCT_USB5534B			0x5534
+#define USB_VENDOR_CYPRESS			0x04b4
+#define USB_PRODUCT_CY7C65632			0x6570
 #define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND	0x01
 #define HUB_QUIRK_DISABLE_AUTOSUSPEND		0x02
       .idProduct = USB_PRODUCT_USB5534B,
       .bInterfaceClass = USB_CLASS_HUB,
       .driver_info = HUB_QUIRK_DISABLE_AUTOSUSPEND},
+    { .match_flags = USB_DEVICE_ID_MATCH_VENDOR
+                   | USB_DEVICE_ID_MATCH_PRODUCT,
+      .idVendor = USB_VENDOR_CYPRESS,
+      .idProduct = USB_PRODUCT_CY7C65632,
+      .driver_info = HUB_QUIRK_DISABLE_AUTOSUSPEND},
     { .match_flags = USB_DEVICE_ID_MATCH_VENDOR
 			| USB_DEVICE_ID_MATCH_INT_CLASS,
       .idVendor = USB_VENDOR_GENESYS_LOGIC,

drivers/usb/dwc3/core.c+1−7

 	pm_runtime_get_sync(&pdev->dev);
-	dwc3_debugfs_exit(dwc);
 	dwc3_core_exit_mode(dwc);
+	dwc3_debugfs_exit(dwc);
 	dwc3_core_exit(dwc);
 	dwc3_ulpi_exit(dwc);
 	return 0;
 }
-static void dwc3_shutdown(struct platform_device *pdev)
-{
-	dwc3_remove(pdev);
-}
 #ifdef CONFIG_PM
 static int dwc3_core_init_for_resume(struct dwc3 *dwc)
 {
 static struct platform_driver dwc3_driver = {
 	.probe		= dwc3_probe,
 	.remove		= dwc3_remove,
-	.shutdown   = dwc3_shutdown,
 	.driver		= {
 		.name	= "dwc3",
 		.of_match_table	= of_match_ptr(of_dwc3_match),

drivers/usb/dwc3/debug.h+3−0

 #ifdef CONFIG_DEBUG_FS
+extern void dwc3_debugfs_create_endpoint_dir(struct dwc3_ep *dep);
 extern void dwc3_debugfs_init(struct dwc3 *d);
 extern void dwc3_debugfs_exit(struct dwc3 *d);
 #else
+static inline void dwc3_debugfs_create_endpoint_dir(struct dwc3_ep *dep)
+{  }
 static inline void dwc3_debugfs_init(struct dwc3 *d)
 {  }
 static inline void dwc3_debugfs_exit(struct dwc3 *d)

drivers/usb/dwc3/debugfs.c+2−19

 	}
 }
-static void dwc3_debugfs_create_endpoint_dir(struct dwc3_ep *dep,
+void dwc3_debugfs_create_endpoint_dir(struct dwc3_ep *dep)
-		struct dentry *parent)
 {
 	struct dentry		*dir;
-	dir = debugfs_create_dir(dep->name, parent);
+	dir = debugfs_create_dir(dep->name, dep->dwc->root);
 	dwc3_debugfs_create_endpoint_files(dep, dir);
 }
-static void dwc3_debugfs_create_endpoint_dirs(struct dwc3 *dwc,
-		struct dentry *parent)
-{
-	int			i;
-	for (i = 0; i < dwc->num_eps; i++) {
-		struct dwc3_ep	*dep = dwc->eps[i];
-		if (!dep)
-			continue;
-		dwc3_debugfs_create_endpoint_dir(dep, parent);
-	}
-}
 void dwc3_debugfs_init(struct dwc3 *dwc)
 {
 	struct dentry		*root;
 				&dwc3_testmode_fops);
 		debugfs_create_file("link_state", 0644, root, dwc,
 				    &dwc3_link_state_fops);
-		dwc3_debugfs_create_endpoint_dirs(dwc, root);
 	}
 }

drivers/usb/dwc3/dwc3-meson-g12a.c+10−3

 		return PTR_ERR(priv->usb_glue_regmap);
 	/* Create a regmap for each USB2 PHY control register set */
-	for (i = 0; i < priv->usb2_ports; i++) {
+	for (i = 0; i < priv->drvdata->num_phys; i++) {
 		struct regmap_config u2p_regmap_config = {
 			.reg_bits = 8,
 			.val_bits = 32,
 			.max_register = U2P_R1,
 		};
+		if (!strstr(priv->drvdata->phy_names[i], "usb2"))
+			continue;
 		u2p_regmap_config.name = devm_kasprintf(priv->dev, GFP_KERNEL,
 							"u2p-%d", i);
 		if (!u2p_regmap_config.name)
 	ret = priv->drvdata->usb_init(priv);
 	if (ret)
-		goto err_disable_clks;
+		goto err_disable_regulator;
 	/* Init PHYs */
 	for (i = 0 ; i < PHY_COUNT ; ++i) {
 		ret = phy_init(priv->phys[i]);
 		if (ret)
-			goto err_disable_clks;
+			goto err_disable_regulator;
 	}
 	/* Set PHY Power */
 	for (i = 0 ; i < PHY_COUNT ; ++i)
 		phy_exit(priv->phys[i]);
+err_disable_regulator:
+	if (priv->vbus)
+		regulator_disable(priv->vbus);
 err_disable_clks:
 	clk_bulk_disable_unprepare(priv->drvdata->num_clks,
 				   priv->drvdata->clks);

drivers/usb/dwc3/ep0.c+3−0

@@ -292,6 +292,9 @@ static struct dwc3_ep dwc3_wIndex_to_dep(struct dwc3 dwc, __le16 wIndex_le) · 291 unmodified lines
292	epnum \|= 1;	292	epnum \|= 1;
293		293
294	dep = dwc->eps[epnum];	294	dep = dwc->eps[epnum];
		295	if (dep == NULL)
		296	return NULL;
		297
295	if (dep->flags & DWC3_EP_ENABLED)	298	if (dep->flags & DWC3_EP_ENABLED)
296	return dep;	299	return dep;
297		300

drivers/usb/dwc3/gadget.c+19−12

 			req->start_sg = sg_next(s);
 		req->num_queued_sgs++;
+		req->num_pending_sgs--;
 		/*
 		 * The number of pending SG entries may not correspond to the
 		 * don't include unused SG entries.
 		 */
 		if (length == 0) {
-			req->num_pending_sgs -= req->request.num_mapped_sgs - req->num_queued_sgs;
+			req->num_pending_sgs = 0;
 			break;
 		}
 	}
 	/*
-	 * Synchronize any pending event handling before executing the controller
+	 * Synchronize and disable any further event handling while controller
-	 * halt routine.
+	 * is being enabled/disabled.
 	 */
-	if (!is_on) {
+	disable_irq(dwc->irq_gadget);
-		dwc3_gadget_disable_irq(dwc);
-		synchronize_irq(dwc->irq_gadget);
-	}
 	spin_lock_irqsave(&dwc->lock, flags);
 	ret = dwc3_gadget_run_stop(dwc, is_on, false);
 	spin_unlock_irqrestore(&dwc->lock, flags);
+	enable_irq(dwc->irq_gadget);
 	pm_runtime_put(dwc->dev);
 	return ret;
 	INIT_LIST_HEAD(&dep->started_list);
 	INIT_LIST_HEAD(&dep->cancelled_list);
+	dwc3_debugfs_create_endpoint_dir(dep);
 	return 0;
 }
 			list_del(&dep->endpoint.ep_list);
 		}
+		debugfs_remove_recursive(debugfs_lookup(dep->name, dwc->root));
 		kfree(dep);
 	}
 }
 	struct dwc3_trb *trb = &dep->trb_pool[dep->trb_dequeue];
 	struct scatterlist *sg = req->sg;
 	struct scatterlist *s;
-	unsigned int pending = req->num_pending_sgs;
+	unsigned int num_queued = req->num_queued_sgs;
 	unsigned int i;
 	int ret = 0;
-	for_each_sg(sg, s, pending, i) {
+	for_each_sg(sg, s, num_queued, i) {
 		trb = &dep->trb_pool[dep->trb_dequeue];
 		req->sg = sg_next(s);
-		req->num_pending_sgs--;
+		req->num_queued_sgs--;
 		ret = dwc3_gadget_ep_reclaim_completed_trb(dep, req,
 				trb, event, status, true);
 static bool dwc3_gadget_ep_request_completed(struct dwc3_request *req)
 {
-	return req->num_pending_sgs == 0;
+	return req->num_pending_sgs == 0 && req->num_queued_sgs == 0;
 }
 static int dwc3_gadget_ep_cleanup_completed_request(struct dwc3_ep *dep,
 {
 	int ret;
-	if (req->num_pending_sgs)
+	if (req->request.num_mapped_sgs)
 		ret = dwc3_gadget_ep_reclaim_trb_sg(dep, req, event,
 				status);
 	else
 	dwc3_gadget_free_endpoints(dwc);
 err4:
 	usb_put_gadget(dwc->gadget);
+	dwc->gadget = NULL;
 err3:
 	dma_free_coherent(dwc->sysdev, DWC3_BOUNCE_SIZE, dwc->bounce,
 			dwc->bounce_addr);
 void dwc3_gadget_exit(struct dwc3 *dwc)
 {
+	if (!dwc->gadget)
+		return;
 	usb_del_gadget(dwc->gadget);
 	dwc3_gadget_free_endpoints(dwc);
 	usb_put_gadget(dwc->gadget);

drivers/usb/gadget/config.c+8−0

@@ -164,6 +164,14 @@ int usb_assign_descriptors(struct usb_function *f, · 163 unmodified lines
164	{	164	{
165	struct usb_gadget *g = f->config->cdev->gadget;	165	struct usb_gadget *g = f->config->cdev->gadget;
166		166
		167	/* super-speed-plus descriptor falls back to super-speed one,
		168	* if such a descriptor was provided, thus avoiding a NULL
		169	* pointer dereference if a 5gbps capable gadget is used with
		170	* a 10gbps capable config (device port + cable + host port)
		171	*/
		172	if (!ssp)
		173	ssp = ss;
		174
167	if (fs) {	175	if (fs) {
168	f->fs_descriptors = usb_copy_descriptors(fs);	176	f->fs_descriptors = usb_copy_descriptors(fs);
169	if (!f->fs_descriptors)	177	if (!f->fs_descriptors)

drivers/usb/gadget/function/f_ecm.c+1−1

@@ -791,7 +791,7 @@ ecm_bind(struct usb_configuration c, struct usb_function f) · 790 unmodified lines
791	fs_ecm_notify_desc.bEndpointAddress;	791	fs_ecm_notify_desc.bEndpointAddress;
792		792
793	status = usb_assign_descriptors(f, ecm_fs_function, ecm_hs_function,	793	status = usb_assign_descriptors(f, ecm_fs_function, ecm_hs_function,
794	ecm_ss_function, NULL);	794	ecm_ss_function, ecm_ss_function);
795	if (status)	795	if (status)
796	goto fail;	796	goto fail;
797		797

drivers/usb/gadget/function/f_eem.c+3−3

@@ -302,7 +302,7 @@ static int eem_bind(struct usb_configuration c, struct usb_function f) · 301 unmodified lines
302	eem_ss_out_desc.bEndpointAddress = eem_fs_out_desc.bEndpointAddress;	302	eem_ss_out_desc.bEndpointAddress = eem_fs_out_desc.bEndpointAddress;
303		303
304	status = usb_assign_descriptors(f, eem_fs_function, eem_hs_function,	304	status = usb_assign_descriptors(f, eem_fs_function, eem_hs_function,
305	eem_ss_function, NULL);	305	eem_ss_function, eem_ss_function);
306	if (status)	306	if (status)
307	goto fail;	307	goto fail;
308		308
@@ -495,7 +495,7 @@ static int eem_unwrap(struct gether *port, · 186 unmodified lines
495	skb2 = skb_clone(skb, GFP_ATOMIC);	495	skb2 = skb_clone(skb, GFP_ATOMIC);
496	if (unlikely(!skb2)) {	496	if (unlikely(!skb2)) {
497	DBG(cdev, "unable to unframe EEM packet\n");	497	DBG(cdev, "unable to unframe EEM packet\n");
498	continue;	498	goto next;
499	}	499	}
500	skb_trim(skb2, len - ETH_FCS_LEN);	500	skb_trim(skb2, len - ETH_FCS_LEN);
501		501
@@ -505,7 +505,7 @@ static int eem_unwrap(struct gether *port, · 3 unmodified lines
505	GFP_ATOMIC);	505	GFP_ATOMIC);
506	if (unlikely(!skb3)) {	506	if (unlikely(!skb3)) {
507	dev_kfree_skb_any(skb2);	507	dev_kfree_skb_any(skb2);
508	continue;	508	goto next;
509	}	509	}
510	dev_kfree_skb_any(skb2);	510	dev_kfree_skb_any(skb2);
511	skb_queue_tail(list, skb3);	511	skb_queue_tail(list, skb3);

drivers/usb/gadget/function/f_fs.c+3−0

@@ -3567,6 +3567,9 @@ static void ffs_func_unbind(struct usb_configuration *c, · 3566 unmodified lines
3567	ffs->func = NULL;	3567	ffs->func = NULL;
3568	}	3568	}
3569		3569
		3570	/* Drain any pending AIO completions */
		3571	drain_workqueue(ffs->io_completion_wq);
		3572
3570	if (!--opts->refcnt)	3573	if (!--opts->refcnt)
3571	functionfs_unbind(ffs);	3574	functionfs_unbind(ffs);
3572		3575

drivers/usb/gadget/function/f_hid.c+2−1

@@ -802,7 +802,8 @@ static int hidg_bind(struct usb_configuration c, struct usb_function f) · 801 unmodified lines
802	hidg_fs_out_ep_desc.bEndpointAddress;	802	hidg_fs_out_ep_desc.bEndpointAddress;
803		803
804	status = usb_assign_descriptors(f, hidg_fs_descriptors,	804	status = usb_assign_descriptors(f, hidg_fs_descriptors,
805	hidg_hs_descriptors, hidg_ss_descriptors, NULL);	805	hidg_hs_descriptors, hidg_ss_descriptors,
		806	hidg_ss_descriptors);
806	if (status)	807	if (status)
807	goto fail;	808	goto fail;
808		809

drivers/usb/gadget/function/f_loopback.c+1−1

@@ -207,7 +207,7 @@ autoconf_fail: · 206 unmodified lines
207	ss_loop_sink_desc.bEndpointAddress = fs_loop_sink_desc.bEndpointAddress;	207	ss_loop_sink_desc.bEndpointAddress = fs_loop_sink_desc.bEndpointAddress;
208		208
209	ret = usb_assign_descriptors(f, fs_loopback_descs, hs_loopback_descs,	209	ret = usb_assign_descriptors(f, fs_loopback_descs, hs_loopback_descs,
210	ss_loopback_descs, NULL);	210	ss_loopback_descs, ss_loopback_descs);
211	if (ret)	211	if (ret)
212	return ret;	212	return ret;
213		213

drivers/usb/gadget/function/f_ncm.c+5−5

 		data[0] = cpu_to_le32(ncm_bitrate(cdev->gadget));
 		data[1] = data[0];
-		DBG(cdev, "notify speed %d\n", ncm_bitrate(cdev->gadget));
+		DBG(cdev, "notify speed %u\n", ncm_bitrate(cdev->gadget));
 		ncm->notify_state = NCM_NOTIFY_CONNECT;
 		break;
 	}
 			ncm->ndp_dgram_count = 1;
 			/* Note: we skip opts->next_ndp_index */
-		}
-		/* Delay the timer. */
+			/* Start the timer. */
-		hrtimer_start(&ncm->task_timer, TX_TIMEOUT_NSECS,
+			hrtimer_start(&ncm->task_timer, TX_TIMEOUT_NSECS,
-			      HRTIMER_MODE_REL_SOFT);
+				      HRTIMER_MODE_REL_SOFT);
+		}
 		/* Add the datagram position entries */
 		ntb_ndp = skb_put_zero(ncm->skb_tx_ndp, dgram_idx_len);

drivers/usb/gadget/function/f_printer.c+2−1

@@ -1101,7 +1101,8 @@ autoconf_fail: · 1100 unmodified lines
1101	ss_ep_out_desc.bEndpointAddress = fs_ep_out_desc.bEndpointAddress;	1101	ss_ep_out_desc.bEndpointAddress = fs_ep_out_desc.bEndpointAddress;
1102		1102
1103	ret = usb_assign_descriptors(f, fs_printer_function,	1103	ret = usb_assign_descriptors(f, fs_printer_function,
1104	hs_printer_function, ss_printer_function, NULL);	1104	hs_printer_function, ss_printer_function,
		1105	ss_printer_function);
1105	if (ret)	1106	if (ret)
1106	return ret;	1107	return ret;
1107		1108

drivers/usb/gadget/function/f_rndis.c+1−1

@@ -789,7 +789,7 @@ rndis_bind(struct usb_configuration c, struct usb_function f) · 788 unmodified lines
789	ss_notify_desc.bEndpointAddress = fs_notify_desc.bEndpointAddress;	789	ss_notify_desc.bEndpointAddress = fs_notify_desc.bEndpointAddress;
790		790
791	status = usb_assign_descriptors(f, eth_fs_function, eth_hs_function,	791	status = usb_assign_descriptors(f, eth_fs_function, eth_hs_function,
792	eth_ss_function, NULL);	792	eth_ss_function, eth_ss_function);
793	if (status)	793	if (status)
794	goto fail;	794	goto fail;
795		795

drivers/usb/gadget/function/f_serial.c+1−1

@@ -233,7 +233,7 @@ static int gser_bind(struct usb_configuration c, struct usb_function f) · 232 unmodified lines
233	gser_ss_out_desc.bEndpointAddress = gser_fs_out_desc.bEndpointAddress;	233	gser_ss_out_desc.bEndpointAddress = gser_fs_out_desc.bEndpointAddress;
234		234
235	status = usb_assign_descriptors(f, gser_fs_function, gser_hs_function,	235	status = usb_assign_descriptors(f, gser_fs_function, gser_hs_function,
236	gser_ss_function, NULL);	236	gser_ss_function, gser_ss_function);
237	if (status)	237	if (status)
238	goto fail;	238	goto fail;
239	dev_dbg(&cdev->gadget->dev, "generic ttyGS%d: %s speed IN/%s OUT/%s\n",	239	dev_dbg(&cdev->gadget->dev, "generic ttyGS%d: %s speed IN/%s OUT/%s\n",

drivers/usb/gadget/function/f_sourcesink.c+2−1

@@ -431,7 +431,8 @@ no_iso: · 430 unmodified lines
431	ss_iso_sink_desc.bEndpointAddress = fs_iso_sink_desc.bEndpointAddress;	431	ss_iso_sink_desc.bEndpointAddress = fs_iso_sink_desc.bEndpointAddress;
432		432
433	ret = usb_assign_descriptors(f, fs_source_sink_descs,	433	ret = usb_assign_descriptors(f, fs_source_sink_descs,
434	hs_source_sink_descs, ss_source_sink_descs, NULL);	434	hs_source_sink_descs, ss_source_sink_descs,
		435	ss_source_sink_descs);
435	if (ret)	436	if (ret)
436	return ret;	437	return ret;
437		438

drivers/usb/gadget/function/f_subset.c+1−1

@@ -358,7 +358,7 @@ geth_bind(struct usb_configuration c, struct usb_function f) · 357 unmodified lines
358	fs_subset_out_desc.bEndpointAddress;	358	fs_subset_out_desc.bEndpointAddress;
359		359
360	status = usb_assign_descriptors(f, fs_eth_function, hs_eth_function,	360	status = usb_assign_descriptors(f, fs_eth_function, hs_eth_function,
361	ss_eth_function, NULL);	361	ss_eth_function, ss_eth_function);
362	if (status)	362	if (status)
363	goto fail;	363	goto fail;
364		364

drivers/usb/gadget/function/f_tcm.c+2−1

@@ -2057,7 +2057,8 @@ static int tcm_bind(struct usb_configuration c, struct usb_function f) · 2056 unmodified lines
2057	uasp_fs_cmd_desc.bEndpointAddress = uasp_ss_cmd_desc.bEndpointAddress;	2057	uasp_fs_cmd_desc.bEndpointAddress = uasp_ss_cmd_desc.bEndpointAddress;
2058		2058
2059	ret = usb_assign_descriptors(f, uasp_fs_function_desc,	2059	ret = usb_assign_descriptors(f, uasp_fs_function_desc,
2060	uasp_hs_function_desc, uasp_ss_function_desc, NULL);	2060	uasp_hs_function_desc, uasp_ss_function_desc,
		2061	uasp_ss_function_desc);
2061	if (ret)	2062	if (ret)
2062	goto ep_fail;	2063	goto ep_fail;
2063		2064

drivers/usb/gadget/udc/renesas_usb3.c+3−2

 			     struct renesas_usb3_request *usb3_req)
 {
 	struct renesas_usb3 *usb3 = usb3_ep_to_usb3(usb3_ep);
-	struct renesas_usb3_request *usb3_req_first = usb3_get_request(usb3_ep);
+	struct renesas_usb3_request *usb3_req_first;
 	unsigned long flags;
 	int ret = -EAGAIN;
 	u32 enable_bits = 0;
 	spin_lock_irqsave(&usb3->lock, flags);
 	if (usb3_ep->halt || usb3_ep->started)
 		goto out;
-	if (usb3_req != usb3_req_first)
+	usb3_req_first = __usb3_get_request(usb3_ep);
+	if (!usb3_req_first || usb3_req != usb3_req_first)
 		goto out;
 	if (usb3_pn_change(usb3, usb3_ep->num) < 0)

drivers/usb/host/xhci-pci.c+6−1

 #define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI		0x1138
 #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI		0x461e
+#define PCI_DEVICE_ID_AMD_RENOIR_XHCI			0x1639
 #define PCI_DEVICE_ID_AMD_PROMONTORYA_4			0x43b9
 #define PCI_DEVICE_ID_AMD_PROMONTORYA_3			0x43ba
 #define PCI_DEVICE_ID_AMD_PROMONTORYA_2			0x43bb
 		(pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_1)))
 		xhci->quirks |= XHCI_U2_DISABLE_WAKE;
+	if (pdev->vendor == PCI_VENDOR_ID_AMD &&
+		pdev->device == PCI_DEVICE_ID_AMD_RENOIR_XHCI)
+		xhci->quirks |= XHCI_BROKEN_D3COLD;
 	if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
 		xhci->quirks |= XHCI_LPM_SUPPORT;
 		xhci->quirks |= XHCI_INTEL_HOST;
 	 * Systems with the TI redriver that loses port status change events
 	 * need to have the registers polled during D3, so avoid D3cold.
 	 */
-	if (xhci->quirks & XHCI_COMP_MODE_QUIRK)
+	if (xhci->quirks & (XHCI_COMP_MODE_QUIRK | XHCI_BROKEN_D3COLD))
 		pci_d3cold_disable(pdev);
 	if (xhci->quirks & XHCI_PME_STUCK_QUIRK)

drivers/usb/host/xhci-ring.c+7−7

 	list_for_each_entry_safe(td, tmp_td, &ep->cancelled_td_list,
 				 cancelled_td_list) {
-		/*
-		 * Doesn't matter what we pass for status, since the core will
-		 * just overwrite it (because the URB has been unlinked).
-		 */
 		ring = xhci_urb_to_transfer_ring(ep->xhci, td->urb);
 		if (td->cancel_status == TD_CLEARED)
-			xhci_td_cleanup(ep->xhci, td, ring, 0);
+			xhci_td_cleanup(ep->xhci, td, ring, td->status);
 		if (ep->xhci->xhc_state & XHCI_STATE_DYING)
 			return;
 			continue;
 		}
 		/*
-		 * If ring stopped on the TD we need to cancel, then we have to
+		 * If a ring stopped on the TD we need to cancel then we have to
 		 * move the xHC endpoint ring dequeue pointer past this TD.
+		 * Rings halted due to STALL may show hw_deq is past the stalled
+		 * TD, but still require a set TR Deq command to flush xHC cache.
 		 */
 		hw_deq = xhci_get_hw_deq(xhci, ep->vdev, ep->ep_index,
 					 td->urb->stream_id);
 		hw_deq &= ~0xf;
-		if (trb_in_td(xhci, td->start_seg, td->first_trb,
+		if (td->cancel_status == TD_HALTED) {
+			cached_td = td;
+		} else if (trb_in_td(xhci, td->start_seg, td->first_trb,
 			      td->last_trb, hw_deq, false)) {
 			switch (td->cancel_status) {
 			case TD_CLEARED: /* TD is already no-op */

drivers/usb/host/xhci.h+1−0

@@ -1892,6 +1892,7 @@ struct xhci_hcd { · 1891 unmodified lines
1892	#define XHCI_DISABLE_SPARSE BIT_ULL(38)	1892	#define XHCI_DISABLE_SPARSE BIT_ULL(38)
1893	#define XHCI_SG_TRB_CACHE_SIZE_QUIRK BIT_ULL(39)	1893	#define XHCI_SG_TRB_CACHE_SIZE_QUIRK BIT_ULL(39)
1894	#define XHCI_NO_SOFT_RETRY BIT_ULL(40)	1894	#define XHCI_NO_SOFT_RETRY BIT_ULL(40)
		1895	#define XHCI_BROKEN_D3COLD BIT_ULL(41)
1895		1896
1896	unsigned int num_active_eps;	1897	unsigned int num_active_eps;
1897	unsigned int limit_active_eps;	1898	unsigned int limit_active_eps;

drivers/usb/misc/brcmstb-usb-pinmap.c+2−0

@@ -263,6 +263,8 @@ static int __init brcmstb_usb_pinmap_probe(struct platform_device *pdev) · 262 unmodified lines
263	return -EINVAL;	263	return -EINVAL;
264		264
265	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);	265	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		266	if (!r)
		267	return -EINVAL;
266		268
267	pdata = devm_kzalloc(&pdev->dev,	269	pdata = devm_kzalloc(&pdev->dev,
268	sizeof(*pdata) +	270	sizeof(*pdata) +

drivers/usb/misc/trancevibrator.c+2−2

@@ -61,9 +61,9 @@ static ssize_t speed_store(struct device dev, struct device_attribute attr, · 60 unmodified lines
61	/* Set speed */	61	/* Set speed */
62	retval = usb_control_msg(tv->udev, usb_sndctrlpipe(tv->udev, 0),	62	retval = usb_control_msg(tv->udev, usb_sndctrlpipe(tv->udev, 0),
63	0x01, /* vendor request: set speed */	63	0x01, /* vendor request: set speed */
64	USB_DIR_IN \| USB_TYPE_VENDOR \| USB_RECIP_OTHER,	64	USB_DIR_OUT \| USB_TYPE_VENDOR \| USB_RECIP_OTHER,
65	tv->speed, /* speed value */	65	tv->speed, /* speed value */
66	0, NULL, 0, USB_CTRL_GET_TIMEOUT);	66	0, NULL, 0, USB_CTRL_SET_TIMEOUT);
67	if (retval) {	67	if (retval) {
68	tv->speed = old;	68	tv->speed = old;
69	dev_dbg(&tv->udev->dev, "retval = %d\n", retval);	69	dev_dbg(&tv->udev->dev, "retval = %d\n", retval);

drivers/usb/misc/uss720.c+1−0

@@ -736,6 +736,7 @@ static int uss720_probe(struct usb_interface *intf, · 735 unmodified lines
736	parport_announce_port(pp);	736	parport_announce_port(pp);
737		737
738	usb_set_intfdata(intf, pp);	738	usb_set_intfdata(intf, pp);
		739	usb_put_dev(usbdev);
739	return 0;	740	return 0;
740		741
741	probe_abort:	742	probe_abort:

drivers/usb/musb/musb_core.c+1−2

 			schedule_delayed_work(&musb->irq_work,
 					      msecs_to_jiffies(1000));
 			musb->quirk_retries--;
-			break;
 		}
-		fallthrough;
+		break;
 	case MUSB_QUIRK_B_INVALID_VBUS_91:
 		if (musb->quirk_retries && !musb->flush_irq_work) {
 			musb_dbg(musb,

drivers/usb/serial/cp210x.c+78−6

@@ -252,9 +252,11 @@ struct cp210x_serial_private { · 251 unmodified lines
252	u8 gpio_input;	252	u8 gpio_input;
253	#endif	253	#endif
254	u8 partnum;	254	u8 partnum;
		255	u32 fw_version;
255	speed_t min_speed;	256	speed_t min_speed;
256	speed_t max_speed;	257	speed_t max_speed;
257	bool use_actual_rate;	258	bool use_actual_rate;
		259	bool no_flow_control;
258	};	260	};
259		261
260	enum cp210x_event_state {	262	enum cp210x_event_state {
@@ -398,6 +400,7 @@ struct cp210x_special_chars { · 137 unmodified lines
398		400
399	/* CP210X_VENDOR_SPECIFIC values */	401	/* CP210X_VENDOR_SPECIFIC values */
400	#define CP210X_READ_2NCONFIG 0x000E	402	#define CP210X_READ_2NCONFIG 0x000E
		403	#define CP210X_GET_FW_VER_2N 0x0010
401	#define CP210X_READ_LATCH 0x00C2	404	#define CP210X_READ_LATCH 0x00C2
402	#define CP210X_GET_PARTNUM 0x370B	405	#define CP210X_GET_PARTNUM 0x370B
403	#define CP210X_GET_PORTCONFIG 0x370C	406	#define CP210X_GET_PORTCONFIG 0x370C
@@ -537,6 +540,12 @@ struct cp210x_single_port_config { · 133 unmodified lines
537	#define CP210X_2NCONFIG_GPIO_RSTLATCH_IDX 587	540	#define CP210X_2NCONFIG_GPIO_RSTLATCH_IDX 587
538	#define CP210X_2NCONFIG_GPIO_CONTROL_IDX 600	541	#define CP210X_2NCONFIG_GPIO_CONTROL_IDX 600
539		542
		543	/* CP2102N QFN20 port configuration values */
		544	#define CP2102N_QFN20_GPIO2_TXLED_MODE BIT(2)
		545	#define CP2102N_QFN20_GPIO3_RXLED_MODE BIT(3)
		546	#define CP2102N_QFN20_GPIO1_RS485_MODE BIT(4)
		547	#define CP2102N_QFN20_GPIO0_CLK_MODE BIT(6)
		548
540	/* CP210X_VENDOR_SPECIFIC, CP210X_WRITE_LATCH call writes these 0x2 bytes. */	549	/* CP210X_VENDOR_SPECIFIC, CP210X_WRITE_LATCH call writes these 0x2 bytes. */
541	struct cp210x_gpio_write {	550	struct cp210x_gpio_write {
542	u8 mask;	551	u8 mask;
@@ -1122,6 +1131,7 @@ static bool cp210x_termios_change(const struct ktermios *a, const struct ktermio · 579 unmodified lines
1122	static void cp210x_set_flow_control(struct tty_struct *tty,	1131	static void cp210x_set_flow_control(struct tty_struct *tty,
1123	struct usb_serial_port port, struct ktermios old_termios)	1132	struct usb_serial_port port, struct ktermios old_termios)
1124	{	1133	{
		1134	struct cp210x_serial_private *priv = usb_get_serial_data(port->serial);
1125	struct cp210x_port_private *port_priv = usb_get_serial_port_data(port);	1135	struct cp210x_port_private *port_priv = usb_get_serial_port_data(port);
1126	struct cp210x_special_chars chars;	1136	struct cp210x_special_chars chars;
1127	struct cp210x_flow_ctl flow_ctl;	1137	struct cp210x_flow_ctl flow_ctl;
@@ -1129,6 +1139,15 @@ static void cp210x_set_flow_control(struct tty_struct *tty, · 1 unmodified line
1129	u32 ctl_hs;	1139	u32 ctl_hs;
1130	int ret;	1140	int ret;
1131		1141
		1142	/*
		1143	* Some CP2102N interpret ulXonLimit as ulFlowReplace (erratum
		1144	* CP2102N_E104). Report back that flow control is not supported.
		1145	*/
		1146	if (priv->no_flow_control) {
		1147	tty->termios.c_cflag &= ~CRTSCTS;
		1148	tty->termios.c_iflag &= ~(IXON \| IXOFF);
		1149	}
		1150
1132	if (old_termios &&	1151	if (old_termios &&
1133	C_CRTSCTS(tty) == (old_termios->c_cflag & CRTSCTS) &&	1152	C_CRTSCTS(tty) == (old_termios->c_cflag & CRTSCTS) &&
1134	I_IXON(tty) == (old_termios->c_iflag & IXON) &&	1153	I_IXON(tty) == (old_termios->c_iflag & IXON) &&
@@ -1185,19 +1204,20 @@ static void cp210x_set_flow_control(struct tty_struct *tty, · 50 unmodified lines
1185	port_priv->crtscts = false;	1204	port_priv->crtscts = false;
1186	}	1205	}
1187		1206
1188	if (I_IXOFF(tty))	1207	if (I_IXOFF(tty)) {
1189	flow_repl \|= CP210X_SERIAL_AUTO_RECEIVE;	1208	flow_repl \|= CP210X_SERIAL_AUTO_RECEIVE;
1190	else	1209
		1210	flow_ctl.ulXonLimit = cpu_to_le32(128);
		1211	flow_ctl.ulXoffLimit = cpu_to_le32(128);
		1212	} else {
1191	flow_repl &= ~CP210X_SERIAL_AUTO_RECEIVE;	1213	flow_repl &= ~CP210X_SERIAL_AUTO_RECEIVE;
		1214	}
1192		1215
1193	if (I_IXON(tty))	1216	if (I_IXON(tty))
1194	flow_repl \|= CP210X_SERIAL_AUTO_TRANSMIT;	1217	flow_repl \|= CP210X_SERIAL_AUTO_TRANSMIT;
1195	else	1218	else
1196	flow_repl &= ~CP210X_SERIAL_AUTO_TRANSMIT;	1219	flow_repl &= ~CP210X_SERIAL_AUTO_TRANSMIT;
1197		1220
1198	flow_ctl.ulXonLimit = cpu_to_le32(128);
1199	flow_ctl.ulXoffLimit = cpu_to_le32(128);
1200
1201	dev_dbg(&port->dev, "%s - ctrl = 0x%02x, flow = 0x%02x\n", __func__,	1221	dev_dbg(&port->dev, "%s - ctrl = 0x%02x, flow = 0x%02x\n", __func__,
1202	ctl_hs, flow_repl);	1222	ctl_hs, flow_repl);
1203		1223
@@ -1733,7 +1753,19 @@ static int cp2102n_gpioconf_init(struct usb_serial *serial) · 529 unmodified lines
1733	priv->gpio_pushpull = (gpio_pushpull >> 3) & 0x0f;	1753	priv->gpio_pushpull = (gpio_pushpull >> 3) & 0x0f;
1734		1754
1735	/* 0 indicates GPIO mode, 1 is alternate function */	1755	/* 0 indicates GPIO mode, 1 is alternate function */
1736	priv->gpio_altfunc = (gpio_ctrl >> 2) & 0x0f;	1756	if (priv->partnum == CP210X_PARTNUM_CP2102N_QFN20) {
		1757	/* QFN20 is special... */
		1758	if (gpio_ctrl & CP2102N_QFN20_GPIO0_CLK_MODE) /* GPIO 0 */
		1759	priv->gpio_altfunc \|= BIT(0);
		1760	if (gpio_ctrl & CP2102N_QFN20_GPIO1_RS485_MODE) /* GPIO 1 */
		1761	priv->gpio_altfunc \|= BIT(1);
		1762	if (gpio_ctrl & CP2102N_QFN20_GPIO2_TXLED_MODE) /* GPIO 2 */
		1763	priv->gpio_altfunc \|= BIT(2);
		1764	if (gpio_ctrl & CP2102N_QFN20_GPIO3_RXLED_MODE) /* GPIO 3 */
		1765	priv->gpio_altfunc \|= BIT(3);
		1766	} else {
		1767	priv->gpio_altfunc = (gpio_ctrl >> 2) & 0x0f;
		1768	}
1737		1769
1738	if (priv->partnum == CP210X_PARTNUM_CP2102N_QFN28) {	1770	if (priv->partnum == CP210X_PARTNUM_CP2102N_QFN28) {
1739	/*	1771	/*
@@ -1908,6 +1940,45 @@ static void cp210x_init_max_speed(struct usb_serial *serial) · 168 unmodified lines
1908	priv->use_actual_rate = use_actual_rate;	1940	priv->use_actual_rate = use_actual_rate;
1909	}	1941	}
1910		1942
		1943	static int cp210x_get_fw_version(struct usb_serial *serial, u16 value)
		1944	{
		1945	struct cp210x_serial_private *priv = usb_get_serial_data(serial);
		1946	u8 ver[3];
		1947	int ret;
		1948
		1949	ret = cp210x_read_vendor_block(serial, REQTYPE_DEVICE_TO_HOST, value,
		1950	ver, sizeof(ver));
		1951	if (ret)
		1952	return ret;
		1953
		1954	dev_dbg(&serial->interface->dev, "%s - %d.%d.%d\n", __func__,
		1955	ver[0], ver[1], ver[2]);
		1956
		1957	priv->fw_version = ver[0] << 16 \| ver[1] << 8 \| ver[2];
		1958
		1959	return 0;
		1960	}
		1961
		1962	static void cp210x_determine_quirks(struct usb_serial *serial)
		1963	{
		1964	struct cp210x_serial_private *priv = usb_get_serial_data(serial);
		1965	int ret;
		1966
		1967	switch (priv->partnum) {
		1968	case CP210X_PARTNUM_CP2102N_QFN28:
		1969	case CP210X_PARTNUM_CP2102N_QFN24:
		1970	case CP210X_PARTNUM_CP2102N_QFN20:
		1971	ret = cp210x_get_fw_version(serial, CP210X_GET_FW_VER_2N);
		1972	if (ret)
		1973	break;
		1974	if (priv->fw_version <= 0x10004)
		1975	priv->no_flow_control = true;
		1976	break;
		1977	default:
		1978	break;
		1979	}
		1980	}
		1981
1911	static int cp210x_attach(struct usb_serial *serial)	1982	static int cp210x_attach(struct usb_serial *serial)
1912	{	1983	{
1913	int result;	1984	int result;
@@ -1928,6 +1999,7 @@ static int cp210x_attach(struct usb_serial *serial) · 14 unmodified lines
1928		1999
1929	usb_set_serial_data(serial, priv);	2000	usb_set_serial_data(serial, priv);
1930		2001
		2002	cp210x_determine_quirks(serial);
1931	cp210x_init_max_speed(serial);	2003	cp210x_init_max_speed(serial);
1932		2004
1933	result = cp210x_gpio_init(serial);	2005	result = cp210x_gpio_init(serial);

drivers/usb/serial/ftdi_sio.c+4−0

 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
 	{ USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLX_PLUS_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_NT_ORION_IO_PID) },
+	{ USB_DEVICE(FTDI_VID, FTDI_NT_ORIONMX_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2_PID) },
 	/* Sienna devices */
 	{ USB_DEVICE(FTDI_VID, FTDI_SIENNA_PID) },
 	{ USB_DEVICE(ECHELON_VID, ECHELON_U20_PID) },
+	/* IDS GmbH devices */
+	{ USB_DEVICE(IDS_VID, IDS_SI31A_PID) },
+	{ USB_DEVICE(IDS_VID, IDS_CM31A_PID) },
 	/* U-Blox devices */
 	{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) },
 	{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) },

drivers/usb/serial/ftdi_sio_ids.h+8−0

 #define FTDI_NT_ORIONLXM_PID		0x7c90	/* OrionLXm Substation Automation Platform */
 #define FTDI_NT_ORIONLX_PLUS_PID	0x7c91	/* OrionLX+ Substation Automation Platform */
 #define FTDI_NT_ORION_IO_PID		0x7c92	/* Orion I/O */
+#define FTDI_NT_ORIONMX_PID		0x7c93	/* OrionMX */
 /*
  * Synapse Wireless product ids (FTDI_VID)
 #define UNJO_VID			0x22B7
 #define UNJO_ISODEBUG_V1_PID		0x150D
+/*
+ * IDS GmbH
+ */
+#define IDS_VID				0x2CAF
+#define IDS_SI31A_PID			0x13A2
+#define IDS_CM31A_PID			0x13A3
 /*
  * U-Blox products (http://www.u-blox.com).
  */

drivers/usb/serial/omninet.c+5−3

 // SPDX-License-Identifier: GPL-2.0
 /*
- * USB ZyXEL omni.net LCD PLUS driver
+ * USB ZyXEL omni.net driver
  *
  * Copyright (C) 2013,2017 Johan Hovold <johan@kernel.org>
  *
 #include <linux/usb/serial.h>
 #define DRIVER_AUTHOR "Alessandro Zummo"
-#define DRIVER_DESC "USB ZyXEL omni.net LCD PLUS Driver"
+#define DRIVER_DESC "USB ZyXEL omni.net Driver"
 #define ZYXEL_VENDOR_ID		0x0586
 #define ZYXEL_OMNINET_ID	0x1000
+#define ZYXEL_OMNI_56K_PLUS_ID	0x1500
 /* This one seems to be a re-branded ZyXEL device */
 #define BT_IGNITIONPRO_ID	0x2000
 static const struct usb_device_id id_table[] = {
 	{ USB_DEVICE(ZYXEL_VENDOR_ID, ZYXEL_OMNINET_ID) },
+	{ USB_DEVICE(ZYXEL_VENDOR_ID, ZYXEL_OMNI_56K_PLUS_ID) },
 	{ USB_DEVICE(ZYXEL_VENDOR_ID, BT_IGNITIONPRO_ID) },
 	{ }						/* Terminating entry */
 };
 		.owner =	THIS_MODULE,
 		.name =		"omninet",
 	},
-	.description =		"ZyXEL - omni.net lcd plus usb",
+	.description =		"ZyXEL - omni.net usb",
 	.id_table =		id_table,
 	.num_bulk_out =		2,
 	.calc_num_ports =	omninet_calc_num_ports,

drivers/usb/serial/option.c+4−0

 	  .driver_info = NCTRL(0) | RSVD(1) },
 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1901, 0xff),	/* Telit LN940 (MBIM) */
 	  .driver_info = NCTRL(0) },
+	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x7010, 0xff),	/* Telit LE910-S1 (RNDIS) */
+	  .driver_info = NCTRL(2) },
+	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x7011, 0xff),	/* Telit LE910-S1 (ECM) */
+	  .driver_info = NCTRL(2) },
 	{ USB_DEVICE(TELIT_VENDOR_ID, 0x9010),				/* Telit SBL FN980 flashing device */
 	  .driver_info = NCTRL(0) | ZLP },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */

drivers/usb/serial/pl2303.c+1−0

@@ -113,6 +113,7 @@ static const struct usb_device_id id_table[] = { · 112 unmodified lines
113	{ USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) },	113	{ USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) },
114	{ USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) },	114	{ USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) },
115	{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) },	115	{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) },
		116	{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530GC_PRODUCT_ID) },
116	{ USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) },	117	{ USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) },
117	{ USB_DEVICE(AT_VENDOR_ID, AT_VTKIT3_PRODUCT_ID) },	118	{ USB_DEVICE(AT_VENDOR_ID, AT_VTKIT3_PRODUCT_ID) },
118	{ } /* Terminating entry */	119	{ } /* Terminating entry */

drivers/usb/serial/pl2303.h+1−0

@@ -158,6 +158,7 @@ · 157 unmodified lines
158	/* ADLINK ND-6530 RS232,RS485 and RS422 adapter */	158	/* ADLINK ND-6530 RS232,RS485 and RS422 adapter */
159	#define ADLINK_VENDOR_ID 0x0b63	159	#define ADLINK_VENDOR_ID 0x0b63
160	#define ADLINK_ND6530_PRODUCT_ID 0x6530	160	#define ADLINK_ND6530_PRODUCT_ID 0x6530
		161	#define ADLINK_ND6530GC_PRODUCT_ID 0x653a
161		162
162	/* SMART USB Serial Adapter */	163	/* SMART USB Serial Adapter */
163	#define SMART_VENDOR_ID 0x0b8c	164	#define SMART_VENDOR_ID 0x0b8c

drivers/usb/serial/quatech2.c+3−3

@@ -416,7 +416,7 @@ static void qt2_close(struct usb_serial_port *port) · 415 unmodified lines
416		416
417	/* flush the port transmit buffer */	417	/* flush the port transmit buffer */
418	i = usb_control_msg(serial->dev,	418	i = usb_control_msg(serial->dev,
419	usb_rcvctrlpipe(serial->dev, 0),	419	usb_sndctrlpipe(serial->dev, 0),
420	QT2_FLUSH_DEVICE, 0x40, 1,	420	QT2_FLUSH_DEVICE, 0x40, 1,
421	port_priv->device_port, NULL, 0, QT2_USB_TIMEOUT);	421	port_priv->device_port, NULL, 0, QT2_USB_TIMEOUT);
422		422
@@ -426,7 +426,7 @@ static void qt2_close(struct usb_serial_port *port) · 3 unmodified lines
426		426
427	/* flush the port receive buffer */	427	/* flush the port receive buffer */
428	i = usb_control_msg(serial->dev,	428	i = usb_control_msg(serial->dev,
429	usb_rcvctrlpipe(serial->dev, 0),	429	usb_sndctrlpipe(serial->dev, 0),
430	QT2_FLUSH_DEVICE, 0x40, 0,	430	QT2_FLUSH_DEVICE, 0x40, 0,
431	port_priv->device_port, NULL, 0, QT2_USB_TIMEOUT);	431	port_priv->device_port, NULL, 0, QT2_USB_TIMEOUT);
432		432
@@ -639,7 +639,7 @@ static int qt2_attach(struct usb_serial *serial) · 206 unmodified lines
639	int status;	639	int status;
640		640
641	/* power on unit */	641	/* power on unit */
642	status = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),	642	status = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
643	0xc2, 0x40, 0x8000, 0, NULL, 0,	643	0xc2, 0x40, 0x8000, 0, NULL, 0,
644	QT2_USB_TIMEOUT);	644	QT2_USB_TIMEOUT);
645	if (status < 0) {	645	if (status < 0) {

drivers/usb/serial/ti_usb_3410_5052.c+3−0

 /* Vendor and product ids */
 #define TI_VENDOR_ID			0x0451
 #define IBM_VENDOR_ID			0x04b3
+#define STARTECH_VENDOR_ID		0x14b0
 #define TI_3410_PRODUCT_ID		0x3410
 #define IBM_4543_PRODUCT_ID		0x4543
 #define IBM_454B_PRODUCT_ID		0x454b
 	{ USB_DEVICE(MXU1_VENDOR_ID, MXU1_1131_PRODUCT_ID) },
 	{ USB_DEVICE(MXU1_VENDOR_ID, MXU1_1150_PRODUCT_ID) },
 	{ USB_DEVICE(MXU1_VENDOR_ID, MXU1_1151_PRODUCT_ID) },
+	{ USB_DEVICE(STARTECH_VENDOR_ID, TI_3410_PRODUCT_ID) },
 	{ }	/* terminator */
 };
 	{ USB_DEVICE(MXU1_VENDOR_ID, MXU1_1131_PRODUCT_ID) },
 	{ USB_DEVICE(MXU1_VENDOR_ID, MXU1_1150_PRODUCT_ID) },
 	{ USB_DEVICE(MXU1_VENDOR_ID, MXU1_1151_PRODUCT_ID) },
+	{ USB_DEVICE(STARTECH_VENDOR_ID, TI_3410_PRODUCT_ID) },
 	{ }	/* terminator */
 };

drivers/usb/typec/mux.c+5−4

 	bool match;
 	int nval;
 	u16 *val;
+	int ret;
 	int i;
 	/*
 	if (!val)
 		return ERR_PTR(-ENOMEM);
-	nval = fwnode_property_read_u16_array(fwnode, "svid", val, nval);
+	ret = fwnode_property_read_u16_array(fwnode, "svid", val, nval);
-	if (nval < 0) {
+	if (ret < 0) {
 		kfree(val);
-		return ERR_PTR(nval);
+		return ERR_PTR(ret);
 	}
 	for (i = 0; i < nval; i++) {
 	dev = class_find_device(&typec_mux_class, NULL, fwnode,
 				mux_fwnode_match);
-	return dev ? to_typec_switch(dev) : ERR_PTR(-EPROBE_DEFER);
+	return dev ? to_typec_mux(dev) : ERR_PTR(-EPROBE_DEFER);
 }
 /**

drivers/usb/typec/mux/intel_pmc_mux.c+11−4

 	acpi_dev_free_resource_list(&resource_list);
 	if (!pmc->iom_base) {
-		put_device(&adev->dev);
+		acpi_dev_put(adev);
 		return -ENOMEM;
 	}
+	if (IS_ERR(pmc->iom_base)) {
+		acpi_dev_put(adev);
+		return PTR_ERR(pmc->iom_base);
+	}
 	pmc->iom_adev = adev;
 	return 0;
 			break;
 		ret = pmc_usb_register_port(pmc, i, fwnode);
-		if (ret)
+		if (ret) {
+			fwnode_handle_put(fwnode);
 			goto err_remove_ports;
+		}
 	}
 	platform_set_drvdata(pdev, pmc);
 		usb_role_switch_unregister(pmc->port[i].usb_sw);
 	}
-	put_device(&pmc->iom_adev->dev);
+	acpi_dev_put(pmc->iom_adev);
 	return ret;
 }
 		usb_role_switch_unregister(pmc->port[i].usb_sw);
 	}
-	put_device(&pmc->iom_adev->dev);
+	acpi_dev_put(pmc->iom_adev);
 	return 0;
 }

drivers/usb/typec/tcpm/tcpm.c+107−43

@@ -401,6 +401,8 @@ struct tcpm_port { · 400 unmodified lines
401	unsigned int nr_src_pdo;	401	unsigned int nr_src_pdo;
402	u32 snk_pdo[PDO_MAX_OBJECTS];	402	u32 snk_pdo[PDO_MAX_OBJECTS];
403	unsigned int nr_snk_pdo;	403	unsigned int nr_snk_pdo;
		404	u32 snk_vdo_v1[VDO_MAX_OBJECTS];
		405	unsigned int nr_snk_vdo_v1;
404	u32 snk_vdo[VDO_MAX_OBJECTS];	406	u32 snk_vdo[VDO_MAX_OBJECTS];
405	unsigned int nr_snk_vdo;	407	unsigned int nr_snk_vdo;
406		408
@@ -1547,33 +1549,43 @@ static int tcpm_pd_svdm(struct tcpm_port port, struct typec_altmode adev, · 1140 unmodified lines
1547	if (PD_VDO_VID(p[0]) != USB_SID_PD)	1549	if (PD_VDO_VID(p[0]) != USB_SID_PD)
1548	break;	1550	break;
1549		1551
1550	if (PD_VDO_SVDM_VER(p[0]) < svdm_version)	1552	if (PD_VDO_SVDM_VER(p[0]) < svdm_version) {
1551	typec_partner_set_svdm_version(port->partner,	1553	typec_partner_set_svdm_version(port->partner,
1552	PD_VDO_SVDM_VER(p[0]));	1554	PD_VDO_SVDM_VER(p[0]));
1553	/* 6.4.4.3.1: Only respond as UFP (device) */	1555	svdm_version = PD_VDO_SVDM_VER(p[0]);
1554	if (port->data_role == TYPEC_DEVICE &&	1556	}
		1557
		1558	port->ams = DISCOVER_IDENTITY;
		1559	/*
		1560	* PD2.0 Spec 6.10.3: respond with NAK as DFP (data host)
		1561	* PD3.1 Spec 6.4.4.2.5.1: respond with NAK if "invalid field" or
		1562	* "wrong configuation" or "Unrecognized"
		1563	*/
		1564	if ((port->data_role == TYPEC_DEVICE \|\| svdm_version >= SVDM_VER_2_0) &&
1555	port->nr_snk_vdo) {	1565	port->nr_snk_vdo) {
1556	/*	1566	if (svdm_version < SVDM_VER_2_0) {
1557	* Product Type DFP and Connector Type are not defined in SVDM	1567	for (i = 0; i < port->nr_snk_vdo_v1; i++)
1558	* version 1.0 and shall be set to zero.	1568	response[i + 1] = port->snk_vdo_v1[i];
1559	*/	1569	rlen = port->nr_snk_vdo_v1 + 1;
1560	if (typec_get_negotiated_svdm_version(typec) < SVDM_VER_2_0)	1570
1561	response[1] = port->snk_vdo[0] & ~IDH_DFP_MASK	1571	} else {
1562	& ~IDH_CONN_MASK;	1572	for (i = 0; i < port->nr_snk_vdo; i++)
1563	else	1573	response[i + 1] = port->snk_vdo[i];
1564	response[1] = port->snk_vdo[0];	1574	rlen = port->nr_snk_vdo + 1;
1565	for (i = 1; i < port->nr_snk_vdo; i++)	1575	}
1566	response[i + 1] = port->snk_vdo[i];
1567	rlen = port->nr_snk_vdo + 1;
1568	}	1576	}
1569	break;	1577	break;
1570	case CMD_DISCOVER_SVID:	1578	case CMD_DISCOVER_SVID:
		1579	port->ams = DISCOVER_SVIDS;
1571	break;	1580	break;
1572	case CMD_DISCOVER_MODES:	1581	case CMD_DISCOVER_MODES:
		1582	port->ams = DISCOVER_MODES;
1573	break;	1583	break;
1574	case CMD_ENTER_MODE:	1584	case CMD_ENTER_MODE:
		1585	port->ams = DFP_TO_UFP_ENTER_MODE;
1575	break;	1586	break;
1576	case CMD_EXIT_MODE:	1587	case CMD_EXIT_MODE:
		1588	port->ams = DFP_TO_UFP_EXIT_MODE;
1577	break;	1589	break;
1578	case CMD_ATTENTION:	1590	case CMD_ATTENTION:
1579	/* Attention command does not have response */	1591	/* Attention command does not have response */
@@ -1930,6 +1942,9 @@ static void vdm_run_state_machine(struct tcpm_port *port) · 350 unmodified lines
1930	tcpm_log(port, "VDM Tx error, retry");	1942	tcpm_log(port, "VDM Tx error, retry");
1931	port->vdm_retries++;	1943	port->vdm_retries++;
1932	port->vdm_state = VDM_STATE_READY;	1944	port->vdm_state = VDM_STATE_READY;
		1945	if (PD_VDO_SVDM(vdo_hdr) && PD_VDO_CMDT(vdo_hdr) == CMDT_INIT)
		1946	tcpm_ams_finish(port);
		1947	} else {
1933	tcpm_ams_finish(port);	1948	tcpm_ams_finish(port);
1934	}	1949	}
1935	break;	1950	break;
@@ -2176,20 +2191,25 @@ static void tcpm_handle_alert(struct tcpm_port port, const __le32 payload, · 240 unmodified lines
2176		2191
2177	if (!type) {	2192	if (!type) {
2178	tcpm_log(port, "Alert message received with no type");	2193	tcpm_log(port, "Alert message received with no type");
		2194	tcpm_queue_message(port, PD_MSG_CTRL_NOT_SUPP);
2179	return;	2195	return;
2180	}	2196	}
2181		2197
2182	/* Just handling non-battery alerts for now */	2198	/* Just handling non-battery alerts for now */
2183	if (!(type & USB_PD_ADO_TYPE_BATT_STATUS_CHANGE)) {	2199	if (!(type & USB_PD_ADO_TYPE_BATT_STATUS_CHANGE)) {
2184	switch (port->state) {	2200	if (port->pwr_role == TYPEC_SOURCE) {
2185	case SRC_READY:	2201	port->upcoming_state = GET_STATUS_SEND;
2186	case SNK_READY:	2202	tcpm_ams_start(port, GETTING_SOURCE_SINK_STATUS);
		2203	} else {
		2204	/*
		2205	* Do not check SinkTxOk here in case the Source doesn't set its Rp to
		2206	* SinkTxOk in time.
		2207	*/
		2208	port->ams = GETTING_SOURCE_SINK_STATUS;
2187	tcpm_set_state(port, GET_STATUS_SEND, 0);	2209	tcpm_set_state(port, GET_STATUS_SEND, 0);
2188	break;
2189	default:
2190	tcpm_queue_message(port, PD_MSG_CTRL_WAIT);
2191	break;
2192	}	2210	}
		2211	} else {
		2212	tcpm_queue_message(port, PD_MSG_CTRL_NOT_SUPP);
2193	}	2213	}
2194	}	2214	}
2195		2215
@@ -2287,6 +2307,12 @@ static void tcpm_pd_data_request(struct tcpm_port *port, · 91 unmodified lines
2287	bool frs_enable;	2307	bool frs_enable;
2288	int ret;	2308	int ret;
2289		2309
		2310	if (tcpm_vdm_ams(port) && type != PD_DATA_VENDOR_DEF) {
		2311	port->vdm_state = VDM_STATE_ERR_BUSY;
		2312	tcpm_ams_finish(port);
		2313	mod_vdm_delayed_work(port, 0);
		2314	}
		2315
2290	switch (type) {	2316	switch (type) {
2291	case PD_DATA_SOURCE_CAP:	2317	case PD_DATA_SOURCE_CAP:
2292	for (i = 0; i < cnt; i++)	2318	for (i = 0; i < cnt; i++)
@@ -2417,14 +2443,22 @@ static void tcpm_pd_data_request(struct tcpm_port *port, · 124 unmodified lines
2417	NONE_AMS);	2443	NONE_AMS);
2418	break;	2444	break;
2419	case PD_DATA_VENDOR_DEF:	2445	case PD_DATA_VENDOR_DEF:
2420	tcpm_handle_vdm_request(port, msg->payload, cnt);	2446	if (tcpm_vdm_ams(port) \|\| port->nr_snk_vdo)
		2447	tcpm_handle_vdm_request(port, msg->payload, cnt);
		2448	else if (port->negotiated_rev > PD_REV20)
		2449	tcpm_pd_handle_msg(port, PD_MSG_CTRL_NOT_SUPP, NONE_AMS);
2421	break;	2450	break;
2422	case PD_DATA_BIST:	2451	case PD_DATA_BIST:
2423	port->bist_request = le32_to_cpu(msg->payload[0]);	2452	port->bist_request = le32_to_cpu(msg->payload[0]);
2424	tcpm_pd_handle_state(port, BIST_RX, BIST, 0);	2453	tcpm_pd_handle_state(port, BIST_RX, BIST, 0);
2425	break;	2454	break;
2426	case PD_DATA_ALERT:	2455	case PD_DATA_ALERT:
2427	tcpm_handle_alert(port, msg->payload, cnt);	2456	if (port->state != SRC_READY && port->state != SNK_READY)
		2457	tcpm_pd_handle_state(port, port->pwr_role == TYPEC_SOURCE ?
		2458	SRC_SOFT_RESET_WAIT_SNK_TX : SNK_SOFT_RESET,
		2459	NONE_AMS, 0);
		2460	else
		2461	tcpm_handle_alert(port, msg->payload, cnt);
2428	break;	2462	break;
2429	case PD_DATA_BATT_STATUS:	2463	case PD_DATA_BATT_STATUS:
2430	case PD_DATA_GET_COUNTRY_INFO:	2464	case PD_DATA_GET_COUNTRY_INFO:

111 more lines aren’t shown here.

drivers/usb/typec/tcpm/wcove.c+1−1

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

drivers/usb/typec/ucsi/ucsi.c+2−1

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

drivers/vdpa/mlx5/net/mlx5_vnet.c+18−1

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

drivers/vfio/pci/Kconfig+1−0

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

drivers/vfio/pci/vfio_pci_config.c+1−1

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

drivers/vfio/platform/vfio_platform_common.c+1−1

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

drivers/vfio/vfio_iommu_type1.c+1−1

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

drivers/video/fbdev/core/fb_defio.c+35−0

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

drivers/video/fbdev/core/fbmem.c+4−0

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

drivers/video/fbdev/hgafb.c+1−1

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

fs/afs/cmservice.c+5−0

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

fs/afs/dir.c+3−1

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

fs/afs/fsclient.c+4−0

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

fs/afs/main.c+2−2

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

fs/afs/vlclient.c+1−0

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

fs/afs/write.c+9−6

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

fs/btrfs/block-group.c+4−4

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

fs/btrfs/compression.c+12−5

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

fs/btrfs/disk-io.c+18−8

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

fs/btrfs/extent-tree.c+1−1

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

fs/btrfs/file-item.c+81−27

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

fs/btrfs/file.c+2−2

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

fs/btrfs/inode.c+18−1

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

fs/btrfs/reflink.c+22−16

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

fs/btrfs/tree-log.c+29−8

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

fs/btrfs/zoned.c+18−5

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

fs/cifs/cifs_ioctl.h+19−6

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

fs/cifs/cifspdu.h+2−1

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

fs/cifs/ioctl.c+105−38

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

fs/cifs/smb2pdu.c+7−0

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

fs/cifs/trace.h+17−12

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

fs/coredump.c+1−1

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

fs/debugfs/file.c+1−1

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

fs/debugfs/inode.c+6−3

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

fs/ext4/extents.c+23−20

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

fs/ext4/fast_commit.c+90−80

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

fs/ext4/fast_commit.h+0−19

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

fs/ext4/ialloc.c+4−2

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

fs/ext4/mballoc.c+1−1

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

fs/ext4/namei.c+4−2

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

fs/ext4/super.c+9−2

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

fs/ext4/sysfs.c+4−0

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

fs/gfs2/file.c+4−1

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

fs/gfs2/glock.c+24−4

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

fs/gfs2/glops.c+1−1

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

fs/gfs2/log.c+3−3

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

fs/gfs2/log.h+1−0

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

fs/gfs2/lops.c+6−1

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

fs/gfs2/lops.h+1−0

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

fs/gfs2/util.c+1−0

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

fs/hugetlbfs/inode.c+1−0

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

fs/io-wq.c+15−14

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

fs/io-wq.h+1−1

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

fs/io_uring.c+43−15

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

fs/netfs/Kconfig+1−1

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

fs/netfs/read_helper.c+1−1

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

fs/nfs/client.c+1−1

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

fs/nfs/filelayout/filelayout.c+1−1

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

fs/nfs/namespace.c+1−1

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

fs/nfs/nfs4_fs.h+1−0

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

fs/nfs/nfs4client.c+1−1

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

fs/nfs/nfs4file.c+1−1

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

fs/nfs/nfs4proc.c+32−9

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

fs/nfs/nfstrace.h+0−4

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

fs/nfs/pagelist.c+6−14

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

fs/nfs/pnfs.c+8−9

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

fs/nfs/super.c+1−1

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

fs/notify/fanotify/fanotify_user.c+26−8

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

fs/notify/fdinfo.c+1−1

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

fs/ocfs2/file.c+50−5

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

fs/proc/base.c+13−0

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

fs/xfs/libxfs/xfs_ag_resv.c+15−3

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

fs/xfs/libxfs/xfs_bmap.c+0−12

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

fs/xfs/libxfs/xfs_inode_buf.c+42−4

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

fs/xfs/libxfs/xfs_trans_inode.c+17−0

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

fs/xfs/xfs_inode.c+29−0

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

fs/xfs/xfs_ioctl.c+34−67

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

fs/xfs/xfs_message.h+2−0

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

include/asm-generic/vmlinux.lds.h+1−0

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

include/dt-bindings/usb/pd.h+76−13

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

include/linux/arch_topology.h+0−1

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

include/linux/avf/virtchnl.h+1−0

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

include/linux/cgroup-defs.h+3−3

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

include/linux/cgroup.h+1−1

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

include/linux/compiler_attributes.h+1−0

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

include/linux/device.h+2−4

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

include/linux/entry-kvm.h+2−1

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

include/linux/fanotify.h+4−0

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

include/linux/fb.h+3−0

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

include/linux/hid.h+1−2

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

include/linux/host1x.h+24−6

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

include/linux/huge_mm.h+7−1

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

include/linux/hugetlb.h+8−0

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

include/linux/init.h+2−1

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

include/linux/kvm_host.h+16−2

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

include/linux/mfd/rohm-bd70528.h+1−3

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

include/linux/mfd/rohm-bd71828.h+5−5

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

include/linux/mlx4/device.h+1−0

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

include/linux/mlx5/driver.h+26−22

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

include/linux/mlx5/mlx5_ifc.h+2−0

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

include/linux/mlx5/mpfs.h+18−0

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

include/linux/mlx5/transobj.h+1−0

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

include/linux/mm.h+3−0

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

include/linux/mm_types.h+20−7

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

include/linux/pci.h+2−0

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

include/linux/pgtable.h+8−0

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

include/linux/phy.h+5−0

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

include/linux/platform_data/ti-sysc.h+1−0

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

include/linux/ptp_clock_kernel.h+1−1

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

include/linux/rmap.h+1−0

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

include/linux/rtsx_pci.h+2−0

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

include/linux/sched.h+8−0

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

include/linux/socket.h+0−2

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

include/linux/spi/spi.h+2−2

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

include/linux/sunrpc/xprt.h+2−0

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

include/linux/swapops.h+11−4

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

include/linux/tick.h+7−0

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

include/linux/usb/pd.h+1−1

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

include/linux/usb/pd_ext_sdb.h+0−4

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

include/net/caif/caif_dev.h+1−1

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

include/net/caif/cfcnfg.h+1−1

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

include/net/caif/cfserl.h+1−0

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

include/net/cfg80211.h+2−2

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

include/net/mac80211.h+7−2

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

include/net/net_namespace.h+13−1

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

include/net/netfilter/nf_flow_table.h+0−1

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

include/net/netfilter/nf_tables.h+0−6

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

include/net/nfc/nci_core.h+1−0

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

include/net/pkt_cls.h+11−0

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

include/net/pkt_sched.h+1−6

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

include/net/sch_generic.h+34−1

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

include/net/sock.h+16−5

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

include/net/tls.h+9−1

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

include/sound/soc-dai.h+1−1

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

include/uapi/asm-generic/unistd.h+1−2

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

include/uapi/linux/in.h+3−0

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

include/uapi/linux/input-event-codes.h+1−0

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

include/uapi/linux/io_uring.h+10−9

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

include/uapi/linux/kvm.h+3−2

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

include/uapi/linux/virtio_ids.h+1−1

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

init/Kconfig+1−40

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

init/main.c+1−1

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

kernel/bpf/Kconfig+89−0

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

kernel/bpf/bpf_lsm.c+2−0

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

kernel/bpf/btf.c+12−0

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

kernel/bpf/helpers.c+24−18

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

kernel/bpf/ringbuf.c+11−13

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

kernel/bpf/syscall.c+2−1

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

kernel/bpf/verifier.c+118−44

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

kernel/cgroup/cgroup-v1.c+5−1

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

kernel/cgroup/cgroup.c+9−12

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

kernel/cgroup/cpuset.c+1−1

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

kernel/cgroup/rdma.c+1−1

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

kernel/cgroup/rstat.c+1−1

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

kernel/crash_core.c+1−0

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

kernel/entry/common.c+3−2

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

kernel/events/core.c+2−0

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

kernel/irq_work.c+0−3

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

kernel/printk/printk_safe.c+1−1

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

kernel/sched/core.c+0−1

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

kernel/sched/debug.c+2−1

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

kernel/sched/fair.c+42−30

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

kernel/sched/pelt.h+1−10

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

kernel/seccomp.c+16−14

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

kernel/sysctl.c+24−5

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

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

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

kernel/trace/bpf_trace.c+12−20

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

kernel/trace/ftrace.c+7−1

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

kernel/trace/trace.c+1−12

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

kernel/trace/trace_clock.c+3−3

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

kernel/workqueue.c+10−2

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

lib/crc64.c+1−1

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

lib/percpu-refcount.c+3−3

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

mm/debug_vm_pgtable.c+2−2

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

mm/huge_memory.c+29−27

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

mm/hugetlb.c+125−26

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

mm/internal.h+39−14

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

mm/kasan/init.c+2−2

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

mm/kfence/core.c+3−3

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

mm/memory-failure.c+33−3

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

mm/memory.c+45−0

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

mm/migrate.c+1−0

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

mm/page_alloc.c+2−0

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

mm/page_vma_mapped.c+17−10

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

mm/pgtable-generic.c+2−3

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

mm/rmap.c+27−12

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

mm/slab_common.c+1−2

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

mm/slub.c+16−21

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

mm/sparse.c+11−2

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

mm/swapfile.c+1−1

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

mm/truncate.c+19−24

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

net/Kconfig+0−27

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

net/appletalk/aarp.c+1−1

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

net/batman-adv/bat_iv_ogm.c+3−1

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

net/bluetooth/hci_core.c+6−1

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

net/bluetooth/hci_sock.c+2−2

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

net/bluetooth/smp.c+3−3

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

net/bridge/br_private.h+2−2

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

net/bridge/br_vlan_tunnel.c+24−14

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

net/caif/caif_dev.c+9−4

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

net/caif/caif_usb.c+13−1

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

net/caif/cfcnfg.c+11−5

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

net/caif/cfserl.c+5−0

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

net/can/bcm.c+49−13

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

net/can/isotp.c+81−29

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

net/can/j1939/transport.c+40−14

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

net/can/raw.c+48−14

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

net/compat.c+1−1

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

net/core/dev.c+24−5

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

net/core/devlink.c+2−2

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

net/core/fib_rules.c+1−1

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

net/core/filter.c+1−0

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

net/core/neighbour.c+1−0

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

net/core/net_namespace.c+13−7

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

net/core/rtnetlink.c+4−0

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

net/core/skbuff.c+3−1

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

net/core/sock.c+16−8

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

net/dsa/master.c+3−2

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

net/dsa/slave.c+7−5

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

net/dsa/tag_8021q.c+1−1

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

net/ethtool/eeprom.c+1−1

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

net/ethtool/ioctl.c+5−5

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

net/ethtool/stats.c+1−1

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

net/ethtool/strset.c+2−0

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

net/hsr/hsr_device.c+2−0

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

net/hsr/hsr_forward.c+21−9

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

net/hsr/hsr_forward.h+4−4

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

net/hsr/hsr_main.h+2−2

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

net/hsr/hsr_slave.c+5−6

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

net/ieee802154/nl-mac.c+6−4

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

net/ieee802154/nl-phy.c+3−1

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

net/ieee802154/nl802154.c+5−4

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

net/ipv4/af_inet.c+2−2

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

net/ipv4/bpf_tcp_ca.c+2−0

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

net/ipv4/cipso_ipv4.c+1−0

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

net/ipv4/devinet.c+1−1

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

net/ipv4/icmp.c+7−0

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

net/ipv4/igmp.c+1−0

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

net/ipv4/ipconfig.c+8−5

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

net/ipv4/ping.c+7−5

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

net/ipv4/route.c+14−1

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

net/ipv4/udp.c+10−0

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

net/ipv6/addrconf.c+1−1

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

net/ipv6/mcast.c+0−3

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

net/ipv6/netfilter/nft_fib_ipv6.c+18−4

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

net/ipv6/reassembly.c+3−1

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

net/ipv6/route.c+6−2

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

net/ipv6/sit.c+3−0

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

net/ipv6/udp.c+3−0

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

net/mac80211/debugfs.c+9−2

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

net/mac80211/ieee80211_i.h+14−24

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

net/mac80211/iface.c+15−15

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

net/mac80211/key.c+7−0

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

net/mac80211/key.h+2−0

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

net/mac80211/main.c+6−1

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

net/mac80211/mlme.c+8−0

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

net/mac80211/rc80211_minstrel_ht.c+1−1

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

net/mac80211/rx.c+119−38

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

net/mac80211/scan.c+16−5

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

net/mac80211/sta_info.c+5−1

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

net/mac80211/sta_info.h+32−1

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

net/mac80211/tx.c+36−16

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

net/mac80211/util.c+11−13

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

net/mac80211/wpa.c+9−4

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

net/mptcp/options.c+3−2

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

net/mptcp/pm_netlink.c+4−4

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

net/mptcp/protocol.c+59−29

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

net/mptcp/protocol.h+2−2

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

net/mptcp/sockopt.c+2−2

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

net/mptcp/subflow.c+90−92

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

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

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

net/netfilter/nf_conntrack_proto.c+1−1

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

net/netfilter/nf_flow_table_core.c+1−2

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

net/netfilter/nf_flow_table_offload.c+4−3

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

net/netfilter/nf_synproxy_core.c+5−0

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

net/netfilter/nf_tables_api.c+100−69

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

net/netfilter/nfnetlink_cthelper.c+6−2

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

net/netfilter/nft_ct.c+1−1

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

net/netfilter/nft_set_pipapo.c+2−2

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

net/netfilter/nft_set_pipapo.h+2−0

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

net/netfilter/nft_set_pipapo_avx2.c+3−0

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

net/netlink/af_netlink.c+4−2

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

net/nfc/llcp_sock.c+2−0

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

net/nfc/nci/core.c+1−0

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

net/nfc/nci/hci.c+5−0

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

net/nfc/rawsock.c+1−1

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

net/openvswitch/meter.c+8−0

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

net/packet/af_packet.c+31−20

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

net/qrtr/qrtr.c+1−1

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

net/rds/connection.c+17−6

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

net/rds/recv.c+1−1

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

net/rds/tcp.c+2−2

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

net/rds/tcp.h+2−1

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

net/rds/tcp_listen.c+6−0

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

net/sched/act_ct.c+17−14

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

net/sched/cls_api.c+1−1

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

net/sched/sch_cake.c+11−7

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

net/sched/sch_dsmark.c+2−1

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

net/sched/sch_fq_pie.c+13−6

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

net/sched/sch_generic.c+48−2

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

net/sched/sch_htb.c+4−4

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

net/sctp/socket.c+1−0

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

net/sctp/sysctl.c+1−1

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

net/smc/smc_ism.c+10−1

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

net/socket.c+0−13

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

net/sunrpc/clnt.c+0−7

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

net/sunrpc/xprt.c+32−8

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

net/sunrpc/xprtrdma/rpc_rdma.c+18−9

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

net/sunrpc/xprtrdma/transport.c+6−6

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

net/sunrpc/xprtrdma/verbs.c+15−3

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

net/sunrpc/xprtrdma/xprt_rdma.h+1−0

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

net/sunrpc/xprtsock.c+2−0

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

net/tipc/core.c+4−2

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

net/tipc/core.h+3−7

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

net/tipc/discover.c+2−2

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

net/tipc/link.c+5−0

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

net/tipc/link.h+1−0

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

net/tipc/msg.c+2−7

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

net/tipc/net.c+3−12

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

net/tipc/node.c+6−6

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

net/tipc/socket.c+4−1

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

net/tipc/udp_media.c+2−0

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

net/tls/tls_device.c+49−11

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

net/tls/tls_device_fallback.c+7−0

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

net/tls/tls_main.c+1−0

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

net/tls/tls_sw.c+6−5

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

net/unix/af_unix.c+4−3

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

net/wireless/Makefile+1−1

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

net/wireless/core.c+5−8

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

net/wireless/pmsr.c+14−2

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

net/wireless/sysfs.c+4−0

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

net/wireless/util.c+8−2

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

net/x25/af_x25.c+1−1

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

samples/bpf/xdpsock_user.c+1−1

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

samples/vfio-mdev/mdpy-fb.c+9−4

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

scripts/Makefile.modfinal+1−1

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

scripts/link-vmlinux.sh+1−1

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

scripts/recordmcount.h+10−5

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

sound/core/control_led.c+26−7

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

sound/core/seq/seq_timer.c+9−1

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

sound/core/timer.c+2−1

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

sound/firewire/amdtp-stream.c+1−1

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

sound/hda/intel-dsp-config.c+4−0

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

sound/pci/hda/hda_codec.c+5−0

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

sound/pci/hda/hda_generic.c+1−0

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

sound/pci/hda/hda_intel.c+3−0

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

sound/pci/hda/patch_cirrus.c+3−4

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

sound/pci/hda/patch_realtek.c+62−1

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

sound/soc/amd/raven/acp3x-pcm-dma.c+0−10

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

sound/soc/amd/raven/acp3x.h+1−0

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

sound/soc/amd/raven/pci-acp3x.c+15−0

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

sound/soc/codecs/ak5558.c+1−1

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

sound/soc/codecs/cs35l32.c+3−0

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

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

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

sound/soc/codecs/cs35l34.c+3−0

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

sound/soc/codecs/cs42l42.c+3−0

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

sound/soc/codecs/cs42l56.c+6−1

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

sound/soc/codecs/cs42l73.c+3−0

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

sound/soc/codecs/cs53l30.c+3−0

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

sound/soc/codecs/da7219.c+1−4

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

sound/soc/codecs/lpass-rx-macro.c+1−0

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

sound/soc/codecs/lpass-tx-macro.c+1−0

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

sound/soc/codecs/max98088.c+11−2

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

sound/soc/codecs/rt5659.c+21−5

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

sound/soc/codecs/rt5682-sdw.c+2−1

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

sound/soc/codecs/rt711-sdca.c+2−2

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

sound/soc/codecs/sti-sas.c+1−0

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

sound/soc/codecs/tas2562.h+7−7

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

sound/soc/fsl/Kconfig+1−0

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

sound/soc/fsl/fsl-asoc-card.c+1−0

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

sound/soc/generic/audio-graph-card.c+29−28

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

sound/soc/generic/simple-card.c+83−85

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

sound/soc/intel/boards/bytcr_rt5640.c+25−0

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

sound/soc/qcom/lpass-cpu.c+80−11

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

sound/soc/qcom/lpass.h+4−0

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

sound/soc/soc-core.c+2−0

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

sound/soc/soc-topology.c+3−3

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

sound/soc/sof/intel/hda-dai.c+5−0

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

sound/soc/sof/pm.c+1−0

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

sound/soc/stm/stm32_sai_sub.c+1−4

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

sound/usb/format.c+1−1

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

sound/usb/mixer_quirks.c+1−1

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

sound/usb/mixer_scarlett_gen2.c+51−30

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

sound/usb/mixer_scarlett_gen2.h+1−1

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

tools/arch/mips/include/uapi/asm/perf_regs.h+40−0

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

tools/arch/x86/include/asm/disabled-features.h+2−5

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

tools/arch/x86/include/uapi/asm/kvm.h+2−0

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

tools/bootconfig/include/linux/bootconfig.h+4−0

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

tools/bootconfig/main.c+1−0

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

tools/bpf/bpftool/Documentation/bpftool-cgroup.rst+3−1

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

tools/bpf/bpftool/Documentation/bpftool-prog.rst+1−1

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

tools/bpf/bpftool/bash-completion/bpftool+3−3

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

tools/bpf/bpftool/cgroup.c+2−1

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

tools/bpf/bpftool/prog.c+1−1

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

tools/include/uapi/asm-generic/unistd.h+1−2

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

tools/include/uapi/linux/fs.h+1−1

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

tools/include/uapi/linux/in.h+3−0

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

tools/include/uapi/linux/kvm.h+3−2

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

tools/include/uapi/linux/perf_event.h+1−1

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

tools/lib/bpf/libbpf.c+3−0

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

tools/lib/bpf/libbpf_internal.h+5−0

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

tools/lib/bpf/xsk.c+1−1

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

tools/objtool/arch/x86/decode.c+4−0

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

tools/objtool/elf.c+24−1

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

tools/perf/Documentation/perf-intel-pt.txt+3−3

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

tools/perf/Documentation/perf-script.txt+4−3

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

tools/perf/Makefile.config+0−1

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

tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl+1−1

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

tools/perf/arch/powerpc/entry/syscalls/syscall.tbl+1−1

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

tools/perf/arch/s390/entry/syscalls/syscall.tbl+1−1

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

tools/perf/arch/x86/entry/syscalls/syscall_64.tbl+1−1

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

tools/perf/builtin-buildid-list.c+3−0

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

tools/perf/builtin-record.c+6−0

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

tools/perf/builtin-stat.c+10−3

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

tools/perf/check-headers.sh+1−0

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

tools/perf/perf.c+2−2

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

tools/perf/pmu-events/arch/powerpc/power10/cache.json+20−10

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

tools/perf/pmu-events/arch/powerpc/power10/floating_point.json+1−1

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

tools/perf/pmu-events/arch/powerpc/power10/frontend.json+77−47

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

tools/perf/pmu-events/arch/powerpc/power10/locks.json+2−2

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

tools/perf/pmu-events/arch/powerpc/power10/marked.json+28−33

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

tools/perf/pmu-events/arch/powerpc/power10/memory.json+37−42

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

tools/perf/pmu-events/arch/powerpc/power10/others.json+54−79

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

tools/perf/pmu-events/arch/powerpc/power10/pipeline.json+65−70

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

tools/perf/pmu-events/arch/powerpc/power10/pmc.json+4−4

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

tools/perf/pmu-events/arch/powerpc/power10/translation.json+11−11

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

tools/perf/pmu-events/jevents.c+1−1

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

tools/perf/scripts/python/exported-sql-viewer.py+9−3

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

tools/perf/tests/attr/base-record+1−1

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

tools/perf/tests/pfm.c+2−2

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

tools/perf/tests/shell/stat_bpf_counters.sh+2−2

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

tools/perf/trace/beauty/include/linux/socket.h+0−2

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

tools/perf/util/bpf_counter.c+6−4

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

tools/perf/util/dwarf-aux.c+6−2

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

tools/perf/util/env.c+1−0

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

tools/perf/util/event.h+1−1

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

tools/perf/util/evlist.c+0−3

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

tools/perf/util/evsel.c+1−0

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

tools/perf/util/evsel.h+2−2

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

tools/perf/util/intel-pt-decoder/intel-pt-decoder.c+5−1

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

tools/perf/util/intel-pt.c+4−2

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

tools/perf/util/machine.c+2−1

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

tools/perf/util/metricgroup.c+8−6

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

tools/perf/util/parse-events.c+11−2

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

tools/perf/util/parse-events.l+1−0

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

tools/perf/util/perf_api_probe.c+10−0

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

tools/perf/util/perf_api_probe.h+1−0

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

tools/perf/util/pfm.c+10−1

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

tools/perf/util/probe-finder.c+3−0

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

tools/perf/util/session.c+1−0

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

tools/perf/util/stat-display.c+3−5

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

tools/perf/util/symbol-elf.c+1−0

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

tools/testing/selftests/bpf/network_helpers.c+1−1

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

tools/testing/selftests/bpf/network_helpers.h+1−0

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

tools/testing/selftests/bpf/prog_tests/ringbuf.c+48−1

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

tools/testing/selftests/bpf/prog_tests/tc_redirect.c+785−0

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

tools/testing/selftests/bpf/progs/test_tc_neigh.c+10−23

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

tools/testing/selftests/bpf/progs/test_tc_neigh_fib.c+6−3

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

tools/testing/selftests/bpf/progs/test_tc_peer.c+37−19

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

tools/testing/selftests/bpf/test_tc_redirect.sh+0−216

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

tools/testing/selftests/bpf/test_verifier.c+1−1

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

tools/testing/selftests/bpf/verifier/and.c+2−0

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

tools/testing/selftests/bpf/verifier/bounds.c+14−0

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

tools/testing/selftests/bpf/verifier/dead_code.c+2−0

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

tools/testing/selftests/bpf/verifier/jmp32.c+22−0

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

tools/testing/selftests/bpf/verifier/jset.c+6−4

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

tools/testing/selftests/bpf/verifier/stack_ptr.c+0−2

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

tools/testing/selftests/bpf/verifier/unpriv.c+2−0

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

tools/testing/selftests/bpf/verifier/value_ptr_arith.c+4−11

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

tools/testing/selftests/kvm/.gitignore+1−0

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

tools/testing/selftests/kvm/Makefile+2−1

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

tools/testing/selftests/kvm/demand_paging_test.c+109−65

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

tools/testing/selftests/kvm/hardware_disable_test.c+31−1

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

tools/testing/selftests/kvm/include/kvm_util.h+9−5

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

tools/testing/selftests/kvm/include/test_util.h+12−0

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

tools/testing/selftests/kvm/kvm_page_table_test.c+1−1

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

tools/testing/selftests/kvm/lib/kvm_util.c+263−67

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

tools/testing/selftests/kvm/lib/kvm_util_internal.h+15−2

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

tools/testing/selftests/kvm/lib/perf_test_util.c+4−2

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

tools/testing/selftests/kvm/lib/rbtree.c+1−0

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

tools/testing/selftests/kvm/lib/test_util.c+35−16

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

tools/testing/selftests/kvm/lib/x86_64/processor.c+4−12

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

tools/testing/selftests/kvm/memslot_modification_stress_test.c+11−7

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

tools/testing/selftests/kvm/memslot_perf_test.c+1037−0

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

tools/testing/selftests/kvm/x86_64/get_cpuid_test.c+5−0

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

tools/testing/selftests/kvm/x86_64/get_msr_index_features.c+2−6

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

tools/testing/selftests/nci/.gitignore+1−0

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

tools/testing/selftests/net/fib_tests.sh+25−0

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

tools/testing/selftests/net/icmp.sh+74−0

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

tools/testing/selftests/net/mptcp/mptcp_connect.sh+17−7

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

tools/testing/selftests/net/udpgro_fwd.sh+1−1

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

tools/testing/selftests/net/veth.sh+3−2

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

tools/testing/selftests/netfilter/Makefile+1−1

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

tools/testing/selftests/netfilter/nft_fib.sh+221−0

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

tools/testing/selftests/proc/.gitignore+1−0

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

tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json+4−4

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

tools/testing/selftests/wireguard/netns.sh+1−0

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

tools/testing/selftests/wireguard/qemu/kernel.config+0−1

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

virt/kvm/kvm_main.c+4−2

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

virt/lib/irqbypass.c+6−10

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

@@ -181,7 +181,7 @@ SLUB Debug output · 180 unmodified lines
181	Here is a sample of slub debug output::	181	Here is a sample of slub debug output::
182		182
183	====================================================================	183	====================================================================
184	BUG kmalloc-8: Redzone overwritten	184	BUG kmalloc-8: Right Redzone overwritten
185	--------------------------------------------------------------------	185	--------------------------------------------------------------------
186		186
187	INFO: 0xc90f6d28-0xc90f6d2b. First byte 0x00 instead of 0xcc	187	INFO: 0xc90f6d28-0xc90f6d2b. First byte 0x00 instead of 0xcc
@@ -189,10 +189,10 @@ Here is a sample of slub debug output:: · 1 unmodified line
189	INFO: Object 0xc90f6d20 @offset=3360 fp=0xc90f6d58	189	INFO: Object 0xc90f6d20 @offset=3360 fp=0xc90f6d58
190	INFO: Allocated in get_modalias+0x61/0xf5 age=53 cpu=1 pid=554	190	INFO: Allocated in get_modalias+0x61/0xf5 age=53 cpu=1 pid=554
191		191
192	Bytes b4 0xc90f6d10: 00 00 00 00 00 00 00 00 5a 5a 5a 5a 5a 5a 5a 5a ........ZZZZZZZZ	192	Bytes b4 (0xc90f6d10): 00 00 00 00 00 00 00 00 5a 5a 5a 5a 5a 5a 5a 5a ........ZZZZZZZZ
193	Object 0xc90f6d20: 31 30 31 39 2e 30 30 35 1019.005	193	Object (0xc90f6d20): 31 30 31 39 2e 30 30 35 1019.005
194	Redzone 0xc90f6d28: 00 cc cc cc .	194	Redzone (0xc90f6d28): 00 cc cc cc .
195	Padding 0xc90f6d50: 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZ	195	Padding (0xc90f6d50): 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZ
196		196
197	[<c010523d>] dump_trace+0x63/0x1eb	197	[<c010523d>] dump_trace+0x63/0x1eb
198	[<c01053df>] show_trace_log_lvl+0x1a/0x2f	198	[<c01053df>] show_trace_log_lvl+0x1a/0x2f

@@ -399,14 +399,14 @@ static bool trap_bvr(struct kvm_vcpu *vcpu, · 398 unmodified lines
399	struct sys_reg_params *p,	399	struct sys_reg_params *p,
400	const struct sys_reg_desc *rd)	400	const struct sys_reg_desc *rd)
401	{	401	{
402	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->reg];	402	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->CRm];
403		403
404	if (p->is_write)	404	if (p->is_write)
405	reg_to_dbg(vcpu, p, rd, dbg_reg);	405	reg_to_dbg(vcpu, p, rd, dbg_reg);
406	else	406	else
407	dbg_to_reg(vcpu, p, rd, dbg_reg);	407	dbg_to_reg(vcpu, p, rd, dbg_reg);
408		408
409	trace_trap_reg(__func__, rd->reg, p->is_write, *dbg_reg);	409	trace_trap_reg(__func__, rd->CRm, p->is_write, *dbg_reg);
410		410
411	return true;	411	return true;
412	}	412	}
@@ -414,7 +414,7 @@ static bool trap_bvr(struct kvm_vcpu *vcpu, · 1 unmodified line
414	static int set_bvr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,	414	static int set_bvr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,
415	const struct kvm_one_reg reg, void __user uaddr)	415	const struct kvm_one_reg reg, void __user uaddr)
416	{	416	{
417	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->reg];	417	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->CRm];
418		418
419	if (copy_from_user(r, uaddr, KVM_REG_SIZE(reg->id)) != 0)	419	if (copy_from_user(r, uaddr, KVM_REG_SIZE(reg->id)) != 0)
420	return -EFAULT;	420	return -EFAULT;
@@ -424,7 +424,7 @@ static int set_bvr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd, · 3 unmodified lines
424	static int get_bvr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,	424	static int get_bvr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,
425	const struct kvm_one_reg reg, void __user uaddr)	425	const struct kvm_one_reg reg, void __user uaddr)
426	{	426	{
427	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->reg];	427	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->CRm];
428		428
429	if (copy_to_user(uaddr, r, KVM_REG_SIZE(reg->id)) != 0)	429	if (copy_to_user(uaddr, r, KVM_REG_SIZE(reg->id)) != 0)
430	return -EFAULT;	430	return -EFAULT;
@@ -434,21 +434,21 @@ static int get_bvr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd, · 3 unmodified lines
434	static void reset_bvr(struct kvm_vcpu *vcpu,	434	static void reset_bvr(struct kvm_vcpu *vcpu,
435	const struct sys_reg_desc *rd)	435	const struct sys_reg_desc *rd)
436	{	436	{
437	vcpu->arch.vcpu_debug_state.dbg_bvr[rd->reg] = rd->val;	437	vcpu->arch.vcpu_debug_state.dbg_bvr[rd->CRm] = rd->val;
438	}	438	}
439		439
440	static bool trap_bcr(struct kvm_vcpu *vcpu,	440	static bool trap_bcr(struct kvm_vcpu *vcpu,
441	struct sys_reg_params *p,	441	struct sys_reg_params *p,
442	const struct sys_reg_desc *rd)	442	const struct sys_reg_desc *rd)
443	{	443	{
444	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_bcr[rd->reg];	444	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_bcr[rd->CRm];
445		445
446	if (p->is_write)	446	if (p->is_write)
447	reg_to_dbg(vcpu, p, rd, dbg_reg);	447	reg_to_dbg(vcpu, p, rd, dbg_reg);
448	else	448	else
449	dbg_to_reg(vcpu, p, rd, dbg_reg);	449	dbg_to_reg(vcpu, p, rd, dbg_reg);
450		450
451	trace_trap_reg(__func__, rd->reg, p->is_write, *dbg_reg);	451	trace_trap_reg(__func__, rd->CRm, p->is_write, *dbg_reg);
452		452
453	return true;	453	return true;
454	}	454	}
@@ -456,7 +456,7 @@ static bool trap_bcr(struct kvm_vcpu *vcpu, · 1 unmodified line
456	static int set_bcr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,	456	static int set_bcr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,
457	const struct kvm_one_reg reg, void __user uaddr)	457	const struct kvm_one_reg reg, void __user uaddr)
458	{	458	{
459	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bcr[rd->reg];	459	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bcr[rd->CRm];
460		460
461	if (copy_from_user(r, uaddr, KVM_REG_SIZE(reg->id)) != 0)	461	if (copy_from_user(r, uaddr, KVM_REG_SIZE(reg->id)) != 0)
462	return -EFAULT;	462	return -EFAULT;
@@ -467,7 +467,7 @@ static int set_bcr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd, · 4 unmodified lines
467	static int get_bcr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,	467	static int get_bcr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,
468	const struct kvm_one_reg reg, void __user uaddr)	468	const struct kvm_one_reg reg, void __user uaddr)
469	{	469	{
470	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bcr[rd->reg];	470	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bcr[rd->CRm];
471		471
472	if (copy_to_user(uaddr, r, KVM_REG_SIZE(reg->id)) != 0)	472	if (copy_to_user(uaddr, r, KVM_REG_SIZE(reg->id)) != 0)
473	return -EFAULT;	473	return -EFAULT;
@@ -477,22 +477,22 @@ static int get_bcr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd, · 3 unmodified lines
477	static void reset_bcr(struct kvm_vcpu *vcpu,	477	static void reset_bcr(struct kvm_vcpu *vcpu,
478	const struct sys_reg_desc *rd)	478	const struct sys_reg_desc *rd)
479	{	479	{
480	vcpu->arch.vcpu_debug_state.dbg_bcr[rd->reg] = rd->val;	480	vcpu->arch.vcpu_debug_state.dbg_bcr[rd->CRm] = rd->val;
481	}	481	}
482		482
483	static bool trap_wvr(struct kvm_vcpu *vcpu,	483	static bool trap_wvr(struct kvm_vcpu *vcpu,
484	struct sys_reg_params *p,	484	struct sys_reg_params *p,
485	const struct sys_reg_desc *rd)	485	const struct sys_reg_desc *rd)
486	{	486	{
487	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_wvr[rd->reg];	487	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_wvr[rd->CRm];
488		488
489	if (p->is_write)	489	if (p->is_write)
490	reg_to_dbg(vcpu, p, rd, dbg_reg);	490	reg_to_dbg(vcpu, p, rd, dbg_reg);
491	else	491	else
492	dbg_to_reg(vcpu, p, rd, dbg_reg);	492	dbg_to_reg(vcpu, p, rd, dbg_reg);
493		493
494	trace_trap_reg(__func__, rd->reg, p->is_write,	494	trace_trap_reg(__func__, rd->CRm, p->is_write,
495	vcpu->arch.vcpu_debug_state.dbg_wvr[rd->reg]);	495	vcpu->arch.vcpu_debug_state.dbg_wvr[rd->CRm]);
496		496
497	return true;	497	return true;
498	}	498	}
@@ -500,7 +500,7 @@ static bool trap_wvr(struct kvm_vcpu *vcpu, · 1 unmodified line
500	static int set_wvr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,	500	static int set_wvr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,
501	const struct kvm_one_reg reg, void __user uaddr)	501	const struct kvm_one_reg reg, void __user uaddr)
502	{	502	{
503	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wvr[rd->reg];	503	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wvr[rd->CRm];
504		504
505	if (copy_from_user(r, uaddr, KVM_REG_SIZE(reg->id)) != 0)	505	if (copy_from_user(r, uaddr, KVM_REG_SIZE(reg->id)) != 0)
506	return -EFAULT;	506	return -EFAULT;
@@ -510,7 +510,7 @@ static int set_wvr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd, · 3 unmodified lines
510	static int get_wvr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,	510	static int get_wvr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,
511	const struct kvm_one_reg reg, void __user uaddr)	511	const struct kvm_one_reg reg, void __user uaddr)
512	{	512	{
513	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wvr[rd->reg];	513	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wvr[rd->CRm];
514		514
515	if (copy_to_user(uaddr, r, KVM_REG_SIZE(reg->id)) != 0)	515	if (copy_to_user(uaddr, r, KVM_REG_SIZE(reg->id)) != 0)
516	return -EFAULT;	516	return -EFAULT;
@@ -520,21 +520,21 @@ static int get_wvr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd, · 3 unmodified lines
520	static void reset_wvr(struct kvm_vcpu *vcpu,	520	static void reset_wvr(struct kvm_vcpu *vcpu,
521	const struct sys_reg_desc *rd)	521	const struct sys_reg_desc *rd)
522	{	522	{
523	vcpu->arch.vcpu_debug_state.dbg_wvr[rd->reg] = rd->val;	523	vcpu->arch.vcpu_debug_state.dbg_wvr[rd->CRm] = rd->val;
524	}	524	}
525		525
526	static bool trap_wcr(struct kvm_vcpu *vcpu,	526	static bool trap_wcr(struct kvm_vcpu *vcpu,
527	struct sys_reg_params *p,	527	struct sys_reg_params *p,
528	const struct sys_reg_desc *rd)	528	const struct sys_reg_desc *rd)
529	{	529	{
530	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_wcr[rd->reg];	530	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_wcr[rd->CRm];
531		531
532	if (p->is_write)	532	if (p->is_write)
533	reg_to_dbg(vcpu, p, rd, dbg_reg);	533	reg_to_dbg(vcpu, p, rd, dbg_reg);
534	else	534	else
535	dbg_to_reg(vcpu, p, rd, dbg_reg);	535	dbg_to_reg(vcpu, p, rd, dbg_reg);
536		536
537	trace_trap_reg(__func__, rd->reg, p->is_write, *dbg_reg);	537	trace_trap_reg(__func__, rd->CRm, p->is_write, *dbg_reg);
538		538
539	return true;	539	return true;
540	}	540	}
@@ -542,7 +542,7 @@ static bool trap_wcr(struct kvm_vcpu *vcpu, · 1 unmodified line
542	static int set_wcr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,	542	static int set_wcr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,
543	const struct kvm_one_reg reg, void __user uaddr)	543	const struct kvm_one_reg reg, void __user uaddr)
544	{	544	{
545	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wcr[rd->reg];	545	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wcr[rd->CRm];
546		546
547	if (copy_from_user(r, uaddr, KVM_REG_SIZE(reg->id)) != 0)	547	if (copy_from_user(r, uaddr, KVM_REG_SIZE(reg->id)) != 0)
548	return -EFAULT;	548	return -EFAULT;
@@ -552,7 +552,7 @@ static int set_wcr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd, · 3 unmodified lines
552	static int get_wcr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,	552	static int get_wcr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd,
553	const struct kvm_one_reg reg, void __user uaddr)	553	const struct kvm_one_reg reg, void __user uaddr)
554	{	554	{
555	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wcr[rd->reg];	555	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wcr[rd->CRm];
556		556
557	if (copy_to_user(uaddr, r, KVM_REG_SIZE(reg->id)) != 0)	557	if (copy_to_user(uaddr, r, KVM_REG_SIZE(reg->id)) != 0)
558	return -EFAULT;	558	return -EFAULT;
@@ -562,7 +562,7 @@ static int get_wcr(struct kvm_vcpu vcpu, const struct sys_reg_desc rd, · 3 unmodified lines
562	static void reset_wcr(struct kvm_vcpu *vcpu,	562	static void reset_wcr(struct kvm_vcpu *vcpu,
563	const struct sys_reg_desc *rd)	563	const struct sys_reg_desc *rd)
564	{	564	{
565	vcpu->arch.vcpu_debug_state.dbg_wcr[rd->reg] = rd->val;	565	vcpu->arch.vcpu_debug_state.dbg_wcr[rd->CRm] = rd->val;
566	}	566	}
567		567
568	static void reset_amair_el1(struct kvm_vcpu vcpu, const struct sys_reg_desc r)	568	static void reset_amair_el1(struct kvm_vcpu vcpu, const struct sys_reg_desc r)

@@ -134,7 +134,7 @@ int acpi_power_init(void); · 133 unmodified lines
134	void acpi_power_resources_list_free(struct list_head *list);	134	void acpi_power_resources_list_free(struct list_head *list);
135	int acpi_extract_power_resources(union acpi_object *package, unsigned int start,	135	int acpi_extract_power_resources(union acpi_object *package, unsigned int start,
136	struct list_head *list);	136	struct list_head *list);
137	int acpi_add_power_resource(acpi_handle handle);	137	struct acpi_device *acpi_add_power_resource(acpi_handle handle);
138	void acpi_power_add_remove_device(struct acpi_device *adev, bool add);	138	void acpi_power_add_remove_device(struct acpi_device *adev, bool add);
139	int acpi_power_wakeup_list_init(struct list_head list, int system_level);	139	int acpi_power_wakeup_list_init(struct list_head list, int system_level);
140	int acpi_device_sleep_wake(struct acpi_device *dev,	140	int acpi_device_sleep_wake(struct acpi_device *dev,
@@ -142,7 +142,7 @@ int acpi_device_sleep_wake(struct acpi_device *dev, · 1 unmodified line
142	int acpi_power_get_inferred_state(struct acpi_device device, int state);	142	int acpi_power_get_inferred_state(struct acpi_device device, int state);
143	int acpi_power_on_resources(struct acpi_device *device, int state);	143	int acpi_power_on_resources(struct acpi_device *device, int state);
144	int acpi_power_transition(struct acpi_device *device, int state);	144	int acpi_power_transition(struct acpi_device *device, int state);
145	void acpi_turn_off_unused_power_resources(void);	145	void acpi_turn_off_unused_power_resources(bool init);
146		146
147	/* --------------------------------------------------------------------------	147	/* --------------------------------------------------------------------------
148	Device Power Management	148	Device Power Management