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

Conflicts are simple overlapping changes.

David S. Miller committed 5 years ago

Commit 5af84df2 parents 090597b 9f42f67371 files · +3766 −3026Browse files

Unified · Split

371 files

Documentation/dev-tools/kunit/running_tips.rst +1 −13
Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml +0 −1
Documentation/devicetree/bindings/display/renesas,du.yaml +0 −1
Documentation/devicetree/bindings/hwmon/adt7475.yaml +11 −11
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +2 −4
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +0 −2
Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml +0 −1
Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml +0 −8
Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml +2 −2
Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml +28 −28
Documentation/devicetree/bindings/regulator/fixed-regulator.yaml +2 −0
Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml +3 −3
Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml +2 −1
Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml +0 −1
Documentation/devicetree/bindings/spi/spi-controller.yaml +16 −16
Documentation/devicetree/bindings/usb/nxp,isp1760.yaml +0 −2
Documentation/driver-api/early-userspace/early_userspace_support.rst +4 −4
Documentation/features/core/thread-info-in-task/arch-support.txt +32 −0
Documentation/features/time/arch-tick-broadcast/arch-support.txt +1 −1
Documentation/filesystems/ramfs-rootfs-initramfs.rst +1 −1
Documentation/networking/af_xdp.rst +3 −3
Documentation/networking/ip-sysctl.rst +1 −1
Documentation/translations/zh_CN/process/2.Process.rst +2 −2
LICENSES/dual/CC-BY-4.0 +1 −1
MAINTAINERS +2 −0
Makefile +7 −6
arch/arm/Kconfig +1 −1
arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts +3 −1
arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts +5 −4
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +1 −4
arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +2 −4
arch/arm/boot/dts/versatile-ab.dts +2 −3
arch/arm/boot/dts/versatile-pb.dts +1 −1
arch/arm/configs/integrator_defconfig +1 −4
arch/arm/configs/multi_v7_defconfig +1 −1
arch/arm/configs/realview_defconfig +1 −3
arch/arm/configs/shmobile_defconfig +1 −0
arch/arm/configs/u8500_defconfig +5 −0
arch/arm/configs/versatile_defconfig +1 −3
arch/arm/configs/vexpress_defconfig +7 −10
arch/arm64/Kconfig +2 −1
arch/arm64/boot/dts/nvidia/tegra194.dtsi +13 −0
arch/arm64/boot/dts/renesas/r9a07g044.dtsi +2 −2
arch/arm64/include/asm/cache.h +1 −1
arch/arm64/include/asm/smp_plat.h +1 −0
arch/arm64/kernel/Makefile +1 −1
arch/arm64/kernel/cpufeature.c +1 −0
arch/arm64/kernel/entry-common.c +1 −1
arch/arm64/kernel/mte.c +2 −13
arch/arm64/kernel/smccc-call.S +6 −3
arch/arm64/lib/copy_from_user.S +10 −3
arch/arm64/lib/copy_in_user.S +14 −7
arch/arm64/lib/copy_to_user.S +11 −3
arch/arm64/lib/strlen.S +10 −0
arch/arm64/mm/mmu.c +8 −12
arch/mips/include/asm/fpu.h +1 −1
arch/mips/mm/tlbex.c +2 −0
arch/powerpc/mm/nohash/8xx.c +10 −0
arch/powerpc/platforms/powermac/smp.c +1 −0
arch/s390/boot/text_dma.S +4 −15
arch/s390/configs/debug_defconfig +18 −9
arch/s390/configs/defconfig +19 −8
arch/s390/configs/zfcpdump_defconfig +1 −2
arch/s390/include/asm/ftrace.h +1 −0
arch/s390/kernel/ftrace.c +2 −0
arch/s390/kernel/mcount.S +2 −2
arch/s390/kernel/perf_cpum_cf.c +1 −1
arch/s390/kernel/uprobes.c +1 −0
arch/s390/kernel/vdso32/Makefile +1 −0
arch/s390/net/bpf_jit_comp.c +1 −1
arch/x86/kernel/cpu/mshyperv.c +1 −1
arch/x86/kvm/cpuid.c +25 −5
arch/x86/kvm/mmu/mmu.c +2 −0
arch/x86/kvm/mmu/paging.h +14 −0
arch/x86/kvm/mmu/paging_tmpl.h +2 −2
arch/x86/kvm/mmu/spte.h +0 −6
arch/x86/kvm/svm/nested.c +33 −20
arch/x86/kvm/svm/sev.c +8 −6
arch/x86/kvm/svm/svm.c +70 −7
arch/x86/kvm/svm/svm.h +5 −0
arch/x86/kvm/vmx/vmx.h +0 −2
arch/x86/kvm/x86.c +2 −3
arch/x86/mm/pgtable.c +15 −19
drivers/block/nbd.c +1 −1
drivers/block/paride/pd.c +1 −1
drivers/block/xen-blkfront.c +26 −198
drivers/char/powernv-op-panel.c +1 −0
drivers/clk/renesas/r9a07g044-cpg.c +47 −32
drivers/clk/renesas/renesas-rzg2l-cpg.c +59 −51
drivers/clk/renesas/renesas-rzg2l-cpg.h +28 −9
drivers/cpufreq/longhaul.c +0 −2
drivers/dma-buf/sync_file.c +7 −6
drivers/dma/ipu/ipu_idmac.c +2 −0
drivers/dma/mpc512x_dma.c +1 −0
drivers/dma/ti/k3-udma.c +1 −0
drivers/edac/Kconfig +1 −1
drivers/firmware/arm_ffa/bus.c +3 −3
drivers/firmware/arm_ffa/driver.c +5 −3
drivers/firmware/arm_scmi/bus.c +3 −5
drivers/firmware/arm_scmi/driver.c +9 −5
drivers/firmware/arm_scmi/notify.c +4 −0
drivers/firmware/arm_scmi/sensors.c +4 −2
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1 −1
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +9 −13
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +3 −3
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 −0
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +1 −1
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +18 −0
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +35 −14
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +3 −3
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +5 −6
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1 −1
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +1 −1
drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c +2 −2
drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c +2 −2
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +12 −33
drivers/gpu/drm/amd/amdkfd/kfd_process.c +1 −2
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +18 −12
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 −1
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c +2 −2
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +4 −4
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +1 −1
drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h +0 −355
drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h +0 −531
drivers/gpu/drm/amd/pm/inc/smu_v13_0.h +1 −0
drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h +0 −57
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1 −0
drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile +1 −1
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +24 −0
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c +0 −311
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +34 −15
drivers/gpu/drm/i915/gem/i915_gem_shrinker.c +1 −0
drivers/gpu/drm/i915/gt/gen8_ppgtt.c +1 −4
drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c +1 −1
drivers/gpu/drm/msm/msm_gem.c +1 −1
drivers/gpu/drm/panel/panel-novatek-nt35510.c +1 −3
drivers/gpu/drm/qxl/qxl_ttm.c +1 −1
drivers/gpu/drm/ttm/ttm_range_manager.c +3 −0
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +1 −0
drivers/gpu/drm/vmwgfx/vmwgfx_mob.c +0 −1
drivers/hv/channel_mgmt.c +64 −32
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +1 −0
drivers/iommu/arm/arm-smmu/qcom_iommu.c +2 −11
drivers/iommu/intel/iommu.c +23 −11
drivers/iommu/rockchip-iommu.c +4 −2
drivers/mmc/core/block.c +21 −14
drivers/mmc/core/host.c +10 −10
drivers/mmc/host/jz4740_mmc.c +2 −0
drivers/mtd/chips/cfi_util.c +2 −2
drivers/net/bonding/bond_main.c +2 −0
drivers/net/dsa/mt7530.c +2 −0
drivers/net/dsa/mt7530.h +1 −0
drivers/net/dsa/mv88e6xxx/Kconfig +1 −1
drivers/net/dsa/sja1105/sja1105_main.c +6 −0
drivers/net/ethernet/broadcom/bnxt/bnxt.c +62 −23
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c +9 −1
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c +7 −17
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h +0 −1
drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +5 −4
drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c +1 −1
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c +8 −8
drivers/net/ethernet/freescale/fman/mac.c +1 −0
drivers/net/ethernet/hisilicon/hip04_eth.c +3 −3
drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h +5 −2
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +6 −2
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c +1 −0
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +10 −0
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c +19 −0
drivers/net/ethernet/ibm/ibmvnic.c +1 −1
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +2 −1
drivers/net/ethernet/marvell/octeontx2/af/Makefile +1 −1
drivers/net/ethernet/marvell/octeontx2/af/rvu.c +9 −1
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +21 −0
drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c +3 −0
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c +1 −4
drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c +41 −7
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +36 −0
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +36 −11
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c +21 −8
drivers/net/ethernet/marvell/octeontx2/af/rvu_switch.c +258 −0
drivers/net/ethernet/microchip/sparx5/Kconfig +1 −0
drivers/net/ethernet/netronome/nfp/flower/conntrack.c +1 −0
drivers/net/ethernet/realtek/r8169_main.c +2 −1
drivers/net/ethernet/renesas/ravb.h +1 −1
drivers/net/ethernet/renesas/ravb_main.c +1 −1
drivers/net/ethernet/xscale/ptp_ixp46x.c +2 −0
drivers/net/usb/r8152.c +20 −10
drivers/net/wireless/mediatek/mt76/mt7921/main.c +1 −0
drivers/nvme/host/pci.c +58 −9
drivers/nvme/host/tcp.c +1 −3
drivers/pci/proc.c +1 −1
drivers/power/supply/ab8500_fg.c +2 −0
drivers/power/supply/abx500_chargalg.c +1 −0
drivers/pwm/pwm-berlin.c +3 −6
drivers/pwm/pwm-ep93xx.c +40 −45
drivers/pwm/pwm-spear.c +3 −6
drivers/pwm/pwm-sprd.c +4 −7
drivers/pwm/pwm-tiecap.c +6 −9
drivers/regulator/bd9576-regulator.c +2 −2
drivers/regulator/hi6421-regulator.c +13 −9
drivers/regulator/hi6421v600-regulator.c +9 −7
drivers/regulator/mtk-dvfsrc-regulator.c +1 −2
drivers/regulator/rtmv20-regulator.c +1 −1
drivers/s390/char/tape_char.c +0 −2
drivers/s390/net/ctcm_fsms.c +1 −0
drivers/s390/net/qeth_l3_main.c +1 −0
drivers/s390/scsi/zfcp_sysfs.c +1 −0
drivers/scsi/arm/fas216.c +1 −1
drivers/scsi/hosts.c +1 −0
drivers/scsi/libsas/sas_discover.c +1 −1
drivers/scsi/mpi3mr/mpi3mr_fw.c +7 −8
drivers/scsi/pm8001/pm8001_ctl.c +26 −22
drivers/scsi/pm8001/pm8001_hwi.c +9 −9
drivers/scsi/pm8001/pm8001_init.c +15 −14
drivers/scsi/pm8001/pm8001_sas.c +22 −19
drivers/scsi/pm8001/pm80xx_hwi.c +25 −25
drivers/scsi/scsi_lib.c +1 −1
drivers/scsi/ufs/ufshcd.h +7 −2
drivers/spi/spi-atmel.c +2 −7
drivers/spi/spi-bcm2835.c +7 −5
drivers/spi/spi-cadence-quadspi.c +17 −13
drivers/spi/spi-cadence.c +9 −5
drivers/spi/spi-imx.c +19 −19
drivers/spi/spi-mt65xx.c +19 −9
drivers/spi/spi-stm32.c +17 −7
drivers/usb/gadget/udc/fsl_qe_udc.c +1 −0
drivers/video/fbdev/core/fbmem.c +5 −7
drivers/video/fbdev/xilinxfb.c +2 −0
fs/afs/cmservice.c +7 −18
fs/afs/dir.c +6 −4
fs/afs/write.c +12 −6
fs/cifs/cifs_dfs_ref.c +5 −1
fs/cifs/cifsglob.h +7 −0
fs/cifs/connect.c +99 −11
fs/cifs/dns_resolve.c +6 −4
fs/cifs/dns_resolve.h +1 −1
fs/cifs/misc.c +1 −1
fs/cifs/smb2ops.c +4 −2
fs/cifs/smb2pdu.h +1 −0
fs/configfs/file.c +22 −7
fs/fcntl.c +1 −1
fs/hfs/bfind.c +13 −1
fs/hfs/bnode.c +20 −5
fs/hfs/btree.h +7 −0
fs/hfs/super.c +5 −5
fs/io_uring.c +5 −3
fs/iomap/buffered-io.c +4 −4
fs/iomap/seek.c +9 −16
fs/seq_file.c +3 −0
fs/xfs/libxfs/xfs_ag.c +8 −0
fs/xfs/libxfs/xfs_attr.c +8 −8
fs/xfs/libxfs/xfs_ialloc.c +55 −0
fs/xfs/libxfs/xfs_ialloc.h +3 −0
fs/xfs/libxfs/xfs_inode_buf.c +16 −12
fs/xfs/libxfs/xfs_trans_inode.c +4 −6
fs/xfs/scrub/inode.c +16 −2
fs/xfs/xfs_inode.c +13 −0
fs/xfs/xfs_ioctl.c +22 −5
fs/xfs/xfs_rtalloc.c +37 −12
fs/zonefs/super.c +0 −3
include/dt-bindings/clock/r9a07g044-cpg.h +183 −53
include/linux/kasan.h +1 −0
include/linux/mfd/rt5033-private.h +2 −2
include/linux/pgtable.h +1 −25
include/linux/rmap.h +3 −1
include/linux/scmi_protocol.h +9 −5
include/linux/scpi_protocol.h +8 −0
include/math-emu/op-common.h +1 −1
include/net/tcp.h +0 −1
include/soc/tegra/mc.h +7 −2
include/trace/events/afs.h +62 −5
include/trace/events/net.h +1 −1
include/trace/events/qdisc.h +27 −1
init/Kconfig +0 −1
kernel/bpf/verifier.c +2 −0
kernel/debug/gdbstub.c +1 −1
kernel/rcu/refscale.c +3 −3
kernel/rcu/tasks.h +2 −4
kernel/rcu/tree_stall.h +2 −2
kernel/scftorture.c +3 −3
kernel/trace/trace_events_hist.c +3 −3
lib/test_hmm.c +0 −2
mm/hugetlb.c +3 −2
mm/kasan/kasan.h +12 −0
mm/page_alloc.c +21 −7
mm/slab.h +11 −4
mm/slub.c +30 −63
net/bpf/test_run.c +5 −0
net/bridge/br_fdb.c +1 −1
net/caif/caif_socket.c +2 −1
net/core/dev.c +26 −8
net/core/skbuff.c +16 −2
net/core/skmsg.c +11 −5
net/decnet/af_decnet.c +12 −15
net/dsa/slave.c +9 −5
net/dsa/tag_ksz.c +9 −0
net/ipv4/tcp_bpf.c +1 −1
net/ipv4/tcp_fastopen.c +24 −4
net/ipv4/tcp_ipv4.c +1 −1
net/ipv4/udp.c +19 −6
net/ipv4/udp_bpf.c +1 −1
net/ipv6/ip6_output.c +1 −1
net/ipv6/route.c +1 −1
net/ipv6/udp.c +19 −6
net/netrom/nr_timer.c +11 −9
net/sched/act_skbmod.c +8 −4
net/sched/cls_api.c +1 −1
net/sched/cls_tcindex.c +4 −1
net/sctp/auth.c +2 −0
net/sctp/output.c +2 −2
net/sctp/socket.c +4 −0
scripts/Makefile.build +1 −1
scripts/setlocalversion +8 −5
scripts/spdxcheck.py +1 −1
sound/soc/mediatek/mt8183/mt8183-dai-adda.c +1 −0
tools/arch/arm64/include/uapi/asm/unistd.h +1 −0
tools/bpf/bpftool/common.c +5 −0
tools/include/linux/kconfig.h +0 −6
tools/include/uapi/asm-generic/unistd.h +6 −1
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +1 −0
tools/perf/builtin-inject.c +9 −4
tools/perf/builtin-report.c +22 −11
tools/perf/builtin-sched.c +30 −5
tools/perf/builtin-script.c +8 −0
tools/perf/builtin-stat.c +0 −3
tools/perf/builtin-trace.c +43 −2
tools/perf/tests/bpf.c +2 −0
tools/perf/tests/event_update.c +4 −2
tools/perf/tests/evsel-roundtrip-name.c +2 −1
tools/perf/tests/maps.c +2 −0
tools/perf/tests/parse-events.c +10 −6
tools/perf/tests/perf-time-to-tsc.c +2 −1
tools/perf/tests/topology.c +1 −0
tools/perf/util/cs-etm.c +167 −1
tools/perf/util/data.c +1 −1
tools/perf/util/dso.c +3 −1
tools/perf/util/dwarf-aux.c +4 −4
tools/perf/util/dwarf-aux.h +1 −1
tools/perf/util/env.c +2 −0
tools/perf/util/lzma.c +5 −3
tools/perf/util/map.c +2 −0
tools/perf/util/pfm.c +1 −1
tools/perf/util/pmu.c +8 −1
tools/perf/util/probe-event.c +26 −27
tools/perf/util/probe-event.h +2 −2
tools/perf/util/probe-file.c +2 −2
tools/perf/util/probe-finder.c +7 −8
tools/perf/util/probe-finder.h +1 −1
tools/perf/util/session.c +1 −0
tools/perf/util/sort.c +1 −1
tools/perf/util/sort.h +1 −1
tools/perf/util/stat-display.c +13 −1
tools/testing/kunit/kunit.py +2 −0
tools/testing/kunit/kunit_kernel.py +2 −4
tools/testing/kunit/kunit_parser.py +4 −2
tools/testing/kunit/kunit_tool_test.py +13 −3
tools/testing/kunit/test_data/test_is_test_passed-no_tests_run_no_header.log +0 −0
tools/testing/kunit/test_data/test_is_test_passed-no_tests_run_with_header.log +2 −0
tools/testing/selftests/kvm/include/kvm_util.h +2 −1
tools/testing/selftests/kvm/lib/aarch64/processor.c +1 −1
tools/testing/selftests/kvm/lib/guest_modes.c +16 −0
tools/testing/selftests/kvm/lib/kvm_util.c +5 −0
tools/testing/selftests/kvm/set_memory_region_test.c +2 −1
tools/testing/selftests/kvm/x86_64/hyperv_features.c +1 −1
tools/testing/selftests/kvm/x86_64/mmu_role_test.c +1 −1
tools/testing/selftests/kvm/x86_64/smm_test.c +64 −6
tools/testing/selftests/memory-hotplug/mem-on-off-test.sh +3 −1
tools/testing/selftests/net/nettest.c +54 −1
tools/testing/selftests/net/pmtu.sh +206 −6
virt/kvm/coalesced_mmio.c +1 −1
virt/kvm/kvm_main.c +1 −1

Documentation/dev-tools/kunit/running_tips.rst+1−13

@@ -86,19 +86,7 @@ Generating code coverage reports under UML · 85 unmodified lines
86	86	.. note::
87	87	TODO(brendanhiggins@google.com): There are various issues with UML and
88	88	versions of gcc 7 and up. You're likely to run into missing ``.gcda``
89		− files or compile errors. We know one `faulty GCC commit
90		− <https://github.com/gcc-mirror/gcc/commit/8c9434c2f9358b8b8bad2c1990edf10a21645f9d>`_
91		− but not how we'd go about getting this fixed. The compile errors still
92		− need some investigation.
93		−
94		−.. note::
95		− TODO(brendanhiggins@google.com): for recent versions of Linux
96		− (5.10-5.12, maybe earlier), there's a bug with gcov counters not being
97		− flushed in UML. This translates to very low (<1%) reported coverage. This is
98		− related to the above issue and can be worked around by replacing the
99		− one call to ``uml_abort()`` (it's in ``os_dump_core()``) with a plain
100		− ``exit()``.
101		−
	89	+ files or compile errors.
102	90
103	91	This is different from the "normal" way of getting coverage information that is
104	92	documented in Documentation/dev-tools/gcov.rst.

Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml+0−1

@@ -50,7 +50,6 @@ properties: · 49 unmodified lines
50	50
51	51	reg:
52	52	minItems: 1
53		− maxItems: 3
54	53	items:
55	54	- description: base register
56	55	- description: power register

Documentation/devicetree/bindings/display/renesas,du.yaml+0−1

@@ -92,7 +92,6 @@ required: · 91 unmodified lines
92	92	- reg
93	93	- clocks
94	94	- interrupts
95		− - resets
96	95	- ports
97	96
98	97	allOf:

Documentation/devicetree/bindings/hwmon/adt7475.yaml+11−11

@@ -39,17 +39,7 @@ properties: · 38 unmodified lines
39	39	reg:
40	40	maxItems: 1
41	41
42		−patternProperties:
43		− "^adi,bypass-attenuator-in[0-4]$":
44		− description: \|
45		− Configures bypassing the individual voltage input attenuator. If
46		− set to 1 the attenuator is bypassed if set to 0 the attenuator is
47		− not bypassed. If the property is absent then the attenuator
48		− retains it's configuration from the bios/bootloader.
49		− $ref: /schemas/types.yaml#/definitions/uint32
50		− enum: [0, 1]
51		−
52		− "^adi,pwm-active-state$":
	42	+ adi,pwm-active-state:
53	43	description: \|
54	44	Integer array, represents the active state of the pwm outputs If set to 0
55	45	the pwm uses a logic low output for 100% duty cycle. If set to 1 the pwm
@@ -61,6 +51,16 @@ patternProperties: · 5 unmodified lines
61	51	enum: [0, 1]
62	52	default: 1
63	53
	54	+patternProperties:
	55	+ "^adi,bypass-attenuator-in[0-4]$":
	56	+ description: \|
	57	+ Configures bypassing the individual voltage input attenuator. If
	58	+ set to 1 the attenuator is bypassed if set to 0 the attenuator is
	59	+ not bypassed. If the property is absent then the attenuator
	60	+ retains it's configuration from the bios/bootloader.
	61	+ $ref: /schemas/types.yaml#/definitions/uint32
	62	+ enum: [0, 1]
	63	+
64	64	required:
65	65	- compatible
66	66	- reg

Documentation/devicetree/bindings/iommu/arm,smmu.yaml+2−4

@@ -52,16 +52,14 @@ properties: · 51 unmodified lines
52	52	items:
53	53	- const: marvell,ap806-smmu-500
54	54	- const: arm,mmu-500
55		− - description: NVIDIA SoCs that program two ARM MMU-500s identically
56		− items:
57	55	- description: NVIDIA SoCs that require memory controller interaction
58	56	and may program multiple ARM MMU-500s identically with the memory
59	57	controller interleaving translations between multiple instances
60	58	for improved performance.
61	59	items:
62	60	- enum:
63		− - const: nvidia,tegra194-smmu
64		− - const: nvidia,tegra186-smmu
	61	+ - nvidia,tegra194-smmu
	62	+ - nvidia,tegra186-smmu
65	63	- const: nvidia,smmu-500
66	64	- items:
67	65	- const: arm,mmu-500

Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml+0−2

@@ -28,14 +28,12 @@ properties: · 27 unmodified lines
28	28	- description: configuration registers for MMU instance 0
29	29	- description: configuration registers for MMU instance 1
30	30	minItems: 1
31		− maxItems: 2
32	31
33	32	interrupts:
34	33	items:
35	34	- description: interruption for MMU instance 0
36	35	- description: interruption for MMU instance 1
37	36	minItems: 1
38		− maxItems: 2
39	37
40	38	clocks:
41	39	items:

Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml+0−1

@@ -57,7 +57,6 @@ properties: · 56 unmodified lines
57	57
58	58	ranges:
59	59	minItems: 1
60		− maxItems: 3
61	60	description: \|
62	61	Memory bus areas for interacting with the devices. Reflects
63	62	the memory layout with four integer values following:

Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml+0−8

@@ -84,7 +84,6 @@ properties: · 83 unmodified lines
84	84
85	85	interrupts:
86	86	minItems: 1
87		− maxItems: 3
88	87	items:
89	88	- description: NAND CTLRDY interrupt
90	89	- description: FLASH_DMA_DONE if flash DMA is available
@@ -92,7 +91,6 @@ properties: · 1 unmodified line
92	91
93	92	interrupt-names:
94	93	minItems: 1
95		− maxItems: 3
96	94	items:
97	95	- const: nand_ctlrdy
98	96	- const: flash_dma_done
@@ -148,8 +146,6 @@ allOf: · 49 unmodified lines
148	146	then:
149	147	properties:
150	148	reg-names:
151		− minItems: 2
152		− maxItems: 2
153	149	items:
154	150	- const: nand
155	151	- const: nand-int-base
@@ -161,8 +157,6 @@ allOf: · 5 unmodified lines
161	157	then:
162	158	properties:
163	159	reg-names:
164		− minItems: 3
165		− maxItems: 3
166	160	items:
167	161	- const: nand
168	162	- const: nand-int-base
@@ -175,8 +169,6 @@ allOf: · 6 unmodified lines
175	169	then:
176	170	properties:
177	171	reg-names:
178		− minItems: 3
179		− maxItems: 3
180	172	items:
181	173	- const: nand
182	174	- const: iproc-idm

Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml+2−2

@@ -67,8 +67,8 @@ properties: · 66 unmodified lines
67	67	reg:
68	68	oneOf:
69	69	- enum:
70		− - 0
71		− - 1
	70	+ - 0
	71	+ - 1
72	72
73	73	required:
74	74	- compatible

Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml+28−28

@@ -77,6 +77,34 @@ properties: · 76 unmodified lines
77	77	Type-C spec states minimum CC pin debounce of 100 ms and maximum
78	78	of 200 ms. However, some solutions might need more than 200 ms.
79	79
	80	+ refclk-dig:
	81	+ type: object
	82	+ description: \|
	83	+ WIZ node should have subnode for refclk_dig to select the reference
	84	+ clock source for the reference clock used in the PHY and PMA digital
	85	+ logic.
	86	+ properties:
	87	+ clocks:
	88	+ minItems: 2
	89	+ maxItems: 4
	90	+ description: Phandle to two (Torrent) or four (Sierra) clock nodes representing
	91	+ the inputs to refclk_dig
	92	+
	93	+ "#clock-cells":
	94	+ const: 0
	95	+
	96	+ assigned-clocks:
	97	+ maxItems: 1
	98	+
	99	+ assigned-clock-parents:
	100	+ maxItems: 1
	101	+
	102	+ required:
	103	+ - clocks
	104	+ - "#clock-cells"
	105	+ - assigned-clocks
	106	+ - assigned-clock-parents
	107	+
80	108	patternProperties:
81	109	"^pll[0\|1]-refclk$":
82	110	type: object
@@ -121,34 +149,6 @@ patternProperties: · 38 unmodified lines
121	149	- clocks
122	150	- "#clock-cells"
123	151
124		− "^refclk-dig$":
125		− type: object
126		− description: \|
127		− WIZ node should have subnode for refclk_dig to select the reference
128		− clock source for the reference clock used in the PHY and PMA digital
129		− logic.
130		− properties:
131		− clocks:
132		− minItems: 2
133		− maxItems: 4
134		− description: Phandle to two (Torrent) or four (Sierra) clock nodes representing
135		− the inputs to refclk_dig
136		−
137		− "#clock-cells":
138		− const: 0
139		−
140		− assigned-clocks:
141		− maxItems: 1
142		−
143		− assigned-clock-parents:
144		− maxItems: 1
145		−
146		− required:
147		− - clocks
148		− - "#clock-cells"
149		− - assigned-clocks
150		− - assigned-clock-parents
151		−
152	152	"^serdes@[0-9a-f]+$":
153	153	type: object
154	154	description: \|

Documentation/devicetree/bindings/regulator/fixed-regulator.yaml+2−0

@@ -57,12 +57,14 @@ properties: · 56 unmodified lines
57	57	maxItems: 1
58	58
59	59	power-domains:
	60	+ deprecated: true
60	61	description:
61	62	Power domain to use for enable control. This binding is only
62	63	available if the compatible is chosen to regulator-fixed-domain.
63	64	maxItems: 1
64	65
65	66	required-opps:
	67	+ deprecated: true
66	68	description:
67	69	Performance state to use for enable control. This binding is only
68	70	available if the compatible is chosen to regulator-fixed-domain. The

Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml+3−3

@@ -36,12 +36,12 @@ properties: · 35 unmodified lines
36	36	switching frequency must be one of following corresponding value
37	37	1.1MHz, 1.65MHz, 2.2MHz, 2.75MHz
38	38
39		− patternProperties:
40		− "^ldo[1-4]$":
	39	+ ldortc:
41	40	type: object
42	41	$ref: regulator.yaml#
43	42
44		− "^ldortc$":
	43	+ patternProperties:
	44	+ "^ldo[1-4]$":
45	45	type: object
46	46	$ref: regulator.yaml#
47	47

Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml+2−1

@@ -83,7 +83,8 @@ properties: · 82 unmodified lines
83	83
84	84	unevaluatedProperties: false
85	85
86		− "^vsnvs$":
	86	+ properties:
	87	+ vsnvs:
87	88	type: object
88	89	$ref: regulator.yaml#
89	90	description:

Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml+0−1

@@ -30,7 +30,6 @@ properties: · 29 unmodified lines
30	30	maxItems: 1
31	31
32	32	clocks:
33		− minItems: 2
34	33	items:
35	34	- description: PCLK clocks
36	35	- description: EXTCLK clocks. Faraday calls it CLK1HZ and says the clock

Documentation/devicetree/bindings/spi/spi-controller.yaml+16−16

@@ -79,22 +79,7 @@ properties: · 78 unmodified lines
79	79	description:
80	80	The SPI controller acts as a slave, instead of a master.
81	81
82		−allOf:
83		− - if:
84		− not:
85		− required:
86		− - spi-slave
87		− then:
88		− properties:
89		− "#address-cells":
90		− const: 1
91		− else:
92		− properties:
93		− "#address-cells":
94		− const: 0
95		−
96		−patternProperties:
97		− "^slave$":
	82	+ slave:
98	83	type: object
99	84
100	85	properties:
@@ -105,6 +90,7 @@ patternProperties: · 4 unmodified lines
105	90	required:
106	91	- compatible
107	92
	93	+patternProperties:
108	94	"^.*@[0-9a-f]+$":
109	95	type: object
110	96
@@ -180,6 +166,20 @@ patternProperties: · 69 unmodified lines
180	166	- compatible
181	167	- reg
182	168
	169	+allOf:
	170	+ - if:
	171	+ not:
	172	+ required:
	173	+ - spi-slave
	174	+ then:
	175	+ properties:
	176	+ "#address-cells":
	177	+ const: 1
	178	+ else:
	179	+ properties:
	180	+ "#address-cells":
	181	+ const: 0
	182	+
183	183	additionalProperties: true
184	184
185	185	examples:

Documentation/devicetree/bindings/usb/nxp,isp1760.yaml+0−2

@@ -25,14 +25,12 @@ properties: · 24 unmodified lines
25	25
26	26	interrupts:
27	27	minItems: 1
28		− maxItems: 2
29	28	items:
30	29	- description: Host controller interrupt
31	30	- description: Device controller interrupt in isp1761
32	31
33	32	interrupt-names:
34	33	minItems: 1
35		− maxItems: 2
36	34	items:
37	35	- const: host
38	36	- const: peripheral

Documentation/driver-api/early-userspace/early_userspace_support.rst+4−4

@@ -69,17 +69,17 @@ early userspace image can be built by an unprivileged user. · 68 unmodified lines
69	69
70	70	As a technical note, when directories and files are specified, the
71	71	entire CONFIG_INITRAMFS_SOURCE is passed to
72		−usr/gen_initramfs_list.sh. This means that CONFIG_INITRAMFS_SOURCE
	72	+usr/gen_initramfs.sh. This means that CONFIG_INITRAMFS_SOURCE
73	73	can really be interpreted as any legal argument to
74		−gen_initramfs_list.sh. If a directory is specified as an argument then
	74	+gen_initramfs.sh. If a directory is specified as an argument then
75	75	the contents are scanned, uid/gid translation is performed, and
76	76	usr/gen_init_cpio file directives are output. If a directory is
77		−specified as an argument to usr/gen_initramfs_list.sh then the
	77	+specified as an argument to usr/gen_initramfs.sh then the
78	78	contents of the file are simply copied to the output. All of the output
79	79	directives from directory scanning and file contents copying are
80	80	processed by usr/gen_init_cpio.
81	81
82		−See also 'usr/gen_initramfs_list.sh -h'.
	82	+See also 'usr/gen_initramfs.sh -h'.
83	83
84	84	Where's this all leading?
85	85	=========================

Documentation/features/core/thread-info-in-task/arch-support.txt+32−0

@@ -0,0 +1,32 @@
	1	+#
	2	+# Feature name: thread-info-in-task
	3	+# Kconfig: THREAD_INFO_IN_TASK
	4	+# description: arch makes use of the core kernel facility to embedd thread_info in task_struct
	5	+#
	6	+ -----------------------
	7	+ \| arch \|status\|
	8	+ -----------------------
	9	+ \| alpha: \| TODO \|
	10	+ \| arc: \| TODO \|
	11	+ \| arm: \| TODO \|
	12	+ \| arm64: \| ok \|
	13	+ \| csky: \| TODO \|
	14	+ \| h8300: \| TODO \|
	15	+ \| hexagon: \| TODO \|
	16	+ \| ia64: \| TODO \|
	17	+ \| m68k: \| TODO \|
	18	+ \| microblaze: \| TODO \|
	19	+ \| mips: \| TODO \|
	20	+ \| nds32: \| ok \|
	21	+ \| nios2: \| TODO \|
	22	+ \| openrisc: \| TODO \|
	23	+ \| parisc: \| TODO \|
	24	+ \| powerpc: \| ok \|
	25	+ \| riscv: \| ok \|
	26	+ \| s390: \| ok \|
	27	+ \| sh: \| TODO \|
	28	+ \| sparc: \| TODO \|
	29	+ \| um: \| TODO \|
	30	+ \| x86: \| ok \|
	31	+ \| xtensa: \| TODO \|
	32	+ -----------------------

Documentation/features/time/arch-tick-broadcast/arch-support.txt+1−1

@@ -22,7 +22,7 @@ · 21 unmodified lines
22	22	\| openrisc: \| TODO \|
23	23	\| parisc: \| TODO \|
24	24	\| powerpc: \| ok \|
25		− \| riscv: \| TODO \|
	25	+ \| riscv: \| ok \|
26	26	\| s390: \| TODO \|
27	27	\| sh: \| ok \|
28	28	\| sparc: \| TODO \|

Documentation/filesystems/ramfs-rootfs-initramfs.rst+1−1

@@ -170,7 +170,7 @@ Documentation/driver-api/early-userspace/early_userspace_support.rst for more de · 169 unmodified lines
170	170	The kernel does not depend on external cpio tools. If you specify a
171	171	directory instead of a configuration file, the kernel's build infrastructure
172	172	creates a configuration file from that directory (usr/Makefile calls
173		−usr/gen_initramfs_list.sh), and proceeds to package up that directory
	173	+usr/gen_initramfs.sh), and proceeds to package up that directory
174	174	using the config file (by feeding it to usr/gen_init_cpio, which is created
175	175	from usr/gen_init_cpio.c). The kernel's build-time cpio creation code is
176	176	entirely self-contained, and the kernel's boot-time extractor is also

Documentation/networking/af_xdp.rst+3−3

@@ -243,8 +243,8 @@ Configuration Flags and Socket Options · 242 unmodified lines
243	243	These are the various configuration flags that can be used to control
244	244	and monitor the behavior of AF_XDP sockets.
245	245
246		−XDP_COPY and XDP_ZERO_COPY bind flags
247		−-------------------------------------
	246	+XDP_COPY and XDP_ZEROCOPY bind flags
	247	+------------------------------------
248	248
249	249	When you bind to a socket, the kernel will first try to use zero-copy
250	250	copy. If zero-copy is not supported, it will fall back on using copy
@@ -252,7 +252,7 @@ mode, i.e. copying all packets out to user space. But if you would · 1 unmodified line
252	252	like to force a certain mode, you can use the following flags. If you
253	253	pass the XDP_COPY flag to the bind call, the kernel will force the
254	254	socket into copy mode. If it cannot use copy mode, the bind call will
255		−fail with an error. Conversely, the XDP_ZERO_COPY flag will force the
	255	+fail with an error. Conversely, the XDP_ZEROCOPY flag will force the
256	256	socket into zero-copy mode or fail.
257	257
258	258	XDP_SHARED_UMEM bind flag

Documentation/networking/ip-sysctl.rst+1−1

@@ -826,7 +826,7 @@ tcp_fastopen_blackhole_timeout_sec - INTEGER · 825 unmodified lines
826	826	initial value when the blackhole issue goes away.
827	827	0 to disable the blackhole detection.
828	828
829		− By default, it is set to 1hr.
	829	+ By default, it is set to 0 (feature is disabled).
830	830
831	831	tcp_fastopen_key - list of comma separated 32-digit hexadecimal INTEGERs
832	832	The list consists of a primary key and an optional backup key. The

Documentation/translations/zh_CN/process/2.Process.rst+2−2

@@ -47,7 +47,7 @@ · 46 unmodified lines
47	47	（顺便说一句，值得注意的是，合并窗口期间集成的更改并不是凭空产生的；它们是经
48	48	提前收集、测试和分级的。稍后将详细描述该过程的工作方式。）
49	49
50		−合并窗口持续大约两周。在这段时间结束时，LinusTorvalds将声明窗口已关闭，并
	50	+合并窗口持续大约两周。在这段时间结束时，Linus Torvalds将声明窗口已关闭，并
51	51	释放第一个“rc”内核。例如，对于目标为5.6的内核，在合并窗口结束时发生的释放
52	52	将被称为5.6-rc1。-rc1 版本是一个信号，表示合并新特性的时间已经过去，稳定下一
53	53	个内核的时间已经到来。
@@ -168,7 +168,7 @@ Greg Kroah-Hartman领导。稳定团队将使用5.x.y编号方案不定期地发 · 114 unmodified lines
168	168	补丁如何进入内核
169	169	----------------
170	170
171		−只有一个人可以将补丁合并到主线内核存储库中：LinusTorvalds。但是，在进入
	171	+只有一个人可以将补丁合并到主线内核存储库中：Linus Torvalds。但是，在进入
172	172	2.6.38内核的9500多个补丁中，只有112个（大约1.3%）是由Linus自己直接选择的。
173	173	内核项目已经发展到一个没有一个开发人员可以在没有支持的情况下检查和选择每个
174	174	补丁的规模。内核开发人员处理这种增长的方式是使用围绕信任链构建的助理系统。

LICENSES/dual/CC-BY-4.0+1−1

@@ -392,7 +392,7 @@ Section 8 -- Interpretation. · 391 unmodified lines
392	392	Creative Commons is not a party to its public
393	393	licenses. Notwithstanding, Creative Commons may elect to apply one of
394	394	its public licenses to material it publishes and in those instances
395		−will be considered the “Licensor.” The text of the Creative Commons
	395	+will be considered the "Licensor." The text of the Creative Commons
396	396	public licenses is dedicated to the public domain under the CC0 Public
397	397	Domain Dedication. Except for the limited purpose of indicating that
398	398	material is shared under a Creative Commons public license or as

MAINTAINERS+2−0

@@ -933,6 +933,7 @@ F: drivers/video/fbdev/geode/ · 932 unmodified lines
933	933
934	934	AMD IOMMU (AMD-VI)
935	935	M: Joerg Roedel <joro@8bytes.org>
	936	+R: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
936	937	L: iommu@lists.linux-foundation.org
937	938	S: Maintained
938	939	T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@ -11764,6 +11765,7 @@ F: drivers/char/hw_random/mtk-rng.c · 10825 unmodified lines
11764	11765	MEDIATEK SWITCH DRIVER
11765	11766	M: Sean Wang <sean.wang@mediatek.com>
11766	11767	M: Landen Chao <Landen.Chao@mediatek.com>
	11768	+M: DENG Qingfang <dqfext@gmail.com>
11767	11769	L: netdev@vger.kernel.org
11768	11770	S: Maintained
11769	11771	F: drivers/net/dsa/mt7530.*

Makefile+7−6

@@ -2,7 +2,7 @@ · 1 unmodified line
2	2	VERSION = 5
3	3	PATCHLEVEL = 14
4	4	SUBLEVEL = 0
5		−EXTRAVERSION = -rc1
	5	+EXTRAVERSION = -rc2
6	6	NAME = Opossums on Parade
7	7
8	8	# DOCUMENTATION
@@ -728,11 +728,12 @@ $(KCONFIG_CONFIG): · 719 unmodified lines
728	728	# This exploits the 'multi-target pattern rule' trick.
729	729	# The syncconfig should be executed only once to make all the targets.
730	730	# (Note: use the grouped target '&:' when we bump to GNU Make 4.3)
731		−quiet_cmd_syncconfig = SYNC $@
732		− cmd_syncconfig = $(MAKE) -f $(srctree)/Makefile syncconfig
733		−
	731	+#
	732	+# Do not use $(call cmd,...) here. That would suppress prompts from syncconfig,
	733	+# so you cannot notice that Kconfig is waiting for the user input.
734	734	%/config/auto.conf %/config/auto.conf.cmd %/generated/autoconf.h: $(KCONFIG_CONFIG)
735		− +$(call cmd,syncconfig)
	735	+ $(Q)$(kecho) " SYNC $@"
	736	+ $(Q)$(MAKE) -f $(srctree)/Makefile syncconfig
736	737	else # !may-sync-config
737	738	# External modules and some install targets need include/generated/autoconf.h
738	739	# and include/config/auto.conf but do not care if they are up-to-date.
@@ -802,7 +803,7 @@ else · 63 unmodified lines
802	803	# Warn about unmarked fall-throughs in switch statement.
803	804	# Disabled for clang while comment to attribute conversion happens and
804	805	# https://github.com/ClangBuiltLinux/linux/issues/636 is discussed.
805		−KBUILD_CFLAGS += $(call cc-option,-Wimplicit-fallthrough,)
	806	+KBUILD_CFLAGS += $(call cc-option,-Wimplicit-fallthrough=5,)
806	807	endif
807	808
808	809	# These warnings generated too much noise in a regular build.

arch/arm/Kconfig+1−1

@@ -395,7 +395,7 @@ config ARCH_IXP4XX · 394 unmodified lines
395	395	select IXP4XX_IRQ
396	396	select IXP4XX_TIMER
397	397	# With the new PCI driver this is not needed
398		− select NEED_MACH_IO_H if PCI_IXP4XX_LEGACY
	398	+ select NEED_MACH_IO_H if IXP4XX_PCI_LEGACY
399	399	select USB_EHCI_BIG_ENDIAN_DESC
400	400	select USB_EHCI_BIG_ENDIAN_MMIO
401	401	help

arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts+3−1

@@ -4,6 +4,7 @@ · 3 unmodified lines
4	4	#include "aspeed-g5.dtsi"
5	5	#include <dt-bindings/gpio/aspeed-gpio.h>
6	6	#include <dt-bindings/i2c/i2c.h>
	7	+#include <dt-bindings/interrupt-controller/irq.h>
7	8
8	9	/{
9	10	model = "ASRock E3C246D4I BMC";
@@ -73,7 +74,8 @@ · 63 unmodified lines
73	74
74	75	&vuart {
75	76	status = "okay";
76		− aspeed,sirq-active-high;
	77	+ aspeed,lpc-io-reg = <0x2f8>;
	78	+ aspeed,lpc-interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
77	79	};
78	80
79	81	&mac0 {

arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts+5−4

@@ -406,14 +406,14 @@ · 405 unmodified lines
406	406	reg = <0x69>;
407	407	};
408	408
409		− power-supply@6a {
	409	+ power-supply@6b {
410	410	compatible = "ibm,cffps";
411		− reg = <0x6a>;
	411	+ reg = <0x6b>;
412	412	};
413	413
414		− power-supply@6b {
	414	+ power-supply@6d {
415	415	compatible = "ibm,cffps";
416		− reg = <0x6b>;
	416	+ reg = <0x6d>;
417	417	};
418	418	};
419	419
@@ -2832,6 +2832,7 @@ · 2412 unmodified lines
2832	2832
2833	2833	&emmc {
2834	2834	status = "okay";
	2835	+ clk-phase-mmc-hs200 = <180>, <180>;
2835	2836	};
2836	2837
2837	2838	&fsim0 {

arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts+1−4

@@ -280,10 +280,7 @@ · 279 unmodified lines
280	280	/W0-W7/ "","","","","","","","",
281	281	/X0-X7/ "","","","","","","","",
282	282	/Y0-Y7/ "","","","","","","","",
283		− /Z0-Z7/ "","","","","","","","",
284		− /AA0-AA7/ "","","","","","","","",
285		− /AB0-AB7/ "","","","","","","","",
286		− /AC0-AC7/ "","","","","","","","";
	283	+ /Z0-Z7/ "","","","","","","","";
287	284
288	285	pin_mclr_vpp {
289	286	gpio-hog;

arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts+2−4

@@ -136,10 +136,7 @@ · 135 unmodified lines
136	136	/W0-W7/ "","","","","","","","",
137	137	/X0-X7/ "","","","","","","","",
138	138	/Y0-Y7/ "","","","","","","","",
139		− /Z0-Z7/ "","","","","","","","",
140		− /AA0-AA7/ "","","","","","","","",
141		− /AB0-AB7/ "","","","","","","","",
142		− /AC0-AC7/ "","","","","","","","";
	139	+ /Z0-Z7/ "","","","","","","","";
143	140	};
144	141
145	142	&fmc {
@@ -189,6 +186,7 @@ · 43 unmodified lines
189	186
190	187	&emmc {
191	188	status = "okay";
	189	+ clk-phase-mmc-hs200 = <36>, <270>;
192	190	};
193	191
194	192	&fsim0 {

arch/arm/boot/dts/versatile-ab.dts+2−3

@@ -195,16 +195,15 @@ · 194 unmodified lines
195	195	#size-cells = <1>;
196	196	ranges;
197	197
198		− vic: intc@10140000 {
	198	+ vic: interrupt-controller@10140000 {
199	199	compatible = "arm,versatile-vic";
200	200	interrupt-controller;
201	201	#interrupt-cells = <1>;
202	202	reg = <0x10140000 0x1000>;
203		− clear-mask = <0xffffffff>;
204	203	valid-mask = <0xffffffff>;
205	204	};
206	205
207		− sic: intc@10003000 {
	206	+ sic: interrupt-controller@10003000 {
208	207	compatible = "arm,versatile-sic";
209	208	interrupt-controller;
210	209	#interrupt-cells = <1>;

arch/arm/boot/dts/versatile-pb.dts+1−1

@@ -7,7 +7,7 @@ · 6 unmodified lines
7	7
8	8	amba {
9	9	/* The Versatile PB is using more SIC IRQ lines than the AB */
10		− sic: intc@10003000 {
	10	+ sic: interrupt-controller@10003000 {
11	11	clear-mask = <0xffffffff>;
12	12	/*
13	13	* Valid interrupt lines mask according to

arch/arm/configs/integrator_defconfig+1−4

@@ -57,10 +57,7 @@ CONFIG_DRM=y · 56 unmodified lines
57	57	CONFIG_DRM_DISPLAY_CONNECTOR=y
58	58	CONFIG_DRM_SIMPLE_BRIDGE=y
59	59	CONFIG_DRM_PL111=y
60		−CONFIG_FB_MODE_HELPERS=y
61		−CONFIG_FB_MATROX=y
62		−CONFIG_FB_MATROX_MILLENIUM=y
63		−CONFIG_FB_MATROX_MYSTIQUE=y
	60	+CONFIG_FB=y
64	61	CONFIG_BACKLIGHT_CLASS_DEVICE=y
65	62	# CONFIG_VGA_CONSOLE is not set
66	63	CONFIG_LOGO=y

arch/arm/configs/multi_v7_defconfig+1−1

@@ -821,7 +821,7 @@ CONFIG_USB_ISP1760=y · 820 unmodified lines
821	821	CONFIG_USB_HSIC_USB3503=y
822	822	CONFIG_AB8500_USB=y
823	823	CONFIG_KEYSTONE_USB_PHY=m
824		−CONFIG_NOP_USB_XCEIV=m
	824	+CONFIG_NOP_USB_XCEIV=y
825	825	CONFIG_AM335X_PHY_USB=m
826	826	CONFIG_TWL6030_USB=m
827	827	CONFIG_USB_GPIO_VBUS=y

arch/arm/configs/realview_defconfig+1−3

@@ -64,11 +64,9 @@ CONFIG_DRM_PANEL_SIMPLE=y · 63 unmodified lines
64	64	CONFIG_DRM_DISPLAY_CONNECTOR=y
65	65	CONFIG_DRM_SIMPLE_BRIDGE=y
66	66	CONFIG_DRM_PL111=y
67		−CONFIG_FB_MODE_HELPERS=y
	67	+CONFIG_FB=y
68	68	CONFIG_BACKLIGHT_CLASS_DEVICE=y
69	69	CONFIG_LOGO=y
70		−# CONFIG_LOGO_LINUX_MONO is not set
71		−# CONFIG_LOGO_LINUX_VGA16 is not set
72	70	CONFIG_SOUND=y
73	71	CONFIG_SND=y
74	72	# CONFIG_SND_DRIVERS is not set

arch/arm/configs/shmobile_defconfig+1−0

@@ -135,6 +135,7 @@ CONFIG_DRM_SII902X=y · 134 unmodified lines
135	135	CONFIG_DRM_SIMPLE_BRIDGE=y
136	136	CONFIG_DRM_I2C_ADV7511=y
137	137	CONFIG_DRM_I2C_ADV7511_AUDIO=y
	138	+CONFIG_FB=y
138	139	CONFIG_FB_SH_MOBILE_LCDC=y
139	140	CONFIG_BACKLIGHT_PWM=y
140	141	CONFIG_BACKLIGHT_AS3711=y

arch/arm/configs/u8500_defconfig+5−0

@@ -61,6 +61,10 @@ CONFIG_INPUT_TOUCHSCREEN=y · 60 unmodified lines
61	61	CONFIG_TOUCHSCREEN_ATMEL_MXT=y
62	62	CONFIG_TOUCHSCREEN_BU21013=y
63	63	CONFIG_TOUCHSCREEN_CY8CTMA140=y
	64	+CONFIG_TOUCHSCREEN_CYTTSP_CORE=y
	65	+CONFIG_TOUCHSCREEN_CYTTSP_SPI=y
	66	+CONFIG_TOUCHSCREEN_MMS114=y
	67	+CONFIG_TOUCHSCREEN_ZINITIX=y
64	68	CONFIG_INPUT_MISC=y
65	69	CONFIG_INPUT_AB8500_PONKEY=y
66	70	CONFIG_INPUT_GPIO_VIBRA=y
@@ -100,6 +104,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E63M0_DSI=y · 33 unmodified lines
100	104	CONFIG_DRM_PANEL_SONY_ACX424AKP=y
101	105	CONFIG_DRM_LIMA=y
102	106	CONFIG_DRM_MCDE=y
	107	+CONFIG_FB=y
103	108	CONFIG_BACKLIGHT_CLASS_DEVICE=y
104	109	CONFIG_BACKLIGHT_KTD253=y
105	110	CONFIG_BACKLIGHT_GPIO=y

arch/arm/configs/versatile_defconfig+1−3

@@ -60,7 +60,7 @@ CONFIG_DRM_PANEL_SIMPLE=y · 59 unmodified lines
60	60	CONFIG_DRM_DISPLAY_CONNECTOR=y
61	61	CONFIG_DRM_SIMPLE_BRIDGE=y
62	62	CONFIG_DRM_PL111=y
63		−CONFIG_FB_MODE_HELPERS=y
	63	+CONFIG_FB=y
64	64	CONFIG_BACKLIGHT_CLASS_DEVICE=y
65	65	CONFIG_LOGO=y
66	66	CONFIG_SOUND=y
@@ -88,8 +88,6 @@ CONFIG_NFSD=y · 21 unmodified lines
88	88	CONFIG_NFSD_V3=y
89	89	CONFIG_NLS_CODEPAGE_850=m
90	90	CONFIG_NLS_ISO8859_1=m
91		−CONFIG_FONTS=y
92		−CONFIG_FONT_ACORN_8x8=y
93	91	CONFIG_MAGIC_SYSRQ=y
94	92	CONFIG_DEBUG_FS=y
95	93	CONFIG_DEBUG_KERNEL=y

arch/arm/configs/vexpress_defconfig+7−10

@@ -11,9 +11,6 @@ CONFIG_CPUSETS=y · 10 unmodified lines
11	11	# CONFIG_NET_NS is not set
12	12	CONFIG_BLK_DEV_INITRD=y
13	13	CONFIG_PROFILING=y
14		−CONFIG_MODULES=y
15		−CONFIG_MODULE_UNLOAD=y
16		−# CONFIG_BLK_DEV_BSG is not set
17	14	CONFIG_ARCH_VEXPRESS=y
18	15	CONFIG_ARCH_VEXPRESS_DCSCB=y
19	16	CONFIG_ARCH_VEXPRESS_TC2_PM=y
@@ -23,14 +20,17 @@ CONFIG_MCPM=y · 3 unmodified lines
23	20	CONFIG_VMSPLIT_2G=y
24	21	CONFIG_NR_CPUS=8
25	22	CONFIG_ARM_PSCI=y
26		−CONFIG_CMA=y
27	23	CONFIG_ZBOOT_ROM_TEXT=0x0
28	24	CONFIG_ZBOOT_ROM_BSS=0x0
29	25	CONFIG_CMDLINE="console=ttyAMA0"
30	26	CONFIG_CPU_IDLE=y
31	27	CONFIG_VFP=y
32	28	CONFIG_NEON=y
	29	+CONFIG_MODULES=y
	30	+CONFIG_MODULE_UNLOAD=y
	31	+# CONFIG_BLK_DEV_BSG is not set
33	32	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
	33	+CONFIG_CMA=y
34	34	CONFIG_NET=y
35	35	CONFIG_PACKET=y
36	36	CONFIG_UNIX=y
@@ -43,7 +43,6 @@ CONFIG_IP_PNP_BOOTP=y · 6 unmodified lines
43	43	CONFIG_NET_9P=y
44	44	CONFIG_NET_9P_VIRTIO=y
45	45	CONFIG_DEVTMPFS=y
46		−CONFIG_DMA_CMA=y
47	46	CONFIG_MTD=y
48	47	CONFIG_MTD_CMDLINE_PARTS=y
49	48	CONFIG_MTD_BLOCK=y
@@ -59,7 +58,6 @@ CONFIG_VIRTIO_BLK=y · 9 unmodified lines
59	58	CONFIG_BLK_DEV_SD=y
60	59	CONFIG_SCSI_VIRTIO=y
61	60	CONFIG_ATA=y
62		−# CONFIG_SATA_PMP is not set
63	61	CONFIG_NETDEVICES=y
64	62	CONFIG_VIRTIO_NET=y
65	63	CONFIG_SMC91X=y
@@ -81,11 +79,9 @@ CONFIG_DRM=y · 15 unmodified lines
81	79	CONFIG_DRM_PANEL_SIMPLE=y
82	80	CONFIG_DRM_SII902X=y
83	81	CONFIG_DRM_PL111=y
84		−CONFIG_FB_MODE_HELPERS=y
	82	+CONFIG_FB=y
85	83	CONFIG_BACKLIGHT_CLASS_DEVICE=y
86	84	CONFIG_LOGO=y
87		−# CONFIG_LOGO_LINUX_MONO is not set
88		−# CONFIG_LOGO_LINUX_VGA16 is not set
89	85	CONFIG_SOUND=y
90	86	CONFIG_SND=y
91	87	# CONFIG_SND_DRIVERS is not set
@@ -136,10 +132,11 @@ CONFIG_ROOT_NFS=y · 44 unmodified lines
136	132	CONFIG_9P_FS=y
137	133	CONFIG_NLS_CODEPAGE_437=y
138	134	CONFIG_NLS_ISO8859_1=y
	135	+# CONFIG_CRYPTO_HW is not set
	136	+CONFIG_DMA_CMA=y
139	137	CONFIG_DEBUG_INFO=y
140	138	CONFIG_MAGIC_SYSRQ=y
141	139	CONFIG_DEBUG_KERNEL=y
142	140	CONFIG_DETECT_HUNG_TASK=y
143	141	# CONFIG_SCHED_DEBUG is not set
144	142	CONFIG_DEBUG_USER=y
145		−# CONFIG_CRYPTO_HW is not set

arch/arm64/Kconfig+2−1

@@ -1605,7 +1605,8 @@ config ARM64_BTI_KERNEL · 1604 unmodified lines
1605	1605	depends on CC_HAS_BRANCH_PROT_PAC_RET_BTI
1606	1606	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94697
1607	1607	depends on !CC_IS_GCC \|\| GCC_VERSION >= 100100
1608		− depends on !(CC_IS_CLANG && GCOV_KERNEL)
	1608	+ # https://github.com/llvm/llvm-project/commit/a88c722e687e6780dcd6a58718350dc76fcc4cc9
	1609	+ depends on !CC_IS_CLANG \|\| CLANG_VERSION >= 120000
1609	1610	depends on (!FUNCTION_GRAPH_TRACER \|\| DYNAMIC_FTRACE_WITH_REGS)
1610	1611	help
1611	1612	Build the kernel with Branch Target Identification annotations

arch/arm64/boot/dts/nvidia/tegra194.dtsi+13−0

@@ -948,6 +948,10 @@ · 947 unmodified lines
948	948	<&bpmp TEGRA194_CLK_XUSB_SS>,
949	949	<&bpmp TEGRA194_CLK_XUSB_FS>;
950	950	clock-names = "dev", "ss", "ss_src", "fs_src";
	951	+ interconnects = <&mc TEGRA194_MEMORY_CLIENT_XUSB_DEVR &emc>,
	952	+ <&mc TEGRA194_MEMORY_CLIENT_XUSB_DEVW &emc>;
	953	+ interconnect-names = "dma-mem", "write";
	954	+ iommus = <&smmu TEGRA194_SID_XUSB_DEV>;
951	955	power-domains = <&bpmp TEGRA194_POWER_DOMAIN_XUSBB>,
952	956	<&bpmp TEGRA194_POWER_DOMAIN_XUSBA>;
953	957	power-domain-names = "dev", "ss";
@@ -977,6 +981,10 @@ · 23 unmodified lines
977	981	"xusb_ss", "xusb_ss_src", "xusb_hs_src",
978	982	"xusb_fs_src", "pll_u_480m", "clk_m",
979	983	"pll_e";
	984	+ interconnects = <&mc TEGRA194_MEMORY_CLIENT_XUSB_HOSTR &emc>,
	985	+ <&mc TEGRA194_MEMORY_CLIENT_XUSB_HOSTW &emc>;
	986	+ interconnect-names = "dma-mem", "write";
	987	+ iommus = <&smmu TEGRA194_SID_XUSB_HOST>;
980	988
981	989	power-domains = <&bpmp TEGRA194_POWER_DOMAIN_XUSBC>,
982	990	<&bpmp TEGRA194_POWER_DOMAIN_XUSBA>;
@@ -2469,6 +2477,11 @@ · 1486 unmodified lines
2469	2477	* for 8x and 11.025x sample rate streams.
2470	2478	*/
2471	2479	assigned-clock-rates = <258000000>;
	2480	+
	2481	+ interconnects = <&mc TEGRA194_MEMORY_CLIENT_APEDMAR &emc>,
	2482	+ <&mc TEGRA194_MEMORY_CLIENT_APEDMAW &emc>;
	2483	+ interconnect-names = "dma-mem", "write";
	2484	+ iommus = <&smmu TEGRA194_SID_APE>;
2472	2485	};
2473	2486
2474	2487	tcu: tcu {

arch/arm64/boot/dts/renesas/r9a07g044.dtsi+2−2

@@ -82,10 +82,10 @@ · 81 unmodified lines
82	82	<GIC_SPI 384 IRQ_TYPE_LEVEL_HIGH>;
83	83	interrupt-names = "eri", "rxi", "txi",
84	84	"bri", "dri", "tei";
85		− clocks = <&cpg CPG_MOD R9A07G044_CLK_SCIF0>;
	85	+ clocks = <&cpg CPG_MOD R9A07G044_SCIF0_CLK_PCK>;
86	86	clock-names = "fck";
87	87	power-domains = <&cpg>;
88		− resets = <&cpg R9A07G044_CLK_SCIF0>;
	88	+ resets = <&cpg R9A07G044_SCIF0_RST_SYSTEM_N>;
89	89	status = "disabled";
90	90	};
91	91

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

@@ -47,7 +47,7 @@ · 46 unmodified lines
47	47	* cache before the transfer is done, causing old data to be seen by
48	48	* the CPU.
49	49	*/
50		−#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
	50	+#define ARCH_DMA_MINALIGN (128)
51	51
52	52	#ifdef CONFIG_KASAN_SW_TAGS
53	53	#define ARCH_SLAB_MINALIGN (1ULL << KASAN_SHADOW_SCALE_SHIFT)

arch/arm64/include/asm/smp_plat.h+1−0

@@ -10,6 +10,7 @@ · 9 unmodified lines
10	10
11	11	#include <linux/cpumask.h>
12	12
	13	+#include <asm/smp.h>
13	14	#include <asm/types.h>
14	15
15	16	struct mpidr_hash {

arch/arm64/kernel/Makefile+1−1

@@ -17,7 +17,7 @@ CFLAGS_syscall.o += -fno-stack-protector · 16 unmodified lines
17	17	# It's not safe to invoke KCOV when portions of the kernel environment aren't
18	18	# available or are out-of-sync with HW state. Since `noinstr` doesn't always
19	19	# inhibit KCOV instrumentation, disable it for the entire compilation unit.
20		−KCOV_INSTRUMENT_entry.o := n
	20	+KCOV_INSTRUMENT_entry-common.o := n
21	21	KCOV_INSTRUMENT_idle.o := n
22	22
23	23	# Object file lists.

arch/arm64/kernel/cpufeature.c+1−0

@@ -81,6 +81,7 @@ · 80 unmodified lines
81	81	#include <asm/mmu_context.h>
82	82	#include <asm/mte.h>
83	83	#include <asm/processor.h>
	84	+#include <asm/smp.h>
84	85	#include <asm/sysreg.h>
85	86	#include <asm/traps.h>
86	87	#include <asm/virt.h>

arch/arm64/kernel/entry-common.c+1−1

@@ -604,7 +604,7 @@ asmlinkage void noinstr el0t_64_fiq_handler(struct pt_regs *regs) · 603 unmodified lines
604	604	__el0_fiq_handler_common(regs);
605	605	}
606	606
607		−static void __el0_error_handler_common(struct pt_regs *regs)
	607	+static void noinstr __el0_error_handler_common(struct pt_regs *regs)
608	608	{
609	609	unsigned long esr = read_sysreg(esr_el1);
610	610

arch/arm64/kernel/mte.c+2−13

@@ -193,18 +193,6 @@ void mte_check_tfsr_el1(void) · 192 unmodified lines
193	193	}
194	194	#endif
195	195
196		−static void update_gcr_el1_excl(u64 excl)
197		−{
198		−
199		− /*
200		− * Note that the mask controlled by the user via prctl() is an
201		− * include while GCR_EL1 accepts an exclude mask.
202		− * No need for ISB since this only affects EL0 currently, implicit
203		− * with ERET.
204		− */
205		− sysreg_clear_set_s(SYS_GCR_EL1, SYS_GCR_EL1_EXCL_MASK, excl);
206		−}
207		−
208	196	static void set_gcr_el1_excl(u64 excl)
209	197	{
210	198	current->thread.gcr_user_excl = excl;
@@ -265,7 +253,8 @@ void mte_suspend_exit(void) · 54 unmodified lines
265	253	if (!system_supports_mte())
266	254	return;
267	255
268		− update_gcr_el1_excl(gcr_kernel_excl);
	256	+ sysreg_clear_set_s(SYS_GCR_EL1, SYS_GCR_EL1_EXCL_MASK, gcr_kernel_excl);
	257	+ isb();
269	258	}
270	259
271	260	long set_mte_ctrl(struct task_struct *task, unsigned long arg)

arch/arm64/kernel/smccc-call.S+6−3

@@ -32,20 +32,23 @@ SYM_FUNC_END(__arm_smccc_sve_check) · 31 unmodified lines
32	32	EXPORT_SYMBOL(__arm_smccc_sve_check)
33	33
34	34	.macro SMCCC instr
	35	+ stp x29, x30, [sp, #-16]!
	36	+ mov x29, sp
35	37	alternative_if ARM64_SVE
36	38	bl __arm_smccc_sve_check
37	39	alternative_else_nop_endif
38	40	\instr #0
39		− ldr x4, [sp]
	41	+ ldr x4, [sp, #16]
40	42	stp x0, x1, [x4, #ARM_SMCCC_RES_X0_OFFS]
41	43	stp x2, x3, [x4, #ARM_SMCCC_RES_X2_OFFS]
42		− ldr x4, [sp, #8]
	44	+ ldr x4, [sp, #24]
43	45	cbz x4, 1f /* no quirk structure */
44	46	ldr x9, [x4, #ARM_SMCCC_QUIRK_ID_OFFS]
45	47	cmp x9, #ARM_SMCCC_QUIRK_QCOM_A6
46	48	b.ne 1f
47	49	str x6, [x4, ARM_SMCCC_QUIRK_STATE_OFFS]
48		−1: ret
	50	+1: ldp x29, x30, [sp], #16
	51	+ ret
49	52	.endm
50	53
51	54	/*

arch/arm64/lib/copy_from_user.S+10−3

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	29	.endm
30	30
31	31	.macro ldrh1 reg, ptr, val
32		− user_ldst 9998f, ldtrh, \reg, \ptr, \val
	32	+ user_ldst 9997f, ldtrh, \reg, \ptr, \val
33	33	.endm
34	34
35	35	.macro strh1 reg, ptr, val
@@ -37,7 +37,7 @@ · 1 unmodified line
37	37	.endm
38	38
39	39	.macro ldr1 reg, ptr, val
40		− user_ldst 9998f, ldtr, \reg, \ptr, \val
	40	+ user_ldst 9997f, ldtr, \reg, \ptr, \val
41	41	.endm
42	42
43	43	.macro str1 reg, ptr, val
@@ -45,7 +45,7 @@ · 1 unmodified line
45	45	.endm
46	46
47	47	.macro ldp1 reg1, reg2, ptr, val
48		− user_ldp 9998f, \reg1, \reg2, \ptr, \val
	48	+ user_ldp 9997f, \reg1, \reg2, \ptr, \val
49	49	.endm
50	50
51	51	.macro stp1 reg1, reg2, ptr, val
@@ -53,8 +53,10 @@ · 1 unmodified line
53	53	.endm
54	54
55	55	end .req x5
	56	+srcin .req x15
56	57	SYM_FUNC_START(__arch_copy_from_user)
57	58	add end, x0, x2
	59	+ mov srcin, x1
58	60	#include "copy_template.S"
59	61	mov x0, #0 // Nothing to copy
60	62	ret
@@ -63,6 +65,11 @@ EXPORT_SYMBOL(__arch_copy_from_user) · 2 unmodified lines
63	65
64	66	.section .fixup,"ax"
65	67	.align 2
	68	+9997: cmp dst, dstin
	69	+ b.ne 9998f
	70	+ // Before being absolutely sure we couldn't copy anything, try harder
	71	+USER(9998f, ldtrb tmp1w, [srcin])
	72	+ strb tmp1w, [dst], #1
66	73	9998: sub x0, end, dst // bytes not copied
67	74	ret
68	75	.previous

arch/arm64/lib/copy_in_user.S+14−7

@@ -30,33 +30,34 @@ · 29 unmodified lines
30	30	.endm
31	31
32	32	.macro ldrh1 reg, ptr, val
33		− user_ldst 9998f, ldtrh, \reg, \ptr, \val
	33	+ user_ldst 9997f, ldtrh, \reg, \ptr, \val
34	34	.endm
35	35
36	36	.macro strh1 reg, ptr, val
37		− user_ldst 9998f, sttrh, \reg, \ptr, \val
	37	+ user_ldst 9997f, sttrh, \reg, \ptr, \val
38	38	.endm
39	39
40	40	.macro ldr1 reg, ptr, val
41		− user_ldst 9998f, ldtr, \reg, \ptr, \val
	41	+ user_ldst 9997f, ldtr, \reg, \ptr, \val
42	42	.endm
43	43
44	44	.macro str1 reg, ptr, val
45		− user_ldst 9998f, sttr, \reg, \ptr, \val
	45	+ user_ldst 9997f, sttr, \reg, \ptr, \val
46	46	.endm
47	47
48	48	.macro ldp1 reg1, reg2, ptr, val
49		− user_ldp 9998f, \reg1, \reg2, \ptr, \val
	49	+ user_ldp 9997f, \reg1, \reg2, \ptr, \val
50	50	.endm
51	51
52	52	.macro stp1 reg1, reg2, ptr, val
53		− user_stp 9998f, \reg1, \reg2, \ptr, \val
	53	+ user_stp 9997f, \reg1, \reg2, \ptr, \val
54	54	.endm
55	55
56	56	end .req x5
57		−
	57	+srcin .req x15
58	58	SYM_FUNC_START(__arch_copy_in_user)
59	59	add end, x0, x2
	60	+ mov srcin, x1
60	61	#include "copy_template.S"
61	62	mov x0, #0
62	63	ret
@@ -65,6 +66,12 @@ EXPORT_SYMBOL(__arch_copy_in_user) · 2 unmodified lines
65	66
66	67	.section .fixup,"ax"
67	68	.align 2
	69	+9997: cmp dst, dstin
	70	+ b.ne 9998f
	71	+ // Before being absolutely sure we couldn't copy anything, try harder
	72	+USER(9998f, ldtrb tmp1w, [srcin])
	73	+USER(9998f, sttrb tmp1w, [dst])
	74	+ add dst, dst, #1
68	75	9998: sub x0, end, dst // bytes not copied
69	76	ret
70	77	.previous

arch/arm64/lib/copy_to_user.S+11−3

@@ -32,7 +32,7 @@ · 31 unmodified lines
32	32	.endm
33	33
34	34	.macro strh1 reg, ptr, val
35		− user_ldst 9998f, sttrh, \reg, \ptr, \val
	35	+ user_ldst 9997f, sttrh, \reg, \ptr, \val
36	36	.endm
37	37
38	38	.macro ldr1 reg, ptr, val
@@ -40,7 +40,7 @@ · 1 unmodified line
40	40	.endm
41	41
42	42	.macro str1 reg, ptr, val
43		− user_ldst 9998f, sttr, \reg, \ptr, \val
	43	+ user_ldst 9997f, sttr, \reg, \ptr, \val
44	44	.endm
45	45
46	46	.macro ldp1 reg1, reg2, ptr, val
@@ -48,12 +48,14 @@ · 1 unmodified line
48	48	.endm
49	49
50	50	.macro stp1 reg1, reg2, ptr, val
51		− user_stp 9998f, \reg1, \reg2, \ptr, \val
	51	+ user_stp 9997f, \reg1, \reg2, \ptr, \val
52	52	.endm
53	53
54	54	end .req x5
	55	+srcin .req x15
55	56	SYM_FUNC_START(__arch_copy_to_user)
56	57	add end, x0, x2
	58	+ mov srcin, x1
57	59	#include "copy_template.S"
58	60	mov x0, #0
59	61	ret
@@ -62,6 +64,12 @@ EXPORT_SYMBOL(__arch_copy_to_user) · 2 unmodified lines
62	64
63	65	.section .fixup,"ax"
64	66	.align 2
	67	+9997: cmp dst, dstin
	68	+ b.ne 9998f
	69	+ // Before being absolutely sure we couldn't copy anything, try harder
	70	+ ldrb tmp1w, [srcin]
	71	+USER(9998f, sttrb tmp1w, [dst])
	72	+ add dst, dst, #1
65	73	9998: sub x0, end, dst // bytes not copied
66	74	ret
67	75	.previous

arch/arm64/lib/strlen.S+10−0

@@ -8,6 +8,7 @@ · 7 unmodified lines
8	8
9	9	#include <linux/linkage.h>
10	10	#include <asm/assembler.h>
	11	+#include <asm/mte-def.h>
11	12
12	13	/* Assumptions:
13	14	*
@@ -42,7 +43,16 @@ · 28 unmodified lines
42	43	#define REP8_7f 0x7f7f7f7f7f7f7f7f
43	44	#define REP8_80 0x8080808080808080
44	45
	46	+/*
	47	+ * When KASAN_HW_TAGS is in use, memory is checked at MTE_GRANULE_SIZE
	48	+ * (16-byte) granularity, and we must ensure that no access straddles this
	49	+ * alignment boundary.
	50	+ */
	51	+#ifdef CONFIG_KASAN_HW_TAGS
	52	+#define MIN_PAGE_SIZE MTE_GRANULE_SIZE
	53	+#else
45	54	#define MIN_PAGE_SIZE 4096
	55	+#endif
46	56
47	57	/* Since strings are short on average, we check the first 16 bytes
48	58	of the string for a NUL character. In order to do an unaligned ldp

arch/arm64/mm/mmu.c+8−12

@@ -1339,7 +1339,6 @@ void __init fixmap_remap_fdt(phys_addr_t dt_phys, int size, pgprot_t prot) · 1338 unmodified lines
1339	1339	return dt_virt;
1340	1340	}
1341	1341
1342		−#if CONFIG_PGTABLE_LEVELS > 3
1343	1342	int pud_set_huge(pud_t *pudp, phys_addr_t phys, pgprot_t prot)
1344	1343	{
1345	1344	pud_t new_pud = pfn_pud(__phys_to_pfn(phys), mk_pud_sect_prot(prot));
@@ -1354,16 +1353,6 @@ int pud_set_huge(pud_t *pudp, phys_addr_t phys, pgprot_t prot) · 8 unmodified lines
1354	1353	return 1;
1355	1354	}
1356	1355
1357		−int pud_clear_huge(pud_t *pudp)
1358		−{
1359		− if (!pud_sect(READ_ONCE(*pudp)))
1360		− return 0;
1361		− pud_clear(pudp);
1362		− return 1;
1363		−}
1364		−#endif
1365		−
1366		−#if CONFIG_PGTABLE_LEVELS > 2
1367	1356	int pmd_set_huge(pmd_t *pmdp, phys_addr_t phys, pgprot_t prot)
1368	1357	{
1369	1358	pmd_t new_pmd = pfn_pmd(__phys_to_pfn(phys), mk_pmd_sect_prot(prot));
@@ -1378,6 +1367,14 @@ int pmd_set_huge(pmd_t *pmdp, phys_addr_t phys, pgprot_t prot) · 8 unmodified lines
1378	1367	return 1;
1379	1368	}
1380	1369
	1370	+int pud_clear_huge(pud_t *pudp)
	1371	+{
	1372	+ if (!pud_sect(READ_ONCE(*pudp)))
	1373	+ return 0;
	1374	+ pud_clear(pudp);
	1375	+ return 1;
	1376	+}
	1377	+
1381	1378	int pmd_clear_huge(pmd_t *pmdp)
1382	1379	{
1383	1380	if (!pmd_sect(READ_ONCE(*pmdp)))
@@ -1385,7 +1382,6 @@ int pmd_clear_huge(pmd_t *pmdp) · 1 unmodified line
1385	1382	pmd_clear(pmdp);
1386	1383	return 1;
1387	1384	}
1388		−#endif
1389	1385
1390	1386	int pmd_free_pte_page(pmd_t *pmdp, unsigned long addr)
1391	1387	{

arch/mips/include/asm/fpu.h+1−1

@@ -76,7 +76,7 @@ static inline int __enable_fpu(enum fpu_mode mode) · 75 unmodified lines
76	76	/* we only have a 32-bit FPU */
77	77	return SIGFPE;
78	78	#endif
79		− fallthrough;
	79	+ /* fallthrough */
80	80	case FPU_32BIT:
81	81	if (cpu_has_fre) {
82	82	/* clear FRE */

arch/mips/mm/tlbex.c+2−0

@@ -1383,6 +1383,7 @@ static void build_r4000_tlb_refill_handler(void) · 1382 unmodified lines
1383	1383	switch (boot_cpu_type()) {
1384	1384	default:
1385	1385	if (sizeof(long) == 4) {
	1386	+ fallthrough;
1386	1387	case CPU_LOONGSON2EF:
1387	1388	/* Loongson2 ebase is different than r4k, we have more space */
1388	1389	if ((p - tlb_handler) > 64)
@@ -2169,6 +2170,7 @@ static void build_r4000_tlb_load_handler(void) · 780 unmodified lines
2169	2170	default:
2170	2171	if (cpu_has_mips_r2_exec_hazard) {
2171	2172	uasm_i_ehb(&p);
	2173	+ fallthrough;
2172	2174
2173	2175	case CPU_CAVIUM_OCTEON:
2174	2176	case CPU_CAVIUM_OCTEON_PLUS:

arch/powerpc/mm/nohash/8xx.c+10−0

@@ -240,3 +240,13 @@ void __init setup_kuap(bool disabled) · 239 unmodified lines
240	240	mtspr(SPRN_MD_AP, MD_APG_KUAP);
241	241	}
242	242	#endif
	243	+
	244	+int pud_clear_huge(pud_t *pud)
	245	+{
	246	+ return 0;
	247	+}
	248	+
	249	+int pmd_clear_huge(pmd_t *pmd)
	250	+{
	251	+ return 0;
	252	+}

arch/powerpc/platforms/powermac/smp.c+1−0

@@ -146,6 +146,7 @@ static inline void psurge_clr_ipi(int cpu) · 145 unmodified lines
146	146	switch(psurge_type) {
147	147	case PSURGE_DUAL:
148	148	out_8(psurge_sec_intr, ~0);
	149	+ break;
149	150	case PSURGE_NONE:
150	151	break;
151	152	default:

arch/s390/boot/text_dma.S+4−15

@@ -9,16 +9,6 @@ · 8 unmodified lines
9	9	#include <asm/errno.h>
10	10	#include <asm/sigp.h>
11	11
12		−#ifdef CC_USING_EXPOLINE
13		− .pushsection .dma.text.__s390_indirect_jump_r14,"axG"
14		−__dma__s390_indirect_jump_r14:
15		− larl %r1,0f
16		− ex 0,0(%r1)
17		− j .
18		−0: br %r14
19		− .popsection
20		−#endif
21		−
22	12	.section .dma.text,"ax"
23	13	/*
24	14	* Simplified version of expoline thunk. The normal thunks can not be used here,
@@ -27,11 +17,10 @@ __dma__s390_indirect_jump_r14: · 2 unmodified lines
27	17	* affects a few functions that are not performance-relevant.
28	18	*/
29	19	.macro BR_EX_DMA_r14
30		−#ifdef CC_USING_EXPOLINE
31		− jg __dma__s390_indirect_jump_r14
32		−#else
33		− br %r14
34		−#endif
	20	+ larl %r1,0f
	21	+ ex 0,0(%r1)
	22	+ j .
	23	+0: br %r14
35	24	.endm
36	25
37	26	/*

arch/s390/configs/debug_defconfig+18−9

@@ -5,7 +5,12 @@ CONFIG_WATCH_QUEUE=y · 4 unmodified lines
5	5	CONFIG_AUDIT=y
6	6	CONFIG_NO_HZ_IDLE=y
7	7	CONFIG_HIGH_RES_TIMERS=y
	8	+CONFIG_BPF_SYSCALL=y
	9	+CONFIG_BPF_JIT=y
	10	+CONFIG_BPF_JIT_ALWAYS_ON=y
	11	+CONFIG_BPF_LSM=y
8	12	CONFIG_PREEMPT=y
	13	+CONFIG_SCHED_CORE=y
9	14	CONFIG_BSD_PROCESS_ACCT=y
10	15	CONFIG_BSD_PROCESS_ACCT_V3=y
11	16	CONFIG_TASKSTATS=y
@@ -28,14 +33,13 @@ CONFIG_CGROUP_DEVICE=y · 16 unmodified lines
28	33	CONFIG_CGROUP_CPUACCT=y
29	34	CONFIG_CGROUP_PERF=y
30	35	CONFIG_CGROUP_BPF=y
	36	+CONFIG_CGROUP_MISC=y
31	37	CONFIG_NAMESPACES=y
32	38	CONFIG_USER_NS=y
33	39	CONFIG_CHECKPOINT_RESTORE=y
34	40	CONFIG_SCHED_AUTOGROUP=y
35	41	CONFIG_EXPERT=y
36	42	# CONFIG_SYSFS_SYSCALL is not set
37		−CONFIG_BPF_LSM=y
38		−CONFIG_BPF_SYSCALL=y
39	43	CONFIG_USERFAULTFD=y
40	44	# CONFIG_COMPAT_BRK is not set
41	45	CONFIG_PROFILING=y
@@ -76,6 +80,7 @@ CONFIG_BLK_DEV_THROTTLING=y · 34 unmodified lines
76	80	CONFIG_BLK_WBT=y
77	81	CONFIG_BLK_CGROUP_IOLATENCY=y
78	82	CONFIG_BLK_CGROUP_IOCOST=y
	83	+CONFIG_BLK_CGROUP_IOPRIO=y
79	84	CONFIG_BLK_INLINE_ENCRYPTION=y
80	85	CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
81	86	CONFIG_PARTITION_ADVANCED=y
@@ -95,6 +100,7 @@ CONFIG_CLEANCACHE=y · 13 unmodified lines
95	100	CONFIG_FRONTSWAP=y
96	101	CONFIG_CMA_DEBUG=y
97	102	CONFIG_CMA_DEBUGFS=y
	103	+CONFIG_CMA_SYSFS=y
98	104	CONFIG_CMA_AREAS=7
99	105	CONFIG_MEM_SOFT_DIRTY=y
100	106	CONFIG_ZSWAP=y
@@ -158,6 +164,7 @@ CONFIG_IPV6_RPL_LWTUNNEL=y · 57 unmodified lines
158	164	CONFIG_MPTCP=y
159	165	CONFIG_NETFILTER=y
160	166	CONFIG_BRIDGE_NETFILTER=m
	167	+CONFIG_NETFILTER_NETLINK_HOOK=m
161	168	CONFIG_NF_CONNTRACK=m
162	169	CONFIG_NF_CONNTRACK_SECMARK=y
163	170	CONFIG_NF_CONNTRACK_EVENTS=y
@@ -280,6 +287,7 @@ CONFIG_IP_VS_FTP=m · 116 unmodified lines
280	287	CONFIG_IP_VS_PE_SIP=m
281	288	CONFIG_NFT_FIB_IPV4=m
282	289	CONFIG_NF_TABLES_ARP=y
	290	+CONFIG_NF_LOG_IPV4=m
283	291	CONFIG_IP_NF_IPTABLES=m
284	292	CONFIG_IP_NF_MATCH_AH=m
285	293	CONFIG_IP_NF_MATCH_ECN=m
@@ -384,12 +392,11 @@ CONFIG_VSOCKETS=m · 98 unmodified lines
384	392	CONFIG_VIRTIO_VSOCKETS=m
385	393	CONFIG_NETLINK_DIAG=m
386	394	CONFIG_CGROUP_NET_PRIO=y
387		−CONFIG_BPF_JIT=y
388	395	CONFIG_NET_PKTGEN=m
389	396	CONFIG_PCI=y
390		−CONFIG_PCI_IOV=y
391	397	# CONFIG_PCIEASPM is not set
392	398	CONFIG_PCI_DEBUG=y
	399	+CONFIG_PCI_IOV=y
393	400	CONFIG_HOTPLUG_PCI=y
394	401	CONFIG_HOTPLUG_PCI_S390=y
395	402	CONFIG_DEVTMPFS=y
@@ -436,7 +443,7 @@ CONFIG_MD_MULTIPATH=m · 40 unmodified lines
436	443	CONFIG_MD_FAULTY=m
437	444	CONFIG_MD_CLUSTER=m
438	445	CONFIG_BCACHE=m
439		−CONFIG_BLK_DEV_DM=m
	446	+CONFIG_BLK_DEV_DM=y
440	447	CONFIG_DM_UNSTRIPED=m
441	448	CONFIG_DM_CRYPT=m
442	449	CONFIG_DM_SNAPSHOT=m
@@ -453,6 +460,7 @@ CONFIG_DM_MULTIPATH_ST=m · 10 unmodified lines
453	460	CONFIG_DM_MULTIPATH_HST=m
454	461	CONFIG_DM_MULTIPATH_IOA=m
455	462	CONFIG_DM_DELAY=m
	463	+CONFIG_DM_INIT=y
456	464	CONFIG_DM_UEVENT=y
457	465	CONFIG_DM_FLAKEY=m
458	466	CONFIG_DM_VERITY=m
@@ -495,6 +503,7 @@ CONFIG_NLMON=m · 36 unmodified lines
495	503	# CONFIG_NET_VENDOR_GOOGLE is not set
496	504	# CONFIG_NET_VENDOR_HUAWEI is not set
497	505	# CONFIG_NET_VENDOR_INTEL is not set
	506	+# CONFIG_NET_VENDOR_MICROSOFT is not set
498	507	# CONFIG_NET_VENDOR_MARVELL is not set
499	508	CONFIG_MLX4_EN=m
500	509	CONFIG_MLX5_CORE=m
@@ -551,7 +560,6 @@ CONFIG_INPUT_EVDEV=y · 50 unmodified lines
551	560	CONFIG_LEGACY_PTY_COUNT=0
552	561	CONFIG_VIRTIO_CONSOLE=m
553	562	CONFIG_HW_RANDOM_VIRTIO=m
554		−CONFIG_RAW_DRIVER=m
555	563	CONFIG_HANGCHECK_TIMER=m
556	564	CONFIG_TN3270_FS=y
557	565	CONFIG_PPS=m
@@ -574,7 +582,6 @@ CONFIG_SYNC_FILE=y · 16 unmodified lines
574	582	CONFIG_VFIO=m
575	583	CONFIG_VFIO_PCI=m
576	584	CONFIG_VFIO_MDEV=m
577		−CONFIG_VFIO_MDEV_DEVICE=m
578	585	CONFIG_VIRTIO_PCI=m
579	586	CONFIG_VIRTIO_BALLOON=m
580	587	CONFIG_VIRTIO_INPUT=y
@@ -619,6 +626,7 @@ CONFIG_FUSE_FS=y · 38 unmodified lines
619	626	CONFIG_CUSE=m
620	627	CONFIG_VIRTIO_FS=m
621	628	CONFIG_OVERLAY_FS=m
	629	+CONFIG_NETFS_STATS=y
622	630	CONFIG_FSCACHE=m
623	631	CONFIG_CACHEFILES=m
624	632	CONFIG_ISO9660_FS=y
@@ -654,7 +662,6 @@ CONFIG_NFSD_V3_ACL=y · 29 unmodified lines
654	662	CONFIG_NFSD_V4=y
655	663	CONFIG_NFSD_V4_SECURITY_LABEL=y
656	664	CONFIG_CIFS=m
657		−CONFIG_CIFS_STATS2=y
658	665	CONFIG_CIFS_WEAK_PW_HASH=y
659	666	CONFIG_CIFS_UPCALL=y
660	667	CONFIG_CIFS_XATTR=y
@@ -682,6 +689,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM=y · 21 unmodified lines
682	689	CONFIG_SECURITY_SELINUX_DISABLE=y
683	690	CONFIG_SECURITY_LOCKDOWN_LSM=y
684	691	CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
	692	+CONFIG_SECURITY_LANDLOCK=y
685	693	CONFIG_INTEGRITY_SIGNATURE=y
686	694	CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
687	695	CONFIG_IMA=y
@@ -696,6 +704,7 @@ CONFIG_CRYPTO_CRYPTD=m · 8 unmodified lines
696	704	CONFIG_CRYPTO_TEST=m
697	705	CONFIG_CRYPTO_DH=m
698	706	CONFIG_CRYPTO_ECDH=m
	707	+CONFIG_CRYPTO_ECDSA=m
699	708	CONFIG_CRYPTO_ECRDSA=m
700	709	CONFIG_CRYPTO_SM2=m
701	710	CONFIG_CRYPTO_CURVE25519=m
@@ -843,7 +852,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y · 141 unmodified lines
843	852	CONFIG_FAIL_FUNCTION=y
844	853	CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
845	854	CONFIG_LKDTM=m
846		−CONFIG_TEST_LIST_SORT=y
847	855	CONFIG_TEST_MIN_HEAP=y
848	856	CONFIG_TEST_SORT=y
849	857	CONFIG_KPROBES_SANITY_TEST=y
@@ -853,3 +861,4 @@ CONFIG_PERCPU_TEST=m · 3 unmodified lines
853	861	CONFIG_ATOMIC64_SELFTEST=y
854	862	CONFIG_TEST_BITOPS=m
855	863	CONFIG_TEST_BPF=m
	864	+CONFIG_TEST_LIVEPATCH=m

arch/s390/configs/defconfig+19−8

@@ -4,6 +4,11 @@ CONFIG_WATCH_QUEUE=y · 3 unmodified lines
4	4	CONFIG_AUDIT=y
5	5	CONFIG_NO_HZ_IDLE=y
6	6	CONFIG_HIGH_RES_TIMERS=y
	7	+CONFIG_BPF_SYSCALL=y
	8	+CONFIG_BPF_JIT=y
	9	+CONFIG_BPF_JIT_ALWAYS_ON=y
	10	+CONFIG_BPF_LSM=y
	11	+CONFIG_SCHED_CORE=y
7	12	CONFIG_BSD_PROCESS_ACCT=y
8	13	CONFIG_BSD_PROCESS_ACCT_V3=y
9	14	CONFIG_TASKSTATS=y
@@ -26,14 +31,13 @@ CONFIG_CGROUP_DEVICE=y · 16 unmodified lines
26	31	CONFIG_CGROUP_CPUACCT=y
27	32	CONFIG_CGROUP_PERF=y
28	33	CONFIG_CGROUP_BPF=y
	34	+CONFIG_CGROUP_MISC=y
29	35	CONFIG_NAMESPACES=y
30	36	CONFIG_USER_NS=y
31	37	CONFIG_CHECKPOINT_RESTORE=y
32	38	CONFIG_SCHED_AUTOGROUP=y
33	39	CONFIG_EXPERT=y
34	40	# CONFIG_SYSFS_SYSCALL is not set
35		−CONFIG_BPF_LSM=y
36		−CONFIG_BPF_SYSCALL=y
37	41	CONFIG_USERFAULTFD=y
38	42	# CONFIG_COMPAT_BRK is not set
39	43	CONFIG_PROFILING=y
@@ -70,6 +74,7 @@ CONFIG_BLK_DEV_THROTTLING=y · 30 unmodified lines
70	74	CONFIG_BLK_WBT=y
71	75	CONFIG_BLK_CGROUP_IOLATENCY=y
72	76	CONFIG_BLK_CGROUP_IOCOST=y
	77	+CONFIG_BLK_CGROUP_IOPRIO=y
73	78	CONFIG_BLK_INLINE_ENCRYPTION=y
74	79	CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
75	80	CONFIG_PARTITION_ADVANCED=y
@@ -87,6 +92,7 @@ CONFIG_KSM=y · 11 unmodified lines
87	92	CONFIG_TRANSPARENT_HUGEPAGE=y
88	93	CONFIG_CLEANCACHE=y
89	94	CONFIG_FRONTSWAP=y
	95	+CONFIG_CMA_SYSFS=y
90	96	CONFIG_CMA_AREAS=7
91	97	CONFIG_MEM_SOFT_DIRTY=y
92	98	CONFIG_ZSWAP=y
@@ -149,6 +155,7 @@ CONFIG_IPV6_RPL_LWTUNNEL=y · 56 unmodified lines
149	155	CONFIG_MPTCP=y
150	156	CONFIG_NETFILTER=y
151	157	CONFIG_BRIDGE_NETFILTER=m
	158	+CONFIG_NETFILTER_NETLINK_HOOK=m
152	159	CONFIG_NF_CONNTRACK=m
153	160	CONFIG_NF_CONNTRACK_SECMARK=y
154	161	CONFIG_NF_CONNTRACK_EVENTS=y
@@ -271,6 +278,7 @@ CONFIG_IP_VS_FTP=m · 116 unmodified lines
271	278	CONFIG_IP_VS_PE_SIP=m
272	279	CONFIG_NFT_FIB_IPV4=m
273	280	CONFIG_NF_TABLES_ARP=y
	281	+CONFIG_NF_LOG_IPV4=m
274	282	CONFIG_IP_NF_IPTABLES=m
275	283	CONFIG_IP_NF_MATCH_AH=m
276	284	CONFIG_IP_NF_MATCH_ECN=m
@@ -374,11 +382,10 @@ CONFIG_VSOCKETS=m · 97 unmodified lines
374	382	CONFIG_VIRTIO_VSOCKETS=m
375	383	CONFIG_NETLINK_DIAG=m
376	384	CONFIG_CGROUP_NET_PRIO=y
377		−CONFIG_BPF_JIT=y
378	385	CONFIG_NET_PKTGEN=m
379	386	CONFIG_PCI=y
380		−CONFIG_PCI_IOV=y
381	387	# CONFIG_PCIEASPM is not set
	388	+CONFIG_PCI_IOV=y
382	389	CONFIG_HOTPLUG_PCI=y
383	390	CONFIG_HOTPLUG_PCI_S390=y
384	391	CONFIG_UEVENT_HELPER=y
@@ -427,7 +434,7 @@ CONFIG_MD_MULTIPATH=m · 42 unmodified lines
427	434	CONFIG_MD_FAULTY=m
428	435	CONFIG_MD_CLUSTER=m
429	436	CONFIG_BCACHE=m
430		−CONFIG_BLK_DEV_DM=m
	437	+CONFIG_BLK_DEV_DM=y
431	438	CONFIG_DM_UNSTRIPED=m
432	439	CONFIG_DM_CRYPT=m
433	440	CONFIG_DM_SNAPSHOT=m
@@ -444,6 +451,7 @@ CONFIG_DM_MULTIPATH_ST=m · 10 unmodified lines
444	451	CONFIG_DM_MULTIPATH_HST=m
445	452	CONFIG_DM_MULTIPATH_IOA=m
446	453	CONFIG_DM_DELAY=m
	454	+CONFIG_DM_INIT=y
447	455	CONFIG_DM_UEVENT=y
448	456	CONFIG_DM_FLAKEY=m
449	457	CONFIG_DM_VERITY=m
@@ -487,6 +495,7 @@ CONFIG_NLMON=m · 37 unmodified lines
487	495	# CONFIG_NET_VENDOR_GOOGLE is not set
488	496	# CONFIG_NET_VENDOR_HUAWEI is not set
489	497	# CONFIG_NET_VENDOR_INTEL is not set
	498	+# CONFIG_NET_VENDOR_MICROSOFT is not set
490	499	# CONFIG_NET_VENDOR_MARVELL is not set
491	500	CONFIG_MLX4_EN=m
492	501	CONFIG_MLX5_CORE=m
@@ -543,7 +552,6 @@ CONFIG_INPUT_EVDEV=y · 50 unmodified lines
543	552	CONFIG_LEGACY_PTY_COUNT=0
544	553	CONFIG_VIRTIO_CONSOLE=m
545	554	CONFIG_HW_RANDOM_VIRTIO=m
546		−CONFIG_RAW_DRIVER=m
547	555	CONFIG_HANGCHECK_TIMER=m
548	556	CONFIG_TN3270_FS=y
549	557	# CONFIG_PTP_1588_CLOCK is not set
@@ -566,7 +574,6 @@ CONFIG_SYNC_FILE=y · 16 unmodified lines
566	574	CONFIG_VFIO=m
567	575	CONFIG_VFIO_PCI=m
568	576	CONFIG_VFIO_MDEV=m
569		−CONFIG_VFIO_MDEV_DEVICE=m
570	577	CONFIG_VIRTIO_PCI=m
571	578	CONFIG_VIRTIO_BALLOON=m
572	579	CONFIG_VIRTIO_INPUT=y
@@ -607,6 +614,7 @@ CONFIG_FUSE_FS=y · 34 unmodified lines
607	614	CONFIG_CUSE=m
608	615	CONFIG_VIRTIO_FS=m
609	616	CONFIG_OVERLAY_FS=m
	617	+CONFIG_NETFS_STATS=y
610	618	CONFIG_FSCACHE=m
611	619	CONFIG_CACHEFILES=m
612	620	CONFIG_ISO9660_FS=y
@@ -642,7 +650,6 @@ CONFIG_NFSD_V3_ACL=y · 29 unmodified lines
642	650	CONFIG_NFSD_V4=y
643	651	CONFIG_NFSD_V4_SECURITY_LABEL=y
644	652	CONFIG_CIFS=m
645		−CONFIG_CIFS_STATS2=y
646	653	CONFIG_CIFS_WEAK_PW_HASH=y
647	654	CONFIG_CIFS_UPCALL=y
648	655	CONFIG_CIFS_XATTR=y
@@ -669,6 +676,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM=y · 20 unmodified lines
669	676	CONFIG_SECURITY_SELINUX_DISABLE=y
670	677	CONFIG_SECURITY_LOCKDOWN_LSM=y
671	678	CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
	679	+CONFIG_SECURITY_LANDLOCK=y
672	680	CONFIG_INTEGRITY_SIGNATURE=y
673	681	CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
674	682	CONFIG_IMA=y
@@ -684,6 +692,7 @@ CONFIG_CRYPTO_CRYPTD=m · 9 unmodified lines
684	692	CONFIG_CRYPTO_TEST=m
685	693	CONFIG_CRYPTO_DH=m
686	694	CONFIG_CRYPTO_ECDH=m
	695	+CONFIG_CRYPTO_ECDSA=m
687	696	CONFIG_CRYPTO_ECRDSA=m
688	697	CONFIG_CRYPTO_SM2=m
689	698	CONFIG_CRYPTO_CURVE25519=m
@@ -754,6 +763,7 @@ CONFIG_CRC8=m · 64 unmodified lines
754	763	CONFIG_DMA_CMA=y
755	764	CONFIG_CMA_SIZE_MBYTES=0
756	765	CONFIG_PRINTK_TIME=y
	766	+CONFIG_DYNAMIC_DEBUG=y
757	767	CONFIG_DEBUG_INFO=y
758	768	CONFIG_DEBUG_INFO_DWARF4=y
759	769	CONFIG_GDB_SCRIPTS=y
@@ -781,3 +791,4 @@ CONFIG_LKDTM=m · 21 unmodified lines
781	791	CONFIG_PERCPU_TEST=m
782	792	CONFIG_ATOMIC64_SELFTEST=y
783	793	CONFIG_TEST_BPF=m
	794	+CONFIG_TEST_LIVEPATCH=m

arch/s390/configs/zfcpdump_defconfig+1−2

@@ -29,9 +29,9 @@ CONFIG_PARTITION_ADVANCED=y · 28 unmodified lines
29	29	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
30	30	# CONFIG_COMPACTION is not set
31	31	# CONFIG_MIGRATION is not set
32		−# CONFIG_BOUNCE is not set
33	32	CONFIG_NET=y
34	33	# CONFIG_IUCV is not set
	34	+# CONFIG_PCPU_DEV_REFCNT is not set
35	35	# CONFIG_ETHTOOL_NETLINK is not set
36	36	CONFIG_DEVTMPFS=y
37	37	CONFIG_BLK_DEV_RAM=y
@@ -51,7 +51,6 @@ CONFIG_ZFCP=y · 13 unmodified lines
51	51	# CONFIG_SERIO is not set
52	52	# CONFIG_HVC_IUCV is not set
53	53	# CONFIG_HW_RANDOM_S390 is not set
54		−CONFIG_RAW_DRIVER=y
55	54	# CONFIG_HMC_DRV is not set
56	55	# CONFIG_S390_TAPE is not set
57	56	# CONFIG_VMCP is not set

arch/s390/include/asm/ftrace.h+1−0

@@ -19,6 +19,7 @@ void ftrace_caller(void); · 18 unmodified lines
19	19
20	20	extern char ftrace_graph_caller_end;
21	21	extern unsigned long ftrace_plt;
	22	+extern void *ftrace_func;
22	23
23	24	struct dyn_arch_ftrace { };
24	25

arch/s390/kernel/ftrace.c+2−0

@@ -40,6 +40,7 @@ · 39 unmodified lines
40	40	* trampoline (ftrace_plt), which clobbers also r1.
41	41	*/
42	42
	43	+void *ftrace_func __read_mostly = ftrace_stub;
43	44	unsigned long ftrace_plt;
44	45
45	46	int ftrace_modify_call(struct dyn_ftrace *rec, unsigned long old_addr,
@@ -85,6 +86,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) · 39 unmodified lines
85	86
86	87	int ftrace_update_ftrace_func(ftrace_func_t func)
87	88	{
	89	+ ftrace_func = func;
88	90	return 0;
89	91	}
90	92

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

@@ -59,13 +59,13 @@ ENTRY(ftrace_caller) · 58 unmodified lines
59	59	#ifdef CONFIG_HAVE_MARCH_Z196_FEATURES
60	60	aghik %r2,%r0,-MCOUNT_INSN_SIZE
61	61	lgrl %r4,function_trace_op
62		− lgrl %r1,ftrace_trace_function
	62	+ lgrl %r1,ftrace_func
63	63	#else
64	64	lgr %r2,%r0
65	65	aghi %r2,-MCOUNT_INSN_SIZE
66	66	larl %r4,function_trace_op
67	67	lg %r4,0(%r4)
68		− larl %r1,ftrace_trace_function
	68	+ larl %r1,ftrace_func
69	69	lg %r1,0(%r1)
70	70	#endif
71	71	lgr %r3,%r14

arch/s390/kernel/perf_cpum_cf.c+1−1

@@ -745,7 +745,7 @@ static int __init cpumf_pmu_init(void) · 744 unmodified lines
745	745	if (!cf_dbg) {
746	746	pr_err("Registration of s390dbf(cpum_cf) failed\n");
747	747	return -ENOMEM;
748		− };
	748	+ }
749	749	debug_register_view(cf_dbg, &debug_sprintf_view);
750	750
751	751	cpumf_pmu.attr_groups = cpumf_cf_event_group();

arch/s390/kernel/uprobes.c+1−0

@@ -126,6 +126,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, · 125 unmodified lines
126	126	case DIE_SSTEP:
127	127	if (uprobe_post_sstep_notifier(regs))
128	128	return NOTIFY_STOP;
	129	+ break;
129	130	default:
130	131	break;
131	132	}

arch/s390/kernel/vdso32/Makefile+1−0

@@ -29,6 +29,7 @@ $(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_32) · 28 unmodified lines
29	29	$(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_32)
30	30
31	31	obj-y += vdso32_wrapper.o
	32	+targets += vdso32.lds
32	33	CPPFLAGS_vdso32.lds += -P -C -U$(ARCH)
33	34
34	35	# Disable gcov profiling, ubsan and kasan for VDSO code

arch/s390/net/bpf_jit_comp.c+1−1

@@ -112,7 +112,7 @@ static inline void reg_set_seen(struct bpf_jit *jit, u32 b1) · 111 unmodified lines
112	112	{
113	113	u32 r1 = reg2hex[b1];
114	114
115		− if (!jit->seen_reg[r1] && r1 >= 6 && r1 <= 15)
	115	+ if (r1 >= 6 && r1 <= 15 && !jit->seen_reg[r1])
116	116	jit->seen_reg[r1] = 1;
117	117	}
118	118

arch/x86/kernel/cpu/mshyperv.c+1−1

@@ -237,7 +237,7 @@ static void __init hv_smp_prepare_cpus(unsigned int max_cpus) · 236 unmodified lines
237	237	for_each_present_cpu(i) {
238	238	if (i == 0)
239	239	continue;
240		− ret = hv_call_add_logical_proc(numa_cpu_node(i), i, i);
	240	+ ret = hv_call_add_logical_proc(numa_cpu_node(i), i, cpu_physical_id(i));
241	241	BUG_ON(ret);
242	242	}
243	243

arch/x86/kvm/cpuid.c+25−5

@@ -765,7 +765,8 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) · 764 unmodified lines
765	765
766	766	edx.split.num_counters_fixed = min(cap.num_counters_fixed, MAX_FIXED_COUNTERS);
767	767	edx.split.bit_width_fixed = cap.bit_width_fixed;
768		− edx.split.anythread_deprecated = 1;
	768	+ if (cap.version)
	769	+ edx.split.anythread_deprecated = 1;
769	770	edx.split.reserved1 = 0;
770	771	edx.split.reserved2 = 0;
771	772
@@ -940,8 +941,21 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) · 168 unmodified lines
940	941	unsigned virt_as = max((entry->eax >> 8) & 0xff, 48U);
941	942	unsigned phys_as = entry->eax & 0xff;
942	943
943		− if (!g_phys_as)
	944	+ /*
	945	+ * If TDP (NPT) is disabled use the adjusted host MAXPHYADDR as
	946	+ * the guest operates in the same PA space as the host, i.e.
	947	+ * reductions in MAXPHYADDR for memory encryption affect shadow
	948	+ * paging, too.
	949	+ *
	950	+ * If TDP is enabled but an explicit guest MAXPHYADDR is not
	951	+ * provided, use the raw bare metal MAXPHYADDR as reductions to
	952	+ * the HPAs do not affect GPAs.
	953	+ */
	954	+ if (!tdp_enabled)
	955	+ g_phys_as = boot_cpu_data.x86_phys_bits;
	956	+ else if (!g_phys_as)
944	957	g_phys_as = phys_as;
	958	+
945	959	entry->eax = g_phys_as \| (virt_as << 8);
946	960	entry->edx = 0;
947	961	cpuid_entry_override(entry, CPUID_8000_0008_EBX);
@@ -964,12 +978,18 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) · 16 unmodified lines
964	978	case 0x8000001a:
965	979	case 0x8000001e:
966	980	break;
967		− /* Support memory encryption cpuid if host supports it */
968	981	case 0x8000001F:
969		− if (!kvm_cpu_cap_has(X86_FEATURE_SEV))
	982	+ if (!kvm_cpu_cap_has(X86_FEATURE_SEV)) {
970	983	entry->eax = entry->ebx = entry->ecx = entry->edx = 0;
971		− else
	984	+ } else {
972	985	cpuid_entry_override(entry, CPUID_8000_001F_EAX);
	986	+
	987	+ /*
	988	+ * Enumerate '0' for "PA bits reduction", the adjusted
	989	+ * MAXPHYADDR is enumerated directly (see 0x80000008).
	990	+ */
	991	+ entry->ebx &= ~GENMASK(11, 6);
	992	+ }
973	993	break;
974	994	/Add support for Centaur's CPUID instruction/
975	995	case 0xC0000000:

arch/x86/kvm/mmu/mmu.c+2−0

@@ -53,6 +53,8 @@ · 52 unmodified lines
53	53	#include <asm/kvm_page_track.h>
54	54	#include "trace.h"
55	55
	56	+#include "paging.h"
	57	+
56	58	extern bool itlb_multihit_kvm_mitigation;
57	59
58	60	int __read_mostly nx_huge_pages = -1;

arch/x86/kvm/mmu/paging.h+14−0

@@ -0,0 +1,14 @@
	1	+/* SPDX-License-Identifier: GPL-2.0-only */
	2	+/* Shadow paging constants/helpers that don't need to be #undef'd. */
	3	+#ifndef __KVM_X86_PAGING_H
	4	+#define __KVM_X86_PAGING_H
	5	+
	6	+#define GUEST_PT64_BASE_ADDR_MASK (((1ULL << 52) - 1) & ~(u64)(PAGE_SIZE-1))
	7	+#define PT64_LVL_ADDR_MASK(level) \
	8	+ (GUEST_PT64_BASE_ADDR_MASK & ~((1ULL << (PAGE_SHIFT + (((level) - 1) \
	9	+ * PT64_LEVEL_BITS))) - 1))
	10	+#define PT64_LVL_OFFSET_MASK(level) \
	11	+ (GUEST_PT64_BASE_ADDR_MASK & ((1ULL << (PAGE_SHIFT + (((level) - 1) \
	12	+ * PT64_LEVEL_BITS))) - 1))
	13	+#endif /* __KVM_X86_PAGING_H */
	14	+

arch/x86/kvm/mmu/paging_tmpl.h+2−2

@@ -24,7 +24,7 @@ · 23 unmodified lines
24	24	#define pt_element_t u64
25	25	#define guest_walker guest_walker64
26	26	#define FNAME(name) paging##64_##name
27		− #define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK
	27	+ #define PT_BASE_ADDR_MASK GUEST_PT64_BASE_ADDR_MASK
28	28	#define PT_LVL_ADDR_MASK(lvl) PT64_LVL_ADDR_MASK(lvl)
29	29	#define PT_LVL_OFFSET_MASK(lvl) PT64_LVL_OFFSET_MASK(lvl)
30	30	#define PT_INDEX(addr, level) PT64_INDEX(addr, level)
@@ -57,7 +57,7 @@ · 26 unmodified lines
57	57	#define pt_element_t u64
58	58	#define guest_walker guest_walkerEPT
59	59	#define FNAME(name) ept_##name
60		− #define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK
	60	+ #define PT_BASE_ADDR_MASK GUEST_PT64_BASE_ADDR_MASK
61	61	#define PT_LVL_ADDR_MASK(lvl) PT64_LVL_ADDR_MASK(lvl)
62	62	#define PT_LVL_OFFSET_MASK(lvl) PT64_LVL_OFFSET_MASK(lvl)
63	63	#define PT_INDEX(addr, level) PT64_INDEX(addr, level)

arch/x86/kvm/mmu/spte.h+0−6

@@ -38,12 +38,6 @@ static_assert(SPTE_TDP_AD_ENABLED_MASK == 0); · 37 unmodified lines
38	38	#else
39	39	#define PT64_BASE_ADDR_MASK (((1ULL << 52) - 1) & ~(u64)(PAGE_SIZE-1))
40	40	#endif
41		−#define PT64_LVL_ADDR_MASK(level) \
42		− (PT64_BASE_ADDR_MASK & ~((1ULL << (PAGE_SHIFT + (((level) - 1) \
43		− * PT64_LEVEL_BITS))) - 1))
44		−#define PT64_LVL_OFFSET_MASK(level) \
45		− (PT64_BASE_ADDR_MASK & ((1ULL << (PAGE_SHIFT + (((level) - 1) \
46		− * PT64_LEVEL_BITS))) - 1))
47	41
48	42	#define PT64_PERM_MASK (PT_PRESENT_MASK \| PT_WRITABLE_MASK \| shadow_user_mask \
49	43	\| shadow_x_mask \| shadow_nx_mask \| shadow_me_mask)

arch/x86/kvm/svm/nested.c+33−20

@@ -154,6 +154,10 @@ void recalc_intercepts(struct vcpu_svm *svm) · 153 unmodified lines
154	154
155	155	for (i = 0; i < MAX_INTERCEPT; i++)
156	156	c->intercepts[i] \|= g->intercepts[i];
	157	+
	158	+ /* If SMI is not intercepted, ignore guest SMI intercept as well */
	159	+ if (!intercept_smi)
	160	+ vmcb_clr_intercept(c, INTERCEPT_SMI);
157	161	}
158	162
159	163	static void copy_vmcb_control_area(struct vmcb_control_area *dst,
@@ -304,8 +308,8 @@ static bool nested_vmcb_valid_sregs(struct kvm_vcpu *vcpu, · 144 unmodified lines
304	308	return true;
305	309	}
306	310
307		−static void nested_load_control_from_vmcb12(struct vcpu_svm *svm,
308		− struct vmcb_control_area *control)
	311	+void nested_load_control_from_vmcb12(struct vcpu_svm *svm,
	312	+ struct vmcb_control_area *control)
309	313	{
310	314	copy_vmcb_control_area(&svm->nested.ctl, control);
311	315
@@ -618,6 +622,11 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) · 306 unmodified lines
618	622	struct kvm_host_map map;
619	623	u64 vmcb12_gpa;
620	624
	625	+ if (!svm->nested.hsave_msr) {
	626	+ kvm_inject_gp(vcpu, 0);
	627	+ return 1;
	628	+ }
	629	+
621	630	if (is_smm(vcpu)) {
622	631	kvm_queue_exception(vcpu, UD_VECTOR);
623	632	return 1;
@@ -692,6 +701,27 @@ out: · 68 unmodified lines
692	701	return ret;
693	702	}
694	703
	704	+/* Copy state save area fields which are handled by VMRUN */
	705	+void svm_copy_vmrun_state(struct vmcb_save_area *from_save,
	706	+ struct vmcb_save_area *to_save)
	707	+{
	708	+ to_save->es = from_save->es;
	709	+ to_save->cs = from_save->cs;
	710	+ to_save->ss = from_save->ss;
	711	+ to_save->ds = from_save->ds;
	712	+ to_save->gdtr = from_save->gdtr;
	713	+ to_save->idtr = from_save->idtr;
	714	+ to_save->rflags = from_save->rflags \| X86_EFLAGS_FIXED;
	715	+ to_save->efer = from_save->efer;
	716	+ to_save->cr0 = from_save->cr0;
	717	+ to_save->cr3 = from_save->cr3;
	718	+ to_save->cr4 = from_save->cr4;
	719	+ to_save->rax = from_save->rax;
	720	+ to_save->rsp = from_save->rsp;
	721	+ to_save->rip = from_save->rip;
	722	+ to_save->cpl = 0;
	723	+}
	724	+
695	725	void nested_svm_vmloadsave(struct vmcb from_vmcb, struct vmcb to_vmcb)
696	726	{
697	727	to_vmcb->save.fs = from_vmcb->save.fs;
@@ -1355,28 +1385,11 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, · 657 unmodified lines
1355	1385
1356	1386	svm->nested.vmcb12_gpa = kvm_state->hdr.svm.vmcb_pa;
1357	1387
1358		− svm->vmcb01.ptr->save.es = save->es;
1359		− svm->vmcb01.ptr->save.cs = save->cs;
1360		− svm->vmcb01.ptr->save.ss = save->ss;
1361		− svm->vmcb01.ptr->save.ds = save->ds;
1362		− svm->vmcb01.ptr->save.gdtr = save->gdtr;
1363		− svm->vmcb01.ptr->save.idtr = save->idtr;
1364		− svm->vmcb01.ptr->save.rflags = save->rflags \| X86_EFLAGS_FIXED;
1365		− svm->vmcb01.ptr->save.efer = save->efer;
1366		− svm->vmcb01.ptr->save.cr0 = save->cr0;
1367		− svm->vmcb01.ptr->save.cr3 = save->cr3;
1368		− svm->vmcb01.ptr->save.cr4 = save->cr4;
1369		− svm->vmcb01.ptr->save.rax = save->rax;
1370		− svm->vmcb01.ptr->save.rsp = save->rsp;
1371		− svm->vmcb01.ptr->save.rip = save->rip;
1372		− svm->vmcb01.ptr->save.cpl = 0;
1373		−
	1388	+ svm_copy_vmrun_state(save, &svm->vmcb01.ptr->save);
1374	1389	nested_load_control_from_vmcb12(svm, ctl);
1375	1390
1376	1391	svm_switch_vmcb(svm, &svm->nested.vmcb02);
1377		−
1378	1392	nested_vmcb02_prepare_control(svm);
1379		−
1380	1393	kvm_make_request(KVM_REQ_GET_NESTED_STATE_PAGES, vcpu);
1381	1394	ret = 0;
1382	1395	out_free:

arch/x86/kvm/svm/sev.c+8−6

@@ -1272,8 +1272,8 @@ static int sev_send_update_data(struct kvm kvm, struct kvm_sev_cmd argp) · 1271 unmodified lines
1272	1272	/* Pin guest memory */
1273	1273	guest_page = sev_pin_memory(kvm, params.guest_uaddr & PAGE_MASK,
1274	1274	PAGE_SIZE, &n, 0);
1275		− if (!guest_page)
1276		− return -EFAULT;
	1275	+ if (IS_ERR(guest_page))
	1276	+ return PTR_ERR(guest_page);
1277	1277
1278	1278	/* allocate memory for header and transport buffer */
1279	1279	ret = -ENOMEM;
@@ -1310,8 +1310,9 @@ static int sev_send_update_data(struct kvm kvm, struct kvm_sev_cmd argp) · 30 unmodified lines
1310	1310	}
1311	1311
1312	1312	/* Copy packet header to userspace. */
1313		− ret = copy_to_user((void __user *)(uintptr_t)params.hdr_uaddr, hdr,
1314		− params.hdr_len);
	1313	+ if (copy_to_user((void __user *)(uintptr_t)params.hdr_uaddr, hdr,
	1314	+ params.hdr_len))
	1315	+ ret = -EFAULT;
1315	1316
1316	1317	e_free_trans_data:
1317	1318	kfree(trans_data);
@@ -1463,11 +1464,12 @@ static int sev_receive_update_data(struct kvm kvm, struct kvm_sev_cmd argp) · 145 unmodified lines
1463	1464	data.trans_len = params.trans_len;
1464	1465
1465	1466	/* Pin guest memory */
1466		− ret = -EFAULT;
1467	1467	guest_page = sev_pin_memory(kvm, params.guest_uaddr & PAGE_MASK,
1468	1468	PAGE_SIZE, &n, 0);
1469		− if (!guest_page)
	1469	+ if (IS_ERR(guest_page)) {
	1470	+ ret = PTR_ERR(guest_page);
1470	1471	goto e_free_trans;
	1472	+ }
1471	1473
1472	1474	/* The RECEIVE_UPDATE_DATA command requires C-bit to be always set. */
1473	1475	data.guest_address = (page_to_pfn(guest_page[0]) << PAGE_SHIFT) + offset;

arch/x86/kvm/svm/svm.c+70−7

@@ -198,6 +198,11 @@ module_param(avic, bool, 0444); · 197 unmodified lines
198	198	bool __read_mostly dump_invalid_vmcb;
199	199	module_param(dump_invalid_vmcb, bool, 0644);
200	200
	201	+
	202	+bool intercept_smi = true;
	203	+module_param(intercept_smi, bool, 0444);
	204	+
	205	+
201	206	static bool svm_gp_erratum_intercept = true;
202	207
203	208	static u8 rsm_ins_bytes[] = "\x0f\xaa";
@@ -1185,7 +1190,10 @@ static void init_vmcb(struct kvm_vcpu *vcpu) · 981 unmodified lines
1185	1190
1186	1191	svm_set_intercept(svm, INTERCEPT_INTR);
1187	1192	svm_set_intercept(svm, INTERCEPT_NMI);
1188		− svm_set_intercept(svm, INTERCEPT_SMI);
	1193	+
	1194	+ if (intercept_smi)
	1195	+ svm_set_intercept(svm, INTERCEPT_SMI);
	1196	+
1189	1197	svm_set_intercept(svm, INTERCEPT_SELECTIVE_CR0);
1190	1198	svm_set_intercept(svm, INTERCEPT_RDPMC);
1191	1199	svm_set_intercept(svm, INTERCEPT_CPUID);
@@ -1923,7 +1931,7 @@ static int npf_interception(struct kvm_vcpu *vcpu) · 731 unmodified lines
1923	1931	{
1924	1932	struct vcpu_svm *svm = to_svm(vcpu);
1925	1933
1926		− u64 fault_address = __sme_clr(svm->vmcb->control.exit_info_2);
	1934	+ u64 fault_address = svm->vmcb->control.exit_info_2;
1927	1935	u64 error_code = svm->vmcb->control.exit_info_1;
1928	1936
1929	1937	trace_kvm_page_fault(fault_address, error_code);
@@ -2106,6 +2114,11 @@ static int nmi_interception(struct kvm_vcpu *vcpu) · 176 unmodified lines
2106	2114	return 1;
2107	2115	}
2108	2116
	2117	+static int smi_interception(struct kvm_vcpu *vcpu)
	2118	+{
	2119	+ return 1;
	2120	+}
	2121	+
2109	2122	static int intr_interception(struct kvm_vcpu *vcpu)
2110	2123	{
2111	2124	++vcpu->stat.irq_exits;
@@ -2941,7 +2954,16 @@ static int svm_set_msr(struct kvm_vcpu vcpu, struct msr_data msr) · 829 unmodified lines
2941	2954	svm_disable_lbrv(vcpu);
2942	2955	break;
2943	2956	case MSR_VM_HSAVE_PA:
2944		− svm->nested.hsave_msr = data;
	2957	+ /*
	2958	+ * Old kernels did not validate the value written to
	2959	+ * MSR_VM_HSAVE_PA. Allow KVM_SET_MSR to set an invalid
	2960	+ * value to allow live migrating buggy or malicious guests
	2961	+ * originating from those kernels.
	2962	+ */
	2963	+ if (!msr->host_initiated && !page_address_valid(vcpu, data))
	2964	+ return 1;
	2965	+
	2966	+ svm->nested.hsave_msr = data & PAGE_MASK;
2945	2967	break;
2946	2968	case MSR_VM_CR:
2947	2969	return svm_set_vm_cr(vcpu, data);
@@ -3080,8 +3102,7 @@ static int (const svm_exit_handlers[])(struct kvm_vcpu vcpu) = { · 132 unmodified lines
3080	3102	[SVM_EXIT_EXCP_BASE + GP_VECTOR] = gp_interception,
3081	3103	[SVM_EXIT_INTR] = intr_interception,
3082	3104	[SVM_EXIT_NMI] = nmi_interception,
3083		− [SVM_EXIT_SMI] = kvm_emulate_as_nop,
3084		− [SVM_EXIT_INIT] = kvm_emulate_as_nop,
	3105	+ [SVM_EXIT_SMI] = smi_interception,
3085	3106	[SVM_EXIT_VINTR] = interrupt_window_interception,
3086	3107	[SVM_EXIT_RDPMC] = kvm_emulate_rdpmc,
3087	3108	[SVM_EXIT_CPUID] = kvm_emulate_cpuid,
@@ -4288,6 +4309,7 @@ static int svm_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection) · 1200 unmodified lines
4288	4309	static int svm_enter_smm(struct kvm_vcpu vcpu, char smstate)
4289	4310	{
4290	4311	struct vcpu_svm *svm = to_svm(vcpu);
	4312	+ struct kvm_host_map map_save;
4291	4313	int ret;
4292	4314
4293	4315	if (is_guest_mode(vcpu)) {
@@ -4303,6 +4325,29 @@ static int svm_enter_smm(struct kvm_vcpu vcpu, char smstate) · 9 unmodified lines
4303	4325	ret = nested_svm_vmexit(svm);
4304	4326	if (ret)
4305	4327	return ret;
	4328	+
	4329	+ /*
	4330	+ * KVM uses VMCB01 to store L1 host state while L2 runs but
	4331	+ * VMCB01 is going to be used during SMM and thus the state will
	4332	+ * be lost. Temporary save non-VMLOAD/VMSAVE state to the host save
	4333	+ * area pointed to by MSR_VM_HSAVE_PA. APM guarantees that the
	4334	+ * format of the area is identical to guest save area offsetted
	4335	+ * by 0x400 (matches the offset of 'struct vmcb_save_area'
	4336	+ * within 'struct vmcb'). Note: HSAVE area may also be used by
	4337	+ * L1 hypervisor to save additional host context (e.g. KVM does
	4338	+ * that, see svm_prepare_guest_switch()) which must be
	4339	+ * preserved.
	4340	+ */
	4341	+ if (kvm_vcpu_map(vcpu, gpa_to_gfn(svm->nested.hsave_msr),
	4342	+ &map_save) == -EINVAL)
	4343	+ return 1;
	4344	+
	4345	+ BUILD_BUG_ON(offsetof(struct vmcb, save) != 0x400);
	4346	+
	4347	+ svm_copy_vmrun_state(&svm->vmcb01.ptr->save,
	4348	+ map_save.hva + 0x400);
	4349	+
	4350	+ kvm_vcpu_unmap(vcpu, &map_save, true);
4306	4351	}
4307	4352	return 0;
4308	4353	}
@@ -4310,13 +4355,14 @@ static int svm_enter_smm(struct kvm_vcpu vcpu, char smstate) · 1 unmodified line
4310	4355	static int svm_leave_smm(struct kvm_vcpu vcpu, const char smstate)
4311	4356	{
4312	4357	struct vcpu_svm *svm = to_svm(vcpu);
4313		− struct kvm_host_map map;
	4358	+ struct kvm_host_map map, map_save;
4314	4359	int ret = 0;
4315	4360
4316	4361	if (guest_cpuid_has(vcpu, X86_FEATURE_LM)) {
4317	4362	u64 saved_efer = GET_SMSTATE(u64, smstate, 0x7ed0);
4318	4363	u64 guest = GET_SMSTATE(u64, smstate, 0x7ed8);
4319	4364	u64 vmcb12_gpa = GET_SMSTATE(u64, smstate, 0x7ee0);
	4365	+ struct vmcb *vmcb12;
4320	4366
4321	4367	if (guest) {
4322	4368	if (!guest_cpuid_has(vcpu, X86_FEATURE_SVM))
@@ -4332,8 +4378,25 @@ static int svm_leave_smm(struct kvm_vcpu vcpu, const char smstate) · 9 unmodified lines
4332	4378	if (svm_allocate_nested(svm))
4333	4379	return 1;
4334	4380
4335		− ret = enter_svm_guest_mode(vcpu, vmcb12_gpa, map.hva);
	4381	+ vmcb12 = map.hva;
	4382	+
	4383	+ nested_load_control_from_vmcb12(svm, &vmcb12->control);
	4384	+
	4385	+ ret = enter_svm_guest_mode(vcpu, vmcb12_gpa, vmcb12);
4336	4386	kvm_vcpu_unmap(vcpu, &map, true);
	4387	+
	4388	+ /*
	4389	+ * Restore L1 host state from L1 HSAVE area as VMCB01 was
	4390	+ * used during SMM (see svm_enter_smm())
	4391	+ */
	4392	+ if (kvm_vcpu_map(vcpu, gpa_to_gfn(svm->nested.hsave_msr),
	4393	+ &map_save) == -EINVAL)
	4394	+ return 1;
	4395	+
	4396	+ svm_copy_vmrun_state(map_save.hva + 0x400,
	4397	+ &svm->vmcb01.ptr->save);
	4398	+
	4399	+ kvm_vcpu_unmap(vcpu, &map_save, true);
4337	4400	}
4338	4401	}
4339	4402

arch/x86/kvm/svm/svm.h+5−0

@@ -31,6 +31,7 @@ · 30 unmodified lines
31	31	#define MSRPM_OFFSETS 16
32	32	extern u32 msrpm_offsets[MSRPM_OFFSETS] __read_mostly;
33	33	extern bool npt_enabled;
	34	+extern bool intercept_smi;
34	35
35	36	/*
36	37	* Clean bits in VMCB.
@@ -463,6 +464,8 @@ void svm_leave_nested(struct vcpu_svm *svm); · 426 unmodified lines
463	464	void svm_free_nested(struct vcpu_svm *svm);
464	465	int svm_allocate_nested(struct vcpu_svm *svm);
465	466	int nested_svm_vmrun(struct kvm_vcpu *vcpu);
	467	+void svm_copy_vmrun_state(struct vmcb_save_area *from_save,
	468	+ struct vmcb_save_area *to_save);
466	469	void nested_svm_vmloadsave(struct vmcb from_vmcb, struct vmcb to_vmcb);
467	470	int nested_svm_vmexit(struct vcpu_svm *svm);
468	471
@@ -479,6 +482,8 @@ int nested_svm_check_permissions(struct kvm_vcpu *vcpu); · 10 unmodified lines
479	482	int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr,
480	483	bool has_error_code, u32 error_code);
481	484	int nested_svm_exit_special(struct vcpu_svm *svm);
	485	+void nested_load_control_from_vmcb12(struct vcpu_svm *svm,
	486	+ struct vmcb_control_area *control);
482	487	void nested_sync_control_from_vmcb02(struct vcpu_svm *svm);
483	488	void nested_vmcb02_compute_g_pat(struct vcpu_svm *svm);
484	489	void svm_switch_vmcb(struct vcpu_svm svm, struct kvm_vmcb_info target_vmcb);

arch/x86/kvm/vmx/vmx.h+0−2

@@ -14,8 +14,6 @@ · 13 unmodified lines
14	14	#include "vmx_ops.h"
15	15	#include "cpuid.h"
16	16
17		−extern const u32 vmx_msr_index[];
18		−
19	17	#define MSR_TYPE_R 1
20	18	#define MSR_TYPE_W 2
21	19	#define MSR_TYPE_RW 3

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

@@ -9601,6 +9601,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) · 9600 unmodified lines
9601	9601	set_debugreg(vcpu->arch.eff_db[3], 3);
9602	9602	set_debugreg(vcpu->arch.dr6, 6);
9603	9603	vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_RELOAD;
	9604	+ } else if (unlikely(hw_breakpoint_active())) {
	9605	+ set_debugreg(0, 7);
9604	9606	}
9605	9607
9606	9608	for (;;) {
@@ -10985,9 +10987,6 @@ int kvm_arch_hardware_setup(void *opaque) · 1378 unmodified lines
10985	10987	int r;
10986	10988
10987	10989	rdmsrl_safe(MSR_EFER, &host_efer);
10988		− if (WARN_ON_ONCE(boot_cpu_has(X86_FEATURE_NX) &&
10989		− !(host_efer & EFER_NX)))
10990		− return -EIO;
10991	10990
10992	10991	if (boot_cpu_has(X86_FEATURE_XSAVES))
10993	10992	rdmsrl(MSR_IA32_XSS, host_xss);

arch/x86/mm/pgtable.c+15−19

@@ -682,7 +682,6 @@ int p4d_clear_huge(p4d_t *p4d) · 681 unmodified lines
682	682	}
683	683	#endif
684	684
685		−#if CONFIG_PGTABLE_LEVELS > 3
686	685	/**
687	686	* pud_set_huge - setup kernel PUD mapping
688	687	*
@@ -721,23 +720,6 @@ int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot) · 32 unmodified lines
721	720	return 1;
722	721	}
723	722
724		−/**
725		− * pud_clear_huge - clear kernel PUD mapping when it is set
726		− *
727		− * Returns 1 on success and 0 on failure (no PUD map is found).
728		− */
729		−int pud_clear_huge(pud_t *pud)
730		−{
731		− if (pud_large(*pud)) {
732		− pud_clear(pud);
733		− return 1;
734		− }
735		−
736		− return 0;
737		−}
738		−#endif
739		−
740		−#if CONFIG_PGTABLE_LEVELS > 2
741	723	/**
742	724	* pmd_set_huge - setup kernel PMD mapping
743	725	*
@@ -768,6 +750,21 @@ int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot) · 24 unmodified lines
768	750	return 1;
769	751	}
770	752
	753	+/**
	754	+ * pud_clear_huge - clear kernel PUD mapping when it is set
	755	+ *
	756	+ * Returns 1 on success and 0 on failure (no PUD map is found).
	757	+ */
	758	+int pud_clear_huge(pud_t *pud)
	759	+{
	760	+ if (pud_large(*pud)) {
	761	+ pud_clear(pud);
	762	+ return 1;
	763	+ }
	764	+
	765	+ return 0;
	766	+}
	767	+
771	768	/**
772	769	* pmd_clear_huge - clear kernel PMD mapping when it is set
773	770	*
@@ -782,7 +779,6 @@ int pmd_clear_huge(pmd_t *pmd) · 8 unmodified lines
782	779
783	780	return 0;
784	781	}
785		−#endif
786	782
787	783	#ifdef CONFIG_X86_64
788	784	/**

drivers/block/nbd.c+1−1

@@ -239,8 +239,8 @@ static void nbd_dev_remove(struct nbd_device *nbd) · 238 unmodified lines
239	239
240	240	if (disk) {
241	241	del_gendisk(disk);
242		− blk_mq_free_tag_set(&nbd->tag_set);
243	242	blk_cleanup_disk(disk);
	243	+ blk_mq_free_tag_set(&nbd->tag_set);
244	244	}
245	245
246	246	/*

drivers/block/paride/pd.c+1−1

@@ -1014,8 +1014,8 @@ static void __exit pd_exit(void) · 1013 unmodified lines
1014	1014	if (p) {
1015	1015	disk->gd = NULL;
1016	1016	del_gendisk(p);
1017		− blk_mq_free_tag_set(&disk->tag_set);
1018	1017	blk_cleanup_disk(p);
	1018	+ blk_mq_free_tag_set(&disk->tag_set);
1019	1019	pi_release(disk->pi);
1020	1020	}
1021	1021	}

drivers/block/xen-blkfront.c+26−198

@@ -502,34 +502,21 @@ static int blkif_getgeo(struct block_device bd, struct hd_geometry hg) · 501 unmodified lines
502	502	static int blkif_ioctl(struct block_device *bdev, fmode_t mode,
503	503	unsigned command, unsigned long argument)
504	504	{
505		− struct blkfront_info *info = bdev->bd_disk->private_data;
506	505	int i;
507	506
508		− dev_dbg(&info->xbdev->dev, "command: 0x%x, argument: 0x%lx\n",
509		− command, (long)argument);
510		−
511	507	switch (command) {
512	508	case CDROMMULTISESSION:
513		− dev_dbg(&info->xbdev->dev, "FIXME: support multisession CDs later\n");
514	509	for (i = 0; i < sizeof(struct cdrom_multisession); i++)
515	510	if (put_user(0, (char __user *)(argument + i)))
516	511	return -EFAULT;
517	512	return 0;
518		−
519		− case CDROM_GET_CAPABILITY: {
520		− struct gendisk *gd = info->gd;
521		− if (gd->flags & GENHD_FL_CD)
	513	+ case CDROM_GET_CAPABILITY:
	514	+ if (bdev->bd_disk->flags & GENHD_FL_CD)
522	515	return 0;
523	516	return -EINVAL;
524		− }
525		−
526	517	default:
527		− /*printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n",
528		− command);*/
529		− return -EINVAL; /* same return as native Linux */
	518	+ return -EINVAL;
530	519	}
531		−
532		− return 0;
533	520	}
534	521
535	522	static unsigned long blkif_ring_get_request(struct blkfront_ring_info *rinfo,
@@ -1177,36 +1164,6 @@ out_release_minors: · 641 unmodified lines
1177	1164	return err;
1178	1165	}
1179	1166
1180		−static void xlvbd_release_gendisk(struct blkfront_info *info)
1181		−{
1182		− unsigned int minor, nr_minors, i;
1183		− struct blkfront_ring_info *rinfo;
1184		−
1185		− if (info->rq == NULL)
1186		− return;
1187		−
1188		− /* No more blkif_request(). */
1189		− blk_mq_stop_hw_queues(info->rq);
1190		−
1191		− for_each_rinfo(info, rinfo, i) {
1192		− /* No more gnttab callback work. */
1193		− gnttab_cancel_free_callback(&rinfo->callback);
1194		−
1195		− /* Flush gnttab callback work. Must be done with no locks held. */
1196		− flush_work(&rinfo->work);
1197		− }
1198		−
1199		− del_gendisk(info->gd);
1200		−
1201		− minor = info->gd->first_minor;
1202		− nr_minors = info->gd->minors;
1203		− xlbd_release_minors(minor, nr_minors);
1204		−
1205		− blk_cleanup_disk(info->gd);
1206		− info->gd = NULL;
1207		− blk_mq_free_tag_set(&info->tag_set);
1208		−}
1209		−
1210	1167	/* Already hold rinfo->ring_lock. */
1211	1168	static inline void kick_pending_request_queues_locked(struct blkfront_ring_info *rinfo)
1212	1169	{
@@ -1756,12 +1713,6 @@ abort_transaction: · 543 unmodified lines
1756	1713	return err;
1757	1714	}
1758	1715
1759		−static void free_info(struct blkfront_info *info)
1760		−{
1761		− list_del(&info->info_list);
1762		− kfree(info);
1763		−}
1764		−
1765	1716	/* Common code used when first setting up, and when resuming. */
1766	1717	static int talk_to_blkback(struct xenbus_device *dev,
1767	1718	struct blkfront_info *info)
@@ -1880,13 +1831,6 @@ again: · 112 unmodified lines
1880	1831	xenbus_dev_fatal(dev, err, "%s", message);
1881	1832	destroy_blkring:
1882	1833	blkif_free(info, 0);
1883		−
1884		− mutex_lock(&blkfront_mutex);
1885		− free_info(info);
1886		− mutex_unlock(&blkfront_mutex);
1887		−
1888		− dev_set_drvdata(&dev->dev, NULL);
1889		−
1890	1834	return err;
1891	1835	}
1892	1836
@@ -2126,38 +2070,26 @@ static int blkfront_resume(struct xenbus_device *dev) · 233 unmodified lines
2126	2070	static void blkfront_closing(struct blkfront_info *info)
2127	2071	{
2128	2072	struct xenbus_device *xbdev = info->xbdev;
2129		− struct block_device *bdev = NULL;
2130		−
2131		− mutex_lock(&info->mutex);
	2073	+ struct blkfront_ring_info *rinfo;
	2074	+ unsigned int i;
2132	2075
2133		− if (xbdev->state == XenbusStateClosing) {
2134		− mutex_unlock(&info->mutex);
	2076	+ if (xbdev->state == XenbusStateClosing)
2135	2077	return;
2136		− }
2137	2078
2138		− if (info->gd)
2139		− bdev = bdgrab(info->gd->part0);
2140		−
2141		− mutex_unlock(&info->mutex);
2142		−
2143		− if (!bdev) {
2144		− xenbus_frontend_closed(xbdev);
2145		− return;
2146		− }
	2079	+ /* No more blkif_request(). */
	2080	+ blk_mq_stop_hw_queues(info->rq);
	2081	+ blk_set_queue_dying(info->rq);
	2082	+ set_capacity(info->gd, 0);
2147	2083
2148		− mutex_lock(&bdev->bd_disk->open_mutex);
	2084	+ for_each_rinfo(info, rinfo, i) {
	2085	+ /* No more gnttab callback work. */
	2086	+ gnttab_cancel_free_callback(&rinfo->callback);
2149	2087
2150		− if (bdev->bd_openers) {
2151		− xenbus_dev_error(xbdev, -EBUSY,
2152		− "Device in use; refusing to close");
2153		− xenbus_switch_state(xbdev, XenbusStateClosing);
2154		− } else {
2155		− xlvbd_release_gendisk(info);
2156		− xenbus_frontend_closed(xbdev);
	2088	+ /* Flush gnttab callback work. Must be done with no locks held. */
	2089	+ flush_work(&rinfo->work);
2157	2090	}
2158	2091
2159		− mutex_unlock(&bdev->bd_disk->open_mutex);
2160		− bdput(bdev);
	2092	+ xenbus_frontend_closed(xbdev);
2161	2093	}
2162	2094
2163	2095	static void blkfront_setup_discard(struct blkfront_info *info)
@@ -2472,8 +2404,7 @@ static void blkback_changed(struct xenbus_device *dev, · 308 unmodified lines
2472	2404	break;
2473	2405	fallthrough;
2474	2406	case XenbusStateClosing:
2475		− if (info)
2476		− blkfront_closing(info);
	2407	+ blkfront_closing(info);
2477	2408	break;
2478	2409	}
2479	2410	}
@@ -2481,56 +2412,21 @@ static void blkback_changed(struct xenbus_device *dev, · 1 unmodified line
2481	2412	static int blkfront_remove(struct xenbus_device *xbdev)
2482	2413	{
2483	2414	struct blkfront_info *info = dev_get_drvdata(&xbdev->dev);
2484		− struct block_device *bdev = NULL;
2485		− struct gendisk *disk;
2486	2415
2487	2416	dev_dbg(&xbdev->dev, "%s removed", xbdev->nodename);
2488	2417
2489		− if (!info)
2490		− return 0;
2491		−
2492		− blkif_free(info, 0);
2493		−
2494		− mutex_lock(&info->mutex);
2495		−
2496		− disk = info->gd;
2497		− if (disk)
2498		− bdev = bdgrab(disk->part0);
2499		−
2500		− info->xbdev = NULL;
2501		− mutex_unlock(&info->mutex);
2502		−
2503		− if (!bdev) {
2504		− mutex_lock(&blkfront_mutex);
2505		− free_info(info);
2506		− mutex_unlock(&blkfront_mutex);
2507		− return 0;
2508		− }
2509		−
2510		− /*
2511		− * The xbdev was removed before we reached the Closed
2512		− * state. See if it's safe to remove the disk. If the bdev
2513		− * isn't closed yet, we let release take care of it.
2514		− */
2515		−
2516		− mutex_lock(&disk->open_mutex);
2517		− info = disk->private_data;
2518		−
2519		− dev_warn(disk_to_dev(disk),
2520		− "%s was hot-unplugged, %d stale handles\n",
2521		− xbdev->nodename, bdev->bd_openers);
	2418	+ del_gendisk(info->gd);
2522	2419
2523		− if (info && !bdev->bd_openers) {
2524		− xlvbd_release_gendisk(info);
2525		− disk->private_data = NULL;
2526		− mutex_lock(&blkfront_mutex);
2527		− free_info(info);
2528		− mutex_unlock(&blkfront_mutex);
2529		− }
	2420	+ mutex_lock(&blkfront_mutex);
	2421	+ list_del(&info->info_list);
	2422	+ mutex_unlock(&blkfront_mutex);
2530	2423
2531		− mutex_unlock(&disk->open_mutex);
2532		− bdput(bdev);
	2424	+ blkif_free(info, 0);
	2425	+ xlbd_release_minors(info->gd->first_minor, info->gd->minors);
	2426	+ blk_cleanup_disk(info->gd);
	2427	+ blk_mq_free_tag_set(&info->tag_set);
2533	2428
	2429	+ kfree(info);
2534	2430	return 0;
2535	2431	}
2536	2432
@@ -2541,77 +2437,9 @@ static int blkfront_is_ready(struct xenbus_device *dev) · 4 unmodified lines
2541	2437	return info->is_ready && info->xbdev;
2542	2438	}
2543	2439
2544		−static int blkif_open(struct block_device *bdev, fmode_t mode)
2545		−{
2546		− struct gendisk *disk = bdev->bd_disk;
2547		− struct blkfront_info *info;
2548		− int err = 0;
2549		−
2550		− mutex_lock(&blkfront_mutex);
2551		−
2552		− info = disk->private_data;
2553		− if (!info) {
2554		− /* xbdev gone */
2555		− err = -ERESTARTSYS;
2556		− goto out;
2557		− }
2558		−
2559		− mutex_lock(&info->mutex);
2560		−
2561		− if (!info->gd)
2562		− /* xbdev is closed */
2563		− err = -ERESTARTSYS;
2564		−
2565		− mutex_unlock(&info->mutex);
2566		−
2567		−out:
2568		− mutex_unlock(&blkfront_mutex);
2569		− return err;
2570		−}
2571		−
2572		−static void blkif_release(struct gendisk *disk, fmode_t mode)
2573		−{
2574		− struct blkfront_info *info = disk->private_data;
2575		− struct xenbus_device *xbdev;
2576		−
2577		− mutex_lock(&blkfront_mutex);
2578		− if (disk->part0->bd_openers)
2579		− goto out_mutex;
2580		−
2581		− /*
2582		− * Check if we have been instructed to close. We will have
2583		− * deferred this request, because the bdev was still open.
2584		− */
2585		−
2586		− mutex_lock(&info->mutex);
2587		− xbdev = info->xbdev;
2588		−
2589		− if (xbdev && xbdev->state == XenbusStateClosing) {
2590		− /* pending switch to state closed */
2591		− dev_info(disk_to_dev(disk), "releasing disk\n");
2592		− xlvbd_release_gendisk(info);
2593		− xenbus_frontend_closed(info->xbdev);
2594		− }
2595		−
2596		− mutex_unlock(&info->mutex);
2597		−
2598		− if (!xbdev) {
2599		− /* sudden device removal */
2600		− dev_info(disk_to_dev(disk), "releasing disk\n");
2601		− xlvbd_release_gendisk(info);
2602		− disk->private_data = NULL;
2603		− free_info(info);
2604		− }
2605		−
2606		−out_mutex:
2607		− mutex_unlock(&blkfront_mutex);
2608		−}
2609		−
2610	2440	static const struct block_device_operations xlvbd_block_fops =
2611	2441	{
2612	2442	.owner = THIS_MODULE,
2613		− .open = blkif_open,
2614		− .release = blkif_release,
2615	2443	.getgeo = blkif_getgeo,
2616	2444	.ioctl = blkif_ioctl,
2617	2445	.compat_ioctl = blkdev_compat_ptr_ioctl,

drivers/char/powernv-op-panel.c+1−0

@@ -75,6 +75,7 @@ static int __op_panel_update_display(void) · 74 unmodified lines
75	75	rc);
76	76	break;
77	77	}
	78	+ break;
78	79	case OPAL_SUCCESS:
79	80	break;
80	81	default:

drivers/clk/renesas/r9a07g044-cpg.c+47−32

@@ -30,8 +30,9 @@ enum clk_ids { · 29 unmodified lines
30	30	CLK_PLL2_DIV20,
31	31	CLK_PLL3,
32	32	CLK_PLL3_DIV2,
	33	+ CLK_PLL3_DIV2_4,
	34	+ CLK_PLL3_DIV2_4_2,
33	35	CLK_PLL3_DIV4,
34		− CLK_PLL3_DIV8,
35	36	CLK_PLL4,
36	37	CLK_PLL5,
37	38	CLK_PLL5_DIV2,
@@ -42,12 +43,13 @@ enum clk_ids { · 4 unmodified lines
42	43	};
43	44
44	45	/* Divider tables */
45		−static const struct clk_div_table dtable_3b[] = {
	46	+static const struct clk_div_table dtable_1_32[] = {
46	47	{0, 1},
47	48	{1, 2},
48	49	{2, 4},
49	50	{3, 8},
50	51	{4, 32},
	52	+ {0, 0},
51	53	};
52	54
53	55	static const struct cpg_core_clk r9a07g044_core_clks[] __initconst = {
@@ -66,47 +68,56 @@ static const struct cpg_core_clk r9a07g044_core_clks[] __initconst = { · 12 unmodified lines
66	68	DEF_FIXED(".pll2_div20", CLK_PLL2_DIV20, CLK_PLL2, 1, 20),
67	69
68	70	DEF_FIXED(".pll3_div2", CLK_PLL3_DIV2, CLK_PLL3, 1, 2),
	71	+ DEF_FIXED(".pll3_div2_4", CLK_PLL3_DIV2_4, CLK_PLL3_DIV2, 1, 4),
	72	+ DEF_FIXED(".pll3_div2_4_2", CLK_PLL3_DIV2_4_2, CLK_PLL3_DIV2_4, 1, 2),
69	73	DEF_FIXED(".pll3_div4", CLK_PLL3_DIV4, CLK_PLL3, 1, 4),
70		− DEF_FIXED(".pll3_div8", CLK_PLL3_DIV8, CLK_PLL3, 1, 8),
71	74
72	75	/* Core output clk */
73	76	DEF_FIXED("I", R9A07G044_CLK_I, CLK_PLL1, 1, 1),
74	77	DEF_DIV("P0", R9A07G044_CLK_P0, CLK_PLL2_DIV16, DIVPL2A,
75		− dtable_3b, CLK_DIVIDER_HIWORD_MASK),
	78	+ dtable_1_32, CLK_DIVIDER_HIWORD_MASK),
76	79	DEF_FIXED("TSU", R9A07G044_CLK_TSU, CLK_PLL2_DIV20, 1, 1),
77		− DEF_DIV("P1", R9A07G044_CLK_P1, CLK_PLL3_DIV8,
78		− DIVPL3B, dtable_3b, CLK_DIVIDER_HIWORD_MASK),
	80	+ DEF_DIV("P1", R9A07G044_CLK_P1, CLK_PLL3_DIV2_4,
	81	+ DIVPL3B, dtable_1_32, CLK_DIVIDER_HIWORD_MASK),
	82	+ DEF_DIV("P2", R9A07G044_CLK_P2, CLK_PLL3_DIV2_4_2,
	83	+ DIVPL3A, dtable_1_32, CLK_DIVIDER_HIWORD_MASK),
79	84	};
80	85
81	86	static struct rzg2l_mod_clk r9a07g044_mod_clks[] = {
82		− DEF_MOD("gic", R9A07G044_CLK_GIC600,
83		− R9A07G044_CLK_P1,
84		− 0x514, BIT(0), (BIT(0) \| BIT(1))),
85		− DEF_MOD("ia55", R9A07G044_CLK_IA55,
86		− R9A07G044_CLK_P1,
87		− 0x518, (BIT(0) \| BIT(1)), BIT(0)),
88		− DEF_MOD("scif0", R9A07G044_CLK_SCIF0,
89		− R9A07G044_CLK_P0,
90		− 0x584, BIT(0), BIT(0)),
91		− DEF_MOD("scif1", R9A07G044_CLK_SCIF1,
92		− R9A07G044_CLK_P0,
93		− 0x584, BIT(1), BIT(1)),
94		− DEF_MOD("scif2", R9A07G044_CLK_SCIF2,
95		− R9A07G044_CLK_P0,
96		− 0x584, BIT(2), BIT(2)),
97		− DEF_MOD("scif3", R9A07G044_CLK_SCIF3,
98		− R9A07G044_CLK_P0,
99		− 0x584, BIT(3), BIT(3)),
100		− DEF_MOD("scif4", R9A07G044_CLK_SCIF4,
101		− R9A07G044_CLK_P0,
102		− 0x584, BIT(4), BIT(4)),
103		− DEF_MOD("sci0", R9A07G044_CLK_SCI0,
104		− R9A07G044_CLK_P0,
105		− 0x588, BIT(0), BIT(0)),
	87	+ DEF_MOD("gic", R9A07G044_GIC600_GICCLK, R9A07G044_CLK_P1,
	88	+ 0x514, 0),
	89	+ DEF_MOD("ia55_pclk", R9A07G044_IA55_PCLK, R9A07G044_CLK_P2,
	90	+ 0x518, 0),
	91	+ DEF_MOD("ia55_clk", R9A07G044_IA55_CLK, R9A07G044_CLK_P1,
	92	+ 0x518, 1),
	93	+ DEF_MOD("scif0", R9A07G044_SCIF0_CLK_PCK, R9A07G044_CLK_P0,
	94	+ 0x584, 0),
	95	+ DEF_MOD("scif1", R9A07G044_SCIF1_CLK_PCK, R9A07G044_CLK_P0,
	96	+ 0x584, 1),
	97	+ DEF_MOD("scif2", R9A07G044_SCIF2_CLK_PCK, R9A07G044_CLK_P0,
	98	+ 0x584, 2),
	99	+ DEF_MOD("scif3", R9A07G044_SCIF3_CLK_PCK, R9A07G044_CLK_P0,
	100	+ 0x584, 3),
	101	+ DEF_MOD("scif4", R9A07G044_SCIF4_CLK_PCK, R9A07G044_CLK_P0,
	102	+ 0x584, 4),
	103	+ DEF_MOD("sci0", R9A07G044_SCI0_CLKP, R9A07G044_CLK_P0,
	104	+ 0x588, 0),
	105	+};
	106	+
	107	+static struct rzg2l_reset r9a07g044_resets[] = {
	108	+ DEF_RST(R9A07G044_GIC600_GICRESET_N, 0x814, 0),
	109	+ DEF_RST(R9A07G044_GIC600_DBG_GICRESET_N, 0x814, 1),
	110	+ DEF_RST(R9A07G044_IA55_RESETN, 0x818, 0),
	111	+ DEF_RST(R9A07G044_SCIF0_RST_SYSTEM_N, 0x884, 0),
	112	+ DEF_RST(R9A07G044_SCIF1_RST_SYSTEM_N, 0x884, 1),
	113	+ DEF_RST(R9A07G044_SCIF2_RST_SYSTEM_N, 0x884, 2),
	114	+ DEF_RST(R9A07G044_SCIF3_RST_SYSTEM_N, 0x884, 3),
	115	+ DEF_RST(R9A07G044_SCIF4_RST_SYSTEM_N, 0x884, 4),
	116	+ DEF_RST(R9A07G044_SCI0_RST, 0x888, 0),
106	117	};
107	118
108	119	static const unsigned int r9a07g044_crit_mod_clks[] __initconst = {
109		− MOD_CLK_BASE + R9A07G044_CLK_GIC600,
	120	+ MOD_CLK_BASE + R9A07G044_GIC600_GICCLK,
110	121	};
111	122
112	123	const struct rzg2l_cpg_info r9a07g044_cpg_info = {
@@ -123,5 +134,9 @@ const struct rzg2l_cpg_info r9a07g044_cpg_info = { · 10 unmodified lines
123	134	/* Module Clocks */
124	135	.mod_clks = r9a07g044_mod_clks,
125	136	.num_mod_clks = ARRAY_SIZE(r9a07g044_mod_clks),
126		− .num_hw_mod_clks = R9A07G044_CLK_MIPI_DSI_PIN + 1,
	137	+ .num_hw_mod_clks = R9A07G044_TSU_PCLK + 1,
	138	+
	139	+ /* Resets */
	140	+ .resets = r9a07g044_resets,
	141	+ .num_resets = ARRAY_SIZE(r9a07g044_resets),
127	142	};

drivers/clk/renesas/renesas-rzg2l-cpg.c+59−51

@@ -47,9 +47,9 @@ · 46 unmodified lines
47	47	#define SDIV(val) DIV_RSMASK(val, 0, 0x7)
48	48
49	49	#define CLK_ON_R(reg) (reg)
50		−#define CLK_MON_R(reg) (0x680 - 0x500 + (reg))
51		−#define CLK_RST_R(reg) (0x800 - 0x500 + (reg))
52		−#define CLK_MRST_R(reg) (0x980 - 0x500 + (reg))
	50	+#define CLK_MON_R(reg) (0x180 + (reg))
	51	+#define CLK_RST_R(reg) (reg)
	52	+#define CLK_MRST_R(reg) (0x180 + (reg))
53	53
54	54	#define GET_REG_OFFSET(val) ((val >> 20) & 0xfff)
55	55	#define GET_REG_SAMPLL_CLK1(val) ((val >> 22) & 0xfff)
@@ -78,6 +78,7 @@ struct rzg2l_cpg_priv { · 22 unmodified lines
78	78	struct clk **clks;
79	79	unsigned int num_core_clks;
80	80	unsigned int num_mod_clks;
	81	+ unsigned int num_resets;
81	82	unsigned int last_dt_core_clk;
82	83
83	84	struct raw_notifier_head notifiers;
@@ -315,15 +316,13 @@ fail: · 231 unmodified lines
315	316	*
316	317	* @hw: handle between common and hardware-specific interfaces
317	318	* @off: register offset
318		− * @onoff: ON/MON bits
319		− * @reset: reset bits
	319	+ * @bit: ON/MON bit
320	320	* @priv: CPG/MSTP private data
321	321	*/
322	322	struct mstp_clock {
323	323	struct clk_hw hw;
324	324	u16 off;
325		− u8 onoff;
326		− u8 reset;
	325	+ u8 bit;
327	326	struct rzg2l_cpg_priv *priv;
328	327	};
329	328
@@ -337,6 +336,7 @@ static int rzg2l_mod_clock_endisable(struct clk_hw *hw, bool enable) · 7 unmodified lines
337	336	struct device *dev = priv->dev;
338	337	unsigned long flags;
339	338	unsigned int i;
	339	+ u32 bitmask = BIT(clock->bit);
340	340	u32 value;
341	341
342	342	if (!clock->off) {
@@ -349,9 +349,9 @@ static int rzg2l_mod_clock_endisable(struct clk_hw *hw, bool enable) · 6 unmodified lines
349	349	spin_lock_irqsave(&priv->rmw_lock, flags);
350	350
351	351	if (enable)
352		− value = (clock->onoff << 16) \| clock->onoff;
	352	+ value = (bitmask << 16) \| bitmask;
353	353	else
354		− value = clock->onoff << 16;
	354	+ value = bitmask << 16;
355	355	writel(value, priv->base + CLK_ON_R(reg));
356	356
357	357	spin_unlock_irqrestore(&priv->rmw_lock, flags);
@@ -360,7 +360,7 @@ static int rzg2l_mod_clock_endisable(struct clk_hw *hw, bool enable) · 2 unmodified lines
360	360	return 0;
361	361
362	362	for (i = 1000; i > 0; --i) {
363		− if (((readl(priv->base + CLK_MON_R(reg))) & clock->onoff))
	363	+ if (((readl(priv->base + CLK_MON_R(reg))) & bitmask))
364	364	break;
365	365	cpu_relax();
366	366	}
@@ -388,6 +388,7 @@ static int rzg2l_mod_clock_is_enabled(struct clk_hw *hw) · 21 unmodified lines
388	388	{
389	389	struct mstp_clock *clock = to_mod_clock(hw);
390	390	struct rzg2l_cpg_priv *priv = clock->priv;
	391	+ u32 bitmask = BIT(clock->bit);
391	392	u32 value;
392	393
393	394	if (!clock->off) {
@@ -397,7 +398,7 @@ static int rzg2l_mod_clock_is_enabled(struct clk_hw *hw) · 3 unmodified lines
397	398
398	399	value = readl(priv->base + CLK_MON_R(clock->off));
399	400
400		− return !(value & clock->onoff);
	401	+ return !(value & bitmask);
401	402	}
402	403
403	404	static const struct clk_ops rzg2l_mod_clock_ops = {
@@ -457,8 +458,7 @@ rzg2l_cpg_register_mod_clk(const struct rzg2l_mod_clk *mod, · 53 unmodified lines
457	458	init.num_parents = 1;
458	459
459	460	clock->off = mod->off;
460		− clock->onoff = mod->onoff;
461		− clock->reset = mod->reset;
	461	+ clock->bit = mod->bit;
462	462	clock->priv = priv;
463	463	clock->hw.init = &init;
464	464
@@ -483,12 +483,11 @@ static int rzg2l_cpg_reset(struct reset_controller_dev *rcdev, · 18 unmodified lines
483	483	{
484	484	struct rzg2l_cpg_priv *priv = rcdev_to_priv(rcdev);
485	485	const struct rzg2l_cpg_info *info = priv->info;
486		− unsigned int reg = info->mod_clks[id].off;
487		− u32 dis = info->mod_clks[id].reset;
	486	+ unsigned int reg = info->resets[id].off;
	487	+ u32 dis = BIT(info->resets[id].bit);
488	488	u32 we = dis << 16;
489	489
490		− dev_dbg(rcdev->dev, "reset name:%s id:%ld offset:0x%x\n",
491		− info->mod_clks[id].name, id, CLK_RST_R(reg));
	490	+ dev_dbg(rcdev->dev, "reset id:%ld offset:0x%x\n", id, CLK_RST_R(reg));
492	491
493	492	/* Reset module */
494	493	writel(we, priv->base + CLK_RST_R(reg));
@@ -507,11 +506,10 @@ static int rzg2l_cpg_assert(struct reset_controller_dev *rcdev, · 12 unmodified lines
507	506	{
508	507	struct rzg2l_cpg_priv *priv = rcdev_to_priv(rcdev);
509	508	const struct rzg2l_cpg_info *info = priv->info;
510		− unsigned int reg = info->mod_clks[id].off;
511		− u32 value = info->mod_clks[id].reset << 16;
	509	+ unsigned int reg = info->resets[id].off;
	510	+ u32 value = BIT(info->resets[id].bit) << 16;
512	511
513		− dev_dbg(rcdev->dev, "assert name:%s id:%ld offset:0x%x\n",
514		− info->mod_clks[id].name, id, CLK_RST_R(reg));
	512	+ dev_dbg(rcdev->dev, "assert id:%ld offset:0x%x\n", id, CLK_RST_R(reg));
515	513
516	514	writel(value, priv->base + CLK_RST_R(reg));
517	515	return 0;
@@ -522,12 +520,12 @@ static int rzg2l_cpg_deassert(struct reset_controller_dev *rcdev, · 4 unmodified lines
522	520	{
523	521	struct rzg2l_cpg_priv *priv = rcdev_to_priv(rcdev);
524	522	const struct rzg2l_cpg_info *info = priv->info;
525		− unsigned int reg = info->mod_clks[id].off;
526		− u32 dis = info->mod_clks[id].reset;
	523	+ unsigned int reg = info->resets[id].off;
	524	+ u32 dis = BIT(info->resets[id].bit);
527	525	u32 value = (dis << 16) \| dis;
528	526
529		− dev_dbg(rcdev->dev, "deassert name:%s id:%ld offset:0x%x\n",
530		− info->mod_clks[id].name, id, CLK_RST_R(reg));
	527	+ dev_dbg(rcdev->dev, "deassert id:%ld offset:0x%x\n", id,
	528	+ CLK_RST_R(reg));
531	529
532	530	writel(value, priv->base + CLK_RST_R(reg));
533	531	return 0;
@@ -538,8 +536,8 @@ static int rzg2l_cpg_status(struct reset_controller_dev *rcdev, · 4 unmodified lines
538	536	{
539	537	struct rzg2l_cpg_priv *priv = rcdev_to_priv(rcdev);
540	538	const struct rzg2l_cpg_info *info = priv->info;
541		− unsigned int reg = info->mod_clks[id].off;
542		− u32 bitmask = info->mod_clks[id].reset;
	539	+ unsigned int reg = info->resets[id].off;
	540	+ u32 bitmask = BIT(info->resets[id].bit);
543	541
544	542	return !(readl(priv->base + CLK_MRST_R(reg)) & bitmask);
545	543	}
@@ -554,9 +552,11 @@ static const struct reset_control_ops rzg2l_cpg_reset_ops = { · 8 unmodified lines
554	552	static int rzg2l_cpg_reset_xlate(struct reset_controller_dev *rcdev,
555	553	const struct of_phandle_args *reset_spec)
556	554	{
	555	+ struct rzg2l_cpg_priv *priv = rcdev_to_priv(rcdev);
	556	+ const struct rzg2l_cpg_info *info = priv->info;
557	557	unsigned int id = reset_spec->args[0];
558	558
559		− if (id >= rcdev->nr_resets) {
	559	+ if (id >= rcdev->nr_resets \|\| !info->resets[id].off) {
560	560	dev_err(rcdev->dev, "Invalid reset index %u\n", id);
561	561	return -EINVAL;
562	562	}
@@ -571,7 +571,7 @@ static int rzg2l_cpg_reset_controller_register(struct rzg2l_cpg_priv *priv) · 8 unmodified lines
571	571	priv->rcdev.dev = priv->dev;
572	572	priv->rcdev.of_reset_n_cells = 1;
573	573	priv->rcdev.of_xlate = rzg2l_cpg_reset_xlate;
574		− priv->rcdev.nr_resets = priv->num_mod_clks;
	574	+ priv->rcdev.nr_resets = priv->num_resets;
575	575
576	576	return devm_reset_controller_register(priv->dev, &priv->rcdev);
577	577	}
@@ -594,42 +594,49 @@ static int rzg2l_cpg_attach_dev(struct generic_pm_domain *unused, struct device · 16 unmodified lines
594	594	{
595	595	struct device_node *np = dev->of_node;
596	596	struct of_phandle_args clkspec;
	597	+ bool once = true;
597	598	struct clk *clk;
598	599	int error;
599	600	int i = 0;
600	601
601	602	while (!of_parse_phandle_with_args(np, "clocks", "#clock-cells", i,
602	603	&clkspec)) {
603		− if (rzg2l_cpg_is_pm_clk(&clkspec))
604		− goto found;
605		−
606		− of_node_put(clkspec.np);
	604	+ if (rzg2l_cpg_is_pm_clk(&clkspec)) {
	605	+ if (once) {
	606	+ once = false;
	607	+ error = pm_clk_create(dev);
	608	+ if (error) {
	609	+ of_node_put(clkspec.np);
	610	+ goto err;
	611	+ }
	612	+ }
	613	+ clk = of_clk_get_from_provider(&clkspec);
	614	+ of_node_put(clkspec.np);
	615	+ if (IS_ERR(clk)) {
	616	+ error = PTR_ERR(clk);
	617	+ goto fail_destroy;
	618	+ }
	619	+
	620	+ error = pm_clk_add_clk(dev, clk);
	621	+ if (error) {
	622	+ dev_err(dev, "pm_clk_add_clk failed %d\n",
	623	+ error);
	624	+ goto fail_put;
	625	+ }
	626	+ } else {
	627	+ of_node_put(clkspec.np);
	628	+ }
607	629	i++;
608	630	}
609	631
610	632	return 0;
611	633
612		−found:
613		− clk = of_clk_get_from_provider(&clkspec);
614		− of_node_put(clkspec.np);
615		−
616		− if (IS_ERR(clk))
617		− return PTR_ERR(clk);
618		−
619		− error = pm_clk_create(dev);
620		− if (error)
621		− goto fail_put;
622		−
623		− error = pm_clk_add_clk(dev, clk);
624		− if (error)
625		− goto fail_destroy;
626		−
627		− return 0;
	634	+fail_put:
	635	+ clk_put(clk);
628	636
629	637	fail_destroy:
630	638	pm_clk_destroy(dev);
631		−fail_put:
632		− clk_put(clk);
	639	+err:
633	640	return error;
634	641	}
635	642
@@ -692,6 +699,7 @@ static int __init rzg2l_cpg_probe(struct platform_device *pdev) · 56 unmodified lines
692	699	priv->clks = clks;
693	700	priv->num_core_clks = info->num_total_core_clks;
694	701	priv->num_mod_clks = info->num_hw_mod_clks;
	702	+ priv->num_resets = info->num_resets;
695	703	priv->last_dt_core_clk = info->last_dt_core_clk;
696	704
697	705	for (i = 0; i < nclks; i++)

drivers/clk/renesas/renesas-rzg2l-cpg.h+28−9

@@ -21,6 +21,7 @@ · 20 unmodified lines
21	21	#define DDIV_PACK(offset, bitpos, size) \
22	22	(((offset) << 20) \| ((bitpos) << 12) \| ((size) << 8))
23	23	#define DIVPL2A DDIV_PACK(CPG_PL2_DDIV, 0, 3)
	24	+#define DIVPL3A DDIV_PACK(CPG_PL3A_DDIV, 0, 3)
24	25	#define DIVPL3B DDIV_PACK(CPG_PL3A_DDIV, 4, 3)
25	26
26	27	/**
@@ -76,26 +77,40 @@ enum clk_types { · 49 unmodified lines
76	77	* @id: clock index in array containing all Core and Module Clocks
77	78	* @parent: id of parent clock
78	79	* @off: register offset
79		− * @onoff: ON/MON bits
80		− * @reset: reset bits
	80	+ * @bit: ON/MON bit
81	81	*/
82	82	struct rzg2l_mod_clk {
83	83	const char *name;
84	84	unsigned int id;
85	85	unsigned int parent;
86	86	u16 off;
87		− u8 onoff;
88		− u8 reset;
	87	+ u8 bit;
89	88	};
90	89
91		−#define DEF_MOD(_name, _id, _parent, _off, _onoff, _reset) \
92		− [_id] = { \
	90	+#define DEF_MOD(_name, _id, _parent, _off, _bit) \
	91	+ { \
93	92	.name = _name, \
94		− .id = MOD_CLK_BASE + _id, \
	93	+ .id = MOD_CLK_BASE + (_id), \
95	94	.parent = (_parent), \
96	95	.off = (_off), \
97		− .onoff = (_onoff), \
98		− .reset = (_reset) \
	96	+ .bit = (_bit), \
	97	+ }
	98	+
	99	+/**
	100	+ * struct rzg2l_reset - Reset definitions
	101	+ *
	102	+ * @off: register offset
	103	+ * @bit: reset bit
	104	+ */
	105	+struct rzg2l_reset {
	106	+ u16 off;
	107	+ u8 bit;
	108	+};
	109	+
	110	+#define DEF_RST(_id, _off, _bit) \
	111	+ [_id] = { \
	112	+ .off = (_off), \
	113	+ .bit = (_bit) \
99	114	}
100	115
101	116	/**
@@ -126,6 +141,10 @@ struct rzg2l_cpg_info { · 24 unmodified lines
126	141	unsigned int num_mod_clks;
127	142	unsigned int num_hw_mod_clks;
128	143
	144	+ /* Resets */
	145	+ const struct rzg2l_reset *resets;
	146	+ unsigned int num_resets;
	147	+
129	148	/* Critical Module Clocks that should not be disabled */
130	149	const unsigned int *crit_mod_clks;
131	150	unsigned int num_crit_mod_clks;

drivers/cpufreq/longhaul.c+0−2

@@ -942,8 +942,6 @@ static int __init longhaul_init(void) · 941 unmodified lines
942	942	return cpufreq_register_driver(&longhaul_driver);
943	943	case 10:
944	944	pr_err("Use acpi-cpufreq driver for VIA C7\n");
945		− default:
946		− ;
947	945	}
948	946
949	947	return -ENODEV;

drivers/dma-buf/sync_file.c+7−6

@@ -211,8 +211,8 @@ static struct sync_file sync_file_merge(const char name, struct sync_file *a, · 210 unmodified lines
211	211	struct sync_file *b)
212	212	{
213	213	struct sync_file *sync_file;
214		− struct dma_fence fences, nfences, a_fences, b_fences;
215		− int i, i_a, i_b, num_fences, a_num_fences, b_num_fences;
	214	+ struct dma_fence fences = NULL, nfences, a_fences, b_fences;
	215	+ int i = 0, i_a, i_b, num_fences, a_num_fences, b_num_fences;
216	216
217	217	sync_file = sync_file_alloc();
218	218	if (!sync_file)
@@ -236,7 +236,7 @@ static struct sync_file sync_file_merge(const char name, struct sync_file *a, · 17 unmodified lines
236	236	* If a sync_file can only be created with sync_file_merge
237	237	* and sync_file_create, this is a reasonable assumption.
238	238	*/
239		− for (i = i_a = i_b = 0; i_a < a_num_fences && i_b < b_num_fences; ) {
	239	+ for (i_a = i_b = 0; i_a < a_num_fences && i_b < b_num_fences; ) {
240	240	struct dma_fence *pt_a = a_fences[i_a];
241	241	struct dma_fence *pt_b = b_fences[i_b];
242	242
@@ -277,15 +277,16 @@ static struct sync_file sync_file_merge(const char name, struct sync_file *a, · 34 unmodified lines
277	277	fences = nfences;
278	278	}
279	279
280		− if (sync_file_set_fence(sync_file, fences, i) < 0) {
281		− kfree(fences);
	280	+ if (sync_file_set_fence(sync_file, fences, i) < 0)
282	281	goto err;
283		− }
284	282
285	283	strlcpy(sync_file->user_name, name, sizeof(sync_file->user_name));
286	284	return sync_file;
287	285
288	286	err:
	287	+ while (i)
	288	+ dma_fence_put(fences[--i]);
	289	+ kfree(fences);
289	290	fput(sync_file->file);
290	291	return NULL;
291	292

drivers/dma/ipu/ipu_idmac.c+2−0

@@ -618,6 +618,7 @@ static int ipu_enable_channel(struct idmac idmac, struct idmac_channel ichan) · 617 unmodified lines
618	618	case IDMAC_SDC_1:
619	619	case IDMAC_IC_7:
620	620	ipu_channel_set_priority(ipu, channel, true);
	621	+ break;
621	622	default:
622	623	break;
623	624	}
@@ -978,6 +979,7 @@ static int ipu_init_channel(struct idmac idmac, struct idmac_channel ichan) · 354 unmodified lines
978	979	case IDMAC_SDC_0:
979	980	case IDMAC_SDC_1:
980	981	n_desc = 4;
	982	+ break;
981	983	default:
982	984	break;
983	985	}

drivers/dma/mpc512x_dma.c+1−0

@@ -813,6 +813,7 @@ inline bool is_buswidth_valid(u8 buswidth, bool is_mpc8308) · 812 unmodified lines
813	813	case 16:
814	814	if (is_mpc8308)
815	815	return false;
	816	+ break;
816	817	case 1:
817	818	case 2:
818	819	case 4:

drivers/dma/ti/k3-udma.c+1−0

@@ -4948,6 +4948,7 @@ static int setup_resources(struct udma_dev *ud) · 4947 unmodified lines
4948	4948	ud->tchan_cnt),
4949	4949	ud->rchan_cnt - bitmap_weight(ud->rchan_map,
4950	4950	ud->rchan_cnt));
	4951	+ break;
4951	4952	default:
4952	4953	break;
4953	4954	}

drivers/edac/Kconfig+1−1

@@ -271,7 +271,7 @@ config EDAC_PND2 · 270 unmodified lines
271	271	config EDAC_IGEN6
272	272	tristate "Intel client SoC Integrated MC"
273	273	depends on PCI && PCI_MMCONFIG && ARCH_HAVE_NMI_SAFE_CMPXCHG
274		− depends on X64_64 && X86_MCE_INTEL
	274	+ depends on X86_64 && X86_MCE_INTEL
275	275	help
276	276	Support for error detection and correction on the Intel
277	277	client SoC Integrated Memory Controller using In-Band ECC IP.

drivers/firmware/arm_ffa/bus.c+3−3

@@ -46,9 +46,6 @@ static int ffa_device_probe(struct device *dev) · 45 unmodified lines
46	46	struct ffa_driver *ffa_drv = to_ffa_driver(dev->driver);
47	47	struct ffa_device *ffa_dev = to_ffa_dev(dev);
48	48
49		− if (!ffa_device_match(dev, dev->driver))
50		− return -ENODEV;
51		−
52	49	return ffa_drv->probe(ffa_dev);
53	50	}
54	51
@@ -99,6 +96,9 @@ int ffa_driver_register(struct ffa_driver driver, struct module owner, · 44 unmodified lines
99	96	{
100	97	int ret;
101	98
	99	+ if (!driver->probe)
	100	+ return -EINVAL;
	101	+
102	102	driver->driver.bus = &ffa_bus_type;
103	103	driver->driver.name = driver->name;
104	104	driver->driver.owner = owner;

drivers/firmware/arm_ffa/driver.c+5−3

@@ -120,7 +120,7 @@ · 119 unmodified lines
120	120	#define PACK_TARGET_INFO(s, r) \
121	121	(FIELD_PREP(SENDER_ID_MASK, (s)) \| FIELD_PREP(RECEIVER_ID_MASK, (r)))
122	122
123		−/**
	123	+/*
124	124	* FF-A specification mentions explicitly about '4K pages'. This should
125	125	* not be confused with the kernel PAGE_SIZE, which is the translation
126	126	* granule kernel is configured and may be one among 4K, 16K and 64K.
@@ -149,8 +149,10 @@ static const int ffa_linux_errmap[] = { · 22 unmodified lines
149	149
150	150	static inline int ffa_to_linux_errno(int errno)
151	151	{
152		− if (errno < FFA_RET_SUCCESS && errno >= -ARRAY_SIZE(ffa_linux_errmap))
153		− return ffa_linux_errmap[-errno];
	152	+ int err_idx = -errno;
	153	+
	154	+ if (err_idx >= 0 && err_idx < ARRAY_SIZE(ffa_linux_errmap))
	155	+ return ffa_linux_errmap[err_idx];
154	156	return -EINVAL;
155	157	}
156	158

drivers/firmware/arm_scmi/bus.c+3−5

@@ -104,11 +104,6 @@ static int scmi_dev_probe(struct device *dev) · 103 unmodified lines
104	104	{
105	105	struct scmi_driver *scmi_drv = to_scmi_driver(dev->driver);
106	106	struct scmi_device *scmi_dev = to_scmi_dev(dev);
107		− const struct scmi_device_id *id;
108		−
109		− id = scmi_dev_match_id(scmi_dev, scmi_drv);
110		− if (!id)
111		− return -ENODEV;
112	107
113	108	if (!scmi_dev->handle)
114	109	return -EPROBE_DEFER;
@@ -139,6 +134,9 @@ int scmi_driver_register(struct scmi_driver driver, struct module owner, · 24 unmodified lines
139	134	{
140	135	int retval;
141	136
	137	+ if (!driver->probe)
	138	+ return -EINVAL;
	139	+
142	140	retval = scmi_protocol_device_request(driver->id_table);
143	141	if (retval)
144	142	return retval;

drivers/firmware/arm_scmi/driver.c+9−5

@@ -47,7 +47,6 @@ enum scmi_error_codes { · 46 unmodified lines
47	47	SCMI_ERR_GENERIC = -8, /* Generic Error */
48	48	SCMI_ERR_HARDWARE = -9, /* Hardware Error */
49	49	SCMI_ERR_PROTOCOL = -10,/* Protocol Error */
50		− SCMI_ERR_MAX
51	50	};
52	51
53	52	/* List of all SCMI devices active in system */
@@ -166,8 +165,10 @@ static const int scmi_linux_errmap[] = { · 112 unmodified lines
166	165
167	166	static inline int scmi_to_linux_errno(int errno)
168	167	{
169		− if (errno < SCMI_SUCCESS && errno > SCMI_ERR_MAX)
170		− return scmi_linux_errmap[-errno];
	168	+ int err_idx = -errno;
	169	+
	170	+ if (err_idx >= SCMI_SUCCESS && err_idx < ARRAY_SIZE(scmi_linux_errmap))
	171	+ return scmi_linux_errmap[err_idx];
171	172	return -EIO;
172	173	}
173	174
@@ -1025,8 +1026,9 @@ static int __scmi_xfer_info_init(struct scmi_info *sinfo, · 851 unmodified lines
1025	1026	const struct scmi_desc *desc = sinfo->desc;
1026	1027
1027	1028	/* Pre-allocated messages, no more than what hdr.seq can support */
1028		− if (WARN_ON(desc->max_msg >= MSG_TOKEN_MAX)) {
1029		− dev_err(dev, "Maximum message of %d exceeds supported %ld\n",
	1029	+ if (WARN_ON(!desc->max_msg \|\| desc->max_msg > MSG_TOKEN_MAX)) {
	1030	+ dev_err(dev,
	1031	+ "Invalid maximum messages %d, not in range [1 - %lu]\n",
1030	1032	desc->max_msg, MSG_TOKEN_MAX);
1031	1033	return -EINVAL;
1032	1034	}
@@ -1137,6 +1139,8 @@ scmi_txrx_setup(struct scmi_info info, struct device dev, int prot_id) · 104 unmodified lines
1137	1139	* @proto_id and @name: if device was still not existent it is created as a
1138	1140	* child of the specified SCMI instance @info and its transport properly
1139	1141	* initialized as usual.
	1142	+ *
	1143	+ * Return: A properly initialized scmi device, NULL otherwise.
1140	1144	*/
1141	1145	static inline struct scmi_device *
1142	1146	scmi_get_protocol_device(struct device_node np, struct scmi_info info,

drivers/firmware/arm_scmi/notify.c+4−0

@@ -1457,6 +1457,8 @@ static void scmi_devm_release_notifier(struct device dev, void res) · 1456 unmodified lines
1457	1457	*
1458	1458	* Generic devres managed helper to register a notifier_block against a
1459	1459	* protocol event.
	1460	+ *
	1461	+ * Return: 0 on Success
1460	1462	*/
1461	1463	static int scmi_devm_notifier_register(struct scmi_device *sdev,
1462	1464	u8 proto_id, u8 evt_id,
@@ -1523,6 +1525,8 @@ static int scmi_devm_notifier_match(struct device dev, void res, void *data) · 60 unmodified lines
1523	1525	* Generic devres managed helper to explicitly un-register a notifier_block
1524	1526	* against a protocol event, which was previously registered using the above
1525	1527	* @scmi_devm_notifier_register.
	1528	+ *
	1529	+ * Return: 0 on Success
1526	1530	*/
1527	1531	static int scmi_devm_notifier_unregister(struct scmi_device *sdev,
1528	1532	u8 proto_id, u8 evt_id,

drivers/firmware/arm_scmi/sensors.c+4−2

@@ -166,7 +166,8 @@ struct scmi_msg_sensor_reading_get { · 165 unmodified lines
166	166
167	167	struct scmi_resp_sensor_reading_complete {
168	168	__le32 id;
169		− __le64 readings;
	169	+ __le32 readings_low;
	170	+ __le32 readings_high;
170	171	};
171	172
172	173	struct scmi_sensor_reading_resp {
@@ -717,7 +718,8 @@ static int scmi_sensor_reading_get(const struct scmi_protocol_handle *ph, · 544 unmodified lines
717	718
718	719	resp = t->rx.buf;
719	720	if (le32_to_cpu(resp->id) == sensor_id)
720		− *value = get_unaligned_le64(&resp->readings);
	721	+ *value =
	722	+ get_unaligned_le64(&resp->readings_low);
721	723	else
722	724	ret = -EPROTO;
723	725	}

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h+1−1

@@ -269,7 +269,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( · 268 unmodified lines
269	269	struct kgd_dev kgd, struct kgd_mem mem, void *drm_priv,
270	270	uint64_t *size);
271	271	int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(
272		− struct kgd_dev kgd, struct kgd_mem mem, void drm_priv, bool table_freed);
	272	+ struct kgd_dev kgd, struct kgd_mem mem, void *drm_priv);
273	273	int amdgpu_amdkfd_gpuvm_unmap_memory_from_gpu(
274	274	struct kgd_dev kgd, struct kgd_mem mem, void *drm_priv);
275	275	int amdgpu_amdkfd_gpuvm_sync_memory(

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c+9−13

@@ -1057,8 +1057,7 @@ static void unmap_bo_from_gpuvm(struct kgd_mem *mem, · 1056 unmodified lines
1057	1057
1058	1058	static int update_gpuvm_pte(struct kgd_mem *mem,
1059	1059	struct kfd_mem_attachment *entry,
1060		− struct amdgpu_sync *sync,
1061		− bool *table_freed)
	1060	+ struct amdgpu_sync *sync)
1062	1061	{
1063	1062	struct amdgpu_bo_va *bo_va = entry->bo_va;
1064	1063	struct amdgpu_device *adev = entry->adev;
@@ -1069,7 +1068,7 @@ static int update_gpuvm_pte(struct kgd_mem *mem, · 4 unmodified lines
1069	1068	return ret;
1070	1069
1071	1070	/* Update the page tables */
1072		− ret = amdgpu_vm_bo_update(adev, bo_va, false, table_freed);
	1071	+ ret = amdgpu_vm_bo_update(adev, bo_va, false);
1073	1072	if (ret) {
1074	1073	pr_err("amdgpu_vm_bo_update failed\n");
1075	1074	return ret;
@@ -1081,8 +1080,7 @@ static int update_gpuvm_pte(struct kgd_mem *mem, · 5 unmodified lines
1081	1080	static int map_bo_to_gpuvm(struct kgd_mem *mem,
1082	1081	struct kfd_mem_attachment *entry,
1083	1082	struct amdgpu_sync *sync,
1084		− bool no_update_pte,
1085		− bool *table_freed)
	1083	+ bool no_update_pte)
1086	1084	{
1087	1085	int ret;
1088	1086
@@ -1099,7 +1097,7 @@ static int map_bo_to_gpuvm(struct kgd_mem *mem, · 10 unmodified lines
1099	1097	if (no_update_pte)
1100	1098	return 0;
1101	1099
1102		− ret = update_gpuvm_pte(mem, entry, sync, table_freed);
	1100	+ ret = update_gpuvm_pte(mem, entry, sync);
1103	1101	if (ret) {
1104	1102	pr_err("update_gpuvm_pte() failed\n");
1105	1103	goto update_gpuvm_pte_failed;
@@ -1393,8 +1391,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( · 287 unmodified lines
1393	1391	domain = alloc_domain = AMDGPU_GEM_DOMAIN_VRAM;
1394	1392	alloc_flags = AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE;
1395	1393	alloc_flags \|= (flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC) ?
1396		− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED :
1397		− AMDGPU_GEM_CREATE_NO_CPU_ACCESS;
	1394	+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED : 0;
1398	1395	} else if (flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT) {
1399	1396	domain = alloc_domain = AMDGPU_GEM_DOMAIN_GTT;
1400	1397	alloc_flags = 0;
@@ -1597,8 +1594,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( · 196 unmodified lines
1597	1594	}
1598	1595
1599	1596	int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(
1600		− struct kgd_dev kgd, struct kgd_mem mem,
1601		− void drm_priv, bool table_freed)
	1597	+ struct kgd_dev kgd, struct kgd_mem mem, void *drm_priv)
1602	1598	{
1603	1599	struct amdgpu_device *adev = get_amdgpu_device(kgd);
1604	1600	struct amdgpu_vm *avm = drm_priv_to_vm(drm_priv);
@@ -1686,7 +1682,7 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu( · 81 unmodified lines
1686	1682	entry->va, entry->va + bo_size, entry);
1687	1683
1688	1684	ret = map_bo_to_gpuvm(mem, entry, ctx.sync,
1689		− is_invalid_userptr, table_freed);
	1685	+ is_invalid_userptr);
1690	1686	if (ret) {
1691	1687	pr_err("Failed to map bo to gpuvm\n");
1692	1688	goto out_unreserve;
@@ -2136,7 +2132,7 @@ static int validate_invalid_user_pages(struct amdkfd_process_info *process_info) · 443 unmodified lines
2136	2132	continue;
2137	2133
2138	2134	kfd_mem_dmaunmap_attachment(mem, attachment);
2139		− ret = update_gpuvm_pte(mem, attachment, &sync, NULL);
	2135	+ ret = update_gpuvm_pte(mem, attachment, &sync);
2140	2136	if (ret) {
2141	2137	pr_err("%s: update PTE failed\n", __func__);
2142	2138	/* make sure this gets validated again */
@@ -2342,7 +2338,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void info, struct dma_fence *ef) · 199 unmodified lines
2342	2338	continue;
2343	2339
2344	2340	kfd_mem_dmaunmap_attachment(mem, attachment);
2345		− ret = update_gpuvm_pte(mem, attachment, &sync_obj, NULL);
	2341	+ ret = update_gpuvm_pte(mem, attachment, &sync_obj);
2346	2342	if (ret) {
2347	2343	pr_debug("Memory eviction: update PTE failed. Try again\n");
2348	2344	goto validate_map_fail;

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c+3−3

@@ -781,7 +781,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) · 780 unmodified lines
781	781	if (r)
782	782	return r;
783	783
784		− r = amdgpu_vm_bo_update(adev, fpriv->prt_va, false, NULL);
	784	+ r = amdgpu_vm_bo_update(adev, fpriv->prt_va, false);
785	785	if (r)
786	786	return r;
787	787
@@ -792,7 +792,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) · 4 unmodified lines
792	792	if (amdgpu_mcbp \|\| amdgpu_sriov_vf(adev)) {
793	793	bo_va = fpriv->csa_va;
794	794	BUG_ON(!bo_va);
795		− r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);
	795	+ r = amdgpu_vm_bo_update(adev, bo_va, false);
796	796	if (r)
797	797	return r;
798	798
@@ -811,7 +811,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) · 12 unmodified lines
811	811	if (bo_va == NULL)
812	812	continue;
813	813
814		− r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);
	814	+ r = amdgpu_vm_bo_update(adev, bo_va, false);
815	815	if (r)
816	816	return r;
817	817

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c+1−0

@@ -1168,6 +1168,7 @@ static const struct pci_device_id pciidlist[] = { · 1167 unmodified lines
1168	1168	{0x1002, 0x734F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI14},
1169	1169
1170	1170	/* Renoir */
	1171	+ {0x1002, 0x15E7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR\|AMD_IS_APU},
1171	1172	{0x1002, 0x1636, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR\|AMD_IS_APU},
1172	1173	{0x1002, 0x1638, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR\|AMD_IS_APU},
1173	1174	{0x1002, 0x164C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR\|AMD_IS_APU},

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c+1−1

@@ -612,7 +612,7 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev, · 611 unmodified lines
612	612
613	613	if (operation == AMDGPU_VA_OP_MAP \|\|
614	614	operation == AMDGPU_VA_OP_REPLACE) {
615		− r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);
	615	+ r = amdgpu_vm_bo_update(adev, bo_va, false);
616	616	if (r)
617	617	goto error;
618	618	}

drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c+18−0

@@ -278,6 +278,21 @@ static bool amdgpu_msi_ok(struct amdgpu_device *adev) · 277 unmodified lines
278	278	return true;
279	279	}
280	280
	281	+static void amdgpu_restore_msix(struct amdgpu_device *adev)
	282	+{
	283	+ u16 ctrl;
	284	+
	285	+ pci_read_config_word(adev->pdev, adev->pdev->msix_cap + PCI_MSIX_FLAGS, &ctrl);
	286	+ if (!(ctrl & PCI_MSIX_FLAGS_ENABLE))
	287	+ return;
	288	+
	289	+ /* VF FLR */
	290	+ ctrl &= ~PCI_MSIX_FLAGS_ENABLE;
	291	+ pci_write_config_word(adev->pdev, adev->pdev->msix_cap + PCI_MSIX_FLAGS, ctrl);
	292	+ ctrl \|= PCI_MSIX_FLAGS_ENABLE;
	293	+ pci_write_config_word(adev->pdev, adev->pdev->msix_cap + PCI_MSIX_FLAGS, ctrl);
	294	+}
	295	+
281	296	/**
282	297	* amdgpu_irq_init - initialize interrupt handling
283	298	*
@@ -569,6 +584,9 @@ void amdgpu_irq_gpu_reset_resume_helper(struct amdgpu_device *adev) · 285 unmodified lines
569	584	{
570	585	int i, j, k;
571	586
	587	+ if (amdgpu_sriov_vf(adev))
	588	+ amdgpu_restore_msix(adev);
	589	+
572	590	for (i = 0; i < AMDGPU_IRQ_CLIENTID_MAX; ++i) {
573	591	if (!adev->irq.client[i].sources)
574	592	continue;

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c+35−14

@@ -809,7 +809,7 @@ static int amdgpu_ras_enable_all_features(struct amdgpu_device *adev, · 808 unmodified lines
809	809
810	810	/* query/inject/cure begin */
811	811	int amdgpu_ras_query_error_status(struct amdgpu_device *adev,
812		− struct ras_query_if *info)
	812	+ struct ras_query_if *info)
813	813	{
814	814	struct ras_manager *obj = amdgpu_ras_find_obj(adev, &info->head);
815	815	struct ras_err_data err_data = {0, 0, 0, NULL};
@@ -1043,17 +1043,32 @@ int amdgpu_ras_error_inject(struct amdgpu_device *adev, · 227 unmodified lines
1043	1043	return ret;
1044	1044	}
1045	1045
1046		−/* get the total error counts on all IPs */
1047		−void amdgpu_ras_query_error_count(struct amdgpu_device *adev,
1048		− unsigned long *ce_count,
1049		− unsigned long *ue_count)
	1046	+/**
	1047	+ * amdgpu_ras_query_error_count -- Get error counts of all IPs
	1048	+ * adev: pointer to AMD GPU device
	1049	+ * ce_count: pointer to an integer to be set to the count of correctible errors.
	1050	+ * ue_count: pointer to an integer to be set to the count of uncorrectible
	1051	+ * errors.
	1052	+ *
	1053	+ * If set, @ce_count or @ue_count, count and return the corresponding
	1054	+ * error counts in those integer pointers. Return 0 if the device
	1055	+ * supports RAS. Return -EOPNOTSUPP if the device doesn't support RAS.
	1056	+ */
	1057	+int amdgpu_ras_query_error_count(struct amdgpu_device *adev,
	1058	+ unsigned long *ce_count,
	1059	+ unsigned long *ue_count)
1050	1060	{
1051	1061	struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
1052	1062	struct ras_manager *obj;
1053	1063	unsigned long ce, ue;
1054	1064
1055	1065	if (!adev->ras_enabled \|\| !con)
1056		− return;
	1066	+ return -EOPNOTSUPP;
	1067	+
	1068	+ /* Don't count since no reporting.
	1069	+ */
	1070	+ if (!ce_count && !ue_count)
	1071	+ return 0;
1057	1072
1058	1073	ce = 0;
1059	1074	ue = 0;
@@ -1061,9 +1076,11 @@ void amdgpu_ras_query_error_count(struct amdgpu_device *adev, · 1 unmodified line
1061	1076	struct ras_query_if info = {
1062	1077	.head = obj->head,
1063	1078	};
	1079	+ int res;
1064	1080
1065		− if (amdgpu_ras_query_error_status(adev, &info))
1066		− return;
	1081	+ res = amdgpu_ras_query_error_status(adev, &info);
	1082	+ if (res)
	1083	+ return res;
1067	1084
1068	1085	ce += info.ce_count;
1069	1086	ue += info.ue_count;
@@ -1074,6 +1091,8 @@ void amdgpu_ras_query_error_count(struct amdgpu_device *adev, · 4 unmodified lines
1074	1091
1075	1092	if (ue_count)
1076	1093	*ue_count = ue;
	1094	+
	1095	+ return 0;
1077	1096	}
1078	1097	/* query/inject/cure end */
1079	1098
@@ -2137,9 +2156,10 @@ static void amdgpu_ras_counte_dw(struct work_struct *work) · 1057 unmodified lines
2137	2156
2138	2157	/* Cache new values.
2139	2158	*/
2140		− amdgpu_ras_query_error_count(adev, &ce_count, &ue_count);
2141		− atomic_set(&con->ras_ce_count, ce_count);
2142		− atomic_set(&con->ras_ue_count, ue_count);
	2159	+ if (amdgpu_ras_query_error_count(adev, &ce_count, &ue_count) == 0) {
	2160	+ atomic_set(&con->ras_ce_count, ce_count);
	2161	+ atomic_set(&con->ras_ue_count, ue_count);
	2162	+ }
2143	2163
2144	2164	pm_runtime_mark_last_busy(dev->dev);
2145	2165	Out:
@@ -2312,9 +2332,10 @@ int amdgpu_ras_late_init(struct amdgpu_device *adev, · 166 unmodified lines
2312	2332
2313	2333	/* Those are the cached values at init.
2314	2334	*/
2315		− amdgpu_ras_query_error_count(adev, &ce_count, &ue_count);
2316		− atomic_set(&con->ras_ce_count, ce_count);
2317		− atomic_set(&con->ras_ue_count, ue_count);
	2335	+ if (amdgpu_ras_query_error_count(adev, &ce_count, &ue_count) == 0) {
	2336	+ atomic_set(&con->ras_ce_count, ce_count);
	2337	+ atomic_set(&con->ras_ue_count, ue_count);
	2338	+ }
2318	2339
2319	2340	return 0;
2320	2341	cleanup:

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h+3−3

@@ -490,9 +490,9 @@ int amdgpu_ras_request_reset_on_boot(struct amdgpu_device *adev, · 489 unmodified lines
490	490	void amdgpu_ras_resume(struct amdgpu_device *adev);
491	491	void amdgpu_ras_suspend(struct amdgpu_device *adev);
492	492
493		−void amdgpu_ras_query_error_count(struct amdgpu_device *adev,
494		− unsigned long *ce_count,
495		− unsigned long *ue_count);
	493	+int amdgpu_ras_query_error_count(struct amdgpu_device *adev,
	494	+ unsigned long *ce_count,
	495	+ unsigned long *ue_count);
496	496
497	497	/* error handling functions */
498	498	int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev,

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c+5−6

@@ -1758,7 +1758,7 @@ int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, · 1757 unmodified lines
1758	1758	r = vm->update_funcs->commit(&params, fence);
1759	1759
1760	1760	if (table_freed)
1761		− table_freed = table_freed \|\| params.table_freed;
	1761	+ *table_freed = params.table_freed;
1762	1762
1763	1763	error_unlock:
1764	1764	amdgpu_vm_eviction_unlock(vm);
@@ -1816,7 +1816,6 @@ void amdgpu_vm_get_memory(struct amdgpu_vm vm, uint64_t vram_mem, · 51 unmodified lines
1816	1816	* @adev: amdgpu_device pointer
1817	1817	* @bo_va: requested BO and VM object
1818	1818	* @clear: if true clear the entries
1819		− * @table_freed: return true if page table is freed
1820	1819	*
1821	1820	* Fill in the page table entries for @bo_va.
1822	1821	*
@@ -1824,7 +1823,7 @@ void amdgpu_vm_get_memory(struct amdgpu_vm vm, uint64_t vram_mem, · 1 unmodified line
1824	1823	* 0 for success, -EINVAL for failure.
1825	1824	*/
1826	1825	int amdgpu_vm_bo_update(struct amdgpu_device adev, struct amdgpu_bo_va bo_va,
1827		− bool clear, bool *table_freed)
	1826	+ bool clear)
1828	1827	{
1829	1828	struct amdgpu_bo *bo = bo_va->base.bo;
1830	1829	struct amdgpu_vm *vm = bo_va->base.vm;
@@ -1903,7 +1902,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device adev, struct amdgpu_bo_va bo_va, · 72 unmodified lines
1903	1902	resv, mapping->start,
1904	1903	mapping->last, update_flags,
1905	1904	mapping->offset, mem,
1906		− pages_addr, last_update, table_freed);
	1905	+ pages_addr, last_update, NULL);
1907	1906	if (r)
1908	1907	return r;
1909	1908	}
@@ -2155,7 +2154,7 @@ int amdgpu_vm_handle_moved(struct amdgpu_device *adev, · 245 unmodified lines
2155	2154
2156	2155	list_for_each_entry_safe(bo_va, tmp, &vm->moved, base.vm_status) {
2157	2156	/* Per VM BOs never need to bo cleared in the page tables */
2158		− r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);
	2157	+ r = amdgpu_vm_bo_update(adev, bo_va, false);
2159	2158	if (r)
2160	2159	return r;
2161	2160	}
@@ -2174,7 +2173,7 @@ int amdgpu_vm_handle_moved(struct amdgpu_device *adev, · 12 unmodified lines
2174	2173	else
2175	2174	clear = true;
2176	2175
2177		− r = amdgpu_vm_bo_update(adev, bo_va, clear, NULL);
	2176	+ r = amdgpu_vm_bo_update(adev, bo_va, clear);
2178	2177	if (r)
2179	2178	return r;
2180	2179

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h+1−1

@@ -406,7 +406,7 @@ int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, · 405 unmodified lines
406	406	struct dma_fence *fence, bool free_table);
407	407	int amdgpu_vm_bo_update(struct amdgpu_device *adev,
408	408	struct amdgpu_bo_va *bo_va,
409		− bool clear, bool *table_freed);
	409	+ bool clear);
410	410	bool amdgpu_vm_evictable(struct amdgpu_bo *bo);
411	411	void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev,
412	412	struct amdgpu_bo *bo, bool evicted);

drivers/gpu/drm/amd/amdgpu/dce_virtual.c+1−1

@@ -766,7 +766,7 @@ static const struct amdgpu_irq_src_funcs dce_virtual_crtc_irq_funcs = { · 765 unmodified lines
766	766
767	767	static void dce_virtual_set_irq_funcs(struct amdgpu_device *adev)
768	768	{
769		− adev->crtc_irq.num_types = AMDGPU_CRTC_IRQ_VBLANK6 + 1;
	769	+ adev->crtc_irq.num_types = adev->mode_info.num_crtc;
770	770	adev->crtc_irq.funcs = &dce_virtual_crtc_irq_funcs;
771	771	}
772	772

drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c+2−2

@@ -252,7 +252,7 @@ static void xgpu_ai_mailbox_flr_work(struct work_struct *work) · 251 unmodified lines
252	252	* otherwise the mailbox msg will be ruined/reseted by
253	253	* the VF FLR.
254	254	*/
255		− if (!down_read_trylock(&adev->reset_sem))
	255	+ if (!down_write_trylock(&adev->reset_sem))
256	256	return;
257	257
258	258	amdgpu_virt_fini_data_exchange(adev);
@@ -268,7 +268,7 @@ static void xgpu_ai_mailbox_flr_work(struct work_struct *work) · 9 unmodified lines
268	268
269	269	flr_done:
270	270	atomic_set(&adev->in_gpu_reset, 0);
271		− up_read(&adev->reset_sem);
	271	+ up_write(&adev->reset_sem);
272	272
273	273	/* Trigger recovery for world switch failure if no TDR */
274	274	if (amdgpu_device_should_recover_gpu(adev)

drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c+2−2

@@ -273,7 +273,7 @@ static void xgpu_nv_mailbox_flr_work(struct work_struct *work) · 272 unmodified lines
273	273	* otherwise the mailbox msg will be ruined/reseted by
274	274	* the VF FLR.
275	275	*/
276		− if (!down_read_trylock(&adev->reset_sem))
	276	+ if (!down_write_trylock(&adev->reset_sem))
277	277	return;
278	278
279	279	amdgpu_virt_fini_data_exchange(adev);
@@ -289,7 +289,7 @@ static void xgpu_nv_mailbox_flr_work(struct work_struct *work) · 9 unmodified lines
289	289
290	290	flr_done:
291	291	atomic_set(&adev->in_gpu_reset, 0);
292		− up_read(&adev->reset_sem);
	292	+ up_write(&adev->reset_sem);
293	293
294	294	/* Trigger recovery for world switch failure if no TDR */
295	295	if (amdgpu_device_should_recover_gpu(adev)

drivers/gpu/drm/amd/amdkfd/kfd_chardev.c+12−33

@@ -1393,7 +1393,6 @@ static int kfd_ioctl_map_memory_to_gpu(struct file *filep, · 1392 unmodified lines
1393	1393	long err = 0;
1394	1394	int i;
1395	1395	uint32_t *devices_arr = NULL;
1396		− bool table_freed = false;
1397	1396
1398	1397	dev = kfd_device_by_id(GET_GPU_ID(args->handle));
1399	1398	if (!dev)
@@ -1451,8 +1450,7 @@ static int kfd_ioctl_map_memory_to_gpu(struct file *filep, · 51 unmodified lines
1451	1450	goto get_mem_obj_from_handle_failed;
1452	1451	}
1453	1452	err = amdgpu_amdkfd_gpuvm_map_memory_to_gpu(
1454		− peer->kgd, (struct kgd_mem *)mem,
1455		− peer_pdd->drm_priv, &table_freed);
	1453	+ peer->kgd, (struct kgd_mem *)mem, peer_pdd->drm_priv);
1456	1454	if (err) {
1457	1455	pr_err("Failed to map to gpu %d/%d\n",
1458	1456	i, args->n_devices);
@@ -1470,17 +1468,16 @@ static int kfd_ioctl_map_memory_to_gpu(struct file *filep, · 11 unmodified lines
1470	1468	}
1471	1469
1472	1470	/* Flush TLBs after waiting for the page table updates to complete */
1473		− if (table_freed) {
1474		− for (i = 0; i < args->n_devices; i++) {
1475		− peer = kfd_device_by_id(devices_arr[i]);
1476		− if (WARN_ON_ONCE(!peer))
1477		− continue;
1478		− peer_pdd = kfd_get_process_device_data(peer, p);
1479		− if (WARN_ON_ONCE(!peer_pdd))
1480		− continue;
1481		− kfd_flush_tlb(peer_pdd, TLB_FLUSH_LEGACY);
1482		− }
	1471	+ for (i = 0; i < args->n_devices; i++) {
	1472	+ peer = kfd_device_by_id(devices_arr[i]);
	1473	+ if (WARN_ON_ONCE(!peer))
	1474	+ continue;
	1475	+ peer_pdd = kfd_get_process_device_data(peer, p);
	1476	+ if (WARN_ON_ONCE(!peer_pdd))
	1477	+ continue;
	1478	+ kfd_flush_tlb(peer_pdd, TLB_FLUSH_LEGACY);
1483	1479	}
	1480	+
1484	1481	kfree(devices_arr);
1485	1482
1486	1483	return err;
@@ -1568,27 +1565,10 @@ static int kfd_ioctl_unmap_memory_from_gpu(struct file *filep, · 81 unmodified lines
1568	1565	}
1569	1566	args->n_success = i+1;
1570	1567	}
1571		− mutex_unlock(&p->mutex);
1572		−
1573		− err = amdgpu_amdkfd_gpuvm_sync_memory(dev->kgd, (struct kgd_mem *) mem, true);
1574		− if (err) {
1575		− pr_debug("Sync memory failed, wait interrupted by user signal\n");
1576		− goto sync_memory_failed;
1577		− }
1578		−
1579		− /* Flush TLBs after waiting for the page table updates to complete */
1580		− for (i = 0; i < args->n_devices; i++) {
1581		− peer = kfd_device_by_id(devices_arr[i]);
1582		− if (WARN_ON_ONCE(!peer))
1583		− continue;
1584		− peer_pdd = kfd_get_process_device_data(peer, p);
1585		− if (WARN_ON_ONCE(!peer_pdd))
1586		− continue;
1587		− kfd_flush_tlb(peer_pdd, TLB_FLUSH_HEAVYWEIGHT);
1588		− }
1589		−
1590	1568	kfree(devices_arr);
1591	1569
	1570	+ mutex_unlock(&p->mutex);
	1571	+
1592	1572	return 0;
1593	1573
1594	1574	bind_process_to_device_failed:
@@ -1596,7 +1576,6 @@ get_mem_obj_from_handle_failed: · 1 unmodified line
1596	1576	unmap_memory_from_gpu_failed:
1597	1577	mutex_unlock(&p->mutex);
1598	1578	copy_from_user_failed:
1599		−sync_memory_failed:
1600	1579	kfree(devices_arr);
1601	1580	return err;
1602	1581	}

drivers/gpu/drm/amd/amdkfd/kfd_process.c+1−2

@@ -714,8 +714,7 @@ static int kfd_process_alloc_gpuvm(struct kfd_process_device *pdd, · 713 unmodified lines
714	714	if (err)
715	715	goto err_alloc_mem;
716	716
717		− err = amdgpu_amdkfd_gpuvm_map_memory_to_gpu(kdev->kgd, mem,
718		− pdd->drm_priv, NULL);
	717	+ err = amdgpu_amdkfd_gpuvm_map_memory_to_gpu(kdev->kgd, mem, pdd->drm_priv);
719	718	if (err)
720	719	goto err_map_mem;
721	720

drivers/gpu/drm/amd/amdkfd/kfd_svm.c+18−12

@@ -2375,21 +2375,27 @@ static bool svm_range_skip_recover(struct svm_range *prange) · 2374 unmodified lines
2375	2375
2376	2376	static void
2377	2377	svm_range_count_fault(struct amdgpu_device adev, struct kfd_process p,
2378		− struct svm_range *prange, int32_t gpuidx)
	2378	+ int32_t gpuidx)
2379	2379	{
2380	2380	struct kfd_process_device *pdd;
2381	2381
2382		− if (gpuidx == MAX_GPU_INSTANCE)
2383		− /* fault is on different page of same range
2384		− * or fault is skipped to recover later
2385		− */
2386		− pdd = svm_range_get_pdd_by_adev(prange, adev);
2387		− else
2388		− /* fault recovered
2389		− * or fault cannot recover because GPU no access on the range
2390		− */
2391		− pdd = kfd_process_device_from_gpuidx(p, gpuidx);
	2382	+ /* fault is on different page of same range
	2383	+ * or fault is skipped to recover later
	2384	+ * or fault is on invalid virtual address
	2385	+ */
	2386	+ if (gpuidx == MAX_GPU_INSTANCE) {
	2387	+ uint32_t gpuid;
	2388	+ int r;
2392	2389
	2390	+ r = kfd_process_gpuid_from_kgd(p, adev, &gpuid, &gpuidx);
	2391	+ if (r < 0)
	2392	+ return;
	2393	+ }
	2394	+
	2395	+ /* fault is recovered
	2396	+ * or fault cannot recover because GPU no access on the range
	2397	+ */
	2398	+ pdd = kfd_process_device_from_gpuidx(p, gpuidx);
2393	2399	if (pdd)
2394	2400	WRITE_ONCE(pdd->faults, pdd->faults + 1);
2395	2401	}
@@ -2525,7 +2531,7 @@ out_unlock_svms: · 129 unmodified lines
2525	2531	mutex_unlock(&svms->lock);
2526	2532	mmap_read_unlock(mm);
2527	2533
2528		− svm_range_count_fault(adev, p, prange, gpuidx);
	2534	+ svm_range_count_fault(adev, p, gpuidx);
2529	2535
2530	2536	mmput(mm);
2531	2537	out:

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c+1−1

@@ -9191,7 +9191,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) · 9190 unmodified lines
9191	9191	#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) \|\| \
9192	9192	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
9193	9193	/* restore the backlight level */
9194		− if (dm->backlight_dev)
	9194	+ if (dm->backlight_dev && (amdgpu_dm_backlight_get_level(dm) != dm->brightness[0]))
9195	9195	amdgpu_dm_backlight_set_level(dm, dm->brightness[0]);
9196	9196	#endif
9197	9197	/*

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c+2−2

@@ -31,8 +31,8 @@ · 30 unmodified lines
31	31	#include "dcn31_smu.h"
32	32
33	33	#include "yellow_carp_offset.h"
34		−#include "mp/mp_13_0_1_offset.h"
35		−#include "mp/mp_13_0_1_sh_mask.h"
	34	+#include "mp/mp_13_0_2_offset.h"
	35	+#include "mp/mp_13_0_2_sh_mask.h"
36	36
37	37	#define REG(reg_name) \
38	38	(MP0_BASE.instance[0].segment[reg ## reg_name ## _BASE_IDX] + reg ## reg_name)

drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c+4−4

@@ -1620,11 +1620,12 @@ enum dc_status dpcd_configure_lttpr_mode(struct dc_link *link, struct link_train · 1619 unmodified lines
1620	1620	{
1621	1621	enum dc_status status = DC_OK;
1622	1622
1623		− if (lt_settings->lttpr_mode == LTTPR_MODE_NON_TRANSPARENT)
1624		− status = configure_lttpr_mode_non_transparent(link, lt_settings);
1625		− else
	1623	+ if (lt_settings->lttpr_mode == LTTPR_MODE_TRANSPARENT)
1626	1624	status = configure_lttpr_mode_transparent(link);
1627	1625
	1626	+ else if (lt_settings->lttpr_mode == LTTPR_MODE_NON_TRANSPARENT)
	1627	+ status = configure_lttpr_mode_non_transparent(link, lt_settings);
	1628	+
1628	1629	return status;
1629	1630	}
1630	1631
@@ -1784,7 +1785,6 @@ bool perform_link_training_with_retries( · 153 unmodified lines
1784	1785	link_enc = stream->link_enc;
1785	1786	else
1786	1787	link_enc = link->link_enc;
1787		− ASSERT(link_enc);
1788	1788
1789	1789	/* We need to do this before the link training to ensure the idle pattern in SST
1790	1790	* mode will be sent right after the link training

drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c+1−1

@@ -390,7 +390,7 @@ void dcn31_update_info_frame(struct pipe_ctx *pipe_ctx) · 389 unmodified lines
390	390	is_hdmi_tmds = dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal);
391	391	is_dp = dc_is_dp_signal(pipe_ctx->stream->signal);
392	392
393		− if (!is_hdmi_tmds)
	393	+ if (!is_hdmi_tmds && !is_dp)
394	394	return;
395	395
396	396	if (is_hdmi_tmds)

drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h+0−355

@@ -1,355 +0,0 @@
1		−/*
2		− * Copyright 2020 Advanced Micro Devices, Inc.
3		− *
4		− * Permission is hereby granted, free of charge, to any person obtaining a
5		− * copy of this software and associated documentation files (the "Software"),
6		− * to deal in the Software without restriction, including without limitation
7		− * the rights to use, copy, modify, merge, publish, distribute, sublicense,
8		− * and/or sell copies of the Software, and to permit persons to whom the
9		− * Software is furnished to do so, subject to the following conditions:
10		− *
11		− * The above copyright notice and this permission notice shall be included in
12		− * all copies or substantial portions of the Software.
13		− *
14		− * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15		− * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16		− * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17		− * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
18		− * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19		− * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20		− * OTHER DEALINGS IN THE SOFTWARE.
21		− *
22		− *
23		− */
24		−#ifndef _mp_13_0_1_OFFSET_HEADER
25		−#define _mp_13_0_1_OFFSET_HEADER
26		−
27		−
28		−
29		−// addressBlock: mp_SmuMp0_SmnDec
30		−// base address: 0x0
31		−#define regMP0_SMN_C2PMSG_32 0x0060
32		−#define regMP0_SMN_C2PMSG_32_BASE_IDX 0
33		−#define regMP0_SMN_C2PMSG_33 0x0061
34		−#define regMP0_SMN_C2PMSG_33_BASE_IDX 0
35		−#define regMP0_SMN_C2PMSG_34 0x0062
36		−#define regMP0_SMN_C2PMSG_34_BASE_IDX 0
37		−#define regMP0_SMN_C2PMSG_35 0x0063
38		−#define regMP0_SMN_C2PMSG_35_BASE_IDX 0
39		−#define regMP0_SMN_C2PMSG_36 0x0064
40		−#define regMP0_SMN_C2PMSG_36_BASE_IDX 0
41		−#define regMP0_SMN_C2PMSG_37 0x0065
42		−#define regMP0_SMN_C2PMSG_37_BASE_IDX 0
43		−#define regMP0_SMN_C2PMSG_38 0x0066
44		−#define regMP0_SMN_C2PMSG_38_BASE_IDX 0
45		−#define regMP0_SMN_C2PMSG_39 0x0067
46		−#define regMP0_SMN_C2PMSG_39_BASE_IDX 0
47		−#define regMP0_SMN_C2PMSG_40 0x0068
48		−#define regMP0_SMN_C2PMSG_40_BASE_IDX 0
49		−#define regMP0_SMN_C2PMSG_41 0x0069
50		−#define regMP0_SMN_C2PMSG_41_BASE_IDX 0
51		−#define regMP0_SMN_C2PMSG_42 0x006a
52		−#define regMP0_SMN_C2PMSG_42_BASE_IDX 0
53		−#define regMP0_SMN_C2PMSG_43 0x006b
54		−#define regMP0_SMN_C2PMSG_43_BASE_IDX 0
55		−#define regMP0_SMN_C2PMSG_44 0x006c
56		−#define regMP0_SMN_C2PMSG_44_BASE_IDX 0
57		−#define regMP0_SMN_C2PMSG_45 0x006d
58		−#define regMP0_SMN_C2PMSG_45_BASE_IDX 0
59		−#define regMP0_SMN_C2PMSG_46 0x006e
60		−#define regMP0_SMN_C2PMSG_46_BASE_IDX 0
61		−#define regMP0_SMN_C2PMSG_47 0x006f
62		−#define regMP0_SMN_C2PMSG_47_BASE_IDX 0
63		−#define regMP0_SMN_C2PMSG_48 0x0070
64		−#define regMP0_SMN_C2PMSG_48_BASE_IDX 0
65		−#define regMP0_SMN_C2PMSG_49 0x0071
66		−#define regMP0_SMN_C2PMSG_49_BASE_IDX 0
67		−#define regMP0_SMN_C2PMSG_50 0x0072
68		−#define regMP0_SMN_C2PMSG_50_BASE_IDX 0
69		−#define regMP0_SMN_C2PMSG_51 0x0073
70		−#define regMP0_SMN_C2PMSG_51_BASE_IDX 0
71		−#define regMP0_SMN_C2PMSG_52 0x0074
72		−#define regMP0_SMN_C2PMSG_52_BASE_IDX 0
73		−#define regMP0_SMN_C2PMSG_53 0x0075
74		−#define regMP0_SMN_C2PMSG_53_BASE_IDX 0
75		−#define regMP0_SMN_C2PMSG_54 0x0076
76		−#define regMP0_SMN_C2PMSG_54_BASE_IDX 0
77		−#define regMP0_SMN_C2PMSG_55 0x0077
78		−#define regMP0_SMN_C2PMSG_55_BASE_IDX 0
79		−#define regMP0_SMN_C2PMSG_56 0x0078
80		−#define regMP0_SMN_C2PMSG_56_BASE_IDX 0
81		−#define regMP0_SMN_C2PMSG_57 0x0079
82		−#define regMP0_SMN_C2PMSG_57_BASE_IDX 0
83		−#define regMP0_SMN_C2PMSG_58 0x007a
84		−#define regMP0_SMN_C2PMSG_58_BASE_IDX 0
85		−#define regMP0_SMN_C2PMSG_59 0x007b
86		−#define regMP0_SMN_C2PMSG_59_BASE_IDX 0
87		−#define regMP0_SMN_C2PMSG_60 0x007c
88		−#define regMP0_SMN_C2PMSG_60_BASE_IDX 0
89		−#define regMP0_SMN_C2PMSG_61 0x007d
90		−#define regMP0_SMN_C2PMSG_61_BASE_IDX 0
91		−#define regMP0_SMN_C2PMSG_62 0x007e
92		−#define regMP0_SMN_C2PMSG_62_BASE_IDX 0
93		−#define regMP0_SMN_C2PMSG_63 0x007f
94		−#define regMP0_SMN_C2PMSG_63_BASE_IDX 0
95		−#define regMP0_SMN_C2PMSG_64 0x0080
96		−#define regMP0_SMN_C2PMSG_64_BASE_IDX 0
97		−#define regMP0_SMN_C2PMSG_65 0x0081
98		−#define regMP0_SMN_C2PMSG_65_BASE_IDX 0
99		−#define regMP0_SMN_C2PMSG_66 0x0082
100		−#define regMP0_SMN_C2PMSG_66_BASE_IDX 0
101		−#define regMP0_SMN_C2PMSG_67 0x0083
102		−#define regMP0_SMN_C2PMSG_67_BASE_IDX 0
103		−#define regMP0_SMN_C2PMSG_68 0x0084
104		−#define regMP0_SMN_C2PMSG_68_BASE_IDX 0
105		−#define regMP0_SMN_C2PMSG_69 0x0085
106		−#define regMP0_SMN_C2PMSG_69_BASE_IDX 0
107		−#define regMP0_SMN_C2PMSG_70 0x0086
108		−#define regMP0_SMN_C2PMSG_70_BASE_IDX 0
109		−#define regMP0_SMN_C2PMSG_71 0x0087
110		−#define regMP0_SMN_C2PMSG_71_BASE_IDX 0
111		−#define regMP0_SMN_C2PMSG_72 0x0088
112		−#define regMP0_SMN_C2PMSG_72_BASE_IDX 0
113		−#define regMP0_SMN_C2PMSG_73 0x0089
114		−#define regMP0_SMN_C2PMSG_73_BASE_IDX 0
115		−#define regMP0_SMN_C2PMSG_74 0x008a
116		−#define regMP0_SMN_C2PMSG_74_BASE_IDX 0
117		−#define regMP0_SMN_C2PMSG_75 0x008b
118		−#define regMP0_SMN_C2PMSG_75_BASE_IDX 0
119		−#define regMP0_SMN_C2PMSG_76 0x008c
120		−#define regMP0_SMN_C2PMSG_76_BASE_IDX 0
121		−#define regMP0_SMN_C2PMSG_77 0x008d
122		−#define regMP0_SMN_C2PMSG_77_BASE_IDX 0
123		−#define regMP0_SMN_C2PMSG_78 0x008e
124		−#define regMP0_SMN_C2PMSG_78_BASE_IDX 0
125		−#define regMP0_SMN_C2PMSG_79 0x008f
126		−#define regMP0_SMN_C2PMSG_79_BASE_IDX 0
127		−#define regMP0_SMN_C2PMSG_80 0x0090
128		−#define regMP0_SMN_C2PMSG_80_BASE_IDX 0
129		−#define regMP0_SMN_C2PMSG_81 0x0091
130		−#define regMP0_SMN_C2PMSG_81_BASE_IDX 0
131		−#define regMP0_SMN_C2PMSG_82 0x0092
132		−#define regMP0_SMN_C2PMSG_82_BASE_IDX 0
133		−#define regMP0_SMN_C2PMSG_83 0x0093
134		−#define regMP0_SMN_C2PMSG_83_BASE_IDX 0
135		−#define regMP0_SMN_C2PMSG_84 0x0094
136		−#define regMP0_SMN_C2PMSG_84_BASE_IDX 0
137		−#define regMP0_SMN_C2PMSG_85 0x0095
138		−#define regMP0_SMN_C2PMSG_85_BASE_IDX 0
139		−#define regMP0_SMN_C2PMSG_86 0x0096
140		−#define regMP0_SMN_C2PMSG_86_BASE_IDX 0
141		−#define regMP0_SMN_C2PMSG_87 0x0097
142		−#define regMP0_SMN_C2PMSG_87_BASE_IDX 0
143		−#define regMP0_SMN_C2PMSG_88 0x0098
144		−#define regMP0_SMN_C2PMSG_88_BASE_IDX 0
145		−#define regMP0_SMN_C2PMSG_89 0x0099
146		−#define regMP0_SMN_C2PMSG_89_BASE_IDX 0
147		−#define regMP0_SMN_C2PMSG_90 0x009a
148		−#define regMP0_SMN_C2PMSG_90_BASE_IDX 0
149		−#define regMP0_SMN_C2PMSG_91 0x009b
150		−#define regMP0_SMN_C2PMSG_91_BASE_IDX 0
151		−#define regMP0_SMN_C2PMSG_92 0x009c
152		−#define regMP0_SMN_C2PMSG_92_BASE_IDX 0
153		−#define regMP0_SMN_C2PMSG_93 0x009d
154		−#define regMP0_SMN_C2PMSG_93_BASE_IDX 0
155		−#define regMP0_SMN_C2PMSG_94 0x009e
156		−#define regMP0_SMN_C2PMSG_94_BASE_IDX 0
157		−#define regMP0_SMN_C2PMSG_95 0x009f
158		−#define regMP0_SMN_C2PMSG_95_BASE_IDX 0
159		−#define regMP0_SMN_C2PMSG_96 0x00a0
160		−#define regMP0_SMN_C2PMSG_96_BASE_IDX 0
161		−#define regMP0_SMN_C2PMSG_97 0x00a1
162		−#define regMP0_SMN_C2PMSG_97_BASE_IDX 0
163		−#define regMP0_SMN_C2PMSG_98 0x00a2
164		−#define regMP0_SMN_C2PMSG_98_BASE_IDX 0
165		−#define regMP0_SMN_C2PMSG_99 0x00a3
166		−#define regMP0_SMN_C2PMSG_99_BASE_IDX 0
167		−#define regMP0_SMN_C2PMSG_100 0x00a4
168		−#define regMP0_SMN_C2PMSG_100_BASE_IDX 0
169		−#define regMP0_SMN_C2PMSG_101 0x00a5
170		−#define regMP0_SMN_C2PMSG_101_BASE_IDX 0
171		−#define regMP0_SMN_C2PMSG_102 0x00a6
172		−#define regMP0_SMN_C2PMSG_102_BASE_IDX 0
173		−#define regMP0_SMN_C2PMSG_103 0x00a7
174		−#define regMP0_SMN_C2PMSG_103_BASE_IDX 0
175		−#define regMP0_SMN_IH_CREDIT 0x00c1
176		−#define regMP0_SMN_IH_CREDIT_BASE_IDX 0
177		−#define regMP0_SMN_IH_SW_INT 0x00c2
178		−#define regMP0_SMN_IH_SW_INT_BASE_IDX 0
179		−#define regMP0_SMN_IH_SW_INT_CTRL 0x00c3
180		−#define regMP0_SMN_IH_SW_INT_CTRL_BASE_IDX 0
181		−
182		−
183		−// addressBlock: mp_SmuMp1_SmnDec
184		−// base address: 0x0
185		−#define regMP1_SMN_C2PMSG_32 0x0260
186		−#define regMP1_SMN_C2PMSG_32_BASE_IDX 0
187		−#define regMP1_SMN_C2PMSG_33 0x0261
188		−#define regMP1_SMN_C2PMSG_33_BASE_IDX 0
189		−#define regMP1_SMN_C2PMSG_34 0x0262
190		−#define regMP1_SMN_C2PMSG_34_BASE_IDX 0
191		−#define regMP1_SMN_C2PMSG_35 0x0263
192		−#define regMP1_SMN_C2PMSG_35_BASE_IDX 0
193		−#define regMP1_SMN_C2PMSG_36 0x0264
194		−#define regMP1_SMN_C2PMSG_36_BASE_IDX 0
195		−#define regMP1_SMN_C2PMSG_37 0x0265
196		−#define regMP1_SMN_C2PMSG_37_BASE_IDX 0
197		−#define regMP1_SMN_C2PMSG_38 0x0266
198		−#define regMP1_SMN_C2PMSG_38_BASE_IDX 0
199		−#define regMP1_SMN_C2PMSG_39 0x0267
200		−#define regMP1_SMN_C2PMSG_39_BASE_IDX 0
201		−#define regMP1_SMN_C2PMSG_40 0x0268
202		−#define regMP1_SMN_C2PMSG_40_BASE_IDX 0
203		−#define regMP1_SMN_C2PMSG_41 0x0269
204		−#define regMP1_SMN_C2PMSG_41_BASE_IDX 0
205		−#define regMP1_SMN_C2PMSG_42 0x026a
206		−#define regMP1_SMN_C2PMSG_42_BASE_IDX 0
207		−#define regMP1_SMN_C2PMSG_43 0x026b
208		−#define regMP1_SMN_C2PMSG_43_BASE_IDX 0
209		−#define regMP1_SMN_C2PMSG_44 0x026c
210		−#define regMP1_SMN_C2PMSG_44_BASE_IDX 0
211		−#define regMP1_SMN_C2PMSG_45 0x026d
212		−#define regMP1_SMN_C2PMSG_45_BASE_IDX 0
213		−#define regMP1_SMN_C2PMSG_46 0x026e
214		−#define regMP1_SMN_C2PMSG_46_BASE_IDX 0
215		−#define regMP1_SMN_C2PMSG_47 0x026f
216		−#define regMP1_SMN_C2PMSG_47_BASE_IDX 0
217		−#define regMP1_SMN_C2PMSG_48 0x0270
218		−#define regMP1_SMN_C2PMSG_48_BASE_IDX 0
219		−#define regMP1_SMN_C2PMSG_49 0x0271
220		−#define regMP1_SMN_C2PMSG_49_BASE_IDX 0
221		−#define regMP1_SMN_C2PMSG_50 0x0272
222		−#define regMP1_SMN_C2PMSG_50_BASE_IDX 0
223		−#define regMP1_SMN_C2PMSG_51 0x0273
224		−#define regMP1_SMN_C2PMSG_51_BASE_IDX 0
225		−#define regMP1_SMN_C2PMSG_52 0x0274
226		−#define regMP1_SMN_C2PMSG_52_BASE_IDX 0
227		−#define regMP1_SMN_C2PMSG_53 0x0275
228		−#define regMP1_SMN_C2PMSG_53_BASE_IDX 0
229		−#define regMP1_SMN_C2PMSG_54 0x0276
230		−#define regMP1_SMN_C2PMSG_54_BASE_IDX 0
231		−#define regMP1_SMN_C2PMSG_55 0x0277
232		−#define regMP1_SMN_C2PMSG_55_BASE_IDX 0
233		−#define regMP1_SMN_C2PMSG_56 0x0278
234		−#define regMP1_SMN_C2PMSG_56_BASE_IDX 0
235		−#define regMP1_SMN_C2PMSG_57 0x0279
236		−#define regMP1_SMN_C2PMSG_57_BASE_IDX 0
237		−#define regMP1_SMN_C2PMSG_58 0x027a
238		−#define regMP1_SMN_C2PMSG_58_BASE_IDX 0
239		−#define regMP1_SMN_C2PMSG_59 0x027b
240		−#define regMP1_SMN_C2PMSG_59_BASE_IDX 0
241		−#define regMP1_SMN_C2PMSG_60 0x027c
242		−#define regMP1_SMN_C2PMSG_60_BASE_IDX 0
243		−#define regMP1_SMN_C2PMSG_61 0x027d
244		−#define regMP1_SMN_C2PMSG_61_BASE_IDX 0
245		−#define regMP1_SMN_C2PMSG_62 0x027e
246		−#define regMP1_SMN_C2PMSG_62_BASE_IDX 0
247		−#define regMP1_SMN_C2PMSG_63 0x027f
248		−#define regMP1_SMN_C2PMSG_63_BASE_IDX 0
249		−#define regMP1_SMN_C2PMSG_64 0x0280
250		−#define regMP1_SMN_C2PMSG_64_BASE_IDX 0
251		−#define regMP1_SMN_C2PMSG_65 0x0281
252		−#define regMP1_SMN_C2PMSG_65_BASE_IDX 0
253		−#define regMP1_SMN_C2PMSG_66 0x0282
254		−#define regMP1_SMN_C2PMSG_66_BASE_IDX 0
255		−#define regMP1_SMN_C2PMSG_67 0x0283
256		−#define regMP1_SMN_C2PMSG_67_BASE_IDX 0
257		−#define regMP1_SMN_C2PMSG_68 0x0284
258		−#define regMP1_SMN_C2PMSG_68_BASE_IDX 0
259		−#define regMP1_SMN_C2PMSG_69 0x0285
260		−#define regMP1_SMN_C2PMSG_69_BASE_IDX 0
261		−#define regMP1_SMN_C2PMSG_70 0x0286
262		−#define regMP1_SMN_C2PMSG_70_BASE_IDX 0
263		−#define regMP1_SMN_C2PMSG_71 0x0287
264		−#define regMP1_SMN_C2PMSG_71_BASE_IDX 0
265		−#define regMP1_SMN_C2PMSG_72 0x0288
266		−#define regMP1_SMN_C2PMSG_72_BASE_IDX 0
267		−#define regMP1_SMN_C2PMSG_73 0x0289
268		−#define regMP1_SMN_C2PMSG_73_BASE_IDX 0
269		−#define regMP1_SMN_C2PMSG_74 0x028a
270		−#define regMP1_SMN_C2PMSG_74_BASE_IDX 0
271		−#define regMP1_SMN_C2PMSG_75 0x028b
272		−#define regMP1_SMN_C2PMSG_75_BASE_IDX 0
273		−#define regMP1_SMN_C2PMSG_76 0x028c
274		−#define regMP1_SMN_C2PMSG_76_BASE_IDX 0
275		−#define regMP1_SMN_C2PMSG_77 0x028d
276		−#define regMP1_SMN_C2PMSG_77_BASE_IDX 0
277		−#define regMP1_SMN_C2PMSG_78 0x028e
278		−#define regMP1_SMN_C2PMSG_78_BASE_IDX 0
279		−#define regMP1_SMN_C2PMSG_79 0x028f
280		−#define regMP1_SMN_C2PMSG_79_BASE_IDX 0
281		−#define regMP1_SMN_C2PMSG_80 0x0290
282		−#define regMP1_SMN_C2PMSG_80_BASE_IDX 0
283		−#define regMP1_SMN_C2PMSG_81 0x0291
284		−#define regMP1_SMN_C2PMSG_81_BASE_IDX 0
285		−#define regMP1_SMN_C2PMSG_82 0x0292
286		−#define regMP1_SMN_C2PMSG_82_BASE_IDX 0
287		−#define regMP1_SMN_C2PMSG_83 0x0293
288		−#define regMP1_SMN_C2PMSG_83_BASE_IDX 0
289		−#define regMP1_SMN_C2PMSG_84 0x0294
290		−#define regMP1_SMN_C2PMSG_84_BASE_IDX 0
291		−#define regMP1_SMN_C2PMSG_85 0x0295
292		−#define regMP1_SMN_C2PMSG_85_BASE_IDX 0
293		−#define regMP1_SMN_C2PMSG_86 0x0296
294		−#define regMP1_SMN_C2PMSG_86_BASE_IDX 0
295		−#define regMP1_SMN_C2PMSG_87 0x0297
296		−#define regMP1_SMN_C2PMSG_87_BASE_IDX 0
297		−#define regMP1_SMN_C2PMSG_88 0x0298
298		−#define regMP1_SMN_C2PMSG_88_BASE_IDX 0
299		−#define regMP1_SMN_C2PMSG_89 0x0299
300		−#define regMP1_SMN_C2PMSG_89_BASE_IDX 0
301		−#define regMP1_SMN_C2PMSG_90 0x029a
302		−#define regMP1_SMN_C2PMSG_90_BASE_IDX 0
303		−#define regMP1_SMN_C2PMSG_91 0x029b
304		−#define regMP1_SMN_C2PMSG_91_BASE_IDX 0
305		−#define regMP1_SMN_C2PMSG_92 0x029c
306		−#define regMP1_SMN_C2PMSG_92_BASE_IDX 0
307		−#define regMP1_SMN_C2PMSG_93 0x029d
308		−#define regMP1_SMN_C2PMSG_93_BASE_IDX 0
309		−#define regMP1_SMN_C2PMSG_94 0x029e
310		−#define regMP1_SMN_C2PMSG_94_BASE_IDX 0
311		−#define regMP1_SMN_C2PMSG_95 0x029f
312		−#define regMP1_SMN_C2PMSG_95_BASE_IDX 0
313		−#define regMP1_SMN_C2PMSG_96 0x02a0
314		−#define regMP1_SMN_C2PMSG_96_BASE_IDX 0
315		−#define regMP1_SMN_C2PMSG_97 0x02a1
316		−#define regMP1_SMN_C2PMSG_97_BASE_IDX 0
317		−#define regMP1_SMN_C2PMSG_98 0x02a2
318		−#define regMP1_SMN_C2PMSG_98_BASE_IDX 0
319		−#define regMP1_SMN_C2PMSG_99 0x02a3
320		−#define regMP1_SMN_C2PMSG_99_BASE_IDX 0
321		−#define regMP1_SMN_C2PMSG_100 0x02a4
322		−#define regMP1_SMN_C2PMSG_100_BASE_IDX 0
323		−#define regMP1_SMN_C2PMSG_101 0x02a5
324		−#define regMP1_SMN_C2PMSG_101_BASE_IDX 0
325		−#define regMP1_SMN_C2PMSG_102 0x02a6
326		−#define regMP1_SMN_C2PMSG_102_BASE_IDX 0
327		−#define regMP1_SMN_C2PMSG_103 0x02a7
328		−#define regMP1_SMN_C2PMSG_103_BASE_IDX 0
329		−#define regMP1_SMN_IH_CREDIT 0x02c1
330		−#define regMP1_SMN_IH_CREDIT_BASE_IDX 0
331		−#define regMP1_SMN_IH_SW_INT 0x02c2
332		−#define regMP1_SMN_IH_SW_INT_BASE_IDX 0
333		−#define regMP1_SMN_IH_SW_INT_CTRL 0x02c3
334		−#define regMP1_SMN_IH_SW_INT_CTRL_BASE_IDX 0
335		−#define regMP1_SMN_FPS_CNT 0x02c4
336		−#define regMP1_SMN_FPS_CNT_BASE_IDX 0
337		−#define regMP1_SMN_EXT_SCRATCH0 0x0340
338		−#define regMP1_SMN_EXT_SCRATCH0_BASE_IDX 0
339		−#define regMP1_SMN_EXT_SCRATCH1 0x0341
340		−#define regMP1_SMN_EXT_SCRATCH1_BASE_IDX 0
341		−#define regMP1_SMN_EXT_SCRATCH2 0x0342
342		−#define regMP1_SMN_EXT_SCRATCH2_BASE_IDX 0
343		−#define regMP1_SMN_EXT_SCRATCH3 0x0343
344		−#define regMP1_SMN_EXT_SCRATCH3_BASE_IDX 0
345		−#define regMP1_SMN_EXT_SCRATCH4 0x0344
346		−#define regMP1_SMN_EXT_SCRATCH4_BASE_IDX 0
347		−#define regMP1_SMN_EXT_SCRATCH5 0x0345
348		−#define regMP1_SMN_EXT_SCRATCH5_BASE_IDX 0
349		−#define regMP1_SMN_EXT_SCRATCH6 0x0346
350		−#define regMP1_SMN_EXT_SCRATCH6_BASE_IDX 0
351		−#define regMP1_SMN_EXT_SCRATCH7 0x0347
352		−#define regMP1_SMN_EXT_SCRATCH7_BASE_IDX 0
353		−
354		−
355		−#endif

drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h+0−531

@@ -1,531 +0,0 @@
1		−/*
2		− * Copyright 2020 Advanced Micro Devices, Inc.
3		− *
4		− * Permission is hereby granted, free of charge, to any person obtaining a
5		− * copy of this software and associated documentation files (the "Software"),
6		− * to deal in the Software without restriction, including without limitation
7		− * the rights to use, copy, modify, merge, publish, distribute, sublicense,
8		− * and/or sell copies of the Software, and to permit persons to whom the
9		− * Software is furnished to do so, subject to the following conditions:
10		− *
11		− * The above copyright notice and this permission notice shall be included in
12		− * all copies or substantial portions of the Software.
13		− *
14		− * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15		− * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16		− * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17		− * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
18		− * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19		− * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20		− * OTHER DEALINGS IN THE SOFTWARE.
21		− *
22		− *
23		− */
24		−#ifndef _mp_13_0_1_SH_MASK_HEADER
25		−#define _mp_13_0_1_SH_MASK_HEADER
26		−
27		−
28		−// addressBlock: mp_SmuMp0_SmnDec
29		−//MP0_SMN_C2PMSG_32
30		−#define MP0_SMN_C2PMSG_32__CONTENT__SHIFT 0x0
31		−#define MP0_SMN_C2PMSG_32__CONTENT_MASK 0xFFFFFFFFL
32		−//MP0_SMN_C2PMSG_33
33		−#define MP0_SMN_C2PMSG_33__CONTENT__SHIFT 0x0
34		−#define MP0_SMN_C2PMSG_33__CONTENT_MASK 0xFFFFFFFFL
35		−//MP0_SMN_C2PMSG_34
36		−#define MP0_SMN_C2PMSG_34__CONTENT__SHIFT 0x0
37		−#define MP0_SMN_C2PMSG_34__CONTENT_MASK 0xFFFFFFFFL
38		−//MP0_SMN_C2PMSG_35
39		−#define MP0_SMN_C2PMSG_35__CONTENT__SHIFT 0x0
40		−#define MP0_SMN_C2PMSG_35__CONTENT_MASK 0xFFFFFFFFL
41		−//MP0_SMN_C2PMSG_36
42		−#define MP0_SMN_C2PMSG_36__CONTENT__SHIFT 0x0
43		−#define MP0_SMN_C2PMSG_36__CONTENT_MASK 0xFFFFFFFFL
44		−//MP0_SMN_C2PMSG_37
45		−#define MP0_SMN_C2PMSG_37__CONTENT__SHIFT 0x0
46		−#define MP0_SMN_C2PMSG_37__CONTENT_MASK 0xFFFFFFFFL
47		−//MP0_SMN_C2PMSG_38
48		−#define MP0_SMN_C2PMSG_38__CONTENT__SHIFT 0x0
49		−#define MP0_SMN_C2PMSG_38__CONTENT_MASK 0xFFFFFFFFL
50		−//MP0_SMN_C2PMSG_39
51		−#define MP0_SMN_C2PMSG_39__CONTENT__SHIFT 0x0
52		−#define MP0_SMN_C2PMSG_39__CONTENT_MASK 0xFFFFFFFFL
53		−//MP0_SMN_C2PMSG_40
54		−#define MP0_SMN_C2PMSG_40__CONTENT__SHIFT 0x0
55		−#define MP0_SMN_C2PMSG_40__CONTENT_MASK 0xFFFFFFFFL
56		−//MP0_SMN_C2PMSG_41
57		−#define MP0_SMN_C2PMSG_41__CONTENT__SHIFT 0x0
58		−#define MP0_SMN_C2PMSG_41__CONTENT_MASK 0xFFFFFFFFL
59		−//MP0_SMN_C2PMSG_42
60		−#define MP0_SMN_C2PMSG_42__CONTENT__SHIFT 0x0
61		−#define MP0_SMN_C2PMSG_42__CONTENT_MASK 0xFFFFFFFFL
62		−//MP0_SMN_C2PMSG_43
63		−#define MP0_SMN_C2PMSG_43__CONTENT__SHIFT 0x0
64		−#define MP0_SMN_C2PMSG_43__CONTENT_MASK 0xFFFFFFFFL
65		−//MP0_SMN_C2PMSG_44
66		−#define MP0_SMN_C2PMSG_44__CONTENT__SHIFT 0x0
67		−#define MP0_SMN_C2PMSG_44__CONTENT_MASK 0xFFFFFFFFL
68		−//MP0_SMN_C2PMSG_45
69		−#define MP0_SMN_C2PMSG_45__CONTENT__SHIFT 0x0
70		−#define MP0_SMN_C2PMSG_45__CONTENT_MASK 0xFFFFFFFFL
71		−//MP0_SMN_C2PMSG_46
72		−#define MP0_SMN_C2PMSG_46__CONTENT__SHIFT 0x0
73		−#define MP0_SMN_C2PMSG_46__CONTENT_MASK 0xFFFFFFFFL
74		−//MP0_SMN_C2PMSG_47
75		−#define MP0_SMN_C2PMSG_47__CONTENT__SHIFT 0x0
76		−#define MP0_SMN_C2PMSG_47__CONTENT_MASK 0xFFFFFFFFL
77		−//MP0_SMN_C2PMSG_48
78		−#define MP0_SMN_C2PMSG_48__CONTENT__SHIFT 0x0
79		−#define MP0_SMN_C2PMSG_48__CONTENT_MASK 0xFFFFFFFFL
80		−//MP0_SMN_C2PMSG_49
81		−#define MP0_SMN_C2PMSG_49__CONTENT__SHIFT 0x0
82		−#define MP0_SMN_C2PMSG_49__CONTENT_MASK 0xFFFFFFFFL
83		−//MP0_SMN_C2PMSG_50
84		−#define MP0_SMN_C2PMSG_50__CONTENT__SHIFT 0x0
85		−#define MP0_SMN_C2PMSG_50__CONTENT_MASK 0xFFFFFFFFL
86		−//MP0_SMN_C2PMSG_51
87		−#define MP0_SMN_C2PMSG_51__CONTENT__SHIFT 0x0
88		−#define MP0_SMN_C2PMSG_51__CONTENT_MASK 0xFFFFFFFFL
89		−//MP0_SMN_C2PMSG_52
90		−#define MP0_SMN_C2PMSG_52__CONTENT__SHIFT 0x0
91		−#define MP0_SMN_C2PMSG_52__CONTENT_MASK 0xFFFFFFFFL
92		−//MP0_SMN_C2PMSG_53
93		−#define MP0_SMN_C2PMSG_53__CONTENT__SHIFT 0x0
94		−#define MP0_SMN_C2PMSG_53__CONTENT_MASK 0xFFFFFFFFL
95		−//MP0_SMN_C2PMSG_54
96		−#define MP0_SMN_C2PMSG_54__CONTENT__SHIFT 0x0
97		−#define MP0_SMN_C2PMSG_54__CONTENT_MASK 0xFFFFFFFFL
98		−//MP0_SMN_C2PMSG_55
99		−#define MP0_SMN_C2PMSG_55__CONTENT__SHIFT 0x0
100		−#define MP0_SMN_C2PMSG_55__CONTENT_MASK 0xFFFFFFFFL
101		−//MP0_SMN_C2PMSG_56
102		−#define MP0_SMN_C2PMSG_56__CONTENT__SHIFT 0x0
103		−#define MP0_SMN_C2PMSG_56__CONTENT_MASK 0xFFFFFFFFL
104		−//MP0_SMN_C2PMSG_57
105		−#define MP0_SMN_C2PMSG_57__CONTENT__SHIFT 0x0
106		−#define MP0_SMN_C2PMSG_57__CONTENT_MASK 0xFFFFFFFFL
107		−//MP0_SMN_C2PMSG_58
108		−#define MP0_SMN_C2PMSG_58__CONTENT__SHIFT 0x0
109		−#define MP0_SMN_C2PMSG_58__CONTENT_MASK 0xFFFFFFFFL
110		−//MP0_SMN_C2PMSG_59
111		−#define MP0_SMN_C2PMSG_59__CONTENT__SHIFT 0x0
112		−#define MP0_SMN_C2PMSG_59__CONTENT_MASK 0xFFFFFFFFL
113		−//MP0_SMN_C2PMSG_60
114		−#define MP0_SMN_C2PMSG_60__CONTENT__SHIFT 0x0
115		−#define MP0_SMN_C2PMSG_60__CONTENT_MASK 0xFFFFFFFFL
116		−//MP0_SMN_C2PMSG_61
117		−#define MP0_SMN_C2PMSG_61__CONTENT__SHIFT 0x0
118		−#define MP0_SMN_C2PMSG_61__CONTENT_MASK 0xFFFFFFFFL
119		−//MP0_SMN_C2PMSG_62
120		−#define MP0_SMN_C2PMSG_62__CONTENT__SHIFT 0x0
121		−#define MP0_SMN_C2PMSG_62__CONTENT_MASK 0xFFFFFFFFL
122		−//MP0_SMN_C2PMSG_63
123		−#define MP0_SMN_C2PMSG_63__CONTENT__SHIFT 0x0
124		−#define MP0_SMN_C2PMSG_63__CONTENT_MASK 0xFFFFFFFFL
125		−//MP0_SMN_C2PMSG_64
126		−#define MP0_SMN_C2PMSG_64__CONTENT__SHIFT 0x0
127		−#define MP0_SMN_C2PMSG_64__CONTENT_MASK 0xFFFFFFFFL
128		−//MP0_SMN_C2PMSG_65
129		−#define MP0_SMN_C2PMSG_65__CONTENT__SHIFT 0x0
130		−#define MP0_SMN_C2PMSG_65__CONTENT_MASK 0xFFFFFFFFL
131		−//MP0_SMN_C2PMSG_66
132		−#define MP0_SMN_C2PMSG_66__CONTENT__SHIFT 0x0
133		−#define MP0_SMN_C2PMSG_66__CONTENT_MASK 0xFFFFFFFFL
134		−//MP0_SMN_C2PMSG_67
135		−#define MP0_SMN_C2PMSG_67__CONTENT__SHIFT 0x0
136		−#define MP0_SMN_C2PMSG_67__CONTENT_MASK 0xFFFFFFFFL
137		−//MP0_SMN_C2PMSG_68
138		−#define MP0_SMN_C2PMSG_68__CONTENT__SHIFT 0x0
139		−#define MP0_SMN_C2PMSG_68__CONTENT_MASK 0xFFFFFFFFL
140		−//MP0_SMN_C2PMSG_69
141		−#define MP0_SMN_C2PMSG_69__CONTENT__SHIFT 0x0
142		−#define MP0_SMN_C2PMSG_69__CONTENT_MASK 0xFFFFFFFFL
143		−//MP0_SMN_C2PMSG_70
144		−#define MP0_SMN_C2PMSG_70__CONTENT__SHIFT 0x0
145		−#define MP0_SMN_C2PMSG_70__CONTENT_MASK 0xFFFFFFFFL
146		−//MP0_SMN_C2PMSG_71
147		−#define MP0_SMN_C2PMSG_71__CONTENT__SHIFT 0x0
148		−#define MP0_SMN_C2PMSG_71__CONTENT_MASK 0xFFFFFFFFL
149		−//MP0_SMN_C2PMSG_72
150		−#define MP0_SMN_C2PMSG_72__CONTENT__SHIFT 0x0
151		−#define MP0_SMN_C2PMSG_72__CONTENT_MASK 0xFFFFFFFFL
152		−//MP0_SMN_C2PMSG_73
153		−#define MP0_SMN_C2PMSG_73__CONTENT__SHIFT 0x0
154		−#define MP0_SMN_C2PMSG_73__CONTENT_MASK 0xFFFFFFFFL
155		−//MP0_SMN_C2PMSG_74
156		−#define MP0_SMN_C2PMSG_74__CONTENT__SHIFT 0x0
157		−#define MP0_SMN_C2PMSG_74__CONTENT_MASK 0xFFFFFFFFL
158		−//MP0_SMN_C2PMSG_75
159		−#define MP0_SMN_C2PMSG_75__CONTENT__SHIFT 0x0
160		−#define MP0_SMN_C2PMSG_75__CONTENT_MASK 0xFFFFFFFFL
161		−//MP0_SMN_C2PMSG_76
162		−#define MP0_SMN_C2PMSG_76__CONTENT__SHIFT 0x0
163		−#define MP0_SMN_C2PMSG_76__CONTENT_MASK 0xFFFFFFFFL
164		−//MP0_SMN_C2PMSG_77
165		−#define MP0_SMN_C2PMSG_77__CONTENT__SHIFT 0x0
166		−#define MP0_SMN_C2PMSG_77__CONTENT_MASK 0xFFFFFFFFL
167		−//MP0_SMN_C2PMSG_78
168		−#define MP0_SMN_C2PMSG_78__CONTENT__SHIFT 0x0
169		−#define MP0_SMN_C2PMSG_78__CONTENT_MASK 0xFFFFFFFFL
170		−//MP0_SMN_C2PMSG_79
171		−#define MP0_SMN_C2PMSG_79__CONTENT__SHIFT 0x0
172		−#define MP0_SMN_C2PMSG_79__CONTENT_MASK 0xFFFFFFFFL
173		−//MP0_SMN_C2PMSG_80
174		−#define MP0_SMN_C2PMSG_80__CONTENT__SHIFT 0x0
175		−#define MP0_SMN_C2PMSG_80__CONTENT_MASK 0xFFFFFFFFL
176		−//MP0_SMN_C2PMSG_81
177		−#define MP0_SMN_C2PMSG_81__CONTENT__SHIFT 0x0
178		−#define MP0_SMN_C2PMSG_81__CONTENT_MASK 0xFFFFFFFFL
179		−//MP0_SMN_C2PMSG_82
180		−#define MP0_SMN_C2PMSG_82__CONTENT__SHIFT 0x0
181		−#define MP0_SMN_C2PMSG_82__CONTENT_MASK 0xFFFFFFFFL
182		−//MP0_SMN_C2PMSG_83
183		−#define MP0_SMN_C2PMSG_83__CONTENT__SHIFT 0x0
184		−#define MP0_SMN_C2PMSG_83__CONTENT_MASK 0xFFFFFFFFL
185		−//MP0_SMN_C2PMSG_84
186		−#define MP0_SMN_C2PMSG_84__CONTENT__SHIFT 0x0
187		−#define MP0_SMN_C2PMSG_84__CONTENT_MASK 0xFFFFFFFFL
188		−//MP0_SMN_C2PMSG_85
189		−#define MP0_SMN_C2PMSG_85__CONTENT__SHIFT 0x0
190		−#define MP0_SMN_C2PMSG_85__CONTENT_MASK 0xFFFFFFFFL
191		−//MP0_SMN_C2PMSG_86
192		−#define MP0_SMN_C2PMSG_86__CONTENT__SHIFT 0x0
193		−#define MP0_SMN_C2PMSG_86__CONTENT_MASK 0xFFFFFFFFL
194		−//MP0_SMN_C2PMSG_87
195		−#define MP0_SMN_C2PMSG_87__CONTENT__SHIFT 0x0
196		−#define MP0_SMN_C2PMSG_87__CONTENT_MASK 0xFFFFFFFFL
197		−//MP0_SMN_C2PMSG_88
198		−#define MP0_SMN_C2PMSG_88__CONTENT__SHIFT 0x0
199		−#define MP0_SMN_C2PMSG_88__CONTENT_MASK 0xFFFFFFFFL
200		−//MP0_SMN_C2PMSG_89
201		−#define MP0_SMN_C2PMSG_89__CONTENT__SHIFT 0x0
202		−#define MP0_SMN_C2PMSG_89__CONTENT_MASK 0xFFFFFFFFL
203		−//MP0_SMN_C2PMSG_90
204		−#define MP0_SMN_C2PMSG_90__CONTENT__SHIFT 0x0
205		−#define MP0_SMN_C2PMSG_90__CONTENT_MASK 0xFFFFFFFFL
206		−//MP0_SMN_C2PMSG_91
207		−#define MP0_SMN_C2PMSG_91__CONTENT__SHIFT 0x0
208		−#define MP0_SMN_C2PMSG_91__CONTENT_MASK 0xFFFFFFFFL
209		−//MP0_SMN_C2PMSG_92
210		−#define MP0_SMN_C2PMSG_92__CONTENT__SHIFT 0x0
211		−#define MP0_SMN_C2PMSG_92__CONTENT_MASK 0xFFFFFFFFL
212		−//MP0_SMN_C2PMSG_93
213		−#define MP0_SMN_C2PMSG_93__CONTENT__SHIFT 0x0
214		−#define MP0_SMN_C2PMSG_93__CONTENT_MASK 0xFFFFFFFFL
215		−//MP0_SMN_C2PMSG_94
216		−#define MP0_SMN_C2PMSG_94__CONTENT__SHIFT 0x0
217		−#define MP0_SMN_C2PMSG_94__CONTENT_MASK 0xFFFFFFFFL
218		−//MP0_SMN_C2PMSG_95
219		−#define MP0_SMN_C2PMSG_95__CONTENT__SHIFT 0x0
220		−#define MP0_SMN_C2PMSG_95__CONTENT_MASK 0xFFFFFFFFL
221		−//MP0_SMN_C2PMSG_96
222		−#define MP0_SMN_C2PMSG_96__CONTENT__SHIFT 0x0
223		−#define MP0_SMN_C2PMSG_96__CONTENT_MASK 0xFFFFFFFFL
224		−//MP0_SMN_C2PMSG_97
225		−#define MP0_SMN_C2PMSG_97__CONTENT__SHIFT 0x0
226		−#define MP0_SMN_C2PMSG_97__CONTENT_MASK 0xFFFFFFFFL
227		−//MP0_SMN_C2PMSG_98
228		−#define MP0_SMN_C2PMSG_98__CONTENT__SHIFT 0x0
229		−#define MP0_SMN_C2PMSG_98__CONTENT_MASK 0xFFFFFFFFL
230		−//MP0_SMN_C2PMSG_99
231		−#define MP0_SMN_C2PMSG_99__CONTENT__SHIFT 0x0
232		−#define MP0_SMN_C2PMSG_99__CONTENT_MASK 0xFFFFFFFFL
233		−//MP0_SMN_C2PMSG_100
234		−#define MP0_SMN_C2PMSG_100__CONTENT__SHIFT 0x0
235		−#define MP0_SMN_C2PMSG_100__CONTENT_MASK 0xFFFFFFFFL
236		−//MP0_SMN_C2PMSG_101
237		−#define MP0_SMN_C2PMSG_101__CONTENT__SHIFT 0x0
238		−#define MP0_SMN_C2PMSG_101__CONTENT_MASK 0xFFFFFFFFL
239		−//MP0_SMN_C2PMSG_102
240		−#define MP0_SMN_C2PMSG_102__CONTENT__SHIFT 0x0
241		−#define MP0_SMN_C2PMSG_102__CONTENT_MASK 0xFFFFFFFFL
242		−//MP0_SMN_C2PMSG_103
243		−#define MP0_SMN_C2PMSG_103__CONTENT__SHIFT 0x0
244		−#define MP0_SMN_C2PMSG_103__CONTENT_MASK 0xFFFFFFFFL
245		−//MP0_SMN_IH_CREDIT
246		−#define MP0_SMN_IH_CREDIT__CREDIT_VALUE__SHIFT 0x0
247		−#define MP0_SMN_IH_CREDIT__CLIENT_ID__SHIFT 0x10
248		−#define MP0_SMN_IH_CREDIT__CREDIT_VALUE_MASK 0x00000003L
249		−#define MP0_SMN_IH_CREDIT__CLIENT_ID_MASK 0x00FF0000L
250		−//MP0_SMN_IH_SW_INT
251		−#define MP0_SMN_IH_SW_INT__ID__SHIFT 0x0
252		−#define MP0_SMN_IH_SW_INT__VALID__SHIFT 0x8
253		−#define MP0_SMN_IH_SW_INT__ID_MASK 0x000000FFL
254		−#define MP0_SMN_IH_SW_INT__VALID_MASK 0x00000100L
255		−//MP0_SMN_IH_SW_INT_CTRL
256		−#define MP0_SMN_IH_SW_INT_CTRL__INT_MASK__SHIFT 0x0
257		−#define MP0_SMN_IH_SW_INT_CTRL__INT_ACK__SHIFT 0x8
258		−#define MP0_SMN_IH_SW_INT_CTRL__INT_MASK_MASK 0x00000001L
259		−#define MP0_SMN_IH_SW_INT_CTRL__INT_ACK_MASK 0x00000100L
260		−
261		−
262		−// addressBlock: mp_SmuMp1Pub_CruDec
263		−//MP1_FIRMWARE_FLAGS
264		−#define MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED__SHIFT 0x0
265		−#define MP1_FIRMWARE_FLAGS__RESERVED__SHIFT 0x1
266		−#define MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED_MASK 0x00000001L
267		−#define MP1_FIRMWARE_FLAGS__RESERVED_MASK 0xFFFFFFFEL
268		−
269		−
270		−// addressBlock: mp_SmuMp1_SmnDec
271		−//MP1_SMN_C2PMSG_32
272		−#define MP1_SMN_C2PMSG_32__CONTENT__SHIFT 0x0
273		−#define MP1_SMN_C2PMSG_32__CONTENT_MASK 0xFFFFFFFFL
274		−//MP1_SMN_C2PMSG_33
275		−#define MP1_SMN_C2PMSG_33__CONTENT__SHIFT 0x0
276		−#define MP1_SMN_C2PMSG_33__CONTENT_MASK 0xFFFFFFFFL
277		−//MP1_SMN_C2PMSG_34
278		−#define MP1_SMN_C2PMSG_34__CONTENT__SHIFT 0x0
279		−#define MP1_SMN_C2PMSG_34__CONTENT_MASK 0xFFFFFFFFL
280		−//MP1_SMN_C2PMSG_35
281		−#define MP1_SMN_C2PMSG_35__CONTENT__SHIFT 0x0
282		−#define MP1_SMN_C2PMSG_35__CONTENT_MASK 0xFFFFFFFFL
283		−//MP1_SMN_C2PMSG_36
284		−#define MP1_SMN_C2PMSG_36__CONTENT__SHIFT 0x0
285		−#define MP1_SMN_C2PMSG_36__CONTENT_MASK 0xFFFFFFFFL
286		−//MP1_SMN_C2PMSG_37
287		−#define MP1_SMN_C2PMSG_37__CONTENT__SHIFT 0x0
288		−#define MP1_SMN_C2PMSG_37__CONTENT_MASK 0xFFFFFFFFL
289		−//MP1_SMN_C2PMSG_38
290		−#define MP1_SMN_C2PMSG_38__CONTENT__SHIFT 0x0
291		−#define MP1_SMN_C2PMSG_38__CONTENT_MASK 0xFFFFFFFFL
292		−//MP1_SMN_C2PMSG_39
293		−#define MP1_SMN_C2PMSG_39__CONTENT__SHIFT 0x0
294		−#define MP1_SMN_C2PMSG_39__CONTENT_MASK 0xFFFFFFFFL
295		−//MP1_SMN_C2PMSG_40
296		−#define MP1_SMN_C2PMSG_40__CONTENT__SHIFT 0x0
297		−#define MP1_SMN_C2PMSG_40__CONTENT_MASK 0xFFFFFFFFL
298		−//MP1_SMN_C2PMSG_41
299		−#define MP1_SMN_C2PMSG_41__CONTENT__SHIFT 0x0
300		−#define MP1_SMN_C2PMSG_41__CONTENT_MASK 0xFFFFFFFFL
301		−//MP1_SMN_C2PMSG_42
302		−#define MP1_SMN_C2PMSG_42__CONTENT__SHIFT 0x0
303		−#define MP1_SMN_C2PMSG_42__CONTENT_MASK 0xFFFFFFFFL
304		−//MP1_SMN_C2PMSG_43
305		−#define MP1_SMN_C2PMSG_43__CONTENT__SHIFT 0x0
306		−#define MP1_SMN_C2PMSG_43__CONTENT_MASK 0xFFFFFFFFL
307		−//MP1_SMN_C2PMSG_44
308		−#define MP1_SMN_C2PMSG_44__CONTENT__SHIFT 0x0
309		−#define MP1_SMN_C2PMSG_44__CONTENT_MASK 0xFFFFFFFFL
310		−//MP1_SMN_C2PMSG_45
311		−#define MP1_SMN_C2PMSG_45__CONTENT__SHIFT 0x0
312		−#define MP1_SMN_C2PMSG_45__CONTENT_MASK 0xFFFFFFFFL
313		−//MP1_SMN_C2PMSG_46
314		−#define MP1_SMN_C2PMSG_46__CONTENT__SHIFT 0x0
315		−#define MP1_SMN_C2PMSG_46__CONTENT_MASK 0xFFFFFFFFL
316		−//MP1_SMN_C2PMSG_47
317		−#define MP1_SMN_C2PMSG_47__CONTENT__SHIFT 0x0
318		−#define MP1_SMN_C2PMSG_47__CONTENT_MASK 0xFFFFFFFFL
319		−//MP1_SMN_C2PMSG_48
320		−#define MP1_SMN_C2PMSG_48__CONTENT__SHIFT 0x0
321		−#define MP1_SMN_C2PMSG_48__CONTENT_MASK 0xFFFFFFFFL
322		−//MP1_SMN_C2PMSG_49
323		−#define MP1_SMN_C2PMSG_49__CONTENT__SHIFT 0x0
324		−#define MP1_SMN_C2PMSG_49__CONTENT_MASK 0xFFFFFFFFL
325		−//MP1_SMN_C2PMSG_50
326		−#define MP1_SMN_C2PMSG_50__CONTENT__SHIFT 0x0
327		−#define MP1_SMN_C2PMSG_50__CONTENT_MASK 0xFFFFFFFFL
328		−//MP1_SMN_C2PMSG_51
329		−#define MP1_SMN_C2PMSG_51__CONTENT__SHIFT 0x0
330		−#define MP1_SMN_C2PMSG_51__CONTENT_MASK 0xFFFFFFFFL
331		−//MP1_SMN_C2PMSG_52
332		−#define MP1_SMN_C2PMSG_52__CONTENT__SHIFT 0x0
333		−#define MP1_SMN_C2PMSG_52__CONTENT_MASK 0xFFFFFFFFL
334		−//MP1_SMN_C2PMSG_53
335		−#define MP1_SMN_C2PMSG_53__CONTENT__SHIFT 0x0
336		−#define MP1_SMN_C2PMSG_53__CONTENT_MASK 0xFFFFFFFFL
337		−//MP1_SMN_C2PMSG_54
338		−#define MP1_SMN_C2PMSG_54__CONTENT__SHIFT 0x0
339		−#define MP1_SMN_C2PMSG_54__CONTENT_MASK 0xFFFFFFFFL
340		−//MP1_SMN_C2PMSG_55
341		−#define MP1_SMN_C2PMSG_55__CONTENT__SHIFT 0x0
342		−#define MP1_SMN_C2PMSG_55__CONTENT_MASK 0xFFFFFFFFL
343		−//MP1_SMN_C2PMSG_56
344		−#define MP1_SMN_C2PMSG_56__CONTENT__SHIFT 0x0
345		−#define MP1_SMN_C2PMSG_56__CONTENT_MASK 0xFFFFFFFFL
346		−//MP1_SMN_C2PMSG_57
347		−#define MP1_SMN_C2PMSG_57__CONTENT__SHIFT 0x0
348		−#define MP1_SMN_C2PMSG_57__CONTENT_MASK 0xFFFFFFFFL
349		−//MP1_SMN_C2PMSG_58
350		−#define MP1_SMN_C2PMSG_58__CONTENT__SHIFT 0x0
351		−#define MP1_SMN_C2PMSG_58__CONTENT_MASK 0xFFFFFFFFL
352		−//MP1_SMN_C2PMSG_59
353		−#define MP1_SMN_C2PMSG_59__CONTENT__SHIFT 0x0
354		−#define MP1_SMN_C2PMSG_59__CONTENT_MASK 0xFFFFFFFFL
355		−//MP1_SMN_C2PMSG_60
356		−#define MP1_SMN_C2PMSG_60__CONTENT__SHIFT 0x0
357		−#define MP1_SMN_C2PMSG_60__CONTENT_MASK 0xFFFFFFFFL
358		−//MP1_SMN_C2PMSG_61
359		−#define MP1_SMN_C2PMSG_61__CONTENT__SHIFT 0x0
360		−#define MP1_SMN_C2PMSG_61__CONTENT_MASK 0xFFFFFFFFL
361		−//MP1_SMN_C2PMSG_62
362		−#define MP1_SMN_C2PMSG_62__CONTENT__SHIFT 0x0
363		−#define MP1_SMN_C2PMSG_62__CONTENT_MASK 0xFFFFFFFFL
364		−//MP1_SMN_C2PMSG_63
365		−#define MP1_SMN_C2PMSG_63__CONTENT__SHIFT 0x0
366		−#define MP1_SMN_C2PMSG_63__CONTENT_MASK 0xFFFFFFFFL
367		−//MP1_SMN_C2PMSG_64
368		−#define MP1_SMN_C2PMSG_64__CONTENT__SHIFT 0x0
369		−#define MP1_SMN_C2PMSG_64__CONTENT_MASK 0xFFFFFFFFL
370		−//MP1_SMN_C2PMSG_65
371		−#define MP1_SMN_C2PMSG_65__CONTENT__SHIFT 0x0
372		−#define MP1_SMN_C2PMSG_65__CONTENT_MASK 0xFFFFFFFFL
373		−//MP1_SMN_C2PMSG_66
374		−#define MP1_SMN_C2PMSG_66__CONTENT__SHIFT 0x0
375		−#define MP1_SMN_C2PMSG_66__CONTENT_MASK 0xFFFFFFFFL
376		−//MP1_SMN_C2PMSG_67
377		−#define MP1_SMN_C2PMSG_67__CONTENT__SHIFT 0x0
378		−#define MP1_SMN_C2PMSG_67__CONTENT_MASK 0xFFFFFFFFL
379		−//MP1_SMN_C2PMSG_68
380		−#define MP1_SMN_C2PMSG_68__CONTENT__SHIFT 0x0
381		−#define MP1_SMN_C2PMSG_68__CONTENT_MASK 0xFFFFFFFFL
382		−//MP1_SMN_C2PMSG_69
383		−#define MP1_SMN_C2PMSG_69__CONTENT__SHIFT 0x0
384		−#define MP1_SMN_C2PMSG_69__CONTENT_MASK 0xFFFFFFFFL
385		−//MP1_SMN_C2PMSG_70
386		−#define MP1_SMN_C2PMSG_70__CONTENT__SHIFT 0x0
387		−#define MP1_SMN_C2PMSG_70__CONTENT_MASK 0xFFFFFFFFL
388		−//MP1_SMN_C2PMSG_71
389		−#define MP1_SMN_C2PMSG_71__CONTENT__SHIFT 0x0
390		−#define MP1_SMN_C2PMSG_71__CONTENT_MASK 0xFFFFFFFFL
391		−//MP1_SMN_C2PMSG_72
392		−#define MP1_SMN_C2PMSG_72__CONTENT__SHIFT 0x0
393		−#define MP1_SMN_C2PMSG_72__CONTENT_MASK 0xFFFFFFFFL
394		−//MP1_SMN_C2PMSG_73
395		−#define MP1_SMN_C2PMSG_73__CONTENT__SHIFT 0x0
396		−#define MP1_SMN_C2PMSG_73__CONTENT_MASK 0xFFFFFFFFL
397		−//MP1_SMN_C2PMSG_74
398		−#define MP1_SMN_C2PMSG_74__CONTENT__SHIFT 0x0
399		−#define MP1_SMN_C2PMSG_74__CONTENT_MASK 0xFFFFFFFFL
400		−//MP1_SMN_C2PMSG_75
401		−#define MP1_SMN_C2PMSG_75__CONTENT__SHIFT 0x0
402		−#define MP1_SMN_C2PMSG_75__CONTENT_MASK 0xFFFFFFFFL
403		−//MP1_SMN_C2PMSG_76
404		−#define MP1_SMN_C2PMSG_76__CONTENT__SHIFT 0x0
405		−#define MP1_SMN_C2PMSG_76__CONTENT_MASK 0xFFFFFFFFL
406		−//MP1_SMN_C2PMSG_77
407		−#define MP1_SMN_C2PMSG_77__CONTENT__SHIFT 0x0
408		−#define MP1_SMN_C2PMSG_77__CONTENT_MASK 0xFFFFFFFFL
409		−//MP1_SMN_C2PMSG_78
410		−#define MP1_SMN_C2PMSG_78__CONTENT__SHIFT 0x0
411		−#define MP1_SMN_C2PMSG_78__CONTENT_MASK 0xFFFFFFFFL
412		−//MP1_SMN_C2PMSG_79
413		−#define MP1_SMN_C2PMSG_79__CONTENT__SHIFT 0x0
414		−#define MP1_SMN_C2PMSG_79__CONTENT_MASK 0xFFFFFFFFL
415		−//MP1_SMN_C2PMSG_80
416		−#define MP1_SMN_C2PMSG_80__CONTENT__SHIFT 0x0
417		−#define MP1_SMN_C2PMSG_80__CONTENT_MASK 0xFFFFFFFFL
418		−//MP1_SMN_C2PMSG_81
419		−#define MP1_SMN_C2PMSG_81__CONTENT__SHIFT 0x0
420		−#define MP1_SMN_C2PMSG_81__CONTENT_MASK 0xFFFFFFFFL
421		−//MP1_SMN_C2PMSG_82
422		−#define MP1_SMN_C2PMSG_82__CONTENT__SHIFT 0x0
423		−#define MP1_SMN_C2PMSG_82__CONTENT_MASK 0xFFFFFFFFL
424		−//MP1_SMN_C2PMSG_83
425		−#define MP1_SMN_C2PMSG_83__CONTENT__SHIFT 0x0
426		−#define MP1_SMN_C2PMSG_83__CONTENT_MASK 0xFFFFFFFFL
427		−//MP1_SMN_C2PMSG_84
428		−#define MP1_SMN_C2PMSG_84__CONTENT__SHIFT 0x0
429		−#define MP1_SMN_C2PMSG_84__CONTENT_MASK 0xFFFFFFFFL
430		−//MP1_SMN_C2PMSG_85
431		−#define MP1_SMN_C2PMSG_85__CONTENT__SHIFT 0x0
432		−#define MP1_SMN_C2PMSG_85__CONTENT_MASK 0xFFFFFFFFL
433		−//MP1_SMN_C2PMSG_86
434		−#define MP1_SMN_C2PMSG_86__CONTENT__SHIFT 0x0
435		−#define MP1_SMN_C2PMSG_86__CONTENT_MASK 0xFFFFFFFFL
436		−//MP1_SMN_C2PMSG_87
437		−#define MP1_SMN_C2PMSG_87__CONTENT__SHIFT 0x0
438		−#define MP1_SMN_C2PMSG_87__CONTENT_MASK 0xFFFFFFFFL
439		−//MP1_SMN_C2PMSG_88
440		−#define MP1_SMN_C2PMSG_88__CONTENT__SHIFT 0x0
441		−#define MP1_SMN_C2PMSG_88__CONTENT_MASK 0xFFFFFFFFL
442		−//MP1_SMN_C2PMSG_89
443		−#define MP1_SMN_C2PMSG_89__CONTENT__SHIFT 0x0
444		−#define MP1_SMN_C2PMSG_89__CONTENT_MASK 0xFFFFFFFFL
445		−//MP1_SMN_C2PMSG_90
446		−#define MP1_SMN_C2PMSG_90__CONTENT__SHIFT 0x0
447		−#define MP1_SMN_C2PMSG_90__CONTENT_MASK 0xFFFFFFFFL
448		−//MP1_SMN_C2PMSG_91
449		−#define MP1_SMN_C2PMSG_91__CONTENT__SHIFT 0x0
450		−#define MP1_SMN_C2PMSG_91__CONTENT_MASK 0xFFFFFFFFL
451		−//MP1_SMN_C2PMSG_92
452		−#define MP1_SMN_C2PMSG_92__CONTENT__SHIFT 0x0
453		−#define MP1_SMN_C2PMSG_92__CONTENT_MASK 0xFFFFFFFFL
454		−//MP1_SMN_C2PMSG_93
455		−#define MP1_SMN_C2PMSG_93__CONTENT__SHIFT 0x0
456		−#define MP1_SMN_C2PMSG_93__CONTENT_MASK 0xFFFFFFFFL
457		−//MP1_SMN_C2PMSG_94
458		−#define MP1_SMN_C2PMSG_94__CONTENT__SHIFT 0x0
459		−#define MP1_SMN_C2PMSG_94__CONTENT_MASK 0xFFFFFFFFL
460		−//MP1_SMN_C2PMSG_95
461		−#define MP1_SMN_C2PMSG_95__CONTENT__SHIFT 0x0
462		−#define MP1_SMN_C2PMSG_95__CONTENT_MASK 0xFFFFFFFFL
463		−//MP1_SMN_C2PMSG_96
464		−#define MP1_SMN_C2PMSG_96__CONTENT__SHIFT 0x0
465		−#define MP1_SMN_C2PMSG_96__CONTENT_MASK 0xFFFFFFFFL
466		−//MP1_SMN_C2PMSG_97
467		−#define MP1_SMN_C2PMSG_97__CONTENT__SHIFT 0x0
468		−#define MP1_SMN_C2PMSG_97__CONTENT_MASK 0xFFFFFFFFL
469		−//MP1_SMN_C2PMSG_98
470		−#define MP1_SMN_C2PMSG_98__CONTENT__SHIFT 0x0
471		−#define MP1_SMN_C2PMSG_98__CONTENT_MASK 0xFFFFFFFFL
472		−//MP1_SMN_C2PMSG_99
473		−#define MP1_SMN_C2PMSG_99__CONTENT__SHIFT 0x0
474		−#define MP1_SMN_C2PMSG_99__CONTENT_MASK 0xFFFFFFFFL
475		−//MP1_SMN_C2PMSG_100
476		−#define MP1_SMN_C2PMSG_100__CONTENT__SHIFT 0x0
477		−#define MP1_SMN_C2PMSG_100__CONTENT_MASK 0xFFFFFFFFL
478		−//MP1_SMN_C2PMSG_101
479		−#define MP1_SMN_C2PMSG_101__CONTENT__SHIFT 0x0
480		−#define MP1_SMN_C2PMSG_101__CONTENT_MASK 0xFFFFFFFFL
481		−//MP1_SMN_C2PMSG_102
482		−#define MP1_SMN_C2PMSG_102__CONTENT__SHIFT 0x0
483		−#define MP1_SMN_C2PMSG_102__CONTENT_MASK 0xFFFFFFFFL
484		−//MP1_SMN_C2PMSG_103
485		−#define MP1_SMN_C2PMSG_103__CONTENT__SHIFT 0x0
486		−#define MP1_SMN_C2PMSG_103__CONTENT_MASK 0xFFFFFFFFL
487		−//MP1_SMN_IH_CREDIT
488		−#define MP1_SMN_IH_CREDIT__CREDIT_VALUE__SHIFT 0x0
489		−#define MP1_SMN_IH_CREDIT__CLIENT_ID__SHIFT 0x10
490		−#define MP1_SMN_IH_CREDIT__CREDIT_VALUE_MASK 0x00000003L
491		−#define MP1_SMN_IH_CREDIT__CLIENT_ID_MASK 0x00FF0000L
492		−//MP1_SMN_IH_SW_INT
493		−#define MP1_SMN_IH_SW_INT__ID__SHIFT 0x0
494		−#define MP1_SMN_IH_SW_INT__VALID__SHIFT 0x8
495		−#define MP1_SMN_IH_SW_INT__ID_MASK 0x000000FFL
496		−#define MP1_SMN_IH_SW_INT__VALID_MASK 0x00000100L
497		−//MP1_SMN_IH_SW_INT_CTRL
498		−#define MP1_SMN_IH_SW_INT_CTRL__INT_MASK__SHIFT 0x0
499		−#define MP1_SMN_IH_SW_INT_CTRL__INT_ACK__SHIFT 0x8
500		−#define MP1_SMN_IH_SW_INT_CTRL__INT_MASK_MASK 0x00000001L
501		−#define MP1_SMN_IH_SW_INT_CTRL__INT_ACK_MASK 0x00000100L
502		−//MP1_SMN_FPS_CNT
503		−#define MP1_SMN_FPS_CNT__COUNT__SHIFT 0x0
504		−#define MP1_SMN_FPS_CNT__COUNT_MASK 0xFFFFFFFFL
505		−//MP1_SMN_EXT_SCRATCH0
506		−#define MP1_SMN_EXT_SCRATCH0__DATA__SHIFT 0x0
507		−#define MP1_SMN_EXT_SCRATCH0__DATA_MASK 0xFFFFFFFFL
508		−//MP1_SMN_EXT_SCRATCH1
509		−#define MP1_SMN_EXT_SCRATCH1__DATA__SHIFT 0x0
510		−#define MP1_SMN_EXT_SCRATCH1__DATA_MASK 0xFFFFFFFFL
511		−//MP1_SMN_EXT_SCRATCH2
512		−#define MP1_SMN_EXT_SCRATCH2__DATA__SHIFT 0x0
513		−#define MP1_SMN_EXT_SCRATCH2__DATA_MASK 0xFFFFFFFFL
514		−//MP1_SMN_EXT_SCRATCH3
515		−#define MP1_SMN_EXT_SCRATCH3__DATA__SHIFT 0x0
516		−#define MP1_SMN_EXT_SCRATCH3__DATA_MASK 0xFFFFFFFFL
517		−//MP1_SMN_EXT_SCRATCH4
518		−#define MP1_SMN_EXT_SCRATCH4__DATA__SHIFT 0x0
519		−#define MP1_SMN_EXT_SCRATCH4__DATA_MASK 0xFFFFFFFFL
520		−//MP1_SMN_EXT_SCRATCH5
521		−#define MP1_SMN_EXT_SCRATCH5__DATA__SHIFT 0x0
522		−#define MP1_SMN_EXT_SCRATCH5__DATA_MASK 0xFFFFFFFFL
523		−//MP1_SMN_EXT_SCRATCH6
524		−#define MP1_SMN_EXT_SCRATCH6__DATA__SHIFT 0x0
525		−#define MP1_SMN_EXT_SCRATCH6__DATA_MASK 0xFFFFFFFFL
526		−//MP1_SMN_EXT_SCRATCH7
527		−#define MP1_SMN_EXT_SCRATCH7__DATA__SHIFT 0x0
528		−#define MP1_SMN_EXT_SCRATCH7__DATA_MASK 0xFFFFFFFFL
529		−
530		−
531		−#endif

drivers/gpu/drm/amd/pm/inc/smu_v13_0.h+1−0

@@ -26,6 +26,7 @@ · 25 unmodified lines
26	26	#include "amdgpu_smu.h"
27	27
28	28	#define SMU13_DRIVER_IF_VERSION_INV 0xFFFFFFFF
	29	+#define SMU13_DRIVER_IF_VERSION_YELLOW_CARP 0x03
29	30	#define SMU13_DRIVER_IF_VERSION_ALDE 0x07
30	31
31	32	/* MP Apertures */

drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h+0−57

@@ -1,57 +0,0 @@
1		−/*
2		− * Copyright 2020 Advanced Micro Devices, Inc.
3		− *
4		− * Permission is hereby granted, free of charge, to any person obtaining a
5		− * copy of this software and associated documentation files (the "Software"),
6		− * to deal in the Software without restriction, including without limitation
7		− * the rights to use, copy, modify, merge, publish, distribute, sublicense,
8		− * and/or sell copies of the Software, and to permit persons to whom the
9		− * Software is furnished to do so, subject to the following conditions:
10		− *
11		− * The above copyright notice and this permission notice shall be included in
12		− * all copies or substantial portions of the Software.
13		− *
14		− * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15		− * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16		− * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17		− * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
18		− * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19		− * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20		− * OTHER DEALINGS IN THE SOFTWARE.
21		− *
22		− */
23		−#ifndef __SMU_V13_0_1_H__
24		−#define __SMU_V13_0_1_H__
25		−
26		−#include "amdgpu_smu.h"
27		−
28		−#define SMU13_0_1_DRIVER_IF_VERSION_INV 0xFFFFFFFF
29		−#define SMU13_0_1_DRIVER_IF_VERSION_YELLOW_CARP 0x3
30		−
31		−/* MP Apertures */
32		−#define MP0_Public 0x03800000
33		−#define MP0_SRAM 0x03900000
34		−#define MP1_Public 0x03b00000
35		−#define MP1_SRAM 0x03c00004
36		−
37		−/* address block */
38		−#define smnMP1_FIRMWARE_FLAGS 0x3010024
39		−
40		−
41		−#if defined(SWSMU_CODE_LAYER_L2) \|\| defined(SWSMU_CODE_LAYER_L3)
42		−
43		−int smu_v13_0_1_check_fw_status(struct smu_context *smu);
44		−
45		−int smu_v13_0_1_check_fw_version(struct smu_context *smu);
46		−
47		−int smu_v13_0_1_fini_smc_tables(struct smu_context *smu);
48		−
49		−int smu_v13_0_1_get_vbios_bootup_values(struct smu_context *smu);
50		−
51		−int smu_v13_0_1_set_default_dpm_tables(struct smu_context *smu);
52		−
53		−int smu_v13_0_1_set_driver_table_location(struct smu_context *smu);
54		−
55		−int smu_v13_0_1_gfx_off_control(struct smu_context *smu, bool enable);
56		−#endif
57		−#endif

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c+1−0

@@ -1528,6 +1528,7 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state) · 1527 unmodified lines
1528	1528	case CHIP_SIENNA_CICHLID:
1529	1529	case CHIP_NAVY_FLOUNDER:
1530	1530	case CHIP_DIMGREY_CAVEFISH:
	1531	+ case CHIP_BEIGE_GOBY:
1531	1532	if (amdgpu_runtime_pm == 2)
1532	1533	ret = smu_cmn_send_smc_msg_with_param(smu,
1533	1534	SMU_MSG_EnterBaco,

drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile+1−1

@@ -23,7 +23,7 @@ · 22 unmodified lines
23	23	# Makefile for the 'smu manager' sub-component of powerplay.
24	24	# It provides the smu management services for the driver.
25	25
26		−SMU13_MGR = smu_v13_0.o aldebaran_ppt.o smu_v13_0_1.o yellow_carp_ppt.o
	26	+SMU13_MGR = smu_v13_0.o aldebaran_ppt.o yellow_carp_ppt.o
27	27
28	28	AMD_SWSMU_SMU13MGR = $(addprefix $(AMD_SWSMU_PATH)/smu13/,$(SMU13_MGR))
29	29

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c+24−0

@@ -210,6 +210,9 @@ int smu_v13_0_check_fw_version(struct smu_context *smu) · 209 unmodified lines
210	210	case CHIP_ALDEBARAN:
211	211	smu->smc_driver_if_version = SMU13_DRIVER_IF_VERSION_ALDE;
212	212	break;
	213	+ case CHIP_YELLOW_CARP:
	214	+ smu->smc_driver_if_version = SMU13_DRIVER_IF_VERSION_YELLOW_CARP;
	215	+ break;
213	216	default:
214	217	dev_err(smu->adev->dev, "smu unsupported asic type:%d.\n", smu->adev->asic_type);
215	218	smu->smc_driver_if_version = SMU13_DRIVER_IF_VERSION_INV;
@@ -694,6 +697,27 @@ failed: · 478 unmodified lines
694	697	return ret;
695	698	}
696	699
	700	+int smu_v13_0_gfx_off_control(struct smu_context *smu, bool enable)
	701	+{
	702	+ int ret = 0;
	703	+ struct amdgpu_device *adev = smu->adev;
	704	+
	705	+ switch (adev->asic_type) {
	706	+ case CHIP_YELLOW_CARP:
	707	+ if (!(adev->pm.pp_feature & PP_GFXOFF_MASK))
	708	+ return 0;
	709	+ if (enable)
	710	+ ret = smu_cmn_send_smc_msg(smu, SMU_MSG_AllowGfxOff, NULL);
	711	+ else
	712	+ ret = smu_cmn_send_smc_msg(smu, SMU_MSG_DisallowGfxOff, NULL);
	713	+ break;
	714	+ default:
	715	+ break;
	716	+ }
	717	+
	718	+ return ret;
	719	+}
	720	+
697	721	int smu_v13_0_system_features_control(struct smu_context *smu,
698	722	bool en)
699	723	{

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c+0−311

@@ -1,311 +0,0 @@
1		−/*
2		− * Copyright 2020 Advanced Micro Devices, Inc.
3		− *
4		− * Permission is hereby granted, free of charge, to any person obtaining a
5		− * copy of this software and associated documentation files (the "Software"),
6		− * to deal in the Software without restriction, including without limitation
7		− * the rights to use, copy, modify, merge, publish, distribute, sublicense,
8		− * and/or sell copies of the Software, and to permit persons to whom the
9		− * Software is furnished to do so, subject to the following conditions:
10		− *
11		− * The above copyright notice and this permission notice shall be included in
12		− * all copies or substantial portions of the Software.
13		− *
14		− * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15		− * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16		− * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17		− * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
18		− * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19		− * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20		− * OTHER DEALINGS IN THE SOFTWARE.
21		− */
22		−
23		−//#include <linux/reboot.h>
24		−
25		−#define SWSMU_CODE_LAYER_L3
26		−
27		−#include "amdgpu.h"
28		−#include "amdgpu_smu.h"
29		−#include "smu_v13_0_1.h"
30		−#include "soc15_common.h"
31		−#include "smu_cmn.h"
32		−#include "atomfirmware.h"
33		−#include "amdgpu_atomfirmware.h"
34		−#include "amdgpu_atombios.h"
35		−#include "atom.h"
36		−
37		−#include "asic_reg/mp/mp_13_0_1_offset.h"
38		−#include "asic_reg/mp/mp_13_0_1_sh_mask.h"
39		−
40		−/*
41		− * DO NOT use these for err/warn/info/debug messages.
42		− * Use dev_err, dev_warn, dev_info and dev_dbg instead.
43		− * They are more MGPU friendly.
44		− */
45		−#undef pr_err
46		−#undef pr_warn
47		−#undef pr_info
48		−#undef pr_debug
49		−
50		−int smu_v13_0_1_check_fw_status(struct smu_context *smu)
51		−{
52		− struct amdgpu_device *adev = smu->adev;
53		− uint32_t mp1_fw_flags;
54		−
55		− mp1_fw_flags = RREG32_PCIE(MP1_Public \|
56		− (smnMP1_FIRMWARE_FLAGS & 0xffffffff));
57		−
58		− if ((mp1_fw_flags & MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED_MASK) >>
59		− MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED__SHIFT)
60		− return 0;
61		−
62		− return -EIO;
63		−}
64		−
65		−int smu_v13_0_1_check_fw_version(struct smu_context *smu)
66		−{
67		− uint32_t if_version = 0xff, smu_version = 0xff;
68		− uint16_t smu_major;
69		− uint8_t smu_minor, smu_debug;
70		− int ret = 0;
71		−
72		− ret = smu_cmn_get_smc_version(smu, &if_version, &smu_version);
73		− if (ret)
74		− return ret;
75		−
76		− smu_major = (smu_version >> 16) & 0xffff;
77		− smu_minor = (smu_version >> 8) & 0xff;
78		− smu_debug = (smu_version >> 0) & 0xff;
79		−
80		− switch (smu->adev->asic_type) {
81		− case CHIP_YELLOW_CARP:
82		− smu->smc_driver_if_version = SMU13_0_1_DRIVER_IF_VERSION_YELLOW_CARP;
83		− break;
84		−
85		− default:
86		− dev_err(smu->adev->dev, "smu unsupported asic type:%d.\n", smu->adev->asic_type);
87		− smu->smc_driver_if_version = SMU13_0_1_DRIVER_IF_VERSION_INV;
88		− break;
89		− }
90		−
91		− dev_info(smu->adev->dev, "smu fw reported version = 0x%08x (%d.%d.%d)\n",
92		− smu_version, smu_major, smu_minor, smu_debug);
93		−
94		− /*
95		− * 1. if_version mismatch is not critical as our fw is designed
96		− * to be backward compatible.
97		− * 2. New fw usually brings some optimizations. But that's visible
98		− * only on the paired driver.
99		− * Considering above, we just leave user a warning message instead
100		− * of halt driver loading.
101		− */
102		− if (if_version != smu->smc_driver_if_version) {
103		− dev_info(smu->adev->dev, "smu driver if version = 0x%08x, smu fw if version = 0x%08x, "
104		− "smu fw version = 0x%08x (%d.%d.%d)\n",
105		− smu->smc_driver_if_version, if_version,
106		− smu_version, smu_major, smu_minor, smu_debug);
107		− dev_warn(smu->adev->dev, "SMU driver if version not matched\n");
108		− }
109		−
110		− return ret;
111		−}
112		−
113		−int smu_v13_0_1_fini_smc_tables(struct smu_context *smu)
114		−{
115		− struct smu_table_context *smu_table = &smu->smu_table;
116		−
117		− kfree(smu_table->clocks_table);
118		− smu_table->clocks_table = NULL;
119		−
120		− kfree(smu_table->metrics_table);
121		− smu_table->metrics_table = NULL;
122		−
123		− kfree(smu_table->watermarks_table);
124		− smu_table->watermarks_table = NULL;
125		−
126		− return 0;
127		−}
128		−
129		−static int smu_v13_0_1_atom_get_smu_clockinfo(struct amdgpu_device *adev,
130		− uint8_t clk_id,
131		− uint8_t syspll_id,
132		− uint32_t *clk_freq)
133		−{
134		− struct atom_get_smu_clock_info_parameters_v3_1 input = {0};
135		− struct atom_get_smu_clock_info_output_parameters_v3_1 *output;
136		− int ret, index;
137		−
138		− input.clk_id = clk_id;
139		− input.syspll_id = syspll_id;
140		− input.command = GET_SMU_CLOCK_INFO_V3_1_GET_CLOCK_FREQ;
141		− index = get_index_into_master_table(atom_master_list_of_command_functions_v2_1,
142		− getsmuclockinfo);
143		−
144		− ret = amdgpu_atom_execute_table(adev->mode_info.atom_context, index,
145		− (uint32_t *)&input);
146		− if (ret)
147		− return -EINVAL;
148		−
149		− output = (struct atom_get_smu_clock_info_output_parameters_v3_1 *)&input;
150		− *clk_freq = le32_to_cpu(output->atom_smu_outputclkfreq.smu_clock_freq_hz) / 10000;
151		−
152		− return 0;
153		−}
154		−
155		−int smu_v13_0_1_get_vbios_bootup_values(struct smu_context *smu)
156		−{
157		− int ret, index;
158		− uint16_t size;
159		− uint8_t frev, crev;
160		− struct atom_common_table_header *header;
161		− struct atom_firmware_info_v3_4 *v_3_4;
162		− struct atom_firmware_info_v3_3 *v_3_3;
163		− struct atom_firmware_info_v3_1 *v_3_1;
164		−
165		− index = get_index_into_master_table(atom_master_list_of_data_tables_v2_1,
166		− firmwareinfo);
167		−
168		− ret = amdgpu_atombios_get_data_table(smu->adev, index, &size, &frev, &crev,
169		− (uint8_t **)&header);
170		− if (ret)
171		− return ret;
172		−
173		− if (header->format_revision != 3) {
174		− dev_err(smu->adev->dev, "unknown atom_firmware_info version! for smu13\n");
175		− return -EINVAL;
176		− }
177		−
178		− switch (header->content_revision) {
179		− case 0:
180		− case 1:
181		− case 2:
182		− v_3_1 = (struct atom_firmware_info_v3_1 *)header;
183		− smu->smu_table.boot_values.revision = v_3_1->firmware_revision;
184		− smu->smu_table.boot_values.gfxclk = v_3_1->bootup_sclk_in10khz;
185		− smu->smu_table.boot_values.uclk = v_3_1->bootup_mclk_in10khz;
186		− smu->smu_table.boot_values.socclk = 0;
187		− smu->smu_table.boot_values.dcefclk = 0;
188		− smu->smu_table.boot_values.vddc = v_3_1->bootup_vddc_mv;
189		− smu->smu_table.boot_values.vddci = v_3_1->bootup_vddci_mv;
190		− smu->smu_table.boot_values.mvddc = v_3_1->bootup_mvddc_mv;
191		− smu->smu_table.boot_values.vdd_gfx = v_3_1->bootup_vddgfx_mv;
192		− smu->smu_table.boot_values.cooling_id = v_3_1->coolingsolution_id;
193		− break;
194		− case 3:
195		− v_3_3 = (struct atom_firmware_info_v3_3 *)header;
196		− smu->smu_table.boot_values.revision = v_3_3->firmware_revision;
197		− smu->smu_table.boot_values.gfxclk = v_3_3->bootup_sclk_in10khz;
198		− smu->smu_table.boot_values.uclk = v_3_3->bootup_mclk_in10khz;
199		− smu->smu_table.boot_values.socclk = 0;
200		− smu->smu_table.boot_values.dcefclk = 0;
201		− smu->smu_table.boot_values.vddc = v_3_3->bootup_vddc_mv;
202		− smu->smu_table.boot_values.vddci = v_3_3->bootup_vddci_mv;
203		− smu->smu_table.boot_values.mvddc = v_3_3->bootup_mvddc_mv;
204		− smu->smu_table.boot_values.vdd_gfx = v_3_3->bootup_vddgfx_mv;
205		− smu->smu_table.boot_values.cooling_id = v_3_3->coolingsolution_id;
206		− break;
207		− case 4:
208		− default:
209		− v_3_4 = (struct atom_firmware_info_v3_4 *)header;
210		− smu->smu_table.boot_values.revision = v_3_4->firmware_revision;
211		− smu->smu_table.boot_values.gfxclk = v_3_4->bootup_sclk_in10khz;
212		− smu->smu_table.boot_values.uclk = v_3_4->bootup_mclk_in10khz;
213		− smu->smu_table.boot_values.socclk = 0;
214		− smu->smu_table.boot_values.dcefclk = 0;
215		− smu->smu_table.boot_values.vddc = v_3_4->bootup_vddc_mv;
216		− smu->smu_table.boot_values.vddci = v_3_4->bootup_vddci_mv;
217		− smu->smu_table.boot_values.mvddc = v_3_4->bootup_mvddc_mv;
218		− smu->smu_table.boot_values.vdd_gfx = v_3_4->bootup_vddgfx_mv;
219		− smu->smu_table.boot_values.cooling_id = v_3_4->coolingsolution_id;
220		− break;
221		− }
222		−
223		− smu->smu_table.boot_values.format_revision = header->format_revision;
224		− smu->smu_table.boot_values.content_revision = header->content_revision;
225		−
226		− smu_v13_0_1_atom_get_smu_clockinfo(smu->adev,
227		− (uint8_t)SMU11_SYSPLL0_SOCCLK_ID,
228		− (uint8_t)0,
229		− &smu->smu_table.boot_values.socclk);
230		−
231		− smu_v13_0_1_atom_get_smu_clockinfo(smu->adev,
232		− (uint8_t)SMU11_SYSPLL0_DCEFCLK_ID,
233		− (uint8_t)0,
234		− &smu->smu_table.boot_values.dcefclk);
235		−
236		− smu_v13_0_1_atom_get_smu_clockinfo(smu->adev,
237		− (uint8_t)SMU11_SYSPLL0_ECLK_ID,
238		− (uint8_t)0,
239		− &smu->smu_table.boot_values.eclk);
240		−
241		− smu_v13_0_1_atom_get_smu_clockinfo(smu->adev,
242		− (uint8_t)SMU11_SYSPLL0_VCLK_ID,
243		− (uint8_t)0,
244		− &smu->smu_table.boot_values.vclk);
245		−
246		− smu_v13_0_1_atom_get_smu_clockinfo(smu->adev,
247		− (uint8_t)SMU11_SYSPLL0_DCLK_ID,
248		− (uint8_t)0,
249		− &smu->smu_table.boot_values.dclk);
250		−
251		− if ((smu->smu_table.boot_values.format_revision == 3) &&
252		− (smu->smu_table.boot_values.content_revision >= 2))
253		− smu_v13_0_1_atom_get_smu_clockinfo(smu->adev,
254		− (uint8_t)SMU11_SYSPLL1_0_FCLK_ID,
255		− (uint8_t)SMU11_SYSPLL1_2_ID,
256		− &smu->smu_table.boot_values.fclk);
257		−
258		− return 0;
259		−}
260		−
261		−int smu_v13_0_1_set_default_dpm_tables(struct smu_context *smu)
262		−{
263		− struct smu_table_context *smu_table = &smu->smu_table;
264		−
265		− return smu_cmn_update_table(smu, SMU_TABLE_DPMCLOCKS, 0, smu_table->clocks_table, false);
266		−}
267		−
268		−int smu_v13_0_1_set_driver_table_location(struct smu_context *smu)
269		−{
270		− struct smu_table *driver_table = &smu->smu_table.driver_table;
271		− int ret = 0;
272		−
273		− if (!driver_table->mc_address)
274		− return 0;
275		−
276		− ret = smu_cmn_send_smc_msg_with_param(smu,
277		− SMU_MSG_SetDriverDramAddrHigh,
278		− upper_32_bits(driver_table->mc_address),
279		− NULL);
280		−
281		− if (ret)
282		− return ret;
283		−
284		− ret = smu_cmn_send_smc_msg_with_param(smu,
285		− SMU_MSG_SetDriverDramAddrLow,
286		− lower_32_bits(driver_table->mc_address),
287		− NULL);
288		−
289		− return ret;
290		−}
291		−
292		−int smu_v13_0_1_gfx_off_control(struct smu_context *smu, bool enable)
293		−{
294		− int ret = 0;
295		− struct amdgpu_device *adev = smu->adev;
296		−
297		− switch (adev->asic_type) {
298		− case CHIP_YELLOW_CARP:
299		− if (!(adev->pm.pp_feature & PP_GFXOFF_MASK))
300		− return 0;
301		− if (enable)
302		− ret = smu_cmn_send_smc_msg(smu, SMU_MSG_AllowGfxOff, NULL);
303		− else
304		− ret = smu_cmn_send_smc_msg(smu, SMU_MSG_DisallowGfxOff, NULL);
305		− break;
306		− default:
307		− break;
308		− }
309		−
310		− return ret;
311		−}

drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c+34−15

@@ -25,7 +25,7 @@ · 24 unmodified lines
25	25
26	26	#include "amdgpu.h"
27	27	#include "amdgpu_smu.h"
28		−#include "smu_v13_0_1.h"
	28	+#include "smu_v13_0.h"
29	29	#include "smu13_driver_if_yellow_carp.h"
30	30	#include "yellow_carp_ppt.h"
31	31	#include "smu_v13_0_1_ppsmc.h"
@@ -186,6 +186,22 @@ err0_out: · 154 unmodified lines
186	186	return -ENOMEM;
187	187	}
188	188
	189	+static int yellow_carp_fini_smc_tables(struct smu_context *smu)
	190	+{
	191	+ struct smu_table_context *smu_table = &smu->smu_table;
	192	+
	193	+ kfree(smu_table->clocks_table);
	194	+ smu_table->clocks_table = NULL;
	195	+
	196	+ kfree(smu_table->metrics_table);
	197	+ smu_table->metrics_table = NULL;
	198	+
	199	+ kfree(smu_table->watermarks_table);
	200	+ smu_table->watermarks_table = NULL;
	201	+
	202	+ return 0;
	203	+}
	204	+
189	205	static int yellow_carp_system_features_control(struct smu_context *smu, bool en)
190	206	{
191	207	struct smu_feature *feature = &smu->smu_feature;
@@ -282,13 +298,9 @@ static int yellow_carp_mode_reset(struct smu_context *smu, int type) · 90 unmodified lines
282	298	if (index < 0)
283	299	return index == -EACCES ? 0 : index;
284	300
285		− mutex_lock(&smu->message_lock);
286		−
287		− ret = smu_cmn_send_msg_without_waiting(smu, (uint16_t)index, type);
288		−
289		− mutex_unlock(&smu->message_lock);
290		−
291		− mdelay(10);
	301	+ ret = smu_cmn_send_smc_msg_with_param(smu, (uint16_t)index, type, NULL);
	302	+ if (ret)
	303	+ dev_err(smu->adev->dev, "Failed to mode reset!\n");
292	304
293	305	return ret;
294	306	}
@@ -659,6 +671,13 @@ static ssize_t yellow_carp_get_gpu_metrics(struct smu_context *smu, · 364 unmodified lines
659	671	return sizeof(struct gpu_metrics_v2_1);
660	672	}
661	673
	674	+static int yellow_carp_set_default_dpm_tables(struct smu_context *smu)
	675	+{
	676	+ struct smu_table_context *smu_table = &smu->smu_table;
	677	+
	678	+ return smu_cmn_update_table(smu, SMU_TABLE_DPMCLOCKS, 0, smu_table->clocks_table, false);
	679	+}
	680	+
662	681	static int yellow_carp_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABLE_COMMAND type,
663	682	long input[], uint32_t size)
664	683	{
@@ -1203,17 +1222,17 @@ static int yellow_carp_set_fine_grain_gfx_freq_parameters(struct smu_context *sm · 538 unmodified lines
1203	1222	}
1204	1223
1205	1224	static const struct pptable_funcs yellow_carp_ppt_funcs = {
1206		− .check_fw_status = smu_v13_0_1_check_fw_status,
1207		− .check_fw_version = smu_v13_0_1_check_fw_version,
	1225	+ .check_fw_status = smu_v13_0_check_fw_status,
	1226	+ .check_fw_version = smu_v13_0_check_fw_version,
1208	1227	.init_smc_tables = yellow_carp_init_smc_tables,
1209		− .fini_smc_tables = smu_v13_0_1_fini_smc_tables,
1210		− .get_vbios_bootup_values = smu_v13_0_1_get_vbios_bootup_values,
	1228	+ .fini_smc_tables = yellow_carp_fini_smc_tables,
	1229	+ .get_vbios_bootup_values = smu_v13_0_get_vbios_bootup_values,
1211	1230	.system_features_control = yellow_carp_system_features_control,
1212	1231	.send_smc_msg_with_param = smu_cmn_send_smc_msg_with_param,
1213	1232	.send_smc_msg = smu_cmn_send_smc_msg,
1214	1233	.dpm_set_vcn_enable = yellow_carp_dpm_set_vcn_enable,
1215	1234	.dpm_set_jpeg_enable = yellow_carp_dpm_set_jpeg_enable,
1216		− .set_default_dpm_table = smu_v13_0_1_set_default_dpm_tables,
	1235	+ .set_default_dpm_table = yellow_carp_set_default_dpm_tables,
1217	1236	.read_sensor = yellow_carp_read_sensor,
1218	1237	.is_dpm_running = yellow_carp_is_dpm_running,
1219	1238	.set_watermarks_table = yellow_carp_set_watermarks_table,
@@ -1222,8 +1241,8 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { · 2 unmodified lines
1222	1241	.get_gpu_metrics = yellow_carp_get_gpu_metrics,
1223	1242	.get_enabled_mask = smu_cmn_get_enabled_32_bits_mask,
1224	1243	.get_pp_feature_mask = smu_cmn_get_pp_feature_mask,
1225		− .set_driver_table_location = smu_v13_0_1_set_driver_table_location,
1226		− .gfx_off_control = smu_v13_0_1_gfx_off_control,
	1244	+ .set_driver_table_location = smu_v13_0_set_driver_table_location,
	1245	+ .gfx_off_control = smu_v13_0_gfx_off_control,
1227	1246	.post_init = yellow_carp_post_smu_init,
1228	1247	.mode2_reset = yellow_carp_mode2_reset,
1229	1248	.get_dpm_ultimate_freq = yellow_carp_get_dpm_ultimate_freq,

drivers/gpu/drm/i915/gem/i915_gem_shrinker.c+1−0

@@ -62,6 +62,7 @@ static void try_to_writeback(struct drm_i915_gem_object *obj, · 61 unmodified lines
62	62	switch (obj->mm.madv) {
63	63	case I915_MADV_DONTNEED:
64	64	i915_gem_object_truncate(obj);
	65	+ return;
65	66	case __I915_MADV_PURGED:
66	67	return;
67	68	}

drivers/gpu/drm/i915/gt/gen8_ppgtt.c+1−4

@@ -303,10 +303,7 @@ static void __gen8_ppgtt_alloc(struct i915_address_space * const vm, · 302 unmodified lines
303	303	__i915_gem_object_pin_pages(pt->base);
304	304	i915_gem_object_make_unshrinkable(pt->base);
305	305
306		− if (lvl \|\|
307		− gen8_pt_count(*start, end) < I915_PDES \|\|
308		− intel_vgpu_active(vm->i915))
309		− fill_px(pt, vm->scratch[lvl]->encode);
	306	+ fill_px(pt, vm->scratch[lvl]->encode);
310	307
311	308	spin_lock(&pd->lock);
312	309	if (likely(!pd->entry[idx])) {

drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c+1−1

@@ -348,7 +348,7 @@ static struct i915_fence_reg fence_find(struct i915_ggtt ggtt) · 347 unmodified lines
348	348	if (intel_has_pending_fb_unpin(ggtt->vm.i915))
349	349	return ERR_PTR(-EAGAIN);
350	350
351		− return ERR_PTR(-EDEADLK);
	351	+ return ERR_PTR(-ENOBUFS);
352	352	}
353	353
354	354	int __i915_vma_pin_fence(struct i915_vma *vma)

drivers/gpu/drm/msm/msm_gem.c+1−1

@@ -1169,7 +1169,7 @@ static int msm_gem_new_impl(struct drm_device *dev, · 1168 unmodified lines
1169	1169	case MSM_BO_CACHED_COHERENT:
1170	1170	if (priv->has_cached_coherent)
1171	1171	break;
1172		− /* fallthrough */
	1172	+ fallthrough;
1173	1173	default:
1174	1174	DRM_DEV_ERROR(dev->dev, "invalid cache flag: %x\n",
1175	1175	(flags & MSM_BO_CACHE_MASK));

drivers/gpu/drm/panel/panel-novatek-nt35510.c+1−3

@@ -706,9 +706,7 @@ static int nt35510_power_on(struct nt35510 *nt) · 705 unmodified lines
706	706	if (ret)
707	707	return ret;
708	708
709		− ret = nt35510_read_id(nt);
710		− if (ret)
711		− return ret;
	709	+ nt35510_read_id(nt);
712	710
713	711	/* Set up stuff in manufacturer control, page 1 */
714	712	ret = nt35510_send_long(nt, dsi, MCS_CMD_MAUCCTR,

drivers/gpu/drm/qxl/qxl_ttm.c+1−1

@@ -127,7 +127,7 @@ static void qxl_bo_move_notify(struct ttm_buffer_object *bo, · 126 unmodified lines
127	127	struct qxl_bo *qbo;
128	128	struct qxl_device *qdev;
129	129
130		− if (!qxl_ttm_bo_is_qxl_bo(bo))
	130	+ if (!qxl_ttm_bo_is_qxl_bo(bo) \|\| !bo->resource)
131	131	return;
132	132	qbo = to_qxl_bo(bo);
133	133	qdev = to_qxl(qbo->tbo.base.dev);

drivers/gpu/drm/ttm/ttm_range_manager.c+3−0

@@ -181,6 +181,9 @@ int ttm_range_man_fini(struct ttm_device *bdev, · 180 unmodified lines
181	181	struct drm_mm *mm = &rman->mm;
182	182	int ret;
183	183
	184	+ if (!man)
	185	+ return 0;
	186	+
184	187	ttm_resource_manager_set_used(man, false);
185	188
186	189	ret = ttm_resource_manager_evict_all(bdev, man);

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c+1−0

@@ -36,6 +36,7 @@ · 35 unmodified lines
36	36	#include <drm/drm_ioctl.h>
37	37	#include <drm/drm_sysfs.h>
38	38	#include <drm/ttm/ttm_bo_driver.h>
	39	+#include <drm/ttm/ttm_range_manager.h>
39	40	#include <drm/ttm/ttm_placement.h>
40	41	#include <generated/utsrelease.h>
41	42

drivers/gpu/drm/vmwgfx/vmwgfx_mob.c+0−1

@@ -354,7 +354,6 @@ static void vmw_otable_batch_takedown(struct vmw_private *dev_priv, · 353 unmodified lines
354	354	ttm_bo_unpin(bo);
355	355	ttm_bo_unreserve(bo);
356	356
357		− ttm_bo_unpin(batch->otable_bo);
358	357	ttm_bo_put(batch->otable_bo);
359	358	batch->otable_bo = NULL;
360	359	}

drivers/hv/channel_mgmt.c+64−32

@@ -605,6 +605,17 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) · 604 unmodified lines
605	605	*/
606	606	mutex_lock(&vmbus_connection.channel_mutex);
607	607
	608	+ list_for_each_entry(channel, &vmbus_connection.chn_list, listentry) {
	609	+ if (guid_equal(&channel->offermsg.offer.if_type,
	610	+ &newchannel->offermsg.offer.if_type) &&
	611	+ guid_equal(&channel->offermsg.offer.if_instance,
	612	+ &newchannel->offermsg.offer.if_instance)) {
	613	+ fnew = false;
	614	+ newchannel->primary_channel = channel;
	615	+ break;
	616	+ }
	617	+ }
	618	+
608	619	init_vp_index(newchannel);
609	620
610	621	/* Remember the channels that should be cleaned up upon suspend. */
@@ -617,16 +628,6 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) · 6 unmodified lines
617	628	*/
618	629	atomic_dec(&vmbus_connection.offer_in_progress);
619	630
620		− list_for_each_entry(channel, &vmbus_connection.chn_list, listentry) {
621		− if (guid_equal(&channel->offermsg.offer.if_type,
622		− &newchannel->offermsg.offer.if_type) &&
623		− guid_equal(&channel->offermsg.offer.if_instance,
624		− &newchannel->offermsg.offer.if_instance)) {
625		− fnew = false;
626		− break;
627		− }
628		− }
629		−
630	631	if (fnew) {
631	632	list_add_tail(&newchannel->listentry,
632	633	&vmbus_connection.chn_list);
@@ -647,7 +648,6 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) · 14 unmodified lines
647	648	/*
648	649	* Process the sub-channel.
649	650	*/
650		− newchannel->primary_channel = channel;
651	651	list_add_tail(&newchannel->sc_list, &channel->sc_list);
652	652	}
653	653
@@ -683,6 +683,30 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) · 29 unmodified lines
683	683	queue_work(wq, &newchannel->add_channel_work);
684	684	}
685	685
	686	+/*
	687	+ * Check if CPUs used by other channels of the same device.
	688	+ * It should only be called by init_vp_index().
	689	+ */
	690	+static bool hv_cpuself_used(u32 cpu, struct vmbus_channel *chn)
	691	+{
	692	+ struct vmbus_channel *primary = chn->primary_channel;
	693	+ struct vmbus_channel *sc;
	694	+
	695	+ lockdep_assert_held(&vmbus_connection.channel_mutex);
	696	+
	697	+ if (!primary)
	698	+ return false;
	699	+
	700	+ if (primary->target_cpu == cpu)
	701	+ return true;
	702	+
	703	+ list_for_each_entry(sc, &primary->sc_list, sc_list)
	704	+ if (sc != chn && sc->target_cpu == cpu)
	705	+ return true;
	706	+
	707	+ return false;
	708	+}
	709	+
686	710	/*
687	711	* We use this state to statically distribute the channel interrupt load.
688	712	*/
@@ -702,6 +726,7 @@ static int next_numa_node_id; · 13 unmodified lines
702	726	static void init_vp_index(struct vmbus_channel *channel)
703	727	{
704	728	bool perf_chn = hv_is_perf_channel(channel);
	729	+ u32 i, ncpu = num_online_cpus();
705	730	cpumask_var_t available_mask;
706	731	struct cpumask *alloced_mask;
707	732	u32 target_cpu;
@@ -724,31 +749,38 @@ static void init_vp_index(struct vmbus_channel *channel) · 16 unmodified lines
724	749	return;
725	750	}
726	751
727		− while (true) {
728		− numa_node = next_numa_node_id++;
729		− if (numa_node == nr_node_ids) {
730		− next_numa_node_id = 0;
731		− continue;
	752	+ for (i = 1; i <= ncpu + 1; i++) {
	753	+ while (true) {
	754	+ numa_node = next_numa_node_id++;
	755	+ if (numa_node == nr_node_ids) {
	756	+ next_numa_node_id = 0;
	757	+ continue;
	758	+ }
	759	+ if (cpumask_empty(cpumask_of_node(numa_node)))
	760	+ continue;
	761	+ break;
	762	+ }
	763	+ alloced_mask = &hv_context.hv_numa_map[numa_node];
	764	+
	765	+ if (cpumask_weight(alloced_mask) ==
	766	+ cpumask_weight(cpumask_of_node(numa_node))) {
	767	+ /*
	768	+ * We have cycled through all the CPUs in the node;
	769	+ * reset the alloced map.
	770	+ */
	771	+ cpumask_clear(alloced_mask);
732	772	}
733		− if (cpumask_empty(cpumask_of_node(numa_node)))
734		− continue;
735		− break;
736		− }
737		− alloced_mask = &hv_context.hv_numa_map[numa_node];
738	773
739		− if (cpumask_weight(alloced_mask) ==
740		− cpumask_weight(cpumask_of_node(numa_node))) {
741		− /*
742		− * We have cycled through all the CPUs in the node;
743		− * reset the alloced map.
744		− */
745		− cpumask_clear(alloced_mask);
746		− }
	774	+ cpumask_xor(available_mask, alloced_mask,
	775	+ cpumask_of_node(numa_node));
747	776
748		− cpumask_xor(available_mask, alloced_mask, cpumask_of_node(numa_node));
	777	+ target_cpu = cpumask_first(available_mask);
	778	+ cpumask_set_cpu(target_cpu, alloced_mask);
749	779
750		− target_cpu = cpumask_first(available_mask);
751		− cpumask_set_cpu(target_cpu, alloced_mask);
	780	+ if (channel->offermsg.offer.sub_channel_index >= ncpu \|\|
	781	+ i > ncpu \|\| !hv_cpuself_used(target_cpu, channel))
	782	+ break;
	783	+ }
752	784
753	785	channel->target_cpu = target_cpu;
754	786

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c+1−0

@@ -379,6 +379,7 @@ static void arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu) · 378 unmodified lines
379	379	switch (idx) {
380	380	case CMDQ_ERR_CERROR_ABT_IDX:
381	381	dev_err(smmu->dev, "retrying command fetch\n");
	382	+ return;
382	383	case CMDQ_ERR_CERROR_NONE_IDX:
383	384	return;
384	385	case CMDQ_ERR_CERROR_ATC_INV_IDX:

drivers/iommu/arm/arm-smmu/qcom_iommu.c+2−11

@@ -849,12 +849,10 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) · 848 unmodified lines
849	849	ret = iommu_device_register(&qcom_iommu->iommu, &qcom_iommu_ops, dev);
850	850	if (ret) {
851	851	dev_err(dev, "Failed to register iommu\n");
852		− goto err_sysfs_remove;
	852	+ return ret;
853	853	}
854	854
855		− ret = bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
856		− if (ret)
857		− goto err_unregister_device;
	855	+ bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
858	856
859	857	if (qcom_iommu->local_base) {
860	858	pm_runtime_get_sync(dev);
@@ -863,13 +861,6 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) · 2 unmodified lines
863	861	}
864	862
865	863	return 0;
866		−
867		−err_unregister_device:
868		− iommu_device_unregister(&qcom_iommu->iommu);
869		−
870		−err_sysfs_remove:
871		− iommu_device_sysfs_remove(&qcom_iommu->iommu);
872		− return ret;
873	864	}
874	865
875	866	static int qcom_iommu_device_remove(struct platform_device *pdev)

drivers/iommu/intel/iommu.c+23−11

@@ -2429,10 +2429,11 @@ __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn, · 2428 unmodified lines
2429	2429	return 0;
2430	2430	}
2431	2431
2432		−static void domain_context_clear_one(struct intel_iommu *iommu, u8 bus, u8 devfn)
	2432	+static void domain_context_clear_one(struct device_domain_info *info, u8 bus, u8 devfn)
2433	2433	{
2434		− unsigned long flags;
	2434	+ struct intel_iommu *iommu = info->iommu;
2435	2435	struct context_entry *context;
	2436	+ unsigned long flags;
2436	2437	u16 did_old;
2437	2438
2438	2439	if (!iommu)
@@ -2444,7 +2445,16 @@ static void domain_context_clear_one(struct intel_iommu *iommu, u8 bus, u8 devfn · 5 unmodified lines
2444	2445	spin_unlock_irqrestore(&iommu->lock, flags);
2445	2446	return;
2446	2447	}
2447		− did_old = context_domain_id(context);
	2448	+
	2449	+ if (sm_supported(iommu)) {
	2450	+ if (hw_pass_through && domain_type_is_si(info->domain))
	2451	+ did_old = FLPT_DEFAULT_DID;
	2452	+ else
	2453	+ did_old = info->domain->iommu_did[iommu->seq_id];
	2454	+ } else {
	2455	+ did_old = context_domain_id(context);
	2456	+ }
	2457	+
2448	2458	context_clear_entry(context);
2449	2459	__iommu_flush_cache(iommu, context, sizeof(*context));
2450	2460	spin_unlock_irqrestore(&iommu->lock, flags);
@@ -2462,6 +2472,8 @@ static void domain_context_clear_one(struct intel_iommu *iommu, u8 bus, u8 devfn · 11 unmodified lines
2462	2472	0,
2463	2473	0,
2464	2474	DMA_TLB_DSI_FLUSH);
	2475	+
	2476	+ __iommu_flush_dev_iotlb(info, 0, MAX_AGAW_PFN_WIDTH);
2465	2477	}
2466	2478
2467	2479	static inline void unlink_domain_info(struct device_domain_info *info)
@@ -4425,9 +4437,9 @@ out_free_dmar: · 1957 unmodified lines
4425	4437
4426	4438	static int domain_context_clear_one_cb(struct pci_dev pdev, u16 alias, void opaque)
4427	4439	{
4428		− struct intel_iommu *iommu = opaque;
	4440	+ struct device_domain_info *info = opaque;
4429	4441
4430		− domain_context_clear_one(iommu, PCI_BUS_NUM(alias), alias & 0xff);
	4442	+ domain_context_clear_one(info, PCI_BUS_NUM(alias), alias & 0xff);
4431	4443	return 0;
4432	4444	}
4433	4445
@@ -4437,12 +4449,13 @@ static int domain_context_clear_one_cb(struct pci_dev pdev, u16 alias, void op · 3 unmodified lines
4437	4449	* devices, unbinding the driver from any one of them will possibly leave
4438	4450	* the others unable to operate.
4439	4451	*/
4440		−static void domain_context_clear(struct intel_iommu iommu, struct device dev)
	4452	+static void domain_context_clear(struct device_domain_info *info)
4441	4453	{
4442		− if (!iommu \|\| !dev \|\| !dev_is_pci(dev))
	4454	+ if (!info->iommu \|\| !info->dev \|\| !dev_is_pci(info->dev))
4443	4455	return;
4444	4456
4445		− pci_for_each_dma_alias(to_pci_dev(dev), &domain_context_clear_one_cb, iommu);
	4457	+ pci_for_each_dma_alias(to_pci_dev(info->dev),
	4458	+ &domain_context_clear_one_cb, info);
4446	4459	}
4447	4460
4448	4461	static void __dmar_remove_one_dev_info(struct device_domain_info *info)
@@ -4459,14 +4472,13 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info) · 10 unmodified lines
4459	4472	iommu = info->iommu;
4460	4473	domain = info->domain;
4461	4474
4462		− if (info->dev) {
	4475	+ if (info->dev && !dev_is_real_dma_subdevice(info->dev)) {
4463	4476	if (dev_is_pci(info->dev) && sm_supported(iommu))
4464	4477	intel_pasid_tear_down_entry(iommu, info->dev,
4465	4478	PASID_RID2PASID, false);
4466	4479
4467	4480	iommu_disable_dev_iotlb(info);
4468		− if (!dev_is_real_dma_subdevice(info->dev))
4469		− domain_context_clear(iommu, info->dev);
	4481	+ domain_context_clear(info);
4470	4482	intel_pasid_free_table(info->dev);
4471	4483	}
4472	4484

drivers/iommu/rockchip-iommu.c+4−2

@@ -544,12 +544,14 @@ static inline u32 rk_dma_addr_dte(dma_addr_t dt_dma) · 543 unmodified lines
544	544	}
545	545
546	546	#define DT_HI_MASK GENMASK_ULL(39, 32)
	547	+#define DTE_BASE_HI_MASK GENMASK(11, 4)
547	548	#define DT_SHIFT 28
548	549
549	550	static inline phys_addr_t rk_dte_addr_phys_v2(u32 addr)
550	551	{
551		− return (phys_addr_t)(addr & RK_DTE_PT_ADDRESS_MASK) \|
552		− ((addr & DT_HI_MASK) << DT_SHIFT);
	552	+ u64 addr64 = addr;
	553	+ return (phys_addr_t)(addr64 & RK_DTE_PT_ADDRESS_MASK) \|
	554	+ ((addr64 & DTE_BASE_HI_MASK) << DT_SHIFT);
553	555	}
554	556
555	557	static inline u32 rk_dma_addr_dte_v2(dma_addr_t dt_dma)

drivers/mmc/core/block.c+21−14

@@ -28,6 +28,7 @@ · 27 unmodified lines
28	28	#include <linux/errno.h>
29	29	#include <linux/hdreg.h>
30	30	#include <linux/kdev_t.h>
	31	+#include <linux/kref.h>
31	32	#include <linux/blkdev.h>
32	33	#include <linux/cdev.h>
33	34	#include <linux/mutex.h>
@@ -111,7 +112,7 @@ struct mmc_blk_data { · 77 unmodified lines
111	112	#define MMC_BLK_CMD23 (1 << 0) /* Can do SET_BLOCK_COUNT for multiblock */
112	113	#define MMC_BLK_REL_WR (1 << 1) /* MMC Reliable write support */
113	114
114		− unsigned int usage;
	115	+ struct kref kref;
115	116	unsigned int read_only;
116	117	unsigned int part_type;
117	118	unsigned int reset_done;
@@ -181,10 +182,8 @@ static struct mmc_blk_data mmc_blk_get(struct gendisk disk) · 63 unmodified lines
181	182
182	183	mutex_lock(&open_lock);
183	184	md = disk->private_data;
184		− if (md && md->usage == 0)
	185	+ if (md && !kref_get_unless_zero(&md->kref))
185	186	md = NULL;
186		− if (md)
187		− md->usage++;
188	187	mutex_unlock(&open_lock);
189	188
190	189	return md;
@@ -196,18 +195,25 @@ static inline int mmc_get_devidx(struct gendisk *disk) · 5 unmodified lines
196	195	return devidx;
197	196	}
198	197
199		−static void mmc_blk_put(struct mmc_blk_data *md)
	198	+static void mmc_blk_kref_release(struct kref *ref)
200	199	{
201		− mutex_lock(&open_lock);
202		− md->usage--;
203		− if (md->usage == 0) {
204		− int devidx = mmc_get_devidx(md->disk);
	200	+ struct mmc_blk_data *md = container_of(ref, struct mmc_blk_data, kref);
	201	+ int devidx;
205	202
206		− ida_simple_remove(&mmc_blk_ida, devidx);
207		− put_disk(md->disk);
208		− kfree(md);
209		− }
	203	+ devidx = mmc_get_devidx(md->disk);
	204	+ ida_simple_remove(&mmc_blk_ida, devidx);
	205	+
	206	+ mutex_lock(&open_lock);
	207	+ md->disk->private_data = NULL;
210	208	mutex_unlock(&open_lock);
	209	+
	210	+ put_disk(md->disk);
	211	+ kfree(md);
	212	+}
	213	+
	214	+static void mmc_blk_put(struct mmc_blk_data *md)
	215	+{
	216	+ kref_put(&md->kref, mmc_blk_kref_release);
211	217	}
212	218
213	219	static ssize_t power_ro_lock_show(struct device *dev,
@@ -2327,7 +2333,8 @@ static struct mmc_blk_data mmc_blk_alloc_req(struct mmc_card card, · 2113 unmodified lines
2327	2333
2328	2334	INIT_LIST_HEAD(&md->part);
2329	2335	INIT_LIST_HEAD(&md->rpmbs);
2330		− md->usage = 1;
	2336	+ kref_init(&md->kref);
	2337	+
2331	2338	md->queue.blkdata = md;
2332	2339
2333	2340	md->disk->major = MMC_BLOCK_MAJOR;

drivers/mmc/core/host.c+10−10

@@ -75,7 +75,8 @@ static void mmc_host_classdev_release(struct device *dev) · 74 unmodified lines
75	75	{
76	76	struct mmc_host *host = cls_dev_to_mmc_host(dev);
77	77	wakeup_source_unregister(host->ws);
78		− ida_simple_remove(&mmc_host_ida, host->index);
	78	+ if (of_alias_get_id(host->parent->of_node, "mmc") < 0)
	79	+ ida_simple_remove(&mmc_host_ida, host->index);
79	80	kfree(host);
80	81	}
81	82
@@ -502,7 +503,7 @@ static int mmc_first_nonreserved_index(void) · 420 unmodified lines
502	503	*/
503	504	struct mmc_host mmc_alloc_host(int extra, struct device dev)
504	505	{
505		− int err;
	506	+ int index;
506	507	struct mmc_host *host;
507	508	int alias_id, min_idx, max_idx;
508	509
@@ -515,20 +516,19 @@ struct mmc_host mmc_alloc_host(int extra, struct device dev) · 6 unmodified lines
515	516
516	517	alias_id = of_alias_get_id(dev->of_node, "mmc");
517	518	if (alias_id >= 0) {
518		− min_idx = alias_id;
519		− max_idx = alias_id + 1;
	519	+ index = alias_id;
520	520	} else {
521	521	min_idx = mmc_first_nonreserved_index();
522	522	max_idx = 0;
523		− }
524	523
525		− err = ida_simple_get(&mmc_host_ida, min_idx, max_idx, GFP_KERNEL);
526		− if (err < 0) {
527		− kfree(host);
528		− return NULL;
	524	+ index = ida_simple_get(&mmc_host_ida, min_idx, max_idx, GFP_KERNEL);
	525	+ if (index < 0) {
	526	+ kfree(host);
	527	+ return NULL;
	528	+ }
529	529	}
530	530
531		− host->index = err;
	531	+ host->index = index;
532	532
533	533	dev_set_name(&host->class_dev, "mmc%d", host->index);
534	534	host->ws = wakeup_source_register(NULL, dev_name(&host->class_dev));

drivers/mmc/host/jz4740_mmc.c+2−0

@@ -789,6 +789,8 @@ static irqreturn_t jz_mmc_irq_worker(int irq, void *devid) · 788 unmodified lines
789	789	break;
790	790	}
791	791	}
	792	+ fallthrough;
	793	+
792	794	case JZ4740_MMC_STATE_DONE:
793	795	break;
794	796	}

drivers/mtd/chips/cfi_util.c+2−2

@@ -108,8 +108,8 @@ map_word cfi_build_cmd(u_long cmd, struct map_info map, struct cfi_private cfi · 107 unmodified lines
108	108	#if BITS_PER_LONG >= 64
109	109	case 8:
110	110	onecmd \|= (onecmd << (chip_mode * 32));
111		−#endif
112	111	fallthrough;
	112	+#endif
113	113	case 4:
114	114	onecmd \|= (onecmd << (chip_mode * 16));
115	115	fallthrough;
@@ -164,8 +164,8 @@ unsigned long cfi_merge_status(map_word val, struct map_info *map, · 48 unmodified lines
164	164	#if BITS_PER_LONG >= 64
165	165	case 8:
166	166	res \|= (onestat >> (chip_mode * 32));
167		−#endif
168	167	fallthrough;
	168	+#endif
169	169	case 4:
170	170	res \|= (onestat >> (chip_mode * 16));
171	171	fallthrough;

drivers/net/bonding/bond_main.c+2−0

@@ -3450,7 +3450,9 @@ static int bond_master_netdev_event(unsigned long event, · 3449 unmodified lines
3450	3450	return bond_event_changename(event_bond);
3451	3451	case NETDEV_UNREGISTER:
3452	3452	bond_remove_proc_entry(event_bond);
	3453	+#ifdef CONFIG_XFRM_OFFLOAD
3453	3454	xfrm_dev_state_flush(dev_net(bond_dev), bond_dev, true);
	3455	+#endif /* CONFIG_XFRM_OFFLOAD */
3454	3456	break;
3455	3457	case NETDEV_REGISTER:
3456	3458	bond_create_proc_entry(event_bond);

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

@@ -366,6 +366,8 @@ mt7530_fdb_write(struct mt7530_priv *priv, u16 vid, · 365 unmodified lines
366	366	int i;
367	367
368	368	reg[1] \|= vid & CVID_MASK;
	369	+ if (vid > 1)
	370	+ reg[1] \|= ATA2_IVL;
369	371	reg[2] \|= (aging & AGE_TIMER_MASK) << AGE_TIMER;
370	372	reg[2] \|= (port_mask & PORT_MAP_MASK) << PORT_MAP;
371	373	/* STATIC_ENT indicate that entry is static wouldn't

drivers/net/dsa/mt7530.h+1−0

@@ -79,6 +79,7 @@ enum mt753x_bpdu_port_fw { · 78 unmodified lines
79	79	#define STATIC_EMP 0
80	80	#define STATIC_ENT 3
81	81	#define MT7530_ATA2 0x78
	82	+#define ATA2_IVL BIT(15)
82	83
83	84	/* Register for address table write data */
84	85	#define MT7530_ATWD 0x7c

drivers/net/dsa/mv88e6xxx/Kconfig+1−1

@@ -12,7 +12,7 @@ config NET_DSA_MV88E6XXX · 11 unmodified lines
12	12	config NET_DSA_MV88E6XXX_PTP
13	13	bool "PTP support for Marvell 88E6xxx"
14	14	default n
15		− depends on PTP_1588_CLOCK
	15	+ depends on NET_DSA_MV88E6XXX && PTP_1588_CLOCK
16	16	help
17	17	Say Y to enable PTP hardware timestamping on Marvell 88E6xxx switch
18	18	chips that support it.

drivers/net/dsa/sja1105/sja1105_main.c+6−0

@@ -397,6 +397,12 @@ static int sja1105_init_static_vlan(struct sja1105_private *priv) · 396 unmodified lines
397	397	if (dsa_is_cpu_port(ds, port))
398	398	v->pvid = true;
399	399	list_add(&v->list, &priv->dsa_8021q_vlans);
	400	+
	401	+ v = kmemdup(v, sizeof(*v), GFP_KERNEL);
	402	+ if (!v)
	403	+ return -ENOMEM;
	404	+
	405	+ list_add(&v->list, &priv->bridge_vlans);
400	406	}
401	407
402	408	((struct sja1105_vlan_lookup_entry *)table->entries)[0] = pvid;

drivers/net/ethernet/broadcom/bnxt/bnxt.c+62−23

@@ -1671,11 +1671,16 @@ static inline struct sk_buff bnxt_tpa_end(struct bnxt bp, · 1670 unmodified lines
1671	1671
1672	1672	if ((tpa_info->flags2 & RX_CMP_FLAGS2_META_FORMAT_VLAN) &&
1673	1673	(skb->dev->features & BNXT_HW_FEATURE_VLAN_ALL_RX)) {
1674		− u16 vlan_proto = tpa_info->metadata >>
1675		− RX_CMP_FLAGS2_METADATA_TPID_SFT;
	1674	+ __be16 vlan_proto = htons(tpa_info->metadata >>
	1675	+ RX_CMP_FLAGS2_METADATA_TPID_SFT);
1676	1676	u16 vtag = tpa_info->metadata & RX_CMP_FLAGS2_METADATA_TCI_MASK;
1677	1677
1678		− __vlan_hwaccel_put_tag(skb, htons(vlan_proto), vtag);
	1678	+ if (eth_type_vlan(vlan_proto)) {
	1679	+ __vlan_hwaccel_put_tag(skb, vlan_proto, vtag);
	1680	+ } else {
	1681	+ dev_kfree_skb(skb);
	1682	+ return NULL;
	1683	+ }
1679	1684	}
1680	1685
1681	1686	skb_checksum_none_assert(skb);
@@ -1897,9 +1902,15 @@ static int bnxt_rx_pkt(struct bnxt bp, struct bnxt_cp_ring_info cpr, · 215 unmodified lines
1897	1902	(skb->dev->features & BNXT_HW_FEATURE_VLAN_ALL_RX)) {
1898	1903	u32 meta_data = le32_to_cpu(rxcmp1->rx_cmp_meta_data);
1899	1904	u16 vtag = meta_data & RX_CMP_FLAGS2_METADATA_TCI_MASK;
1900		− u16 vlan_proto = meta_data >> RX_CMP_FLAGS2_METADATA_TPID_SFT;
	1905	+ __be16 vlan_proto = htons(meta_data >>
	1906	+ RX_CMP_FLAGS2_METADATA_TPID_SFT);
1901	1907
1902		− __vlan_hwaccel_put_tag(skb, htons(vlan_proto), vtag);
	1908	+ if (eth_type_vlan(vlan_proto)) {
	1909	+ __vlan_hwaccel_put_tag(skb, vlan_proto, vtag);
	1910	+ } else {
	1911	+ dev_kfree_skb(skb);
	1912	+ goto next_rx;
	1913	+ }
1903	1914	}
1904	1915
1905	1916	skb_checksum_none_assert(skb);
@@ -7563,8 +7574,12 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) · 5657 unmodified lines
7563	7574	bp->flags &= ~BNXT_FLAG_WOL_CAP;
7564	7575	if (flags & FUNC_QCAPS_RESP_FLAGS_WOL_MAGICPKT_SUPPORTED)
7565	7576	bp->flags \|= BNXT_FLAG_WOL_CAP;
7566		− if (flags & FUNC_QCAPS_RESP_FLAGS_PTP_SUPPORTED)
	7577	+ if (flags & FUNC_QCAPS_RESP_FLAGS_PTP_SUPPORTED) {
7567	7578	__bnxt_hwrm_ptp_qcfg(bp);
	7579	+ } else {
	7580	+ kfree(bp->ptp_cfg);
	7581	+ bp->ptp_cfg = NULL;
	7582	+ }
7568	7583	} else {
7569	7584	#ifdef CONFIG_BNXT_SRIOV
7570	7585	struct bnxt_vf_info *vf = &bp->vf;
@@ -10123,7 +10138,6 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) · 2552 unmodified lines
10123	10138	}
10124	10139	}
10125	10140
10126		− bnxt_ptp_start(bp);
10127	10141	rc = bnxt_init_nic(bp, irq_re_init);
10128	10142	if (rc) {
10129	10143	netdev_err(bp->dev, "bnxt_init_nic err: %x\n", rc);
@@ -10197,6 +10211,12 @@ int bnxt_half_open_nic(struct bnxt *bp) · 67 unmodified lines
10197	10211	{
10198	10212	int rc = 0;
10199	10213
	10214	+ if (test_bit(BNXT_STATE_ABORT_ERR, &bp->state)) {
	10215	+ netdev_err(bp->dev, "A previous firmware reset has not completed, aborting half open\n");
	10216	+ rc = -ENODEV;
	10217	+ goto half_open_err;
	10218	+ }
	10219	+
10200	10220	rc = bnxt_alloc_mem(bp, false);
10201	10221	if (rc) {
10202	10222	netdev_err(bp->dev, "bnxt_alloc_mem err: %x\n", rc);
@@ -10256,9 +10276,16 @@ static int bnxt_open(struct net_device *dev) · 53 unmodified lines
10256	10276	rc = bnxt_hwrm_if_change(bp, true);
10257	10277	if (rc)
10258	10278	return rc;
	10279	+
	10280	+ if (bnxt_ptp_init(bp)) {
	10281	+ netdev_warn(dev, "PTP initialization failed.\n");
	10282	+ kfree(bp->ptp_cfg);
	10283	+ bp->ptp_cfg = NULL;
	10284	+ }
10259	10285	rc = __bnxt_open_nic(bp, true, true);
10260	10286	if (rc) {
10261	10287	bnxt_hwrm_if_change(bp, false);
	10288	+ bnxt_ptp_clear(bp);
10262	10289	} else {
10263	10290	if (test_and_clear_bit(BNXT_STATE_FW_RESET_DET, &bp->state)) {
10264	10291	if (!test_bit(BNXT_STATE_IN_FW_RESET, &bp->state)) {
@@ -10349,6 +10376,7 @@ static int bnxt_close(struct net_device *dev) · 84 unmodified lines
10349	10376	{
10350	10377	struct bnxt *bp = netdev_priv(dev);
10351	10378
	10379	+ bnxt_ptp_clear(bp);
10352	10380	bnxt_hwmon_close(bp);
10353	10381	bnxt_close_nic(bp, true, true);
10354	10382	bnxt_hwrm_shutdown_link(bp);
@@ -11335,6 +11363,7 @@ static void bnxt_fw_reset_close(struct bnxt *bp) · 980 unmodified lines
11335	11363	bnxt_clear_int_mode(bp);
11336	11364	pci_disable_device(bp->pdev);
11337	11365	}
	11366	+ bnxt_ptp_clear(bp);
11338	11367	__bnxt_close_nic(bp, true, false);
11339	11368	bnxt_vf_reps_free(bp);
11340	11369	bnxt_clear_int_mode(bp);
@@ -11959,10 +11988,21 @@ static bool bnxt_fw_reset_timeout(struct bnxt *bp) · 618 unmodified lines
11959	11988	(bp->fw_reset_max_dsecs * HZ / 10));
11960	11989	}
11961	11990
	11991	+static void bnxt_fw_reset_abort(struct bnxt *bp, int rc)
	11992	+{
	11993	+ clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
	11994	+ if (bp->fw_reset_state != BNXT_FW_RESET_STATE_POLL_VF) {
	11995	+ bnxt_ulp_start(bp, rc);
	11996	+ bnxt_dl_health_status_update(bp, false);
	11997	+ }
	11998	+ bp->fw_reset_state = 0;
	11999	+ dev_close(bp->dev);
	12000	+}
	12001	+
11962	12002	static void bnxt_fw_reset_task(struct work_struct *work)
11963	12003	{
11964	12004	struct bnxt *bp = container_of(work, struct bnxt, fw_reset_task.work);
11965		− int rc;
	12005	+ int rc = 0;
11966	12006
11967	12007	if (!test_bit(BNXT_STATE_IN_FW_RESET, &bp->state)) {
11968	12008	netdev_err(bp->dev, "bnxt_fw_reset_task() called when not in fw reset mode!\n");
@@ -11992,6 +12032,11 @@ static void bnxt_fw_reset_task(struct work_struct *work) · 23 unmodified lines
11992	12032	}
11993	12033	bp->fw_reset_timestamp = jiffies;
11994	12034	rtnl_lock();
	12035	+ if (test_bit(BNXT_STATE_ABORT_ERR, &bp->state)) {
	12036	+ bnxt_fw_reset_abort(bp, rc);
	12037	+ rtnl_unlock();
	12038	+ return;
	12039	+ }
11995	12040	bnxt_fw_reset_close(bp);
11996	12041	if (bp->fw_cap & BNXT_FW_CAP_ERR_RECOVER_RELOAD) {
11997	12042	bp->fw_reset_state = BNXT_FW_RESET_STATE_POLL_FW_DOWN;
@@ -12039,6 +12084,7 @@ static void bnxt_fw_reset_task(struct work_struct *work) · 41 unmodified lines
12039	12084	if (val == 0xffff) {
12040	12085	if (bnxt_fw_reset_timeout(bp)) {
12041	12086	netdev_err(bp->dev, "Firmware reset aborted, PCI config space invalid\n");
	12087	+ rc = -ETIMEDOUT;
12042	12088	goto fw_reset_abort;
12043	12089	}
12044	12090	bnxt_queue_fw_reset_work(bp, HZ / 1000);
@@ -12048,6 +12094,7 @@ static void bnxt_fw_reset_task(struct work_struct *work) · 3 unmodified lines
12048	12094	clear_bit(BNXT_STATE_FW_FATAL_COND, &bp->state);
12049	12095	if (pci_enable_device(bp->pdev)) {
12050	12096	netdev_err(bp->dev, "Cannot re-enable PCI device\n");
	12097	+ rc = -ENODEV;
12051	12098	goto fw_reset_abort;
12052	12099	}
12053	12100	pci_set_master(bp->pdev);
@@ -12074,9 +12121,10 @@ static void bnxt_fw_reset_task(struct work_struct *work) · 20 unmodified lines
12074	12121	}
12075	12122	rc = bnxt_open(bp->dev);
12076	12123	if (rc) {
12077		− netdev_err(bp->dev, "bnxt_open_nic() failed\n");
12078		− clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
12079		− dev_close(bp->dev);
	12124	+ netdev_err(bp->dev, "bnxt_open() failed during FW reset\n");
	12125	+ bnxt_fw_reset_abort(bp, rc);
	12126	+ rtnl_unlock();
	12127	+ return;
12080	12128	}
12081	12129
12082	12130	bp->fw_reset_state = 0;
@@ -12103,12 +12151,8 @@ fw_reset_abort_status: · 20 unmodified lines
12103	12151	netdev_err(bp->dev, "fw_health_status 0x%x\n", sts);
12104	12152	}
12105	12153	fw_reset_abort:
12106		− clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
12107		− if (bp->fw_reset_state != BNXT_FW_RESET_STATE_POLL_VF)
12108		− bnxt_dl_health_status_update(bp, false);
12109		− bp->fw_reset_state = 0;
12110	12154	rtnl_lock();
12111		− dev_close(bp->dev);
	12155	+ bnxt_fw_reset_abort(bp, rc);
12112	12156	rtnl_unlock();
12113	12157	}
12114	12158
@@ -12662,7 +12706,6 @@ static void bnxt_remove_one(struct pci_dev *pdev) · 547 unmodified lines
12662	12706	if (BNXT_PF(bp))
12663	12707	devlink_port_type_clear(&bp->dl_port);
12664	12708
12665		− bnxt_ptp_clear(bp);
12666	12709	pci_disable_pcie_error_reporting(pdev);
12667	12710	unregister_netdev(dev);
12668	12711	clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
@@ -13246,11 +13289,6 @@ static int bnxt_init_one(struct pci_dev pdev, const struct pci_device_id ent) · 577 unmodified lines
13246	13289	rc);
13247	13290	}
13248	13291
13249		− if (bnxt_ptp_init(bp)) {
13250		− netdev_warn(dev, "PTP initialization failed.\n");
13251		− kfree(bp->ptp_cfg);
13252		− bp->ptp_cfg = NULL;
13253		− }
13254	13292	bnxt_inv_fw_health_reg(bp);
13255	13293	bnxt_dl_register(bp);
13256	13294
@@ -13436,7 +13474,8 @@ static pci_ers_result_t bnxt_io_error_detected(struct pci_dev *pdev, · 179 unmodified lines
13436	13474	if (netif_running(netdev))
13437	13475	bnxt_close(netdev);
13438	13476
13439		− pci_disable_device(pdev);
	13477	+ if (pci_is_enabled(pdev))
	13478	+ pci_disable_device(pdev);
13440	13479	bnxt_free_ctx_mem(bp);
13441	13480	kfree(bp->ctx);
13442	13481	bp->ctx = NULL;

drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c+9−1

@@ -433,6 +433,7 @@ static int bnxt_hwrm_queue_dscp2pri_cfg(struct bnxt bp, struct dcb_app app, · 432 unmodified lines
433	433	static int bnxt_ets_validate(struct bnxt bp, struct ieee_ets ets, u8 *tc)
434	434	{
435	435	int total_ets_bw = 0;
	436	+ bool zero = false;
436	437	u8 max_tc = 0;
437	438	int i;
438	439
@@ -453,13 +454,20 @@ static int bnxt_ets_validate(struct bnxt bp, struct ieee_ets ets, u8 *tc) · 14 unmodified lines
453	454	break;
454	455	case IEEE_8021QAZ_TSA_ETS:
455	456	total_ets_bw += ets->tc_tx_bw[i];
	457	+ zero = zero \|\| !ets->tc_tx_bw[i];
456	458	break;
457	459	default:
458	460	return -ENOTSUPP;
459	461	}
460	462	}
461		− if (total_ets_bw > 100)
	463	+ if (total_ets_bw > 100) {
	464	+ netdev_warn(bp->dev, "rejecting ETS config exceeding available bandwidth\n");
462	465	return -EINVAL;
	466	+ }
	467	+ if (zero && total_ets_bw == 100) {
	468	+ netdev_warn(bp->dev, "rejecting ETS config starving a TC\n");
	469	+ return -EINVAL;
	470	+ }
463	471
464	472	if (max_tc >= bp->max_tc)
465	473	*tc = bp->max_tc;

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c+7−17

@@ -385,22 +385,6 @@ int bnxt_get_rx_ts_p5(struct bnxt bp, u64 ts, u32 pkt_ts) · 384 unmodified lines
385	385	return 0;
386	386	}
387	387
388		−void bnxt_ptp_start(struct bnxt *bp)
389		−{
390		− struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;
391		−
392		− if (!ptp)
393		− return;
394		−
395		− if (bp->flags & BNXT_FLAG_CHIP_P5) {
396		− spin_lock_bh(&ptp->ptp_lock);
397		− ptp->current_time = bnxt_refclk_read(bp, NULL);
398		− WRITE_ONCE(ptp->old_time, ptp->current_time);
399		− spin_unlock_bh(&ptp->ptp_lock);
400		− ptp_schedule_worker(ptp->ptp_clock, 0);
401		− }
402		−}
403		−
404	388	static const struct ptp_clock_info bnxt_ptp_caps = {
405	389	.owner = THIS_MODULE,
406	390	.name = "bnxt clock",
@@ -450,7 +434,13 @@ int bnxt_ptp_init(struct bnxt *bp) · 43 unmodified lines
450	434	bnxt_unmap_ptp_regs(bp);
451	435	return err;
452	436	}
453		−
	437	+ if (bp->flags & BNXT_FLAG_CHIP_P5) {
	438	+ spin_lock_bh(&ptp->ptp_lock);
	439	+ ptp->current_time = bnxt_refclk_read(bp, NULL);
	440	+ WRITE_ONCE(ptp->old_time, ptp->current_time);
	441	+ spin_unlock_bh(&ptp->ptp_lock);
	442	+ ptp_schedule_worker(ptp->ptp_clock, 0);
	443	+ }
454	444	return 0;
455	445	}
456	446

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h+0−1

@@ -75,7 +75,6 @@ int bnxt_hwtstamp_set(struct net_device dev, struct ifreq ifr); · 74 unmodified lines
75	75	int bnxt_hwtstamp_get(struct net_device dev, struct ifreq ifr);
76	76	int bnxt_get_tx_ts_p5(struct bnxt bp, struct sk_buff skb);
77	77	int bnxt_get_rx_ts_p5(struct bnxt bp, u64 ts, u32 pkt_ts);
78		−void bnxt_ptp_start(struct bnxt *bp);
79	78	int bnxt_ptp_init(struct bnxt *bp);
80	79	void bnxt_ptp_clear(struct bnxt *bp);
81	80	#endif

drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c+5−4

@@ -479,16 +479,17 @@ struct bnxt_en_dev bnxt_ulp_probe(struct net_device dev) · 478 unmodified lines
479	479	if (!edev)
480	480	return ERR_PTR(-ENOMEM);
481	481	edev->en_ops = &bnxt_en_ops_tbl;
482		− if (bp->flags & BNXT_FLAG_ROCEV1_CAP)
483		− edev->flags \|= BNXT_EN_FLAG_ROCEV1_CAP;
484		− if (bp->flags & BNXT_FLAG_ROCEV2_CAP)
485		− edev->flags \|= BNXT_EN_FLAG_ROCEV2_CAP;
486	482	edev->net = dev;
487	483	edev->pdev = bp->pdev;
488	484	edev->l2_db_size = bp->db_size;
489	485	edev->l2_db_size_nc = bp->db_size;
490	486	bp->edev = edev;
491	487	}
	488	+ edev->flags &= ~BNXT_EN_FLAG_ROCE_CAP;
	489	+ if (bp->flags & BNXT_FLAG_ROCEV1_CAP)
	490	+ edev->flags \|= BNXT_EN_FLAG_ROCEV1_CAP;
	491	+ if (bp->flags & BNXT_FLAG_ROCEV2_CAP)
	492	+ edev->flags \|= BNXT_EN_FLAG_ROCEV2_CAP;
492	493	return bp->edev;
493	494	}
494	495	EXPORT_SYMBOL(bnxt_ulp_probe);

drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c+1−1

@@ -420,7 +420,7 @@ static int cn23xx_pf_setup_global_input_regs(struct octeon_device *oct) · 419 unmodified lines
420	420	* bits 32:47 indicate the PVF num.
421	421	*/
422	422	for (q_no = 0; q_no < ern; q_no++) {
423		− reg_val = oct->pcie_port << CN23XX_PKT_INPUT_CTL_MAC_NUM_POS;
	423	+ reg_val = (u64)oct->pcie_port << CN23XX_PKT_INPUT_CTL_MAC_NUM_POS;
424	424
425	425	/* for VF assigned queues. */
426	426	if (q_no < oct->sriov_info.pf_srn) {

drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c+8−8

@@ -2809,32 +2809,32 @@ static int dpaa2_switch_ctrl_if_setup(struct ethsw_core *ethsw) · 2808 unmodified lines
2809	2809	if (err)
2810	2810	return err;
2811	2811
2812		− err = dpaa2_switch_seed_bp(ethsw);
2813		− if (err)
2814		− goto err_free_dpbp;
2815		−
2816	2812	err = dpaa2_switch_alloc_rings(ethsw);
2817	2813	if (err)
2818		− goto err_drain_dpbp;
	2814	+ goto err_free_dpbp;
2819	2815
2820	2816	err = dpaa2_switch_setup_dpio(ethsw);
2821	2817	if (err)
2822	2818	goto err_destroy_rings;
2823	2819
	2820	+ err = dpaa2_switch_seed_bp(ethsw);
	2821	+ if (err)
	2822	+ goto err_deregister_dpio;
	2823	+
2824	2824	err = dpsw_ctrl_if_enable(ethsw->mc_io, 0, ethsw->dpsw_handle);
2825	2825	if (err) {
2826	2826	dev_err(ethsw->dev, "dpsw_ctrl_if_enable err %d\n", err);
2827		− goto err_deregister_dpio;
	2827	+ goto err_drain_dpbp;
2828	2828	}
2829	2829
2830	2830	return 0;
2831	2831
	2832	+err_drain_dpbp:
	2833	+ dpaa2_switch_drain_bp(ethsw);
2832	2834	err_deregister_dpio:
2833	2835	dpaa2_switch_free_dpio(ethsw);
2834	2836	err_destroy_rings:
2835	2837	dpaa2_switch_destroy_rings(ethsw);
2836		−err_drain_dpbp:
2837		− dpaa2_switch_drain_bp(ethsw);
2838	2838	err_free_dpbp:
2839	2839	dpaa2_switch_free_dpbp(ethsw);
2840	2840

drivers/net/ethernet/freescale/fman/mac.c+1−0

@@ -524,6 +524,7 @@ static void setup_memac(struct mac_device *mac_dev) · 523 unmodified lines
524	524	\| SUPPORTED_Autoneg \
525	525	\| SUPPORTED_Pause \
526	526	\| SUPPORTED_Asym_Pause \
	527	+ \| SUPPORTED_FIBRE \
527	528	\| SUPPORTED_MII)
528	529
529	530	static DEFINE_MUTEX(eth_lock);

drivers/net/ethernet/hisilicon/hip04_eth.c+3−3

@@ -131,7 +131,7 @@ · 130 unmodified lines
131	131	/* buf unit size is cache_line_size, which is 64, so the shift is 6 */
132	132	#define PPE_BUF_SIZE_SHIFT 6
133	133	#define PPE_TX_BUF_HOLD BIT(31)
134		−#define CACHE_LINE_MASK 0x3F
	134	+#define SOC_CACHE_LINE_MASK 0x3F
135	135	#else
136	136	#define PPE_CFG_QOS_VMID_GRP_SHIFT 8
137	137	#define PPE_CFG_RX_CTRL_ALIGN_SHIFT 11
@@ -531,8 +531,8 @@ hip04_mac_start_xmit(struct sk_buff skb, struct net_device ndev) · 393 unmodified lines
531	531	#if defined(CONFIG_HI13X1_GMAC)
532	532	desc->cfg = (__force u32)cpu_to_be32(TX_CLEAR_WB \| TX_FINISH_CACHE_INV
533	533	\| TX_RELEASE_TO_PPE \| priv->port << TX_POOL_SHIFT);
534		− desc->data_offset = (__force u32)cpu_to_be32(phys & CACHE_LINE_MASK);
535		− desc->send_addr = (__force u32)cpu_to_be32(phys & ~CACHE_LINE_MASK);
	534	+ desc->data_offset = (__force u32)cpu_to_be32(phys & SOC_CACHE_LINE_MASK);
	535	+ desc->send_addr = (__force u32)cpu_to_be32(phys & ~SOC_CACHE_LINE_MASK);
536	536	#else
537	537	desc->cfg = (__force u32)cpu_to_be32(TX_CLEAR_WB \| TX_FINISH_CACHE_INV);
538	538	desc->send_addr = (__force u32)cpu_to_be32(phys);

drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h+5−2

@@ -98,6 +98,7 @@ struct hclgevf_mbx_resp_status { · 97 unmodified lines
98	98	u32 origin_mbx_msg;
99	99	bool received_resp;
100	100	int resp_status;
	101	+ u16 match_id;
101	102	u8 additional_info[HCLGE_MBX_MAX_RESP_DATA_SIZE];
102	103	};
103	104
@@ -143,7 +144,8 @@ struct hclge_mbx_vf_to_pf_cmd { · 39 unmodified lines
143	144	u8 mbx_need_resp;
144	145	u8 rsv1[1];
145	146	u8 msg_len;
146		− u8 rsv2[3];
	147	+ u8 rsv2;
	148	+ u16 match_id;
147	149	struct hclge_vf_to_pf_msg msg;
148	150	};
149	151
@@ -153,7 +155,8 @@ struct hclge_mbx_pf_to_vf_cmd { · 3 unmodified lines
153	155	u8 dest_vfid;
154	156	u8 rsv[3];
155	157	u8 msg_len;
156		− u8 rsv1[3];
	158	+ u8 rsv1;
	159	+ u16 match_id;
157	160	struct hclge_pf_to_vf_msg msg;
158	161	};
159	162

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c+6−2

@@ -9552,13 +9552,17 @@ static int hclge_set_vport_vlan_filter(struct hclge_vport *vport, bool enable) · 9551 unmodified lines
9552	9552	if (ret)
9553	9553	return ret;
9554	9554
9555		− if (test_bit(HNAE3_DEV_SUPPORT_PORT_VLAN_BYPASS_B, ae_dev->caps))
	9555	+ if (test_bit(HNAE3_DEV_SUPPORT_PORT_VLAN_BYPASS_B, ae_dev->caps)) {
9556	9556	ret = hclge_set_port_vlan_filter_bypass(hdev, vport->vport_id,
9557	9557	!enable);
9558		− else if (!vport->vport_id)
	9558	+ } else if (!vport->vport_id) {
	9559	+ if (test_bit(HNAE3_DEV_SUPPORT_VLAN_FLTR_MDF_B, ae_dev->caps))
	9560	+ enable = false;
	9561	+
9559	9562	ret = hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_PORT,
9560	9563	HCLGE_FILTER_FE_INGRESS,
9561	9564	enable, 0);
	9565	+ }
9562	9566
9563	9567	return ret;
9564	9568	}

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

@@ -47,6 +47,7 @@ static int hclge_gen_resp_to_vf(struct hclge_vport *vport, · 46 unmodified lines
47	47
48	48	resp_pf_to_vf->dest_vfid = vf_to_pf_req->mbx_src_vfid;
49	49	resp_pf_to_vf->msg_len = vf_to_pf_req->msg_len;
	50	+ resp_pf_to_vf->match_id = vf_to_pf_req->match_id;
50	51
51	52	resp_pf_to_vf->msg.code = HCLGE_MBX_PF_VF_RESP;
52	53	resp_pf_to_vf->msg.vf_mbx_msg_code = vf_to_pf_req->msg.code;

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c+10−0

@@ -2641,6 +2641,16 @@ static int hclgevf_rss_init_hw(struct hclgevf_dev *hdev) · 2640 unmodified lines
2641	2641
2642	2642	static int hclgevf_init_vlan_config(struct hclgevf_dev *hdev)
2643	2643	{
	2644	+ struct hnae3_handle *nic = &hdev->nic;
	2645	+ int ret;
	2646	+
	2647	+ ret = hclgevf_en_hw_strip_rxvtag(nic, true);
	2648	+ if (ret) {
	2649	+ dev_err(&hdev->pdev->dev,
	2650	+ "failed to enable rx vlan offload, ret = %d\n", ret);
	2651	+ return ret;
	2652	+ }
	2653	+
2644	2654	return hclgevf_set_vlan_filter(&hdev->nic, htons(ETH_P_8021Q), 0,
2645	2655	false);
2646	2656	}

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c+19−0

@@ -13,6 +13,7 @@ static int hclgevf_resp_to_errno(u16 resp_code) · 12 unmodified lines
13	13	return resp_code ? -resp_code : 0;
14	14	}
15	15
	16	+#define HCLGEVF_MBX_MATCH_ID_START 1
16	17	static void hclgevf_reset_mbx_resp_status(struct hclgevf_dev *hdev)
17	18	{
18	19	/* this function should be called with mbx_resp.mbx_mutex held
@@ -21,6 +22,10 @@ static void hclgevf_reset_mbx_resp_status(struct hclgevf_dev *hdev) · 2 unmodified lines
21	22	hdev->mbx_resp.received_resp = false;
22	23	hdev->mbx_resp.origin_mbx_msg = 0;
23	24	hdev->mbx_resp.resp_status = 0;
	25	+ hdev->mbx_resp.match_id++;
	26	+ /* Update match_id and ensure the value of match_id is not zero */
	27	+ if (hdev->mbx_resp.match_id == 0)
	28	+ hdev->mbx_resp.match_id = HCLGEVF_MBX_MATCH_ID_START;
24	29	memset(hdev->mbx_resp.additional_info, 0, HCLGE_MBX_MAX_RESP_DATA_SIZE);
25	30	}
26	31
@@ -115,6 +120,7 @@ int hclgevf_send_mbx_msg(struct hclgevf_dev *hdev, · 88 unmodified lines
115	120	if (need_resp) {
116	121	mutex_lock(&hdev->mbx_resp.mbx_mutex);
117	122	hclgevf_reset_mbx_resp_status(hdev);
	123	+ req->match_id = hdev->mbx_resp.match_id;
118	124	status = hclgevf_cmd_send(&hdev->hw, &desc, 1);
119	125	if (status) {
120	126	dev_err(&hdev->pdev->dev,
@@ -211,6 +217,19 @@ void hclgevf_mbx_handler(struct hclgevf_dev *hdev) · 90 unmodified lines
211	217	resp->additional_info[i] = *temp;
212	218	temp++;
213	219	}
	220	+
	221	+ /* If match_id is not zero, it means PF support
	222	+ * match_id. If the match_id is right, VF get the
	223	+ * right response, otherwise ignore the response.
	224	+ * Driver will clear hdev->mbx_resp when send
	225	+ * next message which need response.
	226	+ */
	227	+ if (req->match_id) {
	228	+ if (req->match_id == resp->match_id)
	229	+ resp->received_resp = true;
	230	+ } else {
	231	+ resp->received_resp = true;
	232	+ }
214	233	break;
215	234	case HCLGE_MBX_LINK_STAT_CHANGE:
216	235	case HCLGE_MBX_ASSERTING_RESET:

drivers/net/ethernet/ibm/ibmvnic.c+1−1

@@ -1731,7 +1731,6 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff skb, struct net_device netdev) · 1730 unmodified lines
1731	1731	tx_send_failed++;
1732	1732	tx_dropped++;
1733	1733	ret = NETDEV_TX_OK;
1734		− ibmvnic_tx_scrq_flush(adapter, tx_scrq);
1735	1734	goto out;
1736	1735	}
1737	1736
@@ -1753,6 +1752,7 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff skb, struct net_device netdev) · 15 unmodified lines
1753	1752	dev_kfree_skb_any(skb);
1754	1753	tx_send_failed++;
1755	1754	tx_dropped++;
	1755	+ ibmvnic_tx_scrq_flush(adapter, tx_scrq);
1756	1756	ret = NETDEV_TX_OK;
1757	1757	goto out;
1758	1758	}

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c+2−1

@@ -1825,7 +1825,8 @@ static void ixgbe_dma_sync_frag(struct ixgbe_ring *rx_ring, · 1824 unmodified lines
1825	1825	struct sk_buff *skb)
1826	1826	{
1827	1827	if (ring_uses_build_skb(rx_ring)) {
1828		− unsigned long offset = (unsigned long)(skb->data) & ~PAGE_MASK;
	1828	+ unsigned long mask = (unsigned long)ixgbe_rx_pg_size(rx_ring) - 1;
	1829	+ unsigned long offset = (unsigned long)(skb->data) & mask;
1829	1830
1830	1831	dma_sync_single_range_for_cpu(rx_ring->dev,
1831	1832	IXGBE_CB(skb)->dma,

drivers/net/ethernet/marvell/octeontx2/af/Makefile+1−1

@@ -10,4 +10,4 @@ obj-$(CONFIG_OCTEONTX2_AF) += rvu_af.o · 9 unmodified lines
10	10	rvu_mbox-y := mbox.o rvu_trace.o
11	11	rvu_af-y := cgx.o rvu.o rvu_cgx.o rvu_npa.o rvu_nix.o \
12	12	rvu_reg.o rvu_npc.o rvu_debugfs.o ptp.o rvu_npc_fs.o \
13		− rvu_cpt.o rvu_devlink.o rpm.o rvu_cn10k.o
	13	+ rvu_cpt.o rvu_devlink.o rpm.o rvu_cn10k.o rvu_switch.o

drivers/net/ethernet/marvell/octeontx2/af/rvu.c+9−1

@@ -1314,7 +1314,7 @@ int rvu_mbox_handler_detach_resources(struct rvu *rvu, · 1313 unmodified lines
1314	1314	return rvu_detach_rsrcs(rvu, detach, detach->hdr.pcifunc);
1315	1315	}
1316	1316
1317		−static int rvu_get_nix_blkaddr(struct rvu *rvu, u16 pcifunc)
	1317	+int rvu_get_nix_blkaddr(struct rvu *rvu, u16 pcifunc)
1318	1318	{
1319	1319	struct rvu_pfvf *pfvf = rvu_get_pfvf(rvu, pcifunc);
1320	1320	int blkaddr = BLKADDR_NIX0, vf;
@@ -2859,6 +2859,12 @@ static int rvu_enable_sriov(struct rvu *rvu) · 1538 unmodified lines
2859	2859	if (!vfs)
2860	2860	return 0;
2861	2861
	2862	+ /* LBK channel number 63 is used for switching packets between
	2863	+ * CGX mapped VFs. Hence limit LBK pairs till 62 only.
	2864	+ */
	2865	+ if (vfs > 62)
	2866	+ vfs = 62;
	2867	+
2862	2868	/* Save VFs number for reference in VF interrupts handlers.
2863	2869	* Since interrupts might start arriving during SRIOV enablement
2864	2870	* ordinary API cannot be used to get number of enabled VFs.
@@ -3001,6 +3007,8 @@ static int rvu_probe(struct pci_dev pdev, const struct pci_device_id id) · 136 unmodified lines
3001	3007	/* Initialize debugfs */
3002	3008	rvu_dbg_init(rvu);
3003	3009
	3010	+ mutex_init(&rvu->rswitch.switch_lock);
	3011	+
3004	3012	return 0;
3005	3013	err_dl:
3006	3014	rvu_unregister_dl(rvu);

drivers/net/ethernet/marvell/octeontx2/af/rvu.h+21−0

@@ -415,6 +415,16 @@ struct npc_kpu_profile_adapter { · 414 unmodified lines
415	415	size_t kpus;
416	416	};
417	417
	418	+#define RVU_SWITCH_LBK_CHAN 63
	419	+
	420	+struct rvu_switch {
	421	+ struct mutex switch_lock; /* Serialize flow installation */
	422	+ u32 used_entries;
	423	+ u16 *entry2pcifunc;
	424	+ u16 mode;
	425	+ u16 start_entry;
	426	+};
	427	+
418	428	struct rvu {
419	429	void __iomem *afreg_base;
420	430	void __iomem *pfreg_base;
@@ -445,6 +455,7 @@ struct rvu { · 24 unmodified lines
445	455
446	456	/* CGX */
447	457	#define PF_CGXMAP_BASE 1 /* PF 0 is reserved for RVU PF */
	458	+ u16 cgx_mapped_vfs; /* maximum CGX mapped VFs */
448	459	u8 cgx_mapped_pfs;
449	460	u8 cgx_cnt_max; /* CGX port count max */
450	461	u8 pf2cgxlmac_map; / pf to cgx_lmac map */
@@ -477,6 +488,9 @@ struct rvu { · 26 unmodified lines
477	488	struct rvu_debugfs rvu_dbg;
478	489	#endif
479	490	struct rvu_devlink *rvu_dl;
	491	+
	492	+ /* RVU switch implementation over NPC with DMAC rules */
	493	+ struct rvu_switch rswitch;
480	494	};
481	495
482	496	static inline void rvu_write64(struct rvu *rvu, u64 block, u64 offset, u64 val)
@@ -691,6 +705,7 @@ int nix_aq_context_read(struct rvu rvu, struct nix_hw nix_hw, · 208 unmodified lines
691	705	struct nix_cn10k_aq_enq_req *aq_req,
692	706	struct nix_cn10k_aq_enq_rsp *aq_rsp,
693	707	u16 pcifunc, u8 ctype, u32 qidx);
	708	+int rvu_get_nix_blkaddr(struct rvu *rvu, u16 pcifunc);
694	709
695	710	/* NPC APIs */
696	711	int rvu_npc_init(struct rvu *rvu);
@@ -768,4 +783,10 @@ void rvu_dbg_exit(struct rvu *rvu); · 71 unmodified lines
768	783	static inline void rvu_dbg_init(struct rvu *rvu) {}
769	784	static inline void rvu_dbg_exit(struct rvu *rvu) {}
770	785	#endif
	786	+
	787	+/* RVU Switch */
	788	+void rvu_switch_enable(struct rvu *rvu);
	789	+void rvu_switch_disable(struct rvu *rvu);
	790	+void rvu_switch_update_rules(struct rvu *rvu, u16 pcifunc);
	791	+
771	792	#endif /* RVU_H */

drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c+3−0

@@ -126,6 +126,7 @@ static int rvu_map_cgx_lmac_pf(struct rvu *rvu) · 125 unmodified lines
126	126	unsigned long lmac_bmap;
127	127	int size, free_pkind;
128	128	int cgx, lmac, iter;
	129	+ int numvfs, hwvfs;
129	130
130	131	if (!cgx_cnt_max)
131	132	return 0;
@@ -166,6 +167,8 @@ static int rvu_map_cgx_lmac_pf(struct rvu *rvu) · 34 unmodified lines
166	167	pkind->pfchan_map[free_pkind] = ((pf) & 0x3F) << 16;
167	168	rvu_map_cgx_nix_block(rvu, pf, cgx, lmac);
168	169	rvu->cgx_mapped_pfs++;
	170	+ rvu_get_pf_numvfs(rvu, pf, &numvfs, &hwvfs);
	171	+ rvu->cgx_mapped_vfs += numvfs;
169	172	pf++;
170	173	}
171	174	}

drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c+1−4

@@ -2113,9 +2113,6 @@ static void rvu_print_npc_mcam_info(struct seq_file *s, · 2112 unmodified lines
2113	2113	int entry_acnt, entry_ecnt;
2114	2114	int cntr_acnt, cntr_ecnt;
2115	2115
2116		− /* Skip PF0 */
2117		− if (!pcifunc)
2118		− return;
2119	2116	rvu_npc_get_mcam_entry_alloc_info(rvu, pcifunc, blkaddr,
2120	2117	&entry_acnt, &entry_ecnt);
2121	2118	rvu_npc_get_mcam_counter_alloc_info(rvu, pcifunc, blkaddr,
@@ -2298,7 +2295,7 @@ static void rvu_dbg_npc_mcam_show_flows(struct seq_file *s, · 176 unmodified lines
2298	2295	static void rvu_dbg_npc_mcam_show_action(struct seq_file *s,
2299	2296	struct rvu_npc_mcam_rule *rule)
2300	2297	{
2301		− if (rule->intf == NIX_INTF_TX) {
	2298	+ if (is_npc_intf_tx(rule->intf)) {
2302	2299	switch (rule->tx_action.op) {
2303	2300	case NIX_TX_ACTIONOP_DROP:
2304	2301	seq_puts(s, "\taction: Drop\n");

drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c+41−7

@@ -1364,6 +1364,44 @@ static void rvu_health_reporters_destroy(struct rvu *rvu) · 1363 unmodified lines
1364	1364	rvu_nix_health_reporters_destroy(rvu_dl);
1365	1365	}
1366	1366
	1367	+static int rvu_devlink_eswitch_mode_get(struct devlink devlink, u16 mode)
	1368	+{
	1369	+ struct rvu_devlink *rvu_dl = devlink_priv(devlink);
	1370	+ struct rvu *rvu = rvu_dl->rvu;
	1371	+ struct rvu_switch *rswitch;
	1372	+
	1373	+ rswitch = &rvu->rswitch;
	1374	+ *mode = rswitch->mode;
	1375	+
	1376	+ return 0;
	1377	+}
	1378	+
	1379	+static int rvu_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode,
	1380	+ struct netlink_ext_ack *extack)
	1381	+{
	1382	+ struct rvu_devlink *rvu_dl = devlink_priv(devlink);
	1383	+ struct rvu *rvu = rvu_dl->rvu;
	1384	+ struct rvu_switch *rswitch;
	1385	+
	1386	+ rswitch = &rvu->rswitch;
	1387	+ switch (mode) {
	1388	+ case DEVLINK_ESWITCH_MODE_LEGACY:
	1389	+ case DEVLINK_ESWITCH_MODE_SWITCHDEV:
	1390	+ if (rswitch->mode == mode)
	1391	+ return 0;
	1392	+ rswitch->mode = mode;
	1393	+ if (mode == DEVLINK_ESWITCH_MODE_SWITCHDEV)
	1394	+ rvu_switch_enable(rvu);
	1395	+ else
	1396	+ rvu_switch_disable(rvu);
	1397	+ break;
	1398	+ default:
	1399	+ return -EINVAL;
	1400	+ }
	1401	+
	1402	+ return 0;
	1403	+}
	1404	+
1367	1405	static int rvu_devlink_info_get(struct devlink devlink, struct devlink_info_req req,
1368	1406	struct netlink_ext_ack *extack)
1369	1407	{
@@ -1372,6 +1410,8 @@ static int rvu_devlink_info_get(struct devlink *devlink, struct devlink_info_req · 2 unmodified lines
1372	1410
1373	1411	static const struct devlink_ops rvu_devlink_ops = {
1374	1412	.info_get = rvu_devlink_info_get,
	1413	+ .eswitch_mode_get = rvu_devlink_eswitch_mode_get,
	1414	+ .eswitch_mode_set = rvu_devlink_eswitch_mode_set,
1375	1415	};
1376	1416
1377	1417	int rvu_register_dl(struct rvu *rvu)
@@ -1380,14 +1420,9 @@ int rvu_register_dl(struct rvu *rvu) · 2 unmodified lines
1380	1420	struct devlink *dl;
1381	1421	int err;
1382	1422
1383		− rvu_dl = kzalloc(sizeof(*rvu_dl), GFP_KERNEL);
1384		− if (!rvu_dl)
1385		− return -ENOMEM;
1386		−
1387	1423	dl = devlink_alloc(&rvu_devlink_ops, sizeof(struct rvu_devlink));
1388	1424	if (!dl) {
1389	1425	dev_warn(rvu->dev, "devlink_alloc failed\n");
1390		− kfree(rvu_dl);
1391	1426	return -ENOMEM;
1392	1427	}
1393	1428
@@ -1395,10 +1430,10 @@ int rvu_register_dl(struct rvu *rvu) · 1 unmodified line
1395	1430	if (err) {
1396	1431	dev_err(rvu->dev, "devlink register failed with error %d\n", err);
1397	1432	devlink_free(dl);
1398		− kfree(rvu_dl);
1399	1433	return err;
1400	1434	}
1401	1435
	1436	+ rvu_dl = devlink_priv(dl);
1402	1437	rvu_dl->dl = dl;
1403	1438	rvu_dl->rvu = rvu;
1404	1439	rvu->rvu_dl = rvu_dl;
@@ -1417,5 +1452,4 @@ void rvu_unregister_dl(struct rvu *rvu) · 12 unmodified lines
1417	1452	rvu_health_reporters_destroy(rvu);
1418	1453	devlink_unregister(dl);
1419	1454	devlink_free(dl);
1420		− kfree(rvu_dl);
1421	1455	}

drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c+36−0

@@ -1952,6 +1952,35 @@ static void nix_tl1_default_cfg(struct rvu rvu, struct nix_hw nix_hw, · 1951 unmodified lines
1952	1952	pfvf_map[schq] = TXSCH_SET_FLAG(pfvf_map[schq], NIX_TXSCHQ_CFG_DONE);
1953	1953	}
1954	1954
	1955	+static void rvu_nix_tx_tl2_cfg(struct rvu *rvu, int blkaddr,
	1956	+ u16 pcifunc, struct nix_txsch *txsch)
	1957	+{
	1958	+ struct rvu_hwinfo *hw = rvu->hw;
	1959	+ int lbk_link_start, lbk_links;
	1960	+ u8 pf = rvu_get_pf(pcifunc);
	1961	+ int schq;
	1962	+
	1963	+ if (!is_pf_cgxmapped(rvu, pf))
	1964	+ return;
	1965	+
	1966	+ lbk_link_start = hw->cgx_links;
	1967	+
	1968	+ for (schq = 0; schq < txsch->schq.max; schq++) {
	1969	+ if (TXSCH_MAP_FUNC(txsch->pfvf_map[schq]) != pcifunc)
	1970	+ continue;
	1971	+ /* Enable all LBK links with channel 63 by default so that
	1972	+ * packets can be sent to LBK with a NPC TX MCAM rule
	1973	+ */
	1974	+ lbk_links = hw->lbk_links;
	1975	+ while (lbk_links--)
	1976	+ rvu_write64(rvu, blkaddr,
	1977	+ NIX_AF_TL3_TL2X_LINKX_CFG(schq,
	1978	+ lbk_link_start +
	1979	+ lbk_links),
	1980	+ BIT_ULL(12) \| RVU_SWITCH_LBK_CHAN);
	1981	+ }
	1982	+}
	1983	+
1955	1984	int rvu_mbox_handler_nix_txschq_cfg(struct rvu *rvu,
1956	1985	struct nix_txschq_config *req,
1957	1986	struct msg_rsp *rsp)
@@ -2040,6 +2069,9 @@ int rvu_mbox_handler_nix_txschq_cfg(struct rvu *rvu, · 82 unmodified lines
2040	2069	rvu_write64(rvu, blkaddr, reg, regval);
2041	2070	}
2042	2071
	2072	+ rvu_nix_tx_tl2_cfg(rvu, blkaddr, pcifunc,
	2073	+ &nix_hw->txsch[NIX_TXSCH_LVL_TL2]);
	2074	+
2043	2075	return 0;
2044	2076	}
2045	2077
@@ -3180,6 +3212,8 @@ int rvu_mbox_handler_nix_set_mac_addr(struct rvu *rvu, · 1134 unmodified lines
3180	3212	if (test_bit(PF_SET_VF_TRUSTED, &pfvf->flags) && from_vf)
3181	3213	ether_addr_copy(pfvf->default_mac, req->mac_addr);
3182	3214
	3215	+ rvu_switch_update_rules(rvu, pcifunc);
	3216	+
3183	3217	return 0;
3184	3218	}
3185	3219
@@ -3849,6 +3883,8 @@ int rvu_mbox_handler_nix_lf_start_rx(struct rvu rvu, struct msg_req req, · 663 unmodified lines
3849	3883	pfvf = rvu_get_pfvf(rvu, pcifunc);
3850	3884	set_bit(NIXLF_INITIALIZED, &pfvf->flags);
3851	3885
	3886	+ rvu_switch_update_rules(rvu, pcifunc);
	3887	+
3852	3888	return rvu_cgx_start_stop_io(rvu, pcifunc, true);
3853	3889	}
3854	3890

drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c+36−11

@@ -442,7 +442,8 @@ static void npc_fixup_vf_rule(struct rvu rvu, struct npc_mcam mcam, · 441 unmodified lines
442	442	owner = mcam->entry2pfvf_map[index];
443	443	target_func = (entry->action >> 4) & 0xffff;
444	444	/* do nothing when target is LBK/PF or owner is not PF */
445		− if (is_afvf(target_func) \|\| (owner & RVU_PFVF_FUNC_MASK) \|\|
	445	+ if (is_pffunc_af(owner) \|\| is_afvf(target_func) \|\|
	446	+ (owner & RVU_PFVF_FUNC_MASK) \|\|
446	447	!(target_func & RVU_PFVF_FUNC_MASK))
447	448	return;
448	449
@@ -468,6 +469,8 @@ static void npc_config_mcam_entry(struct rvu rvu, struct npc_mcam mcam, · 19 unmodified lines
468	469	{
469	470	int bank = npc_get_bank(mcam, index);
470	471	int kw = 0, actbank, actindex;
	472	+ u8 tx_intf_mask = ~intf & 0x3;
	473	+ u8 tx_intf = intf;
471	474	u64 cam0, cam1;
472	475
473	476	actbank = bank; /* Save bank id, to set action later on */
@@ -488,12 +491,21 @@ static void npc_config_mcam_entry(struct rvu rvu, struct npc_mcam mcam, · 14 unmodified lines
488	491	*/
489	492	for (; bank < (actbank + mcam->banks_per_entry); bank++, kw = kw + 2) {
490	493	/* Interface should be set in all banks */
	494	+ if (is_npc_intf_tx(intf)) {
	495	+ /* Last bit must be set and rest don't care
	496	+ * for TX interfaces
	497	+ */
	498	+ tx_intf_mask = 0x1;
	499	+ tx_intf = intf & tx_intf_mask;
	500	+ tx_intf_mask = ~tx_intf & tx_intf_mask;
	501	+ }
	502	+
491	503	rvu_write64(rvu, blkaddr,
492	504	NPC_AF_MCAMEX_BANKX_CAMX_INTF(index, bank, 1),
493		− intf);
	505	+ tx_intf);
494	506	rvu_write64(rvu, blkaddr,
495	507	NPC_AF_MCAMEX_BANKX_CAMX_INTF(index, bank, 0),
496		− ~intf & 0x3);
	508	+ tx_intf_mask);
497	509
498	510	/* Set the match key */
499	511	npc_get_keyword(entry, kw, &cam0, &cam1);
@@ -650,6 +662,7 @@ void rvu_npc_install_ucast_entry(struct rvu *rvu, u16 pcifunc, · 150 unmodified lines
650	662	eth_broadcast_addr((u8 *)&req.mask.dmac);
651	663	req.features = BIT_ULL(NPC_DMAC);
652	664	req.channel = chan;
	665	+ req.chan_mask = 0xFFFU;
653	666	req.intf = pfvf->nix_rx_intf;
654	667	req.op = action.op;
655	668	req.hdr.pcifunc = 0; /* AF is requester */
@@ -799,6 +812,7 @@ void rvu_npc_install_bcast_match_entry(struct rvu *rvu, u16 pcifunc, · 143 unmodified lines
799	812	eth_broadcast_addr((u8 *)&req.mask.dmac);
800	813	req.features = BIT_ULL(NPC_DMAC);
801	814	req.channel = chan;
	815	+ req.chan_mask = 0xFFFU;
802	816	req.intf = pfvf->nix_rx_intf;
803	817	req.entry = index;
804	818	req.hdr.pcifunc = 0; /* AF is requester */
@@ -1745,6 +1759,8 @@ static int npc_mcam_rsrcs_init(struct rvu *rvu, int blkaddr) · 940 unmodified lines
1745	1759	int nixlf_count = rvu_get_nixlf_count(rvu);
1746	1760	struct npc_mcam *mcam = &rvu->hw->mcam;
1747	1761	int rsvd, err;
	1762	+ u16 index;
	1763	+ int cntr;
1748	1764	u64 cfg;
1749	1765
1750	1766	/* Actual number of MCAM entries vary by entry size */
@@ -1845,6 +1861,14 @@ static int npc_mcam_rsrcs_init(struct rvu *rvu, int blkaddr) · 94 unmodified lines
1845	1861	if (!mcam->entry2target_pffunc)
1846	1862	goto free_mem;
1847	1863
	1864	+ for (index = 0; index < mcam->bmap_entries; index++) {
	1865	+ mcam->entry2pfvf_map[index] = NPC_MCAM_INVALID_MAP;
	1866	+ mcam->entry2cntr_map[index] = NPC_MCAM_INVALID_MAP;
	1867	+ }
	1868	+
	1869	+ for (cntr = 0; cntr < mcam->counters.max; cntr++)
	1870	+ mcam->cntr2pfvf_map[cntr] = NPC_MCAM_INVALID_MAP;
	1871	+
1848	1872	mutex_init(&mcam->lock);
1849	1873
1850	1874	return 0;
@@ -2562,7 +2586,7 @@ int rvu_mbox_handler_npc_mcam_alloc_entry(struct rvu *rvu, · 711 unmodified lines
2562	2586	}
2563	2587
2564	2588	/* Alloc request from PFFUNC with no NIXLF attached should be denied */
2565		− if (!is_nixlf_attached(rvu, pcifunc))
	2589	+ if (!is_pffunc_af(pcifunc) && !is_nixlf_attached(rvu, pcifunc))
2566	2590	return NPC_MCAM_ALLOC_DENIED;
2567	2591
2568	2592	return npc_mcam_alloc_entries(mcam, pcifunc, req, rsp);
@@ -2582,7 +2606,7 @@ int rvu_mbox_handler_npc_mcam_free_entry(struct rvu *rvu, · 13 unmodified lines
2582	2606	return NPC_MCAM_INVALID_REQ;
2583	2607
2584	2608	/* Free request from PFFUNC with no NIXLF attached, ignore */
2585		− if (!is_nixlf_attached(rvu, pcifunc))
	2609	+ if (!is_pffunc_af(pcifunc) && !is_nixlf_attached(rvu, pcifunc))
2586	2610	return NPC_MCAM_INVALID_REQ;
2587	2611
2588	2612	mutex_lock(&mcam->lock);
@@ -2594,7 +2618,7 @@ int rvu_mbox_handler_npc_mcam_free_entry(struct rvu *rvu, · 5 unmodified lines
2594	2618	if (rc)
2595	2619	goto exit;
2596	2620
2597		− mcam->entry2pfvf_map[req->entry] = 0;
	2621	+ mcam->entry2pfvf_map[req->entry] = NPC_MCAM_INVALID_MAP;
2598	2622	mcam->entry2target_pffunc[req->entry] = 0x0;
2599	2623	npc_mcam_clear_bit(mcam, req->entry);
2600	2624	npc_enable_mcam_entry(rvu, mcam, blkaddr, req->entry, false);
@@ -2679,13 +2703,14 @@ int rvu_mbox_handler_npc_mcam_write_entry(struct rvu *rvu, · 78 unmodified lines
2679	2703	else
2680	2704	nix_intf = pfvf->nix_rx_intf;
2681	2705
2682		− if (npc_mcam_verify_channel(rvu, pcifunc, req->intf, channel)) {
	2706	+ if (!is_pffunc_af(pcifunc) &&
	2707	+ npc_mcam_verify_channel(rvu, pcifunc, req->intf, channel)) {
2683	2708	rc = NPC_MCAM_INVALID_REQ;
2684	2709	goto exit;
2685	2710	}
2686	2711
2687		− if (npc_mcam_verify_pf_func(rvu, &req->entry_data, req->intf,
2688		− pcifunc)) {
	2712	+ if (!is_pffunc_af(pcifunc) &&
	2713	+ npc_mcam_verify_pf_func(rvu, &req->entry_data, req->intf, pcifunc)) {
2689	2714	rc = NPC_MCAM_INVALID_REQ;
2690	2715	goto exit;
2691	2716	}
@@ -2836,7 +2861,7 @@ int rvu_mbox_handler_npc_mcam_alloc_counter(struct rvu *rvu, · 144 unmodified lines
2836	2861	return NPC_MCAM_INVALID_REQ;
2837	2862
2838	2863	/* If the request is from a PFFUNC with no NIXLF attached, ignore */
2839		− if (!is_nixlf_attached(rvu, pcifunc))
	2864	+ if (!is_pffunc_af(pcifunc) && !is_nixlf_attached(rvu, pcifunc))
2840	2865	return NPC_MCAM_INVALID_REQ;
2841	2866
2842	2867	/* Since list of allocated counter IDs needs to be sent to requester,
@@ -3081,7 +3106,7 @@ int rvu_mbox_handler_npc_mcam_alloc_and_write_entry(struct rvu *rvu, · 238 unmodified lines
3081	3106	if (rc) {
3082	3107	/* Free allocated MCAM entry */
3083	3108	mutex_lock(&mcam->lock);
3084		− mcam->entry2pfvf_map[entry] = 0;
	3109	+ mcam->entry2pfvf_map[entry] = NPC_MCAM_INVALID_MAP;
3085	3110	npc_mcam_clear_bit(mcam, entry);
3086	3111	mutex_unlock(&mcam->lock);
3087	3112	return rc;

drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c+21−8

@@ -910,14 +910,17 @@ static void rvu_mcam_add_counter_to_rule(struct rvu *rvu, u16 pcifunc, · 909 unmodified lines
910	910
911	911	static void npc_update_rx_entry(struct rvu rvu, struct rvu_pfvf pfvf,
912	912	struct mcam_entry *entry,
913		− struct npc_install_flow_req *req, u16 target)
	913	+ struct npc_install_flow_req *req,
	914	+ u16 target, bool pf_set_vfs_mac)
914	915	{
	916	+ struct rvu_switch *rswitch = &rvu->rswitch;
915	917	struct nix_rx_action action;
916		− u64 chan_mask;
917	918
918		− chan_mask = req->chan_mask ? req->chan_mask : ~0ULL;
919		− npc_update_entry(rvu, NPC_CHAN, entry, req->channel, 0, chan_mask, 0,
920		− NIX_INTF_RX);
	919	+ if (rswitch->mode == DEVLINK_ESWITCH_MODE_SWITCHDEV && pf_set_vfs_mac)
	920	+ req->chan_mask = 0x0; /* Do not care channel */
	921	+
	922	+ npc_update_entry(rvu, NPC_CHAN, entry, req->channel, 0, req->chan_mask,
	923	+ 0, NIX_INTF_RX);
921	924
922	925	(u64 )&action = 0x00;
923	926	action.pf_func = target;
@@ -949,9 +952,16 @@ static void npc_update_tx_entry(struct rvu rvu, struct rvu_pfvf pfvf, · 25 unmodified lines
949	952	struct npc_install_flow_req *req, u16 target)
950	953	{
951	954	struct nix_tx_action action;
	955	+ u64 mask = ~0ULL;
	956	+
	957	+ /* If AF is installing then do not care about
	958	+ * PF_FUNC in Send Descriptor
	959	+ */
	960	+ if (is_pffunc_af(req->hdr.pcifunc))
	961	+ mask = 0;
952	962
953	963	npc_update_entry(rvu, NPC_PF_FUNC, entry, (__force u16)htons(target),
954		− 0, ~0ULL, 0, NIX_INTF_TX);
	964	+ 0, mask, 0, NIX_INTF_TX);
955	965
956	966	(u64 )&action = 0x00;
957	967	action.op = req->op;
@@ -1002,7 +1012,7 @@ static int npc_install_flow(struct rvu *rvu, int blkaddr, u16 target, · 44 unmodified lines
1002	1012	req->intf);
1003	1013
1004	1014	if (is_npc_intf_rx(req->intf))
1005		− npc_update_rx_entry(rvu, pfvf, entry, req, target);
	1015	+ npc_update_rx_entry(rvu, pfvf, entry, req, target, pf_set_vfs_mac);
1006	1016	else
1007	1017	npc_update_tx_entry(rvu, pfvf, entry, req, target);
1008	1018
@@ -1164,7 +1174,9 @@ int rvu_mbox_handler_npc_install_flow(struct rvu *rvu, · 155 unmodified lines
1164	1174	if (err)
1165	1175	return err;
1166	1176
1167		− if (npc_mcam_verify_channel(rvu, target, req->intf, req->channel))
	1177	+ /* Skip channel validation if AF is installing */
	1178	+ if (!is_pffunc_af(req->hdr.pcifunc) &&
	1179	+ npc_mcam_verify_channel(rvu, target, req->intf, req->channel))
1168	1180	return -EINVAL;
1169	1181
1170	1182	pfvf = rvu_get_pfvf(rvu, target);
@@ -1180,6 +1192,7 @@ int rvu_mbox_handler_npc_install_flow(struct rvu *rvu, · 9 unmodified lines
1180	1192	eth_broadcast_addr((u8 *)&req->mask.dmac);
1181	1193	}
1182	1194
	1195	+ /* Proceed if NIXLF is attached or not for TX rules */
1183	1196	err = nix_get_nixlf(rvu, target, &nixlf, NULL);
1184	1197	if (err && is_npc_intf_rx(req->intf) && !pf_set_vfs_mac)
1185	1198	return -EINVAL;

drivers/net/ethernet/marvell/octeontx2/af/rvu_switch.c+258−0

@@ -0,0 +1,258 @@
	1	+// SPDX-License-Identifier: GPL-2.0
	2	+/* Marvell OcteonTx2 RVU Admin Function driver
	3	+ *
	4	+ * Copyright (C) 2021 Marvell.
	5	+ */
	6	+
	7	+#include <linux/bitfield.h>
	8	+#include "rvu.h"
	9	+
	10	+static int rvu_switch_install_rx_rule(struct rvu *rvu, u16 pcifunc,
	11	+ u16 chan_mask)
	12	+{
	13	+ struct npc_install_flow_req req = { 0 };
	14	+ struct npc_install_flow_rsp rsp = { 0 };
	15	+ struct rvu_pfvf *pfvf;
	16	+
	17	+ pfvf = rvu_get_pfvf(rvu, pcifunc);
	18	+ /* If the pcifunc is not initialized then nothing to do.
	19	+ * This same function will be called again via rvu_switch_update_rules
	20	+ * after pcifunc is initialized.
	21	+ */
	22	+ if (!test_bit(NIXLF_INITIALIZED, &pfvf->flags))
	23	+ return 0;
	24	+
	25	+ ether_addr_copy(req.packet.dmac, pfvf->mac_addr);
	26	+ eth_broadcast_addr((u8 *)&req.mask.dmac);
	27	+ req.hdr.pcifunc = 0; /* AF is requester */
	28	+ req.vf = pcifunc;
	29	+ req.features = BIT_ULL(NPC_DMAC);
	30	+ req.channel = pfvf->rx_chan_base;
	31	+ req.chan_mask = chan_mask;
	32	+ req.intf = pfvf->nix_rx_intf;
	33	+ req.op = NIX_RX_ACTION_DEFAULT;
	34	+ req.default_rule = 1;
	35	+
	36	+ return rvu_mbox_handler_npc_install_flow(rvu, &req, &rsp);
	37	+}
	38	+
	39	+static int rvu_switch_install_tx_rule(struct rvu *rvu, u16 pcifunc, u16 entry)
	40	+{
	41	+ struct npc_install_flow_req req = { 0 };
	42	+ struct npc_install_flow_rsp rsp = { 0 };
	43	+ struct rvu_pfvf *pfvf;
	44	+ u8 lbkid;
	45	+
	46	+ pfvf = rvu_get_pfvf(rvu, pcifunc);
	47	+ /* If the pcifunc is not initialized then nothing to do.
	48	+ * This same function will be called again via rvu_switch_update_rules
	49	+ * after pcifunc is initialized.
	50	+ */
	51	+ if (!test_bit(NIXLF_INITIALIZED, &pfvf->flags))
	52	+ return 0;
	53	+
	54	+ lbkid = pfvf->nix_blkaddr == BLKADDR_NIX0 ? 0 : 1;
	55	+ ether_addr_copy(req.packet.dmac, pfvf->mac_addr);
	56	+ eth_broadcast_addr((u8 *)&req.mask.dmac);
	57	+ req.hdr.pcifunc = 0; /* AF is requester */
	58	+ req.vf = pcifunc;
	59	+ req.entry = entry;
	60	+ req.features = BIT_ULL(NPC_DMAC);
	61	+ req.intf = pfvf->nix_tx_intf;
	62	+ req.op = NIX_TX_ACTIONOP_UCAST_CHAN;
	63	+ req.index = (lbkid << 8) \| RVU_SWITCH_LBK_CHAN;
	64	+ req.set_cntr = 1;
	65	+
	66	+ return rvu_mbox_handler_npc_install_flow(rvu, &req, &rsp);
	67	+}
	68	+
	69	+static int rvu_switch_install_rules(struct rvu *rvu)
	70	+{
	71	+ struct rvu_switch *rswitch = &rvu->rswitch;
	72	+ u16 start = rswitch->start_entry;
	73	+ struct rvu_hwinfo *hw = rvu->hw;
	74	+ int pf, vf, numvfs, hwvf;
	75	+ u16 pcifunc, entry = 0;
	76	+ int err;
	77	+
	78	+ for (pf = 1; pf < hw->total_pfs; pf++) {
	79	+ if (!is_pf_cgxmapped(rvu, pf))
	80	+ continue;
	81	+
	82	+ pcifunc = pf << 10;
	83	+ /* rvu_get_nix_blkaddr sets up the corresponding NIX block
	84	+ * address and NIX RX and TX interfaces for a pcifunc.
	85	+ * Generally it is called during attach call of a pcifunc but it
	86	+ * is called here since we are pre-installing rules before
	87	+ * nixlfs are attached
	88	+ */
	89	+ rvu_get_nix_blkaddr(rvu, pcifunc);
	90	+
	91	+ /* MCAM RX rule for a PF/VF already exists as default unicast
	92	+ * rules installed by AF. Hence change the channel in those
	93	+ * rules to ignore channel so that packets with the required
	94	+ * DMAC received from LBK(by other PF/VFs in system) or from
	95	+ * external world (from wire) are accepted.
	96	+ */
	97	+ err = rvu_switch_install_rx_rule(rvu, pcifunc, 0x0);
	98	+ if (err) {
	99	+ dev_err(rvu->dev, "RX rule for PF%d failed(%d)\n",
	100	+ pf, err);
	101	+ return err;
	102	+ }
	103	+
	104	+ err = rvu_switch_install_tx_rule(rvu, pcifunc, start + entry);
	105	+ if (err) {
	106	+ dev_err(rvu->dev, "TX rule for PF%d failed(%d)\n",
	107	+ pf, err);
	108	+ return err;
	109	+ }
	110	+
	111	+ rswitch->entry2pcifunc[entry++] = pcifunc;
	112	+
	113	+ rvu_get_pf_numvfs(rvu, pf, &numvfs, &hwvf);
	114	+ for (vf = 0; vf < numvfs; vf++, hwvf++) {
	115	+ pcifunc = pf << 10 \| ((vf + 1) & 0x3FF);
	116	+ rvu_get_nix_blkaddr(rvu, pcifunc);
	117	+
	118	+ err = rvu_switch_install_rx_rule(rvu, pcifunc, 0x0);
	119	+ if (err) {
	120	+ dev_err(rvu->dev,
	121	+ "RX rule for PF%dVF%d failed(%d)\n",
	122	+ pf, vf, err);
	123	+ return err;
	124	+ }
	125	+
	126	+ err = rvu_switch_install_tx_rule(rvu, pcifunc,
	127	+ start + entry);
	128	+ if (err) {
	129	+ dev_err(rvu->dev,
	130	+ "TX rule for PF%dVF%d failed(%d)\n",
	131	+ pf, vf, err);
	132	+ return err;
	133	+ }
	134	+
	135	+ rswitch->entry2pcifunc[entry++] = pcifunc;
	136	+ }
	137	+ }
	138	+
	139	+ return 0;
	140	+}
	141	+
	142	+void rvu_switch_enable(struct rvu *rvu)
	143	+{
	144	+ struct npc_mcam_alloc_entry_req alloc_req = { 0 };
	145	+ struct npc_mcam_alloc_entry_rsp alloc_rsp = { 0 };
	146	+ struct npc_delete_flow_req uninstall_req = { 0 };
	147	+ struct npc_mcam_free_entry_req free_req = { 0 };
	148	+ struct rvu_switch *rswitch = &rvu->rswitch;
	149	+ struct msg_rsp rsp;
	150	+ int ret;
	151	+
	152	+ alloc_req.contig = true;
	153	+ alloc_req.count = rvu->cgx_mapped_pfs + rvu->cgx_mapped_vfs;
	154	+ ret = rvu_mbox_handler_npc_mcam_alloc_entry(rvu, &alloc_req,
	155	+ &alloc_rsp);
	156	+ if (ret) {
	157	+ dev_err(rvu->dev,
	158	+ "Unable to allocate MCAM entries\n");
	159	+ goto exit;
	160	+ }
	161	+
	162	+ if (alloc_rsp.count != alloc_req.count) {
	163	+ dev_err(rvu->dev,
	164	+ "Unable to allocate %d MCAM entries, got %d\n",
	165	+ alloc_req.count, alloc_rsp.count);
	166	+ goto free_entries;
	167	+ }
	168	+
	169	+ rswitch->entry2pcifunc = kcalloc(alloc_req.count, sizeof(u16),
	170	+ GFP_KERNEL);
	171	+ if (!rswitch->entry2pcifunc)
	172	+ goto free_entries;
	173	+
	174	+ rswitch->used_entries = alloc_rsp.count;
	175	+ rswitch->start_entry = alloc_rsp.entry;
	176	+
	177	+ ret = rvu_switch_install_rules(rvu);
	178	+ if (ret)
	179	+ goto uninstall_rules;
	180	+
	181	+ return;
	182	+
	183	+uninstall_rules:
	184	+ uninstall_req.start = rswitch->start_entry;
	185	+ uninstall_req.end = rswitch->start_entry + rswitch->used_entries - 1;
	186	+ rvu_mbox_handler_npc_delete_flow(rvu, &uninstall_req, &rsp);
	187	+ kfree(rswitch->entry2pcifunc);
	188	+free_entries:
	189	+ free_req.all = 1;
	190	+ rvu_mbox_handler_npc_mcam_free_entry(rvu, &free_req, &rsp);
	191	+exit:
	192	+ return;
	193	+}
	194	+
	195	+void rvu_switch_disable(struct rvu *rvu)
	196	+{
	197	+ struct npc_delete_flow_req uninstall_req = { 0 };
	198	+ struct npc_mcam_free_entry_req free_req = { 0 };
	199	+ struct rvu_switch *rswitch = &rvu->rswitch;
	200	+ struct rvu_hwinfo *hw = rvu->hw;
	201	+ int pf, vf, numvfs, hwvf;
	202	+ struct msg_rsp rsp;
	203	+ u16 pcifunc;
	204	+ int err;
	205	+
	206	+ if (!rswitch->used_entries)
	207	+ return;
	208	+
	209	+ for (pf = 1; pf < hw->total_pfs; pf++) {
	210	+ if (!is_pf_cgxmapped(rvu, pf))
	211	+ continue;
	212	+
	213	+ pcifunc = pf << 10;
	214	+ err = rvu_switch_install_rx_rule(rvu, pcifunc, 0xFFF);
	215	+ if (err)
	216	+ dev_err(rvu->dev,
	217	+ "Reverting RX rule for PF%d failed(%d)\n",
	218	+ pf, err);
	219	+
	220	+ for (vf = 0; vf < numvfs; vf++, hwvf++) {
	221	+ pcifunc = pf << 10 \| ((vf + 1) & 0x3FF);
	222	+ err = rvu_switch_install_rx_rule(rvu, pcifunc, 0xFFF);
	223	+ if (err)
	224	+ dev_err(rvu->dev,
	225	+ "Reverting RX rule for PF%dVF%d failed(%d)\n",
	226	+ pf, vf, err);
	227	+ }
	228	+ }
	229	+
	230	+ uninstall_req.start = rswitch->start_entry;
	231	+ uninstall_req.end = rswitch->start_entry + rswitch->used_entries - 1;
	232	+ free_req.all = 1;
	233	+ rvu_mbox_handler_npc_delete_flow(rvu, &uninstall_req, &rsp);
	234	+ rvu_mbox_handler_npc_mcam_free_entry(rvu, &free_req, &rsp);
	235	+ rswitch->used_entries = 0;
	236	+ kfree(rswitch->entry2pcifunc);
	237	+}
	238	+
	239	+void rvu_switch_update_rules(struct rvu *rvu, u16 pcifunc)
	240	+{
	241	+ struct rvu_switch *rswitch = &rvu->rswitch;
	242	+ u32 max = rswitch->used_entries;
	243	+ u16 entry;
	244	+
	245	+ if (!rswitch->used_entries)
	246	+ return;
	247	+
	248	+ for (entry = 0; entry < max; entry++) {
	249	+ if (rswitch->entry2pcifunc[entry] == pcifunc)
	250	+ break;
	251	+ }
	252	+
	253	+ if (entry >= max)
	254	+ return;
	255	+
	256	+ rvu_switch_install_tx_rule(rvu, pcifunc, rswitch->start_entry + entry);
	257	+ rvu_switch_install_rx_rule(rvu, pcifunc, 0x0);
	258	+}

drivers/net/ethernet/microchip/sparx5/Kconfig+1−0

@@ -3,6 +3,7 @@ config SPARX5_SWITCH · 2 unmodified lines
3	3	depends on NET_SWITCHDEV
4	4	depends on HAS_IOMEM
5	5	depends on OF
	6	+ depends on ARCH_SPARX5 \|\| COMPILE_TEST
6	7	select PHYLINK
7	8	select PHY_SPARX5_SERDES
8	9	select RESET_CONTROLLER

drivers/net/ethernet/netronome/nfp/flower/conntrack.c+1−0

@@ -1769,6 +1769,7 @@ int nfp_fl_ct_del_flow(struct nfp_fl_ct_map_entry *ct_map_ent) · 1768 unmodified lines
1769	1769	nfp_ct_map_params);
1770	1770	nfp_fl_ct_clean_flow_entry(ct_map_ent->ct_entry);
1771	1771	kfree(ct_map_ent);
	1772	+ break;
1772	1773	default:
1773	1774	break;
1774	1775	}

drivers/net/ethernet/realtek/r8169_main.c+2−1

@@ -5084,7 +5084,8 @@ static int r8169_mdio_register(struct rtl8169_private *tp) · 5083 unmodified lines
5084	5084	new_bus->priv = tp;
5085	5085	new_bus->parent = &pdev->dev;
5086	5086	new_bus->irq[0] = PHY_MAC_INTERRUPT;
5087		− snprintf(new_bus->id, MII_BUS_ID_SIZE, "r8169-%x", pci_dev_id(pdev));
	5087	+ snprintf(new_bus->id, MII_BUS_ID_SIZE, "r8169-%x-%x",
	5088	+ pci_domain_nr(pdev->bus), pci_dev_id(pdev));
5088	5089
5089	5090	new_bus->read = r8169_mdio_read_reg;
5090	5091	new_bus->write = r8169_mdio_write_reg;

drivers/net/ethernet/renesas/ravb.h+1−1

@@ -864,7 +864,7 @@ enum GECMR_BIT { · 863 unmodified lines
864	864
865	865	/* The Ethernet AVB descriptor definitions. */
866	866	struct ravb_desc {
867		− __le16 ds; /* Descriptor size */
	867	+ __le16 ds; /* Descriptor size */
868	868	u8 cc; /* Content control MSBs (reserved) */
869	869	u8 die_dt; /* Descriptor interrupt enable and type */
870	870	__le32 dptr; /* Descriptor pointer */

drivers/net/ethernet/renesas/ravb_main.c+1−1

@@ -920,7 +920,7 @@ static int ravb_poll(struct napi_struct *napi, int budget) · 919 unmodified lines
920	920	if (ravb_rx(ndev, &quota, q))
921	921	goto out;
922	922
923		− /* Processing RX Descriptor Ring */
	923	+ /* Processing TX Descriptor Ring */
924	924	spin_lock_irqsave(&priv->lock, flags);
925	925	/* Clear TX interrupt */
926	926	ravb_write(ndev, ~(mask \| TIS_RESERVED), TIS);

drivers/net/ethernet/xscale/ptp_ixp46x.c+2−0

@@ -14,6 +14,8 @@ · 13 unmodified lines
14	14	#include <linux/kernel.h>
15	15	#include <linux/ptp_clock_kernel.h>
16	16	#include <linux/soc/ixp4xx/cpu.h>
	17	+#include <linux/module.h>
	18	+#include <mach/ixp4xx-regs.h>
17	19
18	20	#include "ixp46x_ts.h"
19	21

drivers/net/usb/r8152.c+20−10

@@ -1552,7 +1552,8 @@ static int · 1551 unmodified lines
1552	1552	rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u32 speed, u8 duplex,
1553	1553	u32 advertising);
1554	1554
1555		−static int rtl8152_set_mac_address(struct net_device netdev, void p)
	1555	+static int __rtl8152_set_mac_address(struct net_device netdev, void p,
	1556	+ bool in_resume)
1556	1557	{
1557	1558	struct r8152 *tp = netdev_priv(netdev);
1558	1559	struct sockaddr *addr = p;
@@ -1561,9 +1562,11 @@ static int rtl8152_set_mac_address(struct net_device netdev, void p) · 2 unmodified lines
1561	1562	if (!is_valid_ether_addr(addr->sa_data))
1562	1563	goto out1;
1563	1564
1564		− ret = usb_autopm_get_interface(tp->intf);
1565		− if (ret < 0)
1566		− goto out1;
	1565	+ if (!in_resume) {
	1566	+ ret = usb_autopm_get_interface(tp->intf);
	1567	+ if (ret < 0)
	1568	+ goto out1;
	1569	+ }
1567	1570
1568	1571	mutex_lock(&tp->control);
1569	1572
@@ -1575,11 +1578,17 @@ static int rtl8152_set_mac_address(struct net_device netdev, void p) · 5 unmodified lines
1575	1578
1576	1579	mutex_unlock(&tp->control);
1577	1580
1578		− usb_autopm_put_interface(tp->intf);
	1581	+ if (!in_resume)
	1582	+ usb_autopm_put_interface(tp->intf);
1579	1583	out1:
1580	1584	return ret;
1581	1585	}
1582	1586
	1587	+static int rtl8152_set_mac_address(struct net_device netdev, void p)
	1588	+{
	1589	+ return __rtl8152_set_mac_address(netdev, p, false);
	1590	+}
	1591	+
1583	1592	/* Devices containing proper chips can support a persistent
1584	1593	* host system provided MAC address.
1585	1594	* Examples of this are Dell TB15 and Dell WD15 docks
@@ -1698,7 +1707,7 @@ static int determine_ethernet_addr(struct r8152 tp, struct sockaddr sa) · 112 unmodified lines
1698	1707	return ret;
1699	1708	}
1700	1709
1701		−static int set_ethernet_addr(struct r8152 *tp)
	1710	+static int set_ethernet_addr(struct r8152 *tp, bool in_resume)
1702	1711	{
1703	1712	struct net_device *dev = tp->netdev;
1704	1713	struct sockaddr sa;
@@ -1711,7 +1720,7 @@ static int set_ethernet_addr(struct r8152 *tp) · 6 unmodified lines
1711	1720	if (tp->version == RTL_VER_01)
1712	1721	ether_addr_copy(dev->dev_addr, sa.sa_data);
1713	1722	else
1714		− ret = rtl8152_set_mac_address(dev, &sa);
	1723	+ ret = __rtl8152_set_mac_address(dev, &sa, in_resume);
1715	1724
1716	1725	return ret;
1717	1726	}
@@ -6763,9 +6772,10 @@ static int rtl8152_close(struct net_device *netdev) · 5045 unmodified lines
6763	6772	tp->rtl_ops.down(tp);
6764	6773
6765	6774	mutex_unlock(&tp->control);
	6775	+ }
6766	6776
	6777	+ if (!res)
6767	6778	usb_autopm_put_interface(tp->intf);
6768		− }
6769	6779
6770	6780	free_all_mem(tp);
6771	6781
@@ -8443,7 +8453,7 @@ static int rtl8152_reset_resume(struct usb_interface *intf) · 1671 unmodified lines
8443	8453	clear_bit(SELECTIVE_SUSPEND, &tp->flags);
8444	8454	tp->rtl_ops.init(tp);
8445	8455	queue_delayed_work(system_long_wq, &tp->hw_phy_work, 0);
8446		− set_ethernet_addr(tp);
	8456	+ set_ethernet_addr(tp, true);
8447	8457	return rtl8152_resume(intf);
8448	8458	}
8449	8459
@@ -9644,7 +9654,7 @@ static int rtl8152_probe(struct usb_interface *intf, · 1194 unmodified lines
9644	9654	tp->rtl_fw.retry = true;
9645	9655	#endif
9646	9656	queue_delayed_work(system_long_wq, &tp->hw_phy_work, 0);
9647		− set_ethernet_addr(tp);
	9657	+ set_ethernet_addr(tp, false);
9648	9658
9649	9659	usb_set_intfdata(intf, tp);
9650	9660

drivers/net/wireless/mediatek/mt76/mt7921/main.c+1−0

@@ -389,6 +389,7 @@ static int mt7921_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, · 388 unmodified lines
389	389	case WLAN_CIPHER_SUITE_WEP104:
390	390	if (!mvif->wep_sta)
391	391	return -EOPNOTSUPP;
	392	+ break;
392	393	case WLAN_CIPHER_SUITE_TKIP:
393	394	case WLAN_CIPHER_SUITE_CCMP:
394	395	case WLAN_CIPHER_SUITE_CCMP_256:

drivers/nvme/host/pci.c+58−9

@@ -1554,6 +1554,28 @@ static void nvme_init_queue(struct nvme_queue *nvmeq, u16 qid) · 1553 unmodified lines
1554	1554	wmb(); /* ensure the first interrupt sees the initialization */
1555	1555	}
1556	1556
	1557	+/*
	1558	+ * Try getting shutdown_lock while setting up IO queues.
	1559	+ */
	1560	+static int nvme_setup_io_queues_trylock(struct nvme_dev *dev)
	1561	+{
	1562	+ /*
	1563	+ * Give up if the lock is being held by nvme_dev_disable.
	1564	+ */
	1565	+ if (!mutex_trylock(&dev->shutdown_lock))
	1566	+ return -ENODEV;
	1567	+
	1568	+ /*
	1569	+ * Controller is in wrong state, fail early.
	1570	+ */
	1571	+ if (dev->ctrl.state != NVME_CTRL_CONNECTING) {
	1572	+ mutex_unlock(&dev->shutdown_lock);
	1573	+ return -ENODEV;
	1574	+ }
	1575	+
	1576	+ return 0;
	1577	+}
	1578	+
1557	1579	static int nvme_create_queue(struct nvme_queue *nvmeq, int qid, bool polled)
1558	1580	{
1559	1581	struct nvme_dev *dev = nvmeq->dev;
@@ -1582,8 +1604,11 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid, bool polled) · 22 unmodified lines
1582	1604	goto release_cq;
1583	1605
1584	1606	nvmeq->cq_vector = vector;
1585		− nvme_init_queue(nvmeq, qid);
1586	1607
	1608	+ result = nvme_setup_io_queues_trylock(dev);
	1609	+ if (result)
	1610	+ return result;
	1611	+ nvme_init_queue(nvmeq, qid);
1587	1612	if (!polled) {
1588	1613	result = queue_request_irq(nvmeq);
1589	1614	if (result < 0)
@@ -1591,10 +1616,12 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid, bool polled) · 1 unmodified line
1591	1616	}
1592	1617
1593	1618	set_bit(NVMEQ_ENABLED, &nvmeq->flags);
	1619	+ mutex_unlock(&dev->shutdown_lock);
1594	1620	return result;
1595	1621
1596	1622	release_sq:
1597	1623	dev->online_queues--;
	1624	+ mutex_unlock(&dev->shutdown_lock);
1598	1625	adapter_delete_sq(dev, qid);
1599	1626	release_cq:
1600	1627	adapter_delete_cq(dev, qid);
@@ -2167,7 +2194,18 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) · 566 unmodified lines
2167	2194	if (nr_io_queues == 0)
2168	2195	return 0;
2169	2196
2170		− clear_bit(NVMEQ_ENABLED, &adminq->flags);
	2197	+ /*
	2198	+ * Free IRQ resources as soon as NVMEQ_ENABLED bit transitions
	2199	+ * from set to unset. If there is a window to it is truely freed,
	2200	+ * pci_free_irq_vectors() jumping into this window will crash.
	2201	+ * And take lock to avoid racing with pci_free_irq_vectors() in
	2202	+ * nvme_dev_disable() path.
	2203	+ */
	2204	+ result = nvme_setup_io_queues_trylock(dev);
	2205	+ if (result)
	2206	+ return result;
	2207	+ if (test_and_clear_bit(NVMEQ_ENABLED, &adminq->flags))
	2208	+ pci_free_irq(pdev, 0, adminq);
2171	2209
2172	2210	if (dev->cmb_use_sqes) {
2173	2211	result = nvme_cmb_qdepth(dev, nr_io_queues,
@@ -2183,14 +2221,17 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) · 9 unmodified lines
2183	2221	result = nvme_remap_bar(dev, size);
2184	2222	if (!result)
2185	2223	break;
2186		− if (!--nr_io_queues)
2187		− return -ENOMEM;
	2224	+ if (!--nr_io_queues) {
	2225	+ result = -ENOMEM;
	2226	+ goto out_unlock;
	2227	+ }
2188	2228	} while (1);
2189	2229	adminq->q_db = dev->dbs;
2190	2230
2191	2231	retry:
2192	2232	/* Deregister the admin queue's interrupt */
2193		− pci_free_irq(pdev, 0, adminq);
	2233	+ if (test_and_clear_bit(NVMEQ_ENABLED, &adminq->flags))
	2234	+ pci_free_irq(pdev, 0, adminq);
2194	2235
2195	2236	/*
2196	2237	* If we enable msix early due to not intx, disable it again before
@@ -2199,8 +2240,10 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) · 2 unmodified lines
2199	2240	pci_free_irq_vectors(pdev);
2200	2241
2201	2242	result = nvme_setup_irqs(dev, nr_io_queues);
2202		− if (result <= 0)
2203		− return -EIO;
	2243	+ if (result <= 0) {
	2244	+ result = -EIO;
	2245	+ goto out_unlock;
	2246	+ }
2204	2247
2205	2248	dev->num_vecs = result;
2206	2249	result = max(result - 1, 1);
@@ -2214,8 +2257,9 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) · 7 unmodified lines
2214	2257	*/
2215	2258	result = queue_request_irq(adminq);
2216	2259	if (result)
2217		− return result;
	2260	+ goto out_unlock;
2218	2261	set_bit(NVMEQ_ENABLED, &adminq->flags);
	2262	+ mutex_unlock(&dev->shutdown_lock);
2219	2263
2220	2264	result = nvme_create_io_queues(dev);
2221	2265	if (result \|\| dev->online_queues < 2)
@@ -2224,6 +2268,9 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) · 2 unmodified lines
2224	2268	if (dev->online_queues - 1 < dev->max_qid) {
2225	2269	nr_io_queues = dev->online_queues - 1;
2226	2270	nvme_disable_io_queues(dev);
	2271	+ result = nvme_setup_io_queues_trylock(dev);
	2272	+ if (result)
	2273	+ return result;
2227	2274	nvme_suspend_io_queues(dev);
2228	2275	goto retry;
2229	2276	}
@@ -2232,6 +2279,9 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) · 2 unmodified lines
2232	2279	dev->io_queues[HCTX_TYPE_READ],
2233	2280	dev->io_queues[HCTX_TYPE_POLL]);
2234	2281	return 0;
	2282	+out_unlock:
	2283	+ mutex_unlock(&dev->shutdown_lock);
	2284	+ return result;
2235	2285	}
2236	2286
2237	2287	static void nvme_del_queue_end(struct request *req, blk_status_t error)
@@ -2962,7 +3012,6 @@ static void nvme_remove(struct pci_dev *pdev) · 724 unmodified lines
2962	3012	if (!pci_device_is_present(pdev)) {
2963	3013	nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_DEAD);
2964	3014	nvme_dev_disable(dev, true);
2965		− nvme_dev_remove_admin(dev);
2966	3015	}
2967	3016
2968	3017	flush_work(&dev->ctrl.reset_work);

drivers/nvme/host/tcp.c+1−3

@@ -123,7 +123,6 @@ struct nvme_tcp_ctrl { · 122 unmodified lines
123	123	struct blk_mq_tag_set admin_tag_set;
124	124	struct sockaddr_storage addr;
125	125	struct sockaddr_storage src_addr;
126		− struct net_device *ndev;
127	126	struct nvme_ctrl ctrl;
128	127
129	128	struct work_struct err_work;
@@ -2533,8 +2532,7 @@ static struct nvme_ctrl nvme_tcp_create_ctrl(struct device dev, · 2403 unmodified lines
2533	2532	}
2534	2533
2535	2534	if (opts->mask & NVMF_OPT_HOST_IFACE) {
2536		− ctrl->ndev = dev_get_by_name(&init_net, opts->host_iface);
2537		− if (!ctrl->ndev) {
	2535	+ if (!__dev_get_by_name(&init_net, opts->host_iface)) {
2538	2536	pr_err("invalid interface passed: %s\n",
2539	2537	opts->host_iface);
2540	2538	ret = -ENODEV;

drivers/pci/proc.c+1−1

@@ -230,8 +230,8 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd, · 229 unmodified lines
230	230	break;
231	231	}
232	232	/* If arch decided it can't, fall through... */
233		−#endif /* HAVE_PCI_MMAP */
234	233	fallthrough;
	234	+#endif /* HAVE_PCI_MMAP */
235	235	default:
236	236	ret = -EINVAL;
237	237	break;

drivers/power/supply/ab8500_fg.c+2−0

@@ -1728,6 +1728,7 @@ static void ab8500_fg_algorithm_calibrate(struct ab8500_fg *di) · 1727 unmodified lines
1728	1728	break;
1729	1729	case AB8500_FG_CALIB_WAIT:
1730	1730	dev_dbg(di->dev, "Calibration WFI\n");
	1731	+ break;
1731	1732	default:
1732	1733	break;
1733	1734	}
@@ -2224,6 +2225,7 @@ static int ab8500_fg_get_ext_psy_data(struct device dev, void data) · 490 unmodified lines
2224	2225	queue_work(di->fg_wq, &di->fg_work);
2225	2226	break;
2226	2227	}
	2228	+ break;
2227	2229	default:
2228	2230	break;
2229	2231	}

drivers/power/supply/abx500_chargalg.c+1−0

@@ -1150,6 +1150,7 @@ static int abx500_chargalg_get_ext_psy_data(struct device dev, void data) · 1149 unmodified lines
1150	1150	default:
1151	1151	break;
1152	1152	}
	1153	+ break;
1153	1154	default:
1154	1155	break;
1155	1156	}

drivers/pwm/pwm-berlin.c+3−6

@@ -190,12 +190,9 @@ static int berlin_pwm_apply(struct pwm_chip chip, struct pwm_device pwm, · 189 unmodified lines
190	190	return 0;
191	191	}
192	192
193		− if (state->period != pwm->state.period \|\|
194		− state->duty_cycle != pwm->state.duty_cycle) {
195		− err = berlin_pwm_config(chip, pwm, state->duty_cycle, state->period);
196		− if (err)
197		− return err;
198		− }
	193	+ err = berlin_pwm_config(chip, pwm, state->duty_cycle, state->period);
	194	+ if (err)
	195	+ return err;
199	196
200	197	if (!enabled)
201	198	return berlin_pwm_enable(chip, pwm);

drivers/pwm/pwm-ep93xx.c+40−45

@@ -64,6 +64,11 @@ static int ep93xx_pwm_apply(struct pwm_chip chip, struct pwm_device pwm, · 63 unmodified lines
64	64	int ret;
65	65	struct ep93xx_pwm *ep93xx_pwm = to_ep93xx_pwm(chip);
66	66	bool enabled = state->enabled;
	67	+ void __iomem *base = ep93xx_pwm->base;
	68	+ unsigned long long c;
	69	+ unsigned long period_cycles;
	70	+ unsigned long duty_cycles;
	71	+ unsigned long term;
67	72
68	73	if (state->polarity != pwm->state.polarity) {
69	74	if (enabled) {
@@ -97,57 +102,47 @@ static int ep93xx_pwm_apply(struct pwm_chip chip, struct pwm_device pwm, · 27 unmodified lines
97	102	return 0;
98	103	}
99	104
100		− if (state->period != pwm->state.period \|\|
101		− state->duty_cycle != pwm->state.duty_cycle) {
102		− struct ep93xx_pwm *ep93xx_pwm = to_ep93xx_pwm(chip);
103		− void __iomem *base = ep93xx_pwm->base;
104		− unsigned long long c;
105		− unsigned long period_cycles;
106		− unsigned long duty_cycles;
107		− unsigned long term;
	105	+ /*
	106	+ * The clock needs to be enabled to access the PWM registers.
	107	+ * Configuration can be changed at any time.
	108	+ */
	109	+ if (!pwm_is_enabled(pwm)) {
	110	+ ret = clk_prepare_enable(ep93xx_pwm->clk);
	111	+ if (ret)
	112	+ return ret;
	113	+ }
108	114
109		− /*
110		− * The clock needs to be enabled to access the PWM registers.
111		− * Configuration can be changed at any time.
112		− */
113		− if (!pwm_is_enabled(pwm)) {
114		− ret = clk_prepare_enable(ep93xx_pwm->clk);
115		− if (ret)
116		− return ret;
117		− }
	115	+ c = clk_get_rate(ep93xx_pwm->clk);
	116	+ c *= state->period;
	117	+ do_div(c, 1000000000);
	118	+ period_cycles = c;
	119	+
	120	+ c = period_cycles;
	121	+ c *= state->duty_cycle;
	122	+ do_div(c, state->period);
	123	+ duty_cycles = c;
118	124
119		− c = clk_get_rate(ep93xx_pwm->clk);
120		− c *= state->period;
121		− do_div(c, 1000000000);
122		− period_cycles = c;
123		−
124		− c = period_cycles;
125		− c *= state->duty_cycle;
126		− do_div(c, state->period);
127		− duty_cycles = c;
128		−
129		− if (period_cycles < 0x10000 && duty_cycles < 0x10000) {
130		− term = readw(base + EP93XX_PWMx_TERM_COUNT);
131		−
132		− /* Order is important if PWM is running */
133		− if (period_cycles > term) {
134		− writew(period_cycles, base + EP93XX_PWMx_TERM_COUNT);
135		− writew(duty_cycles, base + EP93XX_PWMx_DUTY_CYCLE);
136		− } else {
137		− writew(duty_cycles, base + EP93XX_PWMx_DUTY_CYCLE);
138		− writew(period_cycles, base + EP93XX_PWMx_TERM_COUNT);
139		− }
140		− ret = 0;
	125	+ if (period_cycles < 0x10000 && duty_cycles < 0x10000) {
	126	+ term = readw(base + EP93XX_PWMx_TERM_COUNT);
	127	+
	128	+ /* Order is important if PWM is running */
	129	+ if (period_cycles > term) {
	130	+ writew(period_cycles, base + EP93XX_PWMx_TERM_COUNT);
	131	+ writew(duty_cycles, base + EP93XX_PWMx_DUTY_CYCLE);
141	132	} else {
142		− ret = -EINVAL;
	133	+ writew(duty_cycles, base + EP93XX_PWMx_DUTY_CYCLE);
	134	+ writew(period_cycles, base + EP93XX_PWMx_TERM_COUNT);
143	135	}
	136	+ ret = 0;
	137	+ } else {
	138	+ ret = -EINVAL;
	139	+ }
144	140
145		− if (!pwm_is_enabled(pwm))
146		− clk_disable_unprepare(ep93xx_pwm->clk);
	141	+ if (!pwm_is_enabled(pwm))
	142	+ clk_disable_unprepare(ep93xx_pwm->clk);
147	143
148		− if (ret)
149		− return ret;
150		− }
	144	+ if (ret)
	145	+ return ret;
151	146
152	147	if (!enabled) {
153	148	ret = clk_prepare_enable(ep93xx_pwm->clk);

drivers/pwm/pwm-spear.c+3−6

@@ -177,12 +177,9 @@ static int spear_pwm_apply(struct pwm_chip chip, struct pwm_device pwm, · 176 unmodified lines
177	177	return 0;
178	178	}
179	179
180		− if (state->period != pwm->state.period \|\|
181		− state->duty_cycle != pwm->state.duty_cycle) {
182		− err = spear_pwm_config(chip, pwm, state->duty_cycle, state->period);
183		− if (err)
184		− return err;
185		− }
	180	+ err = spear_pwm_config(chip, pwm, state->duty_cycle, state->period);
	181	+ if (err)
	182	+ return err;
186	183
187	184	if (!pwm->state.enabled)
188	185	return spear_pwm_enable(chip, pwm);

drivers/pwm/pwm-sprd.c+4−7

@@ -183,13 +183,10 @@ static int sprd_pwm_apply(struct pwm_chip chip, struct pwm_device pwm, · 182 unmodified lines
183	183	}
184	184	}
185	185
186		− if (state->period != cstate->period \|\|
187		− state->duty_cycle != cstate->duty_cycle) {
188		− ret = sprd_pwm_config(spc, pwm, state->duty_cycle,
189		− state->period);
190		− if (ret)
191		− return ret;
192		− }
	186	+ ret = sprd_pwm_config(spc, pwm, state->duty_cycle,
	187	+ state->period);
	188	+ if (ret)
	189	+ return ret;
193	190
194	191	sprd_pwm_write(spc, pwm->hwpwm, SPRD_PWM_ENABLE, 1);
195	192	} else if (cstate->enabled) {

drivers/pwm/pwm-tiecap.c+6−9

@@ -189,16 +189,13 @@ static int ecap_pwm_apply(struct pwm_chip chip, struct pwm_device pwm, · 188 unmodified lines
189	189	return 0;
190	190	}
191	191
192		− if (state->period != pwm->state.period \|\|
193		− state->duty_cycle != pwm->state.duty_cycle) {
194		− if (state->period > NSEC_PER_SEC)
195		− return -ERANGE;
	192	+ if (state->period > NSEC_PER_SEC)
	193	+ return -ERANGE;
196	194
197		− err = ecap_pwm_config(chip, pwm, state->duty_cycle,
198		− state->period, enabled);
199		− if (err)
200		− return err;
201		− }
	195	+ err = ecap_pwm_config(chip, pwm, state->duty_cycle,
	196	+ state->period, enabled);
	197	+ if (err)
	198	+ return err;
202	199
203	200	if (!enabled)
204	201	return ecap_pwm_enable(chip, pwm);

drivers/regulator/bd9576-regulator.c+2−2

@@ -294,9 +294,9 @@ static bool check_temp_flag_mismatch(struct regulator_dev *rdev, int severity, · 293 unmodified lines
294	294	struct bd957x_regulator_data *r)
295	295	{
296	296	if ((severity == REGULATOR_SEVERITY_ERR &&
297		− r->ovd_notif != REGULATOR_EVENT_OVER_TEMP) \|\|
	297	+ r->temp_notif != REGULATOR_EVENT_OVER_TEMP) \|\|
298	298	(severity == REGULATOR_SEVERITY_WARN &&
299		− r->ovd_notif != REGULATOR_EVENT_OVER_TEMP_WARN)) {
	299	+ r->temp_notif != REGULATOR_EVENT_OVER_TEMP_WARN)) {
300	300	dev_warn(rdev_get_dev(rdev),
301	301	"Can't support both thermal WARN and ERR\n");
302	302	if (severity == REGULATOR_SEVERITY_WARN)

drivers/regulator/hi6421-regulator.c+13−9

@@ -366,9 +366,8 @@ static struct hi6421_regulator_info · 365 unmodified lines
366	366
367	367	static int hi6421_regulator_enable(struct regulator_dev *rdev)
368	368	{
369		− struct hi6421_regulator_pdata *pdata;
	369	+ struct hi6421_regulator_pdata *pdata = rdev_get_drvdata(rdev);
370	370
371		− pdata = dev_get_drvdata(rdev->dev.parent);
372	371	/* hi6421 spec requires regulator enablement must be serialized:
373	372	* - Because when BUCK, LDO switching from off to on, it will have
374	373	* a huge instantaneous current; so you can not turn on two or
@@ -385,9 +384,10 @@ static int hi6421_regulator_enable(struct regulator_dev *rdev) · 10 unmodified lines
385	384
386	385	static unsigned int hi6421_regulator_ldo_get_mode(struct regulator_dev *rdev)
387	386	{
388		− struct hi6421_regulator_info *info = rdev_get_drvdata(rdev);
	387	+ struct hi6421_regulator_info *info;
389	388	unsigned int reg_val;
390	389
	390	+ info = container_of(rdev->desc, struct hi6421_regulator_info, desc);
391	391	regmap_read(rdev->regmap, rdev->desc->enable_reg, &reg_val);
392	392	if (reg_val & info->mode_mask)
393	393	return REGULATOR_MODE_IDLE;
@@ -397,9 +397,10 @@ static unsigned int hi6421_regulator_ldo_get_mode(struct regulator_dev *rdev) · 3 unmodified lines
397	397
398	398	static unsigned int hi6421_regulator_buck_get_mode(struct regulator_dev *rdev)
399	399	{
400		− struct hi6421_regulator_info *info = rdev_get_drvdata(rdev);
	400	+ struct hi6421_regulator_info *info;
401	401	unsigned int reg_val;
402	402
	403	+ info = container_of(rdev->desc, struct hi6421_regulator_info, desc);
403	404	regmap_read(rdev->regmap, rdev->desc->enable_reg, &reg_val);
404	405	if (reg_val & info->mode_mask)
405	406	return REGULATOR_MODE_STANDBY;
@@ -410,9 +411,10 @@ static unsigned int hi6421_regulator_buck_get_mode(struct regulator_dev *rdev) · 4 unmodified lines
410	411	static int hi6421_regulator_ldo_set_mode(struct regulator_dev *rdev,
411	412	unsigned int mode)
412	413	{
413		− struct hi6421_regulator_info *info = rdev_get_drvdata(rdev);
	414	+ struct hi6421_regulator_info *info;
414	415	unsigned int new_mode;
415	416
	417	+ info = container_of(rdev->desc, struct hi6421_regulator_info, desc);
416	418	switch (mode) {
417	419	case REGULATOR_MODE_NORMAL:
418	420	new_mode = 0;
@@ -434,9 +436,10 @@ static int hi6421_regulator_ldo_set_mode(struct regulator_dev *rdev, · 15 unmodified lines
434	436	static int hi6421_regulator_buck_set_mode(struct regulator_dev *rdev,
435	437	unsigned int mode)
436	438	{
437		− struct hi6421_regulator_info *info = rdev_get_drvdata(rdev);
	439	+ struct hi6421_regulator_info *info;
438	440	unsigned int new_mode;
439	441
	442	+ info = container_of(rdev->desc, struct hi6421_regulator_info, desc);
440	443	switch (mode) {
441	444	case REGULATOR_MODE_NORMAL:
442	445	new_mode = 0;
@@ -459,7 +462,9 @@ static unsigned int · 16 unmodified lines
459	462	hi6421_regulator_ldo_get_optimum_mode(struct regulator_dev *rdev,
460	463	int input_uV, int output_uV, int load_uA)
461	464	{
462		− struct hi6421_regulator_info *info = rdev_get_drvdata(rdev);
	465	+ struct hi6421_regulator_info *info;
	466	+
	467	+ info = container_of(rdev->desc, struct hi6421_regulator_info, desc);
463	468
464	469	if (load_uA > info->eco_microamp)
465	470	return REGULATOR_MODE_NORMAL;
@@ -543,14 +548,13 @@ static int hi6421_regulator_probe(struct platform_device *pdev) · 77 unmodified lines
543	548	if (!pdata)
544	549	return -ENOMEM;
545	550	mutex_init(&pdata->lock);
546		− platform_set_drvdata(pdev, pdata);
547	551
548	552	for (i = 0; i < ARRAY_SIZE(hi6421_regulator_info); i++) {
549	553	/* assign per-regulator data */
550	554	info = &hi6421_regulator_info[i];
551	555
552	556	config.dev = pdev->dev.parent;
553		− config.driver_data = info;
	557	+ config.driver_data = pdata;
554	558	config.regmap = pmic->regmap;
555	559
556	560	rdev = devm_regulator_register(&pdev->dev, &info->desc,

drivers/regulator/hi6421v600-regulator.c+9−7

@@ -98,10 +98,9 @@ static const unsigned int ldo34_voltages[] = { · 97 unmodified lines
98	98
99	99	static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev)
100	100	{
101		− struct hi6421_spmi_reg_priv *priv;
	101	+ struct hi6421_spmi_reg_priv *priv = rdev_get_drvdata(rdev);
102	102	int ret;
103	103
104		− priv = dev_get_drvdata(rdev->dev.parent);
105	104	/* cannot enable more than one regulator at one time */
106	105	mutex_lock(&priv->enable_mutex);
107	106
@@ -119,9 +118,10 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev) · 11 unmodified lines
119	118
120	119	static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev)
121	120	{
122		− struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
	121	+ struct hi6421_spmi_reg_info *sreg;
123	122	unsigned int reg_val;
124	123
	124	+ sreg = container_of(rdev->desc, struct hi6421_spmi_reg_info, desc);
125	125	regmap_read(rdev->regmap, rdev->desc->enable_reg, &reg_val);
126	126
127	127	if (reg_val & sreg->eco_mode_mask)
@@ -133,9 +133,10 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) · 5 unmodified lines
133	133	static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev,
134	134	unsigned int mode)
135	135	{
136		− struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
	136	+ struct hi6421_spmi_reg_info *sreg;
137	137	unsigned int val;
138	138
	139	+ sreg = container_of(rdev->desc, struct hi6421_spmi_reg_info, desc);
139	140	switch (mode) {
140	141	case REGULATOR_MODE_NORMAL:
141	142	val = 0;
@@ -159,7 +160,9 @@ hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev, · 17 unmodified lines
159	160	int input_uV, int output_uV,
160	161	int load_uA)
161	162	{
162		− struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
	163	+ struct hi6421_spmi_reg_info *sreg;
	164	+
	165	+ sreg = container_of(rdev->desc, struct hi6421_spmi_reg_info, desc);
163	166
164	167	if (!sreg->eco_uA \|\| ((unsigned int)load_uA > sreg->eco_uA))
165	168	return REGULATOR_MODE_NORMAL;
@@ -252,13 +255,12 @@ static int hi6421_spmi_regulator_probe(struct platform_device *pdev) · 86 unmodified lines
252	255	return -ENOMEM;
253	256
254	257	mutex_init(&priv->enable_mutex);
255		− platform_set_drvdata(pdev, priv);
256	258
257	259	for (i = 0; i < ARRAY_SIZE(regulator_info); i++) {
258	260	info = &regulator_info[i];
259	261
260	262	config.dev = pdev->dev.parent;
261		− config.driver_data = info;
	263	+ config.driver_data = priv;
262	264	config.regmap = pmic->regmap;
263	265
264	266	rdev = devm_regulator_register(dev, &info->desc, &config);

drivers/regulator/mtk-dvfsrc-regulator.c+1−2

@@ -179,8 +179,7 @@ static int dvfsrc_vcore_regulator_probe(struct platform_device *pdev) · 178 unmodified lines
179	179	for (i = 0; i < regulator_init_data->size; i++) {
180	180	config.dev = dev->parent;
181	181	config.driver_data = (mt_regulators + i);
182		− rdev = devm_regulator_register(dev->parent,
183		− &(mt_regulators + i)->desc,
	182	+ rdev = devm_regulator_register(dev, &(mt_regulators + i)->desc,
184	183	&config);
185	184	if (IS_ERR(rdev)) {
186	185	dev_err(dev, "failed to register %s\n",

drivers/regulator/rtmv20-regulator.c+1−1

@@ -37,7 +37,7 @@ · 36 unmodified lines
37	37	#define RTMV20_WIDTH2_MASK GENMASK(7, 0)
38	38	#define RTMV20_LBPLVL_MASK GENMASK(3, 0)
39	39	#define RTMV20_LBPEN_MASK BIT(7)
40		−#define RTMV20_STROBEPOL_MASK BIT(1)
	40	+#define RTMV20_STROBEPOL_MASK BIT(0)
41	41	#define RTMV20_VSYNPOL_MASK BIT(1)
42	42	#define RTMV20_FSINEN_MASK BIT(7)
43	43	#define RTMV20_ESEN_MASK BIT(6)

drivers/s390/char/tape_char.c+0−2

@@ -371,8 +371,6 @@ __tapechar_ioctl(struct tape_device *device, · 370 unmodified lines
371	371	case MTSEEK:
372	372	if (device->required_tapemarks)
373	373	tape_std_terminate_write(device);
374		− default:
375		− ;
376	374	}
377	375	rc = tape_mtop(device, op.mt_op, op.mt_count);
378	376

drivers/s390/net/ctcm_fsms.c+1−0

@@ -1454,6 +1454,7 @@ again: · 1453 unmodified lines
1454	1454	get_ccwdev_lock(ch->cdev), saveflags);
1455	1455	if (rc != 0)
1456	1456	ctcm_ccw_check_rc(ch, rc, "normal RX");
	1457	+ break;
1457	1458	default:
1458	1459	break;
1459	1460	}

drivers/s390/net/qeth_l3_main.c+1−0

@@ -434,6 +434,7 @@ static int qeth_l3_correct_routing_type(struct qeth_card *card, · 433 unmodified lines
434	434	if (qeth_is_ipafunc_supported(card, prot,
435	435	IPA_OSA_MC_ROUTER))
436	436	return 0;
	437	+ goto out_inval;
437	438	default:
438	439	goto out_inval;
439	440	}

drivers/s390/scsi/zfcp_sysfs.c+1−0

@@ -487,6 +487,7 @@ static ssize_t zfcp_sysfs_port_fc_security_show(struct device *dev, · 486 unmodified lines
487	487	if (0 == (status & ZFCP_STATUS_COMMON_OPEN) \|\|
488	488	0 == (status & ZFCP_STATUS_COMMON_UNBLOCKED) \|\|
489	489	0 == (status & ZFCP_STATUS_PORT_PHYS_OPEN) \|\|
	490	+ 0 != (status & ZFCP_STATUS_PORT_LINK_TEST) \|\|
490	491	0 != (status & ZFCP_STATUS_COMMON_ERP_FAILED) \|\|
491	492	0 != (status & ZFCP_STATUS_COMMON_ACCESS_BOXED))
492	493	i = sprintf(buf, "unknown\n");

drivers/scsi/arm/fas216.c+1−1

@@ -2010,7 +2010,7 @@ static void fas216_rq_sns_done(FAS216_Info info, struct scsi_cmnd SCpnt, · 2009 unmodified lines
2010	2010	"request sense complete, result=0x%04x%02x%02x",
2011	2011	result, SCpnt->SCp.Message, SCpnt->SCp.Status);
2012	2012
2013		− if (result != DID_OK \|\| SCpnt->SCp.Status != GOOD)
	2013	+ if (result != DID_OK \|\| SCpnt->SCp.Status != SAM_STAT_GOOD)
2014	2014	/*
2015	2015	* Something went wrong. Make sure that we don't
2016	2016	* have valid data in the sense buffer that could

drivers/scsi/hosts.c+1−0

@@ -488,6 +488,7 @@ struct Scsi_Host scsi_host_alloc(struct scsi_host_template sht, int privsize) · 487 unmodified lines
488	488	shost_printk(KERN_WARNING, shost,
489	489	"error handler thread failed to spawn, error = %ld\n",
490	490	PTR_ERR(shost->ehandler));
	491	+ shost->ehandler = NULL;
491	492	goto fail;
492	493	}
493	494

drivers/scsi/libsas/sas_discover.c+1−1

@@ -461,7 +461,7 @@ static void sas_discover_domain(struct work_struct *work) · 460 unmodified lines
461	461	break;
462	462	#else
463	463	pr_notice("ATA device seen but CONFIG_SCSI_SAS_ATA=N so cannot attach\n");
464		− /* Fall through */
	464	+ fallthrough;
465	465	#endif
466	466	/* Fall through - only for the #else condition above. */
467	467	default:

drivers/scsi/mpi3mr/mpi3mr_fw.c+7−8

@@ -2607,14 +2607,13 @@ static int mpi3mr_issue_iocinit(struct mpi3mr_ioc *mrioc) · 2606 unmodified lines
2607	2607	goto out;
2608	2608	}
2609	2609	drv_info->information_length = cpu_to_le32(data_len);
2610		− strncpy(drv_info->driver_signature, "Broadcom", sizeof(drv_info->driver_signature));
2611		− strncpy(drv_info->os_name, utsname()->sysname, sizeof(drv_info->os_name));
2612		− drv_info->os_name[sizeof(drv_info->os_name) - 1] = 0;
2613		− strncpy(drv_info->os_version, utsname()->release, sizeof(drv_info->os_version));
2614		− drv_info->os_version[sizeof(drv_info->os_version) - 1] = 0;
2615		− strncpy(drv_info->driver_name, MPI3MR_DRIVER_NAME, sizeof(drv_info->driver_name));
2616		− strncpy(drv_info->driver_version, MPI3MR_DRIVER_VERSION, sizeof(drv_info->driver_version));
2617		− strncpy(drv_info->driver_release_date, MPI3MR_DRIVER_RELDATE, sizeof(drv_info->driver_release_date));
	2610	+ strscpy(drv_info->driver_signature, "Broadcom", sizeof(drv_info->driver_signature));
	2611	+ strscpy(drv_info->os_name, utsname()->sysname, sizeof(drv_info->os_name));
	2612	+ strscpy(drv_info->os_version, utsname()->release, sizeof(drv_info->os_version));
	2613	+ strscpy(drv_info->driver_name, MPI3MR_DRIVER_NAME, sizeof(drv_info->driver_name));
	2614	+ strscpy(drv_info->driver_version, MPI3MR_DRIVER_VERSION, sizeof(drv_info->driver_version));
	2615	+ strscpy(drv_info->driver_release_date, MPI3MR_DRIVER_RELDATE,
	2616	+ sizeof(drv_info->driver_release_date));
2618	2617	drv_info->driver_capabilities = 0;
2619	2618	memcpy((u8 )&mrioc->driver_info, (u8 )drv_info,
2620	2619	sizeof(mrioc->driver_info));

drivers/scsi/pm8001/pm8001_ctl.c+26−22

@@ -77,7 +77,7 @@ DEVICE_ATTR(interface_rev, S_IRUGO, pm8001_ctl_mpi_interface_rev_show, NULL); · 76 unmodified lines
77	77	* @attr: device attribute (unused)
78	78	* @buf: the buffer returned
79	79	*
80		− * A sysfs 'read only' shost attribute.
	80	+ * A sysfs 'read-only' shost attribute.
81	81	*/
82	82	static ssize_t controller_fatal_error_show(struct device *cdev,
83	83	struct device_attribute attr, char buf)
@@ -149,7 +149,7 @@ static ssize_t pm8001_ctl_ila_version_show(struct device *cdev, · 65 unmodified lines
149	149	static DEVICE_ATTR(ila_version, 0444, pm8001_ctl_ila_version_show, NULL);
150	150
151	151	/**
152		− * pm8001_ctl_inactive_fw_version_show - Inacative firmware version number
	152	+ * pm8001_ctl_inactive_fw_version_show - Inactive firmware version number
153	153	* @cdev: pointer to embedded class device
154	154	* @attr: device attribute (unused)
155	155	* @buf: the buffer returned
@@ -396,6 +396,7 @@ static DEVICE_ATTR(aap_log, S_IRUGO, pm8001_ctl_aap_log_show, NULL); · 240 unmodified lines
396	396	* @cdev:pointer to embedded class device
397	397	* @attr: device attribute (unused)
398	398	* @buf: the buffer returned
	399	+ *
399	400	* A sysfs 'read-only' shost attribute.
400	401	*/
401	402	static ssize_t pm8001_ctl_ib_queue_log_show(struct device *cdev,
@@ -430,6 +431,7 @@ static DEVICE_ATTR(ib_log, S_IRUGO, pm8001_ctl_ib_queue_log_show, NULL); · 28 unmodified lines
430	431	* @cdev:pointer to embedded class device
431	432	* @attr: device attribute (unused)
432	433	* @buf: the buffer returned
	434	+ *
433	435	* A sysfs 'read-only' shost attribute.
434	436	*/
435	437
@@ -464,6 +466,7 @@ static DEVICE_ATTR(ob_log, S_IRUGO, pm8001_ctl_ob_queue_log_show, NULL); · 28 unmodified lines
464	466	* @cdev:pointer to embedded class device
465	467	* @attr: device attribute (unused)
466	468	* @buf:the buffer returned
	469	+ *
467	470	* A sysfs 'read-only' shost attribute.
468	471	*/
469	472	static ssize_t pm8001_ctl_bios_version_show(struct device *cdev,
@@ -555,13 +558,13 @@ static ssize_t pm8001_ctl_iop_log_show(struct device *cdev, · 85 unmodified lines
555	558	static DEVICE_ATTR(iop_log, S_IRUGO, pm8001_ctl_iop_log_show, NULL);
556	559
557	560	/**
558		− ** pm8001_ctl_fatal_log_show - fatal error logging
559		− ** @cdev:pointer to embedded class device
560		− ** @attr: device attribute
561		− ** @buf: the buffer returned
562		− **
563		− ** A sysfs 'read-only' shost attribute.
564		− **/
	561	+ * pm8001_ctl_fatal_log_show - fatal error logging
	562	+ * @cdev:pointer to embedded class device
	563	+ * @attr: device attribute
	564	+ * @buf: the buffer returned
	565	+ *
	566	+ * A sysfs 'read-only' shost attribute.
	567	+ */
565	568
566	569	static ssize_t pm8001_ctl_fatal_log_show(struct device *cdev,
567	570	struct device_attribute attr, char buf)
@@ -575,13 +578,13 @@ static ssize_t pm8001_ctl_fatal_log_show(struct device *cdev, · 7 unmodified lines
575	578	static DEVICE_ATTR(fatal_log, S_IRUGO, pm8001_ctl_fatal_log_show, NULL);
576	579
577	580	/**
578		− ** non_fatal_log_show - non fatal error logging
579		− ** @cdev:pointer to embedded class device
580		− ** @attr: device attribute
581		− ** @buf: the buffer returned
582		− **
583		− ** A sysfs 'read-only' shost attribute.
584		− **/
	581	+ * non_fatal_log_show - non fatal error logging
	582	+ * @cdev:pointer to embedded class device
	583	+ * @attr: device attribute
	584	+ * @buf: the buffer returned
	585	+ *
	586	+ * A sysfs 'read-only' shost attribute.
	587	+ */
585	588	static ssize_t non_fatal_log_show(struct device *cdev,
586	589	struct device_attribute attr, char buf)
587	590	{
@@ -620,12 +623,13 @@ static ssize_t non_fatal_count_store(struct device *cdev, · 32 unmodified lines
620	623	static DEVICE_ATTR_RW(non_fatal_count);
621	624
622	625	/**
623		− ** pm8001_ctl_gsm_log_show - gsm dump collection
624		− ** @cdev:pointer to embedded class device
625		− ** @attr: device attribute (unused)
626		− ** @buf: the buffer returned
627		− ** A sysfs 'read-only' shost attribute.
628		− **/
	626	+ * pm8001_ctl_gsm_log_show - gsm dump collection
	627	+ * @cdev:pointer to embedded class device
	628	+ * @attr: device attribute (unused)
	629	+ * @buf: the buffer returned
	630	+ *
	631	+ * A sysfs 'read-only' shost attribute.
	632	+ */
629	633	static ssize_t pm8001_ctl_gsm_log_show(struct device *cdev,
630	634	struct device_attribute attr, char buf)
631	635	{

drivers/scsi/pm8001/pm8001_hwi.c+9−9

@@ -384,7 +384,7 @@ static void update_outbnd_queue_table(struct pm8001_hba_info *pm8001_ha, · 383 unmodified lines
384	384
385	385	/**
386	386	* pm8001_bar4_shift - function is called to shift BAR base address
387		− * @pm8001_ha : our hba card infomation
	387	+ * @pm8001_ha : our hba card information
388	388	* @shiftValue : shifting value in memory bar.
389	389	*/
390	390	int pm8001_bar4_shift(struct pm8001_hba_info *pm8001_ha, u32 shiftValue)
@@ -1151,7 +1151,7 @@ static void pm8001_hw_chip_rst(struct pm8001_hba_info *pm8001_ha) · 760 unmodified lines
1151	1151	}
1152	1152
1153	1153	/**
1154		− * pm8001_chip_iounmap - which maped when initialized.
	1154	+ * pm8001_chip_iounmap - which mapped when initialized.
1155	1155	* @pm8001_ha: our hba card information
1156	1156	*/
1157	1157	void pm8001_chip_iounmap(struct pm8001_hba_info *pm8001_ha)
@@ -1187,10 +1187,10 @@ pm8001_chip_intx_interrupt_enable(struct pm8001_hba_info *pm8001_ha) · 29 unmodified lines
1187	1187	pm8001_cw32(pm8001_ha, 0, MSGU_ODCR, ODCR_CLEAR_ALL);
1188	1188	}
1189	1189
1190		− /**
1191		− * pm8001_chip_intx_interrupt_disable- disable PM8001 chip interrupt
1192		− * @pm8001_ha: our hba card information
1193		− */
	1190	+/**
	1191	+ * pm8001_chip_intx_interrupt_disable - disable PM8001 chip interrupt
	1192	+ * @pm8001_ha: our hba card information
	1193	+ */
1194	1194	static void
1195	1195	pm8001_chip_intx_interrupt_disable(struct pm8001_hba_info *pm8001_ha)
1196	1196	{
@@ -1876,8 +1876,8 @@ static void pm8001_send_read_log(struct pm8001_hba_info *pm8001_ha, · 679 unmodified lines
1876	1876	* @piomb: the message contents of this outbound message.
1877	1877	*
1878	1878	* When FW has completed a ssp request for example a IO request, after it has
1879		− * filled the SG data with the data, it will trigger this event represent
1880		− * that he has finished the job,please check the coresponding buffer.
	1879	+ * filled the SG data with the data, it will trigger this event representing
	1880	+ * that he has finished the job; please check the corresponding buffer.
1881	1881	* So we will tell the caller who maybe waiting the result to tell upper layer
1882	1882	* that the task has been finished.
1883	1883	*/
@@ -3522,7 +3522,7 @@ hw_event_phy_down(struct pm8001_hba_info pm8001_ha, void piomb) · 1638 unmodified lines
3522	3522	*
3523	3523	* when sas layer find a device it will notify LLDD, then the driver register
3524	3524	* the domain device to FW, this event is the return device ID which the FW
3525		− * has assigned, from now,inter-communication with FW is no longer using the
	3525	+ * has assigned, from now, inter-communication with FW is no longer using the
3526	3526	* SAS address, use device ID which FW assigned.
3527	3527	*/
3528	3528	int pm8001_mpi_reg_resp(struct pm8001_hba_info pm8001_ha, void piomb)

drivers/scsi/pm8001/pm8001_init.c+15−14

@@ -233,7 +233,7 @@ static irqreturn_t pm8001_interrupt_handler_msix(int irq, void *opaque) · 232 unmodified lines
233	233	/**
234	234	* pm8001_interrupt_handler_intx - main INTx interrupt handler.
235	235	* @irq: interrupt number
236		− * @dev_id: sas_ha structure. The HBA is retrieved from sas_has structure.
	236	+ * @dev_id: sas_ha structure. The HBA is retrieved from sas_ha structure.
237	237	*/
238	238
239	239	static irqreturn_t pm8001_interrupt_handler_intx(int irq, void *dev_id)
@@ -439,9 +439,9 @@ err_out: · 199 unmodified lines
439	439	}
440	440
441	441	/**
442		− * pm8001_ioremap - remap the pci high physical address to kernal virtual
	442	+ * pm8001_ioremap - remap the pci high physical address to kernel virtual
443	443	* address so that we can access them.
444		− * @pm8001_ha:our hba structure.
	444	+ * @pm8001_ha: our hba structure.
445	445	*/
446	446	static int pm8001_ioremap(struct pm8001_hba_info *pm8001_ha)
447	447	{
@@ -652,7 +652,7 @@ static void pm8001_post_sas_ha_init(struct Scsi_Host *shost, · 204 unmodified lines
652	652	* pm8001_init_sas_add - initialize sas address
653	653	* @pm8001_ha: our ha struct.
654	654	*
655		− * Currently we just set the fixed SAS address to our HBA,for manufacture,
	655	+ * Currently we just set the fixed SAS address to our HBA, for manufacture,
656	656	* it should read from the EEPROM
657	657	*/
658	658	static void pm8001_init_sas_add(struct pm8001_hba_info *pm8001_ha)
@@ -790,7 +790,7 @@ struct pm8001_mpi3_phy_pg_trx_config { · 131 unmodified lines
790	790	};
791	791
792	792	/**
793		− * pm8001_get_internal_phy_settings : Retrieves the internal PHY settings
	793	+ * pm8001_get_internal_phy_settings - Retrieves the internal PHY settings
794	794	* @pm8001_ha : our adapter
795	795	* @phycfg : PHY config page to populate
796	796	*/
@@ -810,7 +810,7 @@ void pm8001_get_internal_phy_settings(struct pm8001_hba_info *pm8001_ha, · 13 unmodified lines
810	810	}
811	811
812	812	/**
813		− * pm8001_get_external_phy_settings : Retrieves the external PHY settings
	813	+ * pm8001_get_external_phy_settings - Retrieves the external PHY settings
814	814	* @pm8001_ha : our adapter
815	815	* @phycfg : PHY config page to populate
816	816	*/
@@ -830,7 +830,7 @@ void pm8001_get_external_phy_settings(struct pm8001_hba_info *pm8001_ha, · 13 unmodified lines
830	830	}
831	831
832	832	/**
833		− * pm8001_get_phy_mask : Retrieves the mask that denotes if a PHY is int/ext
	833	+ * pm8001_get_phy_mask - Retrieves the mask that denotes if a PHY is int/ext
834	834	* @pm8001_ha : our adapter
835	835	* @phymask : The PHY mask
836	836	*/
@@ -868,7 +868,7 @@ void pm8001_get_phy_mask(struct pm8001_hba_info pm8001_ha, int phymask) · 31 unmodified lines
868	868	}
869	869
870	870	/**
871		− * pm8001_set_phy_settings_ven_117c_12G() : Configure ATTO 12Gb PHY settings
	871	+ * pm8001_set_phy_settings_ven_117c_12G() - Configure ATTO 12Gb PHY settings
872	872	* @pm8001_ha : our adapter
873	873	*/
874	874	static
@@ -903,7 +903,7 @@ int pm8001_set_phy_settings_ven_117c_12G(struct pm8001_hba_info *pm8001_ha) · 28 unmodified lines
903	903	}
904	904
905	905	/**
906		− * pm8001_configure_phy_settings : Configures PHY settings based on vendor ID.
	906	+ * pm8001_configure_phy_settings - Configures PHY settings based on vendor ID.
907	907	* @pm8001_ha : our hba.
908	908	*/
909	909	static int pm8001_configure_phy_settings(struct pm8001_hba_info *pm8001_ha)
@@ -1053,8 +1053,8 @@ intx: · 143 unmodified lines
1053	1053	* @ent: pci device id
1054	1054	*
1055	1055	* This function is the main initialization function, when register a new
1056		− * pci driver it is invoked, all struct an hardware initilization should be done
1057		− * here, also, register interrupt
	1056	+ * pci driver it is invoked, all struct and hardware initialization should be
	1057	+ * done here, also, register interrupt.
1058	1058	*/
1059	1059	static int pm8001_pci_probe(struct pci_dev *pdev,
1060	1060	const struct pci_device_id *ent)
@@ -1172,10 +1172,11 @@ err_out_enable: · 111 unmodified lines
1172	1172	return rc;
1173	1173	}
1174	1174
1175		−/*
	1175	+/**
1176	1176	* pm8001_init_ccb_tag - allocate memory to CCB and tag.
1177	1177	* @pm8001_ha: our hba card information.
1178	1178	* @shost: scsi host which has been allocated outside.
	1179	+ * @pdev: pci device.
1179	1180	*/
1180	1181	static int
1181	1182	pm8001_init_ccb_tag(struct pm8001_hba_info pm8001_ha, struct Scsi_Host shost,
@@ -1270,7 +1271,7 @@ static void pm8001_pci_remove(struct pci_dev *pdev) · 88 unmodified lines
1270	1271	* pm8001_pci_suspend - power management suspend main entry point
1271	1272	* @dev: Device struct
1272	1273	*
1273		− * Returns 0 success, anything else error.
	1274	+ * Return: 0 on success, anything else on error.
1274	1275	*/
1275	1276	static int __maybe_unused pm8001_pci_suspend(struct device *dev)
1276	1277	{
@@ -1315,7 +1316,7 @@ static int __maybe_unused pm8001_pci_suspend(struct device *dev) · 38 unmodified lines
1315	1316	* pm8001_pci_resume - power management resume main entry point
1316	1317	* @dev: Device struct
1317	1318	*
1318		− * Returns 0 success, anything else error.
	1319	+ * Return: 0 on success, anything else on error.
1319	1320	*/
1320	1321	static int __maybe_unused pm8001_pci_resume(struct device *dev)
1321	1322	{

drivers/scsi/pm8001/pm8001_sas.c+22−19

@@ -98,14 +98,16 @@ void pm8001_tag_init(struct pm8001_hba_info *pm8001_ha) · 97 unmodified lines
98	98	pm8001_tag_free(pm8001_ha, i);
99	99	}
100	100
101		− /**
102		− * pm8001_mem_alloc - allocate memory for pm8001.
103		− * @pdev: pci device.
104		− * @virt_addr: the allocated virtual address
105		− * @pphys_addr_hi: the physical address high byte address.
106		− * @pphys_addr_lo: the physical address low byte address.
107		− * @mem_size: memory size.
108		− */
	101	+/**
	102	+ * pm8001_mem_alloc - allocate memory for pm8001.
	103	+ * @pdev: pci device.
	104	+ * @virt_addr: the allocated virtual address
	105	+ * @pphys_addr: DMA address for this device
	106	+ * @pphys_addr_hi: the physical address high byte address.
	107	+ * @pphys_addr_lo: the physical address low byte address.
	108	+ * @mem_size: memory size.
	109	+ * @align: requested byte alignment
	110	+ */
109	111	int pm8001_mem_alloc(struct pci_dev pdev, void *virt_addr,
110	112	dma_addr_t pphys_addr, u32 pphys_addr_hi,
111	113	u32 *pphys_addr_lo, u32 mem_size, u32 align)
@@ -339,7 +341,7 @@ static int pm8001_task_prep_ssp_tm(struct pm8001_hba_info *pm8001_ha, · 227 unmodified lines
339	341	}
340	342
341	343	/**
342		− * pm8001_task_prep_ssp - the dispatcher function,prepare ssp data for ssp task
	344	+ * pm8001_task_prep_ssp - the dispatcher function, prepare ssp data for ssp task
343	345	* @pm8001_ha: our hba card information
344	346	* @ccb: the ccb which attached to ssp task
345	347	*/
@@ -554,10 +556,10 @@ void pm8001_ccb_task_free(struct pm8001_hba_info *pm8001_ha, · 208 unmodified lines
554	556	pm8001_tag_free(pm8001_ha, ccb_idx);
555	557	}
556	558
557		− /**
558		− * pm8001_alloc_dev - find a empty pm8001_device
559		− * @pm8001_ha: our hba card information
560		− */
	559	+/**
	560	+ * pm8001_alloc_dev - find a empty pm8001_device
	561	+ * @pm8001_ha: our hba card information
	562	+ */
561	563	static struct pm8001_device pm8001_alloc_dev(struct pm8001_hba_info pm8001_ha)
562	564	{
563	565	u32 dev;
@@ -705,7 +707,7 @@ static void pm8001_tmf_timedout(struct timer_list *t) · 141 unmodified lines
705	707	* @parameter: ssp task parameter.
706	708	*
707	709	* when errors or exception happened, we may want to do something, for example
708		− * abort the issued task which result in this execption, it is done by calling
	710	+ * abort the issued task which result in this exception, it is done by calling
709	711	* this function, note it is also with the task execute interface.
710	712	*/
711	713	static int pm8001_exec_internal_tmf_task(struct domain_device *dev,
@@ -984,11 +986,12 @@ void pm8001_open_reject_retry( · 272 unmodified lines
984	986	}
985	987
986	988	/**
987		− * pm8001_I_T_nexus_reset()
988		− * Standard mandates link reset for ATA (type 0) and hard reset for
989		− * SSP (type 1) , only for RECOVERY
990		− * @dev: the device structure for the device to reset.
991		− */
	989	+ * pm8001_I_T_nexus_reset() - reset the initiator/target connection
	990	+ * @dev: the device structure for the device to reset.
	991	+ *
	992	+ * Standard mandates link reset for ATA (type 0) and hard reset for
	993	+ * SSP (type 1), only for RECOVERY
	994	+ */
992	995	int pm8001_I_T_nexus_reset(struct domain_device *dev)
993	996	{
994	997	int rc = TMF_RESP_FUNC_FAILED;

drivers/scsi/pm8001/pm80xx_hwi.c+25−25

@@ -140,7 +140,7 @@ ssize_t pm80xx_get_fatal_dump(struct device *cdev, · 139 unmodified lines
140	140	pm8001_ha->fatal_bar_loc = 0;
141	141	}
142	142
143		− /* Read until accum_len is retrived */
	143	+ /* Read until accum_len is retrieved */
144	144	accum_len = pm8001_mr32(fatal_table_address,
145	145	MPI_FATAL_EDUMP_TABLE_ACCUM_LEN);
146	146	/* Determine length of data between previously stored transfer length
@@ -1011,7 +1011,7 @@ static int mpi_init_check(struct pm8001_hba_info *pm8001_ha) · 864 unmodified lines
1011	1011	value);
1012	1012	return -EBUSY;
1013	1013	}
1014		− /* check the MPI-State for initialization upto 100ms*/
	1014	+ /* check the MPI-State for initialization up to 100ms*/
1015	1015	max_wait_count = 5;/* 100 msec */
1016	1016	do {
1017	1017	msleep(FW_READY_INTERVAL);
@@ -1093,7 +1093,7 @@ static int init_pci_device_addresses(struct pm8001_hba_info *pm8001_ha) · 75 unmodified lines
1093	1093
1094	1094	value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_0);
1095	1095
1096		− /**
	1096	+ /*
1097	1097	* lower 26 bits of SCRATCHPAD0 register describes offset within the
1098	1098	* PCIe BAR where the MPI configuration table is present
1099	1099	*/
@@ -1101,7 +1101,7 @@ static int init_pci_device_addresses(struct pm8001_hba_info *pm8001_ha) · 1 unmodified line
1101	1101
1102	1102	pm8001_dbg(pm8001_ha, DEV, "Scratchpad 0 Offset: 0x%x value 0x%x\n",
1103	1103	offset, value);
1104		− /**
	1104	+ /*
1105	1105	* Upper 6 bits describe the offset within PCI config space where BAR
1106	1106	* is located.
1107	1107	*/
@@ -1109,7 +1109,7 @@ static int init_pci_device_addresses(struct pm8001_hba_info *pm8001_ha) · 1 unmodified line
1109	1109	pcibar = get_pci_bar_index(pcilogic);
1110	1110	pm8001_dbg(pm8001_ha, INIT, "Scratchpad 0 PCI BAR: %d\n", pcibar);
1111	1111
1112		− /**
	1112	+ /*
1113	1113	* Make sure the offset falls inside the ioremapped PCI BAR
1114	1114	*/
1115	1115	if (offset > pm8001_ha->io_mem[pcibar].memsize) {
@@ -1121,7 +1121,7 @@ static int init_pci_device_addresses(struct pm8001_hba_info *pm8001_ha) · 5 unmodified lines
1121	1121	pm8001_ha->main_cfg_tbl_addr = base_addr =
1122	1122	pm8001_ha->io_mem[pcibar].memvirtaddr + offset;
1123	1123
1124		− /**
	1124	+ /*
1125	1125	* Validate main configuration table address: first DWord should read
1126	1126	* "PMCS"
1127	1127	*/
@@ -1385,7 +1385,7 @@ pm80xx_get_encrypt_info(struct pm8001_hba_info *pm8001_ha) · 257 unmodified lines
1385	1385	}
1386	1386
1387	1387	/**
1388		− * pm80xx_encrypt_update - update flash with encryption informtion
	1388	+ * pm80xx_encrypt_update - update flash with encryption information
1389	1389	* @pm8001_ha: our hba card information.
1390	1390	*/
1391	1391	static int pm80xx_encrypt_update(struct pm8001_hba_info *pm8001_ha)
@@ -1422,7 +1422,7 @@ static int pm80xx_encrypt_update(struct pm8001_hba_info *pm8001_ha) · 30 unmodified lines
1422	1422	}
1423	1423
1424	1424	/**
1425		− * pm80xx_chip_init - the main init function that initialize whole PM8001 chip.
	1425	+ * pm80xx_chip_init - the main init function that initializes whole PM8001 chip.
1426	1426	* @pm8001_ha: our hba card information
1427	1427	*/
1428	1428	static int pm80xx_chip_init(struct pm8001_hba_info *pm8001_ha)
@@ -1541,7 +1541,7 @@ static int mpi_uninit_check(struct pm8001_hba_info *pm8001_ha) · 112 unmodified lines
1541	1541	}
1542	1542
1543	1543	/**
1544		− * pm80xx_fatal_errors - returns non zero ONLY when fatal errors
	1544	+ * pm80xx_fatal_errors - returns non-zero ONLY when fatal errors
1545	1545	* @pm8001_ha: our hba card information
1546	1546	*
1547	1547	* Fatal errors are recoverable only after a host reboot.
@@ -1576,8 +1576,8 @@ pm80xx_fatal_errors(struct pm8001_hba_info *pm8001_ha) · 28 unmodified lines
1576	1576	}
1577	1577
1578	1578	/**
1579		− * pm80xx_chip_soft_rst - soft reset the PM8001 chip, so that the clear all
1580		− * the FW register status to the originated status.
	1579	+ * pm80xx_chip_soft_rst - soft reset the PM8001 chip, so that all
	1580	+ * FW register status are reset to the originated status.
1581	1581	* @pm8001_ha: our hba card information
1582	1582	*/
1583	1583
@@ -1895,13 +1895,13 @@ static void pm80xx_send_read_log(struct pm8001_hba_info *pm8001_ha, · 311 unmodified lines
1895	1895	}
1896	1896
1897	1897	/**
1898		− * mpi_ssp_completion- process the event that FW response to the SSP request.
	1898	+ * mpi_ssp_completion - process the event that FW response to the SSP request.
1899	1899	* @pm8001_ha: our hba card information
1900	1900	* @piomb: the message contents of this outbound message.
1901	1901	*
1902	1902	* When FW has completed a ssp request for example a IO request, after it has
1903		− * filled the SG data with the data, it will trigger this event represent
1904		− * that he has finished the job,please check the coresponding buffer.
	1903	+ * filled the SG data with the data, it will trigger this event representing
	1904	+ * that he has finished the job; please check the corresponding buffer.
1905	1905	* So we will tell the caller who maybe waiting the result to tell upper layer
1906	1906	* that the task has been finished.
1907	1907	*/
@@ -3217,7 +3217,7 @@ mpi_smp_completion(struct pm8001_hba_info pm8001_ha, void piomb) · 1309 unmodified lines
3217	3217	}
3218	3218
3219	3219	/**
3220		− * pm80xx_hw_event_ack_req- For PM8001,some events need to acknowage to FW.
	3220	+ * pm80xx_hw_event_ack_req- For PM8001, some events need to acknowledge to FW.
3221	3221	* @pm8001_ha: our hba card information
3222	3222	* @Qnum: the outbound queue message number.
3223	3223	* @SEA: source of event to ack
@@ -3275,7 +3275,7 @@ static void hw_event_port_recover(struct pm8001_hba_info *pm8001_ha, · 51 unmodified lines
3275	3275	}
3276	3276
3277	3277	/**
3278		− * hw_event_sas_phy_up -FW tells me a SAS phy up event.
	3278	+ * hw_event_sas_phy_up - FW tells me a SAS phy up event.
3279	3279	* @pm8001_ha: our hba card information
3280	3280	* @piomb: IO message buffer
3281	3281	*/
@@ -3353,7 +3353,7 @@ hw_event_sas_phy_up(struct pm8001_hba_info pm8001_ha, void piomb) · 71 unmodified lines
3353	3353	}
3354	3354
3355	3355	/**
3356		− * hw_event_sata_phy_up -FW tells me a SATA phy up event.
	3356	+ * hw_event_sata_phy_up - FW tells me a SATA phy up event.
3357	3357	* @pm8001_ha: our hba card information
3358	3358	* @piomb: IO message buffer
3359	3359	*/
@@ -3400,7 +3400,7 @@ hw_event_sata_phy_up(struct pm8001_hba_info pm8001_ha, void piomb) · 40 unmodified lines
3400	3400	}
3401	3401
3402	3402	/**
3403		− * hw_event_phy_down -we should notify the libsas the phy is down.
	3403	+ * hw_event_phy_down - we should notify the libsas the phy is down.
3404	3404	* @pm8001_ha: our hba card information
3405	3405	* @piomb: IO message buffer
3406	3406	*/
@@ -3500,7 +3500,7 @@ static int mpi_phy_start_resp(struct pm8001_hba_info pm8001_ha, void piomb) · 93 unmodified lines
3500	3500	}
3501	3501
3502	3502	/**
3503		− * mpi_thermal_hw_event -The hw event has come.
	3503	+ * mpi_thermal_hw_event - a thermal hw event has come.
3504	3504	* @pm8001_ha: our hba card information
3505	3505	* @piomb: IO message buffer
3506	3506	*/
@@ -3530,7 +3530,7 @@ static int mpi_thermal_hw_event(struct pm8001_hba_info pm8001_ha, void piomb) · 23 unmodified lines
3530	3530	}
3531	3531
3532	3532	/**
3533		− * mpi_hw_event -The hw event has come.
	3533	+ * mpi_hw_event - The hw event has come.
3534	3534	* @pm8001_ha: our hba card information
3535	3535	* @piomb: IO message buffer
3536	3536	*/
@@ -4025,7 +4025,7 @@ static void process_one_iomb(struct pm8001_hba_info pm8001_ha, void piomb) · 488 unmodified lines
4025	4025	case OPC_OUB_SET_DEV_INFO:
4026	4026	pm8001_dbg(pm8001_ha, MSG, "OPC_OUB_SET_DEV_INFO\n");
4027	4027	break;
4028		− /* spcv specifc commands */
	4028	+ /* spcv specific commands */
4029	4029	case OPC_OUB_PHY_START_RESP:
4030	4030	pm8001_dbg(pm8001_ha, MSG,
4031	4031	"OPC_OUB_PHY_START_RESP opcode:%x\n", opc);
@@ -4186,7 +4186,7 @@ static void build_smp_cmd(u32 deviceID, __le32 hTag, · 154 unmodified lines
4186	4186	}
4187	4187
4188	4188	/**
4189		− * pm80xx_chip_smp_req - send a SMP task to FW
	4189	+ * pm80xx_chip_smp_req - send an SMP task to FW
4190	4190	* @pm8001_ha: our hba card information.
4191	4191	* @ccb: the ccb information this request used.
4192	4192	*/
@@ -4346,7 +4346,7 @@ static int check_enc_sat_cmd(struct sas_task *task) · 153 unmodified lines
4346	4346	}
4347	4347
4348	4348	/**
4349		− * pm80xx_chip_ssp_io_req - send a SSP task to FW
	4349	+ * pm80xx_chip_ssp_io_req - send an SSP task to FW
4350	4350	* @pm8001_ha: our hba card information.
4351	4351	* @ccb: the ccb information this request used.
4352	4352	*/
@@ -4750,13 +4750,13 @@ pm80xx_chip_phy_start_req(struct pm8001_hba_info *pm8001_ha, u8 phy_id) · 397 unmodified lines
4750	4750	payload.ase_sh_lm_slr_phyid = cpu_to_le32(SPINHOLD_DISABLE \|
4751	4751	LINKMODE_AUTO \| pm8001_ha->link_rate \| phy_id);
4752	4752	/* SSC Disable and SAS Analog ST configuration */
4753		− /**
	4753	+ /*
4754	4754	payload.ase_sh_lm_slr_phyid =
4755	4755	cpu_to_le32(SSC_DISABLE_30 \| SAS_ASE \| SPINHOLD_DISABLE \|
4756	4756	LINKMODE_AUTO \| LINKRATE_15 \| LINKRATE_30 \| LINKRATE_60 \|
4757	4757	phy_id);
4758	4758	Have to add "SAS PHY Analog Setup SPASTI 1 Byte" Based on need
4759		− **/
	4759	+ */
4760	4760
4761	4761	payload.sas_identify.dev_type = SAS_END_DEVICE;
4762	4762	payload.sas_identify.initiator_bits = SAS_PROTOCOL_ALL;

drivers/scsi/scsi_lib.c+1−1

@@ -194,7 +194,7 @@ void scsi_queue_insert(struct scsi_cmnd *cmd, int reason) · 193 unmodified lines
194	194	* @bufflen: len of buffer
195	195	* @sense: optional sense buffer
196	196	* @sshdr: optional decoded sense header
197		− * @timeout: request timeout in seconds
	197	+ * @timeout: request timeout in HZ
198	198	* @retries: number of times to retry request
199	199	* @flags: flags for ->cmd_flags
200	200	* @rq_flags: flags for ->rq_flags

drivers/scsi/ufs/ufshcd.h+7−2

@@ -1229,8 +1229,13 @@ static inline int ufshcd_vops_pwr_change_notify(struct ufs_hba *hba, · 1228 unmodified lines
1229	1229	static inline void ufshcd_vops_setup_xfer_req(struct ufs_hba *hba, int tag,
1230	1230	bool is_scsi_cmd)
1231	1231	{
1232		− if (hba->vops && hba->vops->setup_xfer_req)
1233		− return hba->vops->setup_xfer_req(hba, tag, is_scsi_cmd);
	1232	+ if (hba->vops && hba->vops->setup_xfer_req) {
	1233	+ unsigned long flags;
	1234	+
	1235	+ spin_lock_irqsave(hba->host->host_lock, flags);
	1236	+ hba->vops->setup_xfer_req(hba, tag, is_scsi_cmd);
	1237	+ spin_unlock_irqrestore(hba->host->host_lock, flags);
	1238	+ }
1234	1239	}
1235	1240
1236	1241	static inline void ufshcd_vops_setup_task_mgmt(struct ufs_hba *hba,

drivers/spi/spi-atmel.c+2−7

@@ -352,8 +352,6 @@ static void cs_activate(struct atmel_spi as, struct spi_device spi) · 351 unmodified lines
352	352	}
353	353
354	354	mr = spi_readl(as, MR);
355		− if (spi->cs_gpiod)
356		− gpiod_set_value(spi->cs_gpiod, 1);
357	355	} else {
358	356	u32 cpol = (spi->mode & SPI_CPOL) ? SPI_BIT(CPOL) : 0;
359	357	int i;
@@ -369,8 +367,6 @@ static void cs_activate(struct atmel_spi as, struct spi_device spi) · 9 unmodified lines
369	367
370	368	mr = spi_readl(as, MR);
371	369	mr = SPI_BFINS(PCS, ~(1 << chip_select), mr);
372		− if (spi->cs_gpiod)
373		− gpiod_set_value(spi->cs_gpiod, 1);
374	370	spi_writel(as, MR, mr);
375	371	}
376	372
@@ -400,8 +396,6 @@ static void cs_deactivate(struct atmel_spi as, struct spi_device spi) · 23 unmodified lines
400	396
401	397	if (!spi->cs_gpiod)
402	398	spi_writel(as, CR, SPI_BIT(LASTXFER));
403		− else
404		− gpiod_set_value(spi->cs_gpiod, 0);
405	399	}
406	400
407	401	static void atmel_spi_lock(struct atmel_spi *as) __acquires(&as->lock)
@@ -1483,7 +1477,8 @@ static int atmel_spi_probe(struct platform_device *pdev) · 1075 unmodified lines
1483	1477	master->bus_num = pdev->id;
1484	1478	master->num_chipselect = 4;
1485	1479	master->setup = atmel_spi_setup;
1486		− master->flags = (SPI_MASTER_MUST_RX \| SPI_MASTER_MUST_TX);
	1480	+ master->flags = (SPI_MASTER_MUST_RX \| SPI_MASTER_MUST_TX \|
	1481	+ SPI_MASTER_GPIO_SS);
1487	1482	master->transfer_one = atmel_spi_one_transfer;
1488	1483	master->set_cs = atmel_spi_set_cs;
1489	1484	master->cleanup = atmel_spi_cleanup;

drivers/spi/spi-bcm2835.c+7−5

@@ -83,6 +83,7 @@ MODULE_PARM_DESC(polling_limit_us, · 82 unmodified lines
83	83	* struct bcm2835_spi - BCM2835 SPI controller
84	84	* @regs: base address of register map
85	85	* @clk: core clock, divided to calculate serial clock
	86	+ * @clk_hz: core clock cached speed
86	87	* @irq: interrupt, signals TX FIFO empty or RX FIFO ¾ full
87	88	* @tfr: SPI transfer currently processed
88	89	* @ctlr: SPI controller reverse lookup
@@ -116,6 +117,7 @@ MODULE_PARM_DESC(polling_limit_us, · 27 unmodified lines
116	117	struct bcm2835_spi {
117	118	void __iomem *regs;
118	119	struct clk *clk;
	120	+ unsigned long clk_hz;
119	121	int irq;
120	122	struct spi_transfer *tfr;
121	123	struct spi_controller *ctlr;
@@ -1045,19 +1047,18 @@ static int bcm2835_spi_transfer_one(struct spi_controller *ctlr, · 923 unmodified lines
1045	1047	{
1046	1048	struct bcm2835_spi *bs = spi_controller_get_devdata(ctlr);
1047	1049	struct bcm2835_spidev *slv = spi_get_ctldata(spi);
1048		− unsigned long spi_hz, clk_hz, cdiv;
	1050	+ unsigned long spi_hz, cdiv;
1049	1051	unsigned long hz_per_byte, byte_limit;
1050	1052	u32 cs = slv->prepare_cs;
1051	1053
1052	1054	/* set clock */
1053	1055	spi_hz = tfr->speed_hz;
1054		− clk_hz = clk_get_rate(bs->clk);
1055	1056
1056		− if (spi_hz >= clk_hz / 2) {
	1057	+ if (spi_hz >= bs->clk_hz / 2) {
1057	1058	cdiv = 2; /* clk_hz/2 is the fastest we can go */
1058	1059	} else if (spi_hz) {
1059	1060	/* CDIV must be a multiple of two */
1060		− cdiv = DIV_ROUND_UP(clk_hz, spi_hz);
	1061	+ cdiv = DIV_ROUND_UP(bs->clk_hz, spi_hz);
1061	1062	cdiv += (cdiv % 2);
1062	1063
1063	1064	if (cdiv >= 65536)
@@ -1065,7 +1066,7 @@ static int bcm2835_spi_transfer_one(struct spi_controller *ctlr, · 1 unmodified line
1065	1066	} else {
1066	1067	cdiv = 0; /* 0 is the slowest we can go */
1067	1068	}
1068		− tfr->effective_speed_hz = cdiv ? (clk_hz / cdiv) : (clk_hz / 65536);
	1069	+ tfr->effective_speed_hz = cdiv ? (bs->clk_hz / cdiv) : (bs->clk_hz / 65536);
1069	1070	bcm2835_wr(bs, BCM2835_SPI_CLK, cdiv);
1070	1071
1071	1072	/* handle all the 3-wire mode */
@@ -1354,6 +1355,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev) · 282 unmodified lines
1354	1355	return bs->irq ? bs->irq : -ENODEV;
1355	1356
1356	1357	clk_prepare_enable(bs->clk);
	1358	+ bs->clk_hz = clk_get_rate(bs->clk);
1357	1359
1358	1360	err = bcm2835_dma_init(ctlr, &pdev->dev, bs);
1359	1361	if (err)

drivers/spi/spi-cadence-quadspi.c+17−13

@@ -309,6 +309,9 @@ static unsigned int cqspi_calc_dummy(const struct spi_mem_op *op, bool dtr) · 308 unmodified lines
309	309	{
310	310	unsigned int dummy_clk;
311	311
	312	+ if (!op->dummy.nbytes)
	313	+ return 0;
	314	+
312	315	dummy_clk = op->dummy.nbytes * (8 / op->dummy.buswidth);
313	316	if (dtr)
314	317	dummy_clk /= 2;
@@ -797,19 +800,20 @@ static int cqspi_write_setup(struct cqspi_flash_pdata *f_pdata, · 482 unmodified lines
797	800	reg = cqspi_calc_rdreg(f_pdata);
798	801	writel(reg, reg_base + CQSPI_REG_RD_INSTR);
799	802
800		− if (f_pdata->dtr) {
801		− /*
802		− * Some flashes like the cypress Semper flash expect a 4-byte
803		− * dummy address with the Read SR command in DTR mode, but this
804		− * controller does not support sending address with the Read SR
805		− * command. So, disable write completion polling on the
806		− * controller's side. spi-nor will take care of polling the
807		− * status register.
808		− */
809		− reg = readl(reg_base + CQSPI_REG_WR_COMPLETION_CTRL);
810		− reg \|= CQSPI_REG_WR_DISABLE_AUTO_POLL;
811		− writel(reg, reg_base + CQSPI_REG_WR_COMPLETION_CTRL);
812		− }
	803	+ /*
	804	+ * SPI NAND flashes require the address of the status register to be
	805	+ * passed in the Read SR command. Also, some SPI NOR flashes like the
	806	+ * cypress Semper flash expect a 4-byte dummy address in the Read SR
	807	+ * command in DTR mode.
	808	+ *
	809	+ * But this controller does not support address phase in the Read SR
	810	+ * command when doing auto-HW polling. So, disable write completion
	811	+ * polling on the controller's side. spinand and spi-nor will take
	812	+ * care of polling the status register.
	813	+ */
	814	+ reg = readl(reg_base + CQSPI_REG_WR_COMPLETION_CTRL);
	815	+ reg \|= CQSPI_REG_WR_DISABLE_AUTO_POLL;
	816	+ writel(reg, reg_base + CQSPI_REG_WR_COMPLETION_CTRL);
813	817
814	818	reg = readl(reg_base + CQSPI_REG_SIZE);
815	819	reg &= ~CQSPI_REG_SIZE_ADDRESS_MASK;

drivers/spi/spi-cadence.c+9−5

@@ -517,6 +517,12 @@ static int cdns_spi_probe(struct platform_device *pdev) · 516 unmodified lines
517	517	goto clk_dis_apb;
518	518	}
519	519
	520	+ pm_runtime_use_autosuspend(&pdev->dev);
	521	+ pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);
	522	+ pm_runtime_get_noresume(&pdev->dev);
	523	+ pm_runtime_set_active(&pdev->dev);
	524	+ pm_runtime_enable(&pdev->dev);
	525	+
520	526	ret = of_property_read_u32(pdev->dev.of_node, "num-cs", &num_cs);
521	527	if (ret < 0)
522	528	master->num_chipselect = CDNS_SPI_DEFAULT_NUM_CS;
@@ -531,11 +537,6 @@ static int cdns_spi_probe(struct platform_device *pdev) · 8 unmodified lines
531	537	/* SPI controller initializations */
532	538	cdns_spi_init_hw(xspi);
533	539
534		− pm_runtime_set_active(&pdev->dev);
535		− pm_runtime_enable(&pdev->dev);
536		− pm_runtime_use_autosuspend(&pdev->dev);
537		− pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);
538		−
539	540	irq = platform_get_irq(pdev, 0);
540	541	if (irq <= 0) {
541	542	ret = -ENXIO;
@@ -566,6 +567,9 @@ static int cdns_spi_probe(struct platform_device *pdev) · 24 unmodified lines
566	567
567	568	master->bits_per_word_mask = SPI_BPW_MASK(8);
568	569
	570	+ pm_runtime_mark_last_busy(&pdev->dev);
	571	+ pm_runtime_put_autosuspend(&pdev->dev);
	572	+
569	573	ret = spi_register_master(master);
570	574	if (ret) {
571	575	dev_err(&pdev->dev, "spi_register_master failed\n");

drivers/spi/spi-imx.c+19−19

@@ -506,7 +506,7 @@ static int mx51_ecspi_prepare_message(struct spi_imx_data *spi_imx, · 505 unmodified lines
506	506	{
507	507	struct spi_device *spi = msg->spi;
508	508	u32 ctrl = MX51_ECSPI_CTRL_ENABLE;
509		− u32 testreg;
	509	+ u32 testreg, delay;
510	510	u32 cfg = readl(spi_imx->base + MX51_ECSPI_CONFIG);
511	511
512	512	/* set Master or Slave mode */
@@ -567,6 +567,23 @@ static int mx51_ecspi_prepare_message(struct spi_imx_data *spi_imx, · 54 unmodified lines
567	567
568	568	writel(cfg, spi_imx->base + MX51_ECSPI_CONFIG);
569	569
	570	+ /*
	571	+ * Wait until the changes in the configuration register CONFIGREG
	572	+ * propagate into the hardware. It takes exactly one tick of the
	573	+ * SCLK clock, but we will wait two SCLK clock just to be sure. The
	574	+ * effect of the delay it takes for the hardware to apply changes
	575	+ * is noticable if the SCLK clock run very slow. In such a case, if
	576	+ * the polarity of SCLK should be inverted, the GPIO ChipSelect might
	577	+ * be asserted before the SCLK polarity changes, which would disrupt
	578	+ * the SPI communication as the device on the other end would consider
	579	+ * the change of SCLK polarity as a clock tick already.
	580	+ */
	581	+ delay = (2 * 1000000) / spi_imx->spi_bus_clk;
	582	+ if (likely(delay < 10)) /* SCLK is faster than 100 kHz */
	583	+ udelay(delay);
	584	+ else /* SCLK is _very_ slow */
	585	+ usleep_range(delay, delay + 10);
	586	+
570	587	return 0;
571	588	}
572	589
@@ -574,7 +591,7 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx, · 1 unmodified line
574	591	struct spi_device *spi)
575	592	{
576	593	u32 ctrl = readl(spi_imx->base + MX51_ECSPI_CTRL);
577		− u32 clk, delay;
	594	+ u32 clk;
578	595
579	596	/* Clear BL field and set the right value */
580	597	ctrl &= ~MX51_ECSPI_CTRL_BL_MASK;
@@ -596,23 +613,6 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx, · 15 unmodified lines
596	613
597	614	writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL);
598	615
599		− /*
600		− * Wait until the changes in the configuration register CONFIGREG
601		− * propagate into the hardware. It takes exactly one tick of the
602		− * SCLK clock, but we will wait two SCLK clock just to be sure. The
603		− * effect of the delay it takes for the hardware to apply changes
604		− * is noticable if the SCLK clock run very slow. In such a case, if
605		− * the polarity of SCLK should be inverted, the GPIO ChipSelect might
606		− * be asserted before the SCLK polarity changes, which would disrupt
607		− * the SPI communication as the device on the other end would consider
608		− * the change of SCLK polarity as a clock tick already.
609		− */
610		− delay = (2 * 1000000) / clk;
611		− if (likely(delay < 10)) /* SCLK is faster than 100 kHz */
612		− udelay(delay);
613		− else /* SCLK is _very_ slow */
614		− usleep_range(delay, delay + 10);
615		−
616	616	return 0;
617	617	}
618	618

drivers/spi/spi-mt65xx.c+19−9

@@ -427,13 +427,23 @@ static int mtk_spi_fifo_transfer(struct spi_master *master, · 426 unmodified lines
427	427	mtk_spi_setup_packet(master);
428	428
429	429	cnt = xfer->len / 4;
430		− iowrite32_rep(mdata->base + SPI_TX_DATA_REG, xfer->tx_buf, cnt);
	430	+ if (xfer->tx_buf)
	431	+ iowrite32_rep(mdata->base + SPI_TX_DATA_REG, xfer->tx_buf, cnt);
	432	+
	433	+ if (xfer->rx_buf)
	434	+ ioread32_rep(mdata->base + SPI_RX_DATA_REG, xfer->rx_buf, cnt);
431	435
432	436	remainder = xfer->len % 4;
433	437	if (remainder > 0) {
434	438	reg_val = 0;
435		− memcpy(&reg_val, xfer->tx_buf + (cnt * 4), remainder);
436		− writel(reg_val, mdata->base + SPI_TX_DATA_REG);
	439	+ if (xfer->tx_buf) {
	440	+ memcpy(&reg_val, xfer->tx_buf + (cnt * 4), remainder);
	441	+ writel(reg_val, mdata->base + SPI_TX_DATA_REG);
	442	+ }
	443	+ if (xfer->rx_buf) {
	444	+ reg_val = readl(mdata->base + SPI_RX_DATA_REG);
	445	+ memcpy(xfer->rx_buf + (cnt * 4), &reg_val, remainder);
	446	+ }
437	447	}
438	448
439	449	mtk_spi_enable_transfer(master);
@@ -793,12 +803,6 @@ static int mtk_spi_probe(struct platform_device *pdev) · 353 unmodified lines
793	803
794	804	pm_runtime_enable(&pdev->dev);
795	805
796		− ret = devm_spi_register_master(&pdev->dev, master);
797		− if (ret) {
798		− dev_err(&pdev->dev, "failed to register master (%d)\n", ret);
799		− goto err_disable_runtime_pm;
800		− }
801		−
802	806	if (mdata->dev_comp->need_pad_sel) {
803	807	if (mdata->pad_num != master->num_chipselect) {
804	808	dev_err(&pdev->dev,
@@ -838,6 +842,12 @@ static int mtk_spi_probe(struct platform_device *pdev) · 33 unmodified lines
838	842	dev_notice(&pdev->dev, "SPI dma_set_mask(%d) failed, ret:%d\n",
839	843	addr_bits, ret);
840	844
	845	+ ret = devm_spi_register_master(&pdev->dev, master);
	846	+ if (ret) {
	847	+ dev_err(&pdev->dev, "failed to register master (%d)\n", ret);
	848	+ goto err_disable_runtime_pm;
	849	+ }
	850	+
841	851	return 0;
842	852
843	853	err_disable_runtime_pm:

drivers/spi/spi-stm32.c+17−7

@@ -884,15 +884,18 @@ static irqreturn_t stm32h7_spi_irq_thread(int irq, void *dev_id) · 883 unmodified lines
884	884	ier = readl_relaxed(spi->base + STM32H7_SPI_IER);
885	885
886	886	mask = ier;
887		− /* EOTIE is triggered on EOT, SUSP and TXC events. */
	887	+ /*
	888	+ * EOTIE enables irq from EOT, SUSP and TXC events. We need to set
	889	+ * SUSP to acknowledge it later. TXC is automatically cleared
	890	+ */
	891	+
888	892	mask \|= STM32H7_SPI_SR_SUSP;
889	893	/*
890		− * When TXTF is set, DXPIE and TXPIE are cleared. So in case of
891		− * Full-Duplex, need to poll RXP event to know if there are remaining
892		− * data, before disabling SPI.
	894	+ * DXPIE is set in Full-Duplex, one IT will be raised if TXP and RXP
	895	+ * are set. So in case of Full-Duplex, need to poll TXP and RXP event.
893	896	*/
894		− if (spi->rx_buf && !spi->cur_usedma)
895		− mask \|= STM32H7_SPI_SR_RXP;
	897	+ if ((spi->cur_comm == SPI_FULL_DUPLEX) && !spi->cur_usedma)
	898	+ mask \|= STM32H7_SPI_SR_TXP \| STM32H7_SPI_SR_RXP;
896	899
897	900	if (!(sr & mask)) {
898	901	dev_warn(spi->dev, "spurious IT (sr=0x%08x, ier=0x%08x)\n",
@@ -1925,6 +1928,7 @@ static int stm32_spi_probe(struct platform_device *pdev) · 1026 unmodified lines
1925	1928	master->can_dma = stm32_spi_can_dma;
1926	1929
1927	1930	pm_runtime_set_active(&pdev->dev);
	1931	+ pm_runtime_get_noresume(&pdev->dev);
1928	1932	pm_runtime_enable(&pdev->dev);
1929	1933
1930	1934	ret = spi_register_master(master);
@@ -1940,6 +1944,8 @@ static int stm32_spi_probe(struct platform_device *pdev) · 9 unmodified lines
1940	1944
1941	1945	err_pm_disable:
1942	1946	pm_runtime_disable(&pdev->dev);
	1947	+ pm_runtime_put_noidle(&pdev->dev);
	1948	+ pm_runtime_set_suspended(&pdev->dev);
1943	1949	err_dma_release:
1944	1950	if (spi->dma_tx)
1945	1951	dma_release_channel(spi->dma_tx);
@@ -1956,9 +1962,14 @@ static int stm32_spi_remove(struct platform_device *pdev) · 10 unmodified lines
1956	1962	struct spi_master *master = platform_get_drvdata(pdev);
1957	1963	struct stm32_spi *spi = spi_master_get_devdata(master);
1958	1964
	1965	+ pm_runtime_get_sync(&pdev->dev);
	1966	+
1959	1967	spi_unregister_master(master);
1960	1968	spi->cfg->disable(spi);
1961	1969
	1970	+ pm_runtime_disable(&pdev->dev);
	1971	+ pm_runtime_put_noidle(&pdev->dev);
	1972	+ pm_runtime_set_suspended(&pdev->dev);
1962	1973	if (master->dma_tx)
1963	1974	dma_release_channel(master->dma_tx);
1964	1975	if (master->dma_rx)
@@ -1966,7 +1977,6 @@ static int stm32_spi_remove(struct platform_device *pdev) · 1 unmodified line
1966	1977
1967	1978	clk_disable_unprepare(spi->clk);
1968	1979
1969		− pm_runtime_disable(&pdev->dev);
1970	1980
1971	1981	pinctrl_pm_select_sleep_state(&pdev->dev);
1972	1982

drivers/usb/gadget/udc/fsl_qe_udc.c+1−0

@@ -586,6 +586,7 @@ static int qe_ep_init(struct qe_udc *udc, · 585 unmodified lines
586	586	case USB_SPEED_FULL:
587	587	if (max <= 1023)
588	588	break;
	589	+ fallthrough;
589	590	default:
590	591	goto en_done;
591	592	}

drivers/video/fbdev/core/fbmem.c+5−7

@@ -970,13 +970,11 @@ fb_set_var(struct fb_info info, struct fb_var_screeninfo var) · 969 unmodified lines
970	970	fb_var_to_videomode(&mode2, &info->var);
971	971	/* make sure we don't delete the videomode of current var */
972	972	ret = fb_mode_is_equal(&mode1, &mode2);
973		−
974		− if (!ret)
975		− fbcon_mode_deleted(info, &mode1);
976		−
977		− if (!ret)
978		− fb_delete_videomode(&mode1, &info->modelist);
979		−
	973	+ if (!ret) {
	974	+ ret = fbcon_mode_deleted(info, &mode1);
	975	+ if (!ret)
	976	+ fb_delete_videomode(&mode1, &info->modelist);
	977	+ }
980	978
981	979	return ret ? -EINVAL : 0;
982	980	}

drivers/video/fbdev/xilinxfb.c+2−0

@@ -241,6 +241,8 @@ xilinx_fb_blank(int blank_mode, struct fb_info *fbi) · 240 unmodified lines
241	241	case FB_BLANK_POWERDOWN:
242	242	/* turn off panel */
243	243	xilinx_fb_out32(drvdata, REG_CTRL, 0);
	244	+ break;
	245	+
244	246	default:
245	247	break;
246	248	}

fs/afs/cmservice.c+7−18

@@ -29,16 +29,11 @@ static void SRXAFSCB_TellMeAboutYourself(struct work_struct *); · 28 unmodified lines
29	29
30	30	static int afs_deliver_yfs_cb_callback(struct afs_call *);
31	31
32		−#define CM_NAME(name) \
33		− char afs_SRXCB##name##_name[] __tracepoint_string = \
34		− "CB." #name
35		−
36	32	/*
37	33	* CB.CallBack operation type
38	34	*/
39		−static CM_NAME(CallBack);
40	35	static const struct afs_call_type afs_SRXCBCallBack = {
41		− .name = afs_SRXCBCallBack_name,
	36	+ .name = "CB.CallBack",
42	37	.deliver = afs_deliver_cb_callback,
43	38	.destructor = afs_cm_destructor,
44	39	.work = SRXAFSCB_CallBack,
@@ -47,9 +42,8 @@ static const struct afs_call_type afs_SRXCBCallBack = { · 2 unmodified lines
47	42	/*
48	43	* CB.InitCallBackState operation type
49	44	*/
50		−static CM_NAME(InitCallBackState);
51	45	static const struct afs_call_type afs_SRXCBInitCallBackState = {
52		− .name = afs_SRXCBInitCallBackState_name,
	46	+ .name = "CB.InitCallBackState",
53	47	.deliver = afs_deliver_cb_init_call_back_state,
54	48	.destructor = afs_cm_destructor,
55	49	.work = SRXAFSCB_InitCallBackState,
@@ -58,9 +52,8 @@ static const struct afs_call_type afs_SRXCBInitCallBackState = { · 2 unmodified lines
58	52	/*
59	53	* CB.InitCallBackState3 operation type
60	54	*/
61		−static CM_NAME(InitCallBackState3);
62	55	static const struct afs_call_type afs_SRXCBInitCallBackState3 = {
63		− .name = afs_SRXCBInitCallBackState3_name,
	56	+ .name = "CB.InitCallBackState3",
64	57	.deliver = afs_deliver_cb_init_call_back_state3,
65	58	.destructor = afs_cm_destructor,
66	59	.work = SRXAFSCB_InitCallBackState,
@@ -69,9 +62,8 @@ static const struct afs_call_type afs_SRXCBInitCallBackState3 = { · 2 unmodified lines
69	62	/*
70	63	* CB.Probe operation type
71	64	*/
72		−static CM_NAME(Probe);
73	65	static const struct afs_call_type afs_SRXCBProbe = {
74		− .name = afs_SRXCBProbe_name,
	66	+ .name = "CB.Probe",
75	67	.deliver = afs_deliver_cb_probe,
76	68	.destructor = afs_cm_destructor,
77	69	.work = SRXAFSCB_Probe,
@@ -80,9 +72,8 @@ static const struct afs_call_type afs_SRXCBProbe = { · 2 unmodified lines
80	72	/*
81	73	* CB.ProbeUuid operation type
82	74	*/
83		−static CM_NAME(ProbeUuid);
84	75	static const struct afs_call_type afs_SRXCBProbeUuid = {
85		− .name = afs_SRXCBProbeUuid_name,
	76	+ .name = "CB.ProbeUuid",
86	77	.deliver = afs_deliver_cb_probe_uuid,
87	78	.destructor = afs_cm_destructor,
88	79	.work = SRXAFSCB_ProbeUuid,
@@ -91,9 +82,8 @@ static const struct afs_call_type afs_SRXCBProbeUuid = { · 2 unmodified lines
91	82	/*
92	83	* CB.TellMeAboutYourself operation type
93	84	*/
94		−static CM_NAME(TellMeAboutYourself);
95	85	static const struct afs_call_type afs_SRXCBTellMeAboutYourself = {
96		− .name = afs_SRXCBTellMeAboutYourself_name,
	86	+ .name = "CB.TellMeAboutYourself",
97	87	.deliver = afs_deliver_cb_tell_me_about_yourself,
98	88	.destructor = afs_cm_destructor,
99	89	.work = SRXAFSCB_TellMeAboutYourself,
@@ -102,9 +92,8 @@ static const struct afs_call_type afs_SRXCBTellMeAboutYourself = { · 2 unmodified lines
102	92	/*
103	93	* YFS CB.CallBack operation type
104	94	*/
105		−static CM_NAME(YFS_CallBack);
106	95	static const struct afs_call_type afs_SRXYFSCB_CallBack = {
107		− .name = afs_SRXCBYFS_CallBack_name,
	96	+ .name = "YFSCB.CallBack",
108	97	.deliver = afs_deliver_yfs_cb_callback,
109	98	.destructor = afs_cm_destructor,
110	99	.work = SRXAFSCB_CallBack,

fs/afs/dir.c+6−4

@@ -656,7 +656,6 @@ static int afs_do_lookup_one(struct inode dir, struct dentry dentry, · 655 unmodified lines
656	656	return ret;
657	657	}
658	658
659		− ret = -ENOENT;
660	659	if (!cookie.found) {
661	660	_leave(" = -ENOENT [not found]");
662	661	return -ENOENT;
@@ -2020,17 +2019,20 @@ static int afs_rename(struct user_namespace mnt_userns, struct inode old_dir, · 1357 unmodified lines
2020	2019
2021	2020	if (d_count(new_dentry) > 2) {
2022	2021	/* copy the target dentry's name */
2023		− ret = -ENOMEM;
2024	2022	op->rename.tmp = d_alloc(new_dentry->d_parent,
2025	2023	&new_dentry->d_name);
2026		− if (!op->rename.tmp)
	2024	+ if (!op->rename.tmp) {
	2025	+ op->error = -ENOMEM;
2027	2026	goto error;
	2027	+ }
2028	2028
2029	2029	ret = afs_sillyrename(new_dvnode,
2030	2030	AFS_FS_I(d_inode(new_dentry)),
2031	2031	new_dentry, op->key);
2032		− if (ret)
	2032	+ if (ret) {
	2033	+ op->error = ret;
2033	2034	goto error;
	2035	+ }
2034	2036
2035	2037	op->dentry_2 = op->rename.tmp;
2036	2038	op->rename.rehash = NULL;

fs/afs/write.c+12−6

@@ -771,14 +771,20 @@ int afs_writepages(struct address_space *mapping, · 770 unmodified lines
771	771	if (wbc->range_cyclic) {
772	772	start = mapping->writeback_index * PAGE_SIZE;
773	773	ret = afs_writepages_region(mapping, wbc, start, LLONG_MAX, &next);
774		− if (start > 0 && wbc->nr_to_write > 0 && ret == 0)
775		− ret = afs_writepages_region(mapping, wbc, 0, start,
776		− &next);
777		− mapping->writeback_index = next / PAGE_SIZE;
	774	+ if (ret == 0) {
	775	+ mapping->writeback_index = next / PAGE_SIZE;
	776	+ if (start > 0 && wbc->nr_to_write > 0) {
	777	+ ret = afs_writepages_region(mapping, wbc, 0,
	778	+ start, &next);
	779	+ if (ret == 0)
	780	+ mapping->writeback_index =
	781	+ next / PAGE_SIZE;
	782	+ }
	783	+ }
778	784	} else if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
779	785	ret = afs_writepages_region(mapping, wbc, 0, LLONG_MAX, &next);
780		− if (wbc->nr_to_write > 0)
781		− mapping->writeback_index = next;
	786	+ if (wbc->nr_to_write > 0 && ret == 0)
	787	+ mapping->writeback_index = next / PAGE_SIZE;
782	788	} else {
783	789	ret = afs_writepages_region(mapping, wbc,
784	790	wbc->range_start, wbc->range_end, &next);

fs/cifs/cifs_dfs_ref.c+5−1

@@ -176,7 +176,7 @@ char cifs_compose_mount_options(const char sb_mountdata, · 175 unmodified lines
176	176	}
177	177	}
178	178
179		− rc = dns_resolve_server_name_to_ip(name, &srvIP);
	179	+ rc = dns_resolve_server_name_to_ip(name, &srvIP, NULL);
180	180	if (rc < 0) {
181	181	cifs_dbg(FYI, "%s: Failed to resolve server part of %s to IP: %d\n",
182	182	__func__, name, rc);
@@ -211,6 +211,10 @@ char cifs_compose_mount_options(const char sb_mountdata, · 28 unmodified lines
211	211	else
212	212	noff = tkn_e - (sb_mountdata + off) + 1;
213	213
	214	+ if (strncasecmp(sb_mountdata + off, "cruid=", 6) == 0) {
	215	+ off += noff;
	216	+ continue;
	217	+ }
214	218	if (strncasecmp(sb_mountdata + off, "unc=", 4) == 0) {
215	219	off += noff;
216	220	continue;

fs/cifs/cifsglob.h+7−0

@@ -75,6 +75,9 @@ · 74 unmodified lines
75	75	#define SMB_ECHO_INTERVAL_MAX 600
76	76	#define SMB_ECHO_INTERVAL_DEFAULT 60
77	77
	78	+/* dns resolution interval in seconds */
	79	+#define SMB_DNS_RESOLVE_INTERVAL_DEFAULT 600
	80	+
78	81	/* maximum number of PDUs in one compound */
79	82	#define MAX_COMPOUND 5
80	83
@@ -646,6 +649,7 @@ struct TCP_Server_Info { · 565 unmodified lines
646	649	/* point to the SMBD connection if RDMA is used instead of socket */
647	650	struct smbd_connection *smbd_conn;
648	651	struct delayed_work echo; /* echo ping workqueue job */
	652	+ struct delayed_work resolve; /* dns resolution workqueue job */
649	653	char smallbuf; / pointer to current "small" buffer */
650	654	char bigbuf; / pointer to current "big" buffer */
651	655	/* Total size of this PDU. Only valid from cifs_demultiplex_thread */
@@ -689,6 +693,9 @@ struct TCP_Server_Info { · 37 unmodified lines
689	693	bool use_swn_dstaddr;
690	694	struct sockaddr_storage swn_dstaddr;
691	695	#endif
	696	+#ifdef CONFIG_CIFS_DFS_UPCALL
	697	+ bool is_dfs_conn; /* if a dfs connection */
	698	+#endif
692	699	};
693	700
694	701	struct cifs_credits {

fs/cifs/connect.c+99−11

@@ -78,6 +78,8 @@ static int reconn_set_ipaddr_from_hostname(struct TCP_Server_Info *server) · 77 unmodified lines
78	78	int rc;
79	79	int len;
80	80	char unc, ipaddr = NULL;
	81	+ time64_t expiry, now;
	82	+ unsigned long ttl = SMB_DNS_RESOLVE_INTERVAL_DEFAULT;
81	83
82	84	if (!server->hostname)
83	85	return -EINVAL;
@@ -91,13 +93,13 @@ static int reconn_set_ipaddr_from_hostname(struct TCP_Server_Info *server) · 7 unmodified lines
91	93	}
92	94	scnprintf(unc, len, "\\\\%s", server->hostname);
93	95
94		− rc = dns_resolve_server_name_to_ip(unc, &ipaddr);
	96	+ rc = dns_resolve_server_name_to_ip(unc, &ipaddr, &expiry);
95	97	kfree(unc);
96	98
97	99	if (rc < 0) {
98	100	cifs_dbg(FYI, "%s: failed to resolve server part of %s to IP: %d\n",
99	101	__func__, server->hostname, rc);
100		− return rc;
	102	+ goto requeue_resolve;
101	103	}
102	104
103	105	spin_lock(&cifs_tcp_ses_lock);
@@ -106,7 +108,45 @@ static int reconn_set_ipaddr_from_hostname(struct TCP_Server_Info *server) · 2 unmodified lines
106	108	spin_unlock(&cifs_tcp_ses_lock);
107	109	kfree(ipaddr);
108	110
109		− return !rc ? -1 : 0;
	111	+ /* rc == 1 means success here */
	112	+ if (rc) {
	113	+ now = ktime_get_real_seconds();
	114	+ if (expiry && expiry > now)
	115	+ /*
	116	+ * To make sure we don't use the cached entry, retry 1s
	117	+ * after expiry.
	118	+ */
	119	+ ttl = (expiry - now + 1);
	120	+ }
	121	+ rc = !rc ? -1 : 0;
	122	+
	123	+requeue_resolve:
	124	+ cifs_dbg(FYI, "%s: next dns resolution scheduled for %lu seconds in the future\n",
	125	+ __func__, ttl);
	126	+ mod_delayed_work(cifsiod_wq, &server->resolve, (ttl * HZ));
	127	+
	128	+ return rc;
	129	+}
	130	+
	131	+
	132	+static void cifs_resolve_server(struct work_struct *work)
	133	+{
	134	+ int rc;
	135	+ struct TCP_Server_Info *server = container_of(work,
	136	+ struct TCP_Server_Info, resolve.work);
	137	+
	138	+ mutex_lock(&server->srv_mutex);
	139	+
	140	+ /*
	141	+ * Resolve the hostname again to make sure that IP address is up-to-date.
	142	+ */
	143	+ rc = reconn_set_ipaddr_from_hostname(server);
	144	+ if (rc) {
	145	+ cifs_dbg(FYI, "%s: failed to resolve hostname: %d\n",
	146	+ __func__, rc);
	147	+ }
	148	+
	149	+ mutex_unlock(&server->srv_mutex);
110	150	}
111	151
112	152	#ifdef CONFIG_CIFS_DFS_UPCALL
@@ -680,6 +720,7 @@ static void clean_demultiplex_info(struct TCP_Server_Info *server) · 567 unmodified lines
680	720	spin_unlock(&cifs_tcp_ses_lock);
681	721
682	722	cancel_delayed_work_sync(&server->echo);
	723	+ cancel_delayed_work_sync(&server->resolve);
683	724
684	725	spin_lock(&GlobalMid_Lock);
685	726	server->tcpStatus = CifsExiting;
@@ -1227,6 +1268,16 @@ cifs_find_tcp_session(struct smb3_fs_context *ctx) · 541 unmodified lines
1227	1268
1228	1269	spin_lock(&cifs_tcp_ses_lock);
1229	1270	list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
	1271	+#ifdef CONFIG_CIFS_DFS_UPCALL
	1272	+ /*
	1273	+ * DFS failover implementation in cifs_reconnect() requires unique tcp sessions for
	1274	+ * DFS connections to do failover properly, so avoid sharing them with regular
	1275	+ * shares or even links that may connect to same server but having completely
	1276	+ * different failover targets.
	1277	+ */
	1278	+ if (server->is_dfs_conn)
	1279	+ continue;
	1280	+#endif
1230	1281	/*
1231	1282	* Skip ses channels since they're only handled in lower layers
1232	1283	* (e.g. cifs_send_recv).
@@ -1254,12 +1305,16 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect) · 21 unmodified lines
1254	1305	return;
1255	1306	}
1256	1307
	1308	+ /* srv_count can never go negative */
	1309	+ WARN_ON(server->srv_count < 0);
	1310	+
1257	1311	put_net(cifs_net_ns(server));
1258	1312
1259	1313	list_del_init(&server->tcp_ses_list);
1260	1314	spin_unlock(&cifs_tcp_ses_lock);
1261	1315
1262	1316	cancel_delayed_work_sync(&server->echo);
	1317	+ cancel_delayed_work_sync(&server->resolve);
1263	1318
1264	1319	if (from_reconnect)
1265	1320	/*
@@ -1342,6 +1397,7 @@ cifs_get_tcp_session(struct smb3_fs_context *ctx) · 76 unmodified lines
1342	1397	INIT_LIST_HEAD(&tcp_ses->tcp_ses_list);
1343	1398	INIT_LIST_HEAD(&tcp_ses->smb_ses_list);
1344	1399	INIT_DELAYED_WORK(&tcp_ses->echo, cifs_echo_request);
	1400	+ INIT_DELAYED_WORK(&tcp_ses->resolve, cifs_resolve_server);
1345	1401	INIT_DELAYED_WORK(&tcp_ses->reconnect, smb2_reconnect_server);
1346	1402	mutex_init(&tcp_ses->reconnect_mutex);
1347	1403	memcpy(&tcp_ses->srcaddr, &ctx->srcaddr,
@@ -1427,6 +1483,12 @@ smbd_connected: · 79 unmodified lines
1427	1483	/* queue echo request delayed work */
1428	1484	queue_delayed_work(cifsiod_wq, &tcp_ses->echo, tcp_ses->echo_interval);
1429	1485
	1486	+ /* queue dns resolution delayed work */
	1487	+ cifs_dbg(FYI, "%s: next dns resolution scheduled for %d seconds in the future\n",
	1488	+ __func__, SMB_DNS_RESOLVE_INTERVAL_DEFAULT);
	1489	+
	1490	+ queue_delayed_work(cifsiod_wq, &tcp_ses->resolve, (SMB_DNS_RESOLVE_INTERVAL_DEFAULT * HZ));
	1491	+
1430	1492	return tcp_ses;
1431	1493
1432	1494	out_err_crypto_release:
@@ -1605,6 +1667,9 @@ void cifs_put_smb_ses(struct cifs_ses *ses) · 172 unmodified lines
1605	1667	}
1606	1668	spin_unlock(&cifs_tcp_ses_lock);
1607	1669
	1670	+ /* ses_count can never go negative */
	1671	+ WARN_ON(ses->ses_count < 0);
	1672	+
1608	1673	spin_lock(&GlobalMid_Lock);
1609	1674	if (ses->status == CifsGood)
1610	1675	ses->status = CifsExiting;
@@ -1972,6 +2037,9 @@ cifs_put_tcon(struct cifs_tcon *tcon) · 361 unmodified lines
1972	2037	return;
1973	2038	}
1974	2039
	2040	+ /* tc_count can never go negative */
	2041	+ WARN_ON(tcon->tc_count < 0);
	2042	+
1975	2043	if (tcon->use_witness) {
1976	2044	int rc;
1977	2045
@@ -2910,6 +2978,23 @@ static int mount_setup_tlink(struct cifs_sb_info cifs_sb, struct cifs_ses ses, · 932 unmodified lines
2910	2978	}
2911	2979
2912	2980	#ifdef CONFIG_CIFS_DFS_UPCALL
	2981	+static int mount_get_dfs_conns(struct smb3_fs_context ctx, struct cifs_sb_info cifs_sb,
	2982	+ unsigned int xid, struct TCP_Server_Info *nserver,
	2983	+ struct cifs_ses nses, struct cifs_tcon ntcon)
	2984	+{
	2985	+ int rc;
	2986	+
	2987	+ ctx->nosharesock = true;
	2988	+ rc = mount_get_conns(ctx, cifs_sb, xid, nserver, nses, ntcon);
	2989	+ if (*nserver) {
	2990	+ cifs_dbg(FYI, "%s: marking tcp session as a dfs connection\n", __func__);
	2991	+ spin_lock(&cifs_tcp_ses_lock);
	2992	+ (*nserver)->is_dfs_conn = true;
	2993	+ spin_unlock(&cifs_tcp_ses_lock);
	2994	+ }
	2995	+ return rc;
	2996	+}
	2997	+
2913	2998	/*
2914	2999	* cifs_build_path_to_root returns full path to root when we do not have an
2915	3000	* existing connection (tcon)
@@ -3105,7 +3190,7 @@ static int do_dfs_failover(const char path, const char full_path, struct cifs_ · 189 unmodified lines
3105	3190	tmp_ctx.prepath);
3106	3191
3107	3192	mount_put_conns(cifs_sb, xid, server, ses, tcon);
3108		− rc = mount_get_conns(&tmp_ctx, cifs_sb, xid, server, ses, tcon);
	3193	+ rc = mount_get_dfs_conns(&tmp_ctx, cifs_sb, xid, server, ses, tcon);
3109	3194	if (!rc \|\| (server && ses)) {
3110	3195	/*
3111	3196	* We were able to connect to new target server. Update current context with
@@ -3404,7 +3489,12 @@ int cifs_mount(struct cifs_sb_info cifs_sb, struct smb3_fs_context ctx) · 292 unmodified lines
3404	3489	goto error;
3405	3490	}
3406	3491
3407		− ctx->nosharesock = true;
	3492	+ mount_put_conns(cifs_sb, xid, server, ses, tcon);
	3493	+ /*
	3494	+ * Ignore error check here because we may failover to other targets from cached a
	3495	+ * referral.
	3496	+ */
	3497	+ (void)mount_get_dfs_conns(ctx, cifs_sb, &xid, &server, &ses, &tcon);
3408	3498
3409	3499	/* Get path of DFS root */
3410	3500	ref_path = build_unc_path_to_root(ctx, cifs_sb, false);
@@ -3433,7 +3523,7 @@ int cifs_mount(struct cifs_sb_info cifs_sb, struct smb3_fs_context ctx) · 22 unmodified lines
3433	3523	/* Connect to new DFS target only if we were redirected */
3434	3524	if (oldmnt != cifs_sb->ctx->mount_options) {
3435	3525	mount_put_conns(cifs_sb, xid, server, ses, tcon);
3436		− rc = mount_get_conns(ctx, cifs_sb, &xid, &server, &ses, &tcon);
	3526	+ rc = mount_get_dfs_conns(ctx, cifs_sb, &xid, &server, &ses, &tcon);
3437	3527	}
3438	3528	if (rc && !server && !ses) {
3439	3529	/* Failed to connect. Try to connect to other targets in the referral. */
@@ -3459,7 +3549,7 @@ int cifs_mount(struct cifs_sb_info cifs_sb, struct smb3_fs_context ctx) · 19 unmodified lines
3459	3549	rc = -ELOOP;
3460	3550	} while (rc == -EREMOTE);
3461	3551
3462		− if (rc \|\| !tcon)
	3552	+ if (rc \|\| !tcon \|\| !ses)
3463	3553	goto error;
3464	3554
3465	3555	kfree(ref_path);
@@ -4095,7 +4185,8 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru · 629 unmodified lines
4095	4185	if (!tree)
4096	4186	return -ENOMEM;
4097	4187
4098		− if (!tcon->dfs_path) {
	4188	+ /* If it is not dfs or there was no cached dfs referral, then reconnect to same share */
	4189	+ if (!tcon->dfs_path \|\| dfs_cache_noreq_find(tcon->dfs_path + 1, &ref, &tl)) {
4099	4190	if (tcon->ipc) {
4100	4191	scnprintf(tree, MAX_TREE_SIZE, "\\\\%s\\IPC$", server->hostname);
4101	4192	rc = ops->tree_connect(xid, tcon->ses, tree, tcon, nlsc);
@@ -4105,9 +4196,6 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru · 3 unmodified lines
4105	4196	goto out;
4106	4197	}
4107	4198
4108		− rc = dfs_cache_noreq_find(tcon->dfs_path + 1, &ref, &tl);
4109		− if (rc)
4110		− goto out;
4111	4199	isroot = ref.server_type == DFS_TYPE_ROOT;
4112	4200	free_dfs_info_param(&ref);
4113	4201

fs/cifs/dns_resolve.c+6−4

@@ -24,6 +24,7 @@ · 23 unmodified lines
24	24	* dns_resolve_server_name_to_ip - Resolve UNC server name to ip address.
25	25	* @unc: UNC path specifying the server (with '/' as delimiter)
26	26	* @ip_addr: Where to return the IP address.
	27	+ * @expiry: Where to return the expiry time for the dns record.
27	28	*
28	29	* The IP address will be returned in string form, and the caller is
29	30	* responsible for freeing it.
@@ -31,7 +32,7 @@ · 1 unmodified line
31	32	* Returns length of result on success, -ve on error.
32	33	*/
33	34	int
34		−dns_resolve_server_name_to_ip(const char unc, char *ip_addr)
	35	+dns_resolve_server_name_to_ip(const char unc, char ip_addr, time64_t expiry)
35	36	{
36	37	struct sockaddr_storage ss;
37	38	const char hostname, sep;
@@ -66,13 +67,14 @@ dns_resolve_server_name_to_ip(const char unc, char *ip_addr) · 28 unmodified lines
66	67
67	68	/* Perform the upcall */
68	69	rc = dns_query(current->nsproxy->net_ns, NULL, hostname, len,
69		− NULL, ip_addr, NULL, false);
	70	+ NULL, ip_addr, expiry, false);
70	71	if (rc < 0)
71	72	cifs_dbg(FYI, "%s: unable to resolve: %.s\n",
72	73	__func__, len, len, hostname);
73	74	else
74		− cifs_dbg(FYI, "%s: resolved: %.s to %s\n",
75		− __func__, len, len, hostname, *ip_addr);
	75	+ cifs_dbg(FYI, "%s: resolved: %.s to %s expiry %llu\n",
	76	+ __func__, len, len, hostname, *ip_addr,
	77	+ expiry ? (*expiry) : 0);
76	78	return rc;
77	79
78	80	name_is_IP_address:

fs/cifs/dns_resolve.h+1−1

@@ -12,7 +12,7 @@ · 11 unmodified lines
12	12	#define _DNS_RESOLVE_H
13	13
14	14	#ifdef __KERNEL__
15		−extern int dns_resolve_server_name_to_ip(const char unc, char *ip_addr);
	15	+extern int dns_resolve_server_name_to_ip(const char unc, char ip_addr, time64_t expiry);
16	16	#endif /* KERNEL */
17	17
18	18	#endif /* _DNS_RESOLVE_H */

fs/cifs/misc.c+1−1

@@ -1187,7 +1187,7 @@ int match_target_ip(struct TCP_Server_Info *server, · 1186 unmodified lines
1187	1187
1188	1188	cifs_dbg(FYI, "%s: target name: %s\n", __func__, target + 2);
1189	1189
1190		− rc = dns_resolve_server_name_to_ip(target, &tip);
	1190	+ rc = dns_resolve_server_name_to_ip(target, &tip, NULL);
1191	1191	if (rc < 0)
1192	1192	goto out;
1193	1193

fs/cifs/smb2ops.c+4−2

@@ -557,8 +557,8 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, · 556 unmodified lines
557	557	p = buf;
558	558	while (bytes_left >= sizeof(*p)) {
559	559	info->speed = le64_to_cpu(p->LinkSpeed);
560		− info->rdma_capable = le32_to_cpu(p->Capability & RDMA_CAPABLE);
561		− info->rss_capable = le32_to_cpu(p->Capability & RSS_CAPABLE);
	560	+ info->rdma_capable = le32_to_cpu(p->Capability & RDMA_CAPABLE) ? 1 : 0;
	561	+ info->rss_capable = le32_to_cpu(p->Capability & RSS_CAPABLE) ? 1 : 0;
562	562
563	563	cifs_dbg(FYI, "%s: adding iface %zu\n", __func__, *iface_count);
564	564	cifs_dbg(FYI, "%s: speed %zu bps\n", __func__, info->speed);
@@ -2910,6 +2910,8 @@ smb2_get_dfs_refer(const unsigned int xid, struct cifs_ses *ses, · 2345 unmodified lines
2910	2910	/* ipc tcons are not refcounted */
2911	2911	spin_lock(&cifs_tcp_ses_lock);
2912	2912	tcon->tc_count--;
	2913	+ /* tc_count can never go negative */
	2914	+ WARN_ON(tcon->tc_count < 0);
2913	2915	spin_unlock(&cifs_tcp_ses_lock);
2914	2916	}
2915	2917	kfree(utf16_path);

fs/cifs/smb2pdu.h+1−0

@@ -394,6 +394,7 @@ struct smb2_compression_capabilities_context { · 393 unmodified lines
394	394	__u16 Padding;
395	395	__u32 Flags;
396	396	__le16 CompressionAlgorithms[3];
	397	+ __u16 Pad; /* Some servers require pad to DataLen multiple of 8 */
397	398	/* Check if pad needed */
398	399	} __packed;
399	400

fs/configfs/file.c+22−7

@@ -91,7 +91,10 @@ static ssize_t configfs_read_iter(struct kiocb iocb, struct iov_iter to) · 90 unmodified lines
91	91	}
92	92	pr_debug("%s: count = %zd, pos = %lld, buf = %s\n",
93	93	__func__, iov_iter_count(to), iocb->ki_pos, buffer->page);
94		− retval = copy_to_iter(buffer->page, buffer->count, to);
	94	+ if (iocb->ki_pos >= buffer->count)
	95	+ goto out;
	96	+ retval = copy_to_iter(buffer->page + iocb->ki_pos,
	97	+ buffer->count - iocb->ki_pos, to);
95	98	iocb->ki_pos += retval;
96	99	if (retval == 0)
97	100	retval = -EFAULT;
@@ -162,7 +165,10 @@ static ssize_t configfs_bin_read_iter(struct kiocb iocb, struct iov_iter to) · 64 unmodified lines
162	165	buffer->needs_read_fill = 0;
163	166	}
164	167
165		− retval = copy_to_iter(buffer->bin_buffer, buffer->bin_buffer_size, to);
	168	+ if (iocb->ki_pos >= buffer->bin_buffer_size)
	169	+ goto out;
	170	+ retval = copy_to_iter(buffer->bin_buffer + iocb->ki_pos,
	171	+ buffer->bin_buffer_size - iocb->ki_pos, to);
166	172	iocb->ki_pos += retval;
167	173	if (retval == 0)
168	174	retval = -EFAULT;
@@ -171,21 +177,28 @@ out: · 2 unmodified lines
171	177	return retval;
172	178	}
173	179
174		−static int fill_write_buffer(struct configfs_buffer *buffer,
	180	+/* Fill [buffer, buffer + pos) with data coming from @from. */
	181	+static int fill_write_buffer(struct configfs_buffer *buffer, loff_t pos,
175	182	struct iov_iter *from)
176	183	{
	184	+ loff_t to_copy;
177	185	int copied;
	186	+ u8 *to;
178	187
179	188	if (!buffer->page)
180	189	buffer->page = (char *)__get_free_pages(GFP_KERNEL, 0);
181	190	if (!buffer->page)
182	191	return -ENOMEM;
183	192
184		− copied = copy_from_iter(buffer->page, SIMPLE_ATTR_SIZE - 1, from);
	193	+ to_copy = SIMPLE_ATTR_SIZE - 1 - pos;
	194	+ if (to_copy <= 0)
	195	+ return 0;
	196	+ to = buffer->page + pos;
	197	+ copied = copy_from_iter(to, to_copy, from);
185	198	buffer->needs_read_fill = 1;
186	199	/* if buf is assumed to contain a string, terminate it by \0,
187	200	* so e.g. sscanf() can scan the string easily */
188		− buffer->page[copied] = 0;
	201	+ to[copied] = 0;
189	202	return copied ? : -EFAULT;
190	203	}
191	204
@@ -217,7 +230,7 @@ static ssize_t configfs_write_iter(struct kiocb iocb, struct iov_iter from) · 25 unmodified lines
217	230	ssize_t len;
218	231
219	232	mutex_lock(&buffer->mutex);
220		− len = fill_write_buffer(buffer, from);
	233	+ len = fill_write_buffer(buffer, iocb->ki_pos, from);
221	234	if (len > 0)
222	235	len = flush_write_buffer(file, buffer, len);
223	236	if (len > 0)
@@ -272,7 +285,9 @@ static ssize_t configfs_bin_write_iter(struct kiocb *iocb, · 48 unmodified lines
272	285	buffer->bin_buffer_size = end_offset;
273	286	}
274	287
275		− len = copy_from_iter(buffer->bin_buffer, buffer->bin_buffer_size, from);
	288	+ len = copy_from_iter(buffer->bin_buffer + iocb->ki_pos,
	289	+ buffer->bin_buffer_size - iocb->ki_pos, from);
	290	+ iocb->ki_pos += len;
276	291	out:
277	292	mutex_unlock(&buffer->mutex);
278	293	return len ? : -EFAULT;

fs/fcntl.c+1−1

@@ -369,8 +369,8 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg, · 368 unmodified lines
369	369	/* 32-bit arches must use fcntl64() */
370	370	case F_OFD_SETLK:
371	371	case F_OFD_SETLKW:
372		−#endif
373	372	fallthrough;
	373	+#endif
374	374	case F_SETLK:
375	375	case F_SETLKW:
376	376	if (copy_from_user(&flock, argp, sizeof(flock)))

fs/hfs/bfind.c+13−1

@@ -25,7 +25,19 @@ int hfs_find_init(struct hfs_btree tree, struct hfs_find_data fd) · 24 unmodified lines
25	25	fd->key = ptr + tree->max_key_len + 2;
26	26	hfs_dbg(BNODE_REFS, "find_init: %d (%p)\n",
27	27	tree->cnid, __builtin_return_address(0));
28		− mutex_lock(&tree->tree_lock);
	28	+ switch (tree->cnid) {
	29	+ case HFS_CAT_CNID:
	30	+ mutex_lock_nested(&tree->tree_lock, CATALOG_BTREE_MUTEX);
	31	+ break;
	32	+ case HFS_EXT_CNID:
	33	+ mutex_lock_nested(&tree->tree_lock, EXTENTS_BTREE_MUTEX);
	34	+ break;
	35	+ case HFS_ATTR_CNID:
	36	+ mutex_lock_nested(&tree->tree_lock, ATTR_BTREE_MUTEX);
	37	+ break;
	38	+ default:
	39	+ return -EINVAL;
	40	+ }
29	41	return 0;
30	42	}
31	43

fs/hfs/bnode.c+20−5

@@ -15,16 +15,31 @@ · 14 unmodified lines
15	15
16	16	#include "btree.h"
17	17
18		−void hfs_bnode_read(struct hfs_bnode node, void buf,
19		− int off, int len)
	18	+void hfs_bnode_read(struct hfs_bnode node, void buf, int off, int len)
20	19	{
21	20	struct page *page;
	21	+ int pagenum;
	22	+ int bytes_read;
	23	+ int bytes_to_read;
	24	+ void *vaddr;
22	25
23	26	off += node->page_offset;
24		− page = node->page[0];
	27	+ pagenum = off >> PAGE_SHIFT;
	28	+ off &= ~PAGE_MASK; /* compute page offset for the first page */
25	29
26		− memcpy(buf, kmap(page) + off, len);
27		− kunmap(page);
	30	+ for (bytes_read = 0; bytes_read < len; bytes_read += bytes_to_read) {
	31	+ if (pagenum >= node->tree->pages_per_bnode)
	32	+ break;
	33	+ page = node->page[pagenum];
	34	+ bytes_to_read = min_t(int, len - bytes_read, PAGE_SIZE - off);
	35	+
	36	+ vaddr = kmap_atomic(page);
	37	+ memcpy(buf + bytes_read, vaddr + off, bytes_to_read);
	38	+ kunmap_atomic(vaddr);
	39	+
	40	+ pagenum++;
	41	+ off = 0; /* page offset only applies to the first page */
	42	+ }
28	43	}
29	44
30	45	u16 hfs_bnode_read_u16(struct hfs_bnode *node, int off)

fs/hfs/btree.h+7−0

@@ -13,6 +13,13 @@ typedef int (btree_keycmp)(const btree_key , const btree_key *); · 12 unmodified lines
13	13
14	14	#define NODE_HASH_SIZE 256
15	15
	16	+/* B-tree mutex nested subclasses */
	17	+enum hfs_btree_mutex_classes {
	18	+ CATALOG_BTREE_MUTEX,
	19	+ EXTENTS_BTREE_MUTEX,
	20	+ ATTR_BTREE_MUTEX,
	21	+};
	22	+
16	23	/* A HFS BTree held in memory */
17	24	struct hfs_btree {
18	25	struct super_block *sb;

fs/hfs/super.c+5−5

@@ -420,14 +420,12 @@ static int hfs_fill_super(struct super_block sb, void data, int silent) · 419 unmodified lines
420	420	if (!res) {
421	421	if (fd.entrylength > sizeof(rec) \|\| fd.entrylength < 0) {
422	422	res = -EIO;
423		− goto bail;
	423	+ goto bail_hfs_find;
424	424	}
425	425	hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, fd.entrylength);
426	426	}
427		− if (res) {
428		− hfs_find_exit(&fd);
429		− goto bail_no_root;
430		− }
	427	+ if (res)
	428	+ goto bail_hfs_find;
431	429	res = -EINVAL;
432	430	root_inode = hfs_iget(sb, &fd.search_key->cat, &rec);
433	431	hfs_find_exit(&fd);
@@ -443,6 +441,8 @@ static int hfs_fill_super(struct super_block sb, void data, int silent) · 9 unmodified lines
443	441	/* everything's okay */
444	442	return 0;
445	443
	444	+bail_hfs_find:
	445	+ hfs_find_exit(&fd);
446	446	bail_no_root:
447	447	pr_err("get root inode failed\n");
448	448	bail:

fs/io_uring.c+5−3

@@ -2016,7 +2016,7 @@ static void io_req_task_submit(struct io_kiocb *req) · 2015 unmodified lines
2016	2016
2017	2017	/* ctx stays valid until unlock, even if we drop all ours ctx->refs */
2018	2018	mutex_lock(&ctx->uring_lock);
2019		− if (!(current->flags & PF_EXITING) && !current->in_execve)
	2019	+ if (!(req->task->flags & PF_EXITING) && !req->task->in_execve)
2020	2020	__io_queue_sqe(req);
2021	2021	else
2022	2022	io_req_complete_failed(req, -EFAULT);
@@ -6019,11 +6019,13 @@ static bool io_drain_req(struct io_kiocb *req) · 3996 unmodified lines
6019	6019
6020	6020	ret = io_req_prep_async(req);
6021	6021	if (ret)
6022		− return ret;
	6022	+ goto fail;
6023	6023	io_prep_async_link(req);
6024	6024	de = kmalloc(sizeof(*de), GFP_KERNEL);
6025	6025	if (!de) {
6026		− io_req_complete_failed(req, -ENOMEM);
	6026	+ ret = -ENOMEM;
	6027	+fail:
	6028	+ io_req_complete_failed(req, ret);
6027	6029	return true;
6028	6030	}
6029	6031

fs/iomap/buffered-io.c+4−4

@@ -215,6 +215,7 @@ iomap_read_inline_data(struct inode inode, struct page page, · 214 unmodified lines
215	215	if (PageUptodate(page))
216	216	return;
217	217
	218	+ BUG_ON(page_has_private(page));
218	219	BUG_ON(page->index);
219	220	BUG_ON(size > PAGE_SIZE - offset_in_page(iomap->inline_data));
220	221
@@ -239,7 +240,7 @@ iomap_readpage_actor(struct inode inode, loff_t pos, loff_t length, void data, · 18 unmodified lines
239	240	{
240	241	struct iomap_readpage_ctx *ctx = data;
241	242	struct page *page = ctx->cur_page;
242		− struct iomap_page *iop = iomap_page_create(inode, page);
	243	+ struct iomap_page *iop;
243	244	bool same_page = false, is_contig = false;
244	245	loff_t orig_pos = pos;
245	246	unsigned poff, plen;
@@ -252,6 +253,7 @@ iomap_readpage_actor(struct inode inode, loff_t pos, loff_t length, void data, · 6 unmodified lines
252	253	}
253	254
254	255	/* zero post-eof blocks as the page may be mapped */
	256	+ iop = iomap_page_create(inode, page);
255	257	iomap_adjust_read_range(inode, iop, &pos, length, &poff, &plen);
256	258	if (plen == 0)
257	259	goto done;
@@ -967,7 +969,6 @@ iomap_page_mkwrite_actor(struct inode *inode, loff_t pos, loff_t length, · 709 unmodified lines
967	969	block_commit_write(page, 0, length);
968	970	} else {
969	971	WARN_ON_ONCE(!PageUptodate(page));
970		− iomap_page_create(inode, page);
971	972	set_page_dirty(page);
972	973	}
973	974
@@ -1304,14 +1305,13 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc, · 330 unmodified lines
1304	1305	struct writeback_control wbc, struct inode inode,
1305	1306	struct page *page, u64 end_offset)
1306	1307	{
1307		− struct iomap_page *iop = to_iomap_page(page);
	1308	+ struct iomap_page *iop = iomap_page_create(inode, page);
1308	1309	struct iomap_ioend ioend, next;
1309	1310	unsigned len = i_blocksize(inode);
1310	1311	u64 file_offset; /* file offset of page */
1311	1312	int error = 0, count = 0, i;
1312	1313	LIST_HEAD(submit_list);
1313	1314
1314		− WARN_ON_ONCE(i_blocks_per_page(inode, page) > 1 && !iop);
1315	1315	WARN_ON_ONCE(iop && atomic_read(&iop->write_bytes_pending) != 0);
1316	1316
1317	1317	/*

fs/iomap/seek.c+9−16

@@ -35,23 +35,20 @@ loff_t · 34 unmodified lines
35	35	iomap_seek_hole(struct inode inode, loff_t offset, const struct iomap_ops ops)
36	36	{
37	37	loff_t size = i_size_read(inode);
38		− loff_t length = size - offset;
39	38	loff_t ret;
40	39
41	40	/* Nothing to be found before or beyond the end of the file. */
42	41	if (offset < 0 \|\| offset >= size)
43	42	return -ENXIO;
44	43
45		− while (length > 0) {
46		− ret = iomap_apply(inode, offset, length, IOMAP_REPORT, ops,
47		− &offset, iomap_seek_hole_actor);
	44	+ while (offset < size) {
	45	+ ret = iomap_apply(inode, offset, size - offset, IOMAP_REPORT,
	46	+ ops, &offset, iomap_seek_hole_actor);
48	47	if (ret < 0)
49	48	return ret;
50	49	if (ret == 0)
51	50	break;
52		−
53	51	offset += ret;
54		− length -= ret;
55	52	}
56	53
57	54	return offset;
@@ -83,27 +80,23 @@ loff_t · 25 unmodified lines
83	80	iomap_seek_data(struct inode inode, loff_t offset, const struct iomap_ops ops)
84	81	{
85	82	loff_t size = i_size_read(inode);
86		− loff_t length = size - offset;
87	83	loff_t ret;
88	84
89	85	/* Nothing to be found before or beyond the end of the file. */
90	86	if (offset < 0 \|\| offset >= size)
91	87	return -ENXIO;
92	88
93		− while (length > 0) {
94		− ret = iomap_apply(inode, offset, length, IOMAP_REPORT, ops,
95		− &offset, iomap_seek_data_actor);
	89	+ while (offset < size) {
	90	+ ret = iomap_apply(inode, offset, size - offset, IOMAP_REPORT,
	91	+ ops, &offset, iomap_seek_data_actor);
96	92	if (ret < 0)
97	93	return ret;
98	94	if (ret == 0)
99		− break;
100		−
	95	+ return offset;
101	96	offset += ret;
102		− length -= ret;
103	97	}
104	98
105		− if (length <= 0)
106		− return -ENXIO;
107		− return offset;
	99	+ /* We've reached the end of the file without finding data */
	100	+ return -ENXIO;
108	101	}
109	102	EXPORT_SYMBOL_GPL(iomap_seek_data);

fs/seq_file.c+3−0

@@ -32,6 +32,9 @@ static void seq_set_overflow(struct seq_file *m) · 31 unmodified lines
32	32
33	33	static void *seq_buf_alloc(unsigned long size)
34	34	{
	35	+ if (unlikely(size > MAX_RW_COUNT))
	36	+ return NULL;
	37	+
35	38	return kvmalloc(size, GFP_KERNEL_ACCOUNT);
36	39	}
37	40

fs/xfs/libxfs/xfs_ag.c+8−0

@@ -803,6 +803,14 @@ xfs_ag_shrink_space( · 802 unmodified lines
803	803
804	804	args.fsbno = XFS_AGB_TO_FSB(mp, agno, aglen - delta);
805	805
	806	+ /*
	807	+ * Make sure that the last inode cluster cannot overlap with the new
	808	+ * end of the AG, even if it's sparse.
	809	+ */
	810	+ error = xfs_ialloc_check_shrink(*tpp, agno, agibp, aglen - delta);
	811	+ if (error)
	812	+ return error;
	813	+
806	814	/*
807	815	* Disable perag reservations so it doesn't cause the allocation request
808	816	* to fail. We'll reestablish reservation before we return.

fs/xfs/libxfs/xfs_attr.c+8−8

@@ -483,7 +483,7 @@ xfs_attr_set_iter( · 482 unmodified lines
483	483	if (error)
484	484	return error;
485	485
486		− /* fallthrough */
	486	+ fallthrough;
487	487	case XFS_DAS_RM_LBLK:
488	488	/* Set state in case xfs_attr_rmtval_remove returns -EAGAIN */
489	489	dac->dela_state = XFS_DAS_RM_LBLK;
@@ -496,7 +496,7 @@ xfs_attr_set_iter( · 6 unmodified lines
496	496	return -EAGAIN;
497	497	}
498	498
499		− /* fallthrough */
	499	+ fallthrough;
500	500	case XFS_DAS_RD_LEAF:
501	501	/*
502	502	* This is the last step for leaf format. Read the block with
@@ -528,7 +528,7 @@ xfs_attr_set_iter( · 25 unmodified lines
528	528	return error;
529	529	}
530	530
531		− /* fallthrough */
	531	+ fallthrough;
532	532	case XFS_DAS_ALLOC_NODE:
533	533	/*
534	534	* If there was an out-of-line value, allocate the blocks we
@@ -590,7 +590,7 @@ xfs_attr_set_iter( · 55 unmodified lines
590	590	if (error)
591	591	return error;
592	592
593		− /* fallthrough */
	593	+ fallthrough;
594	594	case XFS_DAS_RM_NBLK:
595	595	/* Set state in case xfs_attr_rmtval_remove returns -EAGAIN */
596	596	dac->dela_state = XFS_DAS_RM_NBLK;
@@ -603,7 +603,7 @@ xfs_attr_set_iter( · 6 unmodified lines
603	603	return -EAGAIN;
604	604	}
605	605
606		− /* fallthrough */
	606	+ fallthrough;
607	607	case XFS_DAS_CLR_FLAG:
608	608	/*
609	609	* The last state for node format. Look up the old attr and
@@ -1406,7 +1406,7 @@ xfs_attr_remove_iter( · 796 unmodified lines
1406	1406	state = dac->da_state;
1407	1407	}
1408	1408
1409		− /* fallthrough */
	1409	+ fallthrough;
1410	1410	case XFS_DAS_RMTBLK:
1411	1411	dac->dela_state = XFS_DAS_RMTBLK;
1412	1412
@@ -1441,7 +1441,7 @@ xfs_attr_remove_iter( · 28 unmodified lines
1441	1441	return -EAGAIN;
1442	1442	}
1443	1443
1444		− /* fallthrough */
	1444	+ fallthrough;
1445	1445	case XFS_DAS_RM_NAME:
1446	1446	/*
1447	1447	* If we came here fresh from a transaction roll, reattach all
@@ -1469,7 +1469,7 @@ xfs_attr_remove_iter( · 21 unmodified lines
1469	1469	return -EAGAIN;
1470	1470	}
1471	1471
1472		− /* fallthrough */
	1472	+ fallthrough;
1473	1473	case XFS_DAS_RM_SHRINK:
1474	1474	/*
1475	1475	* If the result is small enough, push it all into the inode.

fs/xfs/libxfs/xfs_ialloc.c+55−0

@@ -2928,3 +2928,58 @@ xfs_ialloc_calc_rootino( · 2927 unmodified lines
2928	2928
2929	2929	return XFS_AGINO_TO_INO(mp, 0, XFS_AGB_TO_AGINO(mp, first_bno));
2930	2930	}
	2931	+
	2932	+/*
	2933	+ * Ensure there are not sparse inode clusters that cross the new EOAG.
	2934	+ *
	2935	+ * This is a no-op for non-spinode filesystems since clusters are always fully
	2936	+ * allocated and checking the bnobt suffices. However, a spinode filesystem
	2937	+ * could have a record where the upper inodes are free blocks. If those blocks
	2938	+ * were removed from the filesystem, the inode record would extend beyond EOAG,
	2939	+ * which will be flagged as corruption.
	2940	+ */
	2941	+int
	2942	+xfs_ialloc_check_shrink(
	2943	+ struct xfs_trans *tp,
	2944	+ xfs_agnumber_t agno,
	2945	+ struct xfs_buf *agibp,
	2946	+ xfs_agblock_t new_length)
	2947	+{
	2948	+ struct xfs_inobt_rec_incore rec;
	2949	+ struct xfs_btree_cur *cur;
	2950	+ struct xfs_mount *mp = tp->t_mountp;
	2951	+ struct xfs_perag *pag;
	2952	+ xfs_agino_t agino = XFS_AGB_TO_AGINO(mp, new_length);
	2953	+ int has;
	2954	+ int error;
	2955	+
	2956	+ if (!xfs_sb_version_hassparseinodes(&mp->m_sb))
	2957	+ return 0;
	2958	+
	2959	+ pag = xfs_perag_get(mp, agno);
	2960	+ cur = xfs_inobt_init_cursor(mp, tp, agibp, pag, XFS_BTNUM_INO);
	2961	+
	2962	+ /* Look up the inobt record that would correspond to the new EOFS. */
	2963	+ error = xfs_inobt_lookup(cur, agino, XFS_LOOKUP_LE, &has);
	2964	+ if (error \|\| !has)
	2965	+ goto out;
	2966	+
	2967	+ error = xfs_inobt_get_rec(cur, &rec, &has);
	2968	+ if (error)
	2969	+ goto out;
	2970	+
	2971	+ if (!has) {
	2972	+ error = -EFSCORRUPTED;
	2973	+ goto out;
	2974	+ }
	2975	+
	2976	+ /* If the record covers inodes that would be beyond EOFS, bail out. */
	2977	+ if (rec.ir_startino + XFS_INODES_PER_CHUNK > agino) {
	2978	+ error = -ENOSPC;
	2979	+ goto out;
	2980	+ }
	2981	+out:
	2982	+ xfs_btree_del_cursor(cur, error);
	2983	+ xfs_perag_put(pag);
	2984	+ return error;
	2985	+}

fs/xfs/libxfs/xfs_ialloc.h+3−0

@@ -122,4 +122,7 @@ int xfs_ialloc_cluster_alignment(struct xfs_mount *mp); · 121 unmodified lines
122	122	void xfs_ialloc_setup_geometry(struct xfs_mount *mp);
123	123	xfs_ino_t xfs_ialloc_calc_rootino(struct xfs_mount *mp, int sunit);
124	124
	125	+int xfs_ialloc_check_shrink(struct xfs_trans *tp, xfs_agnumber_t agno,
	126	+ struct xfs_buf *agibp, xfs_agblock_t new_length);
	127	+
125	128	#endif /* __XFS_IALLOC_H__ */

fs/xfs/libxfs/xfs_inode_buf.c+16−12

@@ -592,23 +592,27 @@ xfs_inode_validate_extsize( · 591 unmodified lines
592	592	/*
593	593	* This comment describes a historic gap in this verifier function.
594	594	*
595		− * On older kernels, the extent size hint verifier doesn't check that
596		− * the extent size hint is an integer multiple of the realtime extent
597		− * size on a directory with both RTINHERIT and EXTSZINHERIT flags set.
598		− * The verifier has always enforced the alignment rule for regular
599		− * files with the REALTIME flag set.
	595	+ * For a directory with both RTINHERIT and EXTSZINHERIT flags set, this
	596	+ * function has never checked that the extent size hint is an integer
	597	+ * multiple of the realtime extent size. Since we allow users to set
	598	+ * this combination on non-rt filesystems /and/ to change the rt
	599	+ * extent size when adding a rt device to a filesystem, the net effect
	600	+ * is that users can configure a filesystem anticipating one rt
	601	+ * geometry and change their minds later. Directories do not use the
	602	+ * extent size hint, so this is harmless for them.
600	603	*
601	604	* If a directory with a misaligned extent size hint is allowed to
602	605	* propagate that hint into a new regular realtime file, the result
603	606	* is that the inode cluster buffer verifier will trigger a corruption
604		− * shutdown the next time it is run.
	607	+ * shutdown the next time it is run, because the verifier has always
	608	+ * enforced the alignment rule for regular files.
605	609	*
606		− * Unfortunately, there could be filesystems with these misconfigured
607		− * directories in the wild, so we cannot add a check to this verifier
608		− * at this time because that will result a new source of directory
609		− * corruption errors when reading an existing filesystem. Instead, we
610		− * permit the misconfiguration to pass through the verifiers so that
611		− * callers of this function can correct and mitigate externally.
	610	+ * Because we allow administrators to set a new rt extent size when
	611	+ * adding a rt section, we cannot add a check to this verifier because
	612	+ * that will result a new source of directory corruption errors when
	613	+ * reading an existing filesystem. Instead, we rely on callers to
	614	+ * decide when alignment checks are appropriate, and fix things up as
	615	+ * needed.
612	616	*/
613	617
614	618	if (rt_flag)

fs/xfs/libxfs/xfs_trans_inode.c+4−6

@@ -143,16 +143,14 @@ xfs_trans_log_inode( · 142 unmodified lines
143	143	}
144	144
145	145	/*
146		− * Inode verifiers on older kernels don't check that the extent size
147		− * hint is an integer multiple of the rt extent size on a directory
148		− * with both rtinherit and extszinherit flags set. If we're logging a
149		− * directory that is misconfigured in this way, clear the hint.
	146	+ * Inode verifiers do not check that the extent size hint is an integer
	147	+ * multiple of the rt extent size on a directory with both rtinherit
	148	+ * and extszinherit flags set. If we're logging a directory that is
	149	+ * misconfigured in this way, clear the hint.
150	150	*/
151	151	if ((ip->i_diflags & XFS_DIFLAG_RTINHERIT) &&
152	152	(ip->i_diflags & XFS_DIFLAG_EXTSZINHERIT) &&
153	153	(ip->i_extsize % ip->i_mount->m_sb.sb_rextsize) > 0) {
154		− xfs_info_once(ip->i_mount,
155		− "Correcting misaligned extent size hint in inode 0x%llx.", ip->i_ino);
156	154	ip->i_diflags &= ~(XFS_DIFLAG_EXTSIZE \|
157	155	XFS_DIFLAG_EXTSZINHERIT);
158	156	ip->i_extsize = 0;

fs/xfs/scrub/inode.c+16−2

@@ -73,11 +73,25 @@ xchk_inode_extsize( · 72 unmodified lines
73	73	uint16_t flags)
74	74	{
75	75	xfs_failaddr_t fa;
	76	+ uint32_t value = be32_to_cpu(dip->di_extsize);
76	77
77		− fa = xfs_inode_validate_extsize(sc->mp, be32_to_cpu(dip->di_extsize),
78		− mode, flags);
	78	+ fa = xfs_inode_validate_extsize(sc->mp, value, mode, flags);
79	79	if (fa)
80	80	xchk_ino_set_corrupt(sc, ino);
	81	+
	82	+ /*
	83	+ * XFS allows a sysadmin to change the rt extent size when adding a rt
	84	+ * section to a filesystem after formatting. If there are any
	85	+ * directories with extszinherit and rtinherit set, the hint could
	86	+ * become misaligned with the new rextsize. The verifier doesn't check
	87	+ * this, because we allow rtinherit directories even without an rt
	88	+ * device. Flag this as an administrative warning since we will clean
	89	+ * this up eventually.
	90	+ */
	91	+ if ((flags & XFS_DIFLAG_RTINHERIT) &&
	92	+ (flags & XFS_DIFLAG_EXTSZINHERIT) &&
	93	+ value % sc->mp->m_sb.sb_rextsize > 0)
	94	+ xchk_ino_set_warning(sc, ino);
81	95	}
82	96
83	97	/*

fs/xfs/xfs_inode.c+13−0

@@ -2763,6 +2763,19 @@ xfs_remove( · 2762 unmodified lines
2763	2763	error = xfs_droplink(tp, ip);
2764	2764	if (error)
2765	2765	goto out_trans_cancel;
	2766	+
	2767	+ /*
	2768	+ * Point the unlinked child directory's ".." entry to the root
	2769	+ * directory to eliminate back-references to inodes that may
	2770	+ * get freed before the child directory is closed. If the fs
	2771	+ * gets shrunk, this can lead to dirent inode validation errors.
	2772	+ */
	2773	+ if (dp->i_ino != tp->t_mountp->m_sb.sb_rootino) {
	2774	+ error = xfs_dir_replace(tp, ip, &xfs_name_dotdot,
	2775	+ tp->t_mountp->m_sb.sb_rootino, 0);
	2776	+ if (error)
	2777	+ return error;
	2778	+ }
2766	2779	} else {
2767	2780	/*
2768	2781	* When removing a non-directory we need to log the parent

fs/xfs/xfs_ioctl.c+22−5

@@ -1065,7 +1065,24 @@ xfs_fill_fsxattr( · 1064 unmodified lines
1065	1065
1066	1066	fileattr_fill_xflags(fa, xfs_ip2xflags(ip));
1067	1067
1068		− fa->fsx_extsize = XFS_FSB_TO_B(mp, ip->i_extsize);
	1068	+ if (ip->i_diflags & XFS_DIFLAG_EXTSIZE) {
	1069	+ fa->fsx_extsize = XFS_FSB_TO_B(mp, ip->i_extsize);
	1070	+ } else if (ip->i_diflags & XFS_DIFLAG_EXTSZINHERIT) {
	1071	+ /*
	1072	+ * Don't let a misaligned extent size hint on a directory
	1073	+ * escape to userspace if it won't pass the setattr checks
	1074	+ * later.
	1075	+ */
	1076	+ if ((ip->i_diflags & XFS_DIFLAG_RTINHERIT) &&
	1077	+ ip->i_extsize % mp->m_sb.sb_rextsize > 0) {
	1078	+ fa->fsx_xflags &= ~(FS_XFLAG_EXTSIZE \|
	1079	+ FS_XFLAG_EXTSZINHERIT);
	1080	+ fa->fsx_extsize = 0;
	1081	+ } else {
	1082	+ fa->fsx_extsize = XFS_FSB_TO_B(mp, ip->i_extsize);
	1083	+ }
	1084	+ }
	1085	+
1069	1086	if (ip->i_diflags2 & XFS_DIFLAG2_COWEXTSIZE)
1070	1087	fa->fsx_cowextsize = XFS_FSB_TO_B(mp, ip->i_cowextsize);
1071	1088	fa->fsx_projid = ip->i_projid;
@@ -1292,10 +1309,10 @@ xfs_ioctl_setattr_check_extsize( · 220 unmodified lines
1292	1309	new_diflags = xfs_flags2diflags(ip, fa->fsx_xflags);
1293	1310
1294	1311	/*
1295		− * Inode verifiers on older kernels don't check that the extent size
1296		− * hint is an integer multiple of the rt extent size on a directory
1297		− * with both rtinherit and extszinherit flags set. Don't let sysadmins
1298		− * misconfigure directories.
	1312	+ * Inode verifiers do not check that the extent size hint is an integer
	1313	+ * multiple of the rt extent size on a directory with both rtinherit
	1314	+ * and extszinherit flags set. Don't let sysadmins misconfigure
	1315	+ * directories.
1299	1316	*/
1300	1317	if ((new_diflags & XFS_DIFLAG_RTINHERIT) &&
1301	1318	(new_diflags & XFS_DIFLAG_EXTSZINHERIT)) {

fs/xfs/xfs_rtalloc.c+37−12

@@ -923,16 +923,41 @@ xfs_growfs_rt( · 922 unmodified lines
923	923	uint8_t rsum_cache; / old summary cache */
924	924
925	925	sbp = &mp->m_sb;
926		− /*
927		− * Initial error checking.
928		− */
	926	+
929	927	if (!capable(CAP_SYS_ADMIN))
930	928	return -EPERM;
931		− if (mp->m_rtdev_targp == NULL \|\| mp->m_rbmip == NULL \|\|
932		− (nrblocks = in->newblocks) <= sbp->sb_rblocks \|\|
933		− (sbp->sb_rblocks && (in->extsize != sbp->sb_rextsize)))
	929	+
	930	+ /* Needs to have been mounted with an rt device. */
	931	+ if (!XFS_IS_REALTIME_MOUNT(mp))
	932	+ return -EINVAL;
	933	+ /*
	934	+ * Mount should fail if the rt bitmap/summary files don't load, but
	935	+ * we'll check anyway.
	936	+ */
	937	+ if (!mp->m_rbmip \|\| !mp->m_rsumip)
	938	+ return -EINVAL;
	939	+
	940	+ /* Shrink not supported. */
	941	+ if (in->newblocks <= sbp->sb_rblocks)
	942	+ return -EINVAL;
	943	+
	944	+ /* Can only change rt extent size when adding rt volume. */
	945	+ if (sbp->sb_rblocks > 0 && in->extsize != sbp->sb_rextsize)
	946	+ return -EINVAL;
	947	+
	948	+ /* Range check the extent size. */
	949	+ if (XFS_FSB_TO_B(mp, in->extsize) > XFS_MAX_RTEXTSIZE \|\|
	950	+ XFS_FSB_TO_B(mp, in->extsize) < XFS_MIN_RTEXTSIZE)
934	951	return -EINVAL;
935		− if ((error = xfs_sb_validate_fsb_count(sbp, nrblocks)))
	952	+
	953	+ /* Unsupported realtime features. */
	954	+ if (xfs_sb_version_hasrmapbt(&mp->m_sb) \|\|
	955	+ xfs_sb_version_hasreflink(&mp->m_sb))
	956	+ return -EOPNOTSUPP;
	957	+
	958	+ nrblocks = in->newblocks;
	959	+ error = xfs_sb_validate_fsb_count(sbp, nrblocks);
	960	+ if (error)
936	961	return error;
937	962	/*
938	963	* Read in the last block of the device, make sure it exists.
@@ -996,7 +1021,8 @@ xfs_growfs_rt( · 57 unmodified lines
996	1021	((sbp->sb_rextents & ((1 << mp->m_blkbit_log) - 1)) != 0);
997	1022	bmbno < nrbmblocks;
998	1023	bmbno++) {
999		− xfs_trans_t *tp;
	1024	+ struct xfs_trans *tp;
	1025	+ xfs_rfsblock_t nrblocks_step;
1000	1026
1001	1027	nmp = mp;
1002	1028	nsbp = &nmp->m_sb;
@@ -1005,10 +1031,9 @@ xfs_growfs_rt( · 2 unmodified lines
1005	1031	*/
1006	1032	nsbp->sb_rextsize = in->extsize;
1007	1033	nsbp->sb_rbmblocks = bmbno + 1;
1008		− nsbp->sb_rblocks =
1009		− XFS_RTMIN(nrblocks,
1010		− nsbp->sb_rbmblocks * NBBY *
1011		− nsbp->sb_blocksize * nsbp->sb_rextsize);
	1034	+ nrblocks_step = (bmbno + 1) * NBBY * nsbp->sb_blocksize *
	1035	+ nsbp->sb_rextsize;
	1036	+ nsbp->sb_rblocks = min(nrblocks, nrblocks_step);
1012	1037	nsbp->sb_rextents = nsbp->sb_rblocks;
1013	1038	do_div(nsbp->sb_rextents, nsbp->sb_rextsize);
1014	1039	ASSERT(nsbp->sb_rextents != 0);

fs/zonefs/super.c+0−3

@@ -705,9 +705,6 @@ static ssize_t zonefs_file_dio_append(struct kiocb iocb, struct iov_iter from) · 704 unmodified lines
705	705	return 0;
706	706
707	707	bio = bio_alloc(GFP_NOFS, nr_pages);
708		− if (!bio)
709		− return -ENOMEM;
710		−
711	708	bio_set_dev(bio, bdev);
712	709	bio->bi_iter.bi_sector = zi->i_zsector;
713	710	bio->bi_write_hint = iocb->ki_hint;

include/dt-bindings/clock/r9a07g044-cpg.h+183−53

@@ -32,58 +32,188 @@ · 31 unmodified lines
32	32	#define R9A07G044_OSCCLK 21
33	33
34	34	/* R9A07G044 Module Clocks */
35		−#define R9A07G044_CLK_GIC600 0
36		−#define R9A07G044_CLK_IA55 1
37		−#define R9A07G044_CLK_SYC 2
38		−#define R9A07G044_CLK_DMAC 3
39		−#define R9A07G044_CLK_SYSC 4
40		−#define R9A07G044_CLK_MTU 5
41		−#define R9A07G044_CLK_GPT 6
42		−#define R9A07G044_CLK_ETH0 7
43		−#define R9A07G044_CLK_ETH1 8
44		−#define R9A07G044_CLK_I2C0 9
45		−#define R9A07G044_CLK_I2C1 10
46		−#define R9A07G044_CLK_I2C2 11
47		−#define R9A07G044_CLK_I2C3 12
48		−#define R9A07G044_CLK_SCIF0 13
49		−#define R9A07G044_CLK_SCIF1 14
50		−#define R9A07G044_CLK_SCIF2 15
51		−#define R9A07G044_CLK_SCIF3 16
52		−#define R9A07G044_CLK_SCIF4 17
53		−#define R9A07G044_CLK_SCI0 18
54		−#define R9A07G044_CLK_SCI1 19
55		−#define R9A07G044_CLK_GPIO 20
56		−#define R9A07G044_CLK_SDHI0 21
57		−#define R9A07G044_CLK_SDHI1 22
58		−#define R9A07G044_CLK_USB0 23
59		−#define R9A07G044_CLK_USB1 24
60		−#define R9A07G044_CLK_CANFD 25
61		−#define R9A07G044_CLK_SSI0 26
62		−#define R9A07G044_CLK_SSI1 27
63		−#define R9A07G044_CLK_SSI2 28
64		−#define R9A07G044_CLK_SSI3 29
65		−#define R9A07G044_CLK_MHU 30
66		−#define R9A07G044_CLK_OSTM0 31
67		−#define R9A07G044_CLK_OSTM1 32
68		−#define R9A07G044_CLK_OSTM2 33
69		−#define R9A07G044_CLK_WDT0 34
70		−#define R9A07G044_CLK_WDT1 35
71		−#define R9A07G044_CLK_WDT2 36
72		−#define R9A07G044_CLK_WDT_PON 37
73		−#define R9A07G044_CLK_GPU 38
74		−#define R9A07G044_CLK_ISU 39
75		−#define R9A07G044_CLK_H264 40
76		−#define R9A07G044_CLK_CRU 41
77		−#define R9A07G044_CLK_MIPI_DSI 42
78		−#define R9A07G044_CLK_LCDC 43
79		−#define R9A07G044_CLK_SRC 44
80		−#define R9A07G044_CLK_RSPI0 45
81		−#define R9A07G044_CLK_RSPI1 46
82		−#define R9A07G044_CLK_RSPI2 47
83		−#define R9A07G044_CLK_ADC 48
84		−#define R9A07G044_CLK_TSU_PCLK 49
85		−#define R9A07G044_CLK_SPI 50
86		−#define R9A07G044_CLK_MIPI_DSI_V 51
87		−#define R9A07G044_CLK_MIPI_DSI_PIN 52
	35	+#define R9A07G044_CA55_SCLK 0
	36	+#define R9A07G044_CA55_PCLK 1
	37	+#define R9A07G044_CA55_ATCLK 2
	38	+#define R9A07G044_CA55_GICCLK 3
	39	+#define R9A07G044_CA55_PERICLK 4
	40	+#define R9A07G044_CA55_ACLK 5
	41	+#define R9A07G044_CA55_TSCLK 6
	42	+#define R9A07G044_GIC600_GICCLK 7
	43	+#define R9A07G044_IA55_CLK 8
	44	+#define R9A07G044_IA55_PCLK 9
	45	+#define R9A07G044_MHU_PCLK 10
	46	+#define R9A07G044_SYC_CNT_CLK 11
	47	+#define R9A07G044_DMAC_ACLK 12
	48	+#define R9A07G044_DMAC_PCLK 13
	49	+#define R9A07G044_OSTM0_PCLK 14
	50	+#define R9A07G044_OSTM1_PCLK 15
	51	+#define R9A07G044_OSTM2_PCLK 16
	52	+#define R9A07G044_MTU_X_MCK_MTU3 17
	53	+#define R9A07G044_POE3_CLKM_POE 18
	54	+#define R9A07G044_GPT_PCLK 19
	55	+#define R9A07G044_POEG_A_CLKP 20
	56	+#define R9A07G044_POEG_B_CLKP 21
	57	+#define R9A07G044_POEG_C_CLKP 22
	58	+#define R9A07G044_POEG_D_CLKP 23
	59	+#define R9A07G044_WDT0_PCLK 24
	60	+#define R9A07G044_WDT0_CLK 25
	61	+#define R9A07G044_WDT1_PCLK 26
	62	+#define R9A07G044_WDT1_CLK 27
	63	+#define R9A07G044_WDT2_PCLK 28
	64	+#define R9A07G044_WDT2_CLK 29
	65	+#define R9A07G044_SPI_CLK2 30
	66	+#define R9A07G044_SPI_CLK 31
	67	+#define R9A07G044_SDHI0_IMCLK 32
	68	+#define R9A07G044_SDHI0_IMCLK2 33
	69	+#define R9A07G044_SDHI0_CLK_HS 34
	70	+#define R9A07G044_SDHI0_ACLK 35
	71	+#define R9A07G044_SDHI1_IMCLK 36
	72	+#define R9A07G044_SDHI1_IMCLK2 37
	73	+#define R9A07G044_SDHI1_CLK_HS 38
	74	+#define R9A07G044_SDHI1_ACLK 39
	75	+#define R9A07G044_GPU_CLK 40
	76	+#define R9A07G044_GPU_AXI_CLK 41
	77	+#define R9A07G044_GPU_ACE_CLK 42
	78	+#define R9A07G044_ISU_ACLK 43
	79	+#define R9A07G044_ISU_PCLK 44
	80	+#define R9A07G044_H264_CLK_A 45
	81	+#define R9A07G044_H264_CLK_P 46
	82	+#define R9A07G044_CRU_SYSCLK 47
	83	+#define R9A07G044_CRU_VCLK 48
	84	+#define R9A07G044_CRU_PCLK 49
	85	+#define R9A07G044_CRU_ACLK 50
	86	+#define R9A07G044_MIPI_DSI_PLLCLK 51
	87	+#define R9A07G044_MIPI_DSI_SYSCLK 52
	88	+#define R9A07G044_MIPI_DSI_ACLK 53
	89	+#define R9A07G044_MIPI_DSI_PCLK 54
	90	+#define R9A07G044_MIPI_DSI_VCLK 55
	91	+#define R9A07G044_MIPI_DSI_LPCLK 56
	92	+#define R9A07G044_LCDC_CLK_A 57
	93	+#define R9A07G044_LCDC_CLK_P 58
	94	+#define R9A07G044_LCDC_CLK_D 59
	95	+#define R9A07G044_SSI0_PCLK2 60
	96	+#define R9A07G044_SSI0_PCLK_SFR 61
	97	+#define R9A07G044_SSI1_PCLK2 62
	98	+#define R9A07G044_SSI1_PCLK_SFR 63
	99	+#define R9A07G044_SSI2_PCLK2 64
	100	+#define R9A07G044_SSI2_PCLK_SFR 65
	101	+#define R9A07G044_SSI3_PCLK2 66
	102	+#define R9A07G044_SSI3_PCLK_SFR 67
	103	+#define R9A07G044_SRC_CLKP 68
	104	+#define R9A07G044_USB_U2H0_HCLK 69
	105	+#define R9A07G044_USB_U2H1_HCLK 70
	106	+#define R9A07G044_USB_U2P_EXR_CPUCLK 71
	107	+#define R9A07G044_USB_PCLK 72
	108	+#define R9A07G044_ETH0_CLK_AXI 73
	109	+#define R9A07G044_ETH0_CLK_CHI 74
	110	+#define R9A07G044_ETH1_CLK_AXI 75
	111	+#define R9A07G044_ETH1_CLK_CHI 76
	112	+#define R9A07G044_I2C0_PCLK 77
	113	+#define R9A07G044_I2C1_PCLK 78
	114	+#define R9A07G044_I2C2_PCLK 79
	115	+#define R9A07G044_I2C3_PCLK 80
	116	+#define R9A07G044_SCIF0_CLK_PCK 81
	117	+#define R9A07G044_SCIF1_CLK_PCK 82
	118	+#define R9A07G044_SCIF2_CLK_PCK 83
	119	+#define R9A07G044_SCIF3_CLK_PCK 84
	120	+#define R9A07G044_SCIF4_CLK_PCK 85
	121	+#define R9A07G044_SCI0_CLKP 86
	122	+#define R9A07G044_SCI1_CLKP 87
	123	+#define R9A07G044_IRDA_CLKP 88
	124	+#define R9A07G044_RSPI0_CLKB 89
	125	+#define R9A07G044_RSPI1_CLKB 90
	126	+#define R9A07G044_RSPI2_CLKB 91
	127	+#define R9A07G044_CANFD_PCLK 92
	128	+#define R9A07G044_GPIO_HCLK 93
	129	+#define R9A07G044_ADC_ADCLK 94
	130	+#define R9A07G044_ADC_PCLK 95
	131	+#define R9A07G044_TSU_PCLK 96
	132	+
	133	+/* R9A07G044 Resets */
	134	+#define R9A07G044_CA55_RST_1_0 0
	135	+#define R9A07G044_CA55_RST_1_1 1
	136	+#define R9A07G044_CA55_RST_3_0 2
	137	+#define R9A07G044_CA55_RST_3_1 3
	138	+#define R9A07G044_CA55_RST_4 4
	139	+#define R9A07G044_CA55_RST_5 5
	140	+#define R9A07G044_CA55_RST_6 6
	141	+#define R9A07G044_CA55_RST_7 7
	142	+#define R9A07G044_CA55_RST_8 8
	143	+#define R9A07G044_CA55_RST_9 9
	144	+#define R9A07G044_CA55_RST_10 10
	145	+#define R9A07G044_CA55_RST_11 11
	146	+#define R9A07G044_CA55_RST_12 12
	147	+#define R9A07G044_GIC600_GICRESET_N 13
	148	+#define R9A07G044_GIC600_DBG_GICRESET_N 14
	149	+#define R9A07G044_IA55_RESETN 15
	150	+#define R9A07G044_MHU_RESETN 16
	151	+#define R9A07G044_DMAC_ARESETN 17
	152	+#define R9A07G044_DMAC_RST_ASYNC 18
	153	+#define R9A07G044_SYC_RESETN 19
	154	+#define R9A07G044_OSTM0_PRESETZ 20
	155	+#define R9A07G044_OSTM1_PRESETZ 21
	156	+#define R9A07G044_OSTM2_PRESETZ 22
	157	+#define R9A07G044_MTU_X_PRESET_MTU3 23
	158	+#define R9A07G044_POE3_RST_M_REG 24
	159	+#define R9A07G044_GPT_RST_C 25
	160	+#define R9A07G044_POEG_A_RST 26
	161	+#define R9A07G044_POEG_B_RST 27
	162	+#define R9A07G044_POEG_C_RST 28
	163	+#define R9A07G044_POEG_D_RST 29
	164	+#define R9A07G044_WDT0_PRESETN 30
	165	+#define R9A07G044_WDT1_PRESETN 31
	166	+#define R9A07G044_WDT2_PRESETN 32
	167	+#define R9A07G044_SPI_RST 33
	168	+#define R9A07G044_SDHI0_IXRST 34
	169	+#define R9A07G044_SDHI1_IXRST 35
	170	+#define R9A07G044_GPU_RESETN 36
	171	+#define R9A07G044_GPU_AXI_RESETN 37
	172	+#define R9A07G044_GPU_ACE_RESETN 38
	173	+#define R9A07G044_ISU_ARESETN 39
	174	+#define R9A07G044_ISU_PRESETN 40
	175	+#define R9A07G044_H264_X_RESET_VCP 41
	176	+#define R9A07G044_H264_CP_PRESET_P 42
	177	+#define R9A07G044_CRU_CMN_RSTB 43
	178	+#define R9A07G044_CRU_PRESETN 44
	179	+#define R9A07G044_CRU_ARESETN 45
	180	+#define R9A07G044_MIPI_DSI_CMN_RSTB 46
	181	+#define R9A07G044_MIPI_DSI_ARESET_N 47
	182	+#define R9A07G044_MIPI_DSI_PRESET_N 48
	183	+#define R9A07G044_LCDC_RESET_N 49
	184	+#define R9A07G044_SSI0_RST_M2_REG 50
	185	+#define R9A07G044_SSI1_RST_M2_REG 51
	186	+#define R9A07G044_SSI2_RST_M2_REG 52
	187	+#define R9A07G044_SSI3_RST_M2_REG 53
	188	+#define R9A07G044_SRC_RST 54
	189	+#define R9A07G044_USB_U2H0_HRESETN 55
	190	+#define R9A07G044_USB_U2H1_HRESETN 56
	191	+#define R9A07G044_USB_U2P_EXL_SYSRST 57
	192	+#define R9A07G044_USB_PRESETN 58
	193	+#define R9A07G044_ETH0_RST_HW_N 59
	194	+#define R9A07G044_ETH1_RST_HW_N 60
	195	+#define R9A07G044_I2C0_MRST 61
	196	+#define R9A07G044_I2C1_MRST 62
	197	+#define R9A07G044_I2C2_MRST 63
	198	+#define R9A07G044_I2C3_MRST 64
	199	+#define R9A07G044_SCIF0_RST_SYSTEM_N 65
	200	+#define R9A07G044_SCIF1_RST_SYSTEM_N 66
	201	+#define R9A07G044_SCIF2_RST_SYSTEM_N 67
	202	+#define R9A07G044_SCIF3_RST_SYSTEM_N 68
	203	+#define R9A07G044_SCIF4_RST_SYSTEM_N 69
	204	+#define R9A07G044_SCI0_RST 70
	205	+#define R9A07G044_SCI1_RST 71
	206	+#define R9A07G044_IRDA_RST 72
	207	+#define R9A07G044_RSPI0_RST 73
	208	+#define R9A07G044_RSPI1_RST 74
	209	+#define R9A07G044_RSPI2_RST 75
	210	+#define R9A07G044_CANFD_RSTP_N 76
	211	+#define R9A07G044_CANFD_RSTC_N 77
	212	+#define R9A07G044_GPIO_RSTN 78
	213	+#define R9A07G044_GPIO_PORT_RESETN 79
	214	+#define R9A07G044_GPIO_SPARE_RESETN 80
	215	+#define R9A07G044_ADC_PRESETN 81
	216	+#define R9A07G044_ADC_ADRST_N 82
	217	+#define R9A07G044_TSU_PRESETN 83
88	218
89	219	#endif /* __DT_BINDINGS_CLOCK_R9A07G044_CPG_H__ */

include/linux/kasan.h+1−0

@@ -3,6 +3,7 @@ · 2 unmodified lines
3	3	#define _LINUX_KASAN_H
4	4
5	5	#include <linux/bug.h>
	6	+#include <linux/kernel.h>
6	7	#include <linux/static_key.h>
7	8	#include <linux/types.h>
8	9

include/linux/mfd/rt5033-private.h+2−2

@@ -200,13 +200,13 @@ enum rt5033_reg { · 199 unmodified lines
200	200	#define RT5033_REGULATOR_BUCK_VOLTAGE_MIN 1000000U
201	201	#define RT5033_REGULATOR_BUCK_VOLTAGE_MAX 3000000U
202	202	#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP 100000U
203		−#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM 32
	203	+#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM 21
204	204
205	205	/* RT5033 regulator LDO output voltage uV */
206	206	#define RT5033_REGULATOR_LDO_VOLTAGE_MIN 1200000U
207	207	#define RT5033_REGULATOR_LDO_VOLTAGE_MAX 3000000U
208	208	#define RT5033_REGULATOR_LDO_VOLTAGE_STEP 100000U
209		−#define RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM 32
	209	+#define RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM 19
210	210
211	211	/* RT5033 regulator SAFE LDO output voltage uV */
212	212	#define RT5033_REGULATOR_SAFE_LDO_VOLTAGE 4900000U

include/linux/pgtable.h+1−25

@@ -1397,34 +1397,10 @@ static inline int p4d_clear_huge(p4d_t *p4d) · 1396 unmodified lines
1397	1397	}
1398	1398	#endif /* !__PAGETABLE_P4D_FOLDED */
1399	1399
1400		−#ifndef __PAGETABLE_PUD_FOLDED
1401	1400	int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot);
1402		−int pud_clear_huge(pud_t *pud);
1403		−#else
1404		−static inline int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot)
1405		−{
1406		− return 0;
1407		−}
1408		−static inline int pud_clear_huge(pud_t *pud)
1409		−{
1410		− return 0;
1411		−}
1412		−#endif /* !__PAGETABLE_PUD_FOLDED */
1413		−
1414		−#ifndef __PAGETABLE_PMD_FOLDED
1415	1401	int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot);
	1402	+int pud_clear_huge(pud_t *pud);
1416	1403	int pmd_clear_huge(pmd_t *pmd);
1417		−#else
1418		−static inline int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot)
1419		−{
1420		− return 0;
1421		−}
1422		−static inline int pmd_clear_huge(pmd_t *pmd)
1423		−{
1424		− return 0;
1425		−}
1426		−#endif /* !__PAGETABLE_PMD_FOLDED */
1427		−
1428	1404	int p4d_free_pud_page(p4d_t *p4d, unsigned long addr);
1429	1405	int pud_free_pmd_page(pud_t *pud, unsigned long addr);
1430	1406	int pmd_free_pte_page(pmd_t *pmd, unsigned long addr);

include/linux/rmap.h+3−1

@@ -291,7 +291,9 @@ static inline int page_referenced(struct page *page, int is_locked, · 290 unmodified lines
291	291	return 0;
292	292	}
293	293
294		−#define try_to_unmap(page, refs) false
	294	+static inline void try_to_unmap(struct page *page, enum ttu_flags flags)
	295	+{
	296	+}
295	297
296	298	static inline int page_mkclean(struct page *page)
297	299	{

include/linux/scmi_protocol.h+9−5

@@ -101,6 +101,10 @@ struct scmi_clk_proto_ops { · 100 unmodified lines
101	101	* to sustained performance level mapping
102	102	* @est_power_get: gets the estimated power cost for a given performance domain
103	103	* at a given frequency
	104	+ * @fast_switch_possible: indicates if fast DVFS switching is possible or not
	105	+ * for a given device
	106	+ * @power_scale_mw_get: indicates if the power values provided are in milliWatts
	107	+ * or in some other (abstract) scale
104	108	*/
105	109	struct scmi_perf_proto_ops {
106	110	int (limits_set)(const struct scmi_protocol_handle ph, u32 domain,
@@ -153,7 +157,7 @@ struct scmi_power_proto_ops { · 46 unmodified lines
153	157	};
154	158
155	159	/**
156		− * scmi_sensor_reading - represent a timestamped read
	160	+ * struct scmi_sensor_reading - represent a timestamped read
157	161	*
158	162	* Used by @reading_get_timestamped method.
159	163	*
@@ -167,7 +171,7 @@ struct scmi_sensor_reading { · 7 unmodified lines
167	171	};
168	172
169	173	/**
170		− * scmi_range_attrs - specifies a sensor or axis values' range
	174	+ * struct scmi_range_attrs - specifies a sensor or axis values' range
171	175	* @min_range: The minimum value which can be represented by the sensor/axis.
172	176	* @max_range: The maximum value which can be represented by the sensor/axis.
173	177	*/
@@ -177,7 +181,7 @@ struct scmi_range_attrs { · 3 unmodified lines
177	181	};
178	182
179	183	/**
180		− * scmi_sensor_axis_info - describes one sensor axes
	184	+ * struct scmi_sensor_axis_info - describes one sensor axes
181	185	* @id: The axes ID.
182	186	* @type: Axes type. Chosen amongst one of @enum scmi_sensor_class.
183	187	* @scale: Power-of-10 multiplier applied to the axis unit.
@@ -205,8 +209,8 @@ struct scmi_sensor_axis_info { · 21 unmodified lines
205	209	};
206	210
207	211	/**
208		− * scmi_sensor_intervals_info - describes number and type of available update
209		− * intervals
	212	+ * struct scmi_sensor_intervals_info - describes number and type of available
	213	+ * update intervals
210	214	* @segmented: Flag for segmented intervals' representation. When True there
211	215	* will be exactly 3 intervals in @desc, with each entry
212	216	* representing a member of a segment in this order:

include/linux/scpi_protocol.h+8−0

@@ -51,6 +51,14 @@ struct scpi_sensor_info { · 50 unmodified lines
51	51	* OPP is an index to the list return by @dvfs_get_info
52	52	* @dvfs_get_info: returns the DVFS capabilities of the given power
53	53	* domain. It includes the OPP list and the latency information
	54	+ * @device_domain_id: gets the scpi domain id for a given device
	55	+ * @get_transition_latency: gets the DVFS transition latency for a given device
	56	+ * @add_opps_to_device: adds all the OPPs for a given device
	57	+ * @sensor_get_capability: get the list of capabilities for the sensors
	58	+ * @sensor_get_info: get the information of the specified sensor
	59	+ * @sensor_get_value: gets the current value of the sensor
	60	+ * @device_get_power_state: gets the power state of a power domain
	61	+ * @device_set_power_state: sets the power state of a power domain
54	62	*/
55	63	struct scpi_ops {
56	64	u32 (*get_version)(void);

include/math-emu/op-common.h+1−1

@@ -338,7 +338,7 @@ do { \ · 337 unmodified lines
338	338	FP_SET_EXCEPTION(FP_EX_INVALID \| FP_EX_INVALID_ISI); \
339	339	break; \
340	340	} \
341		− /* FALLTHRU */ \
	341	+ fallthrough; \
342	342	\
343	343	case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL): \
344	344	case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO): \

include/net/tcp.h+0−1

@@ -1709,7 +1709,6 @@ struct tcp_fastopen_context { · 1708 unmodified lines
1709	1709	struct rcu_head rcu;
1710	1710	};
1711	1711
1712		−extern unsigned int sysctl_tcp_fastopen_blackhole_timeout;
1713	1712	void tcp_fastopen_active_disable(struct sock *sk);
1714	1713	bool tcp_fastopen_active_should_disable(struct sock *sk);
1715	1714	void tcp_fastopen_active_disable_ofo_check(struct sock *sk);

include/soc/tegra/mc.h+7−2

@@ -237,14 +237,19 @@ unsigned int tegra_mc_get_emem_device_count(struct tegra_mc *mc); · 236 unmodified lines
237	237
238	238	#ifdef CONFIG_TEGRA_MC
239	239	struct tegra_mc devm_tegra_memory_controller_get(struct device dev);
	240	+int tegra_mc_probe_device(struct tegra_mc mc, struct device dev);
240	241	#else
241	242	static inline struct tegra_mc *
242	243	devm_tegra_memory_controller_get(struct device *dev)
243	244	{
244	245	return ERR_PTR(-ENODEV);
245	246	}
246		−#endif
247	247
248		−int tegra_mc_probe_device(struct tegra_mc mc, struct device dev);
	248	+static inline int
	249	+tegra_mc_probe_device(struct tegra_mc mc, struct device dev)
	250	+{
	251	+ return -ENODEV;
	252	+}
	253	+#endif
249	254
250	255	#endif /* __SOC_TEGRA_MC_H__ */

include/trace/events/afs.h+62−5

@@ -174,6 +174,34 @@ enum afs_vl_operation { · 173 unmodified lines
174	174	afs_VL_GetCapabilities = 65537, /* AFS Get VL server capabilities */
175	175	};
176	176
	177	+enum afs_cm_operation {
	178	+ afs_CB_CallBack = 204, /* AFS break callback promises */
	179	+ afs_CB_InitCallBackState = 205, /* AFS initialise callback state */
	180	+ afs_CB_Probe = 206, /* AFS probe client */
	181	+ afs_CB_GetLock = 207, /* AFS get contents of CM lock table */
	182	+ afs_CB_GetCE = 208, /* AFS get cache file description */
	183	+ afs_CB_GetXStatsVersion = 209, /* AFS get version of extended statistics */
	184	+ afs_CB_GetXStats = 210, /* AFS get contents of extended statistics data */
	185	+ afs_CB_InitCallBackState3 = 213, /* AFS initialise callback state, version 3 */
	186	+ afs_CB_ProbeUuid = 214, /* AFS check the client hasn't rebooted */
	187	+};
	188	+
	189	+enum yfs_cm_operation {
	190	+ yfs_CB_Probe = 206, /* YFS probe client */
	191	+ yfs_CB_GetLock = 207, /* YFS get contents of CM lock table */
	192	+ yfs_CB_XStatsVersion = 209, /* YFS get version of extended statistics */
	193	+ yfs_CB_GetXStats = 210, /* YFS get contents of extended statistics data */
	194	+ yfs_CB_InitCallBackState3 = 213, /* YFS initialise callback state, version 3 */
	195	+ yfs_CB_ProbeUuid = 214, /* YFS check the client hasn't rebooted */
	196	+ yfs_CB_GetServerPrefs = 215,
	197	+ yfs_CB_GetCellServDV = 216,
	198	+ yfs_CB_GetLocalCell = 217,
	199	+ yfs_CB_GetCacheConfig = 218,
	200	+ yfs_CB_GetCellByNum = 65537,
	201	+ yfs_CB_TellMeAboutYourself = 65538, /* get client capabilities */
	202	+ yfs_CB_CallBack = 64204,
	203	+};
	204	+
177	205	enum afs_edit_dir_op {
178	206	afs_edit_dir_create,
179	207	afs_edit_dir_create_error,
@@ -436,6 +464,32 @@ enum afs_cb_break_reason { · 256 unmodified lines
436	464	EM(afs_YFSVL_GetCellName, "YFSVL.GetCellName") \
437	465	E_(afs_VL_GetCapabilities, "VL.GetCapabilities")
438	466
	467	+#define afs_cm_operations \
	468	+ EM(afs_CB_CallBack, "CB.CallBack") \
	469	+ EM(afs_CB_InitCallBackState, "CB.InitCallBackState") \
	470	+ EM(afs_CB_Probe, "CB.Probe") \
	471	+ EM(afs_CB_GetLock, "CB.GetLock") \
	472	+ EM(afs_CB_GetCE, "CB.GetCE") \
	473	+ EM(afs_CB_GetXStatsVersion, "CB.GetXStatsVersion") \
	474	+ EM(afs_CB_GetXStats, "CB.GetXStats") \
	475	+ EM(afs_CB_InitCallBackState3, "CB.InitCallBackState3") \
	476	+ E_(afs_CB_ProbeUuid, "CB.ProbeUuid")
	477	+
	478	+#define yfs_cm_operations \
	479	+ EM(yfs_CB_Probe, "YFSCB.Probe") \
	480	+ EM(yfs_CB_GetLock, "YFSCB.GetLock") \
	481	+ EM(yfs_CB_XStatsVersion, "YFSCB.XStatsVersion") \
	482	+ EM(yfs_CB_GetXStats, "YFSCB.GetXStats") \
	483	+ EM(yfs_CB_InitCallBackState3, "YFSCB.InitCallBackState3") \
	484	+ EM(yfs_CB_ProbeUuid, "YFSCB.ProbeUuid") \
	485	+ EM(yfs_CB_GetServerPrefs, "YFSCB.GetServerPrefs") \
	486	+ EM(yfs_CB_GetCellServDV, "YFSCB.GetCellServDV") \
	487	+ EM(yfs_CB_GetLocalCell, "YFSCB.GetLocalCell") \
	488	+ EM(yfs_CB_GetCacheConfig, "YFSCB.GetCacheConfig") \
	489	+ EM(yfs_CB_GetCellByNum, "YFSCB.GetCellByNum") \
	490	+ EM(yfs_CB_TellMeAboutYourself, "YFSCB.TellMeAboutYourself") \
	491	+ E_(yfs_CB_CallBack, "YFSCB.CallBack")
	492	+
439	493	#define afs_edit_dir_ops \
440	494	EM(afs_edit_dir_create, "create") \
441	495	EM(afs_edit_dir_create_error, "c_fail") \
@@ -569,6 +623,8 @@ afs_server_traces; · 127 unmodified lines
569	623	afs_cell_traces;
570	624	afs_fs_operations;
571	625	afs_vl_operations;
	626	+afs_cm_operations;
	627	+yfs_cm_operations;
572	628	afs_edit_dir_ops;
573	629	afs_edit_dir_reasons;
574	630	afs_eproto_causes;
@@ -649,20 +705,21 @@ TRACE_EVENT(afs_cb_call, · 74 unmodified lines
649	705
650	706	TP_STRUCT__entry(
651	707	__field(unsigned int, call )
652		− __field(const char *, name )
653	708	__field(u32, op )
	709	+ __field(u16, service_id )
654	710	),
655	711
656	712	TP_fast_assign(
657	713	__entry->call = call->debug_id;
658		− __entry->name = call->type->name;
659	714	__entry->op = call->operation_ID;
	715	+ __entry->service_id = call->service_id;
660	716	),
661	717
662		− TP_printk("c=%08x %s o=%u",
	718	+ TP_printk("c=%08x %s",
663	719	__entry->call,
664		− __entry->name,
665		− __entry->op)
	720	+ __entry->service_id == 2501 ?
	721	+ __print_symbolic(__entry->op, yfs_cm_operations) :
	722	+ __print_symbolic(__entry->op, afs_cm_operations))
666	723	);
667	724
668	725	TRACE_EVENT(afs_call,

include/trace/events/net.h+1−1

@@ -136,7 +136,7 @@ DECLARE_EVENT_CLASS(net_dev_template, · 135 unmodified lines
136	136	__assign_str(name, skb->dev->name);
137	137	),
138	138
139		− TP_printk("dev=%s skbaddr=%p len=%u",
	139	+ TP_printk("dev=%s skbaddr=%px len=%u",
140	140	__get_str(name), __entry->skbaddr, __entry->len)
141	141	)
142	142

include/trace/events/qdisc.h+27−1

@@ -41,11 +41,37 @@ TRACE_EVENT(qdisc_dequeue, · 40 unmodified lines
41	41	__entry->txq_state = txq->state;
42	42	),
43	43
44		− TP_printk("dequeue ifindex=%d qdisc handle=0x%X parent=0x%X txq_state=0x%lX packets=%d skbaddr=%p",
	44	+ TP_printk("dequeue ifindex=%d qdisc handle=0x%X parent=0x%X txq_state=0x%lX packets=%d skbaddr=%px",
45	45	__entry->ifindex, __entry->handle, __entry->parent,
46	46	__entry->txq_state, __entry->packets, __entry->skbaddr )
47	47	);
48	48
	49	+TRACE_EVENT(qdisc_enqueue,
	50	+
	51	+ TP_PROTO(struct Qdisc qdisc, const struct netdev_queue txq, struct sk_buff *skb),
	52	+
	53	+ TP_ARGS(qdisc, txq, skb),
	54	+
	55	+ TP_STRUCT__entry(
	56	+ __field(struct Qdisc *, qdisc)
	57	+ __field(void *, skbaddr)
	58	+ __field(int, ifindex)
	59	+ __field(u32, handle)
	60	+ __field(u32, parent)
	61	+ ),
	62	+
	63	+ TP_fast_assign(
	64	+ __entry->qdisc = qdisc;
	65	+ __entry->skbaddr = skb;
	66	+ __entry->ifindex = txq->dev ? txq->dev->ifindex : 0;
	67	+ __entry->handle = qdisc->handle;
	68	+ __entry->parent = qdisc->parent;
	69	+ ),
	70	+
	71	+ TP_printk("enqueue ifindex=%d qdisc handle=0x%X parent=0x%X skbaddr=%px",
	72	+ __entry->ifindex, __entry->handle, __entry->parent, __entry->skbaddr)
	73	+);
	74	+
49	75	TRACE_EVENT(qdisc_reset,
50	76
51	77	TP_PROTO(struct Qdisc *q),

init/Kconfig+0−1

@@ -1847,7 +1847,6 @@ config SLUB_DEBUG · 1846 unmodified lines
1847	1847	default y
1848	1848	bool "Enable SLUB debugging support" if EXPERT
1849	1849	depends on SLUB && SYSFS
1850		− select STACKDEPOT if STACKTRACE_SUPPORT
1851	1850	help
1852	1851	SLUB has extensive debug support features. Disabling these can
1853	1852	result in significant savings in code size. This also disables

kernel/bpf/verifier.c+2−0

@@ -3754,6 +3754,8 @@ continue_func: · 3753 unmodified lines
3754	3754	if (tail_call_reachable)
3755	3755	for (j = 0; j < frame; j++)
3756	3756	subprog[ret_prog[j]].tail_call_reachable = true;
	3757	+ if (subprog[0].tail_call_reachable)
	3758	+ env->prog->aux->tail_call_reachable = true;
3757	3759
3758	3760	/* end of for() loop means the last insn of the 'subprog'
3759	3761	* was reached. Doesn't matter whether it was JA or EXIT

kernel/debug/gdbstub.c+1−1

@@ -1045,8 +1045,8 @@ int gdb_serial_stub(struct kgdb_state *ks) · 1044 unmodified lines
1045	1045	gdb_cmd_detachkill(ks);
1046	1046	return DBG_PASS_EVENT;
1047	1047	}
1048		−#endif
1049	1048	fallthrough;
	1049	+#endif
1050	1050	case 'C': /* Exception passing */
1051	1051	tmp = gdb_cmd_exception_pass(ks);
1052	1052	if (tmp > 0)

kernel/rcu/refscale.c+3−3

@@ -487,13 +487,13 @@ ref_scale_reader(void *arg) · 486 unmodified lines
487	487	s64 duration;
488	488
489	489	VERBOSE_SCALEOUT_BATCH("ref_scale_reader %ld: task started", me);
490		− set_cpus_allowed_ptr(current, cpumask_of(me % nr_cpu_ids));
	490	+ WARN_ON_ONCE(set_cpus_allowed_ptr(current, cpumask_of(me % nr_cpu_ids)));
491	491	set_user_nice(current, MAX_NICE);
492	492	atomic_inc(&n_init);
493	493	if (holdoff)
494	494	schedule_timeout_interruptible(holdoff * HZ);
495	495	repeat:
496		− VERBOSE_SCALEOUT_BATCH("ref_scale_reader %ld: waiting to start next experiment on cpu %d", me, smp_processor_id());
	496	+ VERBOSE_SCALEOUT_BATCH("ref_scale_reader %ld: waiting to start next experiment on cpu %d", me, raw_smp_processor_id());
497	497
498	498	// Wait for signal that this reader can start.
499	499	wait_event(rt->wq, (atomic_read(&nreaders_exp) && smp_load_acquire(&rt->start_reader)) \|\|
@@ -503,7 +503,7 @@ repeat: · 3 unmodified lines
503	503	goto end;
504	504
505	505	// Make sure that the CPU is affinitized appropriately during testing.
506		− WARN_ON_ONCE(smp_processor_id() != me);
	506	+ WARN_ON_ONCE(raw_smp_processor_id() != me);
507	507
508	508	WRITE_ONCE(rt->start_reader, 0);
509	509	if (!atomic_dec_return(&n_started))

kernel/rcu/tasks.h+2−4

@@ -953,10 +953,9 @@ static bool trc_inspect_reader(struct task_struct t, void arg) · 952 unmodified lines
953	953	in_qs = likely(!t->trc_reader_nesting);
954	954	}
955	955
956		− // Mark as checked. Because this is called from the grace-period
957		− // kthread, also remove the task from the holdout list.
	956	+ // Mark as checked so that the grace-period kthread will
	957	+ // remove it from the holdout list.
958	958	t->trc_reader_checked = true;
959		− trc_del_holdout(t);
960	959
961	960	if (in_qs)
962	961	return true; // Already in quiescent state, done!!!
@@ -983,7 +982,6 @@ static void trc_wait_for_one_reader(struct task_struct *t, · 20 unmodified lines
983	982	// The current task had better be in a quiescent state.
984	983	if (t == current) {
985	984	t->trc_reader_checked = true;
986		− trc_del_holdout(t);
987	985	WARN_ON_ONCE(t->trc_reader_nesting);
988	986	return;
989	987	}

kernel/rcu/tree_stall.h+2−2

@@ -795,9 +795,9 @@ void show_rcu_gp_kthreads(void) · 794 unmodified lines
795	795	jr = j - data_race(rcu_state.gp_req_activity);
796	796	js = j - data_race(rcu_state.gp_start);
797	797	jw = j - data_race(rcu_state.gp_wake_time);
798		− pr_info("%s: wait state: %s(%d) ->state: %#lx ->rt_priority %u delta ->gp_start %lu ->gp_activity %lu ->gp_req_activity %lu ->gp_wake_time %lu ->gp_wake_seq %ld ->gp_seq %ld ->gp_seq_needed %ld ->gp_max %lu ->gp_flags %#x\n",
	798	+ pr_info("%s: wait state: %s(%d) ->state: %#x ->rt_priority %u delta ->gp_start %lu ->gp_activity %lu ->gp_req_activity %lu ->gp_wake_time %lu ->gp_wake_seq %ld ->gp_seq %ld ->gp_seq_needed %ld ->gp_max %lu ->gp_flags %#x\n",
799	799	rcu_state.name, gp_state_getname(rcu_state.gp_state),
800		− rcu_state.gp_state, t ? t->__state : 0x1ffffL, t ? t->rt_priority : 0xffU,
	800	+ rcu_state.gp_state, t ? t->__state : 0x1ffff, t ? t->rt_priority : 0xffU,
801	801	js, ja, jr, jw, (long)data_race(rcu_state.gp_wake_seq),
802	802	(long)data_race(rcu_state.gp_seq),
803	803	(long)data_race(rcu_get_root()->gp_seq_needed),

kernel/scftorture.c+3−3

@@ -405,15 +405,15 @@ static int scftorture_invoker(void *arg) · 404 unmodified lines
405	405
406	406	VERBOSE_SCFTORTOUT("scftorture_invoker %d: task started", scfp->cpu);
407	407	cpu = scfp->cpu % nr_cpu_ids;
408		− set_cpus_allowed_ptr(current, cpumask_of(cpu));
	408	+ WARN_ON_ONCE(set_cpus_allowed_ptr(current, cpumask_of(cpu)));
409	409	set_user_nice(current, MAX_NICE);
410	410	if (holdoff)
411	411	schedule_timeout_interruptible(holdoff * HZ);
412	412
413		− VERBOSE_SCFTORTOUT("scftorture_invoker %d: Waiting for all SCF torturers from cpu %d", scfp->cpu, smp_processor_id());
	413	+ VERBOSE_SCFTORTOUT("scftorture_invoker %d: Waiting for all SCF torturers from cpu %d", scfp->cpu, raw_smp_processor_id());
414	414
415	415	// Make sure that the CPU is affinitized appropriately during testing.
416		− curcpu = smp_processor_id();
	416	+ curcpu = raw_smp_processor_id();
417	417	WARN_ONCE(curcpu != scfp->cpu % nr_cpu_ids,
418	418	"%s: Wanted CPU %d, running on %d, nr_cpu_ids = %d\n",
419	419	__func__, scfp->cpu, curcpu, nr_cpu_ids);

kernel/trace/trace_events_hist.c+3−3

@@ -1689,7 +1689,9 @@ static struct hist_field create_hist_field(struct hist_trigger_data hist_data, · 1688 unmodified lines
1689	1689	if (WARN_ON_ONCE(!field))
1690	1690	goto out;
1691	1691
1692		− if (is_string_field(field)) {
	1692	+ /* Pointers to strings are just pointers and dangerous to dereference */
	1693	+ if (is_string_field(field) &&
	1694	+ (field->filter_type != FILTER_PTR_STRING)) {
1693	1695	flags \|= HIST_FIELD_FL_STRING;
1694	1696
1695	1697	hist_field->size = MAX_FILTER_STR_VAL;
@@ -4495,8 +4497,6 @@ static inline void add_to_key(char compound_key, void key, · 2799 unmodified lines
4495	4497	field = key_field->field;
4496	4498	if (field->filter_type == FILTER_DYN_STRING)
4497	4499	size = (u32 )(rec + field->offset) >> 16;
4498		− else if (field->filter_type == FILTER_PTR_STRING)
4499		− size = strlen(key);
4500	4500	else if (field->filter_type == FILTER_STATIC_STRING)
4501	4501	size = field->size;
4502	4502

lib/test_hmm.c+0−2

@@ -628,10 +628,8 @@ static int dmirror_check_atomic(struct dmirror *dmirror, unsigned long start, · 627 unmodified lines
628	628
629	629	for (pfn = start >> PAGE_SHIFT; pfn < (end >> PAGE_SHIFT); pfn++) {
630	630	void *entry;
631		− struct page *page;
632	631
633	632	entry = xa_load(&dmirror->pt, pfn);
634		− page = xa_untag_pointer(entry);
635	633	if (xa_pointer_tag(entry) == DPT_XA_TAG_ATOMIC)
636	634	return -EPERM;
637	635	}

mm/hugetlb.c+3−2

@@ -5440,8 +5440,9 @@ long follow_hugetlb_page(struct mm_struct mm, struct vm_area_struct vma, · 5439 unmodified lines
5440	5440	continue;
5441	5441	}
5442	5442
5443		− refs = min3(pages_per_huge_page(h) - pfn_offset,
5444		− (vma->vm_end - vaddr) >> PAGE_SHIFT, remainder);
	5443	+ /* vaddr may not be aligned to PAGE_SIZE */
	5444	+ refs = min3(pages_per_huge_page(h) - pfn_offset, remainder,
	5445	+ (vma->vm_end - ALIGN_DOWN(vaddr, PAGE_SIZE)) >> PAGE_SHIFT);
5445	5446
5446	5447	if (pages \|\| vmas)
5447	5448	record_subpages_vmas(mem_map_offset(page, pfn_offset),

mm/kasan/kasan.h+12−0

@@ -9,6 +9,7 @@ · 8 unmodified lines
9	9	#ifdef CONFIG_KASAN_HW_TAGS
10	10
11	11	#include <linux/static_key.h>
	12	+#include "../slab.h"
12	13
13	14	DECLARE_STATIC_KEY_FALSE(kasan_flag_stacktrace);
14	15	extern bool kasan_flag_async __ro_after_init;
@@ -387,6 +388,17 @@ static inline void kasan_unpoison(const void *addr, size_t size, bool init) · 372 unmodified lines
387	388
388	389	if (WARN_ON((unsigned long)addr & KASAN_GRANULE_MASK))
389	390	return;
	391	+ /*
	392	+ * Explicitly initialize the memory with the precise object size to
	393	+ * avoid overwriting the SLAB redzone. This disables initialization in
	394	+ * the arch code and may thus lead to performance penalty. The penalty
	395	+ * is accepted since SLAB redzones aren't enabled in production builds.
	396	+ */
	397	+ if (__slub_debug_enabled() &&
	398	+ init && ((unsigned long)size & KASAN_GRANULE_MASK)) {
	399	+ init = false;
	400	+ memzero_explicit((void *)addr, size);
	401	+ }
390	402	size = round_up(size, KASAN_GRANULE_SIZE);
391	403
392	404	hw_set_mem_tag_range((void *)addr, size, tag, init);

mm/page_alloc.c+21−7

@@ -3820,7 +3820,7 @@ static inline bool __should_fail_alloc_page(gfp_t gfp_mask, unsigned int order) · 3819 unmodified lines
3820	3820
3821	3821	#endif /* CONFIG_FAIL_PAGE_ALLOC */
3822	3822
3823		−static noinline bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order)
	3823	+noinline bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order)
3824	3824	{
3825	3825	return __should_fail_alloc_page(gfp_mask, order);
3826	3826	}
@@ -5221,9 +5221,6 @@ unsigned long __alloc_pages_bulk(gfp_t gfp, int preferred_nid, · 1394 unmodified lines
5221	5221	unsigned int alloc_flags = ALLOC_WMARK_LOW;
5222	5222	int nr_populated = 0, nr_account = 0;
5223	5223
5224		− if (unlikely(nr_pages <= 0))
5225		− return 0;
5226		−
5227	5224	/*
5228	5225	* Skip populated array elements to determine if any pages need
5229	5226	* to be allocated before disabling IRQs.
@@ -5231,19 +5228,35 @@ unsigned long __alloc_pages_bulk(gfp_t gfp, int preferred_nid, · 1 unmodified line
5231	5228	while (page_array && nr_populated < nr_pages && page_array[nr_populated])
5232	5229	nr_populated++;
5233	5230
	5231	+ /* No pages requested? */
	5232	+ if (unlikely(nr_pages <= 0))
	5233	+ goto out;
	5234	+
5234	5235	/* Already populated array? */
5235	5236	if (unlikely(page_array && nr_pages - nr_populated == 0))
5236		− return nr_populated;
	5237	+ goto out;
5237	5238
5238	5239	/* Use the single page allocator for one page. */
5239	5240	if (nr_pages - nr_populated == 1)
5240	5241	goto failed;
5241	5242
	5243	+#ifdef CONFIG_PAGE_OWNER
	5244	+ /*
	5245	+ * PAGE_OWNER may recurse into the allocator to allocate space to
	5246	+ * save the stack with pagesets.lock held. Releasing/reacquiring
	5247	+ * removes much of the performance benefit of bulk allocation so
	5248	+ * force the caller to allocate one page at a time as it'll have
	5249	+ * similar performance to added complexity to the bulk allocator.
	5250	+ */
	5251	+ if (static_branch_unlikely(&page_owner_inited))
	5252	+ goto failed;
	5253	+#endif
	5254	+
5242	5255	/* May set ALLOC_NOFRAGMENT, fragmentation will return 1 page. */
5243	5256	gfp &= gfp_allowed_mask;
5244	5257	alloc_gfp = gfp;
5245	5258	if (!prepare_alloc_pages(gfp, 0, preferred_nid, nodemask, &ac, &alloc_gfp, &alloc_flags))
5246		− return 0;
	5259	+ goto out;
5247	5260	gfp = alloc_gfp;
5248	5261
5249	5262	/* Find an allowed local zone that meets the low watermark. */
@@ -5311,6 +5324,7 @@ unsigned long __alloc_pages_bulk(gfp_t gfp, int preferred_nid, · 61 unmodified lines
5311	5324	__count_zid_vm_events(PGALLOC, zone_idx(zone), nr_account);
5312	5325	zone_statistics(ac.preferred_zoneref->zone, zone, nr_account);
5313	5326
	5327	+out:
5314	5328	return nr_populated;
5315	5329
5316	5330	failed_irq:
@@ -5326,7 +5340,7 @@ failed: · 9 unmodified lines
5326	5340	nr_populated++;
5327	5341	}
5328	5342
5329		− return nr_populated;
	5343	+ goto out;
5330	5344	}
5331	5345	EXPORT_SYMBOL_GPL(__alloc_pages_bulk);
5332	5346

mm/slab.h+11−4

@@ -216,10 +216,18 @@ DECLARE_STATIC_KEY_FALSE(slub_debug_enabled); · 215 unmodified lines
216	216	#endif
217	217	extern void print_tracking(struct kmem_cache s, void object);
218	218	long validate_slab_cache(struct kmem_cache *s);
	219	+static inline bool __slub_debug_enabled(void)
	220	+{
	221	+ return static_branch_unlikely(&slub_debug_enabled);
	222	+}
219	223	#else
220	224	static inline void print_tracking(struct kmem_cache s, void object)
221	225	{
222	226	}
	227	+static inline bool __slub_debug_enabled(void)
	228	+{
	229	+ return false;
	230	+}
223	231	#endif
224	232
225	233	/*
@@ -229,11 +237,10 @@ static inline void print_tracking(struct kmem_cache s, void object) · 3 unmodified lines
229	237	*/
230	238	static inline bool kmem_cache_debug_flags(struct kmem_cache *s, slab_flags_t flags)
231	239	{
232		−#ifdef CONFIG_SLUB_DEBUG
233		− VM_WARN_ON_ONCE(!(flags & SLAB_DEBUG_FLAGS));
234		− if (static_branch_unlikely(&slub_debug_enabled))
	240	+ if (IS_ENABLED(CONFIG_SLUB_DEBUG))
	241	+ VM_WARN_ON_ONCE(!(flags & SLAB_DEBUG_FLAGS));
	242	+ if (__slub_debug_enabled())
235	243	return s->flags & flags;
236		−#endif
237	244	return false;
238	245	}
239	246

mm/slub.c+30−63

@@ -26,7 +26,6 @@ · 25 unmodified lines
26	26	#include <linux/cpuset.h>
27	27	#include <linux/mempolicy.h>
28	28	#include <linux/ctype.h>
29		−#include <linux/stackdepot.h>
30	29	#include <linux/debugobjects.h>
31	30	#include <linux/kallsyms.h>
32	31	#include <linux/kfence.h>
@@ -120,25 +119,11 @@ · 87 unmodified lines
120	119	*/
121	120
122	121	#ifdef CONFIG_SLUB_DEBUG
123		−
124	122	#ifdef CONFIG_SLUB_DEBUG_ON
125	123	DEFINE_STATIC_KEY_TRUE(slub_debug_enabled);
126	124	#else
127	125	DEFINE_STATIC_KEY_FALSE(slub_debug_enabled);
128	126	#endif
129		−
130		−static inline bool __slub_debug_enabled(void)
131		−{
132		− return static_branch_unlikely(&slub_debug_enabled);
133		−}
134		−
135		−#else /* CONFIG_SLUB_DEBUG */
136		−
137		−static inline bool __slub_debug_enabled(void)
138		−{
139		− return false;
140		−}
141		−
142	127	#endif /* CONFIG_SLUB_DEBUG */
143	128
144	129	static inline bool kmem_cache_debug(struct kmem_cache *s)
@@ -221,8 +206,8 @@ static inline bool kmem_cache_has_cpu_partial(struct kmem_cache *s) · 76 unmodified lines
221	206	#define TRACK_ADDRS_COUNT 16
222	207	struct track {
223	208	unsigned long addr; /* Called from address */
224		−#ifdef CONFIG_STACKDEPOT
225		− depot_stack_handle_t handle;
	209	+#ifdef CONFIG_STACKTRACE
	210	+ unsigned long addrs[TRACK_ADDRS_COUNT]; /* Called from address */
226	211	#endif
227	212	int cpu; /* Was running on cpu */
228	213	int pid; /* Pid context */
@@ -626,27 +611,22 @@ static struct track get_track(struct kmem_cache s, void *object, · 397 unmodified lines
626	611	return kasan_reset_tag(p + alloc);
627	612	}
628	613
629		−#ifdef CONFIG_STACKDEPOT
630		−static depot_stack_handle_t save_stack_depot_trace(gfp_t flags)
631		−{
632		− unsigned long entries[TRACK_ADDRS_COUNT];
633		− depot_stack_handle_t handle;
634		− unsigned int nr_entries;
635		−
636		− nr_entries = stack_trace_save(entries, ARRAY_SIZE(entries), 4);
637		− handle = stack_depot_save(entries, nr_entries, flags);
638		− return handle;
639		−}
640		−#endif
641		−
642	614	static void set_track(struct kmem_cache s, void object,
643	615	enum track_item alloc, unsigned long addr)
644	616	{
645	617	struct track *p = get_track(s, object, alloc);
646	618
647	619	if (addr) {
648		−#ifdef CONFIG_STACKDEPOT
649		− p->handle = save_stack_depot_trace(GFP_NOWAIT);
	620	+#ifdef CONFIG_STACKTRACE
	621	+ unsigned int nr_entries;
	622	+
	623	+ metadata_access_enable();
	624	+ nr_entries = stack_trace_save(kasan_reset_tag(p->addrs),
	625	+ TRACK_ADDRS_COUNT, 3);
	626	+ metadata_access_disable();
	627	+
	628	+ if (nr_entries < TRACK_ADDRS_COUNT)
	629	+ p->addrs[nr_entries] = 0;
650	630	#endif
651	631	p->addr = addr;
652	632	p->cpu = smp_processor_id();
@@ -673,19 +653,14 @@ static void print_track(const char s, struct track t, unsigned long pr_time) · 20 unmodified lines
673	653
674	654	pr_err("%s in %pS age=%lu cpu=%u pid=%d\n",
675	655	s, (void *)t->addr, pr_time - t->when, t->cpu, t->pid);
676		−#ifdef CONFIG_STACKDEPOT
	656	+#ifdef CONFIG_STACKTRACE
677	657	{
678		− depot_stack_handle_t handle;
679		− unsigned long *entries;
680		− unsigned int nr_entries;
681		−
682		− handle = READ_ONCE(t->handle);
683		− if (!handle) {
684		− pr_err("object allocation/free stack trace missing\n");
685		− } else {
686		− nr_entries = stack_depot_fetch(handle, &entries);
687		− stack_trace_print(entries, nr_entries, 0);
688		− }
	658	+ int i;
	659	+ for (i = 0; i < TRACK_ADDRS_COUNT; i++)
	660	+ if (t->addrs[i])
	661	+ pr_err("\t%pS\n", (void *)t->addrs[i]);
	662	+ else
	663	+ break;
689	664	}
690	665	#endif
691	666	}
@@ -4059,26 +4034,18 @@ void kmem_obj_info(struct kmem_obj_info kpp, void object, struct page *page) · 3367 unmodified lines
4059	4034	objp = fixup_red_left(s, objp);
4060	4035	trackp = get_track(s, objp, TRACK_ALLOC);
4061	4036	kpp->kp_ret = (void *)trackp->addr;
4062		−#ifdef CONFIG_STACKDEPOT
4063		− {
4064		− depot_stack_handle_t handle;
4065		− unsigned long *entries;
4066		− unsigned int nr_entries;
4067		−
4068		− handle = READ_ONCE(trackp->handle);
4069		− if (handle) {
4070		− nr_entries = stack_depot_fetch(handle, &entries);
4071		− for (i = 0; i < KS_ADDRS_COUNT && i < nr_entries; i++)
4072		− kpp->kp_stack[i] = (void *)entries[i];
4073		− }
	4037	+#ifdef CONFIG_STACKTRACE
	4038	+ for (i = 0; i < KS_ADDRS_COUNT && i < TRACK_ADDRS_COUNT; i++) {
	4039	+ kpp->kp_stack[i] = (void *)trackp->addrs[i];
	4040	+ if (!kpp->kp_stack[i])
	4041	+ break;
	4042	+ }
4074	4043
4075		− trackp = get_track(s, objp, TRACK_FREE);
4076		− handle = READ_ONCE(trackp->handle);
4077		− if (handle) {
4078		− nr_entries = stack_depot_fetch(handle, &entries);
4079		− for (i = 0; i < KS_ADDRS_COUNT && i < nr_entries; i++)
4080		− kpp->kp_free_stack[i] = (void *)entries[i];
4081		− }
	4044	+ trackp = get_track(s, objp, TRACK_FREE);
	4045	+ for (i = 0; i < KS_ADDRS_COUNT && i < TRACK_ADDRS_COUNT; i++) {
	4046	+ kpp->kp_free_stack[i] = (void *)trackp->addrs[i];
	4047	+ if (!kpp->kp_free_stack[i])
	4048	+ break;
4082	4049	}
4083	4050	#endif
4084	4051	#endif

net/bpf/test_run.c+5−0

@@ -761,6 +761,11 @@ int bpf_prog_test_run_xdp(struct bpf_prog prog, const union bpf_attr kattr, · 760 unmodified lines
761	761	void *data;
762	762	int ret = -EINVAL;
763	763
	764	+ if (prog->expected_attach_type == BPF_XDP_DEVMAP \|\|
	765	+ prog->expected_attach_type == BPF_XDP_CPUMAP)
	766	+ return -EINVAL;
	767	+ if (kattr->test.ctx_in \|\| kattr->test.ctx_out)
	768	+ return -EINVAL;
764	769	ctx = bpf_ctx_init(kattr, sizeof(struct xdp_md));
765	770	if (IS_ERR(ctx))
766	771	return PTR_ERR(ctx);

net/bridge/br_fdb.c+1−1

@@ -783,7 +783,7 @@ int br_fdb_replay(const struct net_device br_dev, const struct net_device dev, · 782 unmodified lines
783	783	struct net_device *dst_dev;
784	784
785	785	dst_dev = dst ? dst->dev : br->dev;
786		− if (dst_dev != br_dev && dst_dev != dev)
	786	+ if (dst_dev && dst_dev != dev)
787	787	continue;
788	788
789	789	err = br_fdb_replay_one(nb, fdb, dst_dev, action, ctx);

net/caif/caif_socket.c+2−1

@@ -539,7 +539,8 @@ static int caif_seqpkt_sendmsg(struct socket sock, struct msghdr msg, · 538 unmodified lines
539	539	goto err;
540	540
541	541	ret = -EINVAL;
542		− if (unlikely(msg->msg_iter.iov->iov_base == NULL))
	542	+ if (unlikely(msg->msg_iter.nr_segs == 0) \|\|
	543	+ unlikely(msg->msg_iter.iov->iov_base == NULL))
543	544	goto err;
544	545	noblock = msg->msg_flags & MSG_DONTWAIT;
545	546

net/core/dev.c+26−8

@@ -131,6 +131,7 @@ · 130 unmodified lines
131	131	#include <trace/events/napi.h>
132	132	#include <trace/events/net.h>
133	133	#include <trace/events/skb.h>
	134	+#include <trace/events/qdisc.h>
134	135	#include <linux/inetdevice.h>
135	136	#include <linux/cpu_rmap.h>
136	137	#include <linux/static_key.h>
@@ -3844,6 +3845,18 @@ static void qdisc_pkt_len_init(struct sk_buff *skb) · 3707 unmodified lines
3844	3845	}
3845	3846	}
3846	3847
	3848	+static int dev_qdisc_enqueue(struct sk_buff skb, struct Qdisc q,
	3849	+ struct sk_buff **to_free,
	3850	+ struct netdev_queue *txq)
	3851	+{
	3852	+ int rc;
	3853	+
	3854	+ rc = q->enqueue(skb, q, to_free) & NET_XMIT_MASK;
	3855	+ if (rc == NET_XMIT_SUCCESS)
	3856	+ trace_qdisc_enqueue(q, txq, skb);
	3857	+ return rc;
	3858	+}
	3859	+
3847	3860	static inline int __dev_xmit_skb(struct sk_buff skb, struct Qdisc q,
3848	3861	struct net_device *dev,
3849	3862	struct netdev_queue *txq)
@@ -3862,8 +3875,7 @@ static inline int __dev_xmit_skb(struct sk_buff skb, struct Qdisc q, · 12 unmodified lines
3862	3875	* of q->seqlock to protect from racing with requeuing.
3863	3876	*/
3864	3877	if (unlikely(!nolock_qdisc_is_empty(q))) {
3865		− rc = q->enqueue(skb, q, &to_free) &
3866		− NET_XMIT_MASK;
	3878	+ rc = dev_qdisc_enqueue(skb, q, &to_free, txq);
3867	3879	__qdisc_run(q);
3868	3880	qdisc_run_end(q);
3869	3881
@@ -3879,7 +3891,7 @@ static inline int __dev_xmit_skb(struct sk_buff skb, struct Qdisc q, · 9 unmodified lines
3879	3891	return NET_XMIT_SUCCESS;
3880	3892	}
3881	3893
3882		− rc = q->enqueue(skb, q, &to_free) & NET_XMIT_MASK;
	3894	+ rc = dev_qdisc_enqueue(skb, q, &to_free, txq);
3883	3895	qdisc_run(q);
3884	3896
3885	3897	no_lock_out:
@@ -3923,7 +3935,7 @@ no_lock_out: · 37 unmodified lines
3923	3935	qdisc_run_end(q);
3924	3936	rc = NET_XMIT_SUCCESS;
3925	3937	} else {
3926		− rc = q->enqueue(skb, q, &to_free) & NET_XMIT_MASK;
	3938	+ rc = dev_qdisc_enqueue(skb, q, &to_free, txq);
3927	3939	if (qdisc_run_begin(q)) {
3928	3940	if (unlikely(contended)) {
3929	3941	spin_unlock(&q->busylock);
@@ -9703,14 +9715,17 @@ int bpf_xdp_link_attach(const union bpf_attr attr, struct bpf_prog prog) · 5773 unmodified lines
9703	9715	struct net_device *dev;
9704	9716	int err, fd;
9705	9717
	9718	+ rtnl_lock();
9706	9719	dev = dev_get_by_index(net, attr->link_create.target_ifindex);
9707		− if (!dev)
	9720	+ if (!dev) {
	9721	+ rtnl_unlock();
9708	9722	return -EINVAL;
	9723	+ }
9709	9724
9710	9725	link = kzalloc(sizeof(*link), GFP_USER);
9711	9726	if (!link) {
9712	9727	err = -ENOMEM;
9713		− goto out_put_dev;
	9728	+ goto unlock;
9714	9729	}
9715	9730
9716	9731	bpf_link_init(&link->link, BPF_LINK_TYPE_XDP, &bpf_xdp_link_lops, prog);
@@ -9720,14 +9735,14 @@ int bpf_xdp_link_attach(const union bpf_attr attr, struct bpf_prog prog) · 3 unmodified lines
9720	9735	err = bpf_link_prime(&link->link, &link_primer);
9721	9736	if (err) {
9722	9737	kfree(link);
9723		− goto out_put_dev;
	9738	+ goto unlock;
9724	9739	}
9725	9740
9726		− rtnl_lock();
9727	9741	err = dev_xdp_attach_link(dev, NULL, link);
9728	9742	rtnl_unlock();
9729	9743
9730	9744	if (err) {
	9745	+ link->dev = NULL;
9731	9746	bpf_link_cleanup(&link_primer);
9732	9747	goto out_put_dev;
9733	9748	}
@@ -9737,6 +9752,9 @@ int bpf_xdp_link_attach(const union bpf_attr attr, struct bpf_prog prog) · 3 unmodified lines
9737	9752	dev_put(dev);
9738	9753	return fd;
9739	9754
	9755	+unlock:
	9756	+ rtnl_unlock();
	9757	+
9740	9758	out_put_dev:
9741	9759	dev_put(dev);
9742	9760	return err;

net/core/skbuff.c+16−2

@@ -663,7 +663,7 @@ static void skb_release_data(struct sk_buff *skb) · 662 unmodified lines
663	663	if (skb->cloned &&
664	664	atomic_sub_return(skb->nohdr ? (1 << SKB_DATAREF_SHIFT) + 1 : 1,
665	665	&shinfo->dataref))
666		− return;
	666	+ goto exit;
667	667
668	668	skb_zcopy_clear(skb, true);
669	669
@@ -674,6 +674,17 @@ static void skb_release_data(struct sk_buff *skb) · 4 unmodified lines
674	674	kfree_skb_list(shinfo->frag_list);
675	675
676	676	skb_free_head(skb);
	677	+exit:
	678	+ /* When we clone an SKB we copy the reycling bit. The pp_recycle
	679	+ * bit is only set on the head though, so in order to avoid races
	680	+ * while trying to recycle fragments on __skb_frag_unref() we need
	681	+ * to make one SKB responsible for triggering the recycle path.
	682	+ * So disable the recycling bit if an SKB is cloned and we have
	683	+ * additional references to to the fragmented part of the SKB.
	684	+ * Eventually the last SKB will have the recycling bit set and it's
	685	+ * dataref set to 0, which will trigger the recycling
	686	+ */
	687	+ skb->pp_recycle = 0;
677	688	}
678	689
679	690	/*
@@ -3011,8 +3022,11 @@ skb_zerocopy_headlen(const struct sk_buff *from) · 2331 unmodified lines
3011	3022
3012	3023	if (!from->head_frag \|\|
3013	3024	skb_headlen(from) < L1_CACHE_BYTES \|\|
3014		− skb_shinfo(from)->nr_frags >= MAX_SKB_FRAGS)
	3025	+ skb_shinfo(from)->nr_frags >= MAX_SKB_FRAGS) {
3015	3026	hlen = skb_headlen(from);
	3027	+ if (!hlen)
	3028	+ hlen = from->len;
	3029	+ }
3016	3030
3017	3031	if (skb_has_frag_list(from))
3018	3032	hlen = from->len;

net/core/skmsg.c+11−5

@@ -508,10 +508,8 @@ static int sk_psock_skb_ingress_enqueue(struct sk_buff *skb, · 507 unmodified lines
508	508	if (skb_linearize(skb))
509	509	return -EAGAIN;
510	510	num_sge = skb_to_sgvec(skb, msg->sg.data, 0, skb->len);
511		− if (unlikely(num_sge < 0)) {
512		− kfree(msg);
	511	+ if (unlikely(num_sge < 0))
513	512	return num_sge;
514		− }
515	513
516	514	copied = skb->len;
517	515	msg->sg.start = 0;
@@ -530,6 +528,7 @@ static int sk_psock_skb_ingress(struct sk_psock psock, struct sk_buff skb) · 12 unmodified lines
530	528	{
531	529	struct sock *sk = psock->sk;
532	530	struct sk_msg *msg;
	531	+ int err;
533	532
534	533	/* If we are receiving on the same sock skb->sk is already assigned,
535	534	* skip memory accounting and owner transition seeing it already set
@@ -548,7 +547,10 @@ static int sk_psock_skb_ingress(struct sk_psock psock, struct sk_buff skb) · 12 unmodified lines
548	547	* into user buffers.
549	548	*/
550	549	skb_set_owner_r(skb, sk);
551		− return sk_psock_skb_ingress_enqueue(skb, psock, sk, msg);
	550	+ err = sk_psock_skb_ingress_enqueue(skb, psock, sk, msg);
	551	+ if (err < 0)
	552	+ kfree(msg);
	553	+ return err;
552	554	}
553	555
554	556	/* Puts an skb on the ingress queue of the socket already assigned to the
@@ -559,12 +561,16 @@ static int sk_psock_skb_ingress_self(struct sk_psock psock, struct sk_buff skb · 4 unmodified lines
559	561	{
560	562	struct sk_msg msg = kzalloc(sizeof(msg), __GFP_NOWARN \| GFP_ATOMIC);
561	563	struct sock *sk = psock->sk;
	564	+ int err;
562	565
563	566	if (unlikely(!msg))
564	567	return -EAGAIN;
565	568	sk_msg_init(msg);
566	569	skb_set_owner_r(skb, sk);
567		− return sk_psock_skb_ingress_enqueue(skb, psock, sk, msg);
	570	+ err = sk_psock_skb_ingress_enqueue(skb, psock, sk, msg);
	571	+ if (err < 0)
	572	+ kfree(msg);
	573	+ return err;
568	574	}
569	575
570	576	static int sk_psock_handle_skb(struct sk_psock psock, struct sk_buff skb,

net/decnet/af_decnet.c+12−15

@@ -816,7 +816,7 @@ static int dn_auto_bind(struct socket *sock) · 815 unmodified lines
816	816	static int dn_confirm_accept(struct sock sk, long timeo, gfp_t allocation)
817	817	{
818	818	struct dn_scp *scp = DN_SK(sk);
819		− DEFINE_WAIT(wait);
	819	+ DEFINE_WAIT_FUNC(wait, woken_wake_function);
820	820	int err;
821	821
822	822	if (scp->state != DN_CR)
@@ -826,11 +826,11 @@ static int dn_confirm_accept(struct sock sk, long timeo, gfp_t allocation) · 3 unmodified lines
826	826	scp->segsize_loc = dst_metric_advmss(__sk_dst_get(sk));
827	827	dn_send_conn_conf(sk, allocation);
828	828
829		− prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
	829	+ add_wait_queue(sk_sleep(sk), &wait);
830	830	for(;;) {
831	831	release_sock(sk);
832	832	if (scp->state == DN_CC)
833		− timeo = schedule_timeout(timeo);
	833	+ timeo = wait_woken(&wait, TASK_INTERRUPTIBLE, timeo);
834	834	lock_sock(sk);
835	835	err = 0;
836	836	if (scp->state == DN_RUN)
@@ -844,9 +844,8 @@ static int dn_confirm_accept(struct sock sk, long timeo, gfp_t allocation) · 7 unmodified lines
844	844	err = -EAGAIN;
845	845	if (!*timeo)
846	846	break;
847		− prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
848	847	}
849		− finish_wait(sk_sleep(sk), &wait);
	848	+ remove_wait_queue(sk_sleep(sk), &wait);
850	849	if (err == 0) {
851	850	sk->sk_socket->state = SS_CONNECTED;
852	851	} else if (scp->state != DN_CC) {
@@ -858,7 +857,7 @@ static int dn_confirm_accept(struct sock sk, long timeo, gfp_t allocation) · 5 unmodified lines
858	857	static int dn_wait_run(struct sock sk, long timeo)
859	858	{
860	859	struct dn_scp *scp = DN_SK(sk);
861		− DEFINE_WAIT(wait);
	860	+ DEFINE_WAIT_FUNC(wait, woken_wake_function);
862	861	int err = 0;
863	862
864	863	if (scp->state == DN_RUN)
@@ -867,11 +866,11 @@ static int dn_wait_run(struct sock sk, long timeo) · 2 unmodified lines
867	866	if (!*timeo)
868	867	return -EALREADY;
869	868
870		− prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
	869	+ add_wait_queue(sk_sleep(sk), &wait);
871	870	for(;;) {
872	871	release_sock(sk);
873	872	if (scp->state == DN_CI \|\| scp->state == DN_CC)
874		− timeo = schedule_timeout(timeo);
	873	+ timeo = wait_woken(&wait, TASK_INTERRUPTIBLE, timeo);
875	874	lock_sock(sk);
876	875	err = 0;
877	876	if (scp->state == DN_RUN)
@@ -885,9 +884,8 @@ static int dn_wait_run(struct sock sk, long timeo) · 7 unmodified lines
885	884	err = -ETIMEDOUT;
886	885	if (!*timeo)
887	886	break;
888		− prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
889	887	}
890		− finish_wait(sk_sleep(sk), &wait);
	888	+ remove_wait_queue(sk_sleep(sk), &wait);
891	889	out:
892	890	if (err == 0) {
893	891	sk->sk_socket->state = SS_CONNECTED;
@@ -1032,16 +1030,16 @@ static void dn_user_copy(struct sk_buff skb, struct optdata_dn opt) · 138 unmodified lines
1032	1030
1033	1031	static struct sk_buff dn_wait_for_connect(struct sock sk, long *timeo)
1034	1032	{
1035		− DEFINE_WAIT(wait);
	1033	+ DEFINE_WAIT_FUNC(wait, woken_wake_function);
1036	1034	struct sk_buff *skb = NULL;
1037	1035	int err = 0;
1038	1036
1039		− prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
	1037	+ add_wait_queue(sk_sleep(sk), &wait);
1040	1038	for(;;) {
1041	1039	release_sock(sk);
1042	1040	skb = skb_dequeue(&sk->sk_receive_queue);
1043	1041	if (skb == NULL) {
1044		− timeo = schedule_timeout(timeo);
	1042	+ timeo = wait_woken(&wait, TASK_INTERRUPTIBLE, timeo);
1045	1043	skb = skb_dequeue(&sk->sk_receive_queue);
1046	1044	}
1047	1045	lock_sock(sk);
@@ -1056,9 +1054,8 @@ static struct sk_buff dn_wait_for_connect(struct sock sk, long *timeo) · 8 unmodified lines
1056	1054	err = -EAGAIN;
1057	1055	if (!*timeo)
1058	1056	break;
1059		− prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
1060	1057	}
1061		− finish_wait(sk_sleep(sk), &wait);
	1058	+ remove_wait_queue(sk_sleep(sk), &wait);
1062	1059
1063	1060	return skb == NULL ? ERR_PTR(err) : skb;
1064	1061	}

net/dsa/slave.c+9−5

@@ -1808,6 +1808,7 @@ void dsa_slave_setup_tagger(struct net_device *slave) · 1807 unmodified lines
1808	1808	struct dsa_slave_priv *p = netdev_priv(slave);
1809	1809	const struct dsa_port *cpu_dp = dp->cpu_dp;
1810	1810	struct net_device *master = cpu_dp->master;
	1811	+ const struct dsa_switch *ds = dp->ds;
1811	1812
1812	1813	slave->needed_headroom = cpu_dp->tag_ops->needed_headroom;
1813	1814	slave->needed_tailroom = cpu_dp->tag_ops->needed_tailroom;
@@ -1819,6 +1820,14 @@ void dsa_slave_setup_tagger(struct net_device *slave) · 5 unmodified lines
1819	1820	slave->needed_tailroom += master->needed_tailroom;
1820	1821
1821	1822	p->xmit = cpu_dp->tag_ops->xmit;
	1823	+
	1824	+ slave->features = master->vlan_features \| NETIF_F_HW_TC;
	1825	+ if (ds->ops->port_vlan_add && ds->ops->port_vlan_del)
	1826	+ slave->features \|= NETIF_F_HW_VLAN_CTAG_FILTER;
	1827	+ slave->hw_features \|= NETIF_F_HW_TC;
	1828	+ slave->features \|= NETIF_F_LLTX;
	1829	+ if (slave->needed_tailroom)
	1830	+ slave->features &= ~(NETIF_F_SG \| NETIF_F_FRAGLIST);
1822	1831	}
1823	1832
1824	1833	static struct lock_class_key dsa_slave_netdev_xmit_lock_key;
@@ -1881,11 +1890,6 @@ int dsa_slave_create(struct dsa_port *port) · 56 unmodified lines
1881	1890	if (slave_dev == NULL)
1882	1891	return -ENOMEM;
1883	1892
1884		− slave_dev->features = master->vlan_features \| NETIF_F_HW_TC;
1885		− if (ds->ops->port_vlan_add && ds->ops->port_vlan_del)
1886		− slave_dev->features \|= NETIF_F_HW_VLAN_CTAG_FILTER;
1887		− slave_dev->hw_features \|= NETIF_F_HW_TC;
1888		− slave_dev->features \|= NETIF_F_LLTX;
1889	1893	slave_dev->ethtool_ops = &dsa_slave_ethtool_ops;
1890	1894	if (!is_zero_ether_addr(port->mac))
1891	1895	ether_addr_copy(slave_dev->dev_addr, port->mac);

net/dsa/tag_ksz.c+9−0

@@ -53,6 +53,9 @@ static struct sk_buff ksz8795_xmit(struct sk_buff skb, struct net_device *dev) · 52 unmodified lines
53	53	u8 *tag;
54	54	u8 *addr;
55	55
	56	+ if (skb->ip_summed == CHECKSUM_PARTIAL && skb_checksum_help(skb))
	57	+ return NULL;
	58	+
56	59	/* Tag encoding */
57	60	tag = skb_put(skb, KSZ_INGRESS_TAG_LEN);
58	61	addr = skb_mac_header(skb);
@@ -114,6 +117,9 @@ static struct sk_buff ksz9477_xmit(struct sk_buff skb, · 55 unmodified lines
114	117	u8 *addr;
115	118	u16 val;
116	119
	120	+ if (skb->ip_summed == CHECKSUM_PARTIAL && skb_checksum_help(skb))
	121	+ return NULL;
	122	+
117	123	/* Tag encoding */
118	124	tag = skb_put(skb, KSZ9477_INGRESS_TAG_LEN);
119	125	addr = skb_mac_header(skb);
@@ -164,6 +170,9 @@ static struct sk_buff ksz9893_xmit(struct sk_buff skb, · 44 unmodified lines
164	170	u8 *addr;
165	171	u8 *tag;
166	172
	173	+ if (skb->ip_summed == CHECKSUM_PARTIAL && skb_checksum_help(skb))
	174	+ return NULL;
	175	+
167	176	/* Tag encoding */
168	177	tag = skb_put(skb, KSZ_INGRESS_TAG_LEN);
169	178	addr = skb_mac_header(skb);

net/ipv4/tcp_bpf.c+1−1

@@ -503,7 +503,7 @@ static int __init tcp_bpf_v4_build_proto(void) · 502 unmodified lines
503	503	tcp_bpf_rebuild_protos(tcp_bpf_prots[TCP_BPF_IPV4], &tcp_prot);
504	504	return 0;
505	505	}
506		−core_initcall(tcp_bpf_v4_build_proto);
	506	+late_initcall(tcp_bpf_v4_build_proto);
507	507
508	508	static int tcp_bpf_assert_proto_ops(struct proto *ops)
509	509	{

net/ipv4/tcp_fastopen.c+24−4

@@ -496,8 +496,18 @@ void tcp_fastopen_active_disable(struct sock *sk) · 495 unmodified lines
496	496	{
497	497	struct net *net = sock_net(sk);
498	498
	499	+ if (!sock_net(sk)->ipv4.sysctl_tcp_fastopen_blackhole_timeout)
	500	+ return;
	501	+
	502	+ /* Paired with READ_ONCE() in tcp_fastopen_active_should_disable() */
	503	+ WRITE_ONCE(net->ipv4.tfo_active_disable_stamp, jiffies);
	504	+
	505	+ /* Paired with smp_rmb() in tcp_fastopen_active_should_disable().
	506	+ * We want net->ipv4.tfo_active_disable_stamp to be updated first.
	507	+ */
	508	+ smp_mb__before_atomic();
499	509	atomic_inc(&net->ipv4.tfo_active_disable_times);
500		− net->ipv4.tfo_active_disable_stamp = jiffies;
	510	+
501	511	NET_INC_STATS(net, LINUX_MIB_TCPFASTOPENBLACKHOLE);
502	512	}
503	513
@@ -508,17 +518,27 @@ void tcp_fastopen_active_disable(struct sock *sk) · 4 unmodified lines
508	518	bool tcp_fastopen_active_should_disable(struct sock *sk)
509	519	{
510	520	unsigned int tfo_bh_timeout = sock_net(sk)->ipv4.sysctl_tcp_fastopen_blackhole_timeout;
511		− int tfo_da_times = atomic_read(&sock_net(sk)->ipv4.tfo_active_disable_times);
512	521	unsigned long timeout;
	522	+ int tfo_da_times;
513	523	int multiplier;
514	524
	525	+ if (!tfo_bh_timeout)
	526	+ return false;
	527	+
	528	+ tfo_da_times = atomic_read(&sock_net(sk)->ipv4.tfo_active_disable_times);
515	529	if (!tfo_da_times)
516	530	return false;
517	531
	532	+ /* Paired with smp_mb__before_atomic() in tcp_fastopen_active_disable() */
	533	+ smp_rmb();
	534	+
518	535	/* Limit timeout to max: 2^6 * initial timeout */
519	536	multiplier = 1 << min(tfo_da_times - 1, 6);
520		− timeout = multiplier * tfo_bh_timeout * HZ;
521		− if (time_before(jiffies, sock_net(sk)->ipv4.tfo_active_disable_stamp + timeout))
	537	+
	538	+ /* Paired with the WRITE_ONCE() in tcp_fastopen_active_disable(). */
	539	+ timeout = READ_ONCE(sock_net(sk)->ipv4.tfo_active_disable_stamp) +
	540	+ multiplier * tfo_bh_timeout * HZ;
	541	+ if (time_before(jiffies, timeout))
522	542	return true;
523	543
524	544	/* Mark check bit so we can check for successful active TFO

net/ipv4/tcp_ipv4.c+1−1

@@ -2964,7 +2964,7 @@ static int __net_init tcp_sk_init(struct net *net) · 2963 unmodified lines
2964	2964	net->ipv4.sysctl_tcp_comp_sack_slack_ns = 100 * NSEC_PER_USEC;
2965	2965	net->ipv4.sysctl_tcp_comp_sack_nr = 44;
2966	2966	net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;
2967		− net->ipv4.sysctl_tcp_fastopen_blackhole_timeout = 60 * 60;
	2967	+ net->ipv4.sysctl_tcp_fastopen_blackhole_timeout = 0;
2968	2968	atomic_set(&net->ipv4.tfo_active_disable_times, 0);
2969	2969
2970	2970	/* Reno is always built in */

net/ipv4/udp.c+19−6

@@ -645,10 +645,12 @@ static struct sock __udp4_lib_err_encap(struct net net, · 644 unmodified lines
645	645	const struct iphdr *iph,
646	646	struct udphdr *uh,
647	647	struct udp_table *udptable,
	648	+ struct sock *sk,
648	649	struct sk_buff *skb, u32 info)
649	650	{
	651	+ int (lookup)(struct sock sk, struct sk_buff *skb);
650	652	int network_offset, transport_offset;
651		− struct sock *sk;
	653	+ struct udp_sock *up;
652	654
653	655	network_offset = skb_network_offset(skb);
654	656	transport_offset = skb_transport_offset(skb);
@@ -659,18 +661,28 @@ static struct sock __udp4_lib_err_encap(struct net net, · 4 unmodified lines
659	661	/* Transport header needs to point to the UDP header */
660	662	skb_set_transport_header(skb, iph->ihl << 2);
661	663
	664	+ if (sk) {
	665	+ up = udp_sk(sk);
	666	+
	667	+ lookup = READ_ONCE(up->encap_err_lookup);
	668	+ if (lookup && lookup(sk, skb))
	669	+ sk = NULL;
	670	+
	671	+ goto out;
	672	+ }
	673	+
662	674	sk = __udp4_lib_lookup(net, iph->daddr, uh->source,
663	675	iph->saddr, uh->dest, skb->dev->ifindex, 0,
664	676	udptable, NULL);
665	677	if (sk) {
666		− int (lookup)(struct sock sk, struct sk_buff *skb);
667		− struct udp_sock *up = udp_sk(sk);
	678	+ up = udp_sk(sk);
668	679
669	680	lookup = READ_ONCE(up->encap_err_lookup);
670	681	if (!lookup \|\| lookup(sk, skb))
671	682	sk = NULL;
672	683	}
673	684
	685	+out:
674	686	if (!sk)
675	687	sk = ERR_PTR(__udp4_lib_err_encap_no_sk(skb, info));
676	688
@@ -707,15 +719,16 @@ int __udp4_lib_err(struct sk_buff skb, u32 info, struct udp_table udptable) · 30 unmodified lines
707	719	sk = __udp4_lib_lookup(net, iph->daddr, uh->dest,
708	720	iph->saddr, uh->source, skb->dev->ifindex,
709	721	inet_sdif(skb), udptable, NULL);
	722	+
710	723	if (!sk \|\| udp_sk(sk)->encap_type) {
711	724	/* No socket for error: try tunnels before discarding */
712		− sk = ERR_PTR(-ENOENT);
713	725	if (static_branch_unlikely(&udp_encap_needed_key)) {
714		− sk = __udp4_lib_err_encap(net, iph, uh, udptable, skb,
	726	+ sk = __udp4_lib_err_encap(net, iph, uh, udptable, sk, skb,
715	727	info);
716	728	if (!sk)
717	729	return 0;
718		− }
	730	+ } else
	731	+ sk = ERR_PTR(-ENOENT);
719	732
720	733	if (IS_ERR(sk)) {
721	734	__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);

net/ipv4/udp_bpf.c+1−1

@@ -133,7 +133,7 @@ static int __init udp_bpf_v4_build_proto(void) · 132 unmodified lines
133	133	udp_bpf_rebuild_protos(&udp_bpf_prots[UDP_BPF_IPV4], &udp_prot);
134	134	return 0;
135	135	}
136		−core_initcall(udp_bpf_v4_build_proto);
	136	+late_initcall(udp_bpf_v4_build_proto);
137	137
138	138	int udp_bpf_update_proto(struct sock sk, struct sk_psock psock, bool restore)
139	139	{

net/ipv6/ip6_output.c+1−1

@@ -74,7 +74,7 @@ static int ip6_finish_output2(struct net net, struct sock sk, struct sk_buff * · 73 unmodified lines
74	74
75	75	if (likely(nskb)) {
76	76	if (skb->sk)
77		− skb_set_owner_w(skb, skb->sk);
	77	+ skb_set_owner_w(nskb, skb->sk);
78	78	consume_skb(skb);
79	79	} else {
80	80	kfree_skb(skb);

net/ipv6/route.c+1−1

@@ -3751,7 +3751,7 @@ static struct fib6_info ip6_route_info_create(struct fib6_config cfg, · 3750 unmodified lines
3751	3751	err = PTR_ERR(rt->fib6_metrics);
3752	3752	/* Do not leave garbage there. */
3753	3753	rt->fib6_metrics = (struct dst_metrics *)&dst_default_metrics;
3754		− goto out;
	3754	+ goto out_free;
3755	3755	}
3756	3756
3757	3757	if (cfg->fc_flags & RTF_ADDRCONF)

net/ipv6/udp.c+19−6

@@ -502,12 +502,14 @@ static struct sock __udp6_lib_err_encap(struct net net, · 501 unmodified lines
502	502	const struct ipv6hdr *hdr, int offset,
503	503	struct udphdr *uh,
504	504	struct udp_table *udptable,
	505	+ struct sock *sk,
505	506	struct sk_buff *skb,
506	507	struct inet6_skb_parm *opt,
507	508	u8 type, u8 code, __be32 info)
508	509	{
	510	+ int (lookup)(struct sock sk, struct sk_buff *skb);
509	511	int network_offset, transport_offset;
510		− struct sock *sk;
	512	+ struct udp_sock *up;
511	513
512	514	network_offset = skb_network_offset(skb);
513	515	transport_offset = skb_transport_offset(skb);
@@ -518,18 +520,28 @@ static struct sock __udp6_lib_err_encap(struct net net, · 4 unmodified lines
518	520	/* Transport header needs to point to the UDP header */
519	521	skb_set_transport_header(skb, offset);
520	522
	523	+ if (sk) {
	524	+ up = udp_sk(sk);
	525	+
	526	+ lookup = READ_ONCE(up->encap_err_lookup);
	527	+ if (lookup && lookup(sk, skb))
	528	+ sk = NULL;
	529	+
	530	+ goto out;
	531	+ }
	532	+
521	533	sk = __udp6_lib_lookup(net, &hdr->daddr, uh->source,
522	534	&hdr->saddr, uh->dest,
523	535	inet6_iif(skb), 0, udptable, skb);
524	536	if (sk) {
525		− int (lookup)(struct sock sk, struct sk_buff *skb);
526		− struct udp_sock *up = udp_sk(sk);
	537	+ up = udp_sk(sk);
527	538
528	539	lookup = READ_ONCE(up->encap_err_lookup);
529	540	if (!lookup \|\| lookup(sk, skb))
530	541	sk = NULL;
531	542	}
532	543
	544	+out:
533	545	if (!sk) {
534	546	sk = ERR_PTR(__udp6_lib_err_encap_no_sk(skb, opt, type, code,
535	547	offset, info));
@@ -558,16 +570,17 @@ int __udp6_lib_err(struct sk_buff skb, struct inet6_skb_parm opt, · 22 unmodified lines
558	570
559	571	sk = __udp6_lib_lookup(net, daddr, uh->dest, saddr, uh->source,
560	572	inet6_iif(skb), inet6_sdif(skb), udptable, NULL);
	573	+
561	574	if (!sk \|\| udp_sk(sk)->encap_type) {
562	575	/* No socket for error: try tunnels before discarding */
563		− sk = ERR_PTR(-ENOENT);
564	576	if (static_branch_unlikely(&udpv6_encap_needed_key)) {
565	577	sk = __udp6_lib_err_encap(net, hdr, offset, uh,
566		− udptable, skb,
	578	+ udptable, sk, skb,
567	579	opt, type, code, info);
568	580	if (!sk)
569	581	return 0;
570		− }
	582	+ } else
	583	+ sk = ERR_PTR(-ENOENT);
571	584
572	585	if (IS_ERR(sk)) {
573	586	__ICMP6_INC_STATS(net, __in6_dev_get(skb->dev),

net/netrom/nr_timer.c+11−9

@@ -121,11 +121,9 @@ static void nr_heartbeat_expiry(struct timer_list *t) · 120 unmodified lines
121	121	is accepted() it isn't 'dead' so doesn't get removed. */
122	122	if (sock_flag(sk, SOCK_DESTROY) \|\|
123	123	(sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) {
124		− sock_hold(sk);
125	124	bh_unlock_sock(sk);
126	125	nr_destroy_socket(sk);
127		− sock_put(sk);
128		− return;
	126	+ goto out;
129	127	}
130	128	break;
131	129
@@ -146,6 +144,8 @@ static void nr_heartbeat_expiry(struct timer_list *t) · 14 unmodified lines
146	144
147	145	nr_start_heartbeat(sk);
148	146	bh_unlock_sock(sk);
	147	+out:
	148	+ sock_put(sk);
149	149	}
150	150
151	151	static void nr_t2timer_expiry(struct timer_list *t)
@@ -159,6 +159,7 @@ static void nr_t2timer_expiry(struct timer_list *t) · 7 unmodified lines
159	159	nr_enquiry_response(sk);
160	160	}
161	161	bh_unlock_sock(sk);
	162	+ sock_put(sk);
162	163	}
163	164
164	165	static void nr_t4timer_expiry(struct timer_list *t)
@@ -169,6 +170,7 @@ static void nr_t4timer_expiry(struct timer_list *t) · 4 unmodified lines
169	170	bh_lock_sock(sk);
170	171	nr_sk(sk)->condition &= ~NR_COND_PEER_RX_BUSY;
171	172	bh_unlock_sock(sk);
	173	+ sock_put(sk);
172	174	}
173	175
174	176	static void nr_idletimer_expiry(struct timer_list *t)
@@ -197,6 +199,7 @@ static void nr_idletimer_expiry(struct timer_list *t) · 22 unmodified lines
197	199	sock_set_flag(sk, SOCK_DEAD);
198	200	}
199	201	bh_unlock_sock(sk);
	202	+ sock_put(sk);
200	203	}
201	204
202	205	static void nr_t1timer_expiry(struct timer_list *t)
@@ -209,8 +212,7 @@ static void nr_t1timer_expiry(struct timer_list *t) · 6 unmodified lines
209	212	case NR_STATE_1:
210	213	if (nr->n2count == nr->n2) {
211	214	nr_disconnect(sk, ETIMEDOUT);
212		− bh_unlock_sock(sk);
213		− return;
	215	+ goto out;
214	216	} else {
215	217	nr->n2count++;
216	218	nr_write_internal(sk, NR_CONNREQ);
@@ -220,8 +222,7 @@ static void nr_t1timer_expiry(struct timer_list *t) · 3 unmodified lines
220	222	case NR_STATE_2:
221	223	if (nr->n2count == nr->n2) {
222	224	nr_disconnect(sk, ETIMEDOUT);
223		− bh_unlock_sock(sk);
224		− return;
	225	+ goto out;
225	226	} else {
226	227	nr->n2count++;
227	228	nr_write_internal(sk, NR_DISCREQ);
@@ -231,8 +232,7 @@ static void nr_t1timer_expiry(struct timer_list *t) · 3 unmodified lines
231	232	case NR_STATE_3:
232	233	if (nr->n2count == nr->n2) {
233	234	nr_disconnect(sk, ETIMEDOUT);
234		− bh_unlock_sock(sk);
235		− return;
	235	+ goto out;
236	236	} else {
237	237	nr->n2count++;
238	238	nr_requeue_frames(sk);
@@ -241,5 +241,7 @@ static void nr_t1timer_expiry(struct timer_list *t) · 2 unmodified lines
241	241	}
242	242
243	243	nr_start_t1timer(sk);
	244	+out:
244	245	bh_unlock_sock(sk);
	246	+ sock_put(sk);
245	247	}

net/sched/act_skbmod.c+8−4

@@ -6,6 +6,7 @@ · 5 unmodified lines
6	6	*/
7	7
8	8	#include <linux/module.h>
	9	+#include <linux/if_arp.h>
9	10	#include <linux/init.h>
10	11	#include <linux/kernel.h>
11	12	#include <linux/skbuff.h>
@@ -33,6 +34,13 @@ static int tcf_skbmod_act(struct sk_buff skb, const struct tc_action a, · 21 unmodified lines
33	34	tcf_lastuse_update(&d->tcf_tm);
34	35	bstats_cpu_update(this_cpu_ptr(d->common.cpu_bstats), skb);
35	36
	37	+ action = READ_ONCE(d->tcf_action);
	38	+ if (unlikely(action == TC_ACT_SHOT))
	39	+ goto drop;
	40	+
	41	+ if (!skb->dev \|\| skb->dev->type != ARPHRD_ETHER)
	42	+ return action;
	43	+
36	44	/* XXX: if you are going to edit more fields beyond ethernet header
37	45	* (example when you add IP header replacement or vlan swap)
38	46	* then MAX_EDIT_LEN needs to change appropriately
@@ -41,10 +49,6 @@ static int tcf_skbmod_act(struct sk_buff skb, const struct tc_action a, · 2 unmodified lines
41	49	if (unlikely(err)) /* best policy is to drop on the floor */
42	50	goto drop;
43	51
44		− action = READ_ONCE(d->tcf_action);
45		− if (unlikely(action == TC_ACT_SHOT))
46		− goto drop;
47		−
48	52	p = rcu_dereference_bh(d->skbmod_p);
49	53	flags = p->flags;
50	54	if (flags & SKBMOD_F_DMAC)

net/sched/cls_api.c+1−1

@@ -2897,7 +2897,7 @@ replay: · 2896 unmodified lines
2897	2897	break;
2898	2898	case RTM_GETCHAIN:
2899	2899	err = tc_chain_notify(chain, skb, n->nlmsg_seq,
2900		− n->nlmsg_seq, n->nlmsg_type, true);
	2900	+ n->nlmsg_flags, n->nlmsg_type, true);
2901	2901	if (err < 0)
2902	2902	NL_SET_ERR_MSG(extack, "Failed to send chain notify message");
2903	2903	break;

net/sched/cls_tcindex.c+4−1

@@ -278,6 +278,8 @@ static int tcindex_filter_result_init(struct tcindex_filter_result *r, · 277 unmodified lines
278	278	TCA_TCINDEX_POLICE);
279	279	}
280	280
	281	+static void tcindex_free_perfect_hash(struct tcindex_data *cp);
	282	+
281	283	static void tcindex_partial_destroy_work(struct work_struct *work)
282	284	{
283	285	struct tcindex_data *p = container_of(to_rcu_work(work),
@@ -285,7 +287,8 @@ static void tcindex_partial_destroy_work(struct work_struct *work) · 1 unmodified line
285	287	rwork);
286	288
287	289	rtnl_lock();
288		− kfree(p->perfect);
	290	+ if (p->perfect)
	291	+ tcindex_free_perfect_hash(p);
289	292	kfree(p);
290	293	rtnl_unlock();
291	294	}

net/sctp/auth.c+2−0

@@ -860,6 +860,8 @@ int sctp_auth_set_key(struct sctp_endpoint *ep, · 859 unmodified lines
860	860	if (replace) {
861	861	list_del_init(&shkey->key_list);
862	862	sctp_auth_shkey_release(shkey);
	863	+ if (asoc && asoc->active_key_id == auth_key->sca_keynumber)
	864	+ sctp_auth_asoc_init_active_key(asoc, GFP_KERNEL);
863	865	}
864	866	list_add(&cur_key->key_list, sh_keys);
865	867

net/sctp/output.c+2−2

@@ -104,8 +104,8 @@ void sctp_packet_config(struct sctp_packet *packet, __u32 vtag, · 103 unmodified lines
104	104	if (asoc->param_flags & SPP_PMTUD_ENABLE)
105	105	sctp_assoc_sync_pmtu(asoc);
106	106	} else if (!sctp_transport_pl_enabled(tp) &&
107		− !sctp_transport_pmtu_check(tp)) {
108		− if (asoc->param_flags & SPP_PMTUD_ENABLE)
	107	+ asoc->param_flags & SPP_PMTUD_ENABLE) {
	108	+ if (!sctp_transport_pmtu_check(tp))
109	109	sctp_assoc_sync_pmtu(asoc);
110	110	}
111	111

net/sctp/socket.c+4−0

@@ -4577,6 +4577,10 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, · 4576 unmodified lines
4577	4577	}
4578	4578
4579	4579	if (optlen > 0) {
	4580	+ /* Trim it to the biggest size sctp sockopt may need if necessary */
	4581	+ optlen = min_t(unsigned int, optlen,
	4582	+ PAGE_ALIGN(USHRT_MAX +
	4583	+ sizeof(__u16) * sizeof(struct sctp_reset_streams)));
4580	4584	kopt = memdup_sockptr(optval, optlen);
4581	4585	if (IS_ERR(kopt))
4582	4586	return PTR_ERR(kopt);

scripts/Makefile.build+1−1

@@ -386,7 +386,7 @@ ifeq ($(CONFIG_LTO_CLANG) $(CONFIG_MODVERSIONS),y y) · 385 unmodified lines
386	386	cmd_update_lto_symversions = \
387	387	rm -f $@.symversions \
388	388	$(foreach n, $(filter-out FORCE,$^), \
389		− $(if $(wildcard $(n).symversions), \
	389	+ $(if $(shell test -s $(n).symversions && echo y), \
390	390	; cat $(n).symversions >> $@.symversions))
391	391	else
392	392	cmd_update_lto_symversions = echo >/dev/null

scripts/setlocalversion+8−5

@@ -131,11 +131,14 @@ res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}" · 130 unmodified lines
131	131	if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then
132	132	# full scm version string
133	133	res="$res$(scm_version)"
134		−elif [ -z "${LOCALVERSION}" ]; then
135		− # append a plus sign if the repository is not in a clean
136		− # annotated or signed tagged state (as git describe only
137		− # looks at signed or annotated tags - git tag -a/-s) and
138		− # LOCALVERSION= is not specified
	134	+elif [ "${LOCALVERSION+set}" != "set" ]; then
	135	+ # If the variable LOCALVERSION is not set, append a plus
	136	+ # sign if the repository is not in a clean annotated or
	137	+ # signed tagged state (as git describe only looks at signed
	138	+ # or annotated tags - git tag -a/-s).
	139	+ #
	140	+ # If the variable LOCALVERSION is set (including being set
	141	+ # to an empty string), we don't want to append a plus sign.
139	142	scm=$(scm_version --short)
140	143	res="$res${scm:++}"
141	144	fi

scripts/spdxcheck.py+1−1

@@ -44,7 +44,7 @@ def read_spdxdata(repo): · 43 unmodified lines
44	44	continue
45	45
46	46	exception = None
47		− for l in open(el.path).readlines():
	47	+ for l in open(el.path, encoding="utf-8").readlines():
48	48	if l.startswith('Valid-License-Identifier:'):
49	49	lid = l.split(':')[1].strip().upper()
50	50	if lid in spdx.licenses:

sound/soc/mediatek/mt8183/mt8183-dai-adda.c+1−0

@@ -341,6 +341,7 @@ static int set_mtkaif_rx(struct mtk_base_afe *afe) · 340 unmodified lines
341	341	case MT8183_MTKAIF_PROTOCOL_1:
342	342	regmap_write(afe->regmap, AFE_AUD_PAD_TOP, 0x31);
343	343	regmap_write(afe->regmap, AFE_ADDA_MTKAIF_CFG0, 0x0);
	344	+ break;
344	345	default:
345	346	break;
346	347	}

tools/arch/arm64/include/uapi/asm/unistd.h+1−0

@@ -20,5 +20,6 @@ · 19 unmodified lines
20	20	#define __ARCH_WANT_SET_GET_RLIMIT
21	21	#define __ARCH_WANT_TIME32_SYSCALLS
22	22	#define __ARCH_WANT_SYS_CLONE3
	23	+#define __ARCH_WANT_MEMFD_SECRET
23	24
24	25	#include <asm-generic/unistd.h>

tools/bpf/bpftool/common.c+5−0

@@ -222,6 +222,11 @@ int mount_bpffs_for_pin(const char *name) · 221 unmodified lines
222	222	int err = 0;
223	223
224	224	file = malloc(strlen(name) + 1);
	225	+ if (!file) {
	226	+ p_err("mem alloc failed");
	227	+ return -1;
	228	+ }
	229	+
225	230	strcpy(file, name);
226	231	dir = dirname(file);
227	232

tools/include/linux/kconfig.h+0−6

@@ -4,12 +4,6 @@ · 3 unmodified lines
4	4
5	5	/* CONFIG_CC_VERSION_TEXT (Do not delete this comment. See help in Kconfig) */
6	6
7		−#ifdef CONFIG_CPU_BIG_ENDIAN
8		−#define __BIG_ENDIAN 4321
9		−#else
10		−#define __LITTLE_ENDIAN 1234
11		−#endif
12		−
13	7	#define __ARG_PLACEHOLDER_1 0,
14	8	#define __take_second_arg(__ignored, val, ...) val
15	9

tools/include/uapi/asm-generic/unistd.h+6−1

@@ -873,8 +873,13 @@ __SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule) · 872 unmodified lines
873	873	#define __NR_landlock_restrict_self 446
874	874	__SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)
875	875
	876	+#ifdef __ARCH_WANT_MEMFD_SECRET
	877	+#define __NR_memfd_secret 447
	878	+__SYSCALL(__NR_memfd_secret, sys_memfd_secret)
	879	+#endif
	880	+
876	881	#undef __NR_syscalls
877		−#define __NR_syscalls 447
	882	+#define __NR_syscalls 448
878	883
879	884	/*
880	885	* 32 bit systems traditionally used different

tools/perf/arch/x86/entry/syscalls/syscall_64.tbl+1−0

@@ -368,6 +368,7 @@ · 367 unmodified lines
368	368	444 common landlock_create_ruleset sys_landlock_create_ruleset
369	369	445 common landlock_add_rule sys_landlock_add_rule
370	370	446 common landlock_restrict_self sys_landlock_restrict_self
	371	+447 common memfd_secret sys_memfd_secret
371	372
372	373	#
373	374	# Due to a historical design error, certain syscalls are numbered differently

tools/perf/builtin-inject.c+9−4

@@ -361,9 +361,10 @@ static struct dso findnew_dso(int pid, int tid, const char filename, · 360 unmodified lines
361	361	dso = machine__findnew_dso_id(machine, filename, id);
362	362	}
363	363
364		− if (dso)
	364	+ if (dso) {
	365	+ nsinfo__put(dso->nsinfo);
365	366	dso->nsinfo = nsi;
366		− else
	367	+ } else
367	368	nsinfo__put(nsi);
368	369
369	370	thread__put(thread);
@@ -992,8 +993,10 @@ int cmd_inject(int argc, const char **argv) · 622 unmodified lines
992	993
993	994	data.path = inject.input_name;
994	995	inject.session = perf_session__new(&data, inject.output.is_pipe, &inject.tool);
995		− if (IS_ERR(inject.session))
996		− return PTR_ERR(inject.session);
	996	+ if (IS_ERR(inject.session)) {
	997	+ ret = PTR_ERR(inject.session);
	998	+ goto out_close_output;
	999	+ }
997	1000
998	1001	if (zstd_init(&(inject.session->zstd_data), 0) < 0)
999	1002	pr_warning("Decompression initialization failed.\n");
@@ -1035,6 +1038,8 @@ int cmd_inject(int argc, const char **argv) · 35 unmodified lines
1035	1038	out_delete:
1036	1039	zstd_fini(&(inject.session->zstd_data));
1037	1040	perf_session__delete(inject.session);
	1041	+out_close_output:
	1042	+ perf_data__close(&inject.output);
1038	1043	free(inject.itrace_synth_opts.vm_tm_corr_args);
1039	1044	return ret;
1040	1045	}

tools/perf/builtin-report.c+22−11

@@ -1175,6 +1175,8 @@ int cmd_report(int argc, const char **argv) · 1174 unmodified lines
1175	1175	.annotation_opts = annotation__default_options,
1176	1176	.skip_empty = true,
1177	1177	};
	1178	+ char *sort_order_help = sort_help("sort by key(s):");
	1179	+ char *field_order_help = sort_help("output field(s): overhead period sample ");
1178	1180	const struct option options[] = {
1179	1181	OPT_STRING('i', "input", &input_name, "file",
1180	1182	"input file name"),
@@ -1209,9 +1211,9 @@ int cmd_report(int argc, const char **argv) · 28 unmodified lines
1209	1211	OPT_BOOLEAN(0, "header-only", &report.header_only,
1210	1212	"Show only data header."),
1211	1213	OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
1212		− sort_help("sort by key(s):")),
	1214	+ sort_order_help),
1213	1215	OPT_STRING('F', "fields", &field_order, "key[,keys...]",
1214		− sort_help("output field(s): overhead period sample ")),
	1216	+ field_order_help),
1215	1217	OPT_BOOLEAN(0, "show-cpu-utilization", &symbol_conf.show_cpu_utilization,
1216	1218	"Show sample percentage for different cpu modes"),
1217	1219	OPT_BOOLEAN_FLAG(0, "showcpuutilization", &symbol_conf.show_cpu_utilization,
@@ -1344,11 +1346,11 @@ int cmd_report(int argc, const char **argv) · 126 unmodified lines
1344	1346	char sort_tmp[128];
1345	1347
1346	1348	if (ret < 0)
1347		− return ret;
	1349	+ goto exit;
1348	1350
1349	1351	ret = perf_config(report__config, &report);
1350	1352	if (ret)
1351		− return ret;
	1353	+ goto exit;
1352	1354
1353	1355	argc = parse_options(argc, argv, options, report_usage, 0);
1354	1356	if (argc) {
@@ -1362,8 +1364,10 @@ int cmd_report(int argc, const char **argv) · 7 unmodified lines
1362	1364	report.symbol_filter_str = argv[0];
1363	1365	}
1364	1366
1365		− if (annotate_check_args(&report.annotation_opts) < 0)
1366		− return -EINVAL;
	1367	+ if (annotate_check_args(&report.annotation_opts) < 0) {
	1368	+ ret = -EINVAL;
	1369	+ goto exit;
	1370	+ }
1367	1371
1368	1372	if (report.mmaps_mode)
1369	1373	report.tasks_mode = true;
@@ -1377,12 +1381,14 @@ int cmd_report(int argc, const char **argv) · 7 unmodified lines
1377	1381	if (symbol_conf.vmlinux_name &&
1378	1382	access(symbol_conf.vmlinux_name, R_OK)) {
1379	1383	pr_err("Invalid file: %s\n", symbol_conf.vmlinux_name);
1380		− return -EINVAL;
	1384	+ ret = -EINVAL;
	1385	+ goto exit;
1381	1386	}
1382	1387	if (symbol_conf.kallsyms_name &&
1383	1388	access(symbol_conf.kallsyms_name, R_OK)) {
1384	1389	pr_err("Invalid file: %s\n", symbol_conf.kallsyms_name);
1385		− return -EINVAL;
	1390	+ ret = -EINVAL;
	1391	+ goto exit;
1386	1392	}
1387	1393
1388	1394	if (report.inverted_callchain)
@@ -1406,12 +1412,14 @@ int cmd_report(int argc, const char **argv) · 17 unmodified lines
1406	1412
1407	1413	repeat:
1408	1414	session = perf_session__new(&data, false, &report.tool);
1409		− if (IS_ERR(session))
1410		− return PTR_ERR(session);
	1415	+ if (IS_ERR(session)) {
	1416	+ ret = PTR_ERR(session);
	1417	+ goto exit;
	1418	+ }
1411	1419
1412	1420	ret = evswitch__init(&report.evswitch, session->evlist, stderr);
1413	1421	if (ret)
1414		− return ret;
	1422	+ goto exit;
1415	1423
1416	1424	if (zstd_init(&(session->zstd_data), 0) < 0)
1417	1425	pr_warning("Decompression initialization failed. Reported data may be incomplete.\n");
@@ -1646,5 +1654,8 @@ error: · 228 unmodified lines
1646	1654
1647	1655	zstd_fini(&(session->zstd_data));
1648	1656	perf_session__delete(session);
	1657	+exit:
	1658	+ free(sort_order_help);
	1659	+ free(field_order_help);
1649	1660	return ret;
1650	1661	}

tools/perf/builtin-sched.c+30−5

@@ -670,7 +670,7 @@ static void create_tasks(struct perf_sched *sched) · 669 unmodified lines
670	670	err = pthread_attr_init(&attr);
671	671	BUG_ON(err);
672	672	err = pthread_attr_setstacksize(&attr,
673		− (size_t) max(16 * 1024, PTHREAD_STACK_MIN));
	673	+ (size_t) max(16 * 1024, (int)PTHREAD_STACK_MIN));
674	674	BUG_ON(err);
675	675	err = pthread_mutex_lock(&sched->start_work_mutex);
676	676	BUG_ON(err);
@@ -3335,6 +3335,16 @@ static void setup_sorting(struct perf_sched sched, const struct option options · 2658 unmodified lines
3335	3335	sort_dimension__add("pid", &sched->cmp_pid);
3336	3336	}
3337	3337
	3338	+static bool schedstat_events_exposed(void)
	3339	+{
	3340	+ /*
	3341	+ * Select "sched:sched_stat_wait" event to check
	3342	+ * whether schedstat tracepoints are exposed.
	3343	+ */
	3344	+ return IS_ERR(trace_event__tp_format("sched", "sched_stat_wait")) ?
	3345	+ false : true;
	3346	+}
	3347	+
3338	3348	static int __cmd_record(int argc, const char **argv)
3339	3349	{
3340	3350	unsigned int rec_argc, i, j;
@@ -3346,21 +3356,33 @@ static int __cmd_record(int argc, const char **argv) · 5 unmodified lines
3346	3356	"-m", "1024",
3347	3357	"-c", "1",
3348	3358	"-e", "sched:sched_switch",
3349		− "-e", "sched:sched_stat_wait",
3350		− "-e", "sched:sched_stat_sleep",
3351		− "-e", "sched:sched_stat_iowait",
3352	3359	"-e", "sched:sched_stat_runtime",
3353	3360	"-e", "sched:sched_process_fork",
3354	3361	"-e", "sched:sched_wakeup_new",
3355	3362	"-e", "sched:sched_migrate_task",
3356	3363	};
	3364	+
	3365	+ /*
	3366	+ * The tracepoints trace_sched_stat_{wait, sleep, iowait}
	3367	+ * are not exposed to user if CONFIG_SCHEDSTATS is not set,
	3368	+ * to prevent "perf sched record" execution failure, determine
	3369	+ * whether to record schedstat events according to actual situation.
	3370	+ */
	3371	+ const char * const schedstat_args[] = {
	3372	+ "-e", "sched:sched_stat_wait",
	3373	+ "-e", "sched:sched_stat_sleep",
	3374	+ "-e", "sched:sched_stat_iowait",
	3375	+ };
	3376	+ unsigned int schedstat_argc = schedstat_events_exposed() ?
	3377	+ ARRAY_SIZE(schedstat_args) : 0;
	3378	+
3357	3379	struct tep_event *waking_event;
3358	3380
3359	3381	/*
3360	3382	* +2 for either "-e", "sched:sched_wakeup" or
3361	3383	* "-e", "sched:sched_waking"
3362	3384	*/
3363		− rec_argc = ARRAY_SIZE(record_args) + 2 + argc - 1;
	3385	+ rec_argc = ARRAY_SIZE(record_args) + 2 + schedstat_argc + argc - 1;
3364	3386	rec_argv = calloc(rec_argc + 1, sizeof(char *));
3365	3387
3366	3388	if (rec_argv == NULL)
@@ -3376,6 +3398,9 @@ static int __cmd_record(int argc, const char **argv) · 9 unmodified lines
3376	3398	else
3377	3399	rec_argv[i++] = strdup("sched:sched_wakeup");
3378	3400
	3401	+ for (j = 0; j < schedstat_argc; j++)
	3402	+ rec_argv[i++] = strdup(schedstat_args[j]);
	3403	+
3379	3404	for (j = 1; j < (unsigned int)argc; j++, i++)
3380	3405	rec_argv[i] = argv[j];
3381	3406

tools/perf/builtin-script.c+8−0

@@ -2601,6 +2601,12 @@ static void perf_script__exit_per_event_dump_stats(struct perf_script *script) · 2600 unmodified lines
2601	2601	}
2602	2602	}
2603	2603
	2604	+static void perf_script__exit(struct perf_script *script)
	2605	+{
	2606	+ perf_thread_map__put(script->threads);
	2607	+ perf_cpu_map__put(script->cpus);
	2608	+}
	2609	+
2604	2610	static int __cmd_script(struct perf_script *script)
2605	2611	{
2606	2612	int ret;
@@ -4143,8 +4149,10 @@ out_delete: · 1536 unmodified lines
4143	4149	zfree(&script.ptime_range);
4144	4150	}
4145	4151
	4152	+ zstd_fini(&(session->zstd_data));
4146	4153	evlist__free_stats(session->evlist);
4147	4154	perf_session__delete(session);
	4155	+ perf_script__exit(&script);
4148	4156
4149	4157	if (script_started)
4150	4158	cleanup_scripting();

tools/perf/builtin-stat.c+0−3

@@ -2445,9 +2445,6 @@ int cmd_stat(int argc, const char **argv) · 2444 unmodified lines
2445	2445
2446	2446	evlist__check_cpu_maps(evsel_list);
2447	2447
2448		− if (perf_pmu__has_hybrid())
2449		− stat_config.no_merge = true;
2450		−
2451	2448	/*
2452	2449	* Initialize thread_map with comm names,
2453	2450	* so we could print it out on output.

tools/perf/builtin-trace.c+43−2

@@ -2266,6 +2266,14 @@ static void syscall__augmented_args(struct syscall sc, struct perf_sample *sam · 2265 unmodified lines
2266	2266	return augmented_args;
2267	2267	}
2268	2268
	2269	+static void syscall__exit(struct syscall *sc)
	2270	+{
	2271	+ if (!sc)
	2272	+ return;
	2273	+
	2274	+ free(sc->arg_fmt);
	2275	+}
	2276	+
2269	2277	static int trace__sys_enter(struct trace trace, struct evsel evsel,
2270	2278	union perf_event *event __maybe_unused,
2271	2279	struct perf_sample *sample)
@@ -3095,6 +3103,21 @@ static struct evsel *evsel__new_pgfault(u64 config) · 823 unmodified lines
3095	3103	return evsel;
3096	3104	}
3097	3105
	3106	+static void evlist__free_syscall_tp_fields(struct evlist *evlist)
	3107	+{
	3108	+ struct evsel *evsel;
	3109	+
	3110	+ evlist__for_each_entry(evlist, evsel) {
	3111	+ struct evsel_trace *et = evsel->priv;
	3112	+
	3113	+ if (!et \|\| !evsel->tp_format \|\| strcmp(evsel->tp_format->system, "syscalls"))
	3114	+ continue;
	3115	+
	3116	+ free(et->fmt);
	3117	+ free(et);
	3118	+ }
	3119	+}
	3120	+
3098	3121	static void trace__handle_event(struct trace trace, union perf_event event, struct perf_sample *sample)
3099	3122	{
3100	3123	const u32 type = event->header.type;
@@ -4130,7 +4153,7 @@ out_disable: · 1029 unmodified lines
4130	4153
4131	4154	out_delete_evlist:
4132	4155	trace__symbols__exit(trace);
4133		−
	4156	+ evlist__free_syscall_tp_fields(evlist);
4134	4157	evlist__delete(evlist);
4135	4158	cgroup__put(trace->cgroup);
4136	4159	trace->evlist = NULL;
@@ -4636,6 +4659,9 @@ do_concat: · 499 unmodified lines
4636	4659	err = parse_events_option(&o, lists[0], 0);
4637	4660	}
4638	4661	out:
	4662	+ free(strace_groups_dir);
	4663	+ free(lists[0]);
	4664	+ free(lists[1]);
4639	4665	if (sep)
4640	4666	*sep = ',';
4641	4667
@@ -4701,6 +4727,21 @@ out: · 59 unmodified lines
4701	4727	return err;
4702	4728	}
4703	4729
	4730	+static void trace__exit(struct trace *trace)
	4731	+{
	4732	+ int i;
	4733	+
	4734	+ strlist__delete(trace->ev_qualifier);
	4735	+ free(trace->ev_qualifier_ids.entries);
	4736	+ if (trace->syscalls.table) {
	4737	+ for (i = 0; i <= trace->sctbl->syscalls.max_id; i++)
	4738	+ syscall__exit(&trace->syscalls.table[i]);
	4739	+ free(trace->syscalls.table);
	4740	+ }
	4741	+ syscalltbl__delete(trace->sctbl);
	4742	+ zfree(&trace->perfconfig_events);
	4743	+}
	4744	+
4704	4745	int cmd_trace(int argc, const char **argv)
4705	4746	{
4706	4747	const char *trace_usage[] = {
@@ -5135,6 +5176,6 @@ out_close: · 428 unmodified lines
5135	5176	if (output_name != NULL)
5136	5177	fclose(trace.output);
5137	5178	out:
5138		− zfree(&trace.perfconfig_events);
	5179	+ trace__exit(&trace);
5139	5180	return err;
5140	5181	}

tools/perf/tests/bpf.c+2−0

@@ -1,6 +1,7 @@
1	1	// SPDX-License-Identifier: GPL-2.0
2	2	#include <errno.h>
3	3	#include <stdio.h>
	4	+#include <stdlib.h>
4	5	#include <sys/epoll.h>
5	6	#include <sys/types.h>
6	7	#include <sys/stat.h>
@@ -276,6 +277,7 @@ static int __test__bpf(int idx) · 269 unmodified lines
276	277	}
277	278
278	279	out:
	280	+ free(obj_buf);
279	281	bpf__clear();
280	282	return ret;
281	283	}

tools/perf/tests/event_update.c+4−2

@@ -88,6 +88,7 @@ int test__event_update(struct test *test __maybe_unused, int subtest __maybe_unu · 87 unmodified lines
88	88	struct evsel *evsel;
89	89	struct event_name tmp;
90	90	struct evlist *evlist = evlist__new_default();
	91	+ char *unit = strdup("KRAVA");
91	92
92	93	TEST_ASSERT_VAL("failed to get evlist", evlist);
93	94
@@ -98,7 +99,7 @@ int test__event_update(struct test *test __maybe_unused, int subtest __maybe_unu · 4 unmodified lines
98	99
99	100	perf_evlist__id_add(&evlist->core, &evsel->core, 0, 0, 123);
100	101
101		− evsel->unit = strdup("KRAVA");
	102	+ evsel->unit = unit;
102	103
103	104	TEST_ASSERT_VAL("failed to synthesize attr update unit",
104	105	!perf_event__synthesize_event_update_unit(NULL, evsel, process_event_unit));
@@ -118,6 +119,7 @@ int test__event_update(struct test *test __maybe_unused, int subtest __maybe_unu · 13 unmodified lines
118	119	TEST_ASSERT_VAL("failed to synthesize attr update cpus",
119	120	!perf_event__synthesize_event_update_cpus(&tmp.tool, evsel, process_event_cpus));
120	121
121		− perf_cpu_map__put(evsel->core.own_cpus);
	122	+ free(unit);
	123	+ evlist__delete(evlist);
122	124	return 0;
123	125	}

tools/perf/tests/evsel-roundtrip-name.c+2−1

@@ -5,6 +5,7 @@ · 4 unmodified lines
5	5	#include "tests.h"
6	6	#include "debug.h"
7	7	#include "pmu.h"
	8	+#include "pmu-hybrid.h"
8	9	#include <errno.h>
9	10	#include <linux/kernel.h>
10	11
@@ -102,7 +103,7 @@ int test__perf_evsel__roundtrip_name_test(struct test *test __maybe_unused, int · 91 unmodified lines
102	103	{
103	104	int err = 0, ret = 0;
104	105
105		− if (perf_pmu__has_hybrid())
	106	+ if (perf_pmu__has_hybrid() && perf_pmu__hybrid_mounted("cpu_atom"))
106	107	return perf_evsel__name_array_test(evsel__hw_names, 2);
107	108
108	109	err = perf_evsel__name_array_test(evsel__hw_names, 1);

tools/perf/tests/maps.c+2−0

@@ -116,5 +116,7 @@ int test__maps__merge_in(struct test *t __maybe_unused, int subtest __maybe_unus · 115 unmodified lines
116	116
117	117	ret = check_maps(merged3, ARRAY_SIZE(merged3), &maps);
118	118	TEST_ASSERT_VAL("merge check failed", !ret);
	119	+
	120	+ maps__exit(&maps);
119	121	return TEST_OK;
120	122	}

tools/perf/tests/parse-events.c+10−6

@@ -6,6 +6,7 @@ · 5 unmodified lines
6	6	#include "tests.h"
7	7	#include "debug.h"
8	8	#include "pmu.h"
	9	+#include "pmu-hybrid.h"
9	10	#include <dirent.h>
10	11	#include <errno.h>
11	12	#include <sys/types.h>
@@ -1596,6 +1597,13 @@ static int test__hybrid_raw1(struct evlist *evlist) · 1584 unmodified lines
1596	1597	{
1597	1598	struct evsel *evsel = evlist__first(evlist);
1598	1599
	1600	+ if (!perf_pmu__hybrid_mounted("cpu_atom")) {
	1601	+ TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
	1602	+ TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
	1603	+ TEST_ASSERT_VAL("wrong config", 0x1a == evsel->core.attr.config);
	1604	+ return 0;
	1605	+ }
	1606	+
1599	1607	TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
1600	1608	TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
1601	1609	TEST_ASSERT_VAL("wrong config", 0x1a == evsel->core.attr.config);
@@ -1620,13 +1628,9 @@ static int test__hybrid_cache_event(struct evlist *evlist) · 18 unmodified lines
1620	1628	{
1621	1629	struct evsel *evsel = evlist__first(evlist);
1622	1630
1623		− TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
	1631	+ TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
1624	1632	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HW_CACHE == evsel->core.attr.type);
1625	1633	TEST_ASSERT_VAL("wrong config", 0x2 == (evsel->core.attr.config & 0xffffffff));
1626		−
1627		− evsel = evsel__next(evsel);
1628		− TEST_ASSERT_VAL("wrong type", PERF_TYPE_HW_CACHE == evsel->core.attr.type);
1629		− TEST_ASSERT_VAL("wrong config", 0x10002 == (evsel->core.attr.config & 0xffffffff));
1630	1634	return 0;
1631	1635	}
1632	1636
@@ -2028,7 +2032,7 @@ static struct evlist_test test__hybrid_events[] = { · 395 unmodified lines
2028	2032	.id = 7,
2029	2033	},
2030	2034	{
2031		− .name = "cpu_core/LLC-loads/,cpu_atom/LLC-load-misses/",
	2035	+ .name = "cpu_core/LLC-loads/",
2032	2036	.check = test__hybrid_cache_event,
2033	2037	.id = 8,
2034	2038	},

tools/perf/tests/perf-time-to-tsc.c+2−1

@@ -21,6 +21,7 @@ · 20 unmodified lines
21	21	#include "mmap.h"
22	22	#include "tests.h"
23	23	#include "pmu.h"
	24	+#include "pmu-hybrid.h"
24	25
25	26	#define CHECK__(x) { \
26	27	while ((x) < 0) { \
@@ -93,7 +94,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe · 66 unmodified lines
93	94	* For hybrid "cycles:u", it creates two events.
94	95	* Init the second evsel here.
95	96	*/
96		− if (perf_pmu__has_hybrid()) {
	97	+ if (perf_pmu__has_hybrid() && perf_pmu__hybrid_mounted("cpu_atom")) {
97	98	evsel = evsel__next(evsel);
98	99	evsel->core.attr.comm = 1;
99	100	evsel->core.attr.disabled = 1;

tools/perf/tests/topology.c+1−0

@@ -61,6 +61,7 @@ static int session_write_header(char *path) · 60 unmodified lines
61	61	TEST_ASSERT_VAL("failed to write header",
62	62	!perf_session__write_header(session, session->evlist, data.file.fd, true));
63	63
	64	+ evlist__delete(session->evlist);
64	65	perf_session__delete(session);
65	66
66	67	return 0;

tools/perf/util/cs-etm.c+167−1

@@ -2683,6 +2683,172 @@ static u64 cs_etm__create_meta_blk(u64 buff_in, int *buff_in_offset, · 2682 unmodified lines
2683	2683	return metadata;
2684	2684	}
2685	2685
	2686	+/**
	2687	+ * Puts a fragment of an auxtrace buffer into the auxtrace queues based
	2688	+ * on the bounds of aux_event, if it matches with the buffer that's at
	2689	+ * file_offset.
	2690	+ *
	2691	+ * Normally, whole auxtrace buffers would be added to the queue. But we
	2692	+ * want to reset the decoder for every PERF_RECORD_AUX event, and the decoder
	2693	+ * is reset across each buffer, so splitting the buffers up in advance has
	2694	+ * the same effect.
	2695	+ */
	2696	+static int cs_etm__queue_aux_fragment(struct perf_session *session, off_t file_offset, size_t sz,
	2697	+ struct perf_record_aux aux_event, struct perf_sample sample)
	2698	+{
	2699	+ int err;
	2700	+ char buf[PERF_SAMPLE_MAX_SIZE];
	2701	+ union perf_event *auxtrace_event_union;
	2702	+ struct perf_record_auxtrace *auxtrace_event;
	2703	+ union perf_event auxtrace_fragment;
	2704	+ __u64 aux_offset, aux_size;
	2705	+
	2706	+ struct cs_etm_auxtrace *etm = container_of(session->auxtrace,
	2707	+ struct cs_etm_auxtrace,
	2708	+ auxtrace);
	2709	+
	2710	+ /*
	2711	+ * There should be a PERF_RECORD_AUXTRACE event at the file_offset that we got
	2712	+ * from looping through the auxtrace index.
	2713	+ */
	2714	+ err = perf_session__peek_event(session, file_offset, buf,
	2715	+ PERF_SAMPLE_MAX_SIZE, &auxtrace_event_union, NULL);
	2716	+ if (err)
	2717	+ return err;
	2718	+ auxtrace_event = &auxtrace_event_union->auxtrace;
	2719	+ if (auxtrace_event->header.type != PERF_RECORD_AUXTRACE)
	2720	+ return -EINVAL;
	2721	+
	2722	+ if (auxtrace_event->header.size < sizeof(struct perf_record_auxtrace) \|\|
	2723	+ auxtrace_event->header.size != sz) {
	2724	+ return -EINVAL;
	2725	+ }
	2726	+
	2727	+ /*
	2728	+ * In per-thread mode, CPU is set to -1, but TID will be set instead. See
	2729	+ * auxtrace_mmap_params__set_idx(). Return 'not found' if neither CPU nor TID match.
	2730	+ */
	2731	+ if ((auxtrace_event->cpu == (__u32) -1 && auxtrace_event->tid != sample->tid) \|\|
	2732	+ auxtrace_event->cpu != sample->cpu)
	2733	+ return 1;
	2734	+
	2735	+ if (aux_event->flags & PERF_AUX_FLAG_OVERWRITE) {
	2736	+ /*
	2737	+ * Clamp size in snapshot mode. The buffer size is clamped in
	2738	+ * __auxtrace_mmap__read() for snapshots, so the aux record size doesn't reflect
	2739	+ * the buffer size.
	2740	+ */
	2741	+ aux_size = min(aux_event->aux_size, auxtrace_event->size);
	2742	+
	2743	+ /*
	2744	+ * In this mode, the head also points to the end of the buffer so aux_offset
	2745	+ * needs to have the size subtracted so it points to the beginning as in normal mode
	2746	+ */
	2747	+ aux_offset = aux_event->aux_offset - aux_size;
	2748	+ } else {
	2749	+ aux_size = aux_event->aux_size;
	2750	+ aux_offset = aux_event->aux_offset;
	2751	+ }
	2752	+
	2753	+ if (aux_offset >= auxtrace_event->offset &&
	2754	+ aux_offset + aux_size <= auxtrace_event->offset + auxtrace_event->size) {
	2755	+ /*
	2756	+ * If this AUX event was inside this buffer somewhere, create a new auxtrace event
	2757	+ * based on the sizes of the aux event, and queue that fragment.
	2758	+ */
	2759	+ auxtrace_fragment.auxtrace = *auxtrace_event;
	2760	+ auxtrace_fragment.auxtrace.size = aux_size;
	2761	+ auxtrace_fragment.auxtrace.offset = aux_offset;
	2762	+ file_offset += aux_offset - auxtrace_event->offset + auxtrace_event->header.size;
	2763	+
	2764	+ pr_debug3("CS ETM: Queue buffer size: %#"PRI_lx64" offset: %#"PRI_lx64
	2765	+ " tid: %d cpu: %d\n", aux_size, aux_offset, sample->tid, sample->cpu);
	2766	+ return auxtrace_queues__add_event(&etm->queues, session, &auxtrace_fragment,
	2767	+ file_offset, NULL);
	2768	+ }
	2769	+
	2770	+ /* Wasn't inside this buffer, but there were no parse errors. 1 == 'not found' */
	2771	+ return 1;
	2772	+}
	2773	+
	2774	+static int cs_etm__queue_aux_records_cb(struct perf_session session, union perf_event event,
	2775	+ u64 offset __maybe_unused, void *data __maybe_unused)
	2776	+{
	2777	+ struct perf_sample sample;
	2778	+ int ret;
	2779	+ struct auxtrace_index_entry *ent;
	2780	+ struct auxtrace_index *auxtrace_index;
	2781	+ struct evsel *evsel;
	2782	+ size_t i;
	2783	+
	2784	+ /* Don't care about any other events, we're only queuing buffers for AUX events */
	2785	+ if (event->header.type != PERF_RECORD_AUX)
	2786	+ return 0;
	2787	+
	2788	+ if (event->header.size < sizeof(struct perf_record_aux))
	2789	+ return -EINVAL;
	2790	+
	2791	+ /* Truncated Aux records can have 0 size and shouldn't result in anything being queued. */
	2792	+ if (!event->aux.aux_size)
	2793	+ return 0;
	2794	+
	2795	+ /*
	2796	+ * Parse the sample, we need the sample_id_all data that comes after the event so that the
	2797	+ * CPU or PID can be matched to an AUXTRACE buffer's CPU or PID.
	2798	+ */
	2799	+ evsel = evlist__event2evsel(session->evlist, event);
	2800	+ if (!evsel)
	2801	+ return -EINVAL;
	2802	+ ret = evsel__parse_sample(evsel, event, &sample);
	2803	+ if (ret)
	2804	+ return ret;
	2805	+
	2806	+ /*
	2807	+ * Loop through the auxtrace index to find the buffer that matches up with this aux event.
	2808	+ */
	2809	+ list_for_each_entry(auxtrace_index, &session->auxtrace_index, list) {
	2810	+ for (i = 0; i < auxtrace_index->nr; i++) {
	2811	+ ent = &auxtrace_index->entries[i];
	2812	+ ret = cs_etm__queue_aux_fragment(session, ent->file_offset,
	2813	+ ent->sz, &event->aux, &sample);
	2814	+ /*
	2815	+ * Stop search on error or successful values. Continue search on
	2816	+ * 1 ('not found')
	2817	+ */
	2818	+ if (ret != 1)
	2819	+ return ret;
	2820	+ }
	2821	+ }
	2822	+
	2823	+ /*
	2824	+ * Couldn't find the buffer corresponding to this aux record, something went wrong. Warn but
	2825	+ * don't exit with an error because it will still be possible to decode other aux records.
	2826	+ */
	2827	+ pr_err("CS ETM: Couldn't find auxtrace buffer for aux_offset: %#"PRI_lx64
	2828	+ " tid: %d cpu: %d\n", event->aux.aux_offset, sample.tid, sample.cpu);
	2829	+ return 0;
	2830	+}
	2831	+
	2832	+static int cs_etm__queue_aux_records(struct perf_session *session)
	2833	+{
	2834	+ struct auxtrace_index *index = list_first_entry_or_null(&session->auxtrace_index,
	2835	+ struct auxtrace_index, list);
	2836	+ if (index && index->nr > 0)
	2837	+ return perf_session__peek_events(session, session->header.data_offset,
	2838	+ session->header.data_size,
	2839	+ cs_etm__queue_aux_records_cb, NULL);
	2840	+
	2841	+ /*
	2842	+ * We would get here if there are no entries in the index (either no auxtrace
	2843	+ * buffers or no index at all). Fail silently as there is the possibility of
	2844	+ * queueing them in cs_etm__process_auxtrace_event() if etm->data_queued is still
	2845	+ * false.
	2846	+ *
	2847	+ * In that scenario, buffers will not be split by AUX records.
	2848	+ */
	2849	+ return 0;
	2850	+}
	2851	+
2686	2852	int cs_etm__process_auxtrace_info(union perf_event *event,
2687	2853	struct perf_session *session)
2688	2854	{
@@ -2883,7 +3049,7 @@ int cs_etm__process_auxtrace_info(union perf_event *event, · 194 unmodified lines
2883	3049	if (err)
2884	3050	goto err_delete_thread;
2885	3051
2886		− err = auxtrace_queues__process_index(&etm->queues, session);
	3052	+ err = cs_etm__queue_aux_records(session);
2887	3053	if (err)
2888	3054	goto err_delete_thread;
2889	3055

tools/perf/util/data.c+1−1

@@ -20,7 +20,7 @@ · 19 unmodified lines
20	20
21	21	static void close_dir(struct perf_data_file *files, int nr)
22	22	{
23		− while (--nr >= 1) {
	23	+ while (--nr >= 0) {
24	24	close(files[nr].fd);
25	25	zfree(&files[nr].path);
26	26	}

tools/perf/util/dso.c+3−1

@@ -1154,8 +1154,10 @@ struct map dso__new_map(const char name) · 1153 unmodified lines
1154	1154	struct map *map = NULL;
1155	1155	struct dso *dso = dso__new(name);
1156	1156
1157		− if (dso)
	1157	+ if (dso) {
1158	1158	map = map__new2(0, dso);
	1159	+ dso__put(dso);
	1160	+ }
1159	1161
1160	1162	return map;
1161	1163	}

tools/perf/util/dwarf-aux.c+4−4

@@ -113,14 +113,14 @@ static Dwarf_Line cu_getsrc_die(Dwarf_Die cu_die, Dwarf_Addr addr) · 112 unmodified lines
113	113	*
114	114	* Find a line number and file name for @addr in @cu_die.
115	115	*/
116		−int cu_find_lineinfo(Dwarf_Die *cu_die, unsigned long addr,
117		− const char *fname, int lineno)
	116	+int cu_find_lineinfo(Dwarf_Die *cu_die, Dwarf_Addr addr,
	117	+ const char *fname, int lineno)
118	118	{
119	119	Dwarf_Line *line;
120	120	Dwarf_Die die_mem;
121	121	Dwarf_Addr faddr;
122	122
123		− if (die_find_realfunc(cu_die, (Dwarf_Addr)addr, &die_mem)
	123	+ if (die_find_realfunc(cu_die, addr, &die_mem)
124	124	&& die_entrypc(&die_mem, &faddr) == 0 &&
125	125	faddr == addr) {
126	126	*fname = dwarf_decl_file(&die_mem);
@@ -128,7 +128,7 @@ int cu_find_lineinfo(Dwarf_Die *cu_die, unsigned long addr, · 1 unmodified line
128	128	goto out;
129	129	}
130	130
131		− line = cu_getsrc_die(cu_die, (Dwarf_Addr)addr);
	131	+ line = cu_getsrc_die(cu_die, addr);
132	132	if (line && dwarf_lineno(line, lineno) == 0) {
133	133	*fname = dwarf_linesrc(line, NULL, NULL);
134	134	if (!*fname)

tools/perf/util/dwarf-aux.h+1−1

@@ -19,7 +19,7 @@ const char cu_find_realpath(Dwarf_Die cu_die, const char *fname); · 18 unmodified lines
19	19	const char cu_get_comp_dir(Dwarf_Die cu_die);
20	20
21	21	/* Get a line number and file name for given address */
22		−int cu_find_lineinfo(Dwarf_Die *cudie, unsigned long addr,
	22	+int cu_find_lineinfo(Dwarf_Die *cudie, Dwarf_Addr addr,
23	23	const char *fname, int lineno);
24	24
25	25	/* Walk on functions at given address */

tools/perf/util/env.c+2−0

@@ -186,10 +186,12 @@ void perf_env__exit(struct perf_env *env) · 185 unmodified lines
186	186	zfree(&env->cpuid);
187	187	zfree(&env->cmdline);
188	188	zfree(&env->cmdline_argv);
	189	+ zfree(&env->sibling_dies);
189	190	zfree(&env->sibling_cores);
190	191	zfree(&env->sibling_threads);
191	192	zfree(&env->pmu_mappings);
192	193	zfree(&env->cpu);
	194	+ zfree(&env->cpu_pmu_caps);
193	195	zfree(&env->numa_map);
194	196
195	197	for (i = 0; i < env->nr_numa_nodes; i++)

tools/perf/util/lzma.c+5−3

@@ -69,7 +69,7 @@ int lzma_decompress_to_file(const char *input, int output_fd) · 68 unmodified lines
69	69
70	70	if (ferror(infile)) {
71	71	pr_err("lzma: read error: %s\n", strerror(errno));
72		− goto err_fclose;
	72	+ goto err_lzma_end;
73	73	}
74	74
75	75	if (feof(infile))
@@ -83,7 +83,7 @@ int lzma_decompress_to_file(const char *input, int output_fd) · 7 unmodified lines
83	83
84	84	if (writen(output_fd, buf_out, write_size) != write_size) {
85	85	pr_err("lzma: write error: %s\n", strerror(errno));
86		− goto err_fclose;
	86	+ goto err_lzma_end;
87	87	}
88	88
89	89	strm.next_out = buf_out;
@@ -95,11 +95,13 @@ int lzma_decompress_to_file(const char *input, int output_fd) · 5 unmodified lines
95	95	break;
96	96
97	97	pr_err("lzma: failed %s\n", lzma_strerror(ret));
98		− goto err_fclose;
	98	+ goto err_lzma_end;
99	99	}
100	100	}
101	101
102	102	err = 0;
	103	+err_lzma_end:
	104	+ lzma_end(&strm);
103	105	err_fclose:
104	106	fclose(infile);
105	107	return err;

tools/perf/util/map.c+2−0

@@ -192,6 +192,8 @@ struct map map__new(struct machine machine, u64 start, u64 len, · 191 unmodified lines
192	192	if (!(prot & PROT_EXEC))
193	193	dso__set_loaded(dso);
194	194	}
	195	+
	196	+ nsinfo__put(dso->nsinfo);
195	197	dso->nsinfo = nsi;
196	198
197	199	if (build_id__is_defined(bid))

tools/perf/util/pfm.c+1−1

@@ -99,7 +99,7 @@ int parse_libpfm_events_option(const struct option opt, const char str, · 98 unmodified lines
99	99	grp_leader = evsel;
100	100
101	101	if (grp_evt > -1) {
102		− evsel->leader = grp_leader;
	102	+ evsel__set_leader(evsel, grp_leader);
103	103	grp_leader->core.nr_members++;
104	104	grp_evt++;
105	105	}

tools/perf/util/pmu.c+8−1

@@ -950,6 +950,13 @@ static struct perf_pmu pmu_lookup(const char name) · 949 unmodified lines
950	950	LIST_HEAD(format);
951	951	LIST_HEAD(aliases);
952	952	__u32 type;
	953	+ bool is_hybrid = perf_pmu__hybrid_mounted(name);
	954	+
	955	+ /*
	956	+ * Check pmu name for hybrid and the pmu may be invalid in sysfs
	957	+ */
	958	+ if (!strncmp(name, "cpu_", 4) && !is_hybrid)
	959	+ return NULL;
953	960
954	961	/*
955	962	* The pmu data we store & need consists of the pmu
@@ -978,7 +985,7 @@ static struct perf_pmu pmu_lookup(const char name) · 22 unmodified lines
978	985	pmu->is_uncore = pmu_is_uncore(name);
979	986	if (pmu->is_uncore)
980	987	pmu->id = pmu_id(name);
981		− pmu->is_hybrid = perf_pmu__hybrid_mounted(name);
	988	+ pmu->is_hybrid = is_hybrid;
982	989	pmu->max_precise = pmu_max_precise(name);
983	990	pmu_add_cpu_aliases(&aliases, pmu);
984	991	pmu_add_sys_aliases(&aliases, pmu);

tools/perf/util/probe-event.c+26−27

@@ -179,8 +179,10 @@ struct map get_target_map(const char target, struct nsinfo *nsi, bool user) · 178 unmodified lines
179	179	struct map *map;
180	180
181	181	map = dso__new_map(target);
182		− if (map && map->dso)
	182	+ if (map && map->dso) {
	183	+ nsinfo__put(map->dso->nsinfo);
183	184	map->dso->nsinfo = nsinfo__get(nsi);
	185	+ }
184	186	return map;
185	187	} else {
186	188	return kernel_get_module_map(target);
@@ -237,8 +239,8 @@ static void clear_probe_trace_events(struct probe_trace_event *tevs, int ntevs) · 50 unmodified lines
237	239	clear_probe_trace_event(tevs + i);
238	240	}
239	241
240		−static bool kprobe_blacklist__listed(unsigned long address);
241		−static bool kprobe_warn_out_range(const char *symbol, unsigned long address)
	242	+static bool kprobe_blacklist__listed(u64 address);
	243	+static bool kprobe_warn_out_range(const char *symbol, u64 address)
242	244	{
243	245	struct map *map;
244	246	bool ret = false;
@@ -398,8 +400,7 @@ static int find_alternative_probe_point(struct debuginfo *dinfo, · 153 unmodified lines
398	400	pr_debug("Symbol %s address found : %" PRIx64 "\n",
399	401	pp->function, address);
400	402
401		− ret = debuginfo__find_probe_point(dinfo, (unsigned long)address,
402		− result);
	403	+ ret = debuginfo__find_probe_point(dinfo, address, result);
403	404	if (ret <= 0)
404	405	ret = (!ret) ? -ENOENT : ret;
405	406	else {
@@ -587,7 +588,7 @@ static void debuginfo_cache__exit(void) · 181 unmodified lines
587	588	}
588	589
589	590
590		−static int get_text_start_address(const char exec, unsigned long address,
	591	+static int get_text_start_address(const char exec, u64 address,
591	592	struct nsinfo *nsi)
592	593	{
593	594	Elf *elf;
@@ -632,7 +633,7 @@ static int find_perf_probe_point_from_dwarf(struct probe_trace_point *tp, · 38 unmodified lines
632	633	bool is_kprobe)
633	634	{
634	635	struct debuginfo *dinfo = NULL;
635		− unsigned long stext = 0;
	636	+ u64 stext = 0;
636	637	u64 addr = tp->address;
637	638	int ret = -ENOENT;
638	639
@@ -660,8 +661,7 @@ static int find_perf_probe_point_from_dwarf(struct probe_trace_point *tp, · 21 unmodified lines
660	661
661	662	dinfo = debuginfo_cache__open(tp->module, verbose <= 0);
662	663	if (dinfo)
663		− ret = debuginfo__find_probe_point(dinfo,
664		− (unsigned long)addr, pp);
	664	+ ret = debuginfo__find_probe_point(dinfo, addr, pp);
665	665	else
666	666	ret = -ENOENT;
667	667
@@ -676,7 +676,7 @@ error: · 8 unmodified lines
676	676
677	677	/* Adjust symbol name and address */
678	678	static int post_process_probe_trace_point(struct probe_trace_point *tp,
679		− struct map *map, unsigned long offs)
	679	+ struct map *map, u64 offs)
680	680	{
681	681	struct symbol *sym;
682	682	u64 addr = tp->address - offs;
@@ -719,7 +719,7 @@ post_process_offline_probe_trace_events(struct probe_trace_event *tevs, · 36 unmodified lines
719	719	int ntevs, const char *pathname)
720	720	{
721	721	struct map *map;
722		− unsigned long stext = 0;
	722	+ u64 stext = 0;
723	723	int i, ret = 0;
724	724
725	725	/* Prepare a map for offline binary */
@@ -745,7 +745,7 @@ static int add_exec_to_probe_trace_events(struct probe_trace_event *tevs, · 19 unmodified lines
745	745	struct nsinfo *nsi)
746	746	{
747	747	int i, ret = 0;
748		− unsigned long stext = 0;
	748	+ u64 stext = 0;
749	749
750	750	if (!exec)
751	751	return 0;
@@ -790,7 +790,7 @@ post_process_module_probe_trace_events(struct probe_trace_event *tevs, · 38 unmodified lines
790	790	mod_name = find_module_name(module);
791	791	for (i = 0; i < ntevs; i++) {
792	792	ret = post_process_probe_trace_point(&tevs[i].point,
793		− map, (unsigned long)text_offs);
	793	+ map, text_offs);
794	794	if (ret < 0)
795	795	break;
796	796	tevs[i].point.module =
@@ -1534,7 +1534,7 @@ static int parse_perf_probe_point(char arg, struct perf_probe_event pev) · 737 unmodified lines
1534	1534	* so tmp[1] should always valid (but could be '\0').
1535	1535	*/
1536	1536	if (tmp && !strncmp(tmp, "0x", 2)) {
1537		− pp->abs_address = strtoul(pp->function, &tmp, 0);
	1537	+ pp->abs_address = strtoull(pp->function, &tmp, 0);
1538	1538	if (*tmp != '\0') {
1539	1539	semantic_error("Invalid absolute address.\n");
1540	1540	return -EINVAL;
@@ -1909,7 +1909,7 @@ int parse_probe_trace_command(const char cmd, struct probe_trace_event tev) · 368 unmodified lines
1909	1909	argv[i] = NULL;
1910	1910	argc -= 1;
1911	1911	} else
1912		− tp->address = strtoul(fmt1_str, NULL, 0);
	1912	+ tp->address = strtoull(fmt1_str, NULL, 0);
1913	1913	} else {
1914	1914	/* Only the symbol-based probe has offset */
1915	1915	tp->symbol = strdup(fmt1_str);
@@ -2155,7 +2155,7 @@ synthesize_uprobe_trace_def(struct probe_trace_point tp, struct strbuf buf) · 239 unmodified lines
2155	2155	return -EINVAL;
2156	2156
2157	2157	/* Use the tp->address for uprobes */
2158		− err = strbuf_addf(buf, "%s:0x%lx", tp->module, tp->address);
	2158	+ err = strbuf_addf(buf, "%s:0x%" PRIx64, tp->module, tp->address);
2159	2159
2160	2160	if (err >= 0 && tp->ref_ctr_offset) {
2161	2161	if (!uprobe_ref_ctr_is_supported())
@@ -2170,7 +2170,7 @@ synthesize_kprobe_trace_def(struct probe_trace_point tp, struct strbuf buf) · 8 unmodified lines
2170	2170	{
2171	2171	if (!strncmp(tp->symbol, "0x", 2)) {
2172	2172	/* Absolute address. See try_to_find_absolute_address() */
2173		− return strbuf_addf(buf, "%s%s0x%lx", tp->module ?: "",
	2173	+ return strbuf_addf(buf, "%s%s0x%" PRIx64, tp->module ?: "",
2174	2174	tp->module ? ":" : "", tp->address);
2175	2175	} else {
2176	2176	return strbuf_addf(buf, "%s%s%s+%lu", tp->module ?: "",
@@ -2269,7 +2269,7 @@ static int convert_to_perf_probe_point(struct probe_trace_point *tp, · 92 unmodified lines
2269	2269	pp->function = strdup(tp->symbol);
2270	2270	pp->offset = tp->offset;
2271	2271	} else {
2272		− ret = e_snprintf(buf, 128, "0x%" PRIx64, (u64)tp->address);
	2272	+ ret = e_snprintf(buf, 128, "0x%" PRIx64, tp->address);
2273	2273	if (ret < 0)
2274	2274	return ret;
2275	2275	pp->function = strdup(buf);
@@ -2450,8 +2450,8 @@ void clear_probe_trace_event(struct probe_trace_event *tev) · 174 unmodified lines
2450	2450
2451	2451	struct kprobe_blacklist_node {
2452	2452	struct list_head list;
2453		− unsigned long start;
2454		− unsigned long end;
	2453	+ u64 start;
	2454	+ u64 end;
2455	2455	char *symbol;
2456	2456	};
2457	2457
@@ -2496,7 +2496,7 @@ static int kprobe_blacklist__load(struct list_head *blacklist) · 38 unmodified lines
2496	2496	}
2497	2497	INIT_LIST_HEAD(&node->list);
2498	2498	list_add_tail(&node->list, blacklist);
2499		− if (sscanf(buf, "0x%lx-0x%lx", &node->start, &node->end) != 2) {
	2499	+ if (sscanf(buf, "0x%" PRIx64 "-0x%" PRIx64, &node->start, &node->end) != 2) {
2500	2500	ret = -EINVAL;
2501	2501	break;
2502	2502	}
@@ -2512,7 +2512,7 @@ static int kprobe_blacklist__load(struct list_head *blacklist) · 9 unmodified lines
2512	2512	ret = -ENOMEM;
2513	2513	break;
2514	2514	}
2515		− pr_debug2("Blacklist: 0x%lx-0x%lx, %s\n",
	2515	+ pr_debug2("Blacklist: 0x%" PRIx64 "-0x%" PRIx64 ", %s\n",
2516	2516	node->start, node->end, node->symbol);
2517	2517	ret++;
2518	2518	}
@@ -2524,8 +2524,7 @@ static int kprobe_blacklist__load(struct list_head *blacklist) · 5 unmodified lines
2524	2524	}
2525	2525
2526	2526	static struct kprobe_blacklist_node *
2527		−kprobe_blacklist__find_by_address(struct list_head *blacklist,
2528		− unsigned long address)
	2527	+kprobe_blacklist__find_by_address(struct list_head *blacklist, u64 address)
2529	2528	{
2530	2529	struct kprobe_blacklist_node *node;
2531	2530
@@ -2553,7 +2552,7 @@ static void kprobe_blacklist__release(void) · 21 unmodified lines
2553	2552	kprobe_blacklist__delete(&kprobe_blacklist);
2554	2553	}
2555	2554
2556		−static bool kprobe_blacklist__listed(unsigned long address)
	2555	+static bool kprobe_blacklist__listed(u64 address)
2557	2556	{
2558	2557	return !!kprobe_blacklist__find_by_address(&kprobe_blacklist, address);
2559	2558	}
@@ -3221,7 +3220,7 @@ static int try_to_find_absolute_address(struct perf_probe_event *pev, · 661 unmodified lines
3221	3220	* In __add_probe_trace_events, a NULL symbol is interpreted as
3222	3221	* invalid.
3223	3222	*/
3224		− if (asprintf(&tp->symbol, "0x%lx", tp->address) < 0)
	3223	+ if (asprintf(&tp->symbol, "0x%" PRIx64, tp->address) < 0)
3225	3224	goto errout;
3226	3225
3227	3226	/* For kprobe, check range */
@@ -3232,7 +3231,7 @@ static int try_to_find_absolute_address(struct perf_probe_event *pev, · 4 unmodified lines
3232	3231	goto errout;
3233	3232	}
3234	3233
3235		− if (asprintf(&tp->realname, "abs_%lx", tp->address) < 0)
	3234	+ if (asprintf(&tp->realname, "abs_%" PRIx64, tp->address) < 0)
3236	3235	goto errout;
3237	3236
3238	3237	if (pev->target) {

tools/perf/util/probe-event.h+2−2

@@ -33,7 +33,7 @@ struct probe_trace_point { · 32 unmodified lines
33	33	char module; / Module name */
34	34	unsigned long offset; /* Offset from symbol */
35	35	unsigned long ref_ctr_offset; /* SDT reference counter offset */
36		− unsigned long address; /* Actual address of the trace point */
	36	+ u64 address; /* Actual address of the trace point */
37	37	bool retprobe; /* Return probe flag */
38	38	};
39	39
@@ -70,7 +70,7 @@ struct perf_probe_point { · 30 unmodified lines
70	70	bool retprobe; /* Return probe flag */
71	71	char lazy_line; / Lazy matching pattern */
72	72	unsigned long offset; /* Offset from function entry */
73		− unsigned long abs_address; /* Absolute address of the point */
	73	+ u64 abs_address; /* Absolute address of the point */
74	74	};
75	75
76	76	/* Perf probe probing argument field chain */

tools/perf/util/probe-file.c+2−2

@@ -377,11 +377,11 @@ int probe_file__del_events(int fd, struct strfilter *filter) · 376 unmodified lines
377	377
378	378	ret = probe_file__get_events(fd, filter, namelist);
379	379	if (ret < 0)
380		− return ret;
	380	+ goto out;
381	381
382	382	ret = probe_file__del_strlist(fd, namelist);
	383	+out:
383	384	strlist__delete(namelist);
384		−
385	385	return ret;
386	386	}
387	387

tools/perf/util/probe-finder.c+7−8

@@ -668,7 +668,7 @@ static int convert_to_trace_point(Dwarf_Die sp_die, Dwfl_Module mod, · 667 unmodified lines
668	668	}
669	669
670	670	tp->offset = (unsigned long)(paddr - eaddr);
671		− tp->address = (unsigned long)paddr;
	671	+ tp->address = paddr;
672	672	tp->symbol = strdup(symbol);
673	673	if (!tp->symbol)
674	674	return -ENOMEM;
@@ -1707,7 +1707,7 @@ int debuginfo__get_text_offset(struct debuginfo dbg, Dwarf_Addr offs, · 1032 unmodified lines
1707	1707	}
1708	1708
1709	1709	/* Reverse search */
1710		−int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr,
	1710	+int debuginfo__find_probe_point(struct debuginfo *dbg, u64 addr,
1711	1711	struct perf_probe_point *ppt)
1712	1712	{
1713	1713	Dwarf_Die cudie, spdie, indie;
@@ -1720,14 +1720,14 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr, · 6 unmodified lines
1720	1720	addr += baseaddr;
1721	1721	/* Find cu die */
1722	1722	if (!dwarf_addrdie(dbg->dbg, (Dwarf_Addr)addr, &cudie)) {
1723		− pr_warning("Failed to find debug information for address %lx\n",
	1723	+ pr_warning("Failed to find debug information for address %" PRIx64 "\n",
1724	1724	addr);
1725	1725	ret = -EINVAL;
1726	1726	goto end;
1727	1727	}
1728	1728
1729	1729	/* Find a corresponding line (filename and lineno) */
1730		− cu_find_lineinfo(&cudie, addr, &fname, &lineno);
	1730	+ cu_find_lineinfo(&cudie, (Dwarf_Addr)addr, &fname, &lineno);
1731	1731	/* Don't care whether it failed or not */
1732	1732
1733	1733	/* Find a corresponding function (name, baseline and baseaddr) */
@@ -1742,7 +1742,7 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr, · 8 unmodified lines
1742	1742	}
1743	1743
1744	1744	fname = dwarf_decl_file(&spdie);
1745		− if (addr == (unsigned long)baseaddr) {
	1745	+ if (addr == baseaddr) {
1746	1746	/* Function entry - Relative line number is 0 */
1747	1747	lineno = baseline;
1748	1748	goto post;
@@ -1788,7 +1788,7 @@ post: · 39 unmodified lines
1788	1788	if (lineno)
1789	1789	ppt->line = lineno - baseline;
1790	1790	else if (basefunc) {
1791		− ppt->offset = addr - (unsigned long)baseaddr;
	1791	+ ppt->offset = addr - baseaddr;
1792	1792	func = basefunc;
1793	1793	}
1794	1794
@@ -1828,8 +1828,7 @@ static int line_range_add_line(const char *src, unsigned int lineno, · 33 unmodified lines
1828	1828	}
1829	1829
1830	1830	static int line_range_walk_cb(const char *fname, int lineno,
1831		− Dwarf_Addr addr __maybe_unused,
1832		− void *data)
	1831	+ Dwarf_Addr addr, void *data)
1833	1832	{
1834	1833	struct line_finder *lf = data;
1835	1834	const char *__fname;

tools/perf/util/probe-finder.h+1−1

@@ -46,7 +46,7 @@ int debuginfo__find_trace_events(struct debuginfo *dbg, · 45 unmodified lines
46	46	struct probe_trace_event **tevs);
47	47
48	48	/* Find a perf_probe_point from debuginfo */
49		−int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr,
	49	+int debuginfo__find_probe_point(struct debuginfo *dbg, u64 addr,
50	50	struct perf_probe_point *ppt);
51	51
52	52	int debuginfo__get_text_offset(struct debuginfo dbg, Dwarf_Addr offs,

tools/perf/util/session.c+1−0

@@ -306,6 +306,7 @@ void perf_session__delete(struct perf_session *session) · 305 unmodified lines
306	306	evlist__delete(session->evlist);
307	307	perf_data__close(session->data);
308	308	}
	309	+ trace_event__cleanup(&session->tevent);
309	310	free(session);
310	311	}
311	312

tools/perf/util/sort.c+1−1

@@ -3370,7 +3370,7 @@ static void add_hpp_sort_string(struct strbuf sb, struct hpp_dimension s, int · 3369 unmodified lines
3370	3370	add_key(sb, s[i].name, llen);
3371	3371	}
3372	3372
3373		−const char sort_help(const char prefix)
	3373	+char sort_help(const char prefix)
3374	3374	{
3375	3375	struct strbuf sb;
3376	3376	char *s;

tools/perf/util/sort.h+1−1

@@ -302,7 +302,7 @@ void reset_output_field(void); · 301 unmodified lines
302	302	void sort__setup_elide(FILE *fp);
303	303	void perf_hpp__set_elide(int idx, bool elide);
304	304
305		−const char sort_help(const char prefix);
	305	+char sort_help(const char prefix);
306	306
307	307	int report_parse_ignore_callees_opt(const struct option opt, const char arg, int unset);
308	308

tools/perf/util/stat-display.c+13−1

@@ -596,6 +596,18 @@ static void collect_all_aliases(struct perf_stat_config config, struct evsel c · 595 unmodified lines
596	596	}
597	597	}
598	598
	599	+static bool is_uncore(struct evsel *evsel)
	600	+{
	601	+ struct perf_pmu *pmu = evsel__find_pmu(evsel);
	602	+
	603	+ return pmu && pmu->is_uncore;
	604	+}
	605	+
	606	+static bool hybrid_uniquify(struct evsel *evsel)
	607	+{
	608	+ return perf_pmu__has_hybrid() && !is_uncore(evsel);
	609	+}
	610	+
599	611	static bool collect_data(struct perf_stat_config config, struct evsel counter,
600	612	void (cb)(struct perf_stat_config config, struct evsel counter, void data,
601	613	bool first),
@@ -604,7 +616,7 @@ static bool collect_data(struct perf_stat_config config, struct evsel counter, · 2 unmodified lines
604	616	if (counter->merged_stat)
605	617	return false;
606	618	cb(config, counter, data, true);
607		− if (config->no_merge)
	619	+ if (config->no_merge \|\| hybrid_uniquify(counter))
608	620	uniquify_event_name(counter);
609	621	else if (counter->auto_merge_stats)
610	622	collect_all_aliases(config, counter, cb, data);

tools/testing/kunit/kunit.py+2−0

@@ -12,6 +12,8 @@ import sys · 11 unmodified lines
12	12	import os
13	13	import time
14	14
	15	+assert sys.version_info >= (3, 7), "Python version is too old"
	16	+
15	17	from collections import namedtuple
16	18	from enum import Enum, auto
17	19

tools/testing/kunit/kunit_kernel.py+2−4

@@ -6,15 +6,13 @@ · 5 unmodified lines
6	6	# Author: Felix Guo <felixguoxiuping@gmail.com>
7	7	# Author: Brendan Higgins <brendanhiggins@google.com>
8	8
9		−from __future__ import annotations
10	9	import importlib.util
11	10	import logging
12	11	import subprocess
13	12	import os
14	13	import shutil
15	14	import signal
16		−from typing import Iterator
17		−from typing import Optional
	15	+from typing import Iterator, Optional, Tuple
18	16
19	17	from contextlib import ExitStack
20	18
@@ -208,7 +206,7 @@ def get_source_tree_ops(arch: str, cross_compile: Optional[str]) -> LinuxSourceT · 187 unmodified lines
208	206	raise ConfigError(arch + ' is not a valid arch')
209	207
210	208	def get_source_tree_ops_from_qemu_config(config_path: str,
211		− cross_compile: Optional[str]) -> tuple[
	209	+ cross_compile: Optional[str]) -> Tuple[
212	210	str, LinuxSourceTreeOperations]:
213	211	# The module name/path has very little to do with where the actual file
214	212	# exists (I learned this through experimentation and could not find it

tools/testing/kunit/kunit_parser.py+4−2

@@ -338,9 +338,11 @@ def bubble_up_suite_errors(test_suites: Iterable[TestSuite]) -> TestStatus: · 337 unmodified lines
338	338	def parse_test_result(lines: LineStream) -> TestResult:
339	339	consume_non_diagnostic(lines)
340	340	if not lines or not parse_tap_header(lines):
341		− return TestResult(TestStatus.NO_TESTS, [], lines)
	341	+ return TestResult(TestStatus.FAILURE_TO_PARSE_TESTS, [], lines)
342	342	expected_test_suite_num = parse_test_plan(lines)
343		− if not expected_test_suite_num:
	343	+ if expected_test_suite_num == 0:
	344	+ return TestResult(TestStatus.NO_TESTS, [], lines)
	345	+ elif expected_test_suite_num is None:
344	346	return TestResult(TestStatus.FAILURE_TO_PARSE_TESTS, [], lines)
345	347	test_suites = []
346	348	for i in range(1, expected_test_suite_num + 1):

tools/testing/kunit/kunit_tool_test.py+13−3

@@ -157,8 +157,18 @@ class KUnitParserTest(unittest.TestCase): · 156 unmodified lines
157	157	kunit_parser.TestStatus.FAILURE,
158	158	result.status)
159	159
	160	+ def test_no_header(self):
	161	+ empty_log = test_data_path('test_is_test_passed-no_tests_run_no_header.log')
	162	+ with open(empty_log) as file:
	163	+ result = kunit_parser.parse_run_tests(
	164	+ kunit_parser.extract_tap_lines(file.readlines()))
	165	+ self.assertEqual(0, len(result.suites))
	166	+ self.assertEqual(
	167	+ kunit_parser.TestStatus.FAILURE_TO_PARSE_TESTS,
	168	+ result.status)
	169	+
160	170	def test_no_tests(self):
161		− empty_log = test_data_path('test_is_test_passed-no_tests_run.log')
	171	+ empty_log = test_data_path('test_is_test_passed-no_tests_run_with_header.log')
162	172	with open(empty_log) as file:
163	173	result = kunit_parser.parse_run_tests(
164	174	kunit_parser.extract_tap_lines(file.readlines()))
@@ -173,7 +183,7 @@ class KUnitParserTest(unittest.TestCase): · 8 unmodified lines
173	183	with open(crash_log) as file:
174	184	result = kunit_parser.parse_run_tests(
175	185	kunit_parser.extract_tap_lines(file.readlines()))
176		− print_mock.assert_any_call(StrContains('no tests run!'))
	186	+ print_mock.assert_any_call(StrContains('could not parse test results!'))
177	187	print_mock.stop()
178	188	file.close()
179	189
@@ -309,7 +319,7 @@ class KUnitJsonTest(unittest.TestCase): · 129 unmodified lines
309	319	result["sub_groups"][1]["test_cases"][0])
310	320
311	321	def test_no_tests_json(self):
312		− result = self._json_for('test_is_test_passed-no_tests_run.log')
	322	+ result = self._json_for('test_is_test_passed-no_tests_run_with_header.log')
313	323	self.assertEqual(0, len(result['sub_groups']))
314	324
315	325	class StrContains(str):

tools/testing/kunit/test_data/test_is_test_passed-no_tests_run_no_header.logrenamed from tools/testing/kunit/test_data/test_is_test_passed-no_tests_run.log+0−0

File renamed without changes.

tools/testing/kunit/test_data/test_is_test_passed-no_tests_run_with_header.log+2−0

@@ -0,0 +1,2 @@
	1	+TAP version 14
	2	+1..0

tools/testing/selftests/kvm/include/kvm_util.h+2−1

@@ -45,6 +45,7 @@ enum vm_guest_mode { · 44 unmodified lines
45	45	VM_MODE_P40V48_64K,
46	46	VM_MODE_PXXV48_4K, /* For 48bits VA but ANY bits PA */
47	47	VM_MODE_P47V64_4K,
	48	+ VM_MODE_P44V64_4K,
48	49	NUM_VM_MODES,
49	50	};
50	51
@@ -62,7 +63,7 @@ enum vm_guest_mode { · 11 unmodified lines
62	63
63	64	#elif defined(__s390x__)
64	65
65		−#define VM_MODE_DEFAULT VM_MODE_P47V64_4K
	66	+#define VM_MODE_DEFAULT VM_MODE_P44V64_4K
66	67	#define MIN_PAGE_SHIFT 12U
67	68	#define ptes_per_page(page_size) ((page_size) / 16)
68	69

tools/testing/selftests/kvm/lib/aarch64/processor.c+1−1

@@ -401,7 +401,7 @@ unexpected_exception: · 400 unmodified lines
401	401	void vm_init_descriptor_tables(struct kvm_vm *vm)
402	402	{
403	403	vm->handlers = vm_vaddr_alloc(vm, sizeof(struct handlers),
404		− vm->page_size, 0, 0);
	404	+ vm->page_size);
405	405
406	406	(vm_vaddr_t )addr_gva2hva(vm, (vm_vaddr_t)(&exception_handlers)) = vm->handlers;
407	407	}

tools/testing/selftests/kvm/lib/guest_modes.c+16−0

@@ -22,6 +22,22 @@ void guest_modes_append_default(void) · 21 unmodified lines
22	22	}
23	23	}
24	24	#endif
	25	+#ifdef __s390x__
	26	+ {
	27	+ int kvm_fd, vm_fd;
	28	+ struct kvm_s390_vm_cpu_processor info;
	29	+
	30	+ kvm_fd = open_kvm_dev_path_or_exit();
	31	+ vm_fd = ioctl(kvm_fd, KVM_CREATE_VM, 0);
	32	+ kvm_device_access(vm_fd, KVM_S390_VM_CPU_MODEL,
	33	+ KVM_S390_VM_CPU_PROCESSOR, &info, false);
	34	+ close(vm_fd);
	35	+ close(kvm_fd);
	36	+ /* Starting with z13 we have 47bits of physical address */
	37	+ if (info.ibc >= 0x30)
	38	+ guest_mode_append(VM_MODE_P47V64_4K, true, true);
	39	+ }
	40	+#endif
25	41	}
26	42
27	43	void for_each_guest_mode(void (func)(enum vm_guest_mode, void ), void *arg)

tools/testing/selftests/kvm/lib/kvm_util.c+5−0

@@ -176,6 +176,7 @@ const char *vm_guest_mode_string(uint32_t i) · 175 unmodified lines
176	176	[VM_MODE_P40V48_64K] = "PA-bits:40, VA-bits:48, 64K pages",
177	177	[VM_MODE_PXXV48_4K] = "PA-bits:ANY, VA-bits:48, 4K pages",
178	178	[VM_MODE_P47V64_4K] = "PA-bits:47, VA-bits:64, 4K pages",
	179	+ [VM_MODE_P44V64_4K] = "PA-bits:44, VA-bits:64, 4K pages",
179	180	};
180	181	_Static_assert(sizeof(strings)/sizeof(char *) == NUM_VM_MODES,
181	182	"Missing new mode strings?");
@@ -194,6 +195,7 @@ const struct vm_guest_mode_params vm_guest_mode_params[] = { · 12 unmodified lines
194	195	{ 40, 48, 0x10000, 16 },
195	196	{ 0, 0, 0x1000, 12 },
196	197	{ 47, 64, 0x1000, 12 },
	198	+ { 44, 64, 0x1000, 12 },
197	199	};
198	200	_Static_assert(sizeof(vm_guest_mode_params)/sizeof(struct vm_guest_mode_params) == NUM_VM_MODES,
199	201	"Missing new mode params?");
@@ -282,6 +284,9 @@ struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm) · 82 unmodified lines
282	284	case VM_MODE_P47V64_4K:
283	285	vm->pgtable_levels = 5;
284	286	break;
	287	+ case VM_MODE_P44V64_4K:
	288	+ vm->pgtable_levels = 5;
	289	+ break;
285	290	default:
286	291	TEST_FAIL("Unknown guest mode, mode: 0x%x", mode);
287	292	}

tools/testing/selftests/kvm/set_memory_region_test.c+2−1

@@ -377,7 +377,8 @@ static void test_add_max_memory_regions(void) · 376 unmodified lines
377	377	(max_mem_slots - 1), MEM_REGION_SIZE >> 10);
378	378
379	379	mem = mmap(NULL, (size_t)max_mem_slots * MEM_REGION_SIZE + alignment,
380		− PROT_READ \| PROT_WRITE, MAP_PRIVATE \| MAP_ANONYMOUS, -1, 0);
	380	+ PROT_READ \| PROT_WRITE,
	381	+ MAP_PRIVATE \| MAP_ANONYMOUS \| MAP_NORESERVE, -1, 0);
381	382	TEST_ASSERT(mem != MAP_FAILED, "Failed to mmap() host");
382	383	mem_aligned = (void *)(((size_t) mem + alignment - 1) & ~(alignment - 1));
383	384

tools/testing/selftests/kvm/x86_64/hyperv_features.c+1−1

@@ -615,7 +615,7 @@ int main(void) · 614 unmodified lines
615	615
616	616	vm_init_descriptor_tables(vm);
617	617	vcpu_init_descriptor_tables(vm, VCPU_ID);
618		− vm_handle_exception(vm, GP_VECTOR, guest_gp_handler);
	618	+ vm_install_exception_handler(vm, GP_VECTOR, guest_gp_handler);
619	619
620	620	pr_info("Testing access to Hyper-V specific MSRs\n");
621	621	guest_test_msrs_access(vm, addr_gva2hva(vm, msr_gva),

tools/testing/selftests/kvm/x86_64/mmu_role_test.c+1−1

@@ -71,7 +71,7 @@ static void mmu_role_test(u32 *cpuid_reg, u32 evil_cpuid_val) · 70 unmodified lines
71	71	/* Set up a #PF handler to eat the RSVD #PF and signal all done! */
72	72	vm_init_descriptor_tables(vm);
73	73	vcpu_init_descriptor_tables(vm, VCPU_ID);
74		− vm_handle_exception(vm, PF_VECTOR, guest_pf_handler);
	74	+ vm_install_exception_handler(vm, PF_VECTOR, guest_pf_handler);
75	75
76	76	r = _vcpu_run(vm, VCPU_ID);
77	77	TEST_ASSERT(r == 0, "vcpu_run failed: %d\n", r);

tools/testing/selftests/kvm/x86_64/smm_test.c+64−6

@@ -53,15 +53,28 @@ static inline void sync_with_host(uint64_t phase) · 52 unmodified lines
53	53	: "+a" (phase));
54	54	}
55	55
56		−void self_smi(void)
	56	+static void self_smi(void)
57	57	{
58	58	x2apic_write_reg(APIC_ICR,
59	59	APIC_DEST_SELF \| APIC_INT_ASSERT \| APIC_DM_SMI);
60	60	}
61	61
62		−void guest_code(void *arg)
	62	+static void l2_guest_code(void)
63	63	{
	64	+ sync_with_host(8);
	65	+
	66	+ sync_with_host(10);
	67	+
	68	+ vmcall();
	69	+}
	70	+
	71	+static void guest_code(void *arg)
	72	+{
	73	+ #define L2_GUEST_STACK_SIZE 64
	74	+ unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];
64	75	uint64_t apicbase = rdmsr(MSR_IA32_APICBASE);
	76	+ struct svm_test_data *svm = arg;
	77	+ struct vmx_pages *vmx_pages = arg;
65	78
66	79	sync_with_host(1);
67	80
@@ -74,21 +87,50 @@ void guest_code(void *arg) · 6 unmodified lines
74	87	sync_with_host(4);
75	88
76	89	if (arg) {
77		− if (cpu_has_svm())
78		− generic_svm_setup(arg, NULL, NULL);
79		− else
80		− GUEST_ASSERT(prepare_for_vmx_operation(arg));
	90	+ if (cpu_has_svm()) {
	91	+ generic_svm_setup(svm, l2_guest_code,
	92	+ &l2_guest_stack[L2_GUEST_STACK_SIZE]);
	93	+ } else {
	94	+ GUEST_ASSERT(prepare_for_vmx_operation(vmx_pages));
	95	+ GUEST_ASSERT(load_vmcs(vmx_pages));
	96	+ prepare_vmcs(vmx_pages, l2_guest_code,
	97	+ &l2_guest_stack[L2_GUEST_STACK_SIZE]);
	98	+ }
81	99
82	100	sync_with_host(5);
83	101
84	102	self_smi();
85	103
86	104	sync_with_host(7);
	105	+
	106	+ if (cpu_has_svm()) {
	107	+ run_guest(svm->vmcb, svm->vmcb_gpa);
	108	+ svm->vmcb->save.rip += 3;
	109	+ run_guest(svm->vmcb, svm->vmcb_gpa);
	110	+ } else {
	111	+ vmlaunch();
	112	+ vmresume();
	113	+ }
	114	+
	115	+ /* Stages 8-11 are eaten by SMM (SMRAM_STAGE reported instead) */
	116	+ sync_with_host(12);
87	117	}
88	118
89	119	sync_with_host(DONE);
90	120	}
91	121
	122	+void inject_smi(struct kvm_vm *vm)
	123	+{
	124	+ struct kvm_vcpu_events events;
	125	+
	126	+ vcpu_events_get(vm, VCPU_ID, &events);
	127	+
	128	+ events.smi.pending = 1;
	129	+ events.flags \|= KVM_VCPUEVENT_VALID_SMM;
	130	+
	131	+ vcpu_events_set(vm, VCPU_ID, &events);
	132	+}
	133	+
92	134	int main(int argc, char *argv[])
93	135	{
94	136	vm_vaddr_t nested_gva = 0;
@@ -147,6 +189,22 @@ int main(int argc, char *argv[]) · 52 unmodified lines
147	189	"Unexpected stage: #%x, got %x",
148	190	stage, stage_reported);
149	191
	192	+ /*
	193	+ * Enter SMM during L2 execution and check that we correctly
	194	+ * return from it. Do not perform save/restore while in SMM yet.
	195	+ */
	196	+ if (stage == 8) {
	197	+ inject_smi(vm);
	198	+ continue;
	199	+ }
	200	+
	201	+ /*
	202	+ * Perform save/restore while the guest is in SMM triggered
	203	+ * during L2 execution.
	204	+ */
	205	+ if (stage == 10)
	206	+ inject_smi(vm);
	207	+
150	208	state = vcpu_save_state(vm, VCPU_ID);
151	209	kvm_vm_release(vm);
152	210	kvm_vm_restart(vm, O_RDWR);

tools/testing/selftests/memory-hotplug/mem-on-off-test.sh+3−1

@@ -282,7 +282,9 @@ done · 281 unmodified lines
282	282	#
283	283	echo $error > $NOTIFIER_ERR_INJECT_DIR/actions/MEM_GOING_OFFLINE/error
284	284	for memory in `hotpluggable_online_memory`; do
285		− offline_memory_expect_fail $memory
	285	+ if [ $((RANDOM % 100)) -lt $ratio ]; then
	286	+ offline_memory_expect_fail $memory
	287	+ fi
286	288	done
287	289
288	290	echo 0 > $NOTIFIER_ERR_INJECT_DIR/actions/MEM_GOING_OFFLINE/error

tools/testing/selftests/net/nettest.c+54−1

@@ -11,9 +11,11 @@ · 10 unmodified lines
11	11	#include <sys/socket.h>
12	12	#include <sys/wait.h>
13	13	#include <linux/tcp.h>
	14	+#include <linux/udp.h>
14	15	#include <arpa/inet.h>
15	16	#include <net/if.h>
16	17	#include <netinet/in.h>
	18	+#include <netinet/ip.h>
17	19	#include <netdb.h>
18	20	#include <fcntl.h>
19	21	#include <libgen.h>
@@ -27,6 +29,10 @@ · 7 unmodified lines
27	29	#include <time.h>
28	30	#include <errno.h>
29	31
	32	+#include <linux/xfrm.h>
	33	+#include <linux/ipsec.h>
	34	+#include <linux/pfkeyv2.h>
	35	+
30	36	#ifndef IPV6_UNICAST_IF
31	37	#define IPV6_UNICAST_IF 76
32	38	#endif
@@ -114,6 +120,9 @@ struct sock_args { · 81 unmodified lines
114	120	struct in_addr in;
115	121	struct in6_addr in6;
116	122	} expected_raddr;
	123	+
	124	+ /* ESP in UDP encap test */
	125	+ int use_xfrm;
117	126	};
118	127
119	128	static int server_mode;
@@ -1346,6 +1355,41 @@ static int bind_socket(int sd, struct sock_args *args) · 1226 unmodified lines
1346	1355	return 0;
1347	1356	}
1348	1357
	1358	+static int config_xfrm_policy(int sd, struct sock_args *args)
	1359	+{
	1360	+ struct xfrm_userpolicy_info policy = {};
	1361	+ int type = UDP_ENCAP_ESPINUDP;
	1362	+ int xfrm_af = IP_XFRM_POLICY;
	1363	+ int level = SOL_IP;
	1364	+
	1365	+ if (args->type != SOCK_DGRAM) {
	1366	+ log_error("Invalid socket type. Only DGRAM could be used for XFRM\n");
	1367	+ return 1;
	1368	+ }
	1369	+
	1370	+ policy.action = XFRM_POLICY_ALLOW;
	1371	+ policy.sel.family = args->version;
	1372	+ if (args->version == AF_INET6) {
	1373	+ xfrm_af = IPV6_XFRM_POLICY;
	1374	+ level = SOL_IPV6;
	1375	+ }
	1376	+
	1377	+ policy.dir = XFRM_POLICY_OUT;
	1378	+ if (setsockopt(sd, level, xfrm_af, &policy, sizeof(policy)) < 0)
	1379	+ return 1;
	1380	+
	1381	+ policy.dir = XFRM_POLICY_IN;
	1382	+ if (setsockopt(sd, level, xfrm_af, &policy, sizeof(policy)) < 0)
	1383	+ return 1;
	1384	+
	1385	+ if (setsockopt(sd, IPPROTO_UDP, UDP_ENCAP, &type, sizeof(type)) < 0) {
	1386	+ log_err_errno("Failed to set xfrm encap");
	1387	+ return 1;
	1388	+ }
	1389	+
	1390	+ return 0;
	1391	+}
	1392	+
1349	1393	static int lsock_init(struct sock_args *args)
1350	1394	{
1351	1395	long flags;
@@ -1389,6 +1433,11 @@ static int lsock_init(struct sock_args *args) · 37 unmodified lines
1389	1433	if (fcntl(sd, F_SETFD, FD_CLOEXEC) < 0)
1390	1434	log_err_errno("Failed to set close-on-exec flag");
1391	1435
	1436	+ if (args->use_xfrm && config_xfrm_policy(sd, args)) {
	1437	+ log_err_errno("Failed to set xfrm policy");
	1438	+ goto err;
	1439	+ }
	1440	+
1392	1441	out:
1393	1442	return sd;
1394	1443
@@ -1772,7 +1821,7 @@ static int ipc_parent(int cpid, int fd, struct sock_args *args) · 377 unmodified lines
1772	1821	return client_status;
1773	1822	}
1774	1823
1775		−#define GETOPT_STR "sr:l:c:p:t:g:P:DRn:M:X:m:d:I:BN:O:SCi6L:0:1:2:3:Fbq"
	1824	+#define GETOPT_STR "sr:l:c:p:t:g:P:DRn:M:X:m:d:I:BN:O:SCi6xL:0:1:2:3:Fbq"
1776	1825
1777	1826	static void print_usage(char *prog)
1778	1827	{
@@ -1795,6 +1844,7 @@ static void print_usage(char *prog) · 16 unmodified lines
1795	1844	" -D\|R datagram (D) / raw (R) socket (default stream)\n"
1796	1845	" -l addr local address to bind to in server mode\n"
1797	1846	" -c addr local address to bind to in client mode\n"
	1847	+ " -x configure XFRM policy on socket\n"
1798	1848	"\n"
1799	1849	" -d dev bind socket to given device name\n"
1800	1850	" -I dev bind socket to given device name - server mode\n"
@@ -1966,6 +2016,9 @@ int main(int argc, char *argv[]) · 165 unmodified lines
1966	2016	case 'q':
1967	2017	quiet = 1;
1968	2018	break;
	2019	+ case 'x':
	2020	+ args.use_xfrm = 1;
	2021	+ break;
1969	2022	default:
1970	2023	print_usage(argv[0]);
1971	2024	return 1;

tools/testing/selftests/net/pmtu.sh+206−6

@@ -118,6 +118,16 @@ · 117 unmodified lines
118	118	# below for IPv6 doesn't apply here, because, on IPv4, administrative MTU
119	119	# changes alone won't affect PMTU
120	120	#
	121	+# - pmtu_vti4_udp_exception
	122	+# Same as pmtu_vti4_exception, but using ESP-in-UDP
	123	+#
	124	+# - pmtu_vti4_udp_routed_exception
	125	+# Set up vti tunnel on top of veth connected through routing namespace and
	126	+# add xfrm states and policies with ESP-in-UDP encapsulation. Check that
	127	+# route exception is not created if link layer MTU is not exceeded, then
	128	+# lower MTU on second part of routed environment and check that exception
	129	+# is created with the expected PMTU.
	130	+#
121	131	# - pmtu_vti6_exception
122	132	# Set up vti6 tunnel on top of veth, with xfrm states and policies, in two
123	133	# namespaces with matching endpoints. Check that route exception is
@@ -125,6 +135,13 @@ · 1 unmodified line
125	135	# decrease and increase MTU of tunnel, checking that route exception PMTU
126	136	# changes accordingly
127	137	#
	138	+# - pmtu_vti6_udp_exception
	139	+# Same as pmtu_vti6_exception, but using ESP-in-UDP
	140	+#
	141	+# - pmtu_vti6_udp_routed_exception
	142	+# Same as pmtu_vti6_udp_routed_exception but with routing between vti
	143	+# endpoints
	144	+#
128	145	# - pmtu_vti4_default_mtu
129	146	# Set up vti4 tunnel on top of veth, in two namespaces with matching
130	147	# endpoints. Check that MTU assigned to vti interface is the MTU of the
@@ -224,6 +241,10 @@ tests=" · 93 unmodified lines
224	241	pmtu_ipv6_ipv6_exception IPv6 over IPv6: PMTU exceptions 1
225	242	pmtu_vti6_exception vti6: PMTU exceptions 0
226	243	pmtu_vti4_exception vti4: PMTU exceptions 0
	244	+ pmtu_vti6_udp_exception vti6: PMTU exceptions (ESP-in-UDP) 0
	245	+ pmtu_vti4_udp_exception vti4: PMTU exceptions (ESP-in-UDP) 0
	246	+ pmtu_vti6_udp_routed_exception vti6: PMTU exceptions, routed (ESP-in-UDP) 0
	247	+ pmtu_vti4_udp_routed_exception vti4: PMTU exceptions, routed (ESP-in-UDP) 0
227	248	pmtu_vti4_default_mtu vti4: default MTU assignment 0
228	249	pmtu_vti6_default_mtu vti6: default MTU assignment 0
229	250	pmtu_vti4_link_add_mtu vti4: MTU setting on link creation 0
@@ -246,7 +267,6 @@ ns_b="ip netns exec ${NS_B}" · 16 unmodified lines
246	267	ns_c="ip netns exec ${NS_C}"
247	268	ns_r1="ip netns exec ${NS_R1}"
248	269	ns_r2="ip netns exec ${NS_R2}"
249		−
250	270	# Addressing and routing for tests with routers: four network segments, with
251	271	# index SEGMENT between 1 and 4, a common prefix (PREFIX4 or PREFIX6) and an
252	272	# identifier ID, which is 1 for hosts (A and B), 2 for routers (R1 and R2).
@@ -279,7 +299,6 @@ routes=" · 26 unmodified lines
279	299	A ${prefix6}:${b_r2}::1 ${prefix6}:${a_r2}::2
280	300	B default ${prefix6}:${b_r1}::2
281	301	"
282		−
283	302	USE_NH="no"
284	303	# ns family nh id destination gateway
285	304	nexthops="
@@ -326,6 +345,7 @@ dummy6_mask="64" · 40 unmodified lines
326	345
327	346	err_buf=
328	347	tcpdump_pids=
	348	+nettest_pids=
329	349
330	350	err() {
331	351	err_buf="${err_buf}${1}
@@ -548,6 +568,14 @@ setup_vti6() { · 216 unmodified lines
548	568	setup_vti 6 ${veth6_a_addr} ${veth6_b_addr} ${tunnel6_a_addr} ${tunnel6_b_addr} ${tunnel6_mask}
549	569	}
550	570
	571	+setup_vti4routed() {
	572	+ setup_vti 4 ${prefix4}.${a_r1}.1 ${prefix4}.${b_r1}.1 ${tunnel4_a_addr} ${tunnel4_b_addr} ${tunnel4_mask}
	573	+}
	574	+
	575	+setup_vti6routed() {
	576	+ setup_vti 6 ${prefix6}:${a_r1}::1 ${prefix6}:${b_r1}::1 ${tunnel6_a_addr} ${tunnel6_b_addr} ${tunnel6_mask}
	577	+}
	578	+
551	579	setup_vxlan_or_geneve() {
552	580	type="${1}"
553	581	a_addr="${2}"
@@ -619,18 +647,36 @@ setup_xfrm() { · 65 unmodified lines
619	647	proto=${1}
620	648	veth_a_addr="${2}"
621	649	veth_b_addr="${3}"
	650	+ encap=${4}
622	651
623		− run_cmd ${ns_a} ip -${proto} xfrm state add src ${veth_a_addr} dst ${veth_b_addr} spi 0x1000 proto esp aead 'rfc4106(gcm(aes))' 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f 128 mode tunnel \|\| return 1
624		− run_cmd ${ns_a} ip -${proto} xfrm state add src ${veth_b_addr} dst ${veth_a_addr} spi 0x1001 proto esp aead 'rfc4106(gcm(aes))' 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f 128 mode tunnel
	652	+ run_cmd ${ns_a} ip -${proto} xfrm state add src ${veth_a_addr} dst ${veth_b_addr} spi 0x1000 proto esp aead 'rfc4106(gcm(aes))' 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f 128 mode tunnel ${encap} \|\| return 1
	653	+ run_cmd ${ns_a} ip -${proto} xfrm state add src ${veth_b_addr} dst ${veth_a_addr} spi 0x1001 proto esp aead 'rfc4106(gcm(aes))' 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f 128 mode tunnel ${encap}
625	654	run_cmd ${ns_a} ip -${proto} xfrm policy add dir out mark 10 tmpl src ${veth_a_addr} dst ${veth_b_addr} proto esp mode tunnel
626	655	run_cmd ${ns_a} ip -${proto} xfrm policy add dir in mark 10 tmpl src ${veth_b_addr} dst ${veth_a_addr} proto esp mode tunnel
627	656
628		− run_cmd ${ns_b} ip -${proto} xfrm state add src ${veth_a_addr} dst ${veth_b_addr} spi 0x1000 proto esp aead 'rfc4106(gcm(aes))' 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f 128 mode tunnel
629		− run_cmd ${ns_b} ip -${proto} xfrm state add src ${veth_b_addr} dst ${veth_a_addr} spi 0x1001 proto esp aead 'rfc4106(gcm(aes))' 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f 128 mode tunnel
	657	+ run_cmd ${ns_b} ip -${proto} xfrm state add src ${veth_a_addr} dst ${veth_b_addr} spi 0x1000 proto esp aead 'rfc4106(gcm(aes))' 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f 128 mode tunnel ${encap}
	658	+ run_cmd ${ns_b} ip -${proto} xfrm state add src ${veth_b_addr} dst ${veth_a_addr} spi 0x1001 proto esp aead 'rfc4106(gcm(aes))' 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f 128 mode tunnel ${encap}
630	659	run_cmd ${ns_b} ip -${proto} xfrm policy add dir out mark 10 tmpl src ${veth_b_addr} dst ${veth_a_addr} proto esp mode tunnel
631	660	run_cmd ${ns_b} ip -${proto} xfrm policy add dir in mark 10 tmpl src ${veth_a_addr} dst ${veth_b_addr} proto esp mode tunnel
632	661	}
633	662
	663	+setup_nettest_xfrm() {
	664	+ which nettest >/dev/null
	665	+ if [ $? -ne 0 ]; then
	666	+ echo "'nettest' command not found; skipping tests"
	667	+ return 1
	668	+ fi
	669	+
	670	+ [ ${1} -eq 6 ] && proto="-6" \|\| proto=""
	671	+ port=${2}
	672	+
	673	+ run_cmd ${ns_a} nettest ${proto} -q -D -s -x -p ${port} -t 5 &
	674	+ nettest_pids="${nettest_pids} $!"
	675	+
	676	+ run_cmd ${ns_b} nettest ${proto} -q -D -s -x -p ${port} -t 5 &
	677	+ nettest_pids="${nettest_pids} $!"
	678	+}
	679	+
634	680	setup_xfrm4() {
635	681	setup_xfrm 4 ${veth4_a_addr} ${veth4_b_addr}
636	682	}
@@ -639,6 +685,26 @@ setup_xfrm6() { · 2 unmodified lines
639	685	setup_xfrm 6 ${veth6_a_addr} ${veth6_b_addr}
640	686	}
641	687
	688	+setup_xfrm4udp() {
	689	+ setup_xfrm 4 ${veth4_a_addr} ${veth4_b_addr} "encap espinudp 4500 4500 0.0.0.0"
	690	+ setup_nettest_xfrm 4 4500
	691	+}
	692	+
	693	+setup_xfrm6udp() {
	694	+ setup_xfrm 6 ${veth6_a_addr} ${veth6_b_addr} "encap espinudp 4500 4500 0.0.0.0"
	695	+ setup_nettest_xfrm 6 4500
	696	+}
	697	+
	698	+setup_xfrm4udprouted() {
	699	+ setup_xfrm 4 ${prefix4}.${a_r1}.1 ${prefix4}.${b_r1}.1 "encap espinudp 4500 4500 0.0.0.0"
	700	+ setup_nettest_xfrm 4 4500
	701	+}
	702	+
	703	+setup_xfrm6udprouted() {
	704	+ setup_xfrm 6 ${prefix6}:${a_r1}::1 ${prefix6}:${b_r1}::1 "encap espinudp 4500 4500 0.0.0.0"
	705	+ setup_nettest_xfrm 6 4500
	706	+}
	707	+
642	708	setup_routing_old() {
643	709	for i in ${routes}; do
644	710	[ "${ns}" = "" ] && ns="${i}" && continue
@@ -823,6 +889,11 @@ cleanup() { · 178 unmodified lines
823	889	done
824	890	tcpdump_pids=
825	891
	892	+ for pid in ${nettest_pids}; do
	893	+ kill ${pid}
	894	+ done
	895	+ nettest_pids=
	896	+
826	897	for n in ${NS_A} ${NS_B} ${NS_C} ${NS_R1} ${NS_R2}; do
827	898	ip netns del ${n} 2> /dev/null
828	899	done
@@ -1432,6 +1503,135 @@ test_pmtu_vti6_exception() { · 603 unmodified lines
1432	1503	return ${fail}
1433	1504	}
1434	1505
	1506	+test_pmtu_vti4_udp_exception() {
	1507	+ setup namespaces veth vti4 xfrm4udp \|\| return $ksft_skip
	1508	+ trace "${ns_a}" veth_a "${ns_b}" veth_b \
	1509	+ "${ns_a}" vti4_a "${ns_b}" vti4_b
	1510	+
	1511	+ veth_mtu=1500
	1512	+ vti_mtu=$((veth_mtu - 20))
	1513	+
	1514	+ # UDP SPI SN IV ICV pad length next header
	1515	+ esp_payload_rfc4106=$((vti_mtu - 8 - 4 - 4 - 8 - 16 - 1 - 1))
	1516	+ ping_payload=$((esp_payload_rfc4106 - 28))
	1517	+
	1518	+ mtu "${ns_a}" veth_a ${veth_mtu}
	1519	+ mtu "${ns_b}" veth_b ${veth_mtu}
	1520	+ mtu "${ns_a}" vti4_a ${vti_mtu}
	1521	+ mtu "${ns_b}" vti4_b ${vti_mtu}
	1522	+
	1523	+ # Send DF packet without exceeding link layer MTU, check that no
	1524	+ # exception is created
	1525	+ run_cmd ${ns_a} ping -q -M want -i 0.1 -w 1 -s ${ping_payload} ${tunnel4_b_addr}
	1526	+ pmtu="$(route_get_dst_pmtu_from_exception "${ns_a}" ${tunnel4_b_addr})"
	1527	+ check_pmtu_value "" "${pmtu}" "sending packet smaller than PMTU (IP payload length ${esp_payload_rfc4106})" \|\| return 1
	1528	+
	1529	+ # Now exceed link layer MTU by one byte, check that exception is created
	1530	+ # with the right PMTU value
	1531	+ run_cmd ${ns_a} ping -q -M want -i 0.1 -w 1 -s $((ping_payload + 1)) ${tunnel4_b_addr}
	1532	+ pmtu="$(route_get_dst_pmtu_from_exception "${ns_a}" ${tunnel4_b_addr})"
	1533	+ check_pmtu_value "${esp_payload_rfc4106}" "${pmtu}" "exceeding PMTU (IP payload length $((esp_payload_rfc4106 + 1)))"
	1534	+}
	1535	+
	1536	+test_pmtu_vti6_udp_exception() {
	1537	+ setup namespaces veth vti6 xfrm6udp \|\| return $ksft_skip
	1538	+ trace "${ns_a}" veth_a "${ns_b}" veth_b \
	1539	+ "${ns_a}" vti6_a "${ns_b}" vti6_b
	1540	+ fail=0
	1541	+
	1542	+ # Create route exception by exceeding link layer MTU
	1543	+ mtu "${ns_a}" veth_a 4000
	1544	+ mtu "${ns_b}" veth_b 4000
	1545	+ mtu "${ns_a}" vti6_a 5000
	1546	+ mtu "${ns_b}" vti6_b 5000
	1547	+ run_cmd ${ns_a} ${ping6} -q -i 0.1 -w 1 -s 60000 ${tunnel6_b_addr}
	1548	+
	1549	+ # Check that exception was created
	1550	+ pmtu="$(route_get_dst_pmtu_from_exception "${ns_a}" ${tunnel6_b_addr})"
	1551	+ check_pmtu_value any "${pmtu}" "creating tunnel exceeding link layer MTU" \|\| return 1
	1552	+
	1553	+ # Decrease tunnel MTU, check for PMTU decrease in route exception
	1554	+ mtu "${ns_a}" vti6_a 3000
	1555	+ pmtu="$(route_get_dst_pmtu_from_exception "${ns_a}" ${tunnel6_b_addr})"
	1556	+ check_pmtu_value "3000" "${pmtu}" "decreasing tunnel MTU" \|\| fail=1
	1557	+
	1558	+ # Increase tunnel MTU, check for PMTU increase in route exception
	1559	+ mtu "${ns_a}" vti6_a 9000
	1560	+ pmtu="$(route_get_dst_pmtu_from_exception "${ns_a}" ${tunnel6_b_addr})"
	1561	+ check_pmtu_value "9000" "${pmtu}" "increasing tunnel MTU" \|\| fail=1
	1562	+
	1563	+ return ${fail}
	1564	+}
	1565	+
	1566	+test_pmtu_vti4_udp_routed_exception() {
	1567	+ setup namespaces routing vti4routed xfrm4udprouted \|\| return $ksft_skip
	1568	+ trace "${ns_a}" veth_A-R1 "${ns_b}" veth_B-R1 \
	1569	+ "${ns_a}" vti4_a "${ns_b}" vti4_b
	1570	+
	1571	+ veth_mtu=1500
	1572	+ vti_mtu=$((veth_mtu - 20))
	1573	+
	1574	+ # UDP SPI SN IV ICV pad length next header
	1575	+ esp_payload_rfc4106=$((vti_mtu - 8 - 4 - 4 - 8 - 16 - 1 - 1))
	1576	+ ping_payload=$((esp_payload_rfc4106 - 28))
	1577	+
	1578	+ mtu "${ns_a}" veth_A-R1 ${veth_mtu}
	1579	+ mtu "${ns_r1}" veth_R1-A ${veth_mtu}
	1580	+ mtu "${ns_b}" veth_B-R1 ${veth_mtu}
	1581	+ mtu "${ns_r1}" veth_R1-B ${veth_mtu}
	1582	+
	1583	+ mtu "${ns_a}" vti4_a ${vti_mtu}
	1584	+ mtu "${ns_b}" vti4_b ${vti_mtu}
	1585	+
	1586	+ # Send DF packet without exceeding link layer MTU, check that no
	1587	+ # exception is created
	1588	+ run_cmd ${ns_a} ping -q -M want -i 0.1 -w 1 -s ${ping_payload} ${tunnel4_b_addr}
	1589	+ pmtu="$(route_get_dst_pmtu_from_exception "${ns_a}" ${tunnel4_b_addr})"
	1590	+ check_pmtu_value "" "${pmtu}" "sending packet smaller than PMTU (IP payload length ${esp_payload_rfc4106})" \|\| return 1
	1591	+
	1592	+ # Now decrease link layer MTU by 8 bytes on R1, check that exception is created
	1593	+ # with the right PMTU value
	1594	+ mtu "${ns_r1}" veth_R1-B $((veth_mtu - 8))
	1595	+ run_cmd ${ns_a} ping -q -M want -i 0.1 -w 1 -s $((ping_payload)) ${tunnel4_b_addr}
	1596	+ pmtu="$(route_get_dst_pmtu_from_exception "${ns_a}" ${tunnel4_b_addr})"
	1597	+ check_pmtu_value "$((esp_payload_rfc4106 - 8))" "${pmtu}" "exceeding PMTU (IP payload length $((esp_payload_rfc4106)))"
	1598	+}
	1599	+
	1600	+test_pmtu_vti6_udp_routed_exception() {
	1601	+ setup namespaces routing vti6routed xfrm6udprouted \|\| return $ksft_skip
	1602	+ trace "${ns_a}" veth_A-R1 "${ns_b}" veth_B-R1 \
	1603	+ "${ns_a}" vti6_a "${ns_b}" vti6_b
	1604	+
	1605	+ veth_mtu=1500
	1606	+ vti_mtu=$((veth_mtu - 40))
	1607	+
	1608	+ # UDP SPI SN IV ICV pad length next header
	1609	+ esp_payload_rfc4106=$((vti_mtu - 8 - 4 - 4 - 8 - 16 - 1 - 1))
	1610	+ ping_payload=$((esp_payload_rfc4106 - 48))
	1611	+
	1612	+ mtu "${ns_a}" veth_A-R1 ${veth_mtu}
	1613	+ mtu "${ns_r1}" veth_R1-A ${veth_mtu}
	1614	+ mtu "${ns_b}" veth_B-R1 ${veth_mtu}
	1615	+ mtu "${ns_r1}" veth_R1-B ${veth_mtu}
	1616	+
	1617	+ # mtu "${ns_a}" vti6_a ${vti_mtu}
	1618	+ # mtu "${ns_b}" vti6_b ${vti_mtu}
	1619	+
	1620	+ run_cmd ${ns_a} ${ping6} -q -M want -i 0.1 -w 1 -s ${ping_payload} ${tunnel6_b_addr}
	1621	+
	1622	+ # Check that exception was not created
	1623	+ pmtu="$(route_get_dst_pmtu_from_exception "${ns_a}" ${tunnel6_b_addr})"
	1624	+ check_pmtu_value "" "${pmtu}" "sending packet smaller than PMTU (IP payload length ${esp_payload_rfc4106})" \|\| return 1
	1625	+
	1626	+ # Now decrease link layer MTU by 8 bytes on R1, check that exception is created
	1627	+ # with the right PMTU value
	1628	+ mtu "${ns_r1}" veth_R1-B $((veth_mtu - 8))
	1629	+ run_cmd ${ns_a} ${ping6} -q -M want -i 0.1 -w 1 -s $((ping_payload)) ${tunnel6_b_addr}
	1630	+ pmtu="$(route_get_dst_pmtu_from_exception "${ns_a}" ${tunnel6_b_addr})"
	1631	+ check_pmtu_value "$((esp_payload_rfc4106 - 8))" "${pmtu}" "exceeding PMTU (IP payload length $((esp_payload_rfc4106)))"
	1632	+
	1633	+}
	1634	+
1435	1635	test_pmtu_vti4_default_mtu() {
1436	1636	setup namespaces veth vti4 \|\| return $ksft_skip
1437	1637

virt/kvm/coalesced_mmio.c+1−1

@@ -186,7 +186,6 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm, · 185 unmodified lines
186	186	coalesced_mmio_in_range(dev, zone->addr, zone->size)) {
187	187	r = kvm_io_bus_unregister_dev(kvm,
188	188	zone->pio ? KVM_PIO_BUS : KVM_MMIO_BUS, &dev->dev);
189		− kvm_iodevice_destructor(&dev->dev);
190	189
191	190	/*
192	191	* On failure, unregister destroys all devices on the
@@ -196,6 +195,7 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm, · 3 unmodified lines
196	195	*/
197	196	if (r)
198	197	break;
	198	+ kvm_iodevice_destructor(&dev->dev);
199	199	}
200	200	}
201	201

virt/kvm/kvm_main.c+1−1

@@ -935,7 +935,7 @@ static int kvm_create_vm_debugfs(struct kvm *kvm, int fd) · 934 unmodified lines
935	935	stat_data->kvm = kvm;
936	936	stat_data->desc = pdesc;
937	937	stat_data->kind = KVM_STAT_VCPU;
938		− kvm->debugfs_stat_data[i] = stat_data;
	938	+ kvm->debugfs_stat_data[i + kvm_vm_stats_header.num_desc] = stat_data;
939	939	debugfs_create_file(pdesc->name, kvm_stats_debugfs_mode(pdesc),
940	940	kvm->debugfs_dentry, stat_data,
941	941	&stat_fops_per_vm);