From: hanjun.guo@linaro•org (Hanjun Guo)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v3 10/17] ACPI / processor: Make it possible to get CPU hardware ID via GICC
Date: Mon, 08 Sep 2014 21:10:57 +0800 [thread overview]
Message-ID: <540DAAE1.9040201@linaro.org> (raw)
In-Reply-To: <20140903162739.GF1824@e102568-lin.cambridge.arm.com>
On 2014?09?04? 00:27, Lorenzo Pieralisi wrote:
> Hi Hanjun,
Hi Lorenzo,
Sorry for the late reply, some comments below.
>
> On Mon, Sep 01, 2014 at 03:57:48PM +0100, Hanjun Guo wrote:
>> Introduce a new function map_gicc_mpidr() to allow MPIDRs to be obtained
>> from the GICC Structure introduced by ACPI 5.1.
>>
>> MPIDR is the CPU hardware ID as local APIC ID on x86 platform, so we use
>> MPIDR not the GIC CPU interface ID to identify CPUs.
>>
>> Signed-off-by: Hanjun Guo <hanjun.guo@linaro•org>
>> ---
>> arch/arm64/include/asm/acpi.h | 32 ++++++++++++++++++++++++++++++++
>> arch/arm64/kernel/acpi.c | 1 -
>> drivers/acpi/processor_core.c | 37 +++++++++++++++++++++++++++++++++++++
>> 3 files changed, 69 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h
>> index e013dbb..a867467 100644
>> --- a/arch/arm64/include/asm/acpi.h
>> +++ b/arch/arm64/include/asm/acpi.h
>> @@ -12,6 +12,8 @@
>> #ifndef _ASM_ACPI_H
>> #define _ASM_ACPI_H
>>
>> +#include <asm/smp_plat.h>
>> +
>> /* Basic configuration for ACPI */
>> #ifdef CONFIG_ACPI
>> #define acpi_strict 1 /* No out-of-spec workarounds on ARM64 */
>> @@ -38,6 +40,36 @@ static inline void disable_acpi(void)
>> acpi_noirq = 1;
>> }
>>
>> +/* MPIDR value provided in GICC structure is 64 bits, but
>> + * the acpi processor driver use the 32 bits cpu hardware
>> + * ID (apic_id on intel platform) everywhere, it is pretty
>> + * hard to modify the acpi processor driver to accept the
>> + * 64 bits MPIDR value, at the same time, only 32 bits of
>> + * the MPIDR is used in the 64 bits MPIDR, just pack the
>> + * Affx fields into a single 32 bit identifier to accommodate
>> + * the acpi processor drivers.
>> + */
> I have comments on the code in this patch, but they are not the most
> important point. What I am really worried about, it is that as ARM,
> I do not want to know what an apic_id is. This code is *supposed* to be
> generic and yet it is chock-full of x86 specific stuff and you are
> trying to make ARM HW concepts fit with x86 ones, and I am not happy
> with that.
apic_id actually represents unique cpu hardware id in MADT to identify
a CPU for x86 and ia64, it was introduced before ACPI supports ARM
platform, when ARM was introduced to ACPI, it needs some updates as
you said.
>
> To be clearer, why does not this look-up of:
>
> logical-cpu-index -> physical-cpu-index
>
> is not carried out using the acpi_id ? Every architecture will have to
> add arch specific code to carry out the reverse look-up:
>
> acpi_id -> apic_id (x86)
> acpi_id -> mpidr_el1 (arm64)
>
> and the code would end up being split in a nice way. On top of that, I wonder
> why ACPI structures like eg struct acpi_processor contain x86 specific
> data (ie apic_id). I know it is a HW identifier as the MPIDR_EL1 is on
> arm64, but I do not want to deal with that in generic ACPI code because
> that's not generic at ALL.
As I said above, apic_id is cpu hardware id in MADT, its name is
x86 specific now, but meaning behind the name is not x86 specific,
we can rename it as physid or cpu_hw_id, and then will be generic.
Rafael, is it ok to you to rename apic_id to physid or cpu_hw_id in
ACPI core for the reason above?
>
> What if another architecture wants to use ACPI ? Are we going to map its
> HW CPU identifier to an apic_id only because that's what x86 requires ?
>
> I am sorry I do not like that. I understand it is easier to map ARM code
> to existing ACPI structures but I feel we will run into issues very soon
> because of that.
>
> Is it that complex to remove the apic_id dependency in *generic* ACPI
> code and replace it with functions that hook into arch specific code to
> carry out the logical to physical cpu mappings ?
Yes, I think there is no easy way to fix that, the main reason is
that MPIDR for ARM64 is 64bit, and apic_id for x86 and ia64 is no
more than 32bit.
thanks
Hanjun
>
> I understand this is harder to do, but it will make your life easier
> in the long run. I am thinking of other pieces of code like the
> supposedly generic ACPI CPUidle driver, where we *still* depend on the apic
> to detect idle states, this is not going to fly, I am sorry, we need to
> have code that has a chance to be generic from the beginning not as an
> afterthought.
>
> Lorenzo
>
>> +static inline u32 pack_mpidr_into_32_bits(u64 mpidr)
>> +{
>> + /*
>> + * Bits [0:7] Aff0;
>> + * Bits [8:15] Aff1;
>> + * Bits [16:23] Aff2;
>> + * Bits [32:39] Aff3;
>> + */
>> + return (u32) ((mpidr & 0xff00000000) >> 8) | mpidr;
>> +}
>> +
>> +/*
>> + * The ACPI processor driver for ACPI core code needs this macro
>> + * to find out this cpu was already mapped (mapping from CPU hardware
>> + * ID to CPU logical ID) or not.
>> + *
>> + * cpu_logical_map(cpu) is the mapping of MPIDR and the logical cpu,
>> + * and MPIDR is the cpu hardware ID we needed to pack.
>> + */
>> +#define cpu_physical_id(cpu) pack_mpidr_into_32_bits(cpu_logical_map(cpu))
>> +
>> /*
>> * It's used from ACPI core in kdump to boot UP system with SMP kernel,
>> * with this check the ACPI core will not override the CPU index
>> diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
>> index fbaaf01..35dff11 100644
>> --- a/arch/arm64/kernel/acpi.c
>> +++ b/arch/arm64/kernel/acpi.c
>> @@ -24,7 +24,6 @@
>> #include <linux/bootmem.h>
>> #include <linux/smp.h>
>>
>> -#include <asm/smp_plat.h>
>> #include <asm/cputype.h>
>> #include <asm/cpu_ops.h>
>>
>> diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
>> index e32321c..4007313 100644
>> --- a/drivers/acpi/processor_core.c
>> +++ b/drivers/acpi/processor_core.c
>> @@ -64,6 +64,38 @@ static int map_lsapic_id(struct acpi_subtable_header *entry,
>> return 0;
>> }
>>
>> +/*
>> + * On ARM platform, MPIDR value is the hardware ID as apic ID
>> + * on Intel platforms
>> + */
>> +static int map_gicc_mpidr(struct acpi_subtable_header *entry,
>> + int device_declaration, u32 acpi_id, int *mpidr)
>> +{
>> + struct acpi_madt_generic_interrupt *gicc =
>> + container_of(entry, struct acpi_madt_generic_interrupt, header);
>> +
>> + if (!(gicc->flags & ACPI_MADT_ENABLED))
>> + return -ENODEV;
>> +
>> + /* In the GIC interrupt model, logical processors are
>> + * required to have a Processor Device object in the DSDT,
>> + * so we should check device_declaration here
>> + */
>> + if (device_declaration && (gicc->uid == acpi_id)) {
>> + /*
>> + * Only bits [0:7] Aff0, bits [8:15] Aff1, bits [16:23] Aff2
>> + * and bits [32:39] Aff3 are meaningful, so pack the Affx
>> + * fields into a single 32 bit identifier to accommodate the
>> + * acpi processor drivers.
>> + */
>> + *mpidr = ((gicc->arm_mpidr & 0xff00000000) >> 8)
>> + | gicc->arm_mpidr;
>> + return 0;
>> + }
>> +
>> + return -EINVAL;
>> +}
>> +
>> static int map_madt_entry(int type, u32 acpi_id)
>> {
>> unsigned long madt_end, entry;
>> @@ -99,6 +131,9 @@ static int map_madt_entry(int type, u32 acpi_id)
>> } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
>> if (!map_lsapic_id(header, type, acpi_id, &apic_id))
>> break;
>> + } else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) {
>> + if (!map_gicc_mpidr(header, type, acpi_id, &apic_id))
>> + break;
>> }
>> entry += header->length;
>> }
>> @@ -131,6 +166,8 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id)
>> map_lsapic_id(header, type, acpi_id, &apic_id);
>> } else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) {
>> map_x2apic_id(header, type, acpi_id, &apic_id);
>> + } else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) {
>> + map_gicc_mpidr(header, type, acpi_id, &apic_id);
>> }
>>
>> exit:
>> --
>> 1.7.9.5
>>
>>
next prev parent reply other threads:[~2014-09-08 13:10 UTC|newest]
Thread overview: 117+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-01 14:57 [PATCH v3 00/17] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 01/17] ARM64: Move the init of cpu_logical_map(0) before unflatten_device_tree() Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 02/17] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2014-09-09 16:26 ` Catalin Marinas
2014-09-09 16:41 ` Jon Masters
2014-09-09 16:44 ` Jon Masters
2014-09-09 17:15 ` Mark Rutland
2014-09-09 17:33 ` Jon Masters
2014-09-09 17:50 ` Lorenzo Pieralisi
2014-09-09 18:05 ` Sudeep Holla
2014-09-09 19:06 ` Jon Masters
2014-09-10 11:13 ` Hanjun Guo
2014-09-10 12:33 ` Catalin Marinas
2014-09-10 21:51 ` Grant Likely
2014-09-11 11:01 ` Catalin Marinas
2014-09-14 15:40 ` Grant Likely
2014-09-14 21:59 ` Catalin Marinas
2014-09-15 3:53 ` Grant Likely
2014-09-16 5:29 ` Zheng, Lv
2014-09-10 21:41 ` Grant Likely
2014-09-09 16:54 ` Mark Rutland
2014-09-10 7:30 ` Hanjun Guo
2014-09-10 21:37 ` Grant Likely
2014-09-01 14:57 ` [PATCH v3 03/17] ARM64 / ACPI: Introduce lowlevel suspend function Hanjun Guo
2014-09-09 16:35 ` Catalin Marinas
2014-09-09 22:04 ` Graeme Gregory
2014-09-01 14:57 ` [PATCH v3 04/17] ARM64 / ACPI: Introduce early_param for "acpi" Hanjun Guo
2014-09-09 16:37 ` Catalin Marinas
2014-09-09 17:17 ` Bjorn Helgaas
2014-09-09 22:14 ` Jon Masters
2014-09-10 13:04 ` Will Deacon
2014-09-10 13:21 ` Bjorn Helgaas
2014-09-10 18:30 ` Will Deacon
2014-09-10 21:58 ` Grant Likely
2014-09-01 14:57 ` [PATCH v3 05/17] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 06/17] ARM64 / ACPI: Make PCI optional for ACPI on ARM64 Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 07/17] ARM64 / ACPI: Parse FADT table to get PSCI flags for PSCI init Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 08/17] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 09/17] ARM64 / ACPI: Parse MADT for SMP initialization Hanjun Guo
2014-09-03 17:21 ` Lorenzo Pieralisi
2014-09-04 15:29 ` Hanjun Guo
2014-09-09 4:29 ` Jon Masters
2014-09-09 5:11 ` Hanjun Guo
2014-09-09 5:34 ` Jon Masters
2014-09-09 16:52 ` Lorenzo Pieralisi
2014-09-09 17:00 ` Jon Masters
2014-09-09 17:02 ` Jon Masters
2014-09-09 4:23 ` Jon Masters
2014-09-09 4:57 ` Hanjun Guo
2014-09-09 5:44 ` Jon Masters
2014-09-09 16:00 ` Hanjun Guo
2014-09-09 16:04 ` Jon Masters
2014-09-09 16:14 ` Hanjun Guo
2014-09-11 14:15 ` Will Deacon
2014-09-12 21:30 ` Jon Masters
2014-09-11 10:24 ` Grant Likely
2014-09-01 14:57 ` [PATCH v3 10/17] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2014-09-03 16:27 ` Lorenzo Pieralisi
2014-09-08 13:10 ` Hanjun Guo [this message]
2014-09-01 14:57 ` [PATCH v3 11/17] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Hanjun Guo
2014-09-11 11:08 ` Grant Likely
2014-09-11 11:34 ` Grant Likely
2014-09-12 9:42 ` Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 12/17] ACPI / table: Add new function to get table entries Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 13/17] ARM64 / ACPI: Add GICv2 specific ACPI boot support Hanjun Guo
2014-09-01 17:35 ` Marc Zyngier
2014-09-02 8:28 ` [Linaro-acpi] " Alexander Spyridakis
2014-09-02 11:48 ` Tomasz Nowicki
2014-09-02 13:02 ` Marc Zyngier
2014-09-02 15:45 ` Hanjun Guo
2014-09-02 15:59 ` Marc Zyngier
2014-09-02 16:11 ` Sudeep Holla
2014-09-03 10:30 ` Marc Zyngier
2014-09-03 11:17 ` Hanjun Guo
2014-09-04 14:03 ` Hanjun Guo
2014-09-09 6:21 ` Jon Masters
2014-09-03 9:26 ` Tomasz Nowicki
2014-09-03 14:57 ` Arnd Bergmann
2014-09-05 8:52 ` Tomasz Nowicki
2014-09-05 9:47 ` Marc Zyngier
2014-09-05 10:13 ` [Linaro-acpi] " Arnd Bergmann
2014-09-05 10:36 ` Tomasz Nowicki
2014-09-05 10:39 ` Marc Zyngier
2014-09-05 10:49 ` Tomasz Nowicki
2014-09-09 6:27 ` Jon Masters
2014-09-11 13:43 ` Grant Likely
2014-09-02 16:34 ` Catalin Marinas
2014-09-11 11:48 ` Grant Likely
2014-09-11 12:01 ` Marc Zyngier
2014-09-09 6:14 ` Jon Masters
2014-09-03 18:42 ` Arnd Bergmann
2014-09-04 10:10 ` Tomasz Nowicki
2014-09-04 10:14 ` Arnd Bergmann
2014-09-04 10:39 ` Tomasz Nowicki
2014-09-09 6:35 ` Jon Masters
2014-09-01 14:57 ` [PATCH v3 14/17] ARM64 / ACPI: Parse GTDT to initialize arch timer Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 15/17] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 16/17] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2014-09-11 15:18 ` Lorenzo Pieralisi
2014-09-01 14:57 ` [PATCH v3 17/17] Documentation: ACPI for ARM64 Hanjun Guo
2014-09-11 13:29 ` [PATCH v3 00/17] Introduce ACPI for ARM64 based on ACPI 5.1 Grant Likely
2014-09-11 13:49 ` Will Deacon
2014-09-12 21:38 ` Jon Masters
2014-09-12 21:43 ` Jon Masters
2014-09-15 4:21 ` Grant Likely
2014-09-11 14:23 ` Rafael J. Wysocki
2014-09-11 14:04 ` Grant Likely
2014-09-11 15:37 ` Catalin Marinas
2014-09-11 15:57 ` Sudeep Holla
2014-09-11 16:06 ` Graeme Gregory
2014-09-11 16:14 ` Sudeep Holla
2014-09-15 4:31 ` Grant Likely
2014-09-15 9:15 ` Catalin Marinas
2014-09-15 22:48 ` Grant Likely
2014-09-16 10:12 ` Catalin Marinas
2014-09-11 16:05 ` Olof Johansson
2014-09-15 4:37 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=540DAAE1.9040201@linaro.org \
--to=hanjun.guo@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox