From: Saurabh Sengar <ssengar@linux.microsoft.com>
To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org,
kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org,
decui@microsoft.com, daniel.lezcano@linaro.org,
tglx@linutronix.de, virtualization@lists.linux-foundation.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-hyperv@vger.kernel.org, mikelley@microsoft.com,
ssengar@microsoft.com, dphadke@linux.microsoft.com
Subject: [PATCH v4 3/6] Drivers: hv: vmbus: Convert acpi_device to more generic platform_device
Date: Mon, 6 Feb 2023 23:49:56 -0800 [thread overview]
Message-ID: <1675756199-5917-4-git-send-email-ssengar@linux.microsoft.com> (raw)
In-Reply-To: <1675756199-5917-1-git-send-email-ssengar@linux.microsoft.com>
Use more generic platform device instead of acpi device. Also rename the
function vmbus_acpi_remove to more generic name vmbus_mmio_remove.
Signed-off-by: Saurabh Sengar <ssengar@linux.microsoft.com>
---
[V4]
- rebased which fixed return type of 'vmbus_mmio_remove' from int to void
drivers/hv/vmbus_drv.c | 58 ++++++++++++++++++++++++++++++--------------------
1 file changed, 35 insertions(+), 23 deletions(-)
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index d24dd65..7349715 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -12,6 +12,7 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
+#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <linux/sysctl.h>
#include <linux/slab.h>
@@ -44,7 +45,7 @@ struct vmbus_dynid {
struct hv_vmbus_device_id id;
};
-static struct acpi_device *hv_acpi_dev;
+static struct device *hv_dev;
static int hyperv_cpuhp_online;
@@ -143,7 +144,7 @@ static int hv_die_panic_notify_crash(struct notifier_block *self,
static int vmbus_exists(void)
{
- if (hv_acpi_dev == NULL)
+ if (hv_dev == NULL)
return -ENODEV;
return 0;
@@ -932,7 +933,7 @@ static int vmbus_dma_configure(struct device *child_device)
* On x86/x64 coherence is assumed and these calls have no effect.
*/
hv_setup_dma_ops(child_device,
- device_get_dma_attr(&hv_acpi_dev->dev) == DEV_DMA_COHERENT);
+ device_get_dma_attr(hv_dev) == DEV_DMA_COHERENT);
return 0;
}
@@ -2090,7 +2091,7 @@ int vmbus_device_register(struct hv_device *child_device_obj)
&child_device_obj->channel->offermsg.offer.if_instance);
child_device_obj->device.bus = &hv_bus;
- child_device_obj->device.parent = &hv_acpi_dev->dev;
+ child_device_obj->device.parent = hv_dev;
child_device_obj->device.release = vmbus_device_release;
child_device_obj->device.dma_parms = &child_device_obj->dma_parms;
@@ -2262,7 +2263,7 @@ static acpi_status vmbus_walk_resources(struct acpi_resource *res, void *ctx)
return AE_OK;
}
-static void vmbus_acpi_remove(struct acpi_device *device)
+static void vmbus_mmio_remove(void)
{
struct resource *cur_res;
struct resource *next_res;
@@ -2441,13 +2442,14 @@ void vmbus_free_mmio(resource_size_t start, resource_size_t size)
}
EXPORT_SYMBOL_GPL(vmbus_free_mmio);
-static int vmbus_acpi_add(struct acpi_device *device)
+static int vmbus_acpi_add(struct platform_device *pdev)
{
acpi_status result;
int ret_val = -ENODEV;
struct acpi_device *ancestor;
+ struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
- hv_acpi_dev = device;
+ hv_dev = &device->dev;
/*
* Older versions of Hyper-V for ARM64 fail to include the _CCA
@@ -2489,10 +2491,21 @@ static int vmbus_acpi_add(struct acpi_device *device)
acpi_walk_err:
if (ret_val)
- vmbus_acpi_remove(device);
+ vmbus_mmio_remove();
return ret_val;
}
+static int vmbus_platform_driver_probe(struct platform_device *pdev)
+{
+ return vmbus_acpi_add(pdev);
+}
+
+static int vmbus_platform_driver_remove(struct platform_device *pdev)
+{
+ vmbus_mmio_remove();
+ return 0;
+}
+
#ifdef CONFIG_PM_SLEEP
static int vmbus_bus_suspend(struct device *dev)
{
@@ -2658,15 +2671,15 @@ static int vmbus_bus_resume(struct device *dev)
.restore_noirq = vmbus_bus_resume
};
-static struct acpi_driver vmbus_acpi_driver = {
- .name = "vmbus",
- .ids = vmbus_acpi_device_ids,
- .ops = {
- .add = vmbus_acpi_add,
- .remove = vmbus_acpi_remove,
- },
- .drv.pm = &vmbus_bus_pm,
- .drv.probe_type = PROBE_FORCE_SYNCHRONOUS,
+static struct platform_driver vmbus_platform_driver = {
+ .probe = vmbus_platform_driver_probe,
+ .remove = vmbus_platform_driver_remove,
+ .driver = {
+ .name = "vmbus",
+ .acpi_match_table = ACPI_PTR(vmbus_acpi_device_ids),
+ .pm = &vmbus_bus_pm,
+ .probe_type = PROBE_FORCE_SYNCHRONOUS,
+ }
};
static void hv_kexec_handler(void)
@@ -2750,12 +2763,11 @@ static int __init hv_acpi_init(void)
/*
* Get ACPI resources first.
*/
- ret = acpi_bus_register_driver(&vmbus_acpi_driver);
-
+ ret = platform_driver_register(&vmbus_platform_driver);
if (ret)
return ret;
- if (!hv_acpi_dev) {
+ if (!hv_dev) {
ret = -ENODEV;
goto cleanup;
}
@@ -2785,8 +2797,8 @@ static int __init hv_acpi_init(void)
return 0;
cleanup:
- acpi_bus_unregister_driver(&vmbus_acpi_driver);
- hv_acpi_dev = NULL;
+ platform_driver_unregister(&vmbus_platform_driver);
+ hv_dev = NULL;
return ret;
}
@@ -2839,7 +2851,7 @@ static void __exit vmbus_exit(void)
cpuhp_remove_state(hyperv_cpuhp_online);
hv_synic_free();
- acpi_bus_unregister_driver(&vmbus_acpi_driver);
+ platform_driver_unregister(&vmbus_platform_driver);
}
--
1.8.3.1
next prev parent reply other threads:[~2023-02-07 7:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-07 7:49 [PATCH v4 0/6] Device tree support for Hyper-V VMBus driver Saurabh Sengar
2023-02-07 7:49 ` [PATCH v4 1/6] drivers/clocksource/hyper-v: non ACPI support in hyperv clock Saurabh Sengar
2023-02-08 1:22 ` Michael Kelley (LINUX)
2023-02-07 7:49 ` [PATCH v4 2/6] Drivers: hv: allow non ACPI compilation for hv_is_hibernation_supported Saurabh Sengar
2023-02-08 1:35 ` Michael Kelley (LINUX)
2023-02-07 7:49 ` Saurabh Sengar [this message]
2023-02-08 1:50 ` [PATCH v4 3/6] Drivers: hv: vmbus: Convert acpi_device to more generic platform_device Michael Kelley (LINUX)
2023-02-07 7:49 ` [PATCH v4 4/6] dt-bindings: hypervisor: Rename virtio to hypervisor Saurabh Sengar
2023-02-07 18:39 ` Rob Herring
2023-02-08 2:51 ` Saurabh Singh Sengar
2023-02-07 7:49 ` [PATCH v4 5/6] dt-bindings: hypervisor: VMBus Saurabh Sengar
2023-02-07 13:00 ` Rob Herring
2023-02-07 18:34 ` Rob Herring
2023-02-08 2:50 ` Saurabh Singh Sengar
2023-02-07 7:49 ` [PATCH v4 6/6] Driver: VMBus: Add device tree support Saurabh Sengar
2023-02-08 8:22 ` kernel test robot
2023-02-08 10:25 ` Krzysztof Kozlowski
2023-02-08 14:39 ` Nathan Chancellor
2023-02-08 15:36 ` Krzysztof Kozlowski
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=1675756199-5917-4-git-send-email-ssengar@linux.microsoft.com \
--to=ssengar@linux.microsoft.com \
--cc=daniel.lezcano@linaro.org \
--cc=decui@microsoft.com \
--cc=devicetree@vger.kernel.org \
--cc=dphadke@linux.microsoft.com \
--cc=haiyangz@microsoft.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikelley@microsoft.com \
--cc=robh+dt@kernel.org \
--cc=ssengar@microsoft.com \
--cc=tglx@linutronix.de \
--cc=virtualization@lists.linux-foundation.org \
--cc=wei.liu@kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).