Skip to contentSkip to conversation

Add basic ACPI support for RISC-V

PATCH In review Sunil V L 5 participants 66 messages Jan 30, 2023 – Feb 14, 2023

Subsystems (8)
lore
Share & tools
lore

Sunil V L

author maintainer
#0 lore raw

cover Add basic ACPI support for RISC-V

This patch series enables the basic ACPI infrastructure for RISC-V. Supporting external interrupt controllers is in progress and hence it is tested using polling based HVC SBI console and RAM disk.

The series depends on Anup's IPI improvement series.
https://github.com/avpatel/linux/commits/riscv_ipi_imp_v17

These changes are available at
https://github.com/vlsunil/linux/commits/acpi_b1_us_review_ipi17

Testing:
1) Build Qemu with ACPI support using below branch
https://github.com/vlsunil/qemu/tree/acpi_b1_us_review

2) Build EDK2 as per instructions in
https://github.com/vlsunil/riscv-uefi-edk2-docs/wiki/RISC-V-Qemu-Virt-support

3) Build Linux after enabling SBI HVC and SBI earlycon CONFIG_RISCV_SBI_V01=y CONFIG_SERIAL_EARLYCON_RISCV_SBI=y CONFIG_HVC_RISCV_SBI=y

4) Build buildroot.

Run with below command.
qemu-system-riscv64 -nographic \
-drive file=Build/RiscVVirtQemu/RELEASE_GCC5/FV/RISCV_VIRT.fd,if=pflash,format=raw,unit=1 \
-machine virt,acpi=on -smp 16 -m 2G \
-kernel arch/riscv/boot/Image \
-initrd buildroot/output/images/rootfs.cpio \
-append "root=/dev/ram ro console=hvc0 earlycon=sbi"

Jisheng Zhang (1):
riscv: move sbi_init() earlier before jump_label_init()

Sunil V L (23):
ACPICA: MADT: Add RISC-V INTC interrupt controller
ACPICA: Add structure definitions for RISC-V RHCT
RISC-V: ACPI: Add empty headers to enable ACPI core
RISC-V: ACPI: Add basic functions to build ACPI core
RISC-V: ACPI: Add PCI functions to build ACPI core
RISC-V: ACPI: Enable ACPI build infrastructure
ACPI: Enable ACPI_PROCESSOR for RISC-V
ACPI: OSL: Make should_use_kmap() 0 for RISC-V.
ACPI: processor_core: RISC-V: Enable mapping processor to the hartid
RISC-V: ACPI: irqchip/riscv-intc: Add ACPI support
RISC-V: ACPI: smpboot: Create wrapper smp_setup()
RISC-V: ACPI: smpboot: Add ACPI support in smp_setup()
RISC-V: ACPI: smpboot: Add function to retrieve the hartid clocksource/timer-riscv: Refactor riscv_timer_init_dt()
RISC-V: ACPI: clocksource/timer-riscv: Add ACPI support
ACPI: RISC-V: drivers/acpi: Add RHCT related code
RISC-V: ACPI: time.c: Add ACPI support for time_init()
RISC-V: ACPI: cpufeature: Add ACPI support in riscv_fill_hwcap()
RISC-V: ACPI: cpu: Enable cpuinfo for ACPI systems
RISC-V: ACPI: Add ACPI initialization in setup_arch()
RISC-V: ACPI: Enable ACPI in defconfig
MAINTAINERS: Add entry for drivers/acpi/riscv Documentation/kernel-parameters.txt: Add RISC-V for ACPI parameter

 .../admin-guide/kernel-parameters.txt         |   6 +-
 MAINTAINERS                                   |   7 +
 arch/riscv/Kconfig                            |   5 +
 arch/riscv/configs/defconfig                  |   4 +
 arch/riscv/include/asm/acenv.h                |  17 ++
 arch/riscv/include/asm/acpi.h                 |  87 +++++++++
 arch/riscv/include/asm/cpu.h                  |   9 +
 arch/riscv/kernel/Makefile                    |   3 +
 arch/riscv/kernel/acpi.c                      | 178 ++++++++++++++++++
 arch/riscv/kernel/cpu.c                       |  36 +++-
 arch/riscv/kernel/cpufeature.c                |  45 ++++-
 arch/riscv/kernel/pci.c                       | 173 +++++++++++++++++
 arch/riscv/kernel/setup.c                     |  21 ++-
 arch/riscv/kernel/smpboot.c                   |  99 +++++++++-
 arch/riscv/kernel/time.c                      |  25 ++-
 drivers/acpi/Kconfig                          |   2 +-
 drivers/acpi/Makefile                         |   2 +
 drivers/acpi/osl.c                            |   2 +-
 drivers/acpi/processor_core.c                 |  28 +++
 drivers/acpi/riscv/Makefile                   |   2 +
 drivers/acpi/riscv/rhct.c                     |  93 +++++++++
 drivers/clocksource/timer-riscv.c             |  88 ++++-----
 drivers/irqchip/irq-riscv-intc.c              |  79 ++++++--
 include/acpi/actbl2.h                         |  69 ++++++-
 24 files changed, 994 insertions(+), 86 deletions(-)
 create mode 100644 arch/riscv/include/asm/acenv.h
 create mode 100644 arch/riscv/include/asm/acpi.h
 create mode 100644 arch/riscv/include/asm/cpu.h
 create mode 100644 arch/riscv/kernel/acpi.c
 create mode 100644 arch/riscv/kernel/pci.c
 create mode 100644 drivers/acpi/riscv/Makefile
 create mode 100644 drivers/acpi/riscv/rhct.c
Signature · 1 line
2.38.0
author maintainer
#1 lore raw

PATCH 1/24 riscv: move sbi_init() earlier before jump_label_init()

From: Jisheng Zhang <[email protected]>

We call jump_label_init() in setup_arch() is to use static key mechanism earlier, but riscv jump label relies on the sbi functions, If we enable static key before sbi_init(), the code path looks like:
static_branch_enable()

    ..
      arch_jump_label_transform()
        patch_text_nosync()
          flush_icache_range()
            flush_icache_all()
              sbi_remote_fence_i() for CONFIG_RISCV_SBI case
                __sbi_rfence()

Since sbi isn't initialized, so NULL deference! Here is a typical panic log:

