ACPI: Arm Generic Diagnostic Dump and Reset device
Subsystems (2)
v3 cover ACPI: Arm Generic Diagnostic Dump and Reset device
Arm Generic Diagnostic Dump and Reset device enables a maintainer to request OS to perform a diagnostic dump and reset a system via SDEI event or an interrupt. This patchset adds support for the SDEI path.
I do have a patch to enable the interrupt path as well but I'm holding it back since AGDI table is missing interrupt configuration fields (trigger type etc.).
The recently published specification is available at
https://developer.arm.com/documentation/den0093/latest
The patchset was tested on Ampere Altra/Mt. Jade.
The patchset applies on top of
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm bleeding-edge (642439a44411)
From v1:
* Moved pdata to the stack and dropped unnecessary kzalloc() in agdi_init()
* Changed the ACPICA patch upstreaming order comment in the paragraph above
From v2:
* The first patch was split. The most of it was merged to ACPICA project at first and later ported to linux-acpi (fd919e37cb15914c6fe13e13d530a4f732407c6d). The rest are in the first patch.
Ilkka Koskinen (2):
ACPI: tables: Add AGDI to the list of known table signatures
ACPI: AGDI: Add driver for Arm Generic Diagnostic Dump and Reset
device
drivers/acpi/arm64/Kconfig | 8 +++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/agdi.c | 125 ++++++++++++++++++++++++++++++++++++ drivers/acpi/tables.c | 2 +- 4 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 drivers/acpi/arm64/agdi.c
Signature · 1 line
2.17.1
PATCH v3 1/2 ACPI: tables: Add AGDI to the list of known table signatures
Add AGDI to the list of known ACPI table signatures to allow the kernel to recognize it when upgrading tables via initrd.
--- drivers/acpi/tables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/tables.c +1 -1
@@ -500,7 +500,7 @@ static const char table_sigs[][ACPI_NAMESEG_SIZE] __initconst = {ACPI_SIG_WDDT ,ACPI_SIG_WDRT ,ACPI_SIG_DSDT ,ACPI_SIG_FADT ,ACPI_SIG_PSDT ,ACPI_SIG_RSDT ,ACPI_SIG_XSDT ,ACPI_SIG_SSDT ,ACPI_SIG_IORT ,ACPI_SIG_NFIT ,ACPI_SIG_HMAT ,ACPI_SIG_PPTT , - ACPI_SIG_NHLT, ACPI_SIG_AEST }; + ACPI_SIG_NHLT, ACPI_SIG_AEST, ACPI_SIG_AGDI };#define ACPI_HEADER_SIZE sizeof(struct acpi_table_header)
Signature · 1 line
2.17.1
PATCH v3 2/2 ACPI: AGDI: Add driver for Arm Generic Diagnostic Dump and Reset device
In reply to Ilkka KoskinenACPI for Arm Components 1.1 Platform Design Document v1.1 [0] specifices Arm Generic Diagnostic Device Interface (AGDI). It allows an admin to issue diagnostic dump and reset via an SDEI event or an interrupt. This patch implements SDEI path.
[0] https://developer.arm.com/documentation/den0093/latest/
--- drivers/acpi/arm64/Kconfig | 8 +++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/agdi.c | 125 ++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 drivers/acpi/arm64/agdi.c
drivers/acpi/arm64/Kconfig +8 -0
@@ -8,3 +8,11 @@ config ACPI_IORT config ACPI_GTDT bool + +config ACPI_AGDI + bool "Arm Generic Diagnostic Dump and Reset Device Interface" + depends on ARM_SDE_INTERFACE + help + Arm Generic Diagnostic Dump and Reset Device Interface (AGDI) is + a standard that enables issuing a non-maskable diagnostic dump and + reset command.
drivers/acpi/arm64/Makefile +1 -0
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_ACPI_AGDI) += agdi.o obj-$(CONFIG_ACPI_IORT) += iort.o obj-$(CONFIG_ACPI_GTDT) += gtdt.o obj-y += dma.o
drivers/acpi/arm64/agdi.c new file +125 -0
125 lines not on this page · raw message
Signature · 1 line
2.17.1
Rafael J. Wysocki
maintainerRe: [PATCH v3 2/2] ACPI: AGDI: Add driver for Arm Generic Diagnostic Dump and Reset device
Quoted 9 lines · Ilkka Koskinen
ACPI for Arm Components 1.1 Platform Design Document v1.1 [0] specifices Arm Generic Diagnostic Device Interface (AGDI). It allows an admin to issue diagnostic dump and reset via an SDEI event or an interrupt. This patch implements SDEI path.
[0] https://developer.arm.com/documentation/den0093/latest/
Signed-off-by Ilkka Koskinen <[email protected]>
This requires an ACK from the arm64 side if you want me to take it.
However, I can apply patch 1 from this series if that helps.
Quoted 167 lines
--- drivers/acpi/arm64/Kconfig | 8 +++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/agdi.c | 125 ++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 drivers/acpi/arm64/agdi.cdrivers/acpi/arm64/Kconfig +8
-0@@ -8,3 +8,11 @@ config ACPI_IORT config ACPI_GTDT bool + +config ACPI_AGDI + bool "Arm Generic Diagnostic Dump and Reset Device Interface" + depends on ARM_SDE_INTERFACE + help + Arm Generic Diagnostic Dump and Reset Device Interface (AGDI) is + a standard that enables issuing a non-maskable diagnostic dump and + reset command.drivers/acpi/arm64/Makefile +1
-0@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_ACPI_AGDI) += agdi.o obj-$(CONFIG_ACPI_IORT) += iort.o obj-$(CONFIG_ACPI_GTDT) += gtdt.o obj-y += dma.odrivers/acpi/arm64/agdi.c new file +125
-1@@ -0,0 +1,125 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* This file implements handling of +* Arm Generic Diagnostic Dump and Reset Interface table (AGDI) +* +* Copyright (c) 2021, Ampere Computing LLC +*/ + +#define pr_fmt (fmt) "ACPI: AGDI: " fmt + +#include <linux/kernel.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/acpi.h> +#include <linux/arm_sdei.h> +#include <linux/io.h> + +struct agdi_data { +int sdei_event; +}; + +static int agdi_sdei_handler (u32 sdei_event,struct pt_regs *regs,void *arg) +{ +nmi_panic (regs,"Arm Generic Diagnostic Dump and Reset SDEI event issued" ); +return 0 ; +} + +static int agdi_sdei_probe (struct platform_device *pdev, +struct agdi_data *adata) +{ +int err; + + err =sdei_event_register (adata->sdei_event, agdi_sdei_handler, pdev); +if (err) { +dev_err (&pdev->dev,"Failed to register for SDEI event %d" , + adata->sdei_event); +return err; + } + + err =sdei_event_enable (adata->sdei_event); +if (err) { +sdei_event_unregister (adata->sdei_event); +dev_err (&pdev->dev,"Failed to enable event %d\n" , + adata->sdei_event); +return err; + } + +return 0 ; +} + +static int agdi_probe (struct platform_device *pdev) +{ +struct agdi_data *adata; + + adata =dev_get_platdata (&pdev->dev); +if (!adata) +return -EINVAL ; + +return agdi_sdei_probe (pdev, adata); +} + +static int agdi_remove (struct platform_device *pdev) +{ +struct agdi_data *adata =platform_get_drvdata (pdev); + +sdei_event_disable (adata->sdei_event); +sdei_event_unregister (adata->sdei_event); + +return 0 ; +} + +static struct platform_driver agdi_driver = { + .driver = { + .name ="agdi" , + }, + .probe = agdi_probe, + .remove = agdi_remove, +}; + +static int __init agdi_init (void ) +{ +int ret; +acpi_status status; +struct acpi_table_agdi *agdi_table; +struct agdi_data pdata; +struct platform_device *pdev; + +if (acpi_disabled) +return 0 ; + + status =acpi_get_table (ACPI_SIG_AGDI ,0 , + (struct acpi_table_header **) &agdi_table); +if (ACPI_FAILURE (status)) +return -ENODEV ; + +if (agdi_table->flags &ACPI_AGDI_SIGNALING_MODE ) { +pr_warn ("Interrupt signaling is not supported" ); + ret = -ENODEV ; + goto err_put_table; + } + + pdata.sdei_event = agdi_table->sdei_event; + + pdev =platform_device_register_data (NULL ,"agdi" ,0 , &pdata,sizeof (pdata)); +if (IS_ERR (pdev)) { + ret =PTR_ERR (pdev); + goto err_put_table; + } + + ret =platform_driver_register (&agdi_driver); +if (ret) + goto err_device_unregister; + +acpi_put_table ((struct acpi_table_header *)agdi_table); +return 0 ; + +err_device_unregister: +platform_device_unregister (pdev); +err_put_table: +acpi_put_table ((struct acpi_table_header *)agdi_table); +return ret; +} +device_initcall (agdi_init); --2.17.1
Re: [PATCH v3 2/2] ACPI: AGDI: Add driver for Arm Generic Diagnostic Dump and Reset device
Hi Rafael,
Quoted 8 lines · Rafael J. Wysocki
Quoted 6 lines · Ilkka Koskinen
ACPI for Arm Components 1.1 Platform Design Document v1.1 [0] specifices Arm Generic Diagnostic Device Interface (AGDI). It allows an admin to issue diagnostic dump and reset via an SDEI event or an interrupt. This patch implements SDEI path.
Quoted 5 lines
Quoted 3 lines
[0] https://developer.arm.com/documentation/den0093/latest/
Signed-off-by Ilkka Koskinen <[email protected]>This requires an ACK from the arm64 side if you want me to take it.
That's my understanding too.
Quoted 1 line
However, I can apply patch 1 from this series if that helps.
I'm not sure, if it makes sense to pick the first patch now since there aren't other users for it. I'd probably keep them together although I don't have strong feelings about it.
Cheers, Ilkka
Quoted 169 lines
Quoted 168 lines
--- drivers/acpi/arm64/Kconfig | 8 +++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/agdi.c | 125 ++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 drivers/acpi/arm64/agdi.cdrivers/acpi/arm64/Kconfig +8
-0@@ -8,3 +8,11 @@ config ACPI_IORT config ACPI_GTDT bool + +config ACPI_AGDI + bool "Arm Generic Diagnostic Dump and Reset Device Interface" + depends on ARM_SDE_INTERFACE + help + Arm Generic Diagnostic Dump and Reset Device Interface (AGDI) is + a standard that enables issuing a non-maskable diagnostic dump and + reset command.drivers/acpi/arm64/Makefile +1
-0@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_ACPI_AGDI) += agdi.o obj-$(CONFIG_ACPI_IORT) += iort.o obj-$(CONFIG_ACPI_GTDT) += gtdt.o obj-y += dma.odrivers/acpi/arm64/agdi.c new file +125
-1@@ -0,0 +1,125 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* This file implements handling of +* Arm Generic Diagnostic Dump and Reset Interface table (AGDI) +* +* Copyright (c) 2021, Ampere Computing LLC +*/ + +#define pr_fmt (fmt) "ACPI: AGDI: " fmt + +#include <linux/kernel.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/acpi.h> +#include <linux/arm_sdei.h> +#include <linux/io.h> + +struct agdi_data { +int sdei_event; +}; + +static int agdi_sdei_handler (u32 sdei_event,struct pt_regs *regs,void *arg) +{ +nmi_panic (regs,"Arm Generic Diagnostic Dump and Reset SDEI event issued" ); +return 0 ; +} + +static int agdi_sdei_probe (struct platform_device *pdev, +struct agdi_data *adata) +{ +int err; + + err =sdei_event_register (adata->sdei_event, agdi_sdei_handler, pdev); +if (err) { +dev_err (&pdev->dev,"Failed to register for SDEI event %d" , + adata->sdei_event); +return err; + } + + err =sdei_event_enable (adata->sdei_event); +if (err) { +sdei_event_unregister (adata->sdei_event); +dev_err (&pdev->dev,"Failed to enable event %d\n" , + adata->sdei_event); +return err; + } + +return 0 ; +} + +static int agdi_probe (struct platform_device *pdev) +{ +struct agdi_data *adata; + + adata =dev_get_platdata (&pdev->dev); +if (!adata) +return -EINVAL ; + +return agdi_sdei_probe (pdev, adata); +} + +static int agdi_remove (struct platform_device *pdev) +{ +struct agdi_data *adata =platform_get_drvdata (pdev); + +sdei_event_disable (adata->sdei_event); +sdei_event_unregister (adata->sdei_event); + +return 0 ; +} + +static struct platform_driver agdi_driver = { + .driver = { + .name ="agdi" , + }, + .probe = agdi_probe, + .remove = agdi_remove, +}; + +static int __init agdi_init (void ) +{ +int ret; +acpi_status status; +struct acpi_table_agdi *agdi_table; +struct agdi_data pdata; +struct platform_device *pdev; + +if (acpi_disabled) +return 0 ; + + status =acpi_get_table (ACPI_SIG_AGDI ,0 , + (struct acpi_table_header **) &agdi_table); +if (ACPI_FAILURE (status)) +return -ENODEV ; + +if (agdi_table->flags &ACPI_AGDI_SIGNALING_MODE ) { +pr_warn ("Interrupt signaling is not supported" ); + ret = -ENODEV ; + goto err_put_table; + } + + pdata.sdei_event = agdi_table->sdei_event; + + pdev =platform_device_register_data (NULL ,"agdi" ,0 , &pdata,sizeof (pdata)); +if (IS_ERR (pdev)) { + ret =PTR_ERR (pdev); + goto err_put_table; + } + + ret =platform_driver_register (&agdi_driver); +if (ret) + goto err_device_unregister; + +acpi_put_table ((struct acpi_table_header *)agdi_table); +return 0 ; + +err_device_unregister: +platform_device_unregister (pdev); +err_put_table: +acpi_put_table ((struct acpi_table_header *)agdi_table); +return ret; +} +device_initcall (agdi_init); --2.17.1
Hanjun Guo
maintainerRe: [PATCH v3 2/2] ACPI: AGDI: Add driver for Arm Generic Diagnostic Dump and Reset device
In reply to Ilkka KoskinenHi Ilkka,
Quoted 55 lines · Ilkka Koskinen
ACPI for Arm Components 1.1 Platform Design Document v1.1 [0] specifices Arm Generic Diagnostic Device Interface (AGDI). It allows an admin to issue diagnostic dump and reset via an SDEI event or an interrupt. This patch implements SDEI path.
[0] https://developer.arm.com/documentation/den0093/latest/
Signed-off-by Ilkka Koskinen <[email protected]>--- drivers/acpi/arm64/Kconfig | 8 +++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/agdi.c | 125 ++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+)create mode 100644
drivers/acpi/arm64/agdi.cdrivers/acpi/arm64/Kconfig +8
-0@@ -8,3 +8,11 @@ config ACPI_IORT config ACPI_GTDT bool + +config ACPI_AGDI + bool "Arm Generic Diagnostic Dump and Reset Device Interface" + depends on ARM_SDE_INTERFACE + help + Arm Generic Diagnostic Dump and Reset Device Interface (AGDI) is + a standard that enables issuing a non-maskable diagnostic dump and + reset command.drivers/acpi/arm64/Makefile +1
-0@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_ACPI_AGDI) += agdi.o obj-$(CONFIG_ACPI_IORT) += iort.o obj-$(CONFIG_ACPI_GTDT) += gtdt.o obj-y += dma.odrivers/acpi/arm64/agdi.c new file +8
-0@@ -0,0 +1,125 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* This file implements handling of +* Arm Generic Diagnostic Dump and Reset Interface table (AGDI) +* +* Copyright (c) 2021, Ampere Computing LLC +*/ +
drivers/acpi/arm64/agdi.c line 18
Quoted 10 lines
drivers/acpi/arm64/agdi.c new file +10
-0+#define pr_fmt (fmt) "ACPI: AGDI: " fmt + +#include <linux/kernel.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/acpi.h> +#include <linux/arm_sdei.h> +#include <linux/io.h>
Please keep the head files in alphabetical order.
Quoted 97 lines
drivers/acpi/arm64/agdi.c new file +97
-0+ +struct agdi_data { +int sdei_event; +}; + +static int agdi_sdei_handler (u32 sdei_event,struct pt_regs *regs,void *arg) +{ +nmi_panic (regs,"Arm Generic Diagnostic Dump and Reset SDEI event issued" ); +return 0 ; +} + +static int agdi_sdei_probe (struct platform_device *pdev, +struct agdi_data *adata) +{ +int err; + + err =sdei_event_register (adata->sdei_event, agdi_sdei_handler, pdev); +if (err) { +dev_err (&pdev->dev,"Failed to register for SDEI event %d" , + adata->sdei_event); +return err; + } + + err =sdei_event_enable (adata->sdei_event); +if (err) { +sdei_event_unregister (adata->sdei_event); +dev_err (&pdev->dev,"Failed to enable event %d\n" , + adata->sdei_event); +return err; + } + +return 0 ; +} + +static int agdi_probe (struct platform_device *pdev) +{ +struct agdi_data *adata; + + adata =dev_get_platdata (&pdev->dev); +if (!adata) +return -EINVAL ; + +return agdi_sdei_probe (pdev, adata); +} + +static int agdi_remove (struct platform_device *pdev) +{ +struct agdi_data *adata =platform_get_drvdata (pdev); + +sdei_event_disable (adata->sdei_event); +sdei_event_unregister (adata->sdei_event); + +return 0 ; +} + +static struct platform_driver agdi_driver = { + .driver = { + .name ="agdi" , + }, + .probe = agdi_probe, + .remove = agdi_remove, +}; + +static int __init agdi_init (void ) +{ +int ret; +acpi_status status; +struct acpi_table_agdi *agdi_table; +struct agdi_data pdata; +struct platform_device *pdev; + +if (acpi_disabled) +return 0 ; + + status =acpi_get_table (ACPI_SIG_AGDI ,0 , + (struct acpi_table_header **) &agdi_table); +if (ACPI_FAILURE (status)) +return -ENODEV ; + +if (agdi_table->flags &ACPI_AGDI_SIGNALING_MODE ) { +pr_warn ("Interrupt signaling is not supported" ); + ret = -ENODEV ; + goto err_put_table; + } + + pdata.sdei_event = agdi_table->sdei_event; + + pdev =platform_device_register_data (NULL ,"agdi" ,0 , &pdata,sizeof (pdata)); +if (IS_ERR (pdev)) { + ret =PTR_ERR (pdev); + goto err_put_table; + } + + ret =platform_driver_register (&agdi_driver); +if (ret) + goto err_device_unregister; +
drivers/acpi/arm64/agdi.c line 125
Quoted 10 lines
drivers/acpi/arm64/agdi.c new file +10
-0+acpi_put_table ((struct acpi_table_header *)agdi_table); +return 0 ; + +err_device_unregister: +platform_device_unregister (pdev); +err_put_table: +acpi_put_table ((struct acpi_table_header *)agdi_table); +return ret; +} +device_initcall (agdi_init);
The rest are looking good to me.
Thanks
Hanjun
Re: [PATCH v3 2/2] ACPI: AGDI: Add driver for Arm Generic Diagnostic Dump and Reset device
Hi Hanjun,
Quoted 61 lines · Hanjun Guo
Hi Ilkka,
Quoted 58 lines · Ilkka Koskinen
ACPI for Arm Components 1.1 Platform Design Document v1.1 [0] specifices Arm Generic Diagnostic Device Interface (AGDI). It allows an admin to issue diagnostic dump and reset via an SDEI event or an interrupt. This patch implements SDEI path.
[0] https://developer.arm.com/documentation/den0093/latest/
Signed-off-by Ilkka Koskinen <[email protected]>--- drivers/acpi/arm64/Kconfig | 8 +++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/agdi.c | 125 ++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+)create mode 100644
drivers/acpi/arm64/agdi.cdrivers/acpi/arm64/Kconfig +8
-0@@ -8,3 +8,11 @@ config ACPI_IORT config ACPI_GTDT bool + +config ACPI_AGDI + bool "Arm Generic Diagnostic Dump and Reset Device Interface" + depends on ARM_SDE_INTERFACE + help + Arm Generic Diagnostic Dump and Reset Device Interface (AGDI) is + a standard that enables issuing a non-maskable diagnostic dump and + reset command.drivers/acpi/arm64/Makefile +1
-0@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_ACPI_AGDI) += agdi.o obj-$(CONFIG_ACPI_IORT) += iort.o obj-$(CONFIG_ACPI_GTDT) += gtdt.o obj-y += dma.odrivers/acpi/arm64/agdi.c new file +12
-0@@ -0,0 +1,125 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* This file implements handling of +* Arm Generic Diagnostic Dump and Reset Interface table (AGDI) +* +* Copyright (c) 2021, Ampere Computing LLC +*/ + +#define pr_fmt (fmt) "ACPI: AGDI: " fmt + +#include <linux/kernel.h> +#include <linux/platform_device.h>
Quoted 8 lines
drivers/acpi/arm64/agdi.c line 18
Quoted 6 lines
drivers/acpi/arm64/agdi.c new file +6
-0+#include <linux/slab.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/acpi.h> +#include <linux/arm_sdei.h> +#include <linux/io.h> Please keep the head files in alphabetical order.
I'll fix the include lines
Quoted 106 lines
Quoted 106 lines
drivers/acpi/arm64/agdi.c new file +6
-0+ +struct agdi_data { +int sdei_event; +}; + +static int agdi_sdei_handler(u32 sdei_event, struct pt_regs *regs, void*arg)
drivers/acpi/arm64/agdi.c new file +2
-0+{ + nmi_panic(regs, "Arm Generic Diagnostic Dump and Reset SDEI eventissued");
drivers/acpi/arm64/agdi.c new file +9
-0+return 0 ; +} + +static int agdi_sdei_probe (struct platform_device *pdev, +struct agdi_data *adata) +{ +int err; + + err = sdei_event_register(adata->sdei_event, agdi_sdei_handler,pdev);
drivers/acpi/arm64/agdi.c new file +71
-0+if (err) { +dev_err (&pdev->dev,"Failed to register for SDEI event %d" , + adata->sdei_event); +return err; + } + + err =sdei_event_enable (adata->sdei_event); +if (err) { +sdei_event_unregister (adata->sdei_event); +dev_err (&pdev->dev,"Failed to enable event %d\n" , + adata->sdei_event); +return err; + } + +return 0 ; +} + +static int agdi_probe (struct platform_device *pdev) +{ +struct agdi_data *adata; + + adata =dev_get_platdata (&pdev->dev); +if (!adata) +return -EINVAL ; + +return agdi_sdei_probe (pdev, adata); +} + +static int agdi_remove (struct platform_device *pdev) +{ +struct agdi_data *adata =platform_get_drvdata (pdev); + +sdei_event_disable (adata->sdei_event); +sdei_event_unregister (adata->sdei_event); + +return 0 ; +} + +static struct platform_driver agdi_driver = { + .driver = { + .name ="agdi" , + }, + .probe = agdi_probe, + .remove = agdi_remove, +}; + +static int __init agdi_init (void ) +{ +int ret; +acpi_status status; +struct acpi_table_agdi *agdi_table; +struct agdi_data pdata; +struct platform_device *pdev; + +if (acpi_disabled) +return 0 ; + + status =acpi_get_table (ACPI_SIG_AGDI ,0 , + (struct acpi_table_header **) &agdi_table); +if (ACPI_FAILURE (status)) +return -ENODEV ; + +if (agdi_table->flags &ACPI_AGDI_SIGNALING_MODE ) { +pr_warn ("Interrupt signaling is not supported" ); + ret = -ENODEV ; + goto err_put_table; + } + + pdata.sdei_event = agdi_table->sdei_event; + + pdev = platform_device_register_data(NULL, "agdi", 0, &pdata,sizeof(pdata));
drivers/acpi/arm64/agdi.c new file +13
-0+if (IS_ERR (pdev)) { + ret =PTR_ERR (pdev); + goto err_put_table; + } + + ret =platform_driver_register (&agdi_driver); +if (ret) + goto err_device_unregister; + +acpi_put_table ((struct acpi_table_header *)agdi_table); +return 0 ; + +err_device_unregister:
Quoted 8 lines
drivers/acpi/arm64/agdi.c line 125
Quoted 6 lines
drivers/acpi/arm64/agdi.c new file +6
-0+platform_device_unregister (pdev); +err_put_table: +acpi_put_table ((struct acpi_table_header *)agdi_table); +return ret; +} +device_initcall (agdi_init);The rest are looking good to me.
I'm glad to hear that
Quoted 3 lines
Thanks
Hanjun
Cheers, Ilkka
Re: [PATCH v3 2/2] ACPI: AGDI: Add driver for Arm Generic Diagnostic Dump and Reset device
In reply to Ilkka Koskinen[+James, for SDEI bits]
Quoted 55 lines · Ilkka Koskinen
ACPI for Arm Components 1.1 Platform Design Document v1.1 [0] specifices Arm Generic Diagnostic Device Interface (AGDI). It allows an admin to issue diagnostic dump and reset via an SDEI event or an interrupt. This patch implements SDEI path.
[0] https://developer.arm.com/documentation/den0093/latest/
Signed-off-by Ilkka Koskinen <[email protected]>--- drivers/acpi/arm64/Kconfig | 8 +++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/agdi.c | 125 ++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 drivers/acpi/arm64/agdi.cdrivers/acpi/arm64/Kconfig +8
-0@@ -8,3 +8,11 @@ config ACPI_IORT config ACPI_GTDT bool + +config ACPI_AGDI + bool "Arm Generic Diagnostic Dump and Reset Device Interface" + depends on ARM_SDE_INTERFACE + help + Arm Generic Diagnostic Dump and Reset Device Interface (AGDI) is + a standard that enables issuing a non-maskable diagnostic dump and + reset command.drivers/acpi/arm64/Makefile +1
-0@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_ACPI_AGDI) += agdi.o obj-$(CONFIG_ACPI_IORT) += iort.o obj-$(CONFIG_ACPI_GTDT) += gtdt.o obj-y += dma.odrivers/acpi/arm64/agdi.c new file +8
-0@@ -0,0 +1,125 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* This file implements handling of +* Arm Generic Diagnostic Dump and Reset Interface table (AGDI) +* +* Copyright (c) 2021, Ampere Computing LLC +*/ +
drivers/acpi/arm64/agdi.c line 18
Quoted 10 lines
drivers/acpi/arm64/agdi.c new file +10
-0+#define pr_fmt (fmt) "ACPI: AGDI: " fmt + +#include <linux/kernel.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/acpi.h> +#include <linux/arm_sdei.h> +#include <linux/io.h>
Nit: alphabetical order.
Quoted 52 lines
drivers/acpi/arm64/agdi.c new file +52
-0+ +struct agdi_data { +int sdei_event; +}; + +static int agdi_sdei_handler (u32 sdei_event,struct pt_regs *regs,void *arg) +{ +nmi_panic (regs,"Arm Generic Diagnostic Dump and Reset SDEI event issued" ); +return 0 ; +} + +static int agdi_sdei_probe (struct platform_device *pdev, +struct agdi_data *adata) +{ +int err; + + err =sdei_event_register (adata->sdei_event, agdi_sdei_handler, pdev); +if (err) { +dev_err (&pdev->dev,"Failed to register for SDEI event %d" , + adata->sdei_event); +return err; + } + + err =sdei_event_enable (adata->sdei_event); +if (err) { +sdei_event_unregister (adata->sdei_event); +dev_err (&pdev->dev,"Failed to enable event %d\n" , + adata->sdei_event); +return err; + } + +return 0 ; +} + +static int agdi_probe (struct platform_device *pdev) +{ +struct agdi_data *adata; + + adata =dev_get_platdata (&pdev->dev); +if (!adata) +return -EINVAL ; + +return agdi_sdei_probe (pdev, adata); +} + +static int agdi_remove (struct platform_device *pdev) +{ +struct agdi_data *adata =platform_get_drvdata (pdev); + +sdei_event_disable (adata->sdei_event); +sdei_event_unregister (adata->sdei_event); +
drivers/acpi/arm64/agdi.c line 80
Quoted 10 lines
drivers/acpi/arm64/agdi.c new file +10
-0+return 0 ; +} + +static struct platform_driver agdi_driver = { + .driver = { + .name ="agdi" , + }, + .probe = agdi_probe, + .remove = agdi_remove, +};
May I ask why we need a platform device (and driver) to register an SDEI event ?
drivers/acpi/arm64/agdi.c line 91
Quoted 10 lines
drivers/acpi/arm64/agdi.c new file +10
-0+static int __init agdi_init (void ) +{ +int ret; +acpi_status status; +struct acpi_table_agdi *agdi_table; +struct agdi_data pdata; +struct platform_device *pdev; + +if (acpi_disabled) +return 0 ;
Why don't we call agdi_init() from acpi_init() as we do for IORT/VIOT ?
I don't think it is necessary to add a device_initcall(), with related ordering dependencies.
drivers/acpi/arm64/agdi.c line 98
Quoted 7 lines
drivers/acpi/arm64/agdi.c new file +7
-0+ + status =acpi_get_table (ACPI_SIG_AGDI ,0 , + (struct acpi_table_header **) &agdi_table); +if (ACPI_FAILURE (status)) +return -ENODEV ; + +if (agdi_table->flags &ACPI_AGDI_SIGNALING_MODE ) {
Is this because specs need updating ?
Quoted 17 lines
drivers/acpi/arm64/agdi.c new file +17
-0+pr_warn ("Interrupt signaling is not supported" ); + ret = -ENODEV ; + goto err_put_table; + } + + pdata.sdei_event = agdi_table->sdei_event; + + pdev =platform_device_register_data (NULL ,"agdi" ,0 , &pdata,sizeof (pdata)); +if (IS_ERR (pdev)) { + ret =PTR_ERR (pdev); + goto err_put_table; + } + + ret =platform_driver_register (&agdi_driver); +if (ret) + goto err_device_unregister; +
drivers/acpi/arm64/agdi.c line 125
Quoted 10 lines
drivers/acpi/arm64/agdi.c new file +10
-0+acpi_put_table ((struct acpi_table_header *)agdi_table); +return 0 ; + +err_device_unregister: +platform_device_unregister (pdev); +err_put_table: +acpi_put_table ((struct acpi_table_header *)agdi_table); +return ret; +} +device_initcall (agdi_init);
See above.
Thanks,
Lorenzo
Re: [PATCH v3 2/2] ACPI: AGDI: Add driver for Arm Generic Diagnostic Dump and Reset device
Hi Lorenzo,
Quoted 62 lines · Lorenzo Pieralisi
[+James, for SDEI bits]
Quoted 59 lines · Ilkka Koskinen
ACPI for Arm Components 1.1 Platform Design Document v1.1 [0] specifices Arm Generic Diagnostic Device Interface (AGDI). It allows an admin to issue diagnostic dump and reset via an SDEI event or an interrupt. This patch implements SDEI path.
[0] https://developer.arm.com/documentation/den0093/latest/
Signed-off-by Ilkka Koskinen <[email protected]>--- drivers/acpi/arm64/Kconfig | 8 +++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/agdi.c | 125 ++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 drivers/acpi/arm64/agdi.cdrivers/acpi/arm64/Kconfig +8
-0@@ -8,3 +8,11 @@ config ACPI_IORT config ACPI_GTDT bool + +config ACPI_AGDI + bool "Arm Generic Diagnostic Dump and Reset Device Interface" + depends on ARM_SDE_INTERFACE + help + Arm Generic Diagnostic Dump and Reset Device Interface (AGDI) is + a standard that enables issuing a non-maskable diagnostic dump and + reset command.drivers/acpi/arm64/Makefile +1
-0@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_ACPI_AGDI) += agdi.o obj-$(CONFIG_ACPI_IORT) += iort.o obj-$(CONFIG_ACPI_GTDT) += gtdt.o obj-y += dma.odrivers/acpi/arm64/agdi.c new file +12
-0@@ -0,0 +1,125 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* This file implements handling of +* Arm Generic Diagnostic Dump and Reset Interface table (AGDI) +* +* Copyright (c) 2021, Ampere Computing LLC +*/ + +#define pr_fmt (fmt) "ACPI: AGDI: " fmt + +#include <linux/kernel.h> +#include <linux/platform_device.h>
Quoted 8 lines
drivers/acpi/arm64/agdi.c line 18
Quoted 6 lines
drivers/acpi/arm64/agdi.c new file +6
-0+#include <linux/slab.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/acpi.h> +#include <linux/arm_sdei.h> +#include <linux/io.h> Nit: alphabetical order.
I clean them
Quoted 58 lines
Quoted 58 lines
drivers/acpi/arm64/agdi.c new file +57
-0+ +struct agdi_data { +int sdei_event; +}; + +static int agdi_sdei_handler (u32 sdei_event,struct pt_regs *regs,void *arg) +{ +nmi_panic (regs,"Arm Generic Diagnostic Dump and Reset SDEI event issued" ); +return 0 ; +} + +static int agdi_sdei_probe (struct platform_device *pdev, +struct agdi_data *adata) +{ +int err; + + err =sdei_event_register (adata->sdei_event, agdi_sdei_handler, pdev); +if (err) { +dev_err (&pdev->dev,"Failed to register for SDEI event %d" , + adata->sdei_event); +return err; + } + + err =sdei_event_enable (adata->sdei_event); +if (err) { +sdei_event_unregister (adata->sdei_event); +dev_err (&pdev->dev,"Failed to enable event %d\n" , + adata->sdei_event); +return err; + } + +return 0 ; +} + +static int agdi_probe (struct platform_device *pdev) +{ +struct agdi_data *adata; + + adata =dev_get_platdata (&pdev->dev); +if (!adata) +return -EINVAL ; + +return agdi_sdei_probe (pdev, adata); +} + +static int agdi_remove (struct platform_device *pdev) +{ +struct agdi_data *adata =platform_get_drvdata (pdev); + +sdei_event_disable (adata->sdei_event); +sdei_event_unregister (adata->sdei_event); + +return 0 ; +} + +static struct platform_driver agdi_driver = { + .driver = {
Quoted 8 lines
drivers/acpi/arm64/agdi.c line 80
Quoted 5 lines
drivers/acpi/arm64/agdi.c new file +5
-0+ .name = "agdi", + }, + .probe = agdi_probe, + .remove = agdi_remove, +};May I ask why we need a platform device (and driver) to register an SDEI event ?
Well, I guess I thought to have a device/driver to handle SDEI events and interrupts since the spec calls it a device. I can certainly remove those, if that's preferred.
Quoted 14 lines
drivers/acpi/arm64/agdi.c line 91
Quoted 11 lines
drivers/acpi/arm64/agdi.c new file +10
-0+static int __init agdi_init (void ) +{ +int ret; +acpi_status status; +struct acpi_table_agdi *agdi_table; +struct agdi_data pdata; +struct platform_device *pdev; + +if (acpi_disabled) +return 0 ;Why don't we call
agdi_init()fromacpi_init()as we do for IORT/VIOT ?
Quoted 2 lines
I don't think it is necessary to add a
device_initcall(), with related ordering dependencies.
That's a good point. I change it.
Quoted 10 lines
drivers/acpi/arm64/agdi.c line 98
Quoted 8 lines
drivers/acpi/arm64/agdi.c new file +7
-0+ + status =acpi_get_table (ACPI_SIG_AGDI ,0 , + (struct acpi_table_header **) &agdi_table); +if (ACPI_FAILURE (status)) +return -ENODEV ; + +if (agdi_table->flags &ACPI_AGDI_SIGNALING_MODE ) {Is this because specs need updating ?
Yes, that's the reason. AGDI table is missing flags that would define trigger type and polarity.
Quoted 31 lines
Quoted 18 lines
drivers/acpi/arm64/agdi.c new file +17
-0+pr_warn ("Interrupt signaling is not supported" ); + ret = -ENODEV ; + goto err_put_table; + } + + pdata.sdei_event = agdi_table->sdei_event; + + pdev =platform_device_register_data (NULL ,"agdi" ,0 , &pdata,sizeof (pdata)); +if (IS_ERR (pdev)) { + ret =PTR_ERR (pdev); + goto err_put_table; + } + + ret =platform_driver_register (&agdi_driver); +if (ret) + goto err_device_unregister; +drivers/acpi/arm64/agdi.c line 125
Quoted 10 lines
drivers/acpi/arm64/agdi.c new file +10
-0+acpi_put_table ((struct acpi_table_header *)agdi_table); +return 0 ; + +err_device_unregister: +platform_device_unregister (pdev); +err_put_table: +acpi_put_table ((struct acpi_table_header *)agdi_table); +return ret; +} +device_initcall (agdi_init);See above.
Quoted 3 lines
Thanks,
Lorenzo
Cheers, Ilkka
Re: [PATCH v3 2/2] ACPI: AGDI: Add driver for Arm Generic Diagnostic Dump and Reset device
Hi Lorenzo,
Quoted 21 lines · Ilkka Koskinen
Hi Lorenzo,
Quoted 17 lines · Lorenzo Pieralisi
[+James, for SDEI bits]
Quoted 14 lines · Ilkka Koskinen
ACPI for Arm Components 1.1 Platform Design Document v1.1 [0] specifices Arm Generic Diagnostic Device Interface (AGDI). It allows an admin to issue diagnostic dump and reset via an SDEI event or an interrupt. This patch implements SDEI path.
[0] https://developer.arm.com/documentation/den0093/latest/
Signed-off-by Ilkka Koskinen <[email protected]>--- drivers/acpi/arm64/Kconfig | 8 +++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/agdi.c | 125 ++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 drivers/acpi/arm64/agdi.c
<snip>
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/acpi/arm64/agdi.c new file +0
-0
<snip>
Quoted 14 lines
Quoted 14 lines
drivers/acpi/arm64/agdi.c line 91
Quoted 11 lines
drivers/acpi/arm64/agdi.c new file +10
-0+static int __init agdi_init (void ) +{ +int ret; +acpi_status status; +struct acpi_table_agdi *agdi_table; +struct agdi_data pdata; +struct platform_device *pdev; + +if (acpi_disabled) +return 0 ;Why don't we call
agdi_init()fromacpi_init()as we do for IORT/VIOT ?
Quoted 4 lines
Quoted 2 lines
I don't think it is necessary to add a
device_initcall(), with related ordering dependencies.That's a good point. I change it.
Actually, I looked at this more carefully. acpi_init() is called in subsys_initcall() while sdei_init() is called in subsys_initcall_sync(). That is, if I call this function in acpi_init(), SDEI driver won't be ready and this driver fails to register the event.
Cheers, Ilkka
Re: [PATCH v3 2/2] ACPI: AGDI: Add driver for Arm Generic Diagnostic Dump and Reset device
Quoted 53 lines · Ilkka Koskinen
Hi Lorenzo,
Quoted 21 lines · Ilkka Koskinen
Hi Lorenzo,
Quoted 17 lines · Lorenzo Pieralisi
[+James, for SDEI bits]
Quoted 14 lines · Ilkka Koskinen
ACPI for Arm Components 1.1 Platform Design Document v1.1 [0] specifices Arm Generic Diagnostic Device Interface (AGDI). It allows an admin to issue diagnostic dump and reset via an SDEI event or an interrupt. This patch implements SDEI path.
[0] https://developer.arm.com/documentation/den0093/latest/
Signed-off-by Ilkka Koskinen <[email protected]>--- drivers/acpi/arm64/Kconfig | 8 +++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/agdi.c | 125 ++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 drivers/acpi/arm64/agdi.c<snip>
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/acpi/arm64/agdi.c new file +0
-0<snip>
Quoted 17 lines
Quoted 16 lines
drivers/acpi/arm64/agdi.c line 91
Quoted 11 lines
drivers/acpi/arm64/agdi.c new file +10
-0+static int __init agdi_init (void ) +{ +int ret; +acpi_status status; +struct acpi_table_agdi *agdi_table; +struct agdi_data pdata; +struct platform_device *pdev; + +if (acpi_disabled) +return 0 ;Why don't we call
agdi_init()fromacpi_init()as we do for IORT/VIOT ?I don't think it is necessary to add a
device_initcall(), with related ordering dependencies.
Quoted 6 lines
Quoted 1 line
That's a good point. I change it.
Actually, I looked at this more carefully.
acpi_init()is called insubsys_initcall()whilesdei_init()is called insubsys_initcall_sync(). That is, if I call this function inacpi_init(), SDEI driver won't be ready and this driver fails to register the event.
Maybe this will help:
Re: [PATCH v3 2/2] ACPI: AGDI: Add driver for Arm Generic Diagnostic Dump and Reset device
Quoted 56 lines · Lorenzo Pieralisi
Quoted 55 lines · Ilkka Koskinen
Hi Lorenzo,
Quoted 21 lines · Ilkka Koskinen
Hi Lorenzo,
Quoted 17 lines · Lorenzo Pieralisi
[+James, for SDEI bits]
Quoted 14 lines · Ilkka Koskinen
ACPI for Arm Components 1.1 Platform Design Document v1.1 [0] specifices Arm Generic Diagnostic Device Interface (AGDI). It allows an admin to issue diagnostic dump and reset via an SDEI event or an interrupt. This patch implements SDEI path.
[0] https://developer.arm.com/documentation/den0093/latest/
Signed-off-by Ilkka Koskinen <[email protected]>--- drivers/acpi/arm64/Kconfig | 8 +++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/agdi.c | 125 ++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 drivers/acpi/arm64/agdi.c<snip>
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/acpi/arm64/agdi.c new file +0
-0<snip>
Quoted 18 lines
Quoted 14 lines
drivers/acpi/arm64/agdi.c line 91
Quoted 11 lines
drivers/acpi/arm64/agdi.c new file +10
-0+static int __init agdi_init (void ) +{ +int ret; +acpi_status status; +struct acpi_table_agdi *agdi_table; +struct agdi_data pdata; +struct platform_device *pdev; + +if (acpi_disabled) +return 0 ;Why don't we call
agdi_init()fromacpi_init()as we do for IORT/VIOT ?Quoted 2 lines
I don't think it is necessary to add a
device_initcall(), with related ordering dependencies.That's a good point. I change it.
Quoted 8 lines
Quoted 4 lines
Actually, I looked at this more carefully.
acpi_init()is called insubsys_initcall()whilesdei_init()is called insubsys_initcall_sync(). That is, if I call this function inacpi_init(), SDEI driver won't be ready and this driver fails to register the event.Maybe this will help:
Yep, that should work. I'll wait for his patch to get approved and make the needed changes to mine before submitting the v5.
Cheers, Ilkka
Quoted 8 lines · Ilkka Koskinen
Arm Generic Diagnostic Dump and Reset device enables a maintainer to request OS to perform a diagnostic dump and reset a system via SDEI event or an interrupt. This patchset adds support for the SDEI path.
I do have a patch to enable the interrupt path as well but I'm holding it back since AGDI table is missing interrupt configuration fields (trigger type etc.).
Quoted 7 lines
The recently published specification is available at
https://developer.arm.com/documentation/den0093/latestThe patchset was tested on Ampere Altra/Mt. Jade.
The patchset applies on top of
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pmbleeding-edge (642439a44411)
LGTM, thanks!
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!