2018-12-17 11:20:33

by Peng Hao

Subject: [PATCH V3 1/3] misc/pvpanic: return 0 for empty body register function

Return 0 for empty body register function normally.

Signed-off-by: Peng Hao <[email protected]>
---
drivers/misc/pvpanic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/misc/pvpanic.c b/drivers/misc/pvpanic.c
index 3150dc2..f84ed30 100644
--- a/drivers/misc/pvpanic.c
+++ b/drivers/misc/pvpanic.c
@@ -125,7 +125,7 @@ static void pvpanic_unregister_acpi_driver(void)
#else
static int pvpanic_register_acpi_driver(void)
{
- return -ENODEV;
+ return 0;
}

static void pvpanic_unregister_acpi_driver(void) {}
--
1.8.3.1

2018-12-17 11:20:39

by Peng Hao

Subject: [PATCH V3 3/3] misc/pvpanic : add pci dependency in Kconfig

Add PCI dependency for pvpanic in Kconfig.

Signed-off-by: Peng Hao <[email protected]>
---
drivers/misc/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index f417b06..5ff8ca4 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -515,7 +515,7 @@ config MISC_RTSX

config PVPANIC
tristate "pvpanic device support"
- depends on HAS_IOMEM && (ACPI || OF)
+ depends on HAS_IOMEM && (ACPI || OF || PCI)
help
This driver provides support for the pvpanic device. pvpanic is
a paravirtualized device provided by QEMU; it lets a virtual machine
--
1.8.3.1

2018-12-17 12:15:03

by Peng Hao

Subject: [PATCH V3 2/3] misc/pvpanic : add pci interface for pvpanic

Support pvpanic as a pci device in guest kernel.

Signed-off-by: Peng Hao <[email protected]>
---
drivers/misc/pvpanic.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 80 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/pvpanic.c b/drivers/misc/pvpanic.c
index f84ed30..b8d8dba 100644
--- a/drivers/misc/pvpanic.c
+++ b/drivers/misc/pvpanic.c
@@ -13,11 +13,14 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_address.h>
+#include <linux/pci.h>
#include <linux/platform_device.h>
#include <linux/types.h>

static void __iomem *base;

+#define PCI_VENDOR_ID_REDHAT 0x1b36
+#define PCI_DEVICE_ID_REDHAT_PVPANIC 0x0101
#define PVPANIC_PANICKED (1 << 0)

MODULE_AUTHOR("Hu Tao <[email protected]>");
@@ -172,12 +175,86 @@ static int pvpanic_mmio_remove(struct platform_device *pdev)
.remove = pvpanic_mmio_remove,
};

+#ifdef CONFIG_PCI
+static const struct pci_device_id pvpanic_pci_id_tbl[] = {
+ { PCI_DEVICE(PCI_VENDOR_ID_REDHAT, PCI_DEVICE_ID_REDHAT_PVPANIC),},
+ {}
+};
+
+static int pvpanic_pci_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
+{
+ int err;
+
+ err = pci_enable_device(pdev);
+ if (err)
+ return err;
+ if (pci_request_region(pdev, 0, "pvpanic-pci"))
+ goto disable;
+
+ base = pci_ioremap_bar(pdev, 0);
+ if (!base)
+ goto release;
+
+ atomic_notifier_chain_register(&panic_notifier_list,
+ &pvpanic_panic_nb);
+ return 0;
+
+release:
+ pci_release_region(pdev, 0);
+disable:
+ pci_disable_device(pdev);
+
+ return -ENODEV;
+}
+
+static void pvpanic_pci_remove(struct pci_dev *pdev)
+{
+ atomic_notifier_chain_unregister(&panic_notifier_list,
+ &pvpanic_panic_nb);
+ iounmap(base);
+ pci_release_region(pdev, 0);
+ pci_disable_device(pdev);
+}
+
+static struct pci_driver pvpanic_pci_driver = {
+ .name = "pvpanic-pci",
+ .id_table = pvpanic_pci_id_tbl,
+ .probe = pvpanic_pci_probe,
+ .remove = pvpanic_pci_remove,
+};
+
+static int pvpanic_register_pci_drvier(void)
+{
+ return pci_register_driver(&pvpanic_pci_driver);
+}
+
+static void pvpanic_unregister_pci_drvier(void)
+{
+ pci_unregister_driver(&pvpanic_pci_driver);
+}
+#else /* CONFIG_PCI */
+static int pvpanic_register_pci_drvier(void)
+{
+ return 0;
+}
+
+static void pvpanic_unregister_pci_drvier(void) {}
+#endif
+
static int __init pvpanic_mmio_init(void)
{
+ int r1, r2;
+
if (acpi_disabled)
- return platform_driver_register(&pvpanic_mmio_driver);
+ r1 = platform_driver_register(&pvpanic_mmio_driver);
+ else
+ r1 = pvpanic_register_acpi_driver();
+ r2 = pvpanic_register_pci_drvier();
+ if (r1 && r2) /* all drivers register failed */
+ return 1;
else
- return pvpanic_register_acpi_driver();
+ return 0;
}

static void __exit pvpanic_mmio_exit(void)
@@ -186,6 +263,7 @@ static void __exit pvpanic_mmio_exit(void)
platform_driver_unregister(&pvpanic_mmio_driver);
else
pvpanic_unregister_acpi_driver();
+ pvpanic_unregister_pci_drvier();
}

module_init(pvpanic_mmio_init);
--
1.8.3.1

2018-12-17 12:58:55

by Greg Kroah-Hartman

Subject: Re: [PATCH V3 1/3] misc/pvpanic: return 0 for empty body register function

On Mon, Dec 17, 2018 at 06:43:12PM +0800, Peng Hao wrote:
> Return 0 for empty body register function normally.
>
> Signed-off-by: Peng Hao <[email protected]>
> ---
> drivers/misc/pvpanic.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

What is changing in these different version?

You always have to list that below the --- line as the documentation
says to do so.

thanks,

greg k-h

2018-12-17 17:23:38

by Greg Kroah-Hartman

Subject: Re: [PATCH V3 2/3] misc/pvpanic : add pci interface for pvpanic

On Mon, Dec 17, 2018 at 06:43:13PM +0800, Peng Hao wrote:
> + pvpanic_unregister_pci_drvier();

"driver", not "drvier" please.

thanks,

greg k-h