[    0.000000] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000
[    0.000000] Oops [#1]
[    0.000000] Modules linked in:
[    0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 5.18.0-rc7+ #79
[    0.000000] Hardware name: riscv-virtio,qemu (DT)
[    0.000000] epc : 0x0
[    0.000000]  ra : sbi_remote_fence_i+0x1e/0x26
[    0.000000] epc : 0000000000000000 ra : ffffffff80005826 sp : ffffffff80c03d50
[    0.000000]  gp : ffffffff80ca6178 tp : ffffffff80c0ad80 t0 : 6200000000000000
[    0.000000]  t1 : 0000000000000000 t2 : 62203a6b746e6972 s0 : ffffffff80c03d60
[    0.000000]  s1 : ffffffff80001af6 a0 : 0000000000000000 a1 : 0000000000000000
[    0.000000]  a2 : 0000000000000000 a3 : 0000000000000000 a4 : 0000000000000000
[    0.000000]  a5 : 0000000000000000 a6 : 0000000000000000 a7 : 0000000000080200
[    0.000000]  s2 : ffffffff808b3e48 s3 : ffffffff808bf698 s4 : ffffffff80cb2818
[    0.000000]  s5 : 0000000000000001 s6 : ffffffff80c9c345 s7 : ffffffff80895aa0
[    0.000000]  s8 : 0000000000000001 s9 : 000000000000007f s10: 0000000000000000
[    0.000000]  s11: 0000000000000000 t3 : ffffffff80824d08 t4 : 0000000000000022
[    0.000000]  t5 : 000000000000003d t6 : 0000000000000000
[    0.000000] status: 0000000000000100 badaddr: 0000000000000000 cause: 000000000000000c
[    0.000000] ---[ end trace 0000000000000000 ]---
[    0.000000] Kernel panic - not syncing: Attempted to kill the idle task!
[    0.000000] ---[ end Kernel panic - not syncing: Attempted to kill the idle task! ]---

Fix this issue by moving sbi_init() earlier before jump_label_init()

---
 arch/riscv/kernel/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kernel/setup.c +1 -1
index 86acd690d529..4335f08ffaf2 100644
@@ -270,6 +270,7 @@ void __init setup_arch(char **cmdline_p)
 	*cmdline_p = boot_command_line;
 
 	early_ioremap_setup();
+	sbi_init();
 	jump_label_init();
 	parse_early_param();
 
@@ -287,7 +288,6 @@ void __init setup_arch(char **cmdline_p)
 	misc_mem_init();
 
 	init_resources();
-	sbi_init();
 
 #ifdef CONFIG_KASAN
 	kasan_init();
Signature · 1 line
2.38.0
author maintainer
#2 lore raw

PATCH 2/24 ACPICA: MADT: Add RISC-V INTC interrupt controller

In reply to Sunil V L

The ECR to add RISC-V INTC interrupt controller is approved by the UEFI forum and will be availabl in the next revision of the ACPI specification.

This patch is not yet merged in ACPICA but a PR is raised.

ACPICA PR: https://github.com/acpica/acpica/pull/804
Reference: Mantis ID: 2348

---
 include/acpi/actbl2.h | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)
include/acpi/actbl2.h +20 -1
index b2973dbe37ee..c432fd15db65 100644
@@ -891,7 +891,8 @@ enum acpi_madt_type {
 	ACPI_MADT_TYPE_MSI_PIC = 21,
 	ACPI_MADT_TYPE_BIO_PIC = 22,
 	ACPI_MADT_TYPE_LPC_PIC = 23,
-	ACPI_MADT_TYPE_RESERVED = 24,	/* 24 to 0x7F are reserved */
+	ACPI_MADT_TYPE_RINTC = 24,
+	ACPI_MADT_TYPE_RESERVED = 25,	/* 25 to 0x7F are reserved */
 	ACPI_MADT_TYPE_OEM_RESERVED = 0x80	/* 0x80 to 0xFF are reserved for OEM use */
 };
 
@@ -1250,6 +1251,24 @@ enum acpi_madt_lpc_pic_version {
 	ACPI_MADT_LPC_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */
 };
 
+/* 24: RISC-V INTC */
+struct acpi_madt_rintc {
+	struct acpi_subtable_header header;
+	u8 version;
+	u8 reserved;
+	u32 flags;
+	u64 hart_id;
+	u32 uid;		/* ACPI processor UID */
+};
+
+/* Values for RISC-V INTC Version field above */
+
+enum acpi_madt_rintc_version {
+	ACPI_MADT_RINTC_VERSION_NONE = 0,
+	ACPI_MADT_RINTC_VERSION_V1 = 1,
+	ACPI_MADT_RINTC_VERSION_RESERVED = 2	/* 2 and greater are reserved */
+};
+
 /* 80: OEM data */
 
 struct acpi_madt_oem_data {
Signature · 1 line
2.38.0
#3 lore raw

Re: [PATCH 02/24] ACPICA: MADT: Add RISC-V INTC interrupt controller

Quoted 2 lines · Sunil V L

The ECR to add RISC-V INTC interrupt controller is approved by the UEFI forum and will be availabl in the next revision of

nit: available

Quoted 5 lines

the ACPI specification.

This patch is not yet merged in ACPICA but a PR is raised.

ACPICA PR: https://github.com/acpica/acpica/pull/804

I had a quick check with git grep, and as this doesn't appear to be a regular pattern in the history, so could you please make this a regular
Link: trailer?

Cheers,
Conor.

Quoted 51 lines

Reference: Mantis ID: 2348

---
 include/acpi/actbl2.h | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)
include/acpi/actbl2.h +20 -1
index b2973dbe37ee..c432fd15db65 100644
@@ -891,7 +891,8 @@ enum acpi_madt_type {
 	ACPI_MADT_TYPE_MSI_PIC = 21,
 	ACPI_MADT_TYPE_BIO_PIC = 22,
 	ACPI_MADT_TYPE_LPC_PIC = 23,
-	ACPI_MADT_TYPE_RESERVED = 24,	/* 24 to 0x7F are reserved */
+	ACPI_MADT_TYPE_RINTC = 24,
+	ACPI_MADT_TYPE_RESERVED = 25,	/* 25 to 0x7F are reserved */
 	ACPI_MADT_TYPE_OEM_RESERVED = 0x80	/* 0x80 to 0xFF are reserved for OEM use */
 };
 
@@ -1250,6 +1251,24 @@ enum acpi_madt_lpc_pic_version {
 	ACPI_MADT_LPC_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */
 };
 
+/* 24: RISC-V INTC */
+struct acpi_madt_rintc {
+	struct acpi_subtable_header header;
+	u8 version;
+	u8 reserved;
+	u32 flags;
+	u64 hart_id;
+	u32 uid;		/* ACPI processor UID */
+};
+
+/* Values for RISC-V INTC Version field above */
+
+enum acpi_madt_rintc_version {
+	ACPI_MADT_RINTC_VERSION_NONE = 0,
+	ACPI_MADT_RINTC_VERSION_V1 = 1,
+	ACPI_MADT_RINTC_VERSION_RESERVED = 2	/* 2 and greater are reserved */
+};
+
 /* 80: OEM data */
 
 struct acpi_madt_oem_data {
Signature · 1 line
2.38.0
author maintainer
#4 lore raw

Re: [PATCH 02/24] ACPICA: MADT: Add RISC-V INTC interrupt controller

Quoted 6 lines · Conor Dooley
Quoted 2 lines · Sunil V L

The ECR to add RISC-V INTC interrupt controller is approved by the UEFI forum and will be availabl in the next revision of

nit: available

Thanks!

Quoted 10 lines
Quoted 5 lines

the ACPI specification.

This patch is not yet merged in ACPICA but a PR is raised.

ACPICA PR: https://github.com/acpica/acpica/pull/804

I had a quick check with git grep, and as this doesn't appear to be a regular pattern in the history, so could you please make this a regular
Link: trailer?

This patch should be merged in acpica repo first and then we will get this in standard format. Until then, it exists to allow other patches get reviewed. I believe by the time we get all other patches reviewed, acpica will have this merged.

Thanks!
Sunil

author maintainer
#5 lore raw

PATCH 3/24 ACPICA: Add structure definitions for RISC-V RHCT

In reply to Sunil V L

RISC-V Hart Capabilities Table (RHCT) is a new static table. The ECR to add RHCT is approved by the UEFI forum and will be available in the next version of the ACPI spec.

This patch is not yet merged in ACPICA but a PR is raised.

ACPICA PR: https://github.com/acpica/acpica/pull/804
Reference: Mantis: 2349

---
 include/acpi/actbl2.h | 48 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
include/acpi/actbl2.h +48 -0
index c432fd15db65..86bb79fdfa62 100644
@@ -47,6 +47,7 @@
 #define ACPI_SIG_PRMT           "PRMT"	/* Platform Runtime Mechanism Table */
 #define ACPI_SIG_RASF           "RASF"	/* RAS Feature table */
 #define ACPI_SIG_RGRT           "RGRT"	/* Regulatory Graphics Resource Table */
+#define ACPI_SIG_RHCT           "RHCT"	/* RISC-V Hart Capabilities Table */
 #define ACPI_SIG_SBST           "SBST"	/* Smart Battery Specification Table */
 #define ACPI_SIG_SDEI           "SDEI"	/* Software Delegated Exception Interface Table */
 #define ACPI_SIG_SDEV           "SDEV"	/* Secure Devices table */
@@ -2604,6 +2605,53 @@ enum acpi_rgrt_image_type {
 	ACPI_RGRT_TYPE_RESERVED = 2	/* 2 and greater are reserved */
 };
 
+/*******************************************************************************
+ *
+ * RHCT - RISC-V Hart Capabilities Table
+ *        Version 1
+ *
+ ******************************************************************************/
+
+struct acpi_table_rhct {
+	struct acpi_table_header header;	/* Common ACPI table header */
+	u32 reserved;
+	u64 time_base_freq;
+	u32 node_count;
+	u32 node_offset;
+};
+
+/*
+ * RHCT subtables
+ */
+struct acpi_rhct_node_header {
+	u16 type;
+	u16 length;
+	u16 revision;
+};
+
+/* Values for RHCT subtable Type above */
+
+enum acpi_rhct_node_type {
+	ACPI_RHCT_NODE_TYPE_ISA_STRING = 0x0000,
+	ACPI_RHCT_NODE_TYPE_HART_INFO = 0xFFFF,
+};
+
+/*
+ * RHCT node specific subtables
+ */
+
+/* ISA string node structure */
+struct acpi_rhct_isa_string {
+	u16 isa_length;
+	char isa[];
+};
+
+/* Hart Info node structure */
+struct acpi_rhct_hart_info {
+	u16 num_offsets;
+	u32 uid;		/* ACPI processor UID */
+};
+
 /*******************************************************************************
  *
  * SBST - Smart Battery Specification Table
Signature · 1 line
2.38.0
author maintainer
#6 lore raw

PATCH 4/24 RISC-V: ACPI: Add empty headers to enable ACPI core

In reply to Sunil V L

Few header files are required unconditionally by ACPI core. So add empty header files for now and update it when needed.

---
 arch/riscv/include/asm/acenv.h | 17 +++++++++++++++++
 arch/riscv/include/asm/cpu.h   |  9 +++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 arch/riscv/include/asm/acenv.h
 create mode 100644 arch/riscv/include/asm/cpu.h
arch/riscv/include/asm/acenv.h new file +17 -0
new file mode 100644
index 000000000000..bbc38ecdf753
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * RISC-V specific ACPICA environments and implementation
+ *
+ * Copyright (C) 2014, Linaro Ltd.
+ *   Author: Hanjun Guo <[email protected]>
+ *   Author: Graeme Gregory <[email protected]>
+ * Copyright (C) 2023, Ventana Micro Systems Inc.
+ *   Author: Sunil V L <[email protected]>
+ */
+
+#ifndef _ASM_ACENV_H
+#define _ASM_ACENV_H
+
+/* It is required unconditionally by ACPI core, update it when needed. */
+
+#endif /* _ASM_ACENV_H */
arch/riscv/include/asm/cpu.h new file +9 -0
new file mode 100644
index 000000000000..51ec1a89a7a9
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (C) 2014 ARM Ltd.
+ * Copyright (C) 2023 Ventana Micro Systems Inc.
+ */
+#ifndef __ASM_CPU_H
+#define __ASM_CPU_H
+
+#endif /* __ASM_CPU_H */
Signature · 1 line
2.38.0
#7 lore raw

Re: [PATCH 04/24] RISC-V: ACPI: Add empty headers to enable ACPI core

Quoted 1 line · Sunil V L

Few header files are required unconditionally by ACPI core.

nit: A few. Without the article this has a different meaning.

Quoted 1 line

So add empty header files for now and update it when needed.

s/ and update it when needed// ;)

Quoted 15 lines
---
 arch/riscv/include/asm/acenv.h | 17 +++++++++++++++++
 arch/riscv/include/asm/cpu.h   |  9 +++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 arch/riscv/include/asm/acenv.h
 create mode 100644 arch/riscv/include/asm/cpu.h
arch/riscv/include/asm/acenv.h new file +0 -0
new file mode 100644
index 000000000000..bbc38ecdf753

arch/riscv/include/asm/acenv.h line 9

Quoted 9 lines
arch/riscv/include/asm/acenv.h new file +9 -0
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * RISC-V specific ACPICA environments and implementation
+ *
+ * Copyright (C) 2014, Linaro Ltd.
+ *   Author: Hanjun Guo <[email protected]>
+ *   Author: Graeme Gregory <[email protected]>
+ * Copyright (C) 2023, Ventana Micro Systems Inc.
+ *   Author: Sunil V L <[email protected]>

More out of idle curiosity than anything else, but what, may I ask, is copyrightable about 2 empty files?
Triply so given there are !3! contributors to said empty file!

arch/riscv/include/asm/acenv.h line 15

Quoted 6 lines
arch/riscv/include/asm/acenv.h new file +6 -0
+ */
+
+#ifndef _ASM_ACENV_H
+#define _ASM_ACENV_H
+
+/* It is required unconditionally by ACPI core, update it when needed. */

How come this file gets a comment and the other doesn't? Also the comment doesn't really make much sense to me in a vacuum, and ideally would read like:
"This header is required unconditionally by the ACPI core" That is, if a comment is really even needed.

Cheers,
Conor.

Quoted 20 lines
arch/riscv/include/asm/acenv.h new file +2 -0
+
+#endif /* _ASM_ACENV_H */
arch/riscv/include/asm/cpu.h new file +9 -0
new file mode 100644
index 000000000000..51ec1a89a7a9
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (C) 2014 ARM Ltd.
+ * Copyright (C) 2023 Ventana Micro Systems Inc.
+ */
+#ifndef __ASM_CPU_H
+#define __ASM_CPU_H
+
+#endif /* __ASM_CPU_H */
Signature · 1 line
2.38.0
author maintainer
#8 lore raw

PATCH 5/24 RISC-V: ACPI: Add basic functions to build ACPI core

In reply to Sunil V L

Introduce acpi.c and its related header files to provide fundamental needs of extern variables and functions for ACPI core.
- asm/acpi.h for arch specific variables and functions needed by ACPI driver core;
- acpi.c - Add function to initialize ACPI tables.
- acpi.c for RISC-V related ACPI implementation for ACPI driver core;

Code is mostly leveraged from ARM64.

---
 arch/riscv/include/asm/acpi.h |  60 ++++++++++++
 arch/riscv/kernel/Makefile    |   2 +
 arch/riscv/kernel/acpi.c      | 178 ++++++++++++++++++++++++++++++++++
 3 files changed, 240 insertions(+)
 create mode 100644 arch/riscv/include/asm/acpi.h
 create mode 100644 arch/riscv/kernel/acpi.c
arch/riscv/include/asm/acpi.h new file +60 -0
new file mode 100644
index 000000000000..8b9babaf3f25
@@ -0,0 +1,60 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ *  Copyright (C) 2013-2014, Linaro Ltd.
+ *	Author: Al Stone <[email protected]>
+ *	Author: Graeme Gregory <[email protected]>
+ *	Author: Hanjun Guo <[email protected]>
+ *
+ *  Copyright (C) 2021-2023, Ventana Micro Systems Inc.
+ *	Author: Sunil V L <[email protected]>
+ */
+
+#ifndef _ASM_ACPI_H
+#define _ASM_ACPI_H
+
+/* Basic configuration for ACPI */
+#ifdef CONFIG_ACPI
+
+/* 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
+
+#define acpi_strict 1   /* No out-of-spec workarounds on RISC-V */
+extern int acpi_disabled;
+extern int acpi_noirq;
+extern int acpi_pci_disabled;
+static inline void disable_acpi(void)
+{
+	acpi_disabled = 1;
+	acpi_pci_disabled = 1;
+	acpi_noirq = 1;
+}
+
+static inline void enable_acpi(void)
+{
+	acpi_disabled = 0;
+	acpi_pci_disabled = 0;
+	acpi_noirq = 0;
+}
+
+/*
+ * 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.
+ */
+#define cpu_physical_id(cpu) cpuid_to_hartid_map(cpu)
+
+/*
+ * It's used from ACPI core in kdump to boot UP system with SMP kernel.
+ * Since MADT must provide at least one IMSIC structure for AIA
+ * initialization, CPU will be always available in MADT on RISC-V.
+ */
+static inline bool acpi_has_cpu_in_madt(void)
+{
+	return true;
+}
+
+static inline void arch_fix_phys_package_id(int num, u32 slot) { }
+#endif
+
+#endif /*_ASM_ACPI_H*/
arch/riscv/kernel/Makefile +2 -0
index 67f542be1bea..f979dc8cf47d 100644
@@ -90,3 +90,5 @@ obj-$(CONFIG_EFI)		+= efi.o
 obj-$(CONFIG_COMPAT)		+= compat_syscall_table.o
 obj-$(CONFIG_COMPAT)		+= compat_signal.o
 obj-$(CONFIG_COMPAT)		+= compat_vdso/
+
+obj-$(CONFIG_ACPI)              += acpi.o
arch/riscv/kernel/acpi.c new file +178 -0

178 lines not on this page · raw message

Signature · 1 line
2.38.0
#9 lore raw

Re: [PATCH 05/24] RISC-V: ACPI: Add basic functions to build ACPI core

Quoted 13 lines · Sunil V L

Introduce acpi.c and its related header files to provide fundamental needs of extern variables and functions for ACPI core.
- asm/acpi.h for arch specific variables and functions needed by ACPI driver core;
- acpi.c - Add function to initialize ACPI tables.
- acpi.c for RISC-V related ACPI implementation for ACPI driver core;

Code is mostly leveraged from ARM64.

arch/riscv/kernel/acpi.c

Quoted 2 lines
arch/riscv/kernel/acpi.c +1 -0
 
+ * __acpi_map_table() will be called before page_init(), so early_ioremap()

rg "\bpage_init\("
arch/riscv/kernel/acpi.c
54: * __acpi_map_table() will be called before page_init(), so early_ioremap()

arch/arm64/kernel/acpi.c
86: * __acpi_map_table() will be called before page_init(), so early_ioremap()

This function doesn't appear to exist, perhaps what you are looking for is paging_init()?

Quoted 9 lines

+ * or early_memremap() should be called here to for ACPI table mapping.
+ */

arch/riscv/kernel/acpi.c +7 -0
+void __init __iomem *__acpi_map_table(unsigned long phys, unsigned long size)
+{
+	if (!size)
+		return NULL;
+
+	return early_memremap(phys, size);
+}

arch/riscv/kernel/acpi.c line 148

Quoted 10 lines
arch/riscv/kernel/acpi.c +9 -0
 
+void __init acpi_boot_table_init(void)
+{
+	/*
+	 * Enable ACPI instead of device tree unless
+	 * - ACPI has been disabled explicitly (acpi=off), or
+	 * - firmware has not populated ACPI ptr in EFI system table
+	 */
+
+	if (param_acpi_off || (efi.acpi20 == EFI_INVALID_TABLE_ADDR))

There's an extraneous set of () around the second item here.

arch/riscv/kernel/acpi.c

Quoted 2 lines
arch/riscv/kernel/acpi.c +2 -0
+		goto done;
+	/*

A small nit: a newline before opening the comment block here please!

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author maintainer
#10 lore raw

Re: [PATCH 05/24] RISC-V: ACPI: Add basic functions to build ACPI core

Quoted 21 lines · Conor Dooley
Quoted 13 lines · Sunil V L

Introduce acpi.c and its related header files to provide fundamental needs of extern variables and functions for ACPI core.
- asm/acpi.h for arch specific variables and functions needed by ACPI driver core;
- acpi.c - Add function to initialize ACPI tables.
- acpi.c for RISC-V related ACPI implementation for ACPI driver core;

Code is mostly leveraged from ARM64.

arch/riscv/kernel/acpi.c

Quoted 2 lines
arch/riscv/kernel/acpi.c +1 -0
 
+ * __acpi_map_table() will be called before page_init(), so early_ioremap()

rg "\bpage_init\("
arch/riscv/kernel/acpi.c
54: * __acpi_map_table() will be called before page_init(), so early_ioremap()

Quoted 6 lines

arch/arm64/kernel/acpi.c
86: * __acpi_map_table() will be called before page_init(), so early_ioremap()

This function doesn't appear to exist, perhaps what you are looking for is paging_init()?

Yes, will update.

Quoted 10 lines
Quoted 9 lines

+ * or early_memremap() should be called here to for ACPI table mapping.
+ */

arch/riscv/kernel/acpi.c +7 -0
+void __init __iomem *__acpi_map_table(unsigned long phys, unsigned long size)
+{
+	if (!size)
+		return NULL;
+
+	return early_memremap(phys, size);
+}
Quoted 12 lines

arch/riscv/kernel/acpi.c line 148

Quoted 9 lines
arch/riscv/kernel/acpi.c +9 -0
+void __init acpi_boot_table_init(void)
+{
+	/*
+	 * Enable ACPI instead of device tree unless
+	 * - ACPI has been disabled explicitly (acpi=off), or
+	 * - firmware has not populated ACPI ptr in EFI system table
+	 */
+
+	if (param_acpi_off || (efi.acpi20 == EFI_INVALID_TABLE_ADDR))

There's an extraneous set of () around the second item here.

Okay.

Quoted 4 lines

arch/riscv/kernel/acpi.c

Quoted 2 lines
arch/riscv/kernel/acpi.c +2 -0
+		goto done;
+	/*

A small nit: a newline before opening the comment block here please!

Thanks, will fix these in the next revision.
-Sunil

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author maintainer
#11 lore raw

PATCH 6/24 RISC-V: ACPI: Add PCI functions to build ACPI core

In reply to Sunil V L

When CONFIG_PCI is enabled, ACPI core expects few arch functions related to PCI. Add those functions so that ACPI core gets build. These are levraged from arm64.

---
 arch/riscv/kernel/Makefile |   1 +
 arch/riscv/kernel/pci.c    | 173 +++++++++++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+)
 create mode 100644 arch/riscv/kernel/pci.c
arch/riscv/kernel/Makefile +1 -0
index f979dc8cf47d..e9d37639751d 100644
@@ -92,3 +92,4 @@ obj-$(CONFIG_COMPAT)		+= compat_signal.o
 obj-$(CONFIG_COMPAT)		+= compat_vdso/
 
 obj-$(CONFIG_ACPI)              += acpi.o
+obj-$(CONFIG_PCI)               += pci.o
arch/riscv/kernel/pci.c new file +173 -0

173 lines not on this page · raw message

Signature · 1 line
2.38.0
Reviewed-by on v1 6/24
#12 lore raw

Re: [PATCH 06/24] RISC-V: ACPI: Add PCI functions to build ACPI core

Quoted 26 lines · Sunil V L

When CONFIG_PCI is enabled, ACPI core expects few arch functions related to PCI. Add those functions so that ACPI core gets build. These are levraged from arm64.

---
 arch/riscv/kernel/Makefile |   1 +
 arch/riscv/kernel/pci.c    | 173 +++++++++++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+)
 create mode 100644 arch/riscv/kernel/pci.c
arch/riscv/kernel/pci.c new file +9 -0
new file mode 100644
index 000000000000..3388af3a67a0
@@ -0,0 +1,173 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Code borrowed from ARM64
+ *
+ * Copyright (C) 2003 Anton Blanchard <[email protected]>, IBM
+ * Copyright (C) 2014 ARM Ltd.
+ * Copyright (C) 2022-2023 Ventana Micro System Inc.
+ */
+

arch/riscv/kernel/pci.c line 19

Quoted 10 lines
arch/riscv/kernel/pci.c new file +10 -0
+#include <linux/acpi.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/pci.h>
+#include <linux/pci-acpi.h>
+#include <linux/pci-ecam.h>
+
+#ifdef CONFIG_ACPI

Quickly checking against ARM64, they do not wrap the read/write functions in this ifdef, so why do we need to do so?

arch/riscv/kernel/pci.c line 31

Quoted 11 lines
arch/riscv/kernel/pci.c new file +11 -0
+/*
+ * raw_pci_read/write - Platform-specific PCI config space access.
+ */
+int raw_pci_read(unsigned int domain, unsigned int bus,
+		  unsigned int devfn, int reg, int len, u32 *val)
+{
+	struct pci_bus *b = pci_find_bus(domain, bus);
+
+	if (!b)
+		return PCIBIOS_DEVICE_NOT_FOUND;
+	return b->ops->read(b, devfn, reg, len, val);

A newline before the return would be appreciated by my eyes :)

arch/riscv/kernel/pci.c line 35

Quoted 4 lines
arch/riscv/kernel/pci.c new file +4 -0
+}
+
+int raw_pci_write(unsigned int domain, unsigned int bus,
+		unsigned int devfn, int reg, int len, u32 val)

Also, both read and write functions here appear to have incorrect alignment on the second lines.

arch/riscv/kernel/pci.c line 44

Quoted 9 lines
arch/riscv/kernel/pci.c new file +9 -0
+{
+	struct pci_bus *b = pci_find_bus(domain, bus);
+
+	if (!b)
+		return PCIBIOS_DEVICE_NOT_FOUND;
+	return b->ops->write(b, devfn, reg, len, val);
+}
+
+

Extra newline here too, looks to be exactly where you deleted the numa stuff from arm64 ;)

Quoted 5 lines
arch/riscv/kernel/pci.c new file +5 -0
+struct acpi_pci_generic_root_info {
+	struct acpi_pci_root_info	common;
+	struct pci_config_window	*cfg;	/* config space mapping */
+};
+

arch/riscv/kernel/pci.c line 59

Quoted 10 lines
arch/riscv/kernel/pci.c new file +10 -0
+int acpi_pci_bus_find_domain_nr(struct pci_bus *bus)
+{
+	struct pci_config_window *cfg = bus->sysdata;
+	struct acpi_device *adev = to_acpi_device(cfg->parent);
+	struct acpi_pci_root *root = acpi_driver_data(adev);
+
+	return root->segment;
+}
+
+static int pci_acpi_root_prepare_resources(struct acpi_pci_root_info *ci)

Rhetorical question perhaps, but what does "ci" mean?

arch/riscv/kernel/pci.c line 69

Quoted 10 lines
arch/riscv/kernel/pci.c new file +10 -0
+{
+	struct resource_entry *entry, *tmp;
+	int status;
+
+	status = acpi_pci_probe_root_resources(ci);
+	resource_list_for_each_entry_safe(entry, tmp, &ci->resources) {
+		if (!(entry->res->flags & IORESOURCE_WINDOW))
+			resource_list_destroy_entry(entry);
+	}
+	return status;

Perhaps that extra newline from above could migrate down to the line above the return here.

arch/riscv/kernel/pci.c line 77

Quoted 8 lines
arch/riscv/kernel/pci.c new file +8 -0
+}
+
+/*
+ * Lookup the bus range for the domain in MCFG, and set up config space
+ * mapping.
+ */
+static struct pci_config_window *
+pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root)

This all fits on 1 line.

Quoted 25 lines
arch/riscv/kernel/pci.c new file +25 -0
+{
+	struct device *dev = &root->device->dev;
+	struct resource *bus_res = &root->secondary;
+	u16 seg = root->segment;
+	const struct pci_ecam_ops *ecam_ops;
+	struct resource cfgres;
+	struct acpi_device *adev;
+	struct pci_config_window *cfg;
+	int ret;
+
+	ret = pci_mcfg_lookup(root, &cfgres, &ecam_ops);
+	if (ret) {
+		dev_err(dev, "%04x:%pR ECAM region not found\n", seg, bus_res);
+		return NULL;
+	}
+
+	adev = acpi_resource_consumer(&cfgres);
+	if (adev)
+		dev_info(dev, "ECAM area %pR reserved by %s\n", &cfgres,
+			 dev_name(&adev->dev));
+	else
+		dev_warn(dev, FW_BUG "ECAM area %pR not reserved in ACPI namespace\n",
+			 &cfgres);
+
+	cfg = pci_ecam_create(dev, &cfgres, bus_res, ecam_ops);

arch/riscv/kernel/pci.c line 112

Quoted 10 lines
arch/riscv/kernel/pci.c new file +10 -0
+	if (IS_ERR(cfg)) {
+		dev_err(dev, "%04x:%pR error %ld mapping ECAM\n", seg, bus_res,
+			PTR_ERR(cfg));
+		return NULL;
+	}
+
+	return cfg;
+}
+
+/* release_info: free resources allocated by init_info */

The fact that you haven't picked a consistent comment style for this functions really bothers my OCD. Yes, it may be copy-paste from arm64, but since this is "new code" I don't think there's harm in at least *starting* with something that looks cohesive.

arch/riscv/kernel/pci.c line 123

Quoted 11 lines
arch/riscv/kernel/pci.c new file +11 -0
+static void pci_acpi_generic_release_info(struct acpi_pci_root_info *ci)
+{
+	struct acpi_pci_generic_root_info *ri;
+
+	ri = container_of(ci, struct acpi_pci_generic_root_info, common);
+	pci_ecam_free(ri->cfg);
+	kfree(ci->ops);
+	kfree(ri);
+}
+
+

Extra newline here.

Quoted 38 lines
arch/riscv/kernel/pci.c new file +38 -0
+/* Interface called from ACPI code to setup PCI host controller */
+struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
+{
+	struct acpi_pci_generic_root_info *ri;
+	struct pci_bus *bus, *child;
+	struct acpi_pci_root_ops *root_ops;
+	struct pci_host_bridge *host;
+
+	ri = kzalloc(sizeof(*ri), GFP_KERNEL);
+	if (!ri)
+		return NULL;
+
+	root_ops = kzalloc(sizeof(*root_ops), GFP_KERNEL);
+	if (!root_ops) {
+		kfree(ri);
+		return NULL;
+	}
+
+	ri->cfg = pci_acpi_setup_ecam_mapping(root);
+	if (!ri->cfg) {
+		kfree(ri);
+		kfree(root_ops);
+		return NULL;
+	}
+
+	root_ops->release_info = pci_acpi_generic_release_info;
+	root_ops->prepare_resources = pci_acpi_root_prepare_resources;
+	root_ops->pci_ops = (struct pci_ops *)&ri->cfg->ops->pci_ops;
+	bus = acpi_pci_root_create(root, root_ops, &ri->common, ri->cfg);
+	if (!bus)
+		return NULL;
+
+	/* If we must preserve the resource configuration, claim now */
+	host = pci_find_host_bridge(bus);
+	if (host->preserve_config)
+		pci_bus_claim_resources(bus);
+
+	/*

arch/riscv/kernel/pci.c line 171

Quoted 10 lines
arch/riscv/kernel/pci.c new file +10 -0
+	 * Assign whatever was left unassigned. If we didn't claim above,
+	 * this will reassign everything.
+	 */
+	pci_assign_unassigned_root_bus_resources(bus);
+
+	list_for_each_entry(child, &bus->children, node)
+		pcie_bus_configure_settings(child);
+
+	return bus;
+}

Anyways, this does look to be "leveraged from arm64" as you say and I only had minor nits to comment about...

Cheers,
Conor.

author maintainer
#13 lore raw

Re: [PATCH 06/24] RISC-V: ACPI: Add PCI functions to build ACPI core

Quoted 32 lines · Conor Dooley
Quoted 31 lines · Sunil V L

When CONFIG_PCI is enabled, ACPI core expects few arch functions related to PCI. Add those functions so that ACPI core gets build. These are levraged from arm64.

---
 arch/riscv/kernel/Makefile |   1 +
 arch/riscv/kernel/pci.c    | 173 +++++++++++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+)
 create mode 100644 arch/riscv/kernel/pci.c
arch/riscv/kernel/pci.c new file +14 -0
new file mode 100644
index 000000000000..3388af3a67a0
@@ -0,0 +1,173 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Code borrowed from ARM64
+ *
+ * Copyright (C) 2003 Anton Blanchard <[email protected]>, IBM
+ * Copyright (C) 2014 ARM Ltd.
+ * Copyright (C) 2022-2023 Ventana Micro System Inc.
+ */
+
+#include <linux/acpi.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
Quoted 9 lines

arch/riscv/kernel/pci.c line 19

Quoted 5 lines
arch/riscv/kernel/pci.c new file +5 -0
+#include <linux/pci.h>
+#include <linux/pci-acpi.h>
+#include <linux/pci-ecam.h>
+
+#ifdef CONFIG_ACPI

Quickly checking against ARM64, they do not wrap the read/write functions in this ifdef, so why do we need to do so?

I didn't find any callers other than ACPI. But let me keep them outside so that we are consistent.

Quoted 5 lines
Quoted 5 lines
arch/riscv/kernel/pci.c new file +5 -0
+/*
+ * raw_pci_read/write - Platform-specific PCI config space access.
+ */
+int raw_pci_read(unsigned int domain, unsigned int bus,
+		  unsigned int devfn, int reg, int len, u32 *val)
Quoted 9 lines

arch/riscv/kernel/pci.c line 31

Quoted 6 lines
arch/riscv/kernel/pci.c new file +6 -0
+{
+	struct pci_bus *b = pci_find_bus(domain, bus);
+
+	if (!b)
+		return PCIBIOS_DEVICE_NOT_FOUND;
+	return b->ops->read(b, devfn, reg, len, val);

A newline before the return would be appreciated by my eyes :)

Okay.

Quoted 8 lines

arch/riscv/kernel/pci.c line 35

Quoted 4 lines
arch/riscv/kernel/pci.c new file +4 -0
+}
+
+int raw_pci_write(unsigned int domain, unsigned int bus,
+		unsigned int devfn, int reg, int len, u32 val)

Also, both read and write functions here appear to have incorrect alignment on the second lines.

Okay.

Quoted 4 lines
Quoted 4 lines
arch/riscv/kernel/pci.c new file +4 -0
+{
+	struct pci_bus *b = pci_find_bus(domain, bus);
+
+	if (!b)
Quoted 9 lines

arch/riscv/kernel/pci.c line 44

Quoted 5 lines
arch/riscv/kernel/pci.c new file +5 -0
+		return PCIBIOS_DEVICE_NOT_FOUND;
+	return b->ops->write(b, devfn, reg, len, val);
+}
+
+

Extra newline here too, looks to be exactly where you deleted the numa stuff from arm64 ;)

Okay.

Quoted 9 lines
Quoted 9 lines
arch/riscv/kernel/pci.c new file +9 -0
+struct acpi_pci_generic_root_info {
+	struct acpi_pci_root_info	common;
+	struct pci_config_window	*cfg;	/* config space mapping */
+};
+
+int acpi_pci_bus_find_domain_nr(struct pci_bus *bus)
+{
+	struct pci_config_window *cfg = bus->sysdata;
+	struct acpi_device *adev = to_acpi_device(cfg->parent);
Quoted 9 lines

arch/riscv/kernel/pci.c line 59

Quoted 6 lines
arch/riscv/kernel/pci.c new file +6 -0
+	struct acpi_pci_root *root = acpi_driver_data(adev);
+
+	return root->segment;
+}
+
+static int pci_acpi_root_prepare_resources(struct acpi_pci_root_info *ci)

Rhetorical question perhaps, but what does "ci" mean?

I don't know either :-). I guess since there is one more generic ri, this is named as ci.

Quoted 5 lines
Quoted 5 lines
arch/riscv/kernel/pci.c new file +5 -0
+{
+	struct resource_entry *entry, *tmp;
+	int status;
+
+	status = acpi_pci_probe_root_resources(ci);
Quoted 9 lines

arch/riscv/kernel/pci.c line 69

Quoted 5 lines
arch/riscv/kernel/pci.c new file +5 -0
+	resource_list_for_each_entry_safe(entry, tmp, &ci->resources) {
+		if (!(entry->res->flags & IORESOURCE_WINDOW))
+			resource_list_destroy_entry(entry);
+	}
+	return status;

Perhaps that extra newline from above could migrate down to the line above the return here.

Okay.

Quoted 11 lines

arch/riscv/kernel/pci.c line 77

Quoted 8 lines
arch/riscv/kernel/pci.c new file +8 -0
+}
+
+/*
+ * Lookup the bus range for the domain in MCFG, and set up config space
+ * mapping.
+ */
+static struct pci_config_window *
+pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root)

This all fits on 1 line.

It actually goes beyond 80 characters, right?

Quoted 32 lines
Quoted 32 lines
arch/riscv/kernel/pci.c new file +32 -0
+{
+	struct device *dev = &root->device->dev;
+	struct resource *bus_res = &root->secondary;
+	u16 seg = root->segment;
+	const struct pci_ecam_ops *ecam_ops;
+	struct resource cfgres;
+	struct acpi_device *adev;
+	struct pci_config_window *cfg;
+	int ret;
+
+	ret = pci_mcfg_lookup(root, &cfgres, &ecam_ops);
+	if (ret) {
+		dev_err(dev, "%04x:%pR ECAM region not found\n", seg, bus_res);
+		return NULL;
+	}
+
+	adev = acpi_resource_consumer(&cfgres);
+	if (adev)
+		dev_info(dev, "ECAM area %pR reserved by %s\n", &cfgres,
+			 dev_name(&adev->dev));
+	else
+		dev_warn(dev, FW_BUG "ECAM area %pR not reserved in ACPI namespace\n",
+			 &cfgres);
+
+	cfg = pci_ecam_create(dev, &cfgres, bus_res, ecam_ops);
+	if (IS_ERR(cfg)) {
+		dev_err(dev, "%04x:%pR error %ld mapping ECAM\n", seg, bus_res,
+			PTR_ERR(cfg));
+		return NULL;
+	}
+
+	return cfg;
Quoted 9 lines

arch/riscv/kernel/pci.c line 112

Quoted 3 lines
arch/riscv/kernel/pci.c new file +3 -0
+}
+
+/* release_info: free resources allocated by init_info */

