From patchwork Thu Feb 9 12:15:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saurabh Singh Sengar X-Patchwork-Id: 54917 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp300953wrn; Thu, 9 Feb 2023 04:19:45 -0800 (PST) X-Google-Smtp-Source: AK7set9uHNFT7COEmZiAMdkvsrxA4HDb0Hls5ALFdZfnL/1YljlIQNp+0egTUdREojTPbJRx78Nd X-Received: by 2002:a17:90b:4aca:b0:230:b643:1f90 with SMTP id mh10-20020a17090b4aca00b00230b6431f90mr12510233pjb.29.1675945185314; Thu, 09 Feb 2023 04:19:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675945185; cv=none; d=google.com; s=arc-20160816; b=lpyJuZPYcs7CbQrwYvU4IMju6LOWw2pdC5PXivBaW4h3X4HmayPbmqmrSL/VhBFF5S 6gQR57NfAl4iHw5SNdO2+JOoo7xZjrKTT068tQFS+t6Uc3Y/bYk+Hx6S1jpMTlRC0uvA VbklBLu1Mk/o7r8yyKxrroIotRy9sDQkqoNI0T85BvEyXN4D7Xe38afso3rfxH3jXmDs DYNQhHIVGt2B31cGFJs+wrg/2Ty0AXqMownjPyGGoTMXmuSKqxE+xPhLZK4+HHh0iXNv yv7QJ17B11pjDAYMlj5VEY2KN5vKlAc5J88zK2yMpXJkcdJrZ52Y/hrvaegFVUq0mryT Y0KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature:dkim-filter; bh=9hqMgwt+9rfgzKvMywqn/H23HiHnKG9S9L6A/+1pzh0=; b=t0e2+pqLXA+ocopKMX5Se+0ojvdnOeP2xmSPOgHnJRd8fGuanWcfd2sdcFfrnevcXZ +JQ30ZuFU+w5igE0Wrl9JStc5vA4Pbz7+7O2fdwQ78Q4NSBPttGvwuRkTdnPN3du8cYA XZpW/c9AK1aTvUnIoxUOVxexdTeQTmwzh3z4xqwWe/jaRioqTBZ+r7Fz6jUMsst7oPft yim71dF1tJTo0G+GZMUrJTXKrOMMwdYdRrPAyh8fMcIaPdYVfa3+pdn4chLmugwScRyN JxIzenpxC251En7REBLAywN2dRrHLR7RCv+ErP4EY+8e18aKpU5mLmUBFd951WIpAu7M 1KSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=rBqKiHDj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nv15-20020a17090b1b4f00b00226c700afe3si6076859pjb.37.2023.02.09.04.19.28; Thu, 09 Feb 2023 04:19:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=rBqKiHDj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229733AbjBIMQ4 (ORCPT + 99 others); Thu, 9 Feb 2023 07:16:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229668AbjBIMQt (ORCPT ); Thu, 9 Feb 2023 07:16:49 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B16EDE05B; Thu, 9 Feb 2023 04:16:30 -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 9B2BC20C8AEB; Thu, 9 Feb 2023 04:15:43 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9B2BC20C8AEB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1675944943; bh=9hqMgwt+9rfgzKvMywqn/H23HiHnKG9S9L6A/+1pzh0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=rBqKiHDjeqm1sqXJAWL58/QjVyUXWPX1F68PIyJd3/YVlz4rOXdJ4A9SkkxbDoQd7 ZqTIXyrhNzyYAC5NJ3YkXo+9kefqiRuGRKw+D62Q/x0sR16jeikqMQeBjLZzxDQUVp aJQ1BA4rgHxi9+wde3lkNg5NRP2gsxQ3T7pK/nrY= 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@linux.microsoft.com, dphadke@linux.microsoft.com Subject: [PATCH v5 1/5] drivers/clocksource/hyper-v: non ACPI support in hyperv clock Date: Thu, 9 Feb 2023 04:15:35 -0800 Message-Id: <1675944939-22631-2-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675944939-22631-1-git-send-email-ssengar@linux.microsoft.com> References: <1675944939-22631-1-git-send-email-ssengar@linux.microsoft.com> X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757355898686366920?= X-GMAIL-MSGID: =?utf-8?q?1757355898686366920?= 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. 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/hyperv_timer.c index c0cef92b12b8..f32948c8a96f 100644 --- a/drivers/clocksource/hyperv_timer.c +++ b/drivers/clocksource/hyperv_timer.c @@ -49,7 +49,7 @@ static bool direct_mode_enabled; static int stimer0_irq = -1; static int stimer0_message_sint; -static DEFINE_PER_CPU(long, stimer0_evt); +static __maybe_unused DEFINE_PER_CPU(long, stimer0_evt); /* * Common code for stimer0 interrupts coming via Direct Mode or @@ -68,7 +68,7 @@ EXPORT_SYMBOL_GPL(hv_stimer0_isr); * 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) { }; +#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 = -1; } } +#else +static int hv_setup_stimer0_irq(void) +{ + return 0; +} + +static void hv_remove_stimer0_irq(void) +{ +} +#endif /* hv_stimer_alloc - Global initialization of the clockevent and stimer0 */ int hv_stimer_alloc(bool have_percpu_irqs) From patchwork Thu Feb 9 12:15:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saurabh Singh Sengar X-Patchwork-Id: 54916 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp300954wrn; Thu, 9 Feb 2023 04:19:45 -0800 (PST) X-Google-Smtp-Source: AK7set97wYlBlQmGzFjJY9FWkbaxvw0ANV4yLuU/gV6NIFPcVH05FlfIpe69maFOrztvViWkXeX4 X-Received: by 2002:a17:90b:1a84:b0:230:a609:ff3b with SMTP id ng4-20020a17090b1a8400b00230a609ff3bmr12891278pjb.32.1675945185401; Thu, 09 Feb 2023 04:19:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675945185; cv=none; d=google.com; s=arc-20160816; b=HQm9IwsqJD6neLvMt1COKfGq6OfSHLndmYnU54TYGxk1lSRu1IzG+YlKB51X4qiXi0 Gu2XzstmQPBbQ1FkoQ9KBo/jRqdV0FIeKjpqNh0yaP2+ueR6xVe7/9jkz+RMvUZcLx6E z104e8et/B5NAnJAkfaLRGPE4XN++RppSbLCnqr+VocJIfauKSWnttJl3N84XqGgUVUw lXKlTZ89jB+D4eOR77ttfvaHJg9qZbro7OqBfJ2cxwKhwyHvSo7zOuoJuF2E4fnoziPT w57Uty36OEV+RP8gpMl61zsMETTSobX0q1PzVug+MouCuzMHXrZuOjLO8JD6YnYX4Yr3 0g0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature:dkim-filter; bh=i1p50TI+7fOgk4LW62buuCzlHOInl+oROOTdYyM1xe0=; b=K9sqUsrOxrhGfDUQjdCxCA6/CAyq1vAn8aGM0/QsfV4kXGCBIUcDrR0aT4jee5FwZd d7Hk/bL1lVO1qjXazkuTdtIuFsgSug5x6s7LKpun7CMICxA5cOajPCgOMUz5FpFn2gq7 nblbZls5qKSk2Gf+/gqXheophRTn8t55g27cB+OAgRm3fWwuDfiuhip/PcTIQxs/xY6/ XKErTJc7ETYgCfbe0RjZ6B17pifeT09fUt1Rr8U5umpAzQ3T8fgkf9E4udmEI6qdcacI 9KVuy1FeTbqyXaEdh9ZskCds30Y3ghK8IQMYfuLcCNX2L/cx11LseYMnOPpkQ/IFpVrw 2fng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=R45l2Rjl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g9-20020a17090ace8900b002192eb3532bsi5052312pju.116.2023.02.09.04.19.33; Thu, 09 Feb 2023 04:19:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=R45l2Rjl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229881AbjBIMRC (ORCPT + 99 others); Thu, 9 Feb 2023 07:17:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229699AbjBIMQt (ORCPT ); Thu, 9 Feb 2023 07:16:49 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id EBE19EB4A; Thu, 9 Feb 2023 04:16:30 -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 B424120C8AEE; Thu, 9 Feb 2023 04:15:43 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B424120C8AEE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1675944943; bh=i1p50TI+7fOgk4LW62buuCzlHOInl+oROOTdYyM1xe0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=R45l2RjlJuLHuNwf4WONyHHr7T+kRK6l5zCqx/yYfKrb1R2/eigbHgmD6zqWhOFl3 sltSm2pidcN4VNi6j9iT4lMkklpiK8zqstWEO2chSL6SL81tbs+zK7SGDPP26hnxc/ UIl+MdjWxFPHmIu87aPIgyFILzzgSdHJk7YU2erI= 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@linux.microsoft.com, dphadke@linux.microsoft.com Subject: [PATCH v5 2/5] Drivers: hv: allow non ACPI compilation for hv_is_hibernation_supported Date: Thu, 9 Feb 2023 04:15:36 -0800 Message-Id: <1675944939-22631-3-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675944939-22631-1-git-send-email-ssengar@linux.microsoft.com> References: <1675944939-22631-1-git-send-email-ssengar@linux.microsoft.com> X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757355898931807933?= X-GMAIL-MSGID: =?utf-8?q?1757355898931807933?= acpi_sleep_state_supported() currently is defined only when CONFIG_ACPI=y. For future work to enable device tree builds, put this function under #ifdef CONFIG_ACPI. Otherwise, return 'false' from hv_is_hibernation_supported() as Hyper-V guest configs using device tree don't support hibernation. 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 52a6f89ccdbd..370ec20d1993 100644 --- a/drivers/hv/hv_common.c +++ b/drivers/hv/hv_common.c @@ -234,7 +234,11 @@ EXPORT_SYMBOL_GPL(hv_setup_dma_ops); 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); From patchwork Thu Feb 9 12:15:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saurabh Singh Sengar X-Patchwork-Id: 54918 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp301020wrn; Thu, 9 Feb 2023 04:19:55 -0800 (PST) X-Google-Smtp-Source: AK7set/0syuPHtbBVHCAss8i05Q85GnkEPRIioTzw64JDtyq4ieQaMf8w5TsRafapmBMYJdloRmx X-Received: by 2002:a17:907:3201:b0:8ae:b7a4:4cf5 with SMTP id xg1-20020a170907320100b008aeb7a44cf5mr7702961ejb.37.1675945195210; Thu, 09 Feb 2023 04:19:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675945195; cv=none; d=google.com; s=arc-20160816; b=ojYgS65U9vvlF6g/ShCehmhY55O3x0o1r8ZFwa8jTA5ofmouDVFq0HTuDCNJLRVGfa p4Zz0GXRjfM5wwhihltDsTQ9yZl498Pw4VGGscdiB0yMwo22jsn0xdHQN6K33R2OJorC gBDKPCz3Z/EFCaeYdetd2Lam3TxhIVIqikK2i6cFJ+VeknhGva9OYz73MZlIbckH+fh3 j//LXf7iI5QzJhNm5HayhGluoWlyVnma0PNgo2pRQwUKiHrEFawm/Omw16hfDbgYkj0S 4RGTxJHMPE2J9QLi7cNLrUS6t3r6ufF9L0aB5XTx9x436tyBTP+RdUDujwXy+b1jbo4v /WcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature:dkim-filter; bh=QxjlMrs+k3GOIkNUqosnD/bWRotR9RtKp6Ub3/+UnTo=; b=ke2/jTYoxFJ3VC9CHUDr2/oZkiwnVmeZFQO2zSH17xzGxw2c7PUtgAg7aCwKlCNzih sb1CC20lEkwa61aX71dp2V2aZJZ7Y1EIg6x5EMk01TTVzpV7/BVo7/2yBbF/kO9/q8C1 7zo9+Kem/WQoNLSwgIN9wR+44rRSpzSaQcZe9m7hZy9wMq307DxBkTNBrnInazt9bArp 6e6lEC6VNw+h8Oaw4g+cY21kfuRx95L0UH58nNT7bcpM5vgOaXLfSNTPV8iqDMZL1jMP vz6sOeA8/kd5fGINhpAnnj0niQZmNtTYpmC06654WOcqNxXjplY9ugSB+REoGxhOcIQ8 zkEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=ObGN+su8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 15-20020a170906004f00b00880d1517c8esi2485980ejg.221.2023.02.09.04.19.32; Thu, 09 Feb 2023 04:19:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=ObGN+su8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229784AbjBIMQw (ORCPT + 99 others); Thu, 9 Feb 2023 07:16:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229655AbjBIMQt (ORCPT ); Thu, 9 Feb 2023 07:16:49 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1DF365581; Thu, 9 Feb 2023 04:16:31 -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 CC66120C8AF0; Thu, 9 Feb 2023 04:15:43 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com CC66120C8AF0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1675944943; bh=QxjlMrs+k3GOIkNUqosnD/bWRotR9RtKp6Ub3/+UnTo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ObGN+su83uYpy2i07SF/nG9zaP4ZhVn+SdyQ6XViFKBANhShXzMjtUrCPwsdOUH8a ZTa9Rf6+VdsZun52aBXdAZJbZnWoWQxzE5eCiy6fbBimTUisfuhZ90E0ViAxfdz77w nAAb08FzD7FZAU+cf7wRX4NR6u06te2Tw/bjCsiY= 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@linux.microsoft.com, dphadke@linux.microsoft.com Subject: [PATCH v5 3/5] Drivers: hv: vmbus: Convert acpi_device to more generic platform_device Date: Thu, 9 Feb 2023 04:15:37 -0800 Message-Id: <1675944939-22631-4-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675944939-22631-1-git-send-email-ssengar@linux.microsoft.com> References: <1675944939-22631-1-git-send-email-ssengar@linux.microsoft.com> X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757355909141217464?= X-GMAIL-MSGID: =?utf-8?q?1757355909141217464?= VMBus driver code currently has direct dependency on ACPI and struct acpi_device. As a staging step toward optionally configuring based on device tree instead of ACPI, use a more generic platform device to reduce the dependency on ACPI where possible, though the dependency on ACPI is not completely removed. Also rename the function vmbus_acpi_remove() to the more generic vmbus_mmio_remove(). Signed-off-by: Saurabh Sengar Reviewed-by: Michael Kelley --- 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..73497157a23a 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; }; -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 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 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); } From patchwork Thu Feb 9 12:15:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saurabh Singh Sengar X-Patchwork-Id: 54915 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp300921wrn; Thu, 9 Feb 2023 04:19:41 -0800 (PST) X-Google-Smtp-Source: AK7set9rEoylzEb63u7wRCEiIix/xBjNN5ryoKfmLfqJqbpGF6xAoXlCzwINhkVt10BfXjCUCmsb X-Received: by 2002:a05:6a21:300e:b0:bf:6cd3:9546 with SMTP id yd14-20020a056a21300e00b000bf6cd39546mr8566887pzb.30.1675945181396; Thu, 09 Feb 2023 04:19:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675945181; cv=none; d=google.com; s=arc-20160816; b=dsCKjZHQ1IHH4fJ/P4volcwhbXj16lP3dLa76wWcTgcq/8wivQ9Gplgp4xvYeMpIKV bqflVvqUxHSMSOmNEo8XS1pcn9tPkh+Sp4Jcs21WYkTQO46WIh9dXS2vV/YE3b0s0Wfo 7+5xTh/IbuoR+HwnJmPyzJ0qf7Mve0QNnKvESH4fl5xKAiXyVcuOWJfDhRH9vlAake09 Ticq5RoQXCw//ttGryQ9eZge9X9t8Lk9TnlE4IewUOg4nzCHztDFbe7J8ktA3o6UwIIw y2GMSdhPdiauYzXUTMcjaDslPkZCQyJg7uK5ZbOnDGmmA+f2qMmGVA/iGGbINdmGhszI i4Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature:dkim-filter; bh=GI+VPyEx6h0BVnPPC0y/WHoLYEEOuv2EPkQqu7kzKDg=; b=Ql25ihowsNE6pl/426BzTK6zjgFZll27AM7qL+huk6fY8JL2iDvnw5SKDEMuueFI9p JAZ5LximtwuKJrLcy92pQ8mTR7Z4tHJgRBHXsHfZT545pwUliJZ73c5vG2X91x4+CgCq /VRZIlG20XRVK/+UyWjQRb3ENkNzj1SLk8YTa5qOd978VuQapm3uIX3Bc4VVXqIhcfSP 3FRbNEJHoEb7o2F5ZsS61Jt8BaqKkWlDQtjU7tie2xykW06RMEjgIfSJhplJEJqio72R wP806p/spbRkn7joRMzezcV/GUv+RQYsZnId5Pqc8sdqoQw3MUi8kffkBxAca9V/4sA6 7coQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=kdcwjwtu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q3-20020a638c43000000b00478ba6bfcf0si1754902pgn.703.2023.02.09.04.19.28; Thu, 09 Feb 2023 04:19:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=kdcwjwtu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229977AbjBIMQ7 (ORCPT + 99 others); Thu, 9 Feb 2023 07:16:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229695AbjBIMQt (ORCPT ); Thu, 9 Feb 2023 07:16:49 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8A90AEC4E; Thu, 9 Feb 2023 04:16:31 -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 E4FE920C8AF3; Thu, 9 Feb 2023 04:15:43 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com E4FE920C8AF3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1675944943; bh=GI+VPyEx6h0BVnPPC0y/WHoLYEEOuv2EPkQqu7kzKDg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=kdcwjwtuBNrI9HXY8HpmZ86VRzQT04nEkutIfXghfnZ1egmYQyBv6QzCgW87g8pIZ Bie+eLn0pLynu0InPJfJKYsivuRT9+p0Q1863BS11VH+rdKymsRg5JttbSgPtexoKu L7wTP/kJd5cyjimX5NHW9GT78f/B8Pz0RsohdP7k= 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@linux.microsoft.com, dphadke@linux.microsoft.com Subject: [PATCH v5 4/5] dt-bindings: hypervisor: VMBus Date: Thu, 9 Feb 2023 04:15:38 -0800 Message-Id: <1675944939-22631-5-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675944939-22631-1-git-send-email-ssengar@linux.microsoft.com> References: <1675944939-22631-1-git-send-email-ssengar@linux.microsoft.com> X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757355894581098740?= X-GMAIL-MSGID: =?utf-8?q?1757355894581098740?= Add dt-bindings for Hyper-V VMBus. Signed-off-by: Saurabh Sengar --- [V5] - moved dt documantation to bus folder - update the dt node to have 'bus' as parent node instead of 'soc'. Also added compatible and ranges property for parent node. - Made sure dt_binding_check have no error/varnings for microsoft,vmbus.yaml file .../bindings/bus/microsoft,vmbus.yaml | 50 +++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 51 insertions(+) create mode 100644 Documentation/devicetree/bindings/bus/microsoft,vmbus.yaml diff --git a/Documentation/devicetree/bindings/bus/microsoft,vmbus.yaml b/Documentation/devicetree/bindings/bus/microsoft,vmbus.yaml new file mode 100644 index 000000000000..40daefc37615 --- /dev/null +++ b/Documentation/devicetree/bindings/bus/microsoft,vmbus.yaml @@ -0,0 +1,50 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/bus/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: + - | + bus@ff0000000 { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <1>; + ranges = <0x0 0xf 0xf0000000 0x10000000>; + + vmbus@ff0000000 { + compatible = "microsoft,vmbus"; + #address-cells = <2>; + #size-cells = <1>; + ranges = <0x0f 0xf0000000 0x0f 0xf0000000 0x10000000>; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index df202a1e4b96..67ddecd1a383 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/bus/microsoft,vmbus.yaml F: Documentation/virt/hyperv F: Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst F: arch/arm64/hyperv From patchwork Thu Feb 9 12:15:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saurabh Singh Sengar X-Patchwork-Id: 54919 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp301018wrn; Thu, 9 Feb 2023 04:19:55 -0800 (PST) X-Google-Smtp-Source: AK7set8i0ZZ3O89nLKwmmAgG9xze08K2r6pFmGUo/RhcubQA4zj/Db+8jdeWpUEJ6LGtbTxUew8z X-Received: by 2002:a17:902:e205:b0:198:d9ff:4bd3 with SMTP id u5-20020a170902e20500b00198d9ff4bd3mr9460671plb.40.1675945194824; Thu, 09 Feb 2023 04:19:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675945194; cv=none; d=google.com; s=arc-20160816; b=AsrJoSsluBYGwtzX6t3W4QCTzh9aOkWTUUOqAxxBBoGrDxNzJYFmeo9tvErnowzWlN 3yJc8tmiNw/4FvX9yxXsUzCiqHN5lfVa1Sv6hTxErlqzntxOJ3a9KUPpMxuzBZ2Pz/vF iyVzPf6/Lz0KG0crAENy4hS63zGeVv8wF1fjm7leDIoXh6IFmUAorCA62JFW/i95UipK gndRIeOqIU27Z0GO/AL6jJML+k8KzuopU47l2PkpbAPtsffboXU3bjIQ8q6Taxtj5Ibw UQ5AUjlEbUCRraPcdIH1d3nAWlpnm7vxSHFtT+IX8dFKPA/Z23pezaL/SIyHOIW6X5Dq sIkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature:dkim-filter; bh=tcypQPfMSnfnYp3JE6Trh1CtkCM96kzsYYRghzAy49I=; b=JMv21CqKulUC9nEHPWsAEGQgSVqNEhioFh1MCep4bXMNOASAUJAoarhWTMRZypVLVd I/fk5JN5cpJwKBNOuGzC/UeXmbQ3gyxUQs4C7GqnjIi6y2cWoULAWiCORcU4zFBjyVgi kKtWdcNC6qfohwRUISU78TgKPs5SNr87W/K+kFEVKivCMkVJCAN6Iy8SG6gxj4EO35LP 7H0y2Xeyi3PYlu2whKPe64BYM7IaES2yXLSFrLBKB2yHt+4POZQAHoRQvXLl60/DAwUT U8IWcT3q019rJdfqvI18vYJUghMRVGj3r7Vbzf/2/QEvFmgjrHF98mlvE3W6r4RF4tEf 4Keg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=bMVGNRK2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h11-20020a170902b94b00b001991f85c5adsi30864pls.453.2023.02.09.04.19.42; Thu, 09 Feb 2023 04:19:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=bMVGNRK2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229511AbjBIMR0 (ORCPT + 99 others); Thu, 9 Feb 2023 07:17:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230127AbjBIMRN (ORCPT ); Thu, 9 Feb 2023 07:17:13 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 02B67DBE5; Thu, 9 Feb 2023 04:16:53 -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 09A7020C8AF4; Thu, 9 Feb 2023 04:15:44 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 09A7020C8AF4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1675944944; bh=tcypQPfMSnfnYp3JE6Trh1CtkCM96kzsYYRghzAy49I=; h=From:To:Subject:Date:In-Reply-To:References:From; b=bMVGNRK2D9pFEslGphWYzkl5YMZc6Ohj7OrdblC71KSHkCd3cjxa4eb3gt+Wj+Y0+ ohsGiJ/OT2VGXVCzJ6a3EEkeP0Z5cpLWfmOSOnO8uFq0NAMMbHvjHNwSsGE0+WNwFJ xS/LDWhVoVX1iHsfc9Tsc+tubf5H8zqef5++b7IY= 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@linux.microsoft.com, dphadke@linux.microsoft.com Subject: [PATCH v5 5/5] Driver: VMBus: Add device tree support Date: Thu, 9 Feb 2023 04:15:39 -0800 Message-Id: <1675944939-22631-6-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675944939-22631-1-git-send-email-ssengar@linux.microsoft.com> References: <1675944939-22631-1-git-send-email-ssengar@linux.microsoft.com> X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757355908343407871?= X-GMAIL-MSGID: =?utf-8?q?1757355908343407871?= 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 --- - Removed #else for device tree parsing code. This should help better test coverage. - Fix macro '__maybe_unused' warning - Added below options in Kconfig to enable device tree options for HYPERV select OF if !ACPI select OF_EARLY_FLATTREE if !ACPI drivers/hv/Kconfig | 6 +++-- drivers/hv/vmbus_drv.c | 60 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig index 0747a8f1fcee..1a55bf32d195 100644 --- a/drivers/hv/Kconfig +++ b/drivers/hv/Kconfig @@ -4,11 +4,13 @@ menu "Microsoft Hyper-V guest support" 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 + select OF if !ACPI + select OF_EARLY_FLATTREE if !ACPI help Select this option to run Linux as a Hyper-V client operating system. diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 73497157a23a..02f6bab61c37 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); } - +#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_resource *res, void *ctx) return AE_OK; } +#endif static void vmbus_mmio_remove(void) { @@ -2282,7 +2284,7 @@ static void vmbus_mmio_remove(void) } } -static void vmbus_reserve_fb(void) +static void __maybe_unused vmbus_reserve_fb(void) { resource_size_t start = 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); +#ifdef CONFIG_ACPI static int vmbus_acpi_add(struct platform_device *pdev) { acpi_status result; @@ -2494,10 +2497,50 @@ static int vmbus_acpi_add(struct platform_device *pdev) vmbus_mmio_remove(); return ret_val; } +#endif + +static int vmbus_device_add(struct platform_device *pdev) +{ + struct resource **cur_res = &hyperv_mmio; + struct of_range range; + struct of_range_parser parser; + struct device_node *np; + int ret = 0; + + hv_dev = &pdev->dev; + np = pdev->dev.of_node; + + ret = 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 = kzalloc(sizeof(*res), GFP_ATOMIC); + if (!res) + return -ENOMEM; + + res->name = "hyperv mmio"; + res->flags = IORESOURCE_MEM | IORESOURCE_MEM_64; + res->start = range.pci_addr; + res->end = range.pci_addr + range.size; + + *cur_res = res; + cur_res = &res->sibling; + } + + return ret; +} static int vmbus_platform_driver_probe(struct platform_device *pdev) { +#ifdef CONFIG_ACPI return vmbus_acpi_add(pdev); +#endif + return vmbus_device_add(pdev); } static int vmbus_platform_driver_remove(struct platform_device *pdev) @@ -2643,12 +2686,24 @@ static int vmbus_bus_resume(struct device *dev) #define vmbus_bus_resume NULL #endif /* CONFIG_PM_SLEEP */ +static const __maybe_unused struct of_device_id vmbus_of_match[] = { + { + .compatible = "microsoft,vmbus", + }, + { + /* sentinel */ + }, +}; +MODULE_DEVICE_TABLE(of, vmbus_of_match); + +#ifdef CONFIG_ACPI static const struct acpi_device_id vmbus_acpi_device_ids[] = { {"VMBUS", 0}, {"VMBus", 0}, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, vmbus_acpi_device_ids); +#endif /* * Note: we must use the "no_irq" ops, otherwise hibernation can not work with @@ -2677,6 +2732,7 @@ static struct platform_driver vmbus_platform_driver = { .driver = { .name = "vmbus", .acpi_match_table = ACPI_PTR(vmbus_acpi_device_ids), + .of_match_table = of_match_ptr(vmbus_of_match), .pm = &vmbus_bus_pm, .probe_type = PROBE_FORCE_SYNCHRONOUS, }