pvpanic device is a qemu-specific emulation device. Pvpanic
devices are now available for ARM64. This patch supports the APCI
way to get device information.
Signed-off-by: Peng Hao <peng.hao2@xxxxxxxxxx>
---
drivers/misc/pvpanic.c | 22 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/drivers/misc/pvpanic.c b/drivers/misc/pvpanic.c
index fd86dab..bdcff8b 100644
--- a/drivers/misc/pvpanic.c
+++ b/drivers/misc/pvpanic.c
@@ -35,13 +35,16 @@
static const struct acpi_device_id pvpanic_device_ids[] = {
{ "QEMU0001", 0 },
+ { "PVPANIC01", 0 },
{ "", 0 },
};
MODULE_DEVICE_TABLE(acpi, pvpanic_device_ids);
#define PVPANIC_PANICKED (1 << 0)
+
+static void __iomem *base;
static struct acpi_driver pvpanic_driver = {
.name = "pvpanic",
@@ -57,7 +60,10 @@
static void
pvpanic_send_event(unsigned int event)
{
- outb(event, port);
+ if (port)
+ outb(event, port);
+ else if (base)
+ writeb(event, base);
}
static int
@@ -77,6 +83,8 @@
static acpi_status
pvpanic_walk_resources(struct acpi_resource *res, void *context)
{
+ struct acpi_resource_fixed_memory32 *fixmem32;
+
switch (res->type) {
case ACPI_RESOURCE_TYPE_END_TAG:
return AE_OK;
@@ -84,7 +92,11 @@
case ACPI_RESOURCE_TYPE_IO:
port = res->data.io.minimum;
return AE_OK;
-
+
+ case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
+ fixmem32 = &res->data.fixed_memory32;
+ base = ioremap(fixmem32->address, fixmem32->address_length);
+ return AE_OK;
default:
return AE_ERROR;
}
@@ -104,7 +116,7 @@ static int pvpanic_add(struct acpi_device *device)
acpi_walk_resources(device->handle, METHOD_NAME__CRS,
pvpanic_walk_resources, NULL);
- if (!port)
+ if (!port && !base)
return -ENODEV;
atomic_notifier_chain_register(&panic_notifier_list,
@@ -118,6 +130,8 @@ static int pvpanic_remove(struct acpi_device *device)
atomic_notifier_chain_unregister(&panic_notifier_list,
&pvpanic_panic_nb);
+ if (base)
+ iounmap(base);
return 0;
}
--
1.8.3.1