The fact that you haven't picked a consistent comment style for this functions really bothers my OCD. Yes, it may be copy-paste from arm64, but since this is "new code" I don't think there's harm in at least *starting* with something that looks cohesive.

Agree. Will try to fix them in the next revision.

Quoted 5 lines
Quoted 5 lines
arch/riscv/kernel/pci.c new file +5 -0
+static void pci_acpi_generic_release_info(struct acpi_pci_root_info *ci)
+{
+	struct acpi_pci_generic_root_info *ri;
+
+	ri = container_of(ci, struct acpi_pci_generic_root_info, common);
Quoted 9 lines

arch/riscv/kernel/pci.c line 123

Quoted 6 lines
arch/riscv/kernel/pci.c new file +6 -0
+	pci_ecam_free(ri->cfg);
+	kfree(ci->ops);
+	kfree(ri);
+}
+
+

Extra newline here.

Okay.

Quoted 51 lines
Quoted 38 lines
arch/riscv/kernel/pci.c new file +38 -0
+/* Interface called from ACPI code to setup PCI host controller */
+struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
+{
+	struct acpi_pci_generic_root_info *ri;
+	struct pci_bus *bus, *child;
+	struct acpi_pci_root_ops *root_ops;
+	struct pci_host_bridge *host;
+
+	ri = kzalloc(sizeof(*ri), GFP_KERNEL);
+	if (!ri)
+		return NULL;
+
+	root_ops = kzalloc(sizeof(*root_ops), GFP_KERNEL);
+	if (!root_ops) {
+		kfree(ri);
+		return NULL;
+	}
+
+	ri->cfg = pci_acpi_setup_ecam_mapping(root);
+	if (!ri->cfg) {
+		kfree(ri);
+		kfree(root_ops);
+		return NULL;
+	}
+
+	root_ops->release_info = pci_acpi_generic_release_info;
+	root_ops->prepare_resources = pci_acpi_root_prepare_resources;
+	root_ops->pci_ops = (struct pci_ops *)&ri->cfg->ops->pci_ops;
+	bus = acpi_pci_root_create(root, root_ops, &ri->common, ri->cfg);
+	if (!bus)
+		return NULL;
+
+	/* If we must preserve the resource configuration, claim now */
+	host = pci_find_host_bridge(bus);
+	if (host->preserve_config)
+		pci_bus_claim_resources(bus);
+
+	/*

arch/riscv/kernel/pci.c line 171

Quoted 10 lines
arch/riscv/kernel/pci.c new file +10 -0
+	 * Assign whatever was left unassigned. If we didn't claim above,
+	 * this will reassign everything.
+	 */
+	pci_assign_unassigned_root_bus_resources(bus);
+
+	list_for_each_entry(child, &bus->children, node)
+		pcie_bus_configure_settings(child);
+
+	return bus;
+}

Anyways, this does look to be "leveraged from arm64" as you say and I only had minor nits to comment about...

Quoted 2 lines

Thanks!
Sunil

#14 lore raw

Re: [PATCH 06/24] RISC-V: ACPI: Add PCI functions to build ACPI core

Quoted 12 lines · Sunil V L
Quoted 11 lines · Conor Dooley

arch/riscv/kernel/pci.c line 77

Quoted 6 lines · Sunil V L
arch/riscv/kernel/pci.c new file +6 -0
+/*
+ * Lookup the bus range for the domain in MCFG, and set up config space
+ * mapping.
+ */
+static struct pci_config_window *
+pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root)

This all fits on 1 line.

Quoted 1 line

It actually goes beyond 80 characters, right?

100 chars is the limit :)

#15 lore raw

Re: [PATCH 06/24] RISC-V: ACPI: Add PCI functions to build ACPI core

In reply to Sunil V L
Quoted 4 lines · Sunil V L

When CONFIG_PCI is enabled, ACPI core expects few arch functions related to PCI. Add those functions so that ACPI core gets build. These are levraged from arm64.

Presumably this is pretty generic and applies to anything without x86 weirdness. Copying all this supposedly architecture specific code that’s really generic seems like bad practice to me as an outsider. Should this not be unifying the two in a shared location as has been done for other subsystems?

Jess

Quoted 203 lines

---
arch/riscv/kernel/Makefile | 1 +
arch/riscv/kernel/pci.c | 173 +++++++++++++++++++++++++++++++++++++

2 files changed, 174 insertions(+)

create mode 100644 arch/riscv/kernel/pci.c

arch/riscv/kernel/Makefile +0 -0
index f979dc8cf47d..e9d37639751d 100644
@@ -92,3 +92,4 @@ obj-$(CONFIG_COMPAT)		+= compat_signal.o

obj-$(CONFIG_COMPAT) += compat_vdso/

obj-$(CONFIG_ACPI) += acpi.o

arch/riscv/kernel/Makefile +1 -0
+obj-$(CONFIG_PCI)               += pci.o
arch/riscv/kernel/pci.c new file +173 -0
new file mode 100644
index 000000000000..3388af3a67a0
@@ -0,0 +1,173 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Code borrowed from ARM64
+ *
+ * Copyright (C) 2003 Anton Blanchard <[email protected]>, IBM
+ * Copyright (C) 2014 ARM Ltd.
+ * Copyright (C) 2022-2023 Ventana Micro System Inc.
+ */
+
+#include <linux/acpi.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/pci.h>
+#include <linux/pci-acpi.h>
+#include <linux/pci-ecam.h>
+
+#ifdef CONFIG_ACPI
+
+/*
+ * raw_pci_read/write - Platform-specific PCI config space access.
+ */
+int raw_pci_read(unsigned int domain, unsigned int bus,
+		  unsigned int devfn, int reg, int len, u32 *val)
+{
+	struct pci_bus *b = pci_find_bus(domain, bus);
+
+	if (!b)
+		return PCIBIOS_DEVICE_NOT_FOUND;
+	return b->ops->read(b, devfn, reg, len, val);
+}
+
+int raw_pci_write(unsigned int domain, unsigned int bus,
+		unsigned int devfn, int reg, int len, u32 val)
+{
+	struct pci_bus *b = pci_find_bus(domain, bus);
+
+	if (!b)
+		return PCIBIOS_DEVICE_NOT_FOUND;
+	return b->ops->write(b, devfn, reg, len, val);
+}
+
+
+struct acpi_pci_generic_root_info {
+	struct acpi_pci_root_info	common;
+	struct pci_config_window	*cfg;	/* config space mapping */
+};
+
+int acpi_pci_bus_find_domain_nr(struct pci_bus *bus)
+{
+	struct pci_config_window *cfg = bus->sysdata;
+	struct acpi_device *adev = to_acpi_device(cfg->parent);
+	struct acpi_pci_root *root = acpi_driver_data(adev);
+
+	return root->segment;
+}
+
+static int pci_acpi_root_prepare_resources(struct acpi_pci_root_info *ci)
+{
+	struct resource_entry *entry, *tmp;
+	int status;
+
+	status = acpi_pci_probe_root_resources(ci);
+	resource_list_for_each_entry_safe(entry, tmp, &ci->resources) {
+		if (!(entry->res->flags & IORESOURCE_WINDOW))
+			resource_list_destroy_entry(entry);
+	}
+	return status;
+}
+
+/*
+ * Lookup the bus range for the domain in MCFG, and set up config space
+ * mapping.
+ */
+static struct pci_config_window *
+pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root)
+{
+	struct device *dev = &root->device->dev;
+	struct resource *bus_res = &root->secondary;
+	u16 seg = root->segment;
+	const struct pci_ecam_ops *ecam_ops;
+	struct resource cfgres;
+	struct acpi_device *adev;
+	struct pci_config_window *cfg;
+	int ret;
+
+	ret = pci_mcfg_lookup(root, &cfgres, &ecam_ops);
+	if (ret) {
+		dev_err(dev, "%04x:%pR ECAM region not found\n", seg, bus_res);
+		return NULL;
+	}
+
+	adev = acpi_resource_consumer(&cfgres);
+	if (adev)
+		dev_info(dev, "ECAM area %pR reserved by %s\n", &cfgres,
+			 dev_name(&adev->dev));
+	else
+		dev_warn(dev, FW_BUG "ECAM area %pR not reserved in ACPI namespace\n",
+			 &cfgres);
+
+	cfg = pci_ecam_create(dev, &cfgres, bus_res, ecam_ops);
+	if (IS_ERR(cfg)) {
+		dev_err(dev, "%04x:%pR error %ld mapping ECAM\n", seg, bus_res,
+			PTR_ERR(cfg));
+		return NULL;
+	}
+
+	return cfg;
+}
+
+/* release_info: free resources allocated by init_info */
+static void pci_acpi_generic_release_info(struct acpi_pci_root_info *ci)
+{
+	struct acpi_pci_generic_root_info *ri;
+
+	ri = container_of(ci, struct acpi_pci_generic_root_info, common);
+	pci_ecam_free(ri->cfg);
+	kfree(ci->ops);
+	kfree(ri);
+}
+
+
+/* Interface called from ACPI code to setup PCI host controller */
+struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
+{
+	struct acpi_pci_generic_root_info *ri;
+	struct pci_bus *bus, *child;
+	struct acpi_pci_root_ops *root_ops;
+	struct pci_host_bridge *host;
+
+	ri = kzalloc(sizeof(*ri), GFP_KERNEL);
+	if (!ri)
+		return NULL;
+
+	root_ops = kzalloc(sizeof(*root_ops), GFP_KERNEL);
+	if (!root_ops) {
+		kfree(ri);
+		return NULL;
+	}
+
+	ri->cfg = pci_acpi_setup_ecam_mapping(root);
+	if (!ri->cfg) {
+		kfree(ri);
+		kfree(root_ops);
+		return NULL;
+	}
+
+	root_ops->release_info = pci_acpi_generic_release_info;
+	root_ops->prepare_resources = pci_acpi_root_prepare_resources;
+	root_ops->pci_ops = (struct pci_ops *)&ri->cfg->ops->pci_ops;
+	bus = acpi_pci_root_create(root, root_ops, &ri->common, ri->cfg);
+	if (!bus)
+		return NULL;
+
+	/* If we must preserve the resource configuration, claim now */
+	host = pci_find_host_bridge(bus);
+	if (host->preserve_config)
+		pci_bus_claim_resources(bus);
+
+	/*
+	 * Assign whatever was left unassigned. If we didn't claim above,
+	 * this will reassign everything.
+	 */
+	pci_assign_unassigned_root_bus_resources(bus);
+
+	list_for_each_entry(child, &bus->children, node)
+		pcie_bus_configure_settings(child);
+
+	return bus;
+}
+
+#endif
Signature · 7 lines
2.38.0


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author maintainer
#16 lore raw

Re: [PATCH 06/24] RISC-V: ACPI: Add PCI functions to build ACPI core

Quoted 11 lines · Jessica Clarke
Quoted 4 lines · Sunil V L

When CONFIG_PCI is enabled, ACPI core expects few arch functions related to PCI. Add those functions so that ACPI core gets build. These are levraged from arm64.

Presumably this is pretty generic and applies to anything without x86 weirdness. Copying all this supposedly architecture specific code that’s really generic seems like bad practice to me as an outsider. Should this not be unifying the two in a shared location as has been done for other subsystems?

Make sense. Let me add these functions in a common location pci-acpi.c for RISC-V. Other architectures can migrate to this in future.

Thanks,
Sunil

author maintainer
#17 lore raw

PATCH 7/24 RISC-V: ACPI: Enable ACPI build infrastructure

In reply to Sunil V L

Enable build infrastructure to add ACPI support for RISC-V.

---
 arch/riscv/Kconfig | 5 +++++
 1 file changed, 5 insertions(+)
arch/riscv/Kconfig +5 -0
index d153e1cd890b..f664350679bc 100644
@@ -12,6 +12,9 @@ config 32BIT
 
 config RISCV
 	def_bool y
+	select ACPI_GENERIC_GSI if ACPI
+	select ACPI_MCFG if (ACPI && PCI)
+	select ACPI_REDUCED_HARDWARE_ONLY if ACPI
 	select ARCH_CLOCKSOURCE_INIT
 	select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION
 	select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
@@ -598,6 +601,7 @@ config EFI_STUB
 config EFI
 	bool "UEFI runtime support"
 	depends on OF && !XIP_KERNEL
+	select ARCH_SUPPORTS_ACPI if 64BIT
 	select LIBFDT
 	select UCS2_STRING
 	select EFI_PARAMS_FROM_FDT
@@ -703,3 +707,4 @@ source "drivers/cpufreq/Kconfig"
 endmenu # "CPU Power Management"
 
 source "arch/riscv/kvm/Kconfig"
+source "drivers/acpi/Kconfig"
Signature · 1 line
2.38.0
#18 lore raw

Re: [PATCH 07/24] RISC-V: ACPI: Enable ACPI build infrastructure

Quoted 13 lines · Sunil V L

Enable build infrastructure to add ACPI support for RISC-V.

---
 arch/riscv/Kconfig | 5 +++++
 1 file changed, 5 insertions(+)
arch/riscv/Kconfig +0 -0
index d153e1cd890b..f664350679bc 100644

arch/riscv/Kconfig config 32BIT · line 16

Quoted 5 lines
arch/riscv/Kconfig +2 -0
@@ -12,6 +12,9 @@ config 32BIT
 
 config RISCV
 	def_bool y
+	select ACPI_GENERIC_GSI if ACPI
+	select ACPI_MCFG if (ACPI && PCI)

These brackets are not needed, right?

Quoted 13 lines
arch/riscv/Kconfig +2 -0
+	select ACPI_REDUCED_HARDWARE_ONLY if ACPI
 	select ARCH_CLOCKSOURCE_INIT
 	select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION
 	select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
@@ -598,6 +601,7 @@ config EFI_STUB
 config EFI
 	bool "UEFI runtime support"
 	depends on OF && !XIP_KERNEL
+	select ARCH_SUPPORTS_ACPI if 64BIT
 	select LIBFDT
 	select UCS2_STRING
 	select EFI_PARAMS_FROM_FDT

arch/riscv/Kconfig source "drivers/cpufreq/Kconfig" · line 710

Quoted 4 lines
arch/riscv/Kconfig +1 -0
@@ -703,3 +707,4 @@ source "drivers/cpufreq/Kconfig"
 endmenu # "CPU Power Management"
 
 source "arch/riscv/kvm/Kconfig"
+source "drivers/acpi/Kconfig"

For consistency with the rest of the file, a newline before drivers would be in order here.

author maintainer
#19 lore raw

Re: [PATCH 07/24] RISC-V: ACPI: Enable ACPI build infrastructure

Quoted 15 lines · Conor Dooley
Quoted 14 lines · Sunil V L

Enable build infrastructure to add ACPI support for RISC-V.

---
 arch/riscv/Kconfig | 5 +++++
 1 file changed, 5 insertions(+)
arch/riscv/Kconfig +0 -0
index d153e1cd890b..f664350679bc 100644
@@ -12,6 +12,9 @@ config 32BIT
 
Quoted 7 lines

arch/riscv/Kconfig config 32BIT · line 16

Quoted 4 lines
arch/riscv/Kconfig +2 -0
 config RISCV
 	def_bool y
+	select ACPI_GENERIC_GSI if ACPI
+	select ACPI_MCFG if (ACPI && PCI)

These brackets are not needed, right?

Okay.

Quoted 15 lines
Quoted 15 lines
arch/riscv/Kconfig +2 -0
+	select ACPI_REDUCED_HARDWARE_ONLY if ACPI
 	select ARCH_CLOCKSOURCE_INIT
 	select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION
 	select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
@@ -598,6 +601,7 @@ config EFI_STUB
 config EFI
 	bool "UEFI runtime support"
 	depends on OF && !XIP_KERNEL
+	select ARCH_SUPPORTS_ACPI if 64BIT
 	select LIBFDT
 	select UCS2_STRING
 	select EFI_PARAMS_FROM_FDT
@@ -703,3 +707,4 @@ source "drivers/cpufreq/Kconfig"
 endmenu # "CPU Power Management"
 
Quoted 6 lines

arch/riscv/Kconfig source "drivers/cpufreq/Kconfig" · line 710

Quoted 2 lines
arch/riscv/Kconfig +1 -0
 source "arch/riscv/kvm/Kconfig"
+source "drivers/acpi/Kconfig"

For consistency with the rest of the file, a newline before drivers would be in order here.

Sure.

Thanks
Sunil

author maintainer
#20 lore raw

PATCH 8/24 ACPI: Enable ACPI_PROCESSOR for RISC-V

In reply to Sunil V L

The ACPI processor driver is not currently enabled for RISC-V. Enable it

---
 drivers/acpi/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/Kconfig +1 -1
index ccbeab9500ec..b44ac8e55b54 100644
@@ -281,7 +281,7 @@ config ACPI_CPPC_LIB
 
 config ACPI_PROCESSOR
 	tristate "Processor"
-	depends on X86 || IA64 || ARM64 || LOONGARCH
+	depends on X86 || IA64 || ARM64 || LOONGARCH || RISCV
 	select ACPI_PROCESSOR_IDLE
 	select ACPI_CPU_FREQ_PSS if X86 || IA64 || LOONGARCH
 	select THERMAL
Signature · 1 line
2.38.0
author maintainer
#21 lore raw

PATCH 9/24 ACPI: OSL: Make should_use_kmap() 0 for RISC-V.

In reply to Sunil V L

Without this, if the tables are larger than 4K,
acpi_map() will fail.

---
 drivers/acpi/osl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/osl.c +1 -1
index 3269a888fb7a..f725813d0cce 100644
@@ -276,7 +276,7 @@ acpi_map_lookup_virt(void __iomem *virt, acpi_size size)
 	return NULL;
 }
 
-#if defined(CONFIG_IA64) || defined(CONFIG_ARM64)
+#if defined(CONFIG_IA64) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV)
 /* ioremap will take care of cache attributes */
 #define should_use_kmap(pfn)   0
 #else
Signature · 1 line
2.38.0
author maintainer
#22 lore raw

PATCH 10/24 ACPI: processor_core: RISC-V: Enable mapping processor to the hartid

In reply to Sunil V L

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.

---
 arch/riscv/include/asm/acpi.h |  3 +++
 drivers/acpi/processor_core.c | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
arch/riscv/include/asm/acpi.h +3 -0
index 8b9babaf3f25..c5cb9f96d404 100644
@@ -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
drivers/acpi/processor_core.c +28 -0
index 2ac48cda5b20..889f495b3481 100644
@@ -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;
 	}
Signature · 1 line
2.38.0
author maintainer
#23 lore raw

PATCH 11/24 RISC-V: ACPI: irqchip/riscv-intc: Add ACPI support

In reply to Sunil V L

Add support for initializing the RISC-V INTC driver on ACPI based platforms.

---
 drivers/irqchip/irq-riscv-intc.c | 79 +++++++++++++++++++++++++++-----
 1 file changed, 67 insertions(+), 12 deletions(-)
drivers/irqchip/irq-riscv-intc.c +67 -12
index f229e3e66387..044ec92fcba7 100644
@@ -6,6 +6,7 @@
  */
 
 #define pr_fmt(fmt) "riscv-intc: " fmt
+#include <linux/acpi.h>
 #include <linux/atomic.h>
 #include <linux/bits.h>
 #include <linux/cpu.h>
@@ -112,6 +113,30 @@ static struct fwnode_handle *riscv_intc_hwnode(void)
 	return intc_domain->fwnode;
 }
 
+static int __init riscv_intc_init_common(struct fwnode_handle *fn)
+{
+	int rc;
+
+	intc_domain = irq_domain_create_linear(fn, BITS_PER_LONG,
+					       &riscv_intc_domain_ops, NULL);
+	if (!intc_domain) {
+		pr_err("unable to add IRQ domain\n");
+		return -ENXIO;
+	}
+
+	rc = set_handle_irq(&riscv_intc_irq);
+	if (rc) {
+		pr_err("failed to set irq handler\n");
+		return rc;
+	}
+
+	riscv_set_intc_hwnode_fn(riscv_intc_hwnode);
+
+	pr_info("%d local interrupts mapped\n", BITS_PER_LONG);
+
+	return 0;
+}
+
 static int __init riscv_intc_init(struct device_node *node,
 				  struct device_node *parent)
 {
@@ -133,24 +158,54 @@ static int __init riscv_intc_init(struct device_node *node,
 	if (riscv_hartid_to_cpuid(hartid) != smp_processor_id())
 		return 0;
 
-	intc_domain = irq_domain_add_linear(node, BITS_PER_LONG,
-					    &riscv_intc_domain_ops, NULL);
-	if (!intc_domain) {
-		pr_err("unable to add IRQ domain\n");
-		return -ENXIO;
-	}
-
-	rc = set_handle_irq(&riscv_intc_irq);
+	rc = riscv_intc_init_common(of_node_to_fwnode(node));
 	if (rc) {
-		pr_err("failed to set irq handler\n");
+		pr_err("failed to initialize INTC\n");
 		return rc;
 	}
 
-	riscv_set_intc_hwnode_fn(riscv_intc_hwnode);
+	return 0;
+}
 
-	pr_info("%d local interrupts mapped\n", BITS_PER_LONG);
+IRQCHIP_DECLARE(riscv, "riscv,cpu-intc", riscv_intc_init);
+
+#ifdef CONFIG_ACPI
+
+static int __init
+riscv_intc_acpi_init(union acpi_subtable_headers *header,
+		     const unsigned long end)
+{
+	int rc;
+	struct fwnode_handle *fn;
+	struct acpi_madt_rintc *rintc;
+
+	rintc = (struct acpi_madt_rintc *)header;
+
+	/*
+	 * The ACPI MADT will have one INTC for each CPU (or HART)
+	 * so riscv_intc_acpi_init() function will be called once
+	 * for each INTC. We only need to do INTC initialization
+	 * for the INTC belonging to the boot CPU (or boot HART).
+	 */
+	if (riscv_hartid_to_cpuid(rintc->hart_id) != smp_processor_id())
+		return 0;
+
+	fn = irq_domain_alloc_named_fwnode("RISCV-INTC");
+	WARN_ON(fn == NULL);
+	if (!fn) {
+		pr_err("unable to allocate INTC FW node\n");
+		return -1;
+	}
+
+	rc = riscv_intc_init_common(fn);
+	if (rc) {
+		pr_err("failed to initialize INTC\n");
+		return rc;
+	}
 
 	return 0;
 }
 
-IRQCHIP_DECLARE(riscv, "riscv,cpu-intc", riscv_intc_init);
+IRQCHIP_ACPI_DECLARE(riscv_intc, ACPI_MADT_TYPE_RINTC,
+		     NULL, 1, riscv_intc_acpi_init);
+#endif
Signature · 1 line
2.38.0
#24 lore raw

Re: [PATCH 11/24] RISC-V: ACPI: irqchip/riscv-intc: Add ACPI support

Quoted 88 lines · Sunil V L

Add support for initializing the RISC-V INTC driver on ACPI based platforms.

---
drivers/irqchip/irq-riscv-intc.c | 79 +++++++++++++++++++++++++++-----

1 file changed, 67 insertions(+), 12 deletions(-)
drivers/irqchip/irq-riscv-intc.c +41 -11
index f229e3e66387..044ec92fcba7 100644
@@ -6,6 +6,7 @@
 */
 
 #define pr_fmt(fmt) "riscv-intc: " fmt
+#include <linux/acpi.h>
 #include <linux/atomic.h>
 #include <linux/bits.h>
 #include <linux/cpu.h>
@@ -112,6 +113,30 @@ static struct fwnode_handle *riscv_intc_hwnode(void)
 	return intc_domain->fwnode;
 }
 
