mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
arm64: kernel: acpi: fix ioremap in ACPI parking protocol cpu_postboot
When secondary cpus are booted through the ACPI parking protocol, the booted cpu should check that FW has correctly cleared its mailbox entry point value to make sure the boot process was correctly executed. The entry point check is carried in the cpu_ops->cpu_postboot method, that is executed by secondary cpus when entering the kernel with irqs disabled. The ACPI parking protocol cpu_ops maps/unmaps the mailboxes on the primary CPU to trigger secondary boot in the cpu_ops->cpu_boot method and on secondary processors to carry out FW checks on the booted CPU to verify the boot protocol was successfully executed in the cpu_ops->cpu_postboot method. Therefore, the cpu_ops->cpu_postboot method is forced to ioremap/unmap the mailboxes, which is wrong in that ioremap cannot be safely be carried out with irqs disabled. To fix this issue, this patch reshuffles the code so that the mailboxes are still mapped after the boot processor executes the cpu_ops->cpu_boot method for a given cpu, and the VA at which a mailbox is mapped for a given cpu is stashed in the per-cpu data struct so that secondary cpus can retrieve them in the cpu_ops->cpu_postboot and complete the required FW checks. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reported-by: Itaru Kitayama <itaru.kitayama@riken.jp> Tested-by: Loc Ho <lho@apm.com> Tested-by: Itaru Kitayama <itaru.kitayama@riken.jp> Cc: Will Deacon <will.deacon@arm.com> Cc: Hanjun Guo <hanjun.guo@linaro.org> Cc: Loc Ho <lho@apm.com> Cc: Itaru Kitayama <itaru.kitayama@riken.jp> Cc: Sudeep Holla <sudeep.holla@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mark Salter <msalter@redhat.com> Cc: Al Stone <ahs3@redhat.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
parent
bf50061844
commit
c1e4659ba8
1 changed files with 14 additions and 26 deletions
|
@ -21,7 +21,14 @@
|
||||||
|
|
||||||
#include <asm/cpu_ops.h>
|
#include <asm/cpu_ops.h>
|
||||||
|
|
||||||
|
struct parking_protocol_mailbox {
|
||||||
|
__le32 cpu_id;
|
||||||
|
__le32 reserved;
|
||||||
|
__le64 entry_point;
|
||||||
|
};
|
||||||
|
|
||||||
struct cpu_mailbox_entry {
|
struct cpu_mailbox_entry {
|
||||||
|
struct parking_protocol_mailbox __iomem *mailbox;
|
||||||
phys_addr_t mailbox_addr;
|
phys_addr_t mailbox_addr;
|
||||||
u8 version;
|
u8 version;
|
||||||
u8 gic_cpu_id;
|
u8 gic_cpu_id;
|
||||||
|
@ -59,12 +66,6 @@ static int acpi_parking_protocol_cpu_prepare(unsigned int cpu)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct parking_protocol_mailbox {
|
|
||||||
__le32 cpu_id;
|
|
||||||
__le32 reserved;
|
|
||||||
__le64 entry_point;
|
|
||||||
};
|
|
||||||
|
|
||||||
static int acpi_parking_protocol_cpu_boot(unsigned int cpu)
|
static int acpi_parking_protocol_cpu_boot(unsigned int cpu)
|
||||||
{
|
{
|
||||||
struct cpu_mailbox_entry *cpu_entry = &cpu_mailbox_entries[cpu];
|
struct cpu_mailbox_entry *cpu_entry = &cpu_mailbox_entries[cpu];
|
||||||
|
@ -96,6 +97,12 @@ static int acpi_parking_protocol_cpu_boot(unsigned int cpu)
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* stash the mailbox address mapping to use it for further FW
|
||||||
|
* checks in the postboot method
|
||||||
|
*/
|
||||||
|
cpu_entry->mailbox = mailbox;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We write the entry point and cpu id as LE regardless of the
|
* We write the entry point and cpu id as LE regardless of the
|
||||||
* native endianness of the kernel. Therefore, any boot-loaders
|
* native endianness of the kernel. Therefore, any boot-loaders
|
||||||
|
@ -107,8 +114,6 @@ static int acpi_parking_protocol_cpu_boot(unsigned int cpu)
|
||||||
|
|
||||||
arch_send_wakeup_ipi_mask(cpumask_of(cpu));
|
arch_send_wakeup_ipi_mask(cpumask_of(cpu));
|
||||||
|
|
||||||
iounmap(mailbox);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -116,32 +121,15 @@ static void acpi_parking_protocol_cpu_postboot(void)
|
||||||
{
|
{
|
||||||
int cpu = smp_processor_id();
|
int cpu = smp_processor_id();
|
||||||
struct cpu_mailbox_entry *cpu_entry = &cpu_mailbox_entries[cpu];
|
struct cpu_mailbox_entry *cpu_entry = &cpu_mailbox_entries[cpu];
|
||||||
struct parking_protocol_mailbox __iomem *mailbox;
|
struct parking_protocol_mailbox __iomem *mailbox = cpu_entry->mailbox;
|
||||||
__le64 entry_point;
|
__le64 entry_point;
|
||||||
|
|
||||||
/*
|
|
||||||
* Map mailbox memory with attribute device nGnRE (ie ioremap -
|
|
||||||
* this deviates from the parking protocol specifications since
|
|
||||||
* the mailboxes are required to be mapped nGnRnE; the attribute
|
|
||||||
* discrepancy is harmless insofar as the protocol specification
|
|
||||||
* is concerned).
|
|
||||||
* If the mailbox is mistakenly allocated in the linear mapping
|
|
||||||
* by FW ioremap will fail since the mapping will be prevented
|
|
||||||
* by the kernel (it clashes with the linear mapping attributes
|
|
||||||
* specifications).
|
|
||||||
*/
|
|
||||||
mailbox = ioremap(cpu_entry->mailbox_addr, sizeof(*mailbox));
|
|
||||||
if (!mailbox)
|
|
||||||
return;
|
|
||||||
|
|
||||||
entry_point = readl_relaxed(&mailbox->entry_point);
|
entry_point = readl_relaxed(&mailbox->entry_point);
|
||||||
/*
|
/*
|
||||||
* Check if firmware has cleared the entry_point as expected
|
* Check if firmware has cleared the entry_point as expected
|
||||||
* by the protocol specification.
|
* by the protocol specification.
|
||||||
*/
|
*/
|
||||||
WARN_ON(entry_point);
|
WARN_ON(entry_point);
|
||||||
|
|
||||||
iounmap(mailbox);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct cpu_operations acpi_parking_protocol_ops = {
|
const struct cpu_operations acpi_parking_protocol_ops = {
|
||||||
|
|
Loading…
Reference in a new issue