From patchwork Mon Jun 24 13:14:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Shiyuan X-Patchwork-Id: 13709459 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8C0E9C2BD09 for ; Mon, 24 Jun 2024 13:15:13 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sLjXF-0001VU-QY; Mon, 24 Jun 2024 09:15:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sLjXE-0001Uz-9e for qemu-devel@nongnu.org; Mon, 24 Jun 2024 09:15:04 -0400 Received: from mx22.baidu.com ([220.181.50.185] helo=baidu.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sLjXB-0004x4-2X for qemu-devel@nongnu.org; Mon, 24 Jun 2024 09:15:04 -0400 To: CC: , , Shiyuan Gao Subject: [PATCH 1/1] hw/i386/acpi-build: add OSHP method support for SHPC driver load Date: Mon, 24 Jun 2024 21:14:26 +0800 Message-ID: <20240624131426.77231-1-gaoshiyuan@baidu.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) MIME-Version: 1.0 X-Originating-IP: [10.127.73.8] X-ClientProxiedBy: BC-Mail-Ex11.internal.baidu.com (172.31.51.51) To bjkjy-mail-ex26.internal.baidu.com (172.31.50.42) X-FEAS-Client-IP: 10.127.64.34 X-FE-Policy-ID: 52:10:53:SYSTEM Received-SPF: pass client-ip=220.181.50.185; envelope-from=gaoshiyuan@baidu.com; helo=baidu.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Shiyuan Gao X-Patchwork-Original-From: Shiyuan Gao via From: Gao Shiyuan Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org SHPC driver will be loaded fail in i440fx platform, the dmesg shows that OS cannot get control of SHPC hotplug and hotplug device to the PCI bridge will fail when we use SHPC Native type: [3.336059] shpchp 0000:00:03.0: Requesting control of SHPC hotplug via OSHP (\_SB_.PCI0.S28_) [3.337408] shpchp 0000:00:03.0: Requesting control of SHPC hotplug via OSHP (\_SB_.PCI0) [3.338710] shpchp 0000:00:03.0: Cannot get control of SHPC hotplug Add OSHP method support for SHPC driver load, the hotplug device to the PCI bridge will success when we use SHPC Native type. [1.703975] shpchp 0000:00:03.0: Requesting control of SHPC hotplug via OSHP (\_SB_.PCI0.S18_) [1.704934] shpchp 0000:00:03.0: Requesting control of SHPC hotplug via OSHP (\_SB_.PCI0) [1.705855] shpchp 0000:00:03.0: Gained control of SHPC hotplug (\_SB_.PCI0) [1.707054] shpchp 0000:00:03.0: HPC vendor_id 1b36 device_id 1 ss_vid 0 ss_did 0 According to the acpi_pcihp, the OSHP method don't need parameter and return value now. shpc_probe --> acpi_get_hp_hw_control_from_firmware --> acpi_run_oshp --> status = acpi_evaluate_object(handle, METHOD_NAME_OSHP, NULL, NULL); Signed-off-by: Shiyuan Gao --- hw/i386/acpi-build.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index f4e366f64f..79622e6939 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1412,6 +1412,18 @@ static void build_acpi0017(Aml *table) aml_append(table, scope); } +static Aml *build_oshp_method(void) +{ + Aml *method; + + /* + * Request control of SHPC hotplug via OSHP method, + * no need parameter and return value in acpi_pcihp. + */ + method = aml_method("OSHP", 0, AML_NOTSERIALIZED); + return method; +} + static void build_dsdt(GArray *table_data, BIOSLinker *linker, AcpiPmInfo *pm, AcpiMiscInfo *misc, @@ -1452,6 +1464,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A03"))); aml_append(dev, aml_name_decl("_UID", aml_int(pcmc->pci_root_uid))); aml_append(dev, aml_pci_edsm()); + aml_append(dev, build_oshp_method()); aml_append(sb_scope, dev); aml_append(dsdt, sb_scope); @@ -1586,6 +1599,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dev, build_q35_osc_method(true)); } else { aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A03"))); + aml_append(dev, build_oshp_method()); } if (numa_node != NUMA_NODE_UNASSIGNED) {