+static int __init riscv_intc_init_common(struct fwnode_handle *fn)
+{
+	int rc;
+
+	intc_domain = irq_domain_create_linear(fn, BITS_PER_LONG,
+					       &riscv_intc_domain_ops, NULL);
+	if (!intc_domain) {
+		pr_err("unable to add IRQ domain\n");
+		return -ENXIO;
+	}
+
+	rc = set_handle_irq(&riscv_intc_irq);
+	if (rc) {
+		pr_err("failed to set irq handler\n");
+		return rc;
+	}
+
+	riscv_set_intc_hwnode_fn(riscv_intc_hwnode);
+
+	pr_info("%d local interrupts mapped\n", BITS_PER_LONG);
+
+	return 0;
+}
+
 static int __init riscv_intc_init(struct device_node *node,
 				  struct device_node *parent)
 {
@@ -133,24 +158,54 @@ static int __init riscv_intc_init(struct device_node *node,
 	if (riscv_hartid_to_cpuid(hartid) != smp_processor_id())
 		return 0;
 
-	intc_domain = irq_domain_add_linear(node, BITS_PER_LONG,
-					    &riscv_intc_domain_ops, NULL);
-	if (!intc_domain) {
-		pr_err("unable to add IRQ domain\n");
-		return -ENXIO;
-	}
-
-	rc = set_handle_irq(&riscv_intc_irq);
+	rc = riscv_intc_init_common(of_node_to_fwnode(node));
 	if (rc) {
-		pr_err("failed to set irq handler\n");
+		pr_err("failed to initialize INTC\n");
 		return rc;
 	}
 
-	riscv_set_intc_hwnode_fn(riscv_intc_hwnode);
+	return 0;
+}
 
-	pr_info("%d local interrupts mapped\n", BITS_PER_LONG);
+IRQCHIP_DECLARE(riscv, "riscv,cpu-intc", riscv_intc_init);
+
+#ifdef CONFIG_ACPI
+
+static int __init
+riscv_intc_acpi_init(union acpi_subtable_headers *header,
+		     const unsigned long end)
+{
+	int rc;
+	struct fwnode_handle *fn;
+	struct acpi_madt_rintc *rintc;
+

drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 191

Quoted 10 lines
drivers/irqchip/irq-riscv-intc.c +10 -0
+	rintc = (struct acpi_madt_rintc *)header;
+
+	/*
+	 * The ACPI MADT will have one INTC for each CPU (or HART)
+	 * so riscv_intc_acpi_init() function will be called once
+	 * for each INTC. We only need to do INTC initialization
+	 * for the INTC belonging to the boot CPU (or boot HART).
+	 */
+	if (riscv_hartid_to_cpuid(rintc->hart_id) != smp_processor_id())
+		return 0;

Why are we carrying forward this mess to ACPI? The DT bindings are awful and a complete pain to deal with, as evidenced by how both Linux and FreeBSD have to go out of their way to do special things to only look at one of the many copies of the same thing.

Jess

Quoted 29 lines
drivers/irqchip/irq-riscv-intc.c +16 -1
+
+	fn = irq_domain_alloc_named_fwnode("RISCV-INTC");
+	WARN_ON(fn == NULL);
+	if (!fn) {
+		pr_err("unable to allocate INTC FW node\n");
+		return -1;
+	}
+
+	rc = riscv_intc_init_common(fn);
+	if (rc) {
+		pr_err("failed to initialize INTC\n");
+		return rc;
+	}
 
 	return 0;
 }
 
-IRQCHIP_DECLARE(riscv, "riscv,cpu-intc", riscv_intc_init);
+IRQCHIP_ACPI_DECLARE(riscv_intc, ACPI_MADT_TYPE_RINTC,
+		     NULL, 1, riscv_intc_acpi_init);
+#endif
Signature · 7 lines
2.38.0


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
author maintainer
#25 lore raw

Re: [PATCH 11/24] RISC-V: ACPI: irqchip/riscv-intc: Add ACPI support

Hi Jessica,

Quoted 96 lines · Jessica Clarke
Quoted 95 lines · Sunil V L

Add support for initializing the RISC-V INTC driver on ACPI based platforms.

---
drivers/irqchip/irq-riscv-intc.c | 79 +++++++++++++++++++++++++++-----

1 file changed, 67 insertions(+), 12 deletions(-)
drivers/irqchip/irq-riscv-intc.c +48 -11
index f229e3e66387..044ec92fcba7 100644
@@ -6,6 +6,7 @@
 */
 
 #define pr_fmt(fmt) "riscv-intc: " fmt
+#include <linux/acpi.h>
 #include <linux/atomic.h>
 #include <linux/bits.h>
 #include <linux/cpu.h>
@@ -112,6 +113,30 @@ static struct fwnode_handle *riscv_intc_hwnode(void)
 	return intc_domain->fwnode;
 }
 
+static int __init riscv_intc_init_common(struct fwnode_handle *fn)
+{
+	int rc;
+
+	intc_domain = irq_domain_create_linear(fn, BITS_PER_LONG,
+					       &riscv_intc_domain_ops, NULL);
+	if (!intc_domain) {
+		pr_err("unable to add IRQ domain\n");
+		return -ENXIO;
+	}
+
+	rc = set_handle_irq(&riscv_intc_irq);
+	if (rc) {
+		pr_err("failed to set irq handler\n");
+		return rc;
+	}
+
+	riscv_set_intc_hwnode_fn(riscv_intc_hwnode);
+
+	pr_info("%d local interrupts mapped\n", BITS_PER_LONG);
+
+	return 0;
+}
+
 static int __init riscv_intc_init(struct device_node *node,
 				  struct device_node *parent)
 {
@@ -133,24 +158,54 @@ static int __init riscv_intc_init(struct device_node *node,
 	if (riscv_hartid_to_cpuid(hartid) != smp_processor_id())
 		return 0;
 
-	intc_domain = irq_domain_add_linear(node, BITS_PER_LONG,
-					    &riscv_intc_domain_ops, NULL);
-	if (!intc_domain) {
-		pr_err("unable to add IRQ domain\n");
-		return -ENXIO;
-	}
-
-	rc = set_handle_irq(&riscv_intc_irq);
+	rc = riscv_intc_init_common(of_node_to_fwnode(node));
 	if (rc) {
-		pr_err("failed to set irq handler\n");
+		pr_err("failed to initialize INTC\n");
 		return rc;
 	}
 
-	riscv_set_intc_hwnode_fn(riscv_intc_hwnode);
+	return 0;
+}
 
-	pr_info("%d local interrupts mapped\n", BITS_PER_LONG);
+IRQCHIP_DECLARE(riscv, "riscv,cpu-intc", riscv_intc_init);
+
+#ifdef CONFIG_ACPI
+
+static int __init
+riscv_intc_acpi_init(union acpi_subtable_headers *header,
+		     const unsigned long end)
+{
+	int rc;
+	struct fwnode_handle *fn;
+	struct acpi_madt_rintc *rintc;
+
+	rintc = (struct acpi_madt_rintc *)header;
+
+	/*
+	 * The ACPI MADT will have one INTC for each CPU (or HART)
+	 * so riscv_intc_acpi_init() function will be called once
+	 * for each INTC. We only need to do INTC initialization
+	 * for the INTC belonging to the boot CPU (or boot HART).
Quoted 9 lines

drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 191

Quoted 3 lines
drivers/irqchip/irq-riscv-intc.c +3 -0
+	 */
+	if (riscv_hartid_to_cpuid(rintc->hart_id) != smp_processor_id())
+		return 0;

Why are we carrying forward this mess to ACPI? The DT bindings are awful and a complete pain to deal with, as evidenced by how both Linux and FreeBSD have to go out of their way to do special things to only look at one of the many copies of the same thing.

Local interrupt controller structures are per-cpu in any architecture. So, there will be multiple such structures. It is upto the OS to choose one of them. What is the issue here?

The RISC-V DT code is selecting the one which is corresponding to the boot cpu. While in ACPI we can choose any one, I think it is better to follow the DT code to keep it similar and boot cpu is always guaranteed to be available.

Thanks!
Sunil

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

#26 lore raw

Re: [PATCH 11/24] RISC-V: ACPI: irqchip/riscv-intc: Add ACPI support

In reply to Sunil V L

Hey Sunil,

Quoted 16 lines · Sunil V L

Add support for initializing the RISC-V INTC driver on ACPI based platforms.

drivers/irqchip/irq-riscv-intc.c +11 -0
+static int __init
+riscv_intc_acpi_init(union acpi_subtable_headers *header,
+		     const unsigned long end)
+{
+	int rc;
+	struct fwnode_handle *fn;
+	struct acpi_madt_rintc *rintc;
+
+	rintc = (struct acpi_madt_rintc *)header;
+
+	/*

drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 194

Quoted 10 lines
drivers/irqchip/irq-riscv-intc.c +10 -0
+	 * The ACPI MADT will have one INTC for each CPU (or HART)
+	 * so riscv_intc_acpi_init() function will be called once
+	 * for each INTC. We only need to do INTC initialization
+	 * for the INTC belonging to the boot CPU (or boot HART).
+	 */
+	if (riscv_hartid_to_cpuid(rintc->hart_id) != smp_processor_id())
+		return 0;
+
+	fn = irq_domain_alloc_named_fwnode("RISCV-INTC");
+	WARN_ON(fn == NULL);

Is there a reason that you do not just check this as !fn?

drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 195

Quoted 1 line
drivers/irqchip/irq-riscv-intc.c +1 -0
+	if (!fn) {

This is a repeated check from the WARN_ON(), no?

drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 196

Quoted 1 line
drivers/irqchip/irq-riscv-intc.c +1 -0
+		pr_err("unable to allocate INTC FW node\n");

Why do you need a WARN_ON() & the pr_err() here?

drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 197

Quoted 1 line
drivers/irqchip/irq-riscv-intc.c +1 -0
+		return -1;

Why not an actual ERRNO?

Cheers,
Conor.

Quoted 18 lines
drivers/irqchip/irq-riscv-intc.c +10 -1
+	}
+
+	rc = riscv_intc_init_common(fn);
+	if (rc) {
+		pr_err("failed to initialize INTC\n");
+		return rc;
+	}
 
 	return 0;
 }
 
-IRQCHIP_DECLARE(riscv, "riscv,cpu-intc", riscv_intc_init);
+IRQCHIP_ACPI_DECLARE(riscv_intc, ACPI_MADT_TYPE_RINTC,
+		     NULL, 1, riscv_intc_acpi_init);
+#endif
Signature · 1 line
2.38.0
author maintainer
#27 lore raw

Re: [PATCH 11/24] RISC-V: ACPI: irqchip/riscv-intc: Add ACPI support

Quoted 32 lines · Conor Dooley

Hey Sunil,

Quoted 16 lines · Sunil V L

Add support for initializing the RISC-V INTC driver on ACPI based platforms.

drivers/irqchip/irq-riscv-intc.c +11 -0
+static int __init
+riscv_intc_acpi_init(union acpi_subtable_headers *header,
+		     const unsigned long end)
+{
+	int rc;
+	struct fwnode_handle *fn;
+	struct acpi_madt_rintc *rintc;
+
+	rintc = (struct acpi_madt_rintc *)header;
+
+	/*

drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 194

Quoted 10 lines
drivers/irqchip/irq-riscv-intc.c +10 -0
+	 * The ACPI MADT will have one INTC for each CPU (or HART)
+	 * so riscv_intc_acpi_init() function will be called once
+	 * for each INTC. We only need to do INTC initialization
+	 * for the INTC belonging to the boot CPU (or boot HART).
+	 */
+	if (riscv_hartid_to_cpuid(rintc->hart_id) != smp_processor_id())
+		return 0;
+
+	fn = irq_domain_alloc_named_fwnode("RISCV-INTC");
+	WARN_ON(fn == NULL);

Is there a reason that you do not just check this as !fn?

Quoted 8 lines

drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 195

Quoted 1 line
drivers/irqchip/irq-riscv-intc.c +1 -0
+	if (!fn) {

This is a repeated check from the WARN_ON(), no?

drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 196

Quoted 1 line
drivers/irqchip/irq-riscv-intc.c +1 -0
+		pr_err("unable to allocate INTC FW node\n");

Why do you need a WARN_ON() & the pr_err() here?

You are right. Will remove the WARN_ON.

Quoted 4 lines

drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 197

Quoted 1 line
drivers/irqchip/irq-riscv-intc.c +1 -0
+		return -1;

Why not an actual ERRNO?

Okay.

Thanks,
Sunil

author maintainer
#28 lore raw

PATCH 12/24 RISC-V: ACPI: smpboot: Create wrapper smp_setup()

In reply to Sunil V L

smp_setup() currently assumes DT based platforms. To enable ACPI, first make this as a wrapper function and move existing code to a separate DT specific function.

---
 arch/riscv/kernel/smpboot.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
arch/riscv/kernel/smpboot.c +6 -1
index 00b53913d4c6..26214ddefaa4 100644
@@ -70,7 +70,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 	}
 }
 
-void __init setup_smp(void)
+static void __init of_parse_and_init_cpus(void)
 {
 	struct device_node *dn;
 	unsigned long hart;
@@ -116,6 +116,11 @@ void __init setup_smp(void)
 	}
 }
 
+void __init setup_smp(void)
+{
+	of_parse_and_init_cpus();
+}
+
 static int start_secondary_cpu(int cpu, struct task_struct *tidle)
 {
 	if (cpu_ops[cpu]->cpu_start)
Signature · 1 line
2.38.0
Reviewed-by on v1 12/24
#29 lore raw

Re: [PATCH 12/24] RISC-V: ACPI: smpboot: Create wrapper smp_setup()

Quoted 1 line · Sunil V L

Subject: RISC-V: ACPI: smpboot: Create wrapper smp_setup()

As I pointed out the other day, this one of the patches that really doesn't warrant an ACPI: prefix.

With that fixed:

Cheers,
Conor.

Quoted 37 lines

smp_setup() currently assumes DT based platforms. To enable ACPI, first make this as a wrapper function and move existing code to a separate DT specific function.

---
 arch/riscv/kernel/smpboot.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
arch/riscv/kernel/smpboot.c +6 -1
index 00b53913d4c6..26214ddefaa4 100644
@@ -70,7 +70,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 	}
 }
 
-void __init setup_smp(void)
+static void __init of_parse_and_init_cpus(void)
 {
 	struct device_node *dn;
 	unsigned long hart;
@@ -116,6 +116,11 @@ void __init setup_smp(void)
 	}
 }
 
+void __init setup_smp(void)
+{
+	of_parse_and_init_cpus();
+}
+
 static int start_secondary_cpu(int cpu, struct task_struct *tidle)
 {
 	if (cpu_ops[cpu]->cpu_start)
Signature · 1 line
2.38.0
author maintainer
#30 lore raw

PATCH 13/24 RISC-V: ACPI: smpboot: Add ACPI support in smp_setup()

In reply to Sunil V L

Add function to parse the RINTC structure in
the MADT table and create the required initializations to enable SMP boot on ACPI based platforms.

---
 arch/riscv/include/asm/acpi.h |  7 ++++
 arch/riscv/kernel/smpboot.c   | 73 ++++++++++++++++++++++++++++++++++-
 2 files changed, 79 insertions(+), 1 deletion(-)
arch/riscv/include/asm/acpi.h +7 -0
index c5cb9f96d404..d1f1e53ec657 100644
@@ -58,6 +58,13 @@ static inline bool acpi_has_cpu_in_madt(void)
 }
 
 static inline void arch_fix_phys_package_id(int num, u32 slot) { }
+
+#ifdef CONFIG_ACPI_NUMA
+int acpi_numa_get_nid(unsigned int cpu);
+#else
+static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
+#endif /* CONFIG_ACPI_NUMA */
+
 #endif
 
 #endif /*_ASM_ACPI_H*/
arch/riscv/kernel/smpboot.c +72 -1

91 lines not on this page · raw message

Signature · 1 line
2.38.0
Reviewed-by on v1 13/24
#31 lore raw

Re: [PATCH 13/24] RISC-V: ACPI: smpboot: Add ACPI support in smp_setup()

Quoted 41 lines · Sunil V L

Add function to parse the RINTC structure in
the MADT table and create the required initializations to enable SMP boot on ACPI based platforms.

---
 arch/riscv/include/asm/acpi.h |  7 ++++
 arch/riscv/kernel/smpboot.c   | 73 ++++++++++++++++++++++++++++++++++-
 2 files changed, 79 insertions(+), 1 deletion(-)
arch/riscv/include/asm/acpi.h +7 -0
index c5cb9f96d404..d1f1e53ec657 100644
@@ -58,6 +58,13 @@ static inline bool acpi_has_cpu_in_madt(void)
 }
 
 static inline void arch_fix_phys_package_id(int num, u32 slot) { }
+
+#ifdef CONFIG_ACPI_NUMA
+int acpi_numa_get_nid(unsigned int cpu);
+#else
+static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
+#endif /* CONFIG_ACPI_NUMA */
+
 #endif
 
 #endif /*_ASM_ACPI_H*/
arch/riscv/kernel/smpboot.c +1 -0
index 26214ddefaa4..e48cf88d0bc1 100644
@@ -8,6 +8,7 @@
  * Copyright (C) 2017 SiFive
  */
 
+#include <linux/acpi.h>
 #include <linux/arch_topology.h>
 #include <linux/module.h>
 #include <linux/init.h>

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 79

Quoted 9 lines
arch/riscv/kernel/smpboot.c +6 -0
@@ -70,6 +71,73 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 	}
 }
 
+#ifdef CONFIG_ACPI
+static unsigned int cpu_count = 1;
+
+static int __init
+acpi_parse_rintc(union acpi_subtable_headers *header,
+			     const unsigned long end)

This all fits on one line. And also avoids the checkpatch complaint from what you have currently done...

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 86

Quoted 7 lines
arch/riscv/kernel/smpboot.c +7 -0
+{
+	unsigned long hart;
+	bool found_boot_cpu = false;
+
+	struct acpi_madt_rintc *processor;
+
+	processor = (struct acpi_madt_rintc *)header;

Why not combine the above two lines?

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 88

Quoted 1 line
arch/riscv/kernel/smpboot.c +1 -0
+	/* RINTC entry which has !ACPI_MADT_ENABLED is not enabled so skip */

This comment is a bit -ENOPARSE. Please reword it in a way that is understandable to mere mortals like myself.

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 94

Quoted 6 lines
arch/riscv/kernel/smpboot.c +6 -0
+	if (!(processor->flags & ACPI_MADT_ENABLED))
+		return 0;
+
+	hart = processor->hart_id;
+	if (hart < 0)
+		return 0;

Newline here please

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 97

Quoted 3 lines
arch/riscv/kernel/smpboot.c +3 -0
+	if (hart == cpuid_to_hartid_map(0)) {
+		BUG_ON(found_boot_cpu);
+		found_boot_cpu = 1;

This is a bool, why not assign a bool value to it so it looks more intentional? I know this is copied from the dt code, but that should really be on too IMO.

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 100

Quoted 3 lines
arch/riscv/kernel/smpboot.c +3 -0
+		early_map_cpu_to_node(0, acpi_numa_get_nid(cpu_count));
+		return 0;
+	}

And a newline here too...

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 109

Quoted 9 lines
arch/riscv/kernel/smpboot.c +9 -0
+	if (cpu_count >= NR_CPUS) {
+		pr_warn("Invalid cpuid [%d] for hartid [%lu]\n",
+			cpu_count, hart);
+		return 0;
+	}
+
+	cpuid_to_hartid_map(cpu_count) = hart;
+	early_map_cpu_to_node(cpu_count, acpi_numa_get_nid(cpu_count));
+	cpu_count++;

...and also here please!

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 117

Quoted 8 lines
arch/riscv/kernel/smpboot.c +8 -0
+	return 0;
+}
+
+static void __init acpi_parse_and_init_cpus(void)
+{
+	int cpuid;
+
+	cpu_set_ops(0);

While I'm at it suggesting newline additions, adding them before comments would be great too.

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 128

Quoted 11 lines
arch/riscv/kernel/smpboot.c +11 -0
+	/*
+	 * do a walk of MADT to determine how many CPUs
+	 * we have including disabled CPUs, and get information
+	 * we need for SMP init.
+	 */
+	acpi_table_parse_madt(ACPI_MADT_TYPE_RINTC,
+				      acpi_parse_rintc, 0);
+
+	/*
+	 * NUMA - TODO
+	 */

TODO before merging, or TODO at some indeterminate point in the future?

Anyways, this is all nits & this largely seem to resemble the dt code, so with the nits fixed (and an s/ACPI: // in $subject):

Cheers,
Conor.

Quoted 34 lines
arch/riscv/kernel/smpboot.c +15 -1
+	for (cpuid = 1; cpuid < nr_cpu_ids; cpuid++) {
+		if (cpuid_to_hartid_map(cpuid) != INVALID_HARTID) {
+			cpu_set_ops(cpuid);
+			set_cpu_possible(cpuid, true);
+		}
+	}
+}
+#else
+#define acpi_parse_and_init_cpus(...)	do { } while (0)
+#endif
+
 static void __init of_parse_and_init_cpus(void)
 {
 	struct device_node *dn;
@@ -118,7 +186,10 @@ static void __init of_parse_and_init_cpus(void)
 
 void __init setup_smp(void)
 {
-	of_parse_and_init_cpus();
+	if (acpi_disabled)
+		of_parse_and_init_cpus();
+	else
+		acpi_parse_and_init_cpus();
 }
 
 static int start_secondary_cpu(int cpu, struct task_struct *tidle)
Signature · 7 lines
2.38.0


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
author maintainer
#32 lore raw

Re: [PATCH 13/24] RISC-V: ACPI: smpboot: Add ACPI support in smp_setup()

Quoted 45 lines · Conor Dooley
Quoted 44 lines · Sunil V L

Add function to parse the RINTC structure in
the MADT table and create the required initializations to enable SMP boot on ACPI based platforms.

---
 arch/riscv/include/asm/acpi.h |  7 ++++
 arch/riscv/kernel/smpboot.c   | 73 ++++++++++++++++++++++++++++++++++-
 2 files changed, 79 insertions(+), 1 deletion(-)
arch/riscv/include/asm/acpi.h +7 -0
index c5cb9f96d404..d1f1e53ec657 100644
@@ -58,6 +58,13 @@ static inline bool acpi_has_cpu_in_madt(void)
 }
 
 static inline void arch_fix_phys_package_id(int num, u32 slot) { }
+
+#ifdef CONFIG_ACPI_NUMA
+int acpi_numa_get_nid(unsigned int cpu);
+#else
+static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
+#endif /* CONFIG_ACPI_NUMA */
+
 #endif
 
 #endif /*_ASM_ACPI_H*/
arch/riscv/kernel/smpboot.c +1 -0
index 26214ddefaa4..e48cf88d0bc1 100644
@@ -8,6 +8,7 @@
  * Copyright (C) 2017 SiFive
  */
 
+#include <linux/acpi.h>
 #include <linux/arch_topology.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -70,6 +71,73 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 	}
 }
 
