LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Peng Hao <peng.hao2@zte.com.cn>
To: robh+dt@kernel.org, mark.rutland@arm.com, arnd@arndb.de,
	gregkh@linuxfoundation.org, andy@infradead.org,
	dvhart@infradead.org
Cc: linux-kernel@vger.kernel.org,
	platform-driver-x86@vger.kernel.org, hutao@cn.fujitsu.com,
	linux-doc@vger.kernel.org, Peng Hao <peng.hao2@zte.com.cn>
Subject: [PATCH V4 4/5]  misc/pvpanic: add support to get pvpanic device info by FDT
Date: Wed, 31 Oct 2018 21:37:20 +0800	[thread overview]
Message-ID: <1540993041-25611-4-git-send-email-peng.hao2@zte.com.cn> (raw)
In-Reply-To: <1540993041-25611-1-git-send-email-peng.hao2@zte.com.cn>

By default, when ACPI tables and FDT coexist for ARM64,
current kernel takes precedence over FDT to get device information.
Virt machine in qemu provides both FDT and ACPI table. This patch
increases the way to get information through FDT.

Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
---
 drivers/misc/pvpanic.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 64 insertions(+), 4 deletions(-)

diff --git a/drivers/misc/pvpanic.c b/drivers/misc/pvpanic.c
index d0e28b2..861a0eb 100644
--- a/drivers/misc/pvpanic.c
+++ b/drivers/misc/pvpanic.c
@@ -3,15 +3,18 @@
  *  Pvpanic Device Support
  *
  *  Copyright (C) 2013 Fujitsu.
+ *  Copyright (C) 2018 ZTE.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/acpi.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
 #include <linux/types.h>
-#include <linux/acpi.h>
 
 MODULE_AUTHOR("Hu Tao <hutao@cn.fujitsu.com>");
 MODULE_DESCRIPTION("pvpanic device driver");
@@ -22,7 +25,7 @@
 
 static const struct acpi_device_id pvpanic_device_ids[] = {
 	{ "QEMU0001", 0 },
-	{ "", 0 },
+	{ "", 0 }
 };
 MODULE_DEVICE_TABLE(acpi, pvpanic_device_ids);
 
@@ -60,6 +63,32 @@
 	.priority = 1, /* let this called before broken drm_fb_helper */
 };
 
+static int pvpanic_mmio_probe(struct platform_device *pdev)
+{
+	struct resource *mem;
+
+	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!mem)
+		return -EINVAL;
+
+	base = devm_ioremap_resource(&pdev->dev, mem);
+	if (base == NULL)
+		return -EFAULT;
+
+	atomic_notifier_chain_register(&panic_notifier_list,
+				       &pvpanic_panic_nb);
+
+	return 0;
+}
+
+static int pvpanic_mmio_remove(struct platform_device *pdev)
+{
+
+	atomic_notifier_chain_unregister(&panic_notifier_list,
+					 &pvpanic_panic_nb);
+
+	return 0;
+}
 
 static acpi_status
 pvpanic_walk_resources(struct acpi_resource *res, void *context)
@@ -120,4 +149,35 @@ static int pvpanic_remove(struct acpi_device *device)
 	return 0;
 }
 
-module_acpi_driver(pvpanic_driver);
+static const struct of_device_id pvpanic_mmio_match[] = {
+	{ .compatible = "qemu,pvpanic-mmio", },
+	{}
+};
+
+static struct platform_driver pvpanic_mmio_driver = {
+	.driver = {
+		.name = "pvpanic-mmio",
+		.of_match_table = pvpanic_mmio_match,
+	},
+	.probe = pvpanic_mmio_probe,
+	.remove = pvpanic_mmio_remove,
+};
+
+static int __init pvpanic_mmio_init(void)
+{
+	if (acpi_disabled)
+		return platform_driver_register(&pvpanic_mmio_driver);
+	else
+		return acpi_bus_register_driver(&pvpanic_driver);
+}
+
+static void __exit pvpanic_mmio_exit(void)
+{
+	if (acpi_disabled)
+		platform_driver_unregister(&pvpanic_mmio_driver);
+	else
+		acpi_bus_unregister_driver(&pvpanic_driver);
+}
+
+module_init(pvpanic_mmio_init);
+module_exit(pvpanic_mmio_exit);
-- 
1.8.3.1


  parent reply	other threads:[~2018-10-31  5:27 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-31 13:37 [PATCH V4 1/5] pvpanic: move pvpanic to misc as common driver Peng Hao
2018-10-31  7:05 ` Mark Rutland
2018-10-31 12:45 ` Andy Shevchenko
2018-10-31 13:37 ` [PATCH V4 2/5] misc/pvpanic : convert to SPDX license tags Peng Hao
2018-10-31 12:46   ` Andy Shevchenko
2018-10-31 13:37 ` [PATCH V4 3/5] misc/pvpanic: add MMIO support Peng Hao
2018-10-31 12:49   ` Andy Shevchenko
2018-10-31 13:37 ` Peng Hao [this message]
2018-10-31 12:50   ` [PATCH V4 4/5] misc/pvpanic: add support to get pvpanic device info by FDT Andy Shevchenko
2018-10-31 12:53   ` Andy Shevchenko
2018-10-31 13:37 ` [PATCH V4 5/5] dt-bindings/misc/pvpanic :add document for pvpanic-mmio Peng Hao
  -- strict thread matches above, loose matches on Subject: below --
2018-10-29 11:32 [PATCH V3 1/5] pvpanic: move pvpanic to misc as common driver Peng Hao
2018-10-29 11:32 ` [PATCH V4 4/5] misc/pvpanic: add support to get pvpanic device info by FDT Peng Hao
2018-10-29 11:37   ` Andy Shevchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1540993041-25611-4-git-send-email-peng.hao2@zte.com.cn \
    --to=peng.hao2@zte.com.cn \
    --cc=andy@infradead.org \
    --cc=arnd@arndb.de \
    --cc=dvhart@infradead.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=hutao@cn.fujitsu.com \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --subject='Re: [PATCH V4 4/5]  misc/pvpanic: add support to get pvpanic device info by FDT' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).