Commit c5a13305 authored by Mark Rutland's avatar Mark Rutland
Browse files

arm64: psci: remove ACPI coupling 



The 32-bit ARM port doesn't have ACPI headers, and conditionally
including them is going to look horrendous. In preparation for sharing
the PSCI invocation code with 32-bit, move the acpi_psci_* function
declarations and definitions such that the PSCI client code need not
include ACPI headers.

While it would seem like we could simply hide the ACPI includes in
psci.h, the ACPI headers have hilarious circular dependencies which make
this infeasible without reorganising most of ACPICA. So rather than
doing that, move the acpi_psci_* prototypes into psci.h.

The psci_acpi_init function is made dependent on CONFIG_ACPI (with a
stub implementation in asm/psci.h) such that it need not be built for
32-bit ARM or kernels without ACPI support. The currently missing __init
annotations are added to the prototypes in the header.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Reviewed-by: default avatarAl Stone <al.stone@linaro.org>
Reviewed-by: default avatarAshwin Chaugule <ashwin.chaugule@linaro.org>
Tested-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
parent c8cc4273

arch/arm64/include/asm/acpi.h

+1 −14
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/irqchip/arm-gic-acpi.h>



#include <asm/cputype.h>

#include <asm/psci.h>

#include <asm/smp_plat.h>



/* Basic configuration for ACPI */
@@ -39,18 +40,6 @@ extern int acpi_disabled; 
extern int acpi_noirq;

extern int acpi_pci_disabled;



/* 1 to indicate PSCI 0.2+ is implemented */

static inline bool acpi_psci_present(void)

{

	return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_COMPLIANT;

}



/* 1 to indicate HVC must be used instead of SMC as the PSCI conduit */

static inline bool acpi_psci_use_hvc(void)

{

	return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_USE_HVC;

}



static inline void disable_acpi(void)

{

	acpi_disabled = 1;
@@ -88,8 +77,6 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) { } 
void __init acpi_init_cpus(void);



#else

static inline bool acpi_psci_present(void) { return false; }

static inline bool acpi_psci_use_hvc(void) { return false; }

static inline void acpi_init_cpus(void) { }

#endif /* CONFIG_ACPI */

arch/arm64/include/asm/psci.h

+10 −2
Original line number Diff line number Diff line
@@ -14,7 +14,15 @@ 
#ifndef __ASM_PSCI_H

#define __ASM_PSCI_H



int psci_dt_init(void);

int psci_acpi_init(void);

int __init psci_dt_init(void);



#ifdef CONFIG_ACPI

int __init psci_acpi_init(void);

bool __init acpi_psci_present(void);

bool __init acpi_psci_use_hvc(void);

#else

static inline int psci_acpi_init(void) { return 0; }

static inline bool acpi_psci_present(void) { return false; }

#endif



#endif /* __ASM_PSCI_H */

arch/arm64/kernel/acpi.c

+11 −0
Original line number Diff line number Diff line
@@ -89,6 +89,17 @@ void __init __acpi_unmap_table(char *map, unsigned long size) 
	early_memunmap(map, size);

}



bool __init acpi_psci_present(void)

{

	return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_COMPLIANT;

}



/* Whether HVC must be used instead of SMC as the PSCI conduit */

bool __init acpi_psci_use_hvc(void)

{

	return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_USE_HVC;

}



/*

 * acpi_fadt_sanity_check() - Check FADT presence and carry out sanity

 *			      checks on it

arch/arm64/kernel/psci.c

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 


#define pr_fmt(fmt) "psci: " fmt



#include <linux/acpi.h>

#include <linux/init.h>

#include <linux/of.h>

#include <linux/smp.h>
@@ -25,7 +24,6 @@ 
#include <linux/slab.h>

#include <uapi/linux/psci.h>



#include <asm/acpi.h>

#include <asm/compiler.h>

#include <asm/cputype.h>

#include <asm/cpu_ops.h>
@@ -446,6 +444,7 @@ int __init psci_dt_init(void) 
	return init_fn(np);

}



#ifdef CONFIG_ACPI

/*

 * We use PSCI 0.2+ when ACPI is deployed on ARM64 and it's

 * explicitly clarified in SBBR
@@ -466,6 +465,7 @@ int __init psci_acpi_init(void) 


	return psci_probe();

}

#endif



#ifdef CONFIG_SMP

CRA Git | Maintained and supported by SUSTech CRA and CCSE