Quoted 10 lines

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 79

Quoted 6 lines
arch/riscv/kernel/smpboot.c +6 -0
+#ifdef CONFIG_ACPI
+static unsigned int cpu_count = 1;
+
+static int __init
+acpi_parse_rintc(union acpi_subtable_headers *header,
+			     const unsigned long end)

This all fits on one line. And also avoids the checkpatch complaint from what you have currently done...

Okay.

Quoted 10 lines

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 86

Quoted 7 lines
arch/riscv/kernel/smpboot.c +7 -0
+{
+	unsigned long hart;
+	bool found_boot_cpu = false;
+
+	struct acpi_madt_rintc *processor;
+
+	processor = (struct acpi_madt_rintc *)header;

Why not combine the above two lines?

Quoted 5 lines

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 88

Quoted 1 line
arch/riscv/kernel/smpboot.c +1 -0
+	/* RINTC entry which has !ACPI_MADT_ENABLED is not enabled so skip */

This comment is a bit -ENOPARSE. Please reword it in a way that is understandable to mere mortals like myself.

Okay, let me try :-).

Quoted 9 lines

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 94

Quoted 6 lines
arch/riscv/kernel/smpboot.c +6 -0
+	if (!(processor->flags & ACPI_MADT_ENABLED))
+		return 0;
+
+	hart = processor->hart_id;
+	if (hart < 0)
+		return 0;

Newline here please

Quoted 8 lines

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 97

Quoted 3 lines
arch/riscv/kernel/smpboot.c +3 -0
+	if (hart == cpuid_to_hartid_map(0)) {
+		BUG_ON(found_boot_cpu);
+		found_boot_cpu = 1;

This is a bool, why not assign a bool value to it so it looks more intentional? I know this is copied from the dt code, but that should really be on too IMO.

Okay.

Quoted 6 lines

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 100

Quoted 3 lines
arch/riscv/kernel/smpboot.c +3 -0
+		early_map_cpu_to_node(0, acpi_numa_get_nid(cpu_count));
+		return 0;
+	}

And a newline here too...

Okay.

Quoted 12 lines

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 109

Quoted 9 lines
arch/riscv/kernel/smpboot.c +9 -0
+	if (cpu_count >= NR_CPUS) {
+		pr_warn("Invalid cpuid [%d] for hartid [%lu]\n",
+			cpu_count, hart);
+		return 0;
+	}
+
+	cpuid_to_hartid_map(cpu_count) = hart;
+	early_map_cpu_to_node(cpu_count, acpi_numa_get_nid(cpu_count));
+	cpu_count++;

...and also here please!

Okay.

Quoted 12 lines

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 117

Quoted 8 lines
arch/riscv/kernel/smpboot.c +8 -0
+	return 0;
+}
+
+static void __init acpi_parse_and_init_cpus(void)
+{
+	int cpuid;
+
+	cpu_set_ops(0);

While I'm at it suggesting newline additions, adding them before comments would be great too.

Okay.

Quoted 5 lines
Quoted 5 lines
arch/riscv/kernel/smpboot.c +5 -0
+	/*
+	 * do a walk of MADT to determine how many CPUs
+	 * we have including disabled CPUs, and get information
+	 * we need for SMP init.
+	 */
Quoted 9 lines

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 128

Quoted 6 lines
arch/riscv/kernel/smpboot.c +6 -0
+	acpi_table_parse_madt(ACPI_MADT_TYPE_RINTC,
+				      acpi_parse_rintc, 0);
+
+	/*
+	 * NUMA - TODO
+	 */

TODO before merging, or TODO at some indeterminate point in the future?

Will remove this comment. We need to add NUMA after basic support is done.

Quoted 4 lines

Anyways, this is all nits & this largely seem to resemble the dt code, so with the nits fixed (and an s/ACPI: // in $subject):

Thanks!
Sunil

author maintainer
#33 lore raw

PATCH 14/24 RISC-V: ACPI: smpboot: Add function to retrieve the hartid

In reply to Sunil V L

hartid is in RINTC structuire in MADT table. Instead of parsing the ACPI table every time we need for a cpu, cache it and provide a function to read it.

This is similar to acpi_get_madt_gicc() in arm64.

---
 arch/riscv/include/asm/acpi.h | 14 +++++++++++++-
 arch/riscv/kernel/smpboot.c   | 21 +++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
arch/riscv/include/asm/acpi.h +13 -1
index d1f1e53ec657..69a880b7257a 100644
@@ -65,6 +65,18 @@ int acpi_numa_get_nid(unsigned int cpu);
 static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
 #endif /* CONFIG_ACPI_NUMA */
 
-#endif
+struct acpi_madt_rintc *acpi_get_madt_rintc(int cpu);
+struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu);
+static inline u32 get_acpi_id_for_cpu(int cpu)
+{
+	return	acpi_cpu_get_madt_rintc(cpu)->uid;
+}
+#else
+static inline u32 get_acpi_id_for_cpu(int cpu)
+{
+	return -1;
+}
+
+#endif /* CONFIG_ACPI */
 
 #endif /*_ASM_ACPI_H*/
arch/riscv/kernel/smpboot.c +21 -0
index e48cf88d0bc1..3a8b7a9eb5ac 100644
@@ -73,6 +73,25 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 
 #ifdef CONFIG_ACPI
 static unsigned int cpu_count = 1;
+static unsigned int intc_count;
+static struct acpi_madt_rintc cpu_madt_rintc[NR_CPUS];
+
+struct acpi_madt_rintc *acpi_get_madt_rintc(int cpu)
+{
+	return &cpu_madt_rintc[cpu];
+}
+
+struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu)
+{
+	int i;
+
+	for (i = 0; i < NR_CPUS; i++) {
+		if (riscv_hartid_to_cpuid(cpu_madt_rintc[i].hart_id) == cpu)
+			return &cpu_madt_rintc[i];
+	}
+	return NULL;
+}
+EXPORT_SYMBOL_GPL(acpi_cpu_get_madt_rintc);
 
 static int __init
 acpi_parse_rintc(union acpi_subtable_headers *header,
@@ -92,6 +111,8 @@ acpi_parse_rintc(union acpi_subtable_headers *header,
 	hart = processor->hart_id;
 	if (hart < 0)
 		return 0;
+
+	cpu_madt_rintc[intc_count++] = *processor;
 	if (hart == cpuid_to_hartid_map(0)) {
 		BUG_ON(found_boot_cpu);
 		found_boot_cpu = 1;
Signature · 1 line
2.38.0
#34 lore raw

Re: [PATCH 14/24] RISC-V: ACPI: smpboot: Add function to retrieve the hartid

Hey Sunil, Drew,

@drew, a question below that I'm sorta aiming at you...

Quoted 1 line · Sunil V L

hartid is in RINTC structuire in MADT table. Instead of parsing

Nit: missing articles before RINTC and MADT. Also typo "structure".

Perhaps you'd benefit from a spell checker in your git editor.

Quoted 4 lines

the ACPI table every time we need for a cpu, cache it and provide a function to read it.

This is similar to acpi_get_madt_gicc() in arm64.

-ENOTFOUND, do you mean acpi_cpu_get_madt_gicc()?

Quoted 40 lines
---
 arch/riscv/include/asm/acpi.h | 14 +++++++++++++-
 arch/riscv/kernel/smpboot.c   | 21 +++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
arch/riscv/include/asm/acpi.h +13 -1
index d1f1e53ec657..69a880b7257a 100644
@@ -65,6 +65,18 @@ int acpi_numa_get_nid(unsigned int cpu);
 static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
 #endif /* CONFIG_ACPI_NUMA */
 
-#endif
+struct acpi_madt_rintc *acpi_get_madt_rintc(int cpu);
+struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu);
+static inline u32 get_acpi_id_for_cpu(int cpu)
+{
+	return	acpi_cpu_get_madt_rintc(cpu)->uid;
+}
+#else
+static inline u32 get_acpi_id_for_cpu(int cpu)
+{
+	return -1;
+}
+
+#endif /* CONFIG_ACPI */
 
 #endif /*_ASM_ACPI_H*/
arch/riscv/kernel/smpboot.c +1 -0
index e48cf88d0bc1..3a8b7a9eb5ac 100644
@@ -73,6 +73,25 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 
 #ifdef CONFIG_ACPI
 static unsigned int cpu_count = 1;
+static unsigned int intc_count;

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 86

Quoted 10 lines
arch/riscv/kernel/smpboot.c +10 -0
+static struct acpi_madt_rintc cpu_madt_rintc[NR_CPUS];
+
+struct acpi_madt_rintc *acpi_get_madt_rintc(int cpu)
+{
+	return &cpu_madt_rintc[cpu];
+}
+
+struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu)
+{
+	int i;

Since we are C11 now, you don't even need to declare this outside of the loop, right?

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 88

Quoted 2 lines
arch/riscv/kernel/smpboot.c +2 -0
+
+	for (i = 0; i < NR_CPUS; i++) {

@drew, perhaps you know since you were fiddling not too long ago with cpumask stuff - at what point does for_each_possible_cpu() become usable?
I had a bit of a poke & couldn't immediately tell if it'd be okay to use it here.

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 92

Quoted 4 lines
arch/riscv/kernel/smpboot.c +4 -0
+		if (riscv_hartid_to_cpuid(cpu_madt_rintc[i].hart_id) == cpu)
+			return &cpu_madt_rintc[i];
+	}
+	return NULL;

Another nit: newline before return please :)

Quoted 17 lines
arch/riscv/kernel/smpboot.c +4 -0
+}
+EXPORT_SYMBOL_GPL(acpi_cpu_get_madt_rintc);
 
 static int __init
 acpi_parse_rintc(union acpi_subtable_headers *header,
@@ -92,6 +111,8 @@ acpi_parse_rintc(union acpi_subtable_headers *header,
 	hart = processor->hart_id;
 	if (hart < 0)
 		return 0;
+
+	cpu_madt_rintc[intc_count++] = *processor;
 	if (hart == cpuid_to_hartid_map(0)) {
 		BUG_ON(found_boot_cpu);
 		found_boot_cpu = 1;
Signature · 1 line
2.38.0
author maintainer
#35 lore raw

Re: [PATCH 14/24] RISC-V: ACPI: smpboot: Add function to retrieve the hartid

Quoted 11 lines · Conor Dooley

Hey Sunil, Drew,

@drew, a question below that I'm sorta aiming at you...

Quoted 1 line · Sunil V L

hartid is in RINTC structuire in MADT table. Instead of parsing

Nit: missing articles before RINTC and MADT. Also typo "structure".

Perhaps you'd benefit from a spell checker in your git editor.

Okay.

Quoted 7 lines
Quoted 4 lines

the ACPI table every time we need for a cpu, cache it and provide a function to read it.

This is similar to acpi_get_madt_gicc() in arm64.

-ENOTFOUND, do you mean acpi_cpu_get_madt_gicc()?

Yes. Will update.

Quoted 37 lines
Quoted 37 lines
---
 arch/riscv/include/asm/acpi.h | 14 +++++++++++++-
 arch/riscv/kernel/smpboot.c   | 21 +++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
arch/riscv/include/asm/acpi.h +13 -1
index d1f1e53ec657..69a880b7257a 100644
@@ -65,6 +65,18 @@ int acpi_numa_get_nid(unsigned int cpu);
 static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
 #endif /* CONFIG_ACPI_NUMA */
 
-#endif
+struct acpi_madt_rintc *acpi_get_madt_rintc(int cpu);
+struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu);
+static inline u32 get_acpi_id_for_cpu(int cpu)
+{
+	return	acpi_cpu_get_madt_rintc(cpu)->uid;
+}
+#else
+static inline u32 get_acpi_id_for_cpu(int cpu)
+{
+	return -1;
+}
+
+#endif /* CONFIG_ACPI */
 
 #endif /*_ASM_ACPI_H*/
arch/riscv/kernel/smpboot.c +0 -0
index e48cf88d0bc1..3a8b7a9eb5ac 100644
@@ -73,6 +73,25 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 
Quoted 17 lines

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 86

Quoted 13 lines
arch/riscv/kernel/smpboot.c +11 -0
 #ifdef CONFIG_ACPI
 static unsigned int cpu_count = 1;
+static unsigned int intc_count;
+static struct acpi_madt_rintc cpu_madt_rintc[NR_CPUS];
+
+struct acpi_madt_rintc *acpi_get_madt_rintc(int cpu)
+{
+	return &cpu_madt_rintc[cpu];
+}
+
+struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu)
+{
+	int i;

Since we are C11 now, you don't even need to declare this outside of the loop, right?

Okay.

Quoted 9 lines

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 88

Quoted 2 lines
arch/riscv/kernel/smpboot.c +2 -0
+
+	for (i = 0; i < NR_CPUS; i++) {

@drew, perhaps you know since you were fiddling not too long ago with cpumask stuff - at what point does for_each_possible_cpu() become usable?
I had a bit of a poke & couldn't immediately tell if it'd be okay to use it here.

It should be possible. Thanks!

Quoted 7 lines

arch/riscv/kernel/smpboot.c void __init smp_prepare_cpus(unsigned int max_cpus) · line 92

Quoted 4 lines
arch/riscv/kernel/smpboot.c +4 -0
+		if (riscv_hartid_to_cpuid(cpu_madt_rintc[i].hart_id) == cpu)
+			return &cpu_madt_rintc[i];
+	}
+	return NULL;

Another nit: newline before return please :)

Sure.

Thanks,
Sunil

author maintainer
#36 lore raw

PATCH 15/24 clocksource/timer-riscv: Refactor riscv_timer_init_dt()

In reply to Sunil V L

Refactor the timer init function such that few things can be shared by both DT and ACPI based platforms.

---
 drivers/clocksource/timer-riscv.c | 79 +++++++++++++++----------------
 1 file changed, 37 insertions(+), 42 deletions(-)
drivers/clocksource/timer-riscv.c +37 -42
index 1b4b36df5484..4016c065a01c 100644
@@ -119,61 +119,28 @@ static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static int __init riscv_timer_init_dt(struct device_node *n)
+static int __init riscv_timer_init_common(void)
 {
-	int cpuid, error;
-	unsigned long hartid;
-	struct device_node *child;
-	struct irq_domain *domain;
-
-	error = riscv_of_processor_hartid(n, &hartid);
-	if (error < 0) {
-		pr_warn("Not valid hartid for node [%pOF] error = [%lu]\n",
-			n, hartid);
-		return error;
-	}
-
-	cpuid = riscv_hartid_to_cpuid(hartid);
-	if (cpuid < 0) {
-		pr_warn("Invalid cpuid for hartid [%lu]\n", hartid);
-		return cpuid;
-	}
-
-	if (cpuid != smp_processor_id())
-		return 0;
+	int error;
+	struct fwnode_handle *intc_fwnode = riscv_get_intc_hwnode();
+	struct irq_domain *domain = NULL;
 
-	child = of_find_compatible_node(NULL, NULL, "riscv,timer");
-	if (child) {
-		riscv_timer_cannot_wake_cpu = of_property_read_bool(child,
-					"riscv,timer-cannot-wake-cpu");
-		of_node_put(child);
-	}
 
-	domain = NULL;
-	child = of_get_compatible_child(n, "riscv,cpu-intc");
-	if (!child) {
-		pr_err("Failed to find INTC node [%pOF]\n", n);
-		return -ENODEV;
-	}
-	domain = irq_find_host(child);
-	of_node_put(child);
+	domain = irq_find_matching_fwnode(intc_fwnode, DOMAIN_BUS_ANY);
 	if (!domain) {
-		pr_err("Failed to find IRQ domain for node [%pOF]\n", n);
+		pr_err("Failed to find INTC node [%pfwP]\n", intc_fwnode);
 		return -ENODEV;
 	}
 
 	riscv_clock_event_irq = irq_create_mapping(domain, RV_IRQ_TIMER);
 	if (!riscv_clock_event_irq) {
-		pr_err("Failed to map timer interrupt for node [%pOF]\n", n);
-		return -ENODEV;
+		pr_err("Failed to map timer interrupt for node [%pfwP]\n",
+			intc_fwnode);
 	}
 
-	pr_info("%s: Registering clocksource cpuid [%d] hartid [%lu]\n",
-	       __func__, cpuid, hartid);
 	error = clocksource_register_hz(&riscv_clocksource, riscv_timebase);
 	if (error) {
-		pr_err("RISCV timer register failed [%d] for cpu = [%d]\n",
-		       error, cpuid);
+		pr_err("clocksource register failed [%d]\n", error);
 		return error;
 	}
 
@@ -199,7 +166,35 @@ static int __init riscv_timer_init_dt(struct device_node *n)
 		static_branch_enable(&riscv_sstc_available);
 	}
 
+	pr_info("timer registered using %s\n",
+		(static_branch_likely(&riscv_sstc_available)) ?
+		"RISC-V Sstc" : "RISC-V SBI");
+
 	return error;
 }
 
+static int __init riscv_timer_init_dt(struct device_node *n)
+{
+	int cpuid, error;
+	unsigned long hartid;
+
+	error = riscv_of_processor_hartid(n, &hartid);
+	if (error < 0) {
+		pr_warn("Not valid hartid for node [%pOF] error = [%lu]\n",
+			n, hartid);
+		return error;
+	}
+
+	cpuid = riscv_hartid_to_cpuid(hartid);
+	if (cpuid < 0) {
+		pr_warn("Invalid cpuid for hartid [%lu]\n", hartid);
+		return cpuid;
+	}
+
+	if (cpuid != smp_processor_id())
+		return 0;
+
+	return riscv_timer_init_common();
+}
+
 TIMER_OF_DECLARE(riscv_timer, "riscv", riscv_timer_init_dt);
Signature · 1 line
2.38.0
#37 lore raw

Re: [PATCH 15/24] clocksource/timer-riscv: Refactor riscv_timer_init_dt()

Hey Sunil,

Quoted 4 lines · Sunil V L

Refactor the timer init function such that few things can be shared by both DT and ACPI based platforms.

What did Anup do here? He's not author or co-author, so the SoB chain looks incorrect.

Quoted 36 lines
---
 drivers/clocksource/timer-riscv.c | 79 +++++++++++++++----------------
 1 file changed, 37 insertions(+), 42 deletions(-)
drivers/clocksource/timer-riscv.c +1 -21
index 1b4b36df5484..4016c065a01c 100644
@@ -119,61 +119,28 @@ static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static int __init riscv_timer_init_dt(struct device_node *n)
+static int __init riscv_timer_init_common(void)
 {
-	int cpuid, error;
-	unsigned long hartid;
-	struct device_node *child;
-	struct irq_domain *domain;
-
-	error = riscv_of_processor_hartid(n, &hartid);
-	if (error < 0) {
-		pr_warn("Not valid hartid for node [%pOF] error = [%lu]\n",
-			n, hartid);
-		return error;
-	}
-
-	cpuid = riscv_hartid_to_cpuid(hartid);
-	if (cpuid < 0) {
-		pr_warn("Invalid cpuid for hartid [%lu]\n", hartid);
-		return cpuid;
-	}
-
-	if (cpuid != smp_processor_id())
-		return 0;

drivers/clocksource/timer-riscv.c static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id) · line 150

Quoted 10 lines
drivers/clocksource/timer-riscv.c +3 -6
+	int error;
+	struct fwnode_handle *intc_fwnode = riscv_get_intc_hwnode();
+	struct irq_domain *domain = NULL;
 
-	child = of_find_compatible_node(NULL, NULL, "riscv,timer");
-	if (child) {
-		riscv_timer_cannot_wake_cpu = of_property_read_bool(child,
-					"riscv,timer-cannot-wake-cpu");
-		of_node_put(child);
-	}

Uhh, where did this code go?
Unless I've badly missed something, this has vanished in the patch.

Quoted 21 lines
drivers/clocksource/timer-riscv.c +3 -11
-	domain = NULL;
-	child = of_get_compatible_child(n, "riscv,cpu-intc");
-	if (!child) {
-		pr_err("Failed to find INTC node [%pOF]\n", n);
-		return -ENODEV;
-	}
-	domain = irq_find_host(child);
-	of_node_put(child);
+	domain = irq_find_matching_fwnode(intc_fwnode, DOMAIN_BUS_ANY);
 	if (!domain) {
-		pr_err("Failed to find IRQ domain for node [%pOF]\n", n);
+		pr_err("Failed to find INTC node [%pfwP]\n", intc_fwnode);
 		return -ENODEV;
 	}
 
 	riscv_clock_event_irq = irq_create_mapping(domain, RV_IRQ_TIMER);
 	if (!riscv_clock_event_irq) {
-		pr_err("Failed to map timer interrupt for node [%pOF]\n", n);
-		return -ENODEV;
+		pr_err("Failed to map timer interrupt for node [%pfwP]\n",

drivers/clocksource/timer-riscv.c static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id) · line 143

Quoted 10 lines
drivers/clocksource/timer-riscv.c +2 -4
+			intc_fwnode);
 	}
 
