Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: Include asm/firmware.h in all users of firmware_has_feature()

Trying to remove asm/ppc_asm.h from all places that don't need it
leads to several failures linked to firmware_has_feature().

To fix it, include asm/firmware.h in all files using
firmware_has_feature()

All users found with:

git grep -L "firmware\.h" ` git grep -l "firmware_has_feature("`

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/11956ec181a034b51a881ac9c059eea72c679a73.1651828453.git.christophe.leroy@csgroup.eu

authored by

Christophe Leroy and committed by
Michael Ellerman
46d60bdb ab8bca92

+16
+3
arch/powerpc/include/asm/book3s/64/hugetlb.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 2 #ifndef _ASM_POWERPC_BOOK3S_64_HUGETLB_H 3 3 #define _ASM_POWERPC_BOOK3S_64_HUGETLB_H 4 + 5 + #include <asm/firmware.h> 6 + 4 7 /* 5 8 * For radix we want generic code to handle hugetlb. But then if we want 6 9 * both hash and radix to be enabled together we need to workaround the
+1
arch/powerpc/include/asm/cputime.h
··· 19 19 #include <asm/div64.h> 20 20 #include <asm/time.h> 21 21 #include <asm/param.h> 22 + #include <asm/firmware.h> 22 23 23 24 typedef u64 __nocast cputime_t; 24 25 typedef u64 __nocast cputime64_t;
+1
arch/powerpc/include/asm/interrupt.h
··· 69 69 #include <linux/context_tracking.h> 70 70 #include <linux/hardirq.h> 71 71 #include <asm/cputime.h> 72 + #include <asm/firmware.h> 72 73 #include <asm/ftrace.h> 73 74 #include <asm/kprobes.h> 74 75 #include <asm/runlatch.h>
+1
arch/powerpc/include/asm/mman.h
··· 12 12 #include <linux/mm.h> 13 13 #include <linux/pkeys.h> 14 14 #include <asm/cpu_has_feature.h> 15 + #include <asm/firmware.h> 15 16 16 17 static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, 17 18 unsigned long pkey)
+1
arch/powerpc/include/asm/prom.h
··· 14 14 #include <linux/types.h> 15 15 #include <asm/irq.h> 16 16 #include <linux/atomic.h> 17 + #include <asm/firmware.h> 17 18 18 19 /* These includes should be removed once implicit includes are cleaned up. */ 19 20 #include <linux/of.h>
+1
arch/powerpc/kernel/dawr.c
··· 11 11 #include <linux/debugfs.h> 12 12 #include <asm/machdep.h> 13 13 #include <asm/hvcall.h> 14 + #include <asm/firmware.h> 14 15 15 16 bool dawr_force_enable; 16 17 EXPORT_SYMBOL_GPL(dawr_force_enable);
+1
arch/powerpc/kexec/core.c
··· 20 20 #include <asm/pgalloc.h> 21 21 #include <asm/sections.h> 22 22 #include <asm/setup.h> 23 + #include <asm/firmware.h> 23 24 24 25 void machine_kexec_mask_interrupts(void) { 25 26 unsigned int i;
+1
arch/powerpc/kvm/book3s_64_mmu_radix.c
··· 22 22 #include <asm/ultravisor.h> 23 23 #include <asm/kvm_book3s_uvmem.h> 24 24 #include <asm/plpar_wrappers.h> 25 + #include <asm/firmware.h> 25 26 26 27 /* 27 28 * Supported radix tree geometry.
+1
arch/powerpc/kvm/book3s_hv_nested.c
··· 20 20 #include <asm/pte-walk.h> 21 21 #include <asm/reg.h> 22 22 #include <asm/plpar_wrappers.h> 23 + #include <asm/firmware.h> 23 24 24 25 static struct patb_entry *pseries_partition_tb; 25 26
+1
arch/powerpc/mm/book3s64/hash_pgtable.c
··· 13 13 #include <asm/sections.h> 14 14 #include <asm/mmu.h> 15 15 #include <asm/tlb.h> 16 + #include <asm/firmware.h> 16 17 17 18 #include <mm/mmu_decl.h> 18 19
+1
arch/powerpc/mm/book3s64/pkeys.c
··· 10 10 #include <asm/mmu.h> 11 11 #include <asm/setup.h> 12 12 #include <asm/smp.h> 13 + #include <asm/firmware.h> 13 14 14 15 #include <linux/pkeys.h> 15 16 #include <linux/of_fdt.h>
+1
arch/powerpc/mm/hugetlbpage.c
··· 24 24 #include <asm/setup.h> 25 25 #include <asm/hugetlb.h> 26 26 #include <asm/pte-walk.h> 27 + #include <asm/firmware.h> 27 28 28 29 bool hugetlb_disabled = false; 29 30
+1
arch/powerpc/platforms/pseries/papr_platform_attributes.c
··· 22 22 23 23 #include <asm/hvcall.h> 24 24 #include <asm/machdep.h> 25 + #include <asm/firmware.h> 25 26 26 27 #include "pseries.h" 27 28
+1
arch/powerpc/platforms/pseries/vas.c
··· 16 16 #include <asm/machdep.h> 17 17 #include <asm/hvcall.h> 18 18 #include <asm/plpar_wrappers.h> 19 + #include <asm/firmware.h> 19 20 #include <asm/vas.h> 20 21 #include "vas.h" 21 22