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>
---
[V3]
- Replace to_acpi_device with ACPI_COMPANION which simplify the logic.
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 d24dd65b33d4..9d6e0d02b834 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 DEFINE_MUTEX(hyperv_mmio_lock);
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 int 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 const struct dev_pm_ops vmbus_bus_pm = {
.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);
}
--
2.25.1Hi Saurabh,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on next-20230206]
[also build test ERROR on v6.2-rc7]
[cannot apply to robh/for-next tip/timers/core brgl/gpio/for-next wsa/i2c/for-next linus/master v6.2-rc7 v6.2-rc6 v6.2-rc5]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Saurabh-Sengar/drivers-clocksource-hyper-v-non-ACPI-support-in-hyperv-clock/20230207-015625
patch link: https://lore.kernel.org/r/1675706060-22361-4-git-send-email-ssengar%40linux.microsoft.com
patch subject: [PATCH v3 3/6] Drivers: hv: vmbus: Convert acpi_device to more generic platform_device
config: i386-randconfig-a006-20230206 (https://download.01.org/0day-ci/archive/20230207/202302071303.dB30Hu98-lkp@intel.com/config)
compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/e6c8ebd27cac165137702f5ff85b14d6d0b8e820
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Saurabh-Sengar/drivers-clocksource-hyper-v-non-ACPI-support-in-hyperv-clock/20230207-015625
git checkout e6c8ebd27cac165137702f5ff85b14d6d0b8e820
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/hv/vmbus_drv.c:2283:1: error: non-void function does not return a value [-Werror,-Wreturn-type]
}
^
1 error generated.
vim +2283 drivers/hv/vmbus_drv.c
b0069f43fc6bc9 drivers/staging/hv/vmbus_drv.c K. Y. Srinivasan 2011-04-29 2265
e6c8ebd27cac16 drivers/hv/vmbus_drv.c Saurabh Sengar 2023-02-06 2266 static int vmbus_mmio_remove(void)
7f163a6fd957a8 drivers/hv/vmbus_drv.c Jake Oshins 2015-08-05 2267 {
7f163a6fd957a8 drivers/hv/vmbus_drv.c Jake Oshins 2015-08-05 2268 struct resource *cur_res;
7f163a6fd957a8 drivers/hv/vmbus_drv.c Jake Oshins 2015-08-05 2269 struct resource *next_res;
7f163a6fd957a8 drivers/hv/vmbus_drv.c Jake Oshins 2015-08-05 2270
7f163a6fd957a8 drivers/hv/vmbus_drv.c Jake Oshins 2015-08-05 2271 if (hyperv_mmio) {
6d146aefbaa5c5 drivers/hv/vmbus_drv.c Jake Oshins 2016-04-05 2272 if (fb_mmio) {
6d146aefbaa5c5 drivers/hv/vmbus_drv.c Jake Oshins 2016-04-05 2273 __release_region(hyperv_mmio, fb_mmio->start,
6d146aefbaa5c5 drivers/hv/vmbus_drv.c Jake Oshins 2016-04-05 2274 resource_size(fb_mmio));
6d146aefbaa5c5 drivers/hv/vmbus_drv.c Jake Oshins 2016-04-05 2275 fb_mmio = NULL;
6d146aefbaa5c5 drivers/hv/vmbus_drv.c Jake Oshins 2016-04-05 2276 }
6d146aefbaa5c5 drivers/hv/vmbus_drv.c Jake Oshins 2016-04-05 2277
7f163a6fd957a8 drivers/hv/vmbus_drv.c Jake Oshins 2015-08-05 2278 for (cur_res = hyperv_mmio; cur_res; cur_res = next_res) {
7f163a6fd957a8 drivers/hv/vmbus_drv.c Jake Oshins 2015-08-05 2279 next_res = cur_res->sibling;
7f163a6fd957a8 drivers/hv/vmbus_drv.c Jake Oshins 2015-08-05 2280 kfree(cur_res);
7f163a6fd957a8 drivers/hv/vmbus_drv.c Jake Oshins 2015-08-05 2281 }
7f163a6fd957a8 drivers/hv/vmbus_drv.c Jake Oshins 2015-08-05 2282 }
7f163a6fd957a8 drivers/hv/vmbus_drv.c Jake Oshins 2015-08-05 @2283 }
7f163a6fd957a8 drivers/hv/vmbus_drv.c Jake Oshins 2015-08-05 2284
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests
© 2016 - 2025 Red Hat, Inc.