-	pr_info("%s: Registering clocksource cpuid [%d] hartid [%lu]\n",
-	       __func__, cpuid, hartid);
 	error = clocksource_register_hz(&riscv_clocksource, riscv_timebase);
 	if (error) {
-		pr_err("RISCV timer register failed [%d] for cpu = [%d]\n",
-		       error, cpuid);
+		pr_err("clocksource register failed [%d]\n", error);

If you're changing this, s/register/registration/ to be grammatically correct I suppose.

drivers/clocksource/timer-riscv.c static int __init riscv_timer_init_dt(struct device_node *n) · line 171

Quoted 10 lines
drivers/clocksource/timer-riscv.c +3 -0
 		return error;
 	}
 
@@ -199,7 +166,35 @@ static int __init riscv_timer_init_dt(struct device_node *n)
 		static_branch_enable(&riscv_sstc_available);
 	}
 
+	pr_info("timer registered using %s\n",
+		(static_branch_likely(&riscv_sstc_available)) ?
+		"RISC-V Sstc" : "RISC-V SBI");

Why is this needed? Isn't there a print like 3 lines above here that says "Timer interrupt in S-mode is available via sstc extension"?

drivers/clocksource/timer-riscv.c static int __init riscv_timer_init_dt(struct device_node *n) · line 183

Quoted 12 lines
drivers/clocksource/timer-riscv.c +9 -0
+
 	return error;
 }
 
+static int __init riscv_timer_init_dt(struct device_node *n)
+{
+	int cpuid, error;
+	unsigned long hartid;
+
+	error = riscv_of_processor_hartid(n, &hartid);
+	if (error < 0) {
+		pr_warn("Not valid hartid for node [%pOF] error = [%lu]\n",

While you're already moving this, may as well fix the grammar IMO. s/Not valid/Invalid/

Cheers,
Conor.

Quoted 20 lines
drivers/clocksource/timer-riscv.c +16 -0
+			n, hartid);
+		return error;
+	}
+
+	cpuid = riscv_hartid_to_cpuid(hartid);
+	if (cpuid < 0) {
+		pr_warn("Invalid cpuid for hartid [%lu]\n", hartid);
+		return cpuid;
+	}
+
+	if (cpuid != smp_processor_id())
+		return 0;
+
+	return riscv_timer_init_common();
+}
+
 TIMER_OF_DECLARE(riscv_timer, "riscv", riscv_timer_init_dt);
Signature · 1 line
2.38.0
author maintainer
#38 lore raw

Re: [PATCH 15/24] clocksource/timer-riscv: Refactor riscv_timer_init_dt()

Hi Conor,

Quoted 11 lines · Conor Dooley

Hey Sunil,

Quoted 4 lines · Sunil V L

Refactor the timer init function such that few things can be shared by both DT and ACPI based platforms.

What did Anup do here? He's not author or co-author, so the SoB chain looks incorrect.

When I wanted to refactor, I realized Anup had done similar in his branch for a different purpose. So, I took some of his changes and I added SOB. Let me add him in co-developed-by:

Quoted 40 lines
Quoted 40 lines
---
 drivers/clocksource/timer-riscv.c | 79 +++++++++++++++----------------
 1 file changed, 37 insertions(+), 42 deletions(-)
drivers/clocksource/timer-riscv.c +4 -21
index 1b4b36df5484..4016c065a01c 100644
@@ -119,61 +119,28 @@ static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static int __init riscv_timer_init_dt(struct device_node *n)
+static int __init riscv_timer_init_common(void)
 {
-	int cpuid, error;
-	unsigned long hartid;
-	struct device_node *child;
-	struct irq_domain *domain;
-
-	error = riscv_of_processor_hartid(n, &hartid);
-	if (error < 0) {
-		pr_warn("Not valid hartid for node [%pOF] error = [%lu]\n",
-			n, hartid);
-		return error;
-	}
-
-	cpuid = riscv_hartid_to_cpuid(hartid);
-	if (cpuid < 0) {
-		pr_warn("Invalid cpuid for hartid [%lu]\n", hartid);
-		return cpuid;
-	}
-
-	if (cpuid != smp_processor_id())
-		return 0;
+	int error;
+	struct fwnode_handle *intc_fwnode = riscv_get_intc_hwnode();
+	struct irq_domain *domain = NULL;
 
Quoted 10 lines

drivers/clocksource/timer-riscv.c static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id) · line 150

Quoted 6 lines
drivers/clocksource/timer-riscv.c +0 -6
-	child = of_find_compatible_node(NULL, NULL, "riscv,timer");
-	if (child) {
-		riscv_timer_cannot_wake_cpu = of_property_read_bool(child,
-					"riscv,timer-cannot-wake-cpu");
-		of_node_put(child);
-	}

Uhh, where did this code go?
Unless I've badly missed something, this has vanished in the patch.

Oops! Anup's patch had moved this to a separate DT timer node instead of cpu node which I didn't realize. Thanks for catching this. Will fix it.

Quoted 24 lines
Quoted 24 lines
drivers/clocksource/timer-riscv.c +4 -11
-	domain = NULL;
-	child = of_get_compatible_child(n, "riscv,cpu-intc");
-	if (!child) {
-		pr_err("Failed to find INTC node [%pOF]\n", n);
-		return -ENODEV;
-	}
-	domain = irq_find_host(child);
-	of_node_put(child);
+	domain = irq_find_matching_fwnode(intc_fwnode, DOMAIN_BUS_ANY);
 	if (!domain) {
-		pr_err("Failed to find IRQ domain for node [%pOF]\n", n);
+		pr_err("Failed to find INTC node [%pfwP]\n", intc_fwnode);
 		return -ENODEV;
 	}
 
 	riscv_clock_event_irq = irq_create_mapping(domain, RV_IRQ_TIMER);
 	if (!riscv_clock_event_irq) {
-		pr_err("Failed to map timer interrupt for node [%pOF]\n", n);
-		return -ENODEV;
+		pr_err("Failed to map timer interrupt for node [%pfwP]\n",
+			intc_fwnode);
 	}
 
Quoted 11 lines

drivers/clocksource/timer-riscv.c static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id) · line 143

Quoted 7 lines
drivers/clocksource/timer-riscv.c +1 -4
-	pr_info("%s: Registering clocksource cpuid [%d] hartid [%lu]\n",
-	       __func__, cpuid, hartid);
 	error = clocksource_register_hz(&riscv_clocksource, riscv_timebase);
 	if (error) {
-		pr_err("RISCV timer register failed [%d] for cpu = [%d]\n",
-		       error, cpuid);
+		pr_err("clocksource register failed [%d]\n", error);

If you're changing this, s/register/registration/ to be grammatically correct I suppose.

Sure.

Quoted 7 lines
Quoted 7 lines
drivers/clocksource/timer-riscv.c +0 -0
 		return error;
 	}
 
@@ -199,7 +166,35 @@ static int __init riscv_timer_init_dt(struct device_node *n)
 		static_branch_enable(&riscv_sstc_available);
 	}
 
Quoted 7 lines

drivers/clocksource/timer-riscv.c static int __init riscv_timer_init_dt(struct device_node *n) · line 171

Quoted 3 lines
drivers/clocksource/timer-riscv.c +3 -0
+	pr_info("timer registered using %s\n",
+		(static_branch_likely(&riscv_sstc_available)) ?
+		"RISC-V Sstc" : "RISC-V SBI");

Why is this needed? Isn't there a print like 3 lines above here that says "Timer interrupt in S-mode is available via sstc extension"?

Yes, will remove it.

Quoted 4 lines
Quoted 4 lines
drivers/clocksource/timer-riscv.c +1 -0
+
 	return error;
 }
 
Quoted 12 lines

drivers/clocksource/timer-riscv.c static int __init riscv_timer_init_dt(struct device_node *n) · line 183

