# git rev-parse -q --verify ac08b1c68d1b1ed3cebb218fc3ea2c07484eb07d^{commit} ac08b1c68d1b1ed3cebb218fc3ea2c07484eb07d already have revision, skipping fetch # git checkout -q -f -B kisskb ac08b1c68d1b1ed3cebb218fc3ea2c07484eb07d # git clean -qxdf # < git log -1 # commit ac08b1c68d1b1ed3cebb218fc3ea2c07484eb07d # Merge: b339ec9c229a 742a4c49a82a # Author: Linus Torvalds # Date: Tue Sep 7 19:13:42 2021 -0700 # # Merge tag 'pci-v5.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci # # Pull PCI updates from Bjorn Helgaas: # "Enumeration: # - Convert controller drivers to generic_handle_domain_irq() (Marc # Zyngier) # - Simplify VPD (Vital Product Data) access and search (Heiner # Kallweit) # - Update bnx2, bnx2x, bnxt, cxgb4, cxlflash, sfc, tg3 drivers to use # simplified VPD interfaces (Heiner Kallweit) # - Run Max Payload Size quirks before configuring MPS; work around # ASMedia ASM1062 SATA MPS issue (Marek Behún) # # Resource management: # - Refactor pci_ioremap_bar() and pci_ioremap_wc_bar() (Krzysztof # Wilczyński) # - Optimize pci_resource_len() to reduce kernel size (Zhen Lei) # # PCI device hotplug: # - Fix a double unmap in ibmphp (Vishal Aslot) # # PCIe port driver: # - Enable Bandwidth Notification only if port supports it (Stuart # Hayes) # # Sysfs/proc/syscalls: # - Add schedule point in proc_bus_pci_read() (Krzysztof Wilczyński) # - Return ~0 data on pciconfig_read() CAP_SYS_ADMIN failure (Krzysztof # Wilczyński) # - Return "int" from pciconfig_read() syscall (Krzysztof Wilczyński) # # Virtualization: # - Extend "pci=noats" to also turn on Translation Blocking to protect # against some DMA attacks (Alex Williamson) # - Add sysfs mechanism to control the type of reset used between # device assignments to VMs (Amey Narkhede) # - Add support for ACPI _RST reset method (Shanker Donthineni) # - Add ACS quirks for Cavium multi-function devices (George Cherian) # - Add ACS quirks for NXP LX2xx0 and LX2xx2 platforms (Wasim Khan) # - Allow HiSilicon AMBA devices that appear as fake PCI devices to use # PASID and SVA (Zhangfei Gao) # # Endpoint framework: # - Add support for SR-IOV Endpoint devices (Kishon Vijay Abraham I) # - Zero-initialize endpoint test tool parameters so we don't use # random parameters (Shunyong Yang) # # APM X-Gene PCIe controller driver: # - Remove redundant dev_err() call in xgene_msi_probe() (ErKun Yang) # # Broadcom iProc PCIe controller driver: # - Don't fail devm_pci_alloc_host_bridge() on missing 'ranges' because # it's optional on BCMA devices (Rob Herring) # - Fix BCMA probe resource handling (Rob Herring) # # Cadence PCIe driver: # - Work around J7200 Link training electrical issue by increasing # delays in LTSSM (Nadeem Athani) # # Intel IXP4xx PCI controller driver: # - Depend on ARCH_IXP4XX to avoid useless config questions (Geert # Uytterhoeven) # # Intel Keembay PCIe controller driver: # - Add Intel Keem Bay PCIe controller (Srikanth Thokala) # # Marvell Aardvark PCIe controller driver: # - Work around config space completion handling issues (Evan Wang) # - Increase timeout for config access completions (Pali Rohár) # - Emulate CRS Software Visibility bit (Pali Rohár) # - Configure resources from DT 'ranges' property to fix I/O space # access (Pali Rohár) # - Serialize INTx mask/unmask (Pali Rohár) # # MediaTek PCIe controller driver: # - Add MT7629 support in DT (Chuanjia Liu) # - Fix an MSI issue (Chuanjia Liu) # - Get syscon regmap ("mediatek,generic-pciecfg"), IRQ number # ("pci_irq"), PCI domain ("linux,pci-domain") from DT properties if # present (Chuanjia Liu) # # Microsoft Hyper-V host bridge driver: # - Add ARM64 support (Boqun Feng) # - Support "Create Interrupt v3" message (Sunil Muthuswamy) # # NVIDIA Tegra PCIe controller driver: # - Use seq_puts(), move err_msg from stack to static, fix OF node leak # (Christophe JAILLET) # # NVIDIA Tegra194 PCIe driver: # - Disable suspend when in Endpoint mode (Om Prakash Singh) # - Fix MSI-X address programming error (Om Prakash Singh) # - Disable interrupts during suspend to avoid spurious AER link down # (Om Prakash Singh) # # Renesas R-Car PCIe controller driver: # - Work around hardware issue that prevents Link L1->L0 transition # (Marek Vasut) # - Fix runtime PM refcount leak (Dinghao Liu) # # Rockchip DesignWare PCIe controller driver: # - Add Rockchip RK356X host controller driver (Simon Xue) # # TI J721E PCIe driver: # - Add support for J7200 and AM64 (Kishon Vijay Abraham I) # # Toshiba Visconti PCIe controller driver: # - Add Toshiba Visconti PCIe host controller driver (Nobuhiro # Iwamatsu) # # Xilinx NWL PCIe controller driver: # - Enable PCIe reference clock via CCF (Hyun Kwon) # # Miscellaneous: # - Convert sta2x11 from 'pci_' to 'dma_' API (Christophe JAILLET) # - Fix pci_dev_str_match_path() alloc while atomic bug (used for # kernel parameters that specify devices) (Dan Carpenter) # - Remove pointless Precision Time Management warning when PTM is # present but not enabled (Jakub Kicinski) # - Remove surplus "break" statements (Krzysztof Wilczyński)" # # * tag 'pci-v5.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (132 commits) # PCI: ibmphp: Fix double unmap of io_mem # x86/PCI: sta2x11: switch from 'pci_' to 'dma_' API # PCI/VPD: Use unaligned access helpers # PCI/VPD: Clean up public VPD defines and inline functions # cxgb4: Use pci_vpd_find_id_string() to find VPD ID string # PCI/VPD: Add pci_vpd_find_id_string() # PCI/VPD: Include post-processing in pci_vpd_find_tag() # PCI/VPD: Stop exporting pci_vpd_find_info_keyword() # PCI/VPD: Stop exporting pci_vpd_find_tag() # PCI: Set dma-can-stall for HiSilicon chips # PCI: rockchip-dwc: Add Rockchip RK356X host controller driver # PCI: dwc: Remove surplus break statement after return # PCI: artpec6: Remove local code block from switch statement # PCI: artpec6: Remove surplus break statement after return # MAINTAINERS: Add entries for Toshiba Visconti PCIe controller # PCI: visconti: Add Toshiba Visconti PCIe host controller driver # PCI/portdrv: Enable Bandwidth Notification only if port supports it # PCI: Allow PASID on fake PCIe devices without TLP prefixes # PCI: mediatek: Use PCI domain to handle ports detection # PCI: mediatek: Add new method to get irq number # ... # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 ac08b1c68d1b1ed3cebb218fc3ea2c07484eb07d # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:11924:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:11927:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:11929:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:11931:warning: override: reassigning to symbol UML_NET_SLIP .config:11934:warning: override: reassigning to symbol UML_NET_MCAST .config:11936:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/x86/um/Makefile:44: FORCE prerequisite is missing /kisskb/src/kernel/trace/trace_osnoise.c: In function 'start_kthread': /kisskb/src/kernel/trace/trace_osnoise.c:1515:8: error: 'main' is usually a function [-Werror=main] void *main = osnoise_main; ^ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:277: kernel/trace/trace_osnoise.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: kernel/trace] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1872: kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/drivers/dma/idxd/init.c:24:0: /kisskb/src/drivers/dma/idxd/perfmon.h: In function 'event_to_pmu': /kisskb/src/drivers/dma/idxd/perfmon.h:24:13: error: 'struct perf_event' has no member named 'pmu' pmu = event->pmu; ^ /kisskb/src/drivers/dma/idxd/perfmon.h: In function 'event_to_idxd': /kisskb/src/drivers/dma/idxd/perfmon.h:35:13: error: 'struct perf_event' has no member named 'pmu' pmu = event->pmu; ^ /kisskb/src/drivers/dma/idxd/init.c: In function 'idxd_init_module': /kisskb/src/drivers/dma/idxd/init.c:815:7: error: implicit declaration of function 'cpu_feature_enabled' [-Werror=implicit-function-declaration] if (!cpu_feature_enabled(X86_FEATURE_MOVDIR64B)) { ^ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/dma/idxd/init.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/dma/idxd] Error 2 make[3]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/dma/ioat/dca.c: In function 'dca_enabled_in_bios': /kisskb/src/drivers/dma/ioat/dca.c:64:18: error: implicit declaration of function 'cpuid_eax' [-Werror=implicit-function-declaration] cpuid_level_9 = cpuid_eax(9); ^ /kisskb/src/drivers/dma/ioat/dca.c: In function 'system_has_dca_enabled': /kisskb/src/drivers/dma/ioat/dca.c:74:6: error: implicit declaration of function 'boot_cpu_has' [-Werror=implicit-function-declaration] if (boot_cpu_has(X86_FEATURE_DCA)) ^ /kisskb/src/drivers/dma/ioat/dca.c: In function 'ioat_dca_get_tag': /kisskb/src/drivers/dma/ioat/dca.c:17:31: error: implicit declaration of function 'cpuid_ebx' [-Werror=implicit-function-declaration] #define cpu_physical_id(cpu) (cpuid_ebx(1) >> 24) ^ /kisskb/src/drivers/dma/ioat/dca.c:185:12: note: in expansion of macro 'cpu_physical_id' apic_id = cpu_physical_id(cpu); ^ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/dma/ioat/dca.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/dma/ioat] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/dma] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_probe': /kisskb/src/drivers/video/fbdev/riva/fbdev.c:2062:11: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers] iounmap(default_par->riva.PRAMIN); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:29, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:6, from /kisskb/src/drivers/video/fbdev/riva/fbdev.c:39: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile U032 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ /kisskb/src/drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_remove': /kisskb/src/drivers/video/fbdev/riva/fbdev.c:2095:11: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers] iounmap(par->riva.PRAMIN); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:29, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:6, from /kisskb/src/drivers/video/fbdev/riva/fbdev.c:39: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile U032 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/video/fbdev/riva/fbdev.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/video/fbdev/riva] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c: In function 'nvidiafb_probe': /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c:1414:10: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers] iounmap(par->REGS); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:29, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:6, from /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c:19: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile u32 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c: In function 'nvidiafb_remove': /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c:1439:10: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers] iounmap(par->REGS); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:29, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:6, from /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c:19: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile u32 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/video/fbdev/nvidia/nvidia.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/video/fbdev/nvidia] Error 2 /kisskb/src/drivers/pci/controller/vmd.c:116:21: error: field 'sysdata' has incomplete type struct pci_sysdata sysdata; ^ /kisskb/src/drivers/pci/controller/vmd.c: In function 'vmd_compose_msi_msg': /kisskb/src/drivers/pci/controller/vmd.c:150:20: error: 'X86_MSI_BASE_ADDRESS_HIGH' undeclared (first use in this function) msg->address_hi = X86_MSI_BASE_ADDRESS_HIGH; ^ /kisskb/src/drivers/pci/controller/vmd.c:150:20: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/drivers/pci/controller/vmd.c:151:19: error: 'arch_msi_msg_addr_lo_t {aka struct arch_msi_msg_addr_lo}' has no member named 'base_address' msg->arch_addr_lo.base_address = X86_MSI_BASE_ADDRESS_LOW; ^ /kisskb/src/drivers/pci/controller/vmd.c:151:35: error: 'X86_MSI_BASE_ADDRESS_LOW' undeclared (first use in this function) msg->arch_addr_lo.base_address = X86_MSI_BASE_ADDRESS_LOW; ^ /kisskb/src/drivers/pci/controller/vmd.c:152:19: error: 'arch_msi_msg_addr_lo_t {aka struct arch_msi_msg_addr_lo}' has no member named 'destid_0_7' msg->arch_addr_lo.destid_0_7 = index_from_irqs(vmd, irq); ^ /kisskb/src/drivers/pci/controller/vmd.c: In function 'vmd_enable_domain': /kisskb/src/drivers/pci/controller/vmd.c:700:4: error: dereferencing pointer to incomplete type 'struct pci_sysdata' sd->vmd_dev = vmd->dev; ^ /kisskb/src/drivers/pci/controller/vmd.c: In function 'vmd_from_bus': /kisskb/src/drivers/pci/controller/vmd.c:127:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/pci/controller/vmd.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/pci/controller] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/pci] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/video/fbdev] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/video] Error 2 make[1]: *** [/kisskb/src/Makefile:1872: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:05:26.060267