| Message ID | 20250227123628.2931490-3-hchauhan@ventanamicro.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Add RAS support for RISC-V architecture | expand |
| Context | Check | Description |
|---|---|---|
| bjorn/pre-ci_am | fail | Failed to apply series |
On 27/02/2025 13:36, Himanshu Chauhan wrote: > ghes_map function uses arch_apei_get_mem_attribute to get the > protection bits for a given physical address. These protection > bits are then used to map the physical address. > > Signed-off-by: Himanshu Chauhan <hchauhan@ventanamicro.com> > --- > arch/riscv/include/asm/acpi.h | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/arch/riscv/include/asm/acpi.h b/arch/riscv/include/asm/acpi.h > index 6e13695120bc..0c599452ef48 100644 > --- a/arch/riscv/include/asm/acpi.h > +++ b/arch/riscv/include/asm/acpi.h > @@ -27,6 +27,26 @@ extern int acpi_disabled; > extern int acpi_noirq; > extern int acpi_pci_disabled; > > +#ifdef CONFIG_ACPI_APEI > +/* > + * acpi_disable_cmcff is used in drivers/acpi/apei/hest.c for disabling > + * IA-32 Architecture Corrected Machine Check (CMC) Firmware-First mode > + * with a kernel command line parameter "acpi=nocmcoff". But we don't > + * have this IA-32 specific feature on ARM64, this definition is only Hi Himanshu s/ARM/RISC-V Thanks, Clément > + * for compatibility. > + */ > +#define acpi_disable_cmcff 1 > +static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) > +{ > + /* > + * Until we have a way to look for EFI memory attributes. > + */ > + return PAGE_KERNEL; > +} > +#else /* CONFIG_ACPI_APEI */ > +#define acpi_disable_cmcff 0 > +#endif /* !CONFIG_ACPI_APEI */ > + > static inline void disable_acpi(void) > { > acpi_disabled = 1;
diff --git a/arch/riscv/include/asm/acpi.h b/arch/riscv/include/asm/acpi.h index 6e13695120bc..0c599452ef48 100644 --- a/arch/riscv/include/asm/acpi.h +++ b/arch/riscv/include/asm/acpi.h @@ -27,6 +27,26 @@ extern int acpi_disabled; extern int acpi_noirq; extern int acpi_pci_disabled; +#ifdef CONFIG_ACPI_APEI +/* + * acpi_disable_cmcff is used in drivers/acpi/apei/hest.c for disabling + * IA-32 Architecture Corrected Machine Check (CMC) Firmware-First mode + * with a kernel command line parameter "acpi=nocmcoff". But we don't + * have this IA-32 specific feature on ARM64, this definition is only + * for compatibility. + */ +#define acpi_disable_cmcff 1 +static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) +{ + /* + * Until we have a way to look for EFI memory attributes. + */ + return PAGE_KERNEL; +} +#else /* CONFIG_ACPI_APEI */ +#define acpi_disable_cmcff 0 +#endif /* !CONFIG_ACPI_APEI */ + static inline void disable_acpi(void) { acpi_disabled = 1;
ghes_map function uses arch_apei_get_mem_attribute to get the protection bits for a given physical address. These protection bits are then used to map the physical address. Signed-off-by: Himanshu Chauhan <hchauhan@ventanamicro.com> --- arch/riscv/include/asm/acpi.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)