Quoted 8 lines
drivers/clocksource/timer-riscv.c +8 -0
+static int __init riscv_timer_init_dt(struct device_node *n)
+{
+	int cpuid, error;
+	unsigned long hartid;
+
+	error = riscv_of_processor_hartid(n, &hartid);
+	if (error < 0) {
+		pr_warn("Not valid hartid for node [%pOF] error = [%lu]\n",

While you're already moving this, may as well fix the grammar IMO. s/Not valid/Invalid/

Okay

Thanks!
Sunil

author maintainer
#39 lore raw

PATCH 16/24 RISC-V: ACPI: clocksource/timer-riscv: Add ACPI support

In reply to Sunil V L

timer-riscv driver needs to get the timebase-frequency from RISC-V Hart Capabilities Table (RHCT) on ACPI platforms. Add support to read the information from RHCT.

---
 drivers/clocksource/timer-riscv.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/clocksource/timer-riscv.c +9 -0
index 4016c065a01c..8079666753a6 100644
@@ -10,6 +10,7 @@
 
 #define pr_fmt(fmt) "riscv-timer: " fmt
 
+#include <linux/acpi.h>
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
 #include <linux/cpu.h>
@@ -198,3 +199,11 @@ static int __init riscv_timer_init_dt(struct device_node *n)
 }
 
 TIMER_OF_DECLARE(riscv_timer, "riscv", riscv_timer_init_dt);
+
+#ifdef CONFIG_ACPI
+static int __init riscv_timer_acpi_init(struct acpi_table_header *table)
+{
+	return riscv_timer_init_common();
+}
+TIMER_ACPI_DECLARE(aclint_mtimer, ACPI_SIG_RHCT, riscv_timer_acpi_init);
+#endif
Signature · 1 line
2.38.0
#40 lore raw

Re: [PATCH 16/24] RISC-V: ACPI: clocksource/timer-riscv: Add ACPI support

Quoted 22 lines · Sunil V L

timer-riscv driver needs to get the timebase-frequency from RISC-V Hart Capabilities Table (RHCT) on ACPI platforms. Add support to read the information from RHCT.

---
 drivers/clocksource/timer-riscv.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/clocksource/timer-riscv.c +1 -0
index 4016c065a01c..8079666753a6 100644
@@ -10,6 +10,7 @@
 
 #define pr_fmt(fmt) "riscv-timer: " fmt
 
+#include <linux/acpi.h>
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
 #include <linux/cpu.h>

drivers/clocksource/timer-riscv.c static int __init riscv_timer_init_dt(struct device_node *n) · line 206

Quoted 8 lines
drivers/clocksource/timer-riscv.c +5 -0
@@ -198,3 +199,11 @@ static int __init riscv_timer_init_dt(struct device_node *n)
 }
 
 TIMER_OF_DECLARE(riscv_timer, "riscv", riscv_timer_init_dt);
+
+#ifdef CONFIG_ACPI
+static int __init riscv_timer_acpi_init(struct acpi_table_header *table)
+{
+	return riscv_timer_init_common();

I feel like I need to ask as it was deleted in the previous patch, how does ACPI determine whether the arch timer can wake the CPUs?

Cheers,
Conor.

author maintainer
#41 lore raw

Re: [PATCH 16/24] RISC-V: ACPI: clocksource/timer-riscv: Add ACPI support

Quoted 25 lines · Conor Dooley
Quoted 24 lines · Sunil V L

timer-riscv driver needs to get the timebase-frequency from RISC-V Hart Capabilities Table (RHCT) on ACPI platforms. Add support to read the information from RHCT.

---
 drivers/clocksource/timer-riscv.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/clocksource/timer-riscv.c +1 -0
index 4016c065a01c..8079666753a6 100644
@@ -10,6 +10,7 @@
 
 #define pr_fmt(fmt) "riscv-timer: " fmt
 
+#include <linux/acpi.h>
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
 #include <linux/cpu.h>
@@ -198,3 +199,11 @@ static int __init riscv_timer_init_dt(struct device_node *n)
 }
 
Quoted 10 lines

drivers/clocksource/timer-riscv.c static int __init riscv_timer_init_dt(struct device_node *n) · line 206

Quoted 6 lines
drivers/clocksource/timer-riscv.c +5 -0
 TIMER_OF_DECLARE(riscv_timer, "riscv", riscv_timer_init_dt);
+
+#ifdef CONFIG_ACPI
+static int __init riscv_timer_acpi_init(struct acpi_table_header *table)
+{
+	return riscv_timer_init_common();

I feel like I need to ask as it was deleted in the previous patch, how does ACPI determine whether the arch timer can wake the CPUs?

We have plans to add a flag in RHCT. But that still needs approval.

Thanks
Sunil

author maintainer
#42 lore raw

PATCH 17/24 ACPI: RISC-V: drivers/acpi: Add RHCT related code

In reply to Sunil V L

RHCT is a new table defined for RISC-V to communicate the features of the CPU to the OS. Create a new architecture folder in drivers/acpi and add RHCT parsing code.

---
 arch/riscv/include/asm/acpi.h |  5 ++
 drivers/acpi/Makefile         |  2 +
 drivers/acpi/riscv/Makefile   |  2 +
 drivers/acpi/riscv/rhct.c     | 93 +++++++++++++++++++++++++++++++++++
 4 files changed, 102 insertions(+)
 create mode 100644 drivers/acpi/riscv/Makefile
 create mode 100644 drivers/acpi/riscv/rhct.c
arch/riscv/include/asm/acpi.h +5 -0
index 69a880b7257a..4fec9ea3b874 100644
@@ -71,11 +71,16 @@ static inline u32 get_acpi_id_for_cpu(int cpu)
 {
 	return	acpi_cpu_get_madt_rintc(cpu)->uid;
 }
+int acpi_get_riscv_isa(struct acpi_table_header *table, unsigned int cpu, const char **isa);
 #else
 static inline u32 get_acpi_id_for_cpu(int cpu)
 {
 	return -1;
 }
+int acpi_get_riscv_isa(struct acpi_table_header *table, unsigned int cpu, const char **isa)
+{
+	return -1;
+}
 
 #endif /* CONFIG_ACPI */
 
drivers/acpi/Makefile +2 -0
index feb36c0b9446..3fc5a0d54f6e 100644
@@ -131,3 +131,5 @@ obj-y				+= dptf/
 obj-$(CONFIG_ARM64)		+= arm64/
 
 obj-$(CONFIG_ACPI_VIOT)		+= viot.o
+
+obj-$(CONFIG_RISCV)		+= riscv/
drivers/acpi/riscv/Makefile new file +2 -0
new file mode 100644
index 000000000000..8b3b126e0b94
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-y 	+= rhct.o
drivers/acpi/riscv/rhct.c new file +93 -0

93 lines not on this page · raw message

Signature · 1 line
2.38.0
author maintainer
#43 lore raw

PATCH 18/24 RISC-V: ACPI: time.c: Add ACPI support for time_init()

In reply to Sunil V L

On ACPI based platforms, timer related information is available in RHCT. Add ACPI based probe support to the timer initialization.

---
 arch/riscv/kernel/time.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)
arch/riscv/kernel/time.c +19 -6
index 1cf21db4fcc7..e49b897fc657 100644
@@ -4,6 +4,7 @@
  * Copyright (C) 2017 SiFive
  */
 
+#include <linux/acpi.h>
 #include <linux/of_clk.h>
 #include <linux/clockchips.h>
 #include <linux/clocksource.h>
@@ -18,17 +19,29 @@ EXPORT_SYMBOL_GPL(riscv_timebase);
 void __init time_init(void)
 {
 	struct device_node *cpu;
+	struct acpi_table_rhct *rhct;
+	acpi_status status;
 	u32 prop;
 
-	cpu = of_find_node_by_path("/cpus");
-	if (!cpu || of_property_read_u32(cpu, "timebase-frequency", &prop))
-		panic(KERN_WARNING "RISC-V system with no 'timebase-frequency' in DTS\n");
-	of_node_put(cpu);
-	riscv_timebase = prop;
+	if (acpi_disabled) {
+		cpu = of_find_node_by_path("/cpus");
+		if (!cpu || of_property_read_u32(cpu, "timebase-frequency", &prop))
+			panic("RISC-V system with no 'timebase-frequency' in DTS\n");
+		of_node_put(cpu);
+		riscv_timebase = prop;
+	} else {
+		status = acpi_get_table(ACPI_SIG_RHCT, 0, (struct acpi_table_header **)&rhct);
+		if (ACPI_FAILURE(status))
+			panic("RISC-V ACPI system with no RHCT table\n");
+		riscv_timebase = rhct->time_base_freq;
+		acpi_put_table((struct acpi_table_header *)rhct);
+	}
 
 	lpj_fine = riscv_timebase / HZ;
 
-	of_clk_init(NULL);
+	if (acpi_disabled)
+		of_clk_init(NULL);
+
 	timer_probe();
 
 	tick_setup_hrtimer_broadcast();
Signature · 1 line
2.38.0
author maintainer
#44 lore raw

PATCH 19/24 RISC-V: ACPI: cpufeature: Add ACPI support in riscv_fill_hwcap()

In reply to Sunil V L

On ACPI based systems, the information about the hart like ISA, extesions supported are defined in RISC-V Hart Capabilities Table (RHCT). Enable filling up hwcap structure based on the information in RHCT.

---
 arch/riscv/kernel/cpufeature.c | 45 ++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 7 deletions(-)
arch/riscv/kernel/cpufeature.c +38 -7
index 93e45560af30..c10177c608f8 100644
@@ -6,12 +6,14 @@
  * Copyright (C) 2017 SiFive
  */
 
+#include <linux/acpi.h>
 #include <linux/bitmap.h>
 #include <linux/ctype.h>
 #include <linux/libfdt.h>
 #include <linux/log2.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <asm/acpi.h>
 #include <asm/alternative.h>
 #include <asm/cacheflush.h>
 #include <asm/errata_list.h>
@@ -21,6 +23,7 @@
 #include <asm/processor.h>
 #include <asm/smp.h>
 #include <asm/switch_to.h>
+#include <linux/of_device.h>
 
 #define NUM_ALPHA_EXTS ('z' - 'a' + 1)
 
@@ -93,7 +96,10 @@ void __init riscv_fill_hwcap(void)
 	char print_str[NUM_ALPHA_EXTS + 1];
 	int i, j, rc;
 	unsigned long isa2hwcap[26] = {0};
+	struct acpi_table_header *rhct;
+	acpi_status status;
 	unsigned long hartid;
+	unsigned int cpu;
 
 	isa2hwcap['i' - 'a'] = COMPAT_HWCAP_ISA_I;
 	isa2hwcap['m' - 'a'] = COMPAT_HWCAP_ISA_M;
@@ -106,18 +112,38 @@ void __init riscv_fill_hwcap(void)
 
 	bitmap_zero(riscv_isa, RISCV_ISA_EXT_MAX);
 
-	for_each_of_cpu_node(node) {
+	if (!acpi_disabled) {
+
+		status = acpi_get_table(ACPI_SIG_RHCT, 0, &rhct);
+		if (ACPI_FAILURE(status))
+			return;
+	}
+
+	for_each_possible_cpu(cpu) {
 		unsigned long this_hwcap = 0;
 		DECLARE_BITMAP(this_isa, RISCV_ISA_EXT_MAX);
 		const char *temp;
 
-		rc = riscv_of_processor_hartid(node, &hartid);
-		if (rc < 0)
-			continue;
+		if (acpi_disabled) {
+			node = of_cpu_device_node_get(cpu);
+			if (node) {
+				rc = riscv_of_processor_hartid(node, &hartid);
+				if (rc < 0)
+					continue;
 
-		if (of_property_read_string(node, "riscv,isa", &isa)) {
-			pr_warn("Unable to find \"riscv,isa\" devicetree entry\n");
-			continue;
+				if (of_property_read_string(node, "riscv,isa", &isa)) {
+					pr_warn("Unable to find \"riscv,isa\" devicetree entry\n");
+					continue;
+				}
+				of_node_put(node);
+			}
+		} else {
+			rc = acpi_get_riscv_isa(rhct, get_acpi_id_for_cpu(cpu), &isa);
+			if (rc < 0) {
+				pr_warn("Unable to get ISA for the hart - %d\n",
+						cpu);
+				continue;
+			}
 		}
 
 		temp = isa;
@@ -248,6 +274,11 @@ void __init riscv_fill_hwcap(void)
 			bitmap_and(riscv_isa, riscv_isa, this_isa, RISCV_ISA_EXT_MAX);
 	}
 
+#ifdef CONFIG_ACPI
+	if (!acpi_disabled)
+		acpi_put_table((struct acpi_table_header *)rhct);
+#endif
+
 	/* We don't support systems with F but without D, so mask those out
 	 * here. */
 	if ((elf_hwcap & COMPAT_HWCAP_ISA_F) && !(elf_hwcap & COMPAT_HWCAP_ISA_D)) {
Signature · 1 line
2.38.0
#45 lore raw

Re: [PATCH 19/24] RISC-V: ACPI: cpufeature: Add ACPI support in riscv_fill_hwcap()

Quoted 30 lines · Sunil V L

On ACPI based systems, the information about the hart like ISA, extesions supported are defined in RISC-V Hart Capabilities Table (RHCT). Enable filling up hwcap structure based on the information in RHCT.

---
 arch/riscv/kernel/cpufeature.c | 45 ++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 7 deletions(-)
arch/riscv/kernel/cpufeature.c +2 -0
index 93e45560af30..c10177c608f8 100644
@@ -6,12 +6,14 @@
  * Copyright (C) 2017 SiFive
  */
 
+#include <linux/acpi.h>
 #include <linux/bitmap.h>
 #include <linux/ctype.h>
 #include <linux/libfdt.h>
 #include <linux/log2.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <asm/acpi.h>
 #include <asm/alternative.h>
 #include <asm/cacheflush.h>
 #include <asm/errata_list.h>

arch/riscv/kernel/cpufeature.c line 26

Quoted 4 lines
arch/riscv/kernel/cpufeature.c +1 -0
@@ -21,6 +23,7 @@
 #include <asm/processor.h>
 #include <asm/smp.h>
 #include <asm/switch_to.h>
+#include <linux/of_device.h>

Is there a reason this header is not added with the other linux ones?

Quoted 15 lines
arch/riscv/kernel/cpufeature.c +3 -0
 #define NUM_ALPHA_EXTS ('z' - 'a' + 1)
 
@@ -93,7 +96,10 @@ void __init riscv_fill_hwcap(void)
 	char print_str[NUM_ALPHA_EXTS + 1];
 	int i, j, rc;
 	unsigned long isa2hwcap[26] = {0};
+	struct acpi_table_header *rhct;
+	acpi_status status;
 	unsigned long hartid;
+	unsigned int cpu;
 
 	isa2hwcap['i' - 'a'] = COMPAT_HWCAP_ISA_I;
 	isa2hwcap['m' - 'a'] = COMPAT_HWCAP_ISA_M;

arch/riscv/kernel/cpufeature.c void __init riscv_fill_hwcap(void) · line 116

Quoted 6 lines
arch/riscv/kernel/cpufeature.c +2 -1
@@ -106,18 +112,38 @@ void __init riscv_fill_hwcap(void)
 
 	bitmap_zero(riscv_isa, RISCV_ISA_EXT_MAX);
 
-	for_each_of_cpu_node(node) {
+	if (!acpi_disabled) {
+

Extraneous blank line.

Quoted 24 lines
arch/riscv/kernel/cpufeature.c +13 -6
+		status = acpi_get_table(ACPI_SIG_RHCT, 0, &rhct);
+		if (ACPI_FAILURE(status))
+			return;
+	}
+
+	for_each_possible_cpu(cpu) {
 		unsigned long this_hwcap = 0;
 		DECLARE_BITMAP(this_isa, RISCV_ISA_EXT_MAX);
 		const char *temp;
 
-		rc = riscv_of_processor_hartid(node, &hartid);
-		if (rc < 0)
-			continue;
+		if (acpi_disabled) {
+			node = of_cpu_device_node_get(cpu);
+			if (node) {
+				rc = riscv_of_processor_hartid(node, &hartid);
+				if (rc < 0)
+					continue;
 
-		if (of_property_read_string(node, "riscv,isa", &isa)) {
-			pr_warn("Unable to find \"riscv,isa\" devicetree entry\n");
-			continue;
+				if (of_property_read_string(node, "riscv,isa", &isa)) {

arch/riscv/kernel/cpufeature.c void __init riscv_fill_hwcap(void) · line 144

Quoted 10 lines
arch/riscv/kernel/cpufeature.c +10 -0
+					pr_warn("Unable to find \"riscv,isa\" devicetree entry\n");
+					continue;
+				}
+				of_node_put(node);
+			}
+		} else {
+			rc = acpi_get_riscv_isa(rhct, get_acpi_id_for_cpu(cpu), &isa);
+			if (rc < 0) {
+				pr_warn("Unable to get ISA for the hart - %d\n",
+						cpu);

The alignment here is wrong, but the whole thing fits on a single line.

arch/riscv/kernel/cpufeature.c void __init riscv_fill_hwcap(void) · line 277

Quoted 10 lines
arch/riscv/kernel/cpufeature.c +3 -0
+				continue;
+			}
 		}
 
 		temp = isa;
@@ -248,6 +274,11 @@ void __init riscv_fill_hwcap(void)
 			bitmap_and(riscv_isa, riscv_isa, this_isa, RISCV_ISA_EXT_MAX);
 	}
 
+#ifdef CONFIG_ACPI

Is this guard actually needed, or is acpi_put_table() always available?

Cheers,
Conor.

Quoted 10 lines
arch/riscv/kernel/cpufeature.c +4 -0
+	if (!acpi_disabled)
+		acpi_put_table((struct acpi_table_header *)rhct);
+#endif
+
 	/* We don't support systems with F but without D, so mask those out
 	 * here. */
 	if ((elf_hwcap & COMPAT_HWCAP_ISA_F) && !(elf_hwcap & COMPAT_HWCAP_ISA_D)) {
Signature · 1 line
2.38.0
author maintainer
#46 lore raw

Re: [PATCH 19/24] RISC-V: ACPI: cpufeature: Add ACPI support in riscv_fill_hwcap()

Quoted 29 lines · Conor Dooley
Quoted 28 lines · Sunil V L

On ACPI based systems, the information about the hart like ISA, extesions supported are defined in RISC-V Hart Capabilities Table (RHCT). Enable filling up hwcap structure based on the information in RHCT.

---
 arch/riscv/kernel/cpufeature.c | 45 ++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 7 deletions(-)
arch/riscv/kernel/cpufeature.c +2 -0
index 93e45560af30..c10177c608f8 100644
@@ -6,12 +6,14 @@
  * Copyright (C) 2017 SiFive
  */
 
+#include <linux/acpi.h>
 #include <linux/bitmap.h>
 #include <linux/ctype.h>
 #include <linux/libfdt.h>
 #include <linux/log2.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <asm/acpi.h>
 #include <asm/alternative.h>
 #include <asm/cacheflush.h>
Quoted 9 lines

arch/riscv/kernel/cpufeature.c line 26

Quoted 6 lines
arch/riscv/kernel/cpufeature.c +1 -0
 #include <asm/errata_list.h>
@@ -21,6 +23,7 @@
 #include <asm/processor.h>
 #include <asm/smp.h>
 #include <asm/switch_to.h>
+#include <linux/of_device.h>

Is there a reason this header is not added with the other linux ones?

No, let me move it.

Quoted 16 lines
Quoted 16 lines
arch/riscv/kernel/cpufeature.c +3 -0
 #define NUM_ALPHA_EXTS ('z' - 'a' + 1)
 
@@ -93,7 +96,10 @@ void __init riscv_fill_hwcap(void)
 	char print_str[NUM_ALPHA_EXTS + 1];
 	int i, j, rc;
 	unsigned long isa2hwcap[26] = {0};
+	struct acpi_table_header *rhct;
+	acpi_status status;
 	unsigned long hartid;
+	unsigned int cpu;
 
 	isa2hwcap['i' - 'a'] = COMPAT_HWCAP_ISA_I;
 	isa2hwcap['m' - 'a'] = COMPAT_HWCAP_ISA_M;
@@ -106,18 +112,38 @@ void __init riscv_fill_hwcap(void)
 
Quoted 8 lines

arch/riscv/kernel/cpufeature.c void __init riscv_fill_hwcap(void) · line 116

Quoted 5 lines
arch/riscv/kernel/cpufeature.c +2 -1
 	bitmap_zero(riscv_isa, RISCV_ISA_EXT_MAX);
 
-	for_each_of_cpu_node(node) {
+	if (!acpi_disabled) {
+

Extraneous blank line.

Okay

Quoted 20 lines
Quoted 20 lines
arch/riscv/kernel/cpufeature.c +12 -3
+		status = acpi_get_table(ACPI_SIG_RHCT, 0, &rhct);
+		if (ACPI_FAILURE(status))
+			return;
+	}
+
+	for_each_possible_cpu(cpu) {
 		unsigned long this_hwcap = 0;
 		DECLARE_BITMAP(this_isa, RISCV_ISA_EXT_MAX);
 		const char *temp;
 
-		rc = riscv_of_processor_hartid(node, &hartid);
-		if (rc < 0)
-			continue;
+		if (acpi_disabled) {
+			node = of_cpu_device_node_get(cpu);
+			if (node) {
+				rc = riscv_of_processor_hartid(node, &hartid);
+				if (rc < 0)
+					continue;
 
Quoted 17 lines
Quoted 4 lines
arch/riscv/kernel/cpufeature.c +1 -3
-		if (of_property_read_string(node, "riscv,isa", &isa)) {
-			pr_warn("Unable to find \"riscv,isa\" devicetree entry\n");
-			continue;
+				if (of_property_read_string(node, "riscv,isa", &isa)) {

arch/riscv/kernel/cpufeature.c void __init riscv_fill_hwcap(void) · line 144

Quoted 10 lines
arch/riscv/kernel/cpufeature.c +10 -0
+					pr_warn("Unable to find \"riscv,isa\" devicetree entry\n");
+					continue;
+				}
+				of_node_put(node);
+			}
+		} else {
+			rc = acpi_get_riscv_isa(rhct, get_acpi_id_for_cpu(cpu), &isa);
+			if (rc < 0) {
+				pr_warn("Unable to get ISA for the hart - %d\n",
+						cpu);

The alignment here is wrong, but the whole thing fits on a single line.

Okay

Quoted 4 lines
Quoted 4 lines
arch/riscv/kernel/cpufeature.c +2 -0
+				continue;
+			}
 		}
 
Quoted 9 lines

arch/riscv/kernel/cpufeature.c void __init riscv_fill_hwcap(void) · line 277

Quoted 6 lines
arch/riscv/kernel/cpufeature.c +1 -0
 		temp = isa;
@@ -248,6 +274,11 @@ void __init riscv_fill_hwcap(void)
 			bitmap_and(riscv_isa, riscv_isa, this_isa, RISCV_ISA_EXT_MAX);
 	}
 
+#ifdef CONFIG_ACPI

Is this guard actually needed, or is acpi_put_table() always available?

It can be removed.

Thanks,
Sunil

Quoted 13 lines

Cheers,
Conor.

Quoted 10 lines
arch/riscv/kernel/cpufeature.c +4 -0
+	if (!acpi_disabled)
+		acpi_put_table((struct acpi_table_header *)rhct);
+#endif
+
 	/* We don't support systems with F but without D, so mask those out
 	 * here. */
 	if ((elf_hwcap & COMPAT_HWCAP_ISA_F) && !(elf_hwcap & COMPAT_HWCAP_ISA_D)) {
Signature · 1 line
2.38.0
author maintainer
#47 lore raw

PATCH 20/24 RISC-V: ACPI: cpu: Enable cpuinfo for ACPI systems

In reply to Sunil V L

On ACPI based platforms, few details like ISA need to be read from the ACPI table. Enable cpuinfo on ACPI based systems.

---
 arch/riscv/kernel/cpu.c | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)
arch/riscv/kernel/cpu.c +29 -7
index 1b9a5a66e55a..bd6c0fcfe4ce 100644
@@ -3,6 +3,7 @@
  * Copyright (C) 2012 Regents of the University of California
  */
 
+#include <linux/acpi.h>
 #include <linux/cpu.h>
 #include <linux/init.h>
 #include <linux/seq_file.h>
@@ -256,26 +257,47 @@ static void c_stop(struct seq_file *m, void *v)
 {
 }
 
+#ifdef CONFIG_ACPI
+void acpi_print_hart_info(struct seq_file *m,
+			  unsigned long cpu)
+{
+	const char *isa;
+
+	if (!acpi_get_riscv_isa(NULL, get_acpi_id_for_cpu(cpu), &isa))
+		print_isa(m, isa);
+
+}
+#endif
+
 static int c_show(struct seq_file *m, void *v)
 {
 	unsigned long cpu_id = (unsigned long)v - 1;
-	struct device_node *node = of_get_cpu_node(cpu_id, NULL);
 	struct riscv_cpuinfo *ci = per_cpu_ptr(&riscv_cpuinfo, cpu_id);
+	struct device_node *node;
 	const char *compat, *isa;
 
 	seq_printf(m, "processor\t: %lu\n", cpu_id);
 	seq_printf(m, "hart\t\t: %lu\n", cpuid_to_hartid_map(cpu_id));
-	if (!of_property_read_string(node, "riscv,isa", &isa))
-		print_isa(m, isa);
+
+	if (acpi_disabled) {
+		node = of_get_cpu_node(cpu_id, NULL);
+		if (!of_property_read_string(node, "riscv,isa", &isa))
+			print_isa(m, isa);
+		if (!of_property_read_string(node, "compatible", &compat)
+		    && strcmp(compat, "riscv"))
+			seq_printf(m, "uarch\t\t: %s\n", compat);
+		of_node_put(node);
+	}
+#ifdef CONFIG_ACPI
+	else
+		acpi_print_hart_info(m, cpu_id);
+#endif
+
 	print_mmu(m);
-	if (!of_property_read_string(node, "compatible", &compat)
-	    && strcmp(compat, "riscv"))
-		seq_printf(m, "uarch\t\t: %s\n", compat);
 	seq_printf(m, "mvendorid\t: 0x%lx\n", ci->mvendorid);
 	seq_printf(m, "marchid\t\t: 0x%lx\n", ci->marchid);
 	seq_printf(m, "mimpid\t\t: 0x%lx\n", ci->mimpid);
 	seq_puts(m, "\n");
-	of_node_put(node);
 
 	return 0;
 }
Signature · 1 line
2.38.0
#48 lore raw

Re: [PATCH 20/24] RISC-V: ACPI: cpu: Enable cpuinfo for ACPI systems

Quoted 21 lines · Sunil V L

On ACPI based platforms, few details like ISA need to be read from the ACPI table. Enable cpuinfo on ACPI based systems.

---
 arch/riscv/kernel/cpu.c | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)
arch/riscv/kernel/cpu.c +1 -0
index 1b9a5a66e55a..bd6c0fcfe4ce 100644
@@ -3,6 +3,7 @@
  * Copyright (C) 2012 Regents of the University of California
  */
 
+#include <linux/acpi.h>
 #include <linux/cpu.h>
 #include <linux/init.h>
 #include <linux/seq_file.h>

arch/riscv/kernel/cpu.c static void c_stop(struct seq_file *m, void *v) · line 262

Quoted 6 lines
arch/riscv/kernel/cpu.c +3 -0
@@ -256,26 +257,47 @@ static void c_stop(struct seq_file *m, void *v)
 {
 }
 
+#ifdef CONFIG_ACPI
+void acpi_print_hart_info(struct seq_file *m,
+			  unsigned long cpu)

Surely this fits on one line?

arch/riscv/kernel/cpu.c static void c_stop(struct seq_file *m, void *v) · line 267

Quoted 5 lines
arch/riscv/kernel/cpu.c +5 -0
+{
+	const char *isa;
+
+	if (!acpi_get_riscv_isa(NULL, get_acpi_id_for_cpu(cpu), &isa))
+		print_isa(m, isa);

Do you really need to guard this function? Aren't there nop'ed versions of acpi_get_riscv_isa() and get_acpi_id_for_cpu() in acpi.h?

IMO, basically any use of ifdeffery you can cleanly remove from a c file is a worthwhile change.

arch/riscv/kernel/cpu.c static void c_stop(struct seq_file *m, void *v) · line 268

Quoted 1 line
arch/riscv/kernel/cpu.c +1 -0
+

Extra blank line here FYI.

Quoted 12 lines
arch/riscv/kernel/cpu.c +4 -1
+}
+#endif
+
 static int c_show(struct seq_file *m, void *v)
 {
 	unsigned long cpu_id = (unsigned long)v - 1;
-	struct device_node *node = of_get_cpu_node(cpu_id, NULL);
 	struct riscv_cpuinfo *ci = per_cpu_ptr(&riscv_cpuinfo, cpu_id);
+	struct device_node *node;
 	const char *compat, *isa;
 
 	seq_printf(m, "processor\t: %lu\n", cpu_id);

arch/riscv/kernel/cpu.c static void c_stop(struct seq_file *m, void *v) · line 287

Quoted 10 lines
arch/riscv/kernel/cpu.c +7 -2
 	seq_printf(m, "hart\t\t: %lu\n", cpuid_to_hartid_map(cpu_id));
-	if (!of_property_read_string(node, "riscv,isa", &isa))
-		print_isa(m, isa);
+
+	if (acpi_disabled) {
+		node = of_get_cpu_node(cpu_id, NULL);
+		if (!of_property_read_string(node, "riscv,isa", &isa))
+			print_isa(m, isa);
+		if (!of_property_read_string(node, "compatible", &compat)
+		    && strcmp(compat, "riscv"))

^^ this should be on the line above
TBH the whole series is in need of a checkpatch --strict run IMO, there's a bunch of coding style issues throughout.

arch/riscv/kernel/cpu.c static void c_stop(struct seq_file *m, void *v) · line 293

Quoted 6 lines
arch/riscv/kernel/cpu.c +6 -0
+			seq_printf(m, "uarch\t\t: %s\n", compat);
+		of_node_put(node);
+	}
+#ifdef CONFIG_ACPI
+	else
+		acpi_print_hart_info(m, cpu_id);

Delete the ifdeffery here too please :)

Cheers,
Conor.

Quoted 17 lines
arch/riscv/kernel/cpu.c +2 -4
+#endif
+
 	print_mmu(m);
-	if (!of_property_read_string(node, "compatible", &compat)
-	    && strcmp(compat, "riscv"))
-		seq_printf(m, "uarch\t\t: %s\n", compat);
 	seq_printf(m, "mvendorid\t: 0x%lx\n", ci->mvendorid);
 	seq_printf(m, "marchid\t\t: 0x%lx\n", ci->marchid);
 	seq_printf(m, "mimpid\t\t: 0x%lx\n", ci->mimpid);
 	seq_puts(m, "\n");
-	of_node_put(node);
 
 	return 0;
 }
Signature · 1 line
2.38.0
author maintainer
#49 lore raw

Re: [PATCH 20/24] RISC-V: ACPI: cpu: Enable cpuinfo for ACPI systems

Quoted 25 lines · Conor Dooley
Quoted 24 lines · Sunil V L

On ACPI based platforms, few details like ISA need to be read from the ACPI table. Enable cpuinfo on ACPI based systems.

---
 arch/riscv/kernel/cpu.c | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)
arch/riscv/kernel/cpu.c +1 -0
index 1b9a5a66e55a..bd6c0fcfe4ce 100644
@@ -3,6 +3,7 @@
  * Copyright (C) 2012 Regents of the University of California
  */
 
+#include <linux/acpi.h>
 #include <linux/cpu.h>
 #include <linux/init.h>
 #include <linux/seq_file.h>
@@ -256,26 +257,47 @@ static void c_stop(struct seq_file *m, void *v)
 {
 }
 
Quoted 6 lines

arch/riscv/kernel/cpu.c static void c_stop(struct seq_file *m, void *v) · line 262

Quoted 3 lines
arch/riscv/kernel/cpu.c +3 -0
+#ifdef CONFIG_ACPI
+void acpi_print_hart_info(struct seq_file *m,
+			  unsigned long cpu)

Surely this fits on one line?

Okay

Quoted 9 lines

arch/riscv/kernel/cpu.c static void c_stop(struct seq_file *m, void *v) · line 267

Quoted 5 lines
arch/riscv/kernel/cpu.c +5 -0
+{
+	const char *isa;
+
+	if (!acpi_get_riscv_isa(NULL, get_acpi_id_for_cpu(cpu), &isa))
+		print_isa(m, isa);

Do you really need to guard this function? Aren't there nop'ed versions of acpi_get_riscv_isa() and get_acpi_id_for_cpu() in acpi.h?

Quoted 3 lines

IMO, basically any use of ifdeffery you can cleanly remove from a c file is a worthwhile change.

You are right. Let me remove ifdef.

Quoted 15 lines

arch/riscv/kernel/cpu.c static void c_stop(struct seq_file *m, void *v) · line 268

Quoted 1 line
arch/riscv/kernel/cpu.c +1 -0
+

Extra blank line here FYI.

Quoted 11 lines
arch/riscv/kernel/cpu.c +4 -1
+}
+#endif
+
 static int c_show(struct seq_file *m, void *v)
 {
 	unsigned long cpu_id = (unsigned long)v - 1;
-	struct device_node *node = of_get_cpu_node(cpu_id, NULL);
 	struct riscv_cpuinfo *ci = per_cpu_ptr(&riscv_cpuinfo, cpu_id);
+	struct device_node *node;
 	const char *compat, *isa;
 
Quoted 15 lines

arch/riscv/kernel/cpu.c static void c_stop(struct seq_file *m, void *v) · line 287

Quoted 11 lines
arch/riscv/kernel/cpu.c +7 -2
 	seq_printf(m, "processor\t: %lu\n", cpu_id);
 	seq_printf(m, "hart\t\t: %lu\n", cpuid_to_hartid_map(cpu_id));
-	if (!of_property_read_string(node, "riscv,isa", &isa))
-		print_isa(m, isa);
+
+	if (acpi_disabled) {
+		node = of_get_cpu_node(cpu_id, NULL);
+		if (!of_property_read_string(node, "riscv,isa", &isa))
+			print_isa(m, isa);
+		if (!of_property_read_string(node, "compatible", &compat)
+		    && strcmp(compat, "riscv"))

^^ this should be on the line above
TBH the whole series is in need of a checkpatch --strict run IMO, there's a bunch of coding style issues throughout.

I just moved this line as is. Sure, let me fix it. Thanks.

Quoted 9 lines

arch/riscv/kernel/cpu.c static void c_stop(struct seq_file *m, void *v) · line 293

Quoted 6 lines
arch/riscv/kernel/cpu.c +6 -0
+			seq_printf(m, "uarch\t\t: %s\n", compat);
+		of_node_put(node);
+	}
+#ifdef CONFIG_ACPI
+	else
+		acpi_print_hart_info(m, cpu_id);

Delete the ifdeffery here too please :)

Okay

Thanks,
Sunil

author maintainer
#50 lore raw

PATCH 21/24 RISC-V: ACPI: Add ACPI initialization in setup_arch()

In reply to Sunil V L

Initialize ACPI tables for RISC-V during boot.

---
 arch/riscv/kernel/setup.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
arch/riscv/kernel/setup.c +14 -5
index 4335f08ffaf2..5b4ad1baf664 100644
@@ -8,6 +8,7 @@
  *  Nick Kossifidis <[email protected]>
  */
 
+#include <linux/acpi.h>
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/memblock.h>
@@ -276,14 +277,22 @@ void __init setup_arch(char **cmdline_p)
 
 	efi_init();
 	paging_init();
+
+	/* Parse the ACPI tables for possible boot-time configuration */
+	acpi_boot_table_init();
+	if (acpi_disabled) {
 #if IS_ENABLED(CONFIG_BUILTIN_DTB)
-	unflatten_and_copy_device_tree();
+		unflatten_and_copy_device_tree();
 #else
-	if (early_init_dt_verify(__va(XIP_FIXUP(dtb_early_pa))))
-		unflatten_device_tree();
-	else
-		pr_err("No DTB found in kernel mappings\n");
+		if (early_init_dt_verify(__va(XIP_FIXUP(dtb_early_pa))))
+			unflatten_device_tree();
+		else
+			pr_err("No DTB found in kernel mappings\n");
 #endif
+	} else {
+		early_init_dt_verify(__va(XIP_FIXUP(dtb_early_pa)));
+	}
+
 	early_init_fdt_scan_reserved_mem();
 	misc_mem_init();
 
Signature · 1 line
2.38.0
#51 lore raw

Re: [PATCH 21/24] RISC-V: ACPI: Add ACPI initialization in setup_arch()

Quoted 20 lines · Sunil V L

Initialize ACPI tables for RISC-V during boot.

---
 arch/riscv/kernel/setup.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
arch/riscv/kernel/setup.c +1 -0
index 4335f08ffaf2..5b4ad1baf664 100644
@@ -8,6 +8,7 @@
  *  Nick Kossifidis <[email protected]>
  */
 
+#include <linux/acpi.h>
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/memblock.h>

arch/riscv/kernel/setup.c void __init setup_arch(char **cmdline_p) · line 284

Quoted 8 lines
arch/riscv/kernel/setup.c +4 -0
@@ -276,14 +277,22 @@ void __init setup_arch(char **cmdline_p)
 
 	efi_init();
 	paging_init();
+
+	/* Parse the ACPI tables for possible boot-time configuration */
+	acpi_boot_table_init();
+	if (acpi_disabled) {
 #if IS_ENABLED(CONFIG_BUILTIN_DTB)

I only poked it with a stick, but I think this #if IS_ENABLED() can be changed to a normal if (IS_ENABLED()) while you're already modifying this code.

Quoted 22 lines
arch/riscv/kernel/setup.c +9 -5
-	unflatten_and_copy_device_tree();
+		unflatten_and_copy_device_tree();
 #else
-	if (early_init_dt_verify(__va(XIP_FIXUP(dtb_early_pa))))
-		unflatten_device_tree();
-	else
-		pr_err("No DTB found in kernel mappings\n");
+		if (early_init_dt_verify(__va(XIP_FIXUP(dtb_early_pa))))
+			unflatten_device_tree();
+		else
+			pr_err("No DTB found in kernel mappings\n");
 #endif
+	} else {
+		early_init_dt_verify(__va(XIP_FIXUP(dtb_early_pa)));
+	}
+
 	early_init_fdt_scan_reserved_mem();
 	misc_mem_init();
 
Signature · 1 line
2.38.0
author maintainer
#52 lore raw

Re: [PATCH 21/24] RISC-V: ACPI: Add ACPI initialization in setup_arch()

Quoted 22 lines · Conor Dooley
Quoted 21 lines · Sunil V L

Initialize ACPI tables for RISC-V during boot.

---
 arch/riscv/kernel/setup.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
arch/riscv/kernel/setup.c +1 -0
index 4335f08ffaf2..5b4ad1baf664 100644
@@ -8,6 +8,7 @@
  *  Nick Kossifidis <[email protected]>
  */
 
+#include <linux/acpi.h>
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/memblock.h>
@@ -276,14 +277,22 @@ void __init setup_arch(char **cmdline_p)
 
Quoted 12 lines

arch/riscv/kernel/setup.c void __init setup_arch(char **cmdline_p) · line 284

Quoted 7 lines
arch/riscv/kernel/setup.c +4 -0
 	efi_init();
 	paging_init();
+
+	/* Parse the ACPI tables for possible boot-time configuration */
+	acpi_boot_table_init();
+	if (acpi_disabled) {
 #if IS_ENABLED(CONFIG_BUILTIN_DTB)

I only poked it with a stick, but I think this #if IS_ENABLED() can be changed to a normal if (IS_ENABLED()) while you're already modifying this code.

Sure,

Thanks
Sunil

author maintainer
#53 lore raw

PATCH 22/24 RISC-V: ACPI: Enable ACPI in defconfig

In reply to Sunil V L

Add support to build ACPI subsystem in defconfig.

---
 arch/riscv/configs/defconfig | 4 ++++
 1 file changed, 4 insertions(+)
arch/riscv/configs/defconfig +4 -0
index 128dcf4c0814..8ce06fb0dde8 100644
@@ -218,3 +218,7 @@ CONFIG_RCU_EQS_DEBUG=y
 # CONFIG_FTRACE is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
 CONFIG_MEMTEST=y
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+CONFIG_ACPI_MCFG=y
+# CONFIG_PCI_QUIRKS is not set
Signature · 1 line
2.38.0
#54 lore raw

Re: [PATCH 22/24] RISC-V: ACPI: Enable ACPI in defconfig

Hey Sunil,

Two quick comments while I think of them..

Quoted 1 line · Sunil V L

RISC-V: ACPI: Enable ACPI in defconfig

btw, about half of this series redundantly puts "ACPI:" or "RISC-V:
ACPI:" into $subject. None of commits that mention ACPI after the last :
should mention ACPI in the prefix IMO, it's just noise.

For example, this one should be something like:
RISC-V: enable ACPI in defconfig

Quoted 12 lines

Add support to build ACPI subsystem in defconfig.

---
 arch/riscv/configs/defconfig | 4 ++++
 1 file changed, 4 insertions(+)
arch/riscv/configs/defconfig +0 -0
index 128dcf4c0814..8ce06fb0dde8 100644

arch/riscv/configs/defconfig CONFIG_RCU_EQS_DEBUG=y · line 221

Quoted 4 lines
arch/riscv/configs/defconfig +1 -0
@@ -218,3 +218,7 @@ CONFIG_RCU_EQS_DEBUG=y
 # CONFIG_FTRACE is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
 CONFIG_MEMTEST=y
+CONFIG_ARCH_SUPPORTS_ACPI=y

This needs to go into the arch Kconfig file, where it will be selected. Check what arm64 does if you are not sure what I mean.

Hopefully I'll get a chance to look at the rest of this this week sometime,
Conor.

author maintainer
#55 lore raw

Re: [PATCH 22/24] RISC-V: ACPI: Enable ACPI in defconfig

Hi Conor,

Quoted 4 lines · Conor Dooley

Hey Sunil,

Two quick comments while I think of them..

Sure. Thank you!

Quoted 10 lines · Sunil V L
Quoted 1 line

RISC-V: ACPI: Enable ACPI in defconfig

btw, about half of this series redundantly puts "ACPI:" or "RISC-V:
ACPI:" into $subject. None of commits that mention ACPI after the last :
should mention ACPI in the prefix IMO, it's just noise.

For example, this one should be something like:
RISC-V: enable ACPI in defconfig

I agree. Will update in the next version. I added ACPI in begining so that I could quickly identify them along with other patches in my branch.

Quoted 7 lines
Quoted 7 lines

Add support to build ACPI subsystem in defconfig.

---
 arch/riscv/configs/defconfig | 4 ++++
 1 file changed, 4 insertions(+)
Quoted 13 lines

arch/riscv/configs/defconfig CONFIG_RCU_EQS_DEBUG=y · line 221

Quoted 9 lines
arch/riscv/configs/defconfig +1 -0
index 128dcf4c0814..8ce06fb0dde8 100644
@@ -218,3 +218,7 @@ CONFIG_RCU_EQS_DEBUG=y
 # CONFIG_FTRACE is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
 CONFIG_MEMTEST=y
+CONFIG_ARCH_SUPPORTS_ACPI=y

This needs to go into the arch Kconfig file, where it will be selected. Check what arm64 does if you are not sure what I mean.

Yes, I have added in "[PATCH 07/24] RISC-V: ACPI: Enable ACPI build infrastructure". But forgot to remove here. Thanks!. Will update it when I send next revision.

Quoted 4 lines

Hopefully I'll get a chance to look at the rest of this this week sometime,
Conor.

Thanks!
Sunil

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author maintainer
#56 lore raw

PATCH 23/24 MAINTAINERS: Add entry for drivers/acpi/riscv

In reply to Sunil V L

ACPI defines few RISC-V specific tables which need parsing code added in drivers/acpi/riscv. Add maintainer entries for this newly created folder.

---
 MAINTAINERS | 7 +++++++
 1 file changed, 7 insertions(+)
MAINTAINERS +7 -0
index 8a5c25c20d00..b14ceb917a81 100644
@@ -450,6 +450,13 @@ S:	Orphan
 F:	drivers/platform/x86/wmi.c
 F:	include/uapi/linux/wmi.h
 
+ACPI FOR RISC-V (ACPI/riscv)
+M:	Sunil V L <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Maintained
+F:	drivers/acpi/riscv
+
 ACRN HYPERVISOR SERVICE MODULE
 M:	Fei Li <[email protected]>
 L:	[email protected] (subscribers-only)
Signature · 1 line
2.38.0
#57 lore raw

Re: [PATCH 23/24] MAINTAINERS: Add entry for drivers/acpi/riscv

Quoted 14 lines · Sunil V L

ACPI defines few RISC-V specific tables which need parsing code added in drivers/acpi/riscv. Add maintainer entries for this newly created folder.

---
 MAINTAINERS | 7 +++++++
 1 file changed, 7 insertions(+)
MAINTAINERS +0 -0
index 8a5c25c20d00..b14ceb917a81 100644

MAINTAINERS S: Orphan · line 457

Quoted 8 lines
MAINTAINERS +5 -0
@@ -450,6 +450,13 @@ S:	Orphan
 F:	drivers/platform/x86/wmi.c
 F:	include/uapi/linux/wmi.h
 
+ACPI FOR RISC-V (ACPI/riscv)
+M:	Sunil V L <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Maintained

Supported, no?

Quoted 8 lines
MAINTAINERS +2 -0
+F:	drivers/acpi/riscv
+
 ACRN HYPERVISOR SERVICE MODULE
 M:	Fei Li <[email protected]>
 L:	[email protected] (subscribers-only)
Signature · 1 line
2.38.0
author maintainer
#58 lore raw

Re: [PATCH 23/24] MAINTAINERS: Add entry for drivers/acpi/riscv

Quoted 18 lines · Conor Dooley
Quoted 17 lines · Sunil V L

ACPI defines few RISC-V specific tables which need parsing code added in drivers/acpi/riscv. Add maintainer entries for this newly created folder.

---
 MAINTAINERS | 7 +++++++
 1 file changed, 7 insertions(+)
MAINTAINERS +0 -0
index 8a5c25c20d00..b14ceb917a81 100644
@@ -450,6 +450,13 @@ S:	Orphan
 F:	drivers/platform/x86/wmi.c
 F:	include/uapi/linux/wmi.h
 
Quoted 8 lines

MAINTAINERS S: Orphan · line 457

Quoted 5 lines
MAINTAINERS +5 -0
+ACPI FOR RISC-V (ACPI/riscv)
+M:	Sunil V L <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Maintained

Supported, no?

I prefer to keep it same as ARM.

author maintainer
#59 lore raw

PATCH 24/24 Documentation/kernel-parameters.txt: Add RISC-V for ACPI parameter

In reply to Sunil V L

With ACPI support added for RISC-V, this kernel parameter also supported on RISC-V. Hence, update the documentation.

---
 Documentation/admin-guide/kernel-parameters.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +4 -2
index 6cfa6e3996cf..d9795418aaf8 100644
@@ -1,9 +1,9 @@
-	acpi=		[HW,ACPI,X86,ARM64]
+	acpi=		[HW,ACPI,X86,ARM64,RISC-V]
 			Advanced Configuration and Power Interface
 			Format: { force | on | off | strict | noirq | rsdt |
 				  copy_dsdt }
 			force -- enable ACPI if default was off
-			on -- enable ACPI but allow fallback to DT [arm64]
+			on -- enable ACPI but allow fallback to DT [arm64,riscv]
 			off -- disable ACPI if default was on
 			noirq -- do not use ACPI for IRQ routing
 			strict -- Be less tolerant of platforms that are not
@@ -12,6 +12,8 @@
 			copy_dsdt -- copy DSDT to memory
 			For ARM64, ONLY "acpi=off", "acpi=on" or "acpi=force"
 			are available
+			For RISC-V, ONLY "acpi=off", "acpi=on" or "acpi=force"
+			are available
 
 			See also Documentation/power/runtime_pm.rst, pci=noacpi
 
Signature · 1 line
2.38.0
#60 lore raw

Re: [PATCH 24/24] Documentation/kernel-parameters.txt: Add RISC-V for ACPI parameter

Documentation/admin-guide/kernel-parameters.txt line 16

Quoted 5 lines · Sunil V L
Documentation/admin-guide/kernel-parameters.txt +2 -0
 			For ARM64, ONLY "acpi=off", "acpi=on" or "acpi=force"
 			are available
+			For RISC-V, ONLY "acpi=off", "acpi=on" or "acpi=force"
+			are available

Something repetitive here. What about "For ARM64 and RISC-V, the available options are only "acpi=off", "acpi=on", and "acpi=force""?

Thanks.

Signature · 1 line
An old man doll... just what I always wanted! - Clara
author maintainer
#61 lore raw

Re: [PATCH 24/24] Documentation/kernel-parameters.txt: Add RISC-V for ACPI parameter

Quoted 10 lines · Bagas Sanjaya

Documentation/admin-guide/kernel-parameters.txt line 16

Quoted 5 lines · Sunil V L
Documentation/admin-guide/kernel-parameters.txt +2 -0
 			For ARM64, ONLY "acpi=off", "acpi=on" or "acpi=force"
 			are available
+			For RISC-V, ONLY "acpi=off", "acpi=on" or "acpi=force"
+			are available

Something repetitive here. What about "For ARM64 and RISC-V, the available options are only "acpi=off", "acpi=on", and "acpi=force""?

Quoted 2 lines

Thanks.

Hi Sanjaya,
-Sunil

maintainer Acked-by on the v1 series
#62 lore raw
In reply to Sunil V L
Quoted 52 lines · Sunil V L

This patch series enables the basic ACPI infrastructure for RISC-V. Supporting external interrupt controllers is in progress and hence it is tested using polling based HVC SBI console and RAM disk.

The series depends on Anup's IPI improvement series.
https://github.com/avpatel/linux/commits/riscv_ipi_imp_v17

These changes are available at
https://github.com/vlsunil/linux/commits/acpi_b1_us_review_ipi17

Testing:
1) Build Qemu with ACPI support using below branch
https://github.com/vlsunil/qemu/tree/acpi_b1_us_review

2) Build EDK2 as per instructions in
https://github.com/vlsunil/riscv-uefi-edk2-docs/wiki/RISC-V-Qemu-Virt-support

3) Build Linux after enabling SBI HVC and SBI earlycon CONFIG_RISCV_SBI_V01=y CONFIG_SERIAL_EARLYCON_RISCV_SBI=y CONFIG_HVC_RISCV_SBI=y

4) Build buildroot.

Run with below command.
qemu-system-riscv64 -nographic \

(quoted diff) +0 -5
-drive file=Build/RiscVVirtQemu/RELEASE_GCC5/FV/RISCV_VIRT.fd,if=pflash,format=raw,unit=1 \
-machine virt,acpi=on -smp 16 -m 2G \
-kernel arch/riscv/boot/Image \
-initrd buildroot/output/images/rootfs.cpio \
-append "root=/dev/ram ro console=hvc0 earlycon=sbi"

Jisheng Zhang (1):
riscv: move sbi_init() earlier before jump_label_init()

Sunil V L (23):
ACPICA: MADT: Add RISC-V INTC interrupt controller
ACPICA: Add structure definitions for RISC-V RHCT
RISC-V: ACPI: Add empty headers to enable ACPI core
RISC-V: ACPI: Add basic functions to build ACPI core
RISC-V: ACPI: Add PCI functions to build ACPI core
RISC-V: ACPI: Enable ACPI build infrastructure
ACPI: Enable ACPI_PROCESSOR for RISC-V
ACPI: OSL: Make should_use_kmap() 0 for RISC-V.
ACPI: processor_core: RISC-V: Enable mapping processor to the hartid
RISC-V: ACPI: irqchip/riscv-intc: Add ACPI support
RISC-V: ACPI: smpboot: Create wrapper smp_setup()
RISC-V: ACPI: smpboot: Add ACPI support in smp_setup()
RISC-V: ACPI: smpboot: Add function to retrieve the hartid clocksource/timer-riscv: Refactor riscv_timer_init_dt()
RISC-V: ACPI: clocksource/timer-riscv: Add ACPI support

Quoted 8 lines

ACPI: RISC-V: drivers/acpi: Add RHCT related code
RISC-V: ACPI: time.c: Add ACPI support for time_init()
RISC-V: ACPI: cpufeature: Add ACPI support in riscv_fill_hwcap()
RISC-V: ACPI: cpu: Enable cpuinfo for ACPI systems
RISC-V: ACPI: Add ACPI initialization in setup_arch()
RISC-V: ACPI: Enable ACPI in defconfig
MAINTAINERS: Add entry for drivers/acpi/riscv Documentation/kernel-parameters.txt: Add RISC-V for ACPI parameter

The series looks fine to me from the ACPI perspective, so please feel free to add

to it and route it via RISC-V.

Thanks!

#63 lore raw
In reply to Sunil V L

Hey Sunil,

Quoted 6 lines · Sunil V L

This patch series enables the basic ACPI infrastructure for RISC-V. Supporting external interrupt controllers is in progress and hence it is tested using polling based HVC SBI console and RAM disk.

The series depends on Anup's IPI improvement series.
https://github.com/avpatel/linux/commits/riscv_ipi_imp_v17

In the future, please provide links to patchsets rather than "random" git trees.

Quoted 2 lines

Jisheng Zhang (1):
riscv: move sbi_init() earlier before jump_label_init()

    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

What has this patch got to do with your series? Just something that was sitting in your tree?

If you need this, it'd be ideal if you would submit *with* the R-b tags it appears to have had by v6 [1] & add the reason that you need to move it to the commit message.
In Jisheng's series that was obvious, but this is a significantly larger series and it is hard to spot your reasoning for it.

Cheers,
Conor.

#64 lore raw
Quoted 17 lines · Conor Dooley

Hey Sunil,

Quoted 6 lines · Sunil V L

This patch series enables the basic ACPI infrastructure for RISC-V. Supporting external interrupt controllers is in progress and hence it is tested using polling based HVC SBI console and RAM disk.

The series depends on Anup's IPI improvement series.
https://github.com/avpatel/linux/commits/riscv_ipi_imp_v17

In the future, please provide links to patchsets rather than "random" git trees.

Quoted 2 lines

Jisheng Zhang (1):
riscv: move sbi_init() earlier before jump_label_init()

    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Quoted 8 lines

What has this patch got to do with your series? Just something that was sitting in your tree?

If you need this, it'd be ideal if you would submit *with* the R-b tags it appears to have had by v6 [1] & add the reason that you need to move it to the commit message.
In Jisheng's series that was obvious, but this is a significantly larger series and it is hard to spot your reasoning for it.

Apologies, I forgot to provide the link!
https://lore.kernel.org/all/[email protected]/

Cheers,
Conor.

author maintainer
#65 lore raw

Hi Conor,

Quoted 21 lines · Conor Dooley
Quoted 20 lines · Conor Dooley

Hey Sunil,

Quoted 6 lines · Sunil V L

This patch series enables the basic ACPI infrastructure for RISC-V. Supporting external interrupt controllers is in progress and hence it is tested using polling based HVC SBI console and RAM disk.

The series depends on Anup's IPI improvement series.
https://github.com/avpatel/linux/commits/riscv_ipi_imp_v17

In the future, please provide links to patchsets rather than "random" git trees.

Quoted 2 lines

Jisheng Zhang (1):
riscv: move sbi_init() earlier before jump_label_init()

    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

What has this patch got to do with your series? Just something that was sitting in your tree?

Quoted 9 lines
Quoted 5 lines

If you need this, it'd be ideal if you would submit *with* the R-b tags it appears to have had by v6 [1] & add the reason that you need to move it to the commit message.
In Jisheng's series that was obvious, but this is a significantly larger series and it is hard to spot your reasoning for it.

Apologies, I forgot to provide the link!
https://lore.kernel.org/all/[email protected]/

First of all, thank you very much for your detailed review!!. Will address your comments in the next revision of the series I am preparing to send this week.

This patch from Jisheng is required to enable ACPI for the same reason. sbi_init() should be called before jump_label_init(). Otherwise, I hit a panic like below.

[   0.000000] efi: seeding entropy pool
 [   0.000000] sbi_remote_fence_i: Enter for cpu_mask = 0000000000000000
 [   0.000000] Kernel panic - not syncing: __sbi_rfence is called before sbi_init!!!
 [   0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 5.19.0-rc3-00079-gd3ee951eeea1-dirty #3
 [   0.000000] Call Trace:
 [   0.000000] [<ffffffff80005900>] dump_backtrace+0x1c/0x24
 [   0.000000] [<ffffffff8072a83e>] show_stack+0x2c/0x38
 [   0.000000] [<ffffffff8072fe7c>] dump_stack_lvl+0x40/0x58
 [   0.000000] [<ffffffff8072fea8>] dump_stack+0x14/0x1c
 [   0.000000] [<ffffffff8072ae4a>] panic+0x106/0x2c6
 [   0.000000] [<ffffffff8072a964>] sbi_remote_fence_i+0x32/0x4a
 [   0.000000] [<ffffffff80009c22>] flush_icache_all+0x1a/0x44
 [   0.000000] [<ffffffff8000622a>] patch_text_nosync+0x1e/0x2a
 [   0.000000] [<ffffffff800084da>] arch_jump_label_transform+0x48/0xd0
 [   0.000000] [<ffffffff801013ee>] __jump_label_update+0x82/0xd4
 [   0.000000] [<ffffffff801014bc>] jump_label_update+0x7c/0xca
 [   0.000000] [<ffffffff80101b5c>] static_key_enable_cpuslocked+0x70/0x9c
 [   0.000000] [<ffffffff80101b9e>] static_key_enable+0x16/0x24
 [   0.000000] [<ffffffff80730c16>] crng_set_ready+0x18/0x20
 [   0.000000] [<ffffffff80022f06>] execute_in_process_context+0x3e/0x92
 [   0.000000] [<ffffffff80730dc8>] _credit_init_bits+0x9c/0x140
 [   0.000000] [<ffffffff80827024>] add_bootloader_randomness+0x3e/0x48
 [   0.000000] [<ffffffff8082c434>] efi_config_parse_tables+0x114/0x21c
 [   0.000000] [<ffffffff8082dd18>] efi_init+0x11e/0x22a
 [   0.000000] [<ffffffff80803256>] setup_arch+0xc8/0x5fa
 [   0.000000] [<ffffffff80800716>] start_kernel+0x88/0x74e
 [   0.000000] ---[ end Kernel panic - not syncing: __sbi_rfence is called before sbi_init!!! ]---

Yes, I missed V6 of Jishang. Will update it. I will also use public patchset linkgs.

Thanks!
Sunil