Commit 46d60bdb authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman

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: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/11956ec181a034b51a881ac9c059eea72c679a73.1651828453.git.christophe.leroy@csgroup.eu
parent ab8bca92
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_POWERPC_BOOK3S_64_HUGETLB_H #ifndef _ASM_POWERPC_BOOK3S_64_HUGETLB_H
#define _ASM_POWERPC_BOOK3S_64_HUGETLB_H #define _ASM_POWERPC_BOOK3S_64_HUGETLB_H
#include <asm/firmware.h>
/* /*
* For radix we want generic code to handle hugetlb. But then if we want * For radix we want generic code to handle hugetlb. But then if we want
* both hash and radix to be enabled together we need to workaround the * both hash and radix to be enabled together we need to workaround the
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <asm/div64.h> #include <asm/div64.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/param.h> #include <asm/param.h>
#include <asm/firmware.h>
typedef u64 __nocast cputime_t; typedef u64 __nocast cputime_t;
typedef u64 __nocast cputime64_t; typedef u64 __nocast cputime64_t;
......
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
#include <linux/context_tracking.h> #include <linux/context_tracking.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <asm/cputime.h> #include <asm/cputime.h>
#include <asm/firmware.h>
#include <asm/ftrace.h> #include <asm/ftrace.h>
#include <asm/kprobes.h> #include <asm/kprobes.h>
#include <asm/runlatch.h> #include <asm/runlatch.h>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/pkeys.h> #include <linux/pkeys.h>
#include <asm/cpu_has_feature.h> #include <asm/cpu_has_feature.h>
#include <asm/firmware.h>
static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot,
unsigned long pkey) unsigned long pkey)
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <asm/firmware.h>
/* These includes should be removed once implicit includes are cleaned up. */ /* These includes should be removed once implicit includes are cleaned up. */
#include <linux/of.h> #include <linux/of.h>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/firmware.h>
bool dawr_force_enable; bool dawr_force_enable;
EXPORT_SYMBOL_GPL(dawr_force_enable); EXPORT_SYMBOL_GPL(dawr_force_enable);
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/firmware.h>
void machine_kexec_mask_interrupts(void) { void machine_kexec_mask_interrupts(void) {
unsigned int i; unsigned int i;
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <asm/ultravisor.h> #include <asm/ultravisor.h>
#include <asm/kvm_book3s_uvmem.h> #include <asm/kvm_book3s_uvmem.h>
#include <asm/plpar_wrappers.h> #include <asm/plpar_wrappers.h>
#include <asm/firmware.h>
/* /*
* Supported radix tree geometry. * Supported radix tree geometry.
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <asm/pte-walk.h> #include <asm/pte-walk.h>
#include <asm/reg.h> #include <asm/reg.h>
#include <asm/plpar_wrappers.h> #include <asm/plpar_wrappers.h>
#include <asm/firmware.h>
static struct patb_entry *pseries_partition_tb; static struct patb_entry *pseries_partition_tb;
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/tlb.h> #include <asm/tlb.h>
#include <asm/firmware.h>
#include <mm/mmu_decl.h> #include <mm/mmu_decl.h>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/firmware.h>
#include <linux/pkeys.h> #include <linux/pkeys.h>
#include <linux/of_fdt.h> #include <linux/of_fdt.h>
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/hugetlb.h> #include <asm/hugetlb.h>
#include <asm/pte-walk.h> #include <asm/pte-walk.h>
#include <asm/firmware.h>
bool hugetlb_disabled = false; bool hugetlb_disabled = false;
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/firmware.h>
#include "pseries.h" #include "pseries.h"
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/plpar_wrappers.h> #include <asm/plpar_wrappers.h>
#include <asm/firmware.h>
#include <asm/vas.h> #include <asm/vas.h>
#include "vas.h" #include "vas.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment