From patchwork Mon Mar 20 07:47: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: 72022 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1077213wrt; Mon, 20 Mar 2023 00:58:01 -0700 (PDT) X-Google-Smtp-Source: AK7set9gfSDw/KV+/XXGcIs6tTyd9pjHHC7Brrp7+Gbz/NBPLJHqIumXaZ0G7ql0zWN47l7SnxsE X-Received: by 2002:a17:90a:ce89:b0:234:289d:5e69 with SMTP id g9-20020a17090ace8900b00234289d5e69mr13416272pju.2.1679299081422; Mon, 20 Mar 2023 00:58:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679299081; cv=none; d=google.com; s=arc-20160816; b=Z7DtlXdszqQsuHhXUoSs7CnP4OFeTyd8X3ilQ6WIhro4Yp8WEi80kQUNZXGfDUlZGy uiV+WXaSiYySwmCm8SRQZZEQ8dpk2xAI56VQoLp6hvhnLET9YQKsaUI6VikS3O7/eL9A CRudGPDCoSHgbDBrqrui0TT62MpzxbJAZ8YCIIQfAS/VcSVjaxlMfZf/3O/x/3FtHr+h ja264DuBJIJjMn6THfVAiH+wnrZP2zTpO/DD8Mx54OGfUdGKYBc7N4QOxWeNE/rlFvkd nBNTSJwA/Npcl3iDqqPFarlkzg/dOW+tida3j3oDo4E8FBUzfzgi2NqJoGHdpmAwDZC2 YLkQ== 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=xHDwTsMUde6JL7YhTI3oGm/fJ9QMwF+GPXGhbdwD6TUcwsDZbYCbmqFoivkqrHja3b l5956kJhChjYyhkB/bxHcXM1aGxWDE2il3k5uqmuY0VIbko/DFlX2kgqUCZNAQk4ngHW 0comtrvqfp3tIBeCr1D9WNjPGoSAsD31N4WjFLL+2wL3WOjUw1fbdlqrtRPGmdIN+xl+ fE6Hu+BiyFmxGcf6h9hmtlGI6v15k6d4eqSQ4sA9rKrkxOD3Yqw2nvHYKqhvNXBfK78n AwyYhOEO3Ua865wbLgW0JCPqH1o9U+UHvcDm+3d4sfHrOt8EAzb2lhzGvaaopW+coJI3 DMDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=UQ7XWCso; 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 nh3-20020a17090b364300b0023b35a46595si14984117pjb.99.2023.03.20.00.57.49; Mon, 20 Mar 2023 00:58:01 -0700 (PDT) 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=UQ7XWCso; 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 S230187AbjCTHrz (ORCPT + 99 others); Mon, 20 Mar 2023 03:47:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229561AbjCTHrr (ORCPT ); Mon, 20 Mar 2023 03:47:47 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CA5A012594; Mon, 20 Mar 2023 00:47:44 -0700 (PDT) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id F184B20FAACE; Mon, 20 Mar 2023 00:47:43 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com F184B20FAACE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679298464; bh=9hqMgwt+9rfgzKvMywqn/H23HiHnKG9S9L6A/+1pzh0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=UQ7XWCsoz4aLvEyssGIFuVqFwdiiGt+efQ0p6tQOvIL/9k8jKDly/VSaoLZhnwWNp L73ZiX5d4HKIBjvL3dC3TM0HPuXtjNkBoH8AikaPPbl9RiTp7A6PhoT1xL1XiX97VZ YMqo7II67x8opgdoV5l2WSFvAcqC4PRuWOdP1Hek= From: Saurabh Sengar To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, mikelley@microsoft.com Subject: [PATCH v9 1/5] drivers/clocksource/hyper-v: non ACPI support in hyperv clock Date: Mon, 20 Mar 2023 00:47:36 -0700 Message-Id: <1679298460-11855-2-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679298460-11855-1-git-send-email-ssengar@linux.microsoft.com> References: <1679298460-11855-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?1760872713889821743?= X-GMAIL-MSGID: =?utf-8?q?1760872713889821743?= 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 Mon Mar 20 07:47: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: 72024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1078710wrt; Mon, 20 Mar 2023 01:01:46 -0700 (PDT) X-Google-Smtp-Source: AK7set93PtfkuoKpEcUZaYq0epYzO/i//ZewnHOw2k0Lg9L2oQwEBrjCNcMSUzpVPTaSXnoSZFn+ X-Received: by 2002:a05:6a20:8f0a:b0:d9:ec4b:82c6 with SMTP id b10-20020a056a208f0a00b000d9ec4b82c6mr1359475pzk.0.1679299306406; Mon, 20 Mar 2023 01:01:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679299306; cv=none; d=google.com; s=arc-20160816; b=Qtsq7xrXcwz2k8pIQfkQgpxlLJSaCJ0JA3irF2gu3E5PqhyW4Hiry66fSliFBsstcM rCYOWt3eIAIjRy/GZoWXpMxAC0oRnvC8duG2nqsuSMSa40SO3APcw/Ha5jBeJvKX9PFz mFNe17FAEMdmtj8xtpwLrD1emaz64h1FERiRxXDILIBKxqkNzWIiPqCCfQc92w1HCqHt fGG3GkzY7k9gl2MMPu2mLiQC8lsFrLkm5gunI28wkka1PZ5JB7+mrLG4xYCD1UdlDg+C Ko2MYstQ1/RTUIKMrGRbiQWVmJLpl+Cgu5Vz81QU8WeX0jsqMoI++1WENbPa9VaAypEX dhKw== 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=4PRW0VI+oZvbTmFAcVbsrAFK92yD8Gwq6n0ZpwB9zPo=; b=CofkuNDazmz/3QMV/zmOgVjn6EzeC2s+R+63ebx1al8rYdZcyaPef7u7iWBXXIRFy0 iocH9BJK7Hnue82W7MxtS6myea0K1V1Jq8fkn1/AJqyFYbWq5IduXimoTfsUlsdK677+ pCX6sSRwWlIQr07IeGUO5kz03DiZGHWSA2GzRXNl9gSc/9XCqYVy7cmY6k46g4UJm9xf kFpjN91L4adg96GmraOEC9Szl+dxeSh+eGQxk44f17XlxP1wGP7T33gRjpYMOrSwGwXB k8wKoNE3DNqNEy0VjrWedV5drsKGSFIgf0pBe/14bzLQgHWhcNRtY01K04094dxWeY/l xBVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=NFOdiDJZ; 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 b19-20020a631b13000000b00503a2ab161dsi9872428pgb.534.2023.03.20.01.01.34; Mon, 20 Mar 2023 01:01:46 -0700 (PDT) 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=NFOdiDJZ; 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 S230201AbjCTHru (ORCPT + 99 others); Mon, 20 Mar 2023 03:47:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229665AbjCTHrr (ORCPT ); Mon, 20 Mar 2023 03:47:47 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DE7B2125A3; Mon, 20 Mar 2023 00:47:44 -0700 (PDT) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 1476120FAAD4; Mon, 20 Mar 2023 00:47:44 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 1476120FAAD4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679298464; bh=4PRW0VI+oZvbTmFAcVbsrAFK92yD8Gwq6n0ZpwB9zPo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=NFOdiDJZUwvLWn/3+im5vYYkUdZEqchvLQ+qCTga3O3f2mlYIR6k+3iV5fWWH/Gko aCNoxTVlCJVu7RyAIAvKVZXlvgYfIfYr/kjkYMMuAtTcFWB3VD8QOityCWjF3KITHi NqoECmyNJBYO/pnFNRStMYv4y/e+T9W+MF2MvYuc= From: Saurabh Sengar To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, mikelley@microsoft.com Subject: [PATCH v9 2/5] ACPI: bus: Add stub acpi_sleep_state_supported() in non-ACPI cases Date: Mon, 20 Mar 2023 00:47:37 -0700 Message-Id: <1679298460-11855-3-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679298460-11855-1-git-send-email-ssengar@linux.microsoft.com> References: <1679298460-11855-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?1760872949418579722?= X-GMAIL-MSGID: =?utf-8?q?1760872949418579722?= acpi_sleep_state_supported() is defined only when CONFIG_ACPI=y. The function is in acpi_bus.h, and acpi_bus.h can only be used in CONFIG_ACPI=y cases. Add the stub function to linux/acpi.h to make compilation successful for !CONFIG_ACPI cases. Signed-off-by: Saurabh Sengar Acked-by: Rafael J. Wysocki --- include/linux/acpi.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/acpi.h b/include/linux/acpi.h index efff750f326d..d331f76b0c19 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1075,6 +1075,11 @@ static inline u32 acpi_osc_ctx_get_cxl_control(struct acpi_osc_context *context) return 0; } +static inline bool acpi_sleep_state_supported(u8 sleep_state) +{ + return false; +} + #endif /* !CONFIG_ACPI */ #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC From patchwork Mon Mar 20 07:47: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: 72029 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1083741wrt; Mon, 20 Mar 2023 01:13:59 -0700 (PDT) X-Google-Smtp-Source: AK7set9rGZtjZIIsCAa/8Q30ATRbFAb0TAj5s4oZ7CgSawZweNob2OH1IcVvE7CoJKSc9puC9SlB X-Received: by 2002:a17:90a:2a0f:b0:233:b57f:23c5 with SMTP id i15-20020a17090a2a0f00b00233b57f23c5mr13846860pjd.2.1679300039685; Mon, 20 Mar 2023 01:13:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679300039; cv=none; d=google.com; s=arc-20160816; b=OV9BTcoo+NGwbAwbhfXteJ3V0UFRW0QuyIz6YF0PsqoUs0ad/94uc1l7n/4CwiIWZ7 vUfmGnz/5VvmaEmyiu3p3xNiNe7lC/j/ZZdxiECmJncweDPe/8pdWigSVfXhm+bm9Afc c5mRxzukcHabdRqyCdEPL5RJYtneC0UcDOJ+rEK6q/ppA3wHserP+jxOVt+whiImhgZw YuR1r4lOcYFkle7xbhURX8oYp/X2bwFQyHmu8i7B8lG6L15HS0DT51MvWaOLZGg67t1G X0VYSLG/mhMWDS0JkvJ8LEoGoaGRsi3+Uvjk59rh2k3hJBPs0peyagAU4AtzVDPdthCp +sHg== 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=kCtr1lBlf7j2Mhd1zlGqb7Klz5qlzuGWzb9TdRoa9Nc=; b=z2WOuxrepF5Pe9sUOePL/MfYO1ArS3UKixI/M0JmRfZzCQzWHm+TDMevJyv11iFrnd KKZ+lGAid/FCDNMHAWGdSbEQh96fG49iaIzNwBIyLkGskjFSsHmRbvnbhg39IES4dT/V HXKCWDpOCzDJd9dzkGe0ujPNzM8QMqFWBjOtgYuRT1axwbrm5Os4V4g8HdmD7fyUcEtf DcCiDcqN4pzZujxUuea1CZXCoDbMTfLhUrYPXGFXS/Vesei0Zx7JmOgPMAVURZ4cW+F8 aD5Bf01la1EhbDKRnt7XdirSIO/VAjuyTH2G7zYtJBOXPxNdWPidrLvPF/4mAsx9A7Qj YgdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=h24kRzpZ; 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 lk5-20020a17090b33c500b00233efa8d3e5si16431807pjb.20.2023.03.20.01.13.47; Mon, 20 Mar 2023 01:13:59 -0700 (PDT) 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=h24kRzpZ; 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 S230259AbjCTHsM (ORCPT + 99 others); Mon, 20 Mar 2023 03:48:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230195AbjCTHrt (ORCPT ); Mon, 20 Mar 2023 03:47:49 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C5D6A12590; Mon, 20 Mar 2023 00:47:44 -0700 (PDT) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 2B9C320FAEC2; Mon, 20 Mar 2023 00:47:44 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 2B9C320FAEC2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679298464; bh=kCtr1lBlf7j2Mhd1zlGqb7Klz5qlzuGWzb9TdRoa9Nc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=h24kRzpZ1piu4JIWsThNpoPshq1QFeUxfdMhmGcT9oxm9BCzs9vu9HGBmgEjYDrs+ bsAlp5Jtva2N1IqUznNzg8JFa8jbCMI+qRn75nkTgpROKBd7si1KteQy0Azca0Vb3J b3xZovE+aDvuRYjME3J2OKo4PbotzGN8k9XDQCnY= From: Saurabh Sengar To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, mikelley@microsoft.com Subject: [PATCH v9 3/5] Drivers: hv: vmbus: Convert acpi_device to more generic platform_device Date: Mon, 20 Mar 2023 00:47:38 -0700 Message-Id: <1679298460-11855-4-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679298460-11855-1-git-send-email-ssengar@linux.microsoft.com> References: <1679298460-11855-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?1760873718376345732?= X-GMAIL-MSGID: =?utf-8?q?1760873718376345732?= VMBus driver code currently has direct dependency on ACPI and struct acpi_device. As a staging step toward optionally configuring based on Devicetree 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 229353f1e9c2..3ad2fa2b92e7 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; } @@ -2081,7 +2082,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; @@ -2253,7 +2254,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; @@ -2432,13 +2433,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 @@ -2480,10 +2482,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) { @@ -2649,15 +2662,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) @@ -2741,12 +2754,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; } @@ -2776,8 +2788,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; } @@ -2830,7 +2842,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 Mon Mar 20 07:47: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: 72027 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1083624wrt; Mon, 20 Mar 2023 01:13:43 -0700 (PDT) X-Google-Smtp-Source: AK7set/7LgWjvpI12TOesw5DTSmJyJ5PJAMeWpXJsrbXLkRBPvfGPNfi509e5/PFZ41+skxNNNNg X-Received: by 2002:a05:6a20:3d24:b0:cc:bf13:7b1c with SMTP id y36-20020a056a203d2400b000ccbf137b1cmr23355303pzi.0.1679300023009; Mon, 20 Mar 2023 01:13:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679300022; cv=none; d=google.com; s=arc-20160816; b=xiDTn5XaJhdxHaV5lxvpffvsatXaETtdAkrtdG6VOx2Y0K9yvsyKG/tc1bnewadS1Z 1L19H1tRUHVG9Zxm6AmdfRAXKP1mH5dZ6MY1+gA5YZaQevpkDxdzRRk+Maem9siCLcJt aujiRzbxw8Q9gQNG2LzbZADp+jPTjLpTjjw0ZOh43YXxySnmhPWpAlm9TArJRyZ4EXYw xojHwGfS6pww63dvK8z6fIFwstHlPZ+yXWMJqfGmkOjbxTw4V5LH6jjcVxUqgj0thTno 1tHbHVZYeH1LAMmwjOgdW1X/YhQY/0j4lovlBjwOvX1/KvrkeEKl1KYtFQ7zbUZwRPsS VsPw== 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=4FMYgFngPsCYjftlQoUOLXjlLUIuzh3R5fN/lo5rhQo=; b=bUPsnPC2ZlGnly7+1eUQKUfIAZvOw+9gxcsZd/FchjN3JKPQvozlK7R5bVelEQLVCu 1D1vV/D8I5a9leRkXx5tuG+0ZgOR/dpJ4WvzIgoZzYss6hQqi+r6DHZHzzc7oMS6u0EC P6ZUDcNQGhXhvJrEOLQ3Cy3RZ91pumWKoqzxmmQfMhVQzb/FEZ6F8ABkMo2bNaCSxKzO OQfzJQCQbkZ9l7E83YGY11V8ysZUQS2/Fw5w7izPVHD8PfcLrMwDTFm2+VVt7I/ZeGOe G4vwj/d30HofzZxoqgpa0RjyHTjv8mggd0Dn6VwQvIGFbWQXqyH8D3Xy2jLU16peveQZ unOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=ZsbSHZVJ; 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 x6-20020a056a00188600b006265c3b7053si8430795pfh.200.2023.03.20.01.13.31; Mon, 20 Mar 2023 01:13:42 -0700 (PDT) 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=ZsbSHZVJ; 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 S229782AbjCTHsI (ORCPT + 99 others); Mon, 20 Mar 2023 03:48:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230185AbjCTHrt (ORCPT ); Mon, 20 Mar 2023 03:47:49 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1199D125AB; Mon, 20 Mar 2023 00:47:44 -0700 (PDT) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 4284A20FAEC9; Mon, 20 Mar 2023 00:47:44 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4284A20FAEC9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679298464; bh=4FMYgFngPsCYjftlQoUOLXjlLUIuzh3R5fN/lo5rhQo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZsbSHZVJy6lV9o3h1gc0pFly1b83s0GIjPS8J1O1F+b7GGqESOpDrWlw/3P8NcP8d dky8mTLBtrXkWFKgj2CMmrz5rw0cWWtz826raSUz1Jd+P1P5f2Y2SyIhDW/qsXfemj GZgtnh5ejgIO4av8KvU0uoFv/r37K7cDwjMC4tbo= From: Saurabh Sengar To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, mikelley@microsoft.com Subject: [PATCH v9 4/5] dt-bindings: bus: VMBus Date: Mon, 20 Mar 2023 00:47:39 -0700 Message-Id: <1679298460-11855-5-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679298460-11855-1-git-send-email-ssengar@linux.microsoft.com> References: <1679298460-11855-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?1760873700953786895?= X-GMAIL-MSGID: =?utf-8?q?1760873700953786895?= Add dt-bindings for Hyper-V VMBus. Signed-off-by: Saurabh Sengar Reviewed-by: Rob Herring --- .../bindings/bus/microsoft,vmbus.yaml | 54 +++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 55 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..a8d40c766dcd --- /dev/null +++ b/Documentation/devicetree/bindings/bus/microsoft,vmbus.yaml @@ -0,0 +1,54 @@ +# 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: + - | + soc { + #address-cells = <2>; + #size-cells = <1>; + bus { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <1>; + ranges; + + vmbus@ff0000000 { + compatible = "microsoft,vmbus"; + #address-cells = <2>; + #size-cells = <1>; + ranges = <0x0f 0xf0000000 0x0f 0xf0000000 0x10000000>; + }; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 216a61805c93..3cfe67af51f1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9540,6 +9540,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 Mon Mar 20 07:47:40 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: 72025 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1080820wrt; Mon, 20 Mar 2023 01:06:45 -0700 (PDT) X-Google-Smtp-Source: AK7set+xY3VIcebUmQ2nfXMFbZPzx+Y+RIiY7nVEMzTJqZMvGz9+rG3UUY8R8rVF9bhJK+Nd9G7d X-Received: by 2002:a17:902:f689:b0:1a1:b51b:4d3b with SMTP id l9-20020a170902f68900b001a1b51b4d3bmr7685900plg.1.1679299605097; Mon, 20 Mar 2023 01:06:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679299605; cv=none; d=google.com; s=arc-20160816; b=HNaS9lB2wQk0vR+sG6qYRb4oN1znJXuef3/Pu9mYDa5Q+n5t2CFv5B+cl7fg/zvBv2 kcNyT3/yopb1IvHLSk1TrTlq7SuDJPGstAhRVtuC1gQajbfuvBP4muu2QQ0QBzrNVCEB oIcb6oeZFFD7Sfsc87RvZXO025hyNdxI+skKJ89HJztQgrKIipt4AZTQiXfCoHDZ6KPA nlhBkk7xO2WlifiKLCbNX8phAuoBS317Txbb0zaAD03n+lISJqQhmlbmqKYzFqmqCRSu Iugn7nF892qH1fq1daPlT1XcJAYc7RNcEAFE8fsr3JeA9yaXn5DAVYSNXUOU+SKIze3l Wz9g== 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=GM5+GaMg13JEPlmbB8fyrcDYf5aGInVhNK1lqkzJoEE=; b=o29xAMJUhGDw04L6fRuPq2bMHSsgmsOULnTNM54qdWedK/b/oP7Fer+sbIO6l5Oxkg +n412kfBjI7xWYPO342o1L9JA1NYZ2mQsisGFYybT9/aNL1SzxIjfuvYaSnbSL1jowSI 1NpskYa8/hI6KbhpxRUHvqvfj+qbeOh6fzsJbQz05CSZpbHhfFM+ZMAlGjj3kpcDn80h ZLC/kyRoNsxA0Es5e2vRLw91BR0npO79pKRPDIeXrJtIcU5b1cTV96gCYX7RQQTE/+zn t6RTksIkhY3vHmaNb5Blhm3i0muGikgEpCKCsTKW/0+hp2n4iJgkUC/gWWU+hkIc1Xy6 X80g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=CP3IsgcR; 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 u14-20020a170902e80e00b0019cac966629si7182103plg.245.2023.03.20.01.06.31; Mon, 20 Mar 2023 01:06:45 -0700 (PDT) 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=CP3IsgcR; 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 S230151AbjCTHsE (ORCPT + 99 others); Mon, 20 Mar 2023 03:48:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230122AbjCTHrs (ORCPT ); Mon, 20 Mar 2023 03:47:48 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4FFF4125B1; Mon, 20 Mar 2023 00:47:47 -0700 (PDT) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 5991120FAED2; Mon, 20 Mar 2023 00:47:44 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5991120FAED2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679298464; bh=GM5+GaMg13JEPlmbB8fyrcDYf5aGInVhNK1lqkzJoEE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=CP3IsgcRGHuzf3gla+JV6awMwByLeqXxrm6kj3YOPrhQAcwsXbEnVWtkFlAiF+QLo q2R8k0aRJ1F6bXOVh98Fxu0kVm+vKnd0K+OrbjE2Whcywwi+gvKDqhXIzJU02nbUYm LAm8dRRJUOV0K52Sirn+mDkcjBU2VgzxE/HoquKw= From: Saurabh Sengar To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, mikelley@microsoft.com Subject: [PATCH v9 5/5] Driver: VMBus: Add Devicetree support Date: Mon, 20 Mar 2023 00:47:40 -0700 Message-Id: <1679298460-11855-6-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679298460-11855-1-git-send-email-ssengar@linux.microsoft.com> References: <1679298460-11855-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?1760873262723133139?= X-GMAIL-MSGID: =?utf-8?q?1760873262723133139?= Update the driver to support Devicetree boot as well along with ACPI. At present the Devicetree parsing only provides the mmio region info and is not the exact copy of ACPI parsing. This is sufficient to cater all the current Devicetree usecases for VMBus. Currently Devicetree is supported only for x86 systems. Signed-off-by: Saurabh Sengar Reviewed-by: Michael Kelley --- [V9] - Add vmbus_mmio_remove for error handling - Remove logic from !acpi_disabled to acpi_disabled drivers/hv/Kconfig | 5 ++-- drivers/hv/vmbus_drv.c | 66 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig index 0747a8f1fcee..47132b30b7ee 100644 --- a/drivers/hv/Kconfig +++ b/drivers/hv/Kconfig @@ -4,11 +4,12 @@ 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_EARLY_FLATTREE if OF 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 3ad2fa2b92e7..5de2d3bb8289 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -2143,7 +2144,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. @@ -2253,6 +2254,7 @@ static acpi_status vmbus_walk_resources(struct acpi_resource *res, void *ctx) return AE_OK; } +#endif static void vmbus_mmio_remove(void) { @@ -2273,7 +2275,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; @@ -2433,6 +2435,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; @@ -2485,10 +2488,54 @@ static int vmbus_acpi_add(struct platform_device *pdev) vmbus_mmio_remove(); return ret_val; } +#else +static int vmbus_acpi_add(struct platform_device *pdev) +{ + return 0; +} +#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 = pdev->dev.of_node; + int ret; + + hv_dev = &pdev->dev; + + ret = of_range_parser_init(&parser, np); + if (ret) + return ret; + + for_each_of_range(&parser, &range) { + struct resource *res; + + res = kzalloc(sizeof(*res), GFP_KERNEL); + if (!res) { + vmbus_mmio_remove(); + return -ENOMEM; + } + + res->name = "hyperv mmio"; + res->flags = range.flags; + res->start = range.cpu_addr; + res->end = range.cpu_addr + range.size; + + *cur_res = res; + cur_res = &res->sibling; + } + + return ret; +} static int vmbus_platform_driver_probe(struct platform_device *pdev) { - return vmbus_acpi_add(pdev); + if (acpi_disabled) + return vmbus_device_add(pdev); + else + return vmbus_acpi_add(pdev); } static int vmbus_platform_driver_remove(struct platform_device *pdev) @@ -2634,7 +2681,17 @@ static int vmbus_bus_resume(struct device *dev) #define vmbus_bus_resume NULL #endif /* CONFIG_PM_SLEEP */ -static const struct acpi_device_id vmbus_acpi_device_ids[] = { +static const __maybe_unused struct of_device_id vmbus_of_match[] = { + { + .compatible = "microsoft,vmbus", + }, + { + /* sentinel */ + }, +}; +MODULE_DEVICE_TABLE(of, vmbus_of_match); + +static const __maybe_unused struct acpi_device_id vmbus_acpi_device_ids[] = { {"VMBUS", 0}, {"VMBus", 0}, {"", 0}, @@ -2668,6 +2725,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, }