# git rev-parse -q --verify 4a3bb4200a5958d76cc26ebe4db4257efa56812b^{commit} 4a3bb4200a5958d76cc26ebe4db4257efa56812b already have revision, skipping fetch # git checkout -q -f -B kisskb 4a3bb4200a5958d76cc26ebe4db4257efa56812b # git clean -qxdf # < git log -1 # commit 4a3bb4200a5958d76cc26ebe4db4257efa56812b # Merge: eceae1e7acae c1dec343d7ab # Author: Linus Torvalds # Date: Thu Sep 2 10:32:06 2021 -0700 # # Merge tag 'dma-mapping-5.15' of git://git.infradead.org/users/hch/dma-mapping # # Pull dma-mapping updates from Christoph Hellwig: # # - fix debugfs initialization order (Anthony Iliopoulos) # # - use memory_intersects() directly (Kefeng Wang) # # - allow to return specific errors from ->map_sg (Logan Gunthorpe, # Martin Oliveira) # # - turn the dma_map_sg return value into an unsigned int (me) # # - provide a common global coherent pool Ń–mplementation (me) # # * tag 'dma-mapping-5.15' of git://git.infradead.org/users/hch/dma-mapping: (31 commits) # hexagon: use the generic global coherent pool # dma-mapping: make the global coherent pool conditional # dma-mapping: add a dma_init_global_coherent helper # dma-mapping: simplify dma_init_coherent_memory # dma-mapping: allow using the global coherent pool for !ARM # ARM/nommu: use the generic dma-direct code for non-coherent devices # dma-direct: add support for dma_coherent_default_memory # dma-mapping: return an unsigned int from dma_map_sg{,_attrs} # dma-mapping: disallow .map_sg operations from returning zero on error # dma-mapping: return error code from dma_dummy_map_sg() # x86/amd_gart: don't set failed sg dma_address to DMA_MAPPING_ERROR # x86/amd_gart: return error code from gart_map_sg() # xen: swiotlb: return error code from xen_swiotlb_map_sg() # parisc: return error code from .map_sg() ops # sparc/iommu: don't set failed sg dma_address to DMA_MAPPING_ERROR # sparc/iommu: return error codes from .map_sg() ops # s390/pci: don't set failed sg dma_address to DMA_MAPPING_ERROR # s390/pci: return error code from s390_dma_map_sg() # powerpc/iommu: don't set failed sg dma_address to DMA_MAPPING_ERROR # powerpc/iommu: return error code from .map_sg() ops # ... # < /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 4a3bb4200a5958d76cc26ebe4db4257efa56812b # < make -s -j 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # 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 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:11646:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:11649:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:11651:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:11653:warning: override: reassigning to symbol UML_NET_SLIP .config:11656:warning: override: reassigning to symbol UML_NET_MCAST .config:11658:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/kernel/trace/trace_osnoise.c: In function 'start_kthread': /kisskb/src/kernel/trace/trace_osnoise.c:1515:8: warning: 'main' is usually a function [-Wmain] void *main = osnoise_main; ^ /kisskb/src/drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_probe': /kisskb/src/drivers/video/fbdev/riva/fbdev.c:2062:11: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-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: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-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); ^ /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c: In function 'nvidiafb_probe': /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c:1414:10: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-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: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-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); ^ 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: some warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/dma/idxd/init.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:514: 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: some warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/dma/ioat/dca.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/dma/ioat] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/dma] Error 2 make[2]: *** Waiting for unfinished jobs.... /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: some warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/pci/controller/vmd.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/pci/controller] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/pci] Error 2 /kisskb/src/drivers/tty/synclink_gt.c:442:13: error: conflicting types for 'set_signals' static void set_signals(struct slgt_info *info); ^ In file included from /kisskb/src/include/linux/irqflags.h:16:0, from /kisskb/src/include/linux/spinlock.h:58, from /kisskb/src/include/linux/mm_types.h:9, from /kisskb/src/include/linux/buildid.h:5, from /kisskb/src/include/linux/module.h:14, from /kisskb/src/drivers/tty/synclink_gt.c:46: /kisskb/src/arch/um/include/asm/irqflags.h:6:5: note: previous declaration of 'set_signals' was here int set_signals(int enable); ^ make[3]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/tty/synclink_gt.o] Error 1 make[3]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/gpu/drm/ttm/ttm_module.c: In function 'ttm_prot_from_caching': /kisskb/src/drivers/gpu/drm/ttm/ttm_module.c:59:24: error: 'struct cpuinfo_um' has no member named 'x86' else if (boot_cpu_data.x86 > 3) ^ make[5]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/gpu/drm/ttm/ttm_module.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu/drm/ttm] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/gpu/drm/r128/ati_pcigart.c: In function 'drm_ati_pcigart_init': /kisskb/src/drivers/gpu/drm/r128/ati_pcigart.c:218:2: error: implicit declaration of function 'wbinvd' [-Werror=implicit-function-declaration] wbinvd(); ^ cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/gpu/drm/r128/ati_pcigart.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu/drm/r128] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/tty] Error 2 In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:12, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:25: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/arch/um/include/asm/processor-generic.h:104:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1553:9: note: in expansion of macro 'cpu_data' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1557:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:12, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c:23: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c: In function 'kfd_fill_iolink_info_for_cpu': /kisskb/src/arch/um/include/asm/processor-generic.h:104:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c:1684:27: note: in expansion of macro 'cpu_data' struct cpuinfo_x86 *c = &cpu_data(0); ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c:1687:7: error: dereferencing pointer to incomplete type 'struct cpuinfo_x86' if (c->x86_vendor == X86_VENDOR_AMD) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c:1687:23: error: 'X86_VENDOR_AMD' undeclared (first use in this function) if (c->x86_vendor == X86_VENDOR_AMD) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c:1687:23: note: each undeclared identifier is reported only once for each function it appears in make[5]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu/drm/amd/amdgpu] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1851: drivers] Error 2 make: *** [Makefile:220: __sub-make] Error 2 Command 'make -s -j 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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-allmodconfig_um-x86_64 # Build took: 0:03:15.102917