From: Sunil V L <sunilvl@ventanamicro.com> To: Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, "Rafael J . Wysocki" <rafael@kernel.org>, Len Brown <lenb@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, Marc Zyngier <maz@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Jonathan Corbet <corbet@lwn.net> Cc: linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Anup Patel <apatel@ventanamicro.com>, Andrew Jones <ajones@ventanamicro.com>, Atish Patra <atishp@rivosinc.com>, Sunil V L <sunilvl@ventanamicro.com> Subject: [PATCH 10/24] ACPI: processor_core: RISC-V: Enable mapping processor to the hartid Date: Mon, 30 Jan 2023 23:52:11 +0530 [thread overview] Message-ID: <20230130182225.2471414-11-sunilvl@ventanamicro.com> (raw) In-Reply-To: <20230130182225.2471414-1-sunilvl@ventanamicro.com> processor_core needs arch specific functions to map the ACPI ID to the physical ID. In RISC-V platforms, hartid is the physical id and RINTC structure in MADT provides this mapping. Add arch specific function to get this mapping from RINTC. Signed-off-by: Sunil V L <sunilvl@ventanamicro.com> --- arch/riscv/include/asm/acpi.h | 3 +++ drivers/acpi/processor_core.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/arch/riscv/include/asm/acpi.h b/arch/riscv/include/asm/acpi.h index 8b9babaf3f25..c5cb9f96d404 100644 --- a/arch/riscv/include/asm/acpi.h +++ b/arch/riscv/include/asm/acpi.h @@ -15,6 +15,9 @@ /* Basic configuration for ACPI */ #ifdef CONFIG_ACPI +typedef u64 phys_cpuid_t; +#define PHYS_CPUID_INVALID INVALID_HARTID + /* ACPI table mapping after acpi_permanent_mmap is set */ void *acpi_os_ioremap(acpi_physical_address phys, acpi_size size); #define acpi_os_ioremap acpi_os_ioremap diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 2ac48cda5b20..889f495b3481 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -106,6 +106,31 @@ static int map_gicc_mpidr(struct acpi_subtable_header *entry, return -EINVAL; } +/* + * Retrieve the RISC-V hartid for the processor + */ +static int map_rintc_hartid(struct acpi_subtable_header *entry, + int device_declaration, u32 acpi_id, phys_cpuid_t *hartid) +{ + struct acpi_madt_rintc *rintc = + container_of(entry, struct acpi_madt_rintc, header); + + if (!(rintc->flags & ACPI_MADT_ENABLED)) + return -ENODEV; + + /* device_declaration means Device object in DSDT, in the + * RISC-V, logical processors are required to + * have a Processor Device object in the DSDT, so we should + * check device_declaration here + */ + if (device_declaration && (rintc->uid == acpi_id)) { + *hartid = rintc->hart_id; + return 0; + } + + return -EINVAL; +} + static phys_cpuid_t map_madt_entry(struct acpi_table_madt *madt, int type, u32 acpi_id) { @@ -136,6 +161,9 @@ static phys_cpuid_t map_madt_entry(struct acpi_table_madt *madt, } else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) { if (!map_gicc_mpidr(header, type, acpi_id, &phys_id)) break; + } else if (header->type == ACPI_MADT_TYPE_RINTC) { + if (!map_rintc_hartid(header, type, acpi_id, &phys_id)) + break; } entry += header->length; } -- 2.38.0
WARNING: multiple messages have this Message-ID (diff)
From: Sunil V L <sunilvl@ventanamicro.com> To: Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, "Rafael J . Wysocki" <rafael@kernel.org>, Len Brown <lenb@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, Marc Zyngier <maz@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Jonathan Corbet <corbet@lwn.net> Cc: Anup Patel <apatel@ventanamicro.com>, linux-doc@vger.kernel.org, Atish Patra <atishp@rivosinc.com>, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-riscv@lists.infradead.org, Andrew Jones <ajones@ventanamicro.com> Subject: [PATCH 10/24] ACPI: processor_core: RISC-V: Enable mapping processor to the hartid Date: Mon, 30 Jan 2023 23:52:11 +0530 [thread overview] Message-ID: <20230130182225.2471414-11-sunilvl@ventanamicro.com> (raw) In-Reply-To: <20230130182225.2471414-1-sunilvl@ventanamicro.com> processor_core needs arch specific functions to map the ACPI ID to the physical ID. In RISC-V platforms, hartid is the physical id and RINTC structure in MADT provides this mapping. Add arch specific function to get this mapping from RINTC. Signed-off-by: Sunil V L <sunilvl@ventanamicro.com> --- arch/riscv/include/asm/acpi.h | 3 +++ drivers/acpi/processor_core.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/arch/riscv/include/asm/acpi.h b/arch/riscv/include/asm/acpi.h index 8b9babaf3f25..c5cb9f96d404 100644 --- a/arch/riscv/include/asm/acpi.h +++ b/arch/riscv/include/asm/acpi.h @@ -15,6 +15,9 @@ /* Basic configuration for ACPI */ #ifdef CONFIG_ACPI +typedef u64 phys_cpuid_t; +#define PHYS_CPUID_INVALID INVALID_HARTID + /* ACPI table mapping after acpi_permanent_mmap is set */ void *acpi_os_ioremap(acpi_physical_address phys, acpi_size size); #define acpi_os_ioremap acpi_os_ioremap diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 2ac48cda5b20..889f495b3481 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -106,6 +106,31 @@ static int map_gicc_mpidr(struct acpi_subtable_header *entry, return -EINVAL; } +/* + * Retrieve the RISC-V hartid for the processor + */ +static int map_rintc_hartid(struct acpi_subtable_header *entry, + int device_declaration, u32 acpi_id, phys_cpuid_t *hartid) +{ + struct acpi_madt_rintc *rintc = + container_of(entry, struct acpi_madt_rintc, header); + + if (!(rintc->flags & ACPI_MADT_ENABLED)) + return -ENODEV; + + /* device_declaration means Device object in DSDT, in the + * RISC-V, logical processors are required to + * have a Processor Device object in the DSDT, so we should + * check device_declaration here + */ + if (device_declaration && (rintc->uid == acpi_id)) { + *hartid = rintc->hart_id; + return 0; + } + + return -EINVAL; +} + static phys_cpuid_t map_madt_entry(struct acpi_table_madt *madt, int type, u32 acpi_id) { @@ -136,6 +161,9 @@ static phys_cpuid_t map_madt_entry(struct acpi_table_madt *madt, } else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) { if (!map_gicc_mpidr(header, type, acpi_id, &phys_id)) break; + } else if (header->type == ACPI_MADT_TYPE_RINTC) { + if (!map_rintc_hartid(header, type, acpi_id, &phys_id)) + break; } entry += header->length; } -- 2.38.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2023-01-30 18:24 UTC|newest] Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-01-30 18:22 [PATCH 00/24] Add basic ACPI support for RISC-V Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-01-30 18:22 ` [PATCH 01/24] riscv: move sbi_init() earlier before jump_label_init() Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-01-30 18:22 ` [PATCH 02/24] ACPICA: MADT: Add RISC-V INTC interrupt controller Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-08 19:59 ` Conor Dooley 2023-02-08 19:59 ` Conor Dooley 2023-02-13 5:13 ` Sunil V L 2023-02-13 5:13 ` Sunil V L 2023-01-30 18:22 ` [PATCH 03/24] ACPICA: Add structure definitions for RISC-V RHCT Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-01-30 18:22 ` [PATCH 04/24] RISC-V: ACPI: Add empty headers to enable ACPI core Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-08 19:55 ` Conor Dooley 2023-02-08 19:55 ` Conor Dooley 2023-01-30 18:22 ` [PATCH 05/24] RISC-V: ACPI: Add basic functions to build " Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-08 20:58 ` Conor Dooley 2023-02-08 20:58 ` Conor Dooley 2023-02-13 15:16 ` Sunil V L 2023-02-13 15:16 ` Sunil V L 2023-01-30 18:22 ` [PATCH 06/24] RISC-V: ACPI: Add PCI " Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-08 21:26 ` Conor Dooley 2023-02-08 21:26 ` Conor Dooley 2023-02-13 15:23 ` Sunil V L 2023-02-13 15:23 ` Sunil V L 2023-02-13 17:14 ` Conor Dooley 2023-02-13 17:14 ` Conor Dooley 2023-02-13 17:26 ` Jessica Clarke 2023-02-13 17:26 ` Jessica Clarke 2023-02-14 4:42 ` Sunil V L 2023-02-14 4:42 ` Sunil V L 2023-01-30 18:22 ` [PATCH 07/24] RISC-V: ACPI: Enable ACPI build infrastructure Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-08 21:31 ` Conor Dooley 2023-02-08 21:31 ` Conor Dooley 2023-02-13 15:23 ` Sunil V L 2023-02-13 15:23 ` Sunil V L 2023-01-30 18:22 ` [PATCH 08/24] ACPI: Enable ACPI_PROCESSOR for RISC-V Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-01-30 18:22 ` [PATCH 09/24] ACPI: OSL: Make should_use_kmap() 0 " Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-01-30 18:22 ` Sunil V L [this message] 2023-01-30 18:22 ` [PATCH 10/24] ACPI: processor_core: RISC-V: Enable mapping processor to the hartid Sunil V L 2023-01-30 18:22 ` [PATCH 11/24] RISC-V: ACPI: irqchip/riscv-intc: Add ACPI support Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-01-30 23:38 ` Jessica Clarke 2023-01-30 23:38 ` Jessica Clarke 2023-01-31 9:11 ` Sunil V L 2023-01-31 9:11 ` Sunil V L 2023-02-08 21:49 ` Conor Dooley 2023-02-08 21:49 ` Conor Dooley 2023-02-13 15:25 ` Sunil V L 2023-02-13 15:25 ` Sunil V L 2023-01-30 18:22 ` [PATCH 12/24] RISC-V: ACPI: smpboot: Create wrapper smp_setup() Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-08 21:34 ` Conor Dooley 2023-02-08 21:34 ` Conor Dooley 2023-01-30 18:22 ` [PATCH 13/24] RISC-V: ACPI: smpboot: Add ACPI support in smp_setup() Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-08 22:10 ` Conor Dooley 2023-02-08 22:10 ` Conor Dooley 2023-02-13 15:27 ` Sunil V L 2023-02-13 15:27 ` Sunil V L 2023-01-30 18:22 ` [PATCH 14/24] RISC-V: ACPI: smpboot: Add function to retrieve the hartid Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-09 20:30 ` Conor Dooley 2023-02-09 20:30 ` Conor Dooley 2023-02-13 17:00 ` Sunil V L 2023-02-13 17:00 ` Sunil V L 2023-01-30 18:22 ` [PATCH 15/24] clocksource/timer-riscv: Refactor riscv_timer_init_dt() Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-09 20:54 ` Conor Dooley 2023-02-09 20:54 ` Conor Dooley 2023-02-13 17:22 ` Sunil V L 2023-02-13 17:22 ` Sunil V L 2023-01-30 18:22 ` [PATCH 16/24] RISC-V: ACPI: clocksource/timer-riscv: Add ACPI support Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-09 20:58 ` Conor Dooley 2023-02-09 20:58 ` Conor Dooley 2023-02-13 17:39 ` Sunil V L 2023-02-13 17:39 ` Sunil V L 2023-01-30 18:22 ` [PATCH 17/24] ACPI: RISC-V: drivers/acpi: Add RHCT related code Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-01-30 18:22 ` [PATCH 18/24] RISC-V: ACPI: time.c: Add ACPI support for time_init() Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-01-30 18:22 ` [PATCH 19/24] RISC-V: ACPI: cpufeature: Add ACPI support in riscv_fill_hwcap() Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-09 21:47 ` Conor Dooley 2023-02-09 21:47 ` Conor Dooley 2023-02-13 17:51 ` Sunil V L 2023-02-13 17:51 ` Sunil V L 2023-01-30 18:22 ` [PATCH 20/24] RISC-V: ACPI: cpu: Enable cpuinfo for ACPI systems Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-09 21:13 ` Conor Dooley 2023-02-09 21:13 ` Conor Dooley 2023-02-13 17:42 ` Sunil V L 2023-02-13 17:42 ` Sunil V L 2023-01-30 18:22 ` [PATCH 21/24] RISC-V: ACPI: Add ACPI initialization in setup_arch() Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-09 21:53 ` Conor Dooley 2023-02-09 21:53 ` Conor Dooley 2023-02-13 17:52 ` Sunil V L 2023-02-13 17:52 ` Sunil V L 2023-01-30 18:22 ` [PATCH 22/24] RISC-V: ACPI: Enable ACPI in defconfig Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-01-30 23:47 ` Conor Dooley 2023-01-30 23:47 ` Conor Dooley 2023-01-31 8:41 ` Sunil V L 2023-01-31 8:41 ` Sunil V L 2023-01-30 18:22 ` [PATCH 23/24] MAINTAINERS: Add entry for drivers/acpi/riscv Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-09 21:54 ` Conor Dooley 2023-02-09 21:54 ` Conor Dooley 2023-02-13 17:53 ` Sunil V L 2023-02-13 17:53 ` Sunil V L 2023-01-30 18:22 ` [PATCH 24/24] Documentation/kernel-parameters.txt: Add RISC-V for ACPI parameter Sunil V L 2023-01-30 18:22 ` Sunil V L 2023-02-09 2:02 ` Bagas Sanjaya 2023-02-09 2:02 ` Bagas Sanjaya 2023-02-13 15:29 ` Sunil V L 2023-02-13 15:29 ` Sunil V L 2023-01-30 19:11 ` [PATCH 00/24] Add basic ACPI support for RISC-V Rafael J. Wysocki 2023-01-30 19:11 ` Rafael J. Wysocki 2023-02-08 18:28 ` Conor Dooley 2023-02-08 18:28 ` Conor Dooley 2023-02-08 18:50 ` Conor Dooley 2023-02-08 18:50 ` Conor Dooley 2023-02-13 4:51 ` Sunil V L 2023-02-13 4:51 ` Sunil V L
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=20230130182225.2471414-11-sunilvl@ventanamicro.com \ --to=sunilvl@ventanamicro.com \ --cc=ajones@ventanamicro.com \ --cc=aou@eecs.berkeley.edu \ --cc=apatel@ventanamicro.com \ --cc=atishp@rivosinc.com \ --cc=corbet@lwn.net \ --cc=daniel.lezcano@linaro.org \ --cc=lenb@kernel.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-riscv@lists.infradead.org \ --cc=maz@kernel.org \ --cc=palmer@dabbelt.com \ --cc=rafael@kernel.org \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.