From nobody Fri Sep 12 21:48:59 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F583C636D4 for ; Tue, 7 Feb 2023 07:50:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230498AbjBGHuJ (ORCPT ); Tue, 7 Feb 2023 02:50:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229585AbjBGHuE (ORCPT ); Tue, 7 Feb 2023 02:50:04 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 565F61816A; Mon, 6 Feb 2023 23:50:03 -0800 (PST) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id D250820C7E2C; Mon, 6 Feb 2023 23:50:02 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com D250820C7E2C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1675756202; bh=Z3Fz4ic+ruuxQNGx6fEsHOlcMxP7j3bu18u8mylit5o=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ni4Q0W2iTPiF3wS11jRxJyBitdCXRHvZCWHncfNA85jR20rMtGmgzINMywR3hD7LA 3sEfXrrS3qFMPUjYFXmyATl0VJy/Ssv7eEJgoDb5y/ju4FZY2VHzHDZu9KzcCXuKX4 UC7QiJnWd2CauD+3rGBy8pzK+UikkjAdtWn+2cgM= From: Saurabh Sengar 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 1/6] drivers/clocksource/hyper-v: non ACPI support in hyperv clock Date: Mon, 6 Feb 2023 23:49:54 -0800 Message-Id: <1675756199-5917-2-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675756199-5917-1-git-send-email-ssengar@linux.microsoft.com> References: <1675756199-5917-1-git-send-email-ssengar@linux.microsoft.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add a placeholder function for the hv_setup_stimer0_irq API to accommodate systems without ACPI support. Since this function is not utilized on x86/x64 systems and non-ACPI support is only intended for x86/x64 systems, a placeholder function is sufficient for now and can be improved upon if necessary in the future. This change will make it easier to add device tree support for VMBus in subsequent commits. Signed-off-by: Saurabh Sengar Reviewed-by: Michael Kelley --- drivers/clocksource/hyperv_timer.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyper= v_timer.c index c0cef92..f32948c 100644 --- a/drivers/clocksource/hyperv_timer.c +++ b/drivers/clocksource/hyperv_timer.c @@ -49,7 +49,7 @@ =20 static int stimer0_irq =3D -1; static int stimer0_message_sint; -static DEFINE_PER_CPU(long, stimer0_evt); +static __maybe_unused DEFINE_PER_CPU(long, stimer0_evt); =20 /* * Common code for stimer0 interrupts coming via Direct Mode or @@ -68,7 +68,7 @@ void hv_stimer0_isr(void) * stimer0 interrupt handler for architectures that support * per-cpu interrupts, which also implies Direct Mode. */ -static irqreturn_t hv_stimer0_percpu_isr(int irq, void *dev_id) +static irqreturn_t __maybe_unused hv_stimer0_percpu_isr(int irq, void *dev= _id) { hv_stimer0_isr(); return IRQ_HANDLED; @@ -196,6 +196,7 @@ void __weak hv_remove_stimer0_handler(void) { }; =20 +#ifdef CONFIG_ACPI /* Called only on architectures with per-cpu IRQs (i.e., not x86/x64) */ static int hv_setup_stimer0_irq(void) { @@ -230,6 +231,16 @@ static void hv_remove_stimer0_irq(void) stimer0_irq =3D -1; } } +#else +static int hv_setup_stimer0_irq(void) +{ + return 0; +} + +static void hv_remove_stimer0_irq(void) +{ +} +#endif =20 /* hv_stimer_alloc - Global initialization of the clockevent and stimer0 */ int hv_stimer_alloc(bool have_percpu_irqs) --=20 1.8.3.1 From nobody Fri Sep 12 21:48:59 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93DABC64EC5 for ; Tue, 7 Feb 2023 07:50:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230509AbjBGHuN (ORCPT ); Tue, 7 Feb 2023 02:50:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230080AbjBGHuE (ORCPT ); Tue, 7 Feb 2023 02:50:04 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7443E18B20; Mon, 6 Feb 2023 23:50:03 -0800 (PST) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id EA79720C7E2D; Mon, 6 Feb 2023 23:50:02 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com EA79720C7E2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1675756203; bh=m27CpggRo4AF+8YjkrkT62CF9pWm8xzxwR5YS2mWWsk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ITVHd11BBEY1XV/RW1GFECrDc3DvZ6cNR4GgynqIV6y3JmaqQ/J6byoGKvvLhG5c/ FkFbIcbmCOMjjCCeyJxaL/uV5+oEU2Jc031kH0OKPziTDGE66x4KzotxmmGYobc1VX cyk2MFzupAUSSPJz2AZjSIcvViRyX0OdSmkXgFps= From: Saurabh Sengar 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 2/6] Drivers: hv: allow non ACPI compilation for hv_is_hibernation_supported Date: Mon, 6 Feb 2023 23:49:55 -0800 Message-Id: <1675756199-5917-3-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675756199-5917-1-git-send-email-ssengar@linux.microsoft.com> References: <1675756199-5917-1-git-send-email-ssengar@linux.microsoft.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" acpi_sleep_state_supported API is only define for CONFIG_ACPI flag and thus it can't be used for non-ACPI builds. Initially there won't be hibernation support for non ACPI builds. This change will help adding device tree support in subsequent commits. Signed-off-by: Saurabh Sengar Reviewed-by: Michael Kelley --- drivers/hv/hv_common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/hv/hv_common.c b/drivers/hv/hv_common.c index 52a6f89..370ec20 100644 --- a/drivers/hv/hv_common.c +++ b/drivers/hv/hv_common.c @@ -234,7 +234,11 @@ void hv_setup_dma_ops(struct device *dev, bool coheren= t) =20 bool hv_is_hibernation_supported(void) { +#ifdef CONFIG_ACPI return !hv_root_partition && acpi_sleep_state_supported(ACPI_STATE_S4); +#else + return false; +#endif } EXPORT_SYMBOL_GPL(hv_is_hibernation_supported); =20 --=20 1.8.3.1 From nobody Fri Sep 12 21:48:59 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5145BC636D4 for ; Tue, 7 Feb 2023 07:50:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231128AbjBGHuS (ORCPT ); Tue, 7 Feb 2023 02:50:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230425AbjBGHuF (ORCPT ); Tue, 7 Feb 2023 02:50:05 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 81C5818B2A; Mon, 6 Feb 2023 23:50:03 -0800 (PST) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 0E87E20C7E2E; Mon, 6 Feb 2023 23:50:03 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 0E87E20C7E2E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1675756203; bh=L1jFvNrJkRlaJtMngQprF0W5dGHrerp9QNcY95pybS8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=fOZN937KCSVoII11uiltwmRypf7wTRt/X0EiCyAXe21oA/tbrLQA3mR9GinXnPc+Q /3QPPRB9UdLStNSurK60aVC5wC3nIT6cxGA9PpAlotLnBHWYRyyOqFT33cNmBHjoa0 b22MEYgLvGblMALcBp+UTM4v2x7k2bILZRXIyiMc= From: Saurabh Sengar 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 Message-Id: <1675756199-5917-4-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675756199-5917-1-git-send-email-ssengar@linux.microsoft.com> References: <1675756199-5917-1-git-send-email-ssengar@linux.microsoft.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Michael Kelley --- [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 #include #include +#include #include #include #include @@ -44,7 +45,7 @@ struct vmbus_dynid { struct hv_vmbus_device_id id; }; =20 -static struct acpi_device *hv_acpi_dev; +static struct device *hv_dev; =20 static int hyperv_cpuhp_online; =20 @@ -143,7 +144,7 @@ static int hv_die_panic_notify_crash(struct notifier_bl= ock *self, =20 static int vmbus_exists(void) { - if (hv_acpi_dev =3D=3D NULL) + if (hv_dev =3D=3D NULL) return -ENODEV; =20 return 0; @@ -932,7 +933,7 @@ static int vmbus_dma_configure(struct device *child_dev= ice) * 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) =3D=3D DEV_DMA_COHERENT); + device_get_dma_attr(hv_dev) =3D=3D DEV_DMA_COHERENT); return 0; } =20 @@ -2090,7 +2091,7 @@ int vmbus_device_register(struct hv_device *child_dev= ice_obj) &child_device_obj->channel->offermsg.offer.if_instance); =20 child_device_obj->device.bus =3D &hv_bus; - child_device_obj->device.parent =3D &hv_acpi_dev->dev; + child_device_obj->device.parent =3D hv_dev; child_device_obj->device.release =3D vmbus_device_release; =20 child_device_obj->device.dma_parms =3D &child_device_obj->dma_parms; @@ -2262,7 +2263,7 @@ static acpi_status vmbus_walk_resources(struct acpi_r= esource *res, void *ctx) return AE_OK; } =20 -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, resourc= e_size_t size) } EXPORT_SYMBOL_GPL(vmbus_free_mmio); =20 -static int vmbus_acpi_add(struct acpi_device *device) +static int vmbus_acpi_add(struct platform_device *pdev) { acpi_status result; int ret_val =3D -ENODEV; struct acpi_device *ancestor; + struct acpi_device *device =3D ACPI_COMPANION(&pdev->dev); =20 - hv_acpi_dev =3D device; + hv_dev =3D &device->dev; =20 /* * Older versions of Hyper-V for ARM64 fail to include the _CCA @@ -2489,10 +2491,21 @@ static int vmbus_acpi_add(struct acpi_device *devic= e) =20 acpi_walk_err: if (ret_val) - vmbus_acpi_remove(device); + vmbus_mmio_remove(); return ret_val; } =20 +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 =3D vmbus_bus_resume }; =20 -static struct acpi_driver vmbus_acpi_driver =3D { - .name =3D "vmbus", - .ids =3D vmbus_acpi_device_ids, - .ops =3D { - .add =3D vmbus_acpi_add, - .remove =3D vmbus_acpi_remove, - }, - .drv.pm =3D &vmbus_bus_pm, - .drv.probe_type =3D PROBE_FORCE_SYNCHRONOUS, +static struct platform_driver vmbus_platform_driver =3D { + .probe =3D vmbus_platform_driver_probe, + .remove =3D vmbus_platform_driver_remove, + .driver =3D { + .name =3D "vmbus", + .acpi_match_table =3D ACPI_PTR(vmbus_acpi_device_ids), + .pm =3D &vmbus_bus_pm, + .probe_type =3D PROBE_FORCE_SYNCHRONOUS, + } }; =20 static void hv_kexec_handler(void) @@ -2750,12 +2763,11 @@ static int __init hv_acpi_init(void) /* * Get ACPI resources first. */ - ret =3D acpi_bus_register_driver(&vmbus_acpi_driver); - + ret =3D platform_driver_register(&vmbus_platform_driver); if (ret) return ret; =20 - if (!hv_acpi_dev) { + if (!hv_dev) { ret =3D -ENODEV; goto cleanup; } @@ -2785,8 +2797,8 @@ static int __init hv_acpi_init(void) return 0; =20 cleanup: - acpi_bus_unregister_driver(&vmbus_acpi_driver); - hv_acpi_dev =3D NULL; + platform_driver_unregister(&vmbus_platform_driver); + hv_dev =3D NULL; return ret; } =20 @@ -2839,7 +2851,7 @@ static void __exit vmbus_exit(void) =20 cpuhp_remove_state(hyperv_cpuhp_online); hv_synic_free(); - acpi_bus_unregister_driver(&vmbus_acpi_driver); + platform_driver_unregister(&vmbus_platform_driver); } =20 =20 --=20 1.8.3.1 From nobody Fri Sep 12 21:48:59 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 483ECC636CC for ; Tue, 7 Feb 2023 07:50:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230520AbjBGHuV (ORCPT ); Tue, 7 Feb 2023 02:50:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230446AbjBGHuF (ORCPT ); Tue, 7 Feb 2023 02:50:05 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9D8CF1E5D2; Mon, 6 Feb 2023 23:50:03 -0800 (PST) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 2734720C7E2F; Mon, 6 Feb 2023 23:50:03 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 2734720C7E2F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1675756203; bh=mKpNmSIgrjwnpdItA6SeJ/oovZZXYlrfih5kK51feog=; h=From:To:Subject:Date:In-Reply-To:References:From; b=R0SNKSjcaz3wSPXL2zVGuCdBX1jPSIPMYo2+sMKaCaKtvv7Xb0HwbpJcvrdOokItX tBSS8HoQT13yq4tDZTdC8A/AZnEb9kFCPJFx33qyr2IEREn89LkIxBbFBHslZKvf3f Z4U1/eDnHX9whprI4g6RpF4S95C0qnw9T1WW9s2s= From: Saurabh Sengar 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 4/6] dt-bindings: hypervisor: Rename virtio to hypervisor Date: Mon, 6 Feb 2023 23:49:57 -0800 Message-Id: <1675756199-5917-5-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675756199-5917-1-git-send-email-ssengar@linux.microsoft.com> References: <1675756199-5917-1-git-send-email-ssengar@linux.microsoft.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Rename virtio folder to more generic hypervisor, so that this can accommodate more devices of similar type. Signed-off-by: Saurabh Sengar --- Documentation/devicetree/bindings/gpio/gpio-virtio.yaml | 4 = ++-- Documentation/devicetree/bindings/{virtio =3D> hypervisor}/mmio.yaml | = 2 +- .../devicetree/bindings/{virtio =3D> hypervisor}/pci-iommu.yaml | = 2 +- .../devicetree/bindings/{virtio =3D> hypervisor}/virtio-device.yaml | = 2 +- Documentation/devicetree/bindings/i2c/i2c-virtio.yaml | 4 = ++-- MAINTAINERS | 2 = +- 6 files changed, 8 insertions(+), 8 deletions(-) rename Documentation/devicetree/bindings/{virtio =3D> hypervisor}/mmio.yam= l (95%) rename Documentation/devicetree/bindings/{virtio =3D> hypervisor}/pci-iomm= u.yaml (98%) rename Documentation/devicetree/bindings/{virtio =3D> hypervisor}/virtio-d= evice.yaml (93%) diff --git a/Documentation/devicetree/bindings/gpio/gpio-virtio.yaml b/Docu= mentation/devicetree/bindings/gpio/gpio-virtio.yaml index 601d857..e08ed2a 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-virtio.yaml +++ b/Documentation/devicetree/bindings/gpio/gpio-virtio.yaml @@ -10,10 +10,10 @@ maintainers: - Viresh Kumar =20 allOf: - - $ref: /schemas/virtio/virtio-device.yaml# + - $ref: /schemas/hypervisor/virtio-device.yaml# =20 description: - Virtio GPIO controller, see /schemas/virtio/virtio-device.yaml for more + Virtio GPIO controller, see /schemas/hypervisor/virtio-device.yaml for m= ore details. =20 properties: diff --git a/Documentation/devicetree/bindings/virtio/mmio.yaml b/Documenta= tion/devicetree/bindings/hypervisor/mmio.yaml similarity index 95% rename from Documentation/devicetree/bindings/virtio/mmio.yaml rename to Documentation/devicetree/bindings/hypervisor/mmio.yaml index 0aa8433..8492c9b 100644 --- a/Documentation/devicetree/bindings/virtio/mmio.yaml +++ b/Documentation/devicetree/bindings/hypervisor/mmio.yaml @@ -1,7 +1,7 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/virtio/mmio.yaml# +$id: http://devicetree.org/schemas/hypervisor/mmio.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# =20 title: virtio memory mapped devices diff --git a/Documentation/devicetree/bindings/virtio/pci-iommu.yaml b/Docu= mentation/devicetree/bindings/hypervisor/pci-iommu.yaml similarity index 98% rename from Documentation/devicetree/bindings/virtio/pci-iommu.yaml rename to Documentation/devicetree/bindings/hypervisor/pci-iommu.yaml index 972a785..52de535 100644 --- a/Documentation/devicetree/bindings/virtio/pci-iommu.yaml +++ b/Documentation/devicetree/bindings/hypervisor/pci-iommu.yaml @@ -1,7 +1,7 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/virtio/pci-iommu.yaml# +$id: http://devicetree.org/schemas/hypervisor/pci-iommu.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# =20 title: virtio-iommu device using the virtio-pci transport diff --git a/Documentation/devicetree/bindings/virtio/virtio-device.yaml b/= Documentation/devicetree/bindings/hypervisor/virtio-device.yaml similarity index 93% rename from Documentation/devicetree/bindings/virtio/virtio-device.yaml rename to Documentation/devicetree/bindings/hypervisor/virtio-device.yaml index 8c6919b..7b8d93b 100644 --- a/Documentation/devicetree/bindings/virtio/virtio-device.yaml +++ b/Documentation/devicetree/bindings/hypervisor/virtio-device.yaml @@ -1,7 +1,7 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/virtio/virtio-device.yaml# +$id: http://devicetree.org/schemas/hypervisor/virtio-device.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# =20 title: Virtio device diff --git a/Documentation/devicetree/bindings/i2c/i2c-virtio.yaml b/Docume= ntation/devicetree/bindings/i2c/i2c-virtio.yaml index 7d87ed8..99a0ce2 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-virtio.yaml +++ b/Documentation/devicetree/bindings/i2c/i2c-virtio.yaml @@ -11,10 +11,10 @@ maintainers: =20 allOf: - $ref: /schemas/i2c/i2c-controller.yaml# - - $ref: /schemas/virtio/virtio-device.yaml# + - $ref: /schemas/hypervisor/virtio-device.yaml# =20 description: - Virtio I2C device, see /schemas/virtio/virtio-device.yaml for more detai= ls. + Virtio I2C device, see /schemas/hypervisor/virtio-device.yaml for more d= etails. =20 properties: $nodename: diff --git a/MAINTAINERS b/MAINTAINERS index f76ca28..27a5650 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21977,7 +21977,7 @@ L: virtualization@lists.linux-foundation.org S: Maintained F: Documentation/ABI/testing/sysfs-bus-vdpa F: Documentation/ABI/testing/sysfs-class-vduse -F: Documentation/devicetree/bindings/virtio/ +F: Documentation/devicetree/bindings/hypervisor/ F: Documentation/driver-api/virtio/ F: drivers/block/virtio_blk.c F: drivers/crypto/virtio/ --=20 1.8.3.1 From nobody Fri Sep 12 21:48:59 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9BFFBC636CC for ; Tue, 7 Feb 2023 07:50:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230516AbjBGHuP (ORCPT ); Tue, 7 Feb 2023 02:50:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230429AbjBGHuF (ORCPT ); Tue, 7 Feb 2023 02:50:05 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 78CE9227BC; Mon, 6 Feb 2023 23:50:04 -0800 (PST) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 3FBDF20C7E30; Mon, 6 Feb 2023 23:50:03 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 3FBDF20C7E30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1675756203; bh=LRgFTNEcHuGtL1aCGDTqe/YCQf0md08qX7Nvqfh3cLA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=U60bue7ngIy2B6t3eElkHR7hOvzNnrqQ8uFUjIRv6hYGfU2N8vuD1hFIoiEtvDaJV IQs7Xo7nhbO1BM3PtSZr1WHeoTG0YuMnuO0LDxCHeoZrRC5ZKmIPELKhK1f/G8idwl Y1kFp5BWlQA8q3rsG6lRLNXsvVCDVGDXrN6vaio8= From: Saurabh Sengar 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 5/6] dt-bindings: hypervisor: VMBus Date: Mon, 6 Feb 2023 23:49:58 -0800 Message-Id: <1675756199-5917-6-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675756199-5917-1-git-send-email-ssengar@linux.microsoft.com> References: <1675756199-5917-1-git-send-email-ssengar@linux.microsoft.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add dt-bindings for Hyper-V VMBus. Signed-off-by: Saurabh Sengar --- .../bindings/hypervisor/microsoft,vmbus.yaml | 48 ++++++++++++++++++= ++++ MAINTAINERS | 1 + 2 files changed, 49 insertions(+) create mode 100644 Documentation/devicetree/bindings/hypervisor/microsoft,= vmbus.yaml diff --git a/Documentation/devicetree/bindings/hypervisor/microsoft,vmbus.y= aml b/Documentation/devicetree/bindings/hypervisor/microsoft,vmbus.yaml new file mode 100644 index 0000000..a9c43a6 --- /dev/null +++ b/Documentation/devicetree/bindings/hypervisor/microsoft,vmbus.yaml @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/hypervisor/microsoft,vmbus.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Microsoft Hyper-V VMBus + +maintainers: + - Saurabh Sengar + +description: + VMBus is a software bus that implement the protocols for communication + between the root or host OS and guest OSs (virtual machines). + +properties: + compatible: + const: microsoft,vmbus + + ranges: true + + '#address-cells': + const: 2 + + '#size-cells': + const: 1 + +required: + - compatible + - ranges + - '#address-cells' + - '#size-cells' + +additionalProperties: false + +examples: + - | + soc { + #address-cells =3D <2>; + #size-cells =3D <2>; + + vmbus@ff0000000 { + #address-cells =3D <2>; + #size-cells =3D <1>; + compatible =3D "microsoft,vmbus"; + ranges =3D <0x0f 0xf0000000 0x0f 0xf0000000 0x10000000>; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 27a5650..669f1c1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9490,6 +9490,7 @@ S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git F: Documentation/ABI/stable/sysfs-bus-vmbus F: Documentation/ABI/testing/debugfs-hyperv +F: Documentation/devicetree/bindings/hypervisor/microsoft,vmbus.yaml F: Documentation/virt/hyperv F: Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst F: arch/arm64/hyperv --=20 1.8.3.1 From nobody Fri Sep 12 21:48:59 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87D75C636CD for ; Tue, 7 Feb 2023 07:50:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231130AbjBGHu0 (ORCPT ); Tue, 7 Feb 2023 02:50:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230447AbjBGHuF (ORCPT ); Tue, 7 Feb 2023 02:50:05 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 783D020D34; Mon, 6 Feb 2023 23:50:04 -0800 (PST) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 5864E20C7E31; Mon, 6 Feb 2023 23:50:03 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5864E20C7E31 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1675756203; bh=qvXsJpgHQiFB3Phr4UYarQ/CGWW+zSQX/ORJm9VS1wA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=P7Xjp7FG3ZLu+Mh05imc4yqgtipn8j70PU99vGNOPPPWX2dkplJ2cvXNHG3vYeFJh VBUpwiSfz+pyyg8M8pJJy6aApkOh5wjtABUCcNhqxUiQQP/hZTubKAolJoscXsa2VN 5bwAatCBGTyu9ECfunxtwY1wDDBrTkyWxqCg56i8= From: Saurabh Sengar 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 6/6] Driver: VMBus: Add device tree support Date: Mon, 6 Feb 2023 23:49:59 -0800 Message-Id: <1675756199-5917-7-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675756199-5917-1-git-send-email-ssengar@linux.microsoft.com> References: <1675756199-5917-1-git-send-email-ssengar@linux.microsoft.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Update the driver to support device tree boot as well along with ACPI. At present the device tree parsing only provides the mmio region info and is not the exact copy of ACPI parsing. This is sufficient to cater all the current device tree usecases for VMBus. Currently device tree is supported only for x86 systems. Signed-off-by: Saurabh Sengar --- [V4] - used __maybe_unused for 'vmbus_of_match' and safeguard vmbus_acpi_device_= ids under #ifdef drivers/hv/Kconfig | 4 ++-- drivers/hv/vmbus_drv.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++= ++-- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig index 0747a8f..7e44d42 100644 --- a/drivers/hv/Kconfig +++ b/drivers/hv/Kconfig @@ -4,8 +4,8 @@ menu "Microsoft Hyper-V guest support" =20 config HYPERV tristate "Microsoft Hyper-V client drivers" - depends on ACPI && ((X86 && X86_LOCAL_APIC && HYPERVISOR_GUEST) \ - || (ARM64 && !CPU_BIG_ENDIAN)) + depends on (X86 && X86_LOCAL_APIC && HYPERVISOR_GUEST) \ + || (ACPI && ARM64 && !CPU_BIG_ENDIAN) select PARAVIRT select X86_HV_CALLBACK_VECTOR if X86 select VMAP_PFN diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 7349715..1774cae 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -2152,7 +2153,7 @@ void vmbus_device_unregister(struct hv_device *device= _obj) device_unregister(&device_obj->device); } =20 - +#ifdef CONFIG_ACPI /* * VMBUS is an acpi enumerated device. Get the information we * need from DSDT. @@ -2262,6 +2263,7 @@ static acpi_status vmbus_walk_resources(struct acpi_r= esource *res, void *ctx) =20 return AE_OK; } +#endif =20 static void vmbus_mmio_remove(void) { @@ -2282,7 +2284,7 @@ static void vmbus_mmio_remove(void) } } =20 -static void vmbus_reserve_fb(void) +static void __maybe_unused vmbus_reserve_fb(void) { resource_size_t start =3D 0, size; struct pci_dev *pdev; @@ -2442,6 +2444,7 @@ void vmbus_free_mmio(resource_size_t start, resource_= size_t size) } EXPORT_SYMBOL_GPL(vmbus_free_mmio); =20 +#ifdef CONFIG_ACPI static int vmbus_acpi_add(struct platform_device *pdev) { acpi_status result; @@ -2494,10 +2497,52 @@ static int vmbus_acpi_add(struct platform_device *p= dev) vmbus_mmio_remove(); return ret_val; } +#else + +static int vmbus_device_add(struct platform_device *pdev) +{ + struct resource **cur_res =3D &hyperv_mmio; + struct of_range range; + struct of_range_parser parser; + struct device_node *np; + int ret =3D 0; + + hv_dev =3D &pdev->dev; + np =3D pdev->dev.of_node; + + ret =3D of_range_parser_init(&parser, np); + if (ret) { + dev_err(hv_dev, "Failed to parse resources.\n"); + return ret; + } + + for_each_of_range(&parser, &range) { + struct resource *res; + + res =3D kzalloc(sizeof(*res), GFP_ATOMIC); + if (!res) + return -ENOMEM; + + res->name =3D "hyperv mmio"; + res->flags =3D IORESOURCE_MEM | IORESOURCE_MEM_64; + res->start =3D range.pci_addr; + res->end =3D range.pci_addr + range.size; + + *cur_res =3D res; + cur_res =3D &res->sibling; + } + + return ret; +} +#endif =20 static int vmbus_platform_driver_probe(struct platform_device *pdev) { +#ifdef CONFIG_ACPI return vmbus_acpi_add(pdev); +#else + return vmbus_device_add(pdev); +#endif } =20 static int vmbus_platform_driver_remove(struct platform_device *pdev) @@ -2643,12 +2688,24 @@ static int vmbus_bus_resume(struct device *dev) #define vmbus_bus_resume NULL #endif /* CONFIG_PM_SLEEP */ =20 +static const struct __maybe_unused of_device_id vmbus_of_match[] =3D { + { + .compatible =3D "microsoft,vmbus", + }, + { + /* sentinel */ + }, +}; +MODULE_DEVICE_TABLE(of, vmbus_of_match); + +#ifdef CONFIG_ACPI static const struct acpi_device_id vmbus_acpi_device_ids[] =3D { {"VMBUS", 0}, {"VMBus", 0}, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, vmbus_acpi_device_ids); +#endif =20 /* * Note: we must use the "no_irq" ops, otherwise hibernation can not work = with @@ -2677,6 +2734,7 @@ static int vmbus_bus_resume(struct device *dev) .driver =3D { .name =3D "vmbus", .acpi_match_table =3D ACPI_PTR(vmbus_acpi_device_ids), + .of_match_table =3D of_match_ptr(vmbus_of_match), .pm =3D &vmbus_bus_pm, .probe_type =3D PROBE_FORCE_SYNCHRONOUS, } --=20 1.8.3.1