From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out01.mta.xmission.com (out01.mta.xmission.com [166.70.13.231]) by mx.groups.io with SMTP id smtpd.web10.45350.1606179462657018025 for ; Mon, 23 Nov 2020 16:57:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@bsdio.com header.s=xmission header.b=Ox1Cmlzd; spf=none, err=SPF record not found (domain: bsdio.com, ip: 166.70.13.231, mailfrom: rebecca@bsdio.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=bsdio.com; s=xmission; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=5CzRdMaNe/AtURV/isDfZ6A7JSjbFykVJqF/A3eAqFU=; b=Ox1CmlzdXlaMKQh1hZTbgta14w VIzc5TV7gbZ/S0jGd+hmNg/ogHDETCtqjU2rJUrSpAWrrAxp7Ii4qs1my6S99vHRfHfeTkIjYYzmv mtegH8qtB0xkJ/MaiGSXUuDoodFQ5EU6biC9P2gFaNHW86Fb0vEYmshzOXRcDr9KYa48=; Received: from in01.mta.xmission.com ([166.70.13.51]) by out01.mta.xmission.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1khMeL-00BcWk-Qs; Mon, 23 Nov 2020 17:57:41 -0700 Received: from mta4.zcs.xmission.com ([166.70.13.68]) by in01.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.87) (envelope-from ) id 1khMeL-0008Qu-2l; Mon, 23 Nov 2020 17:57:41 -0700 Received: from localhost (localhost [127.0.0.1]) by mta4.zcs.xmission.com (Postfix) with ESMTP id EB2EE500667; Mon, 23 Nov 2020 17:57:40 -0700 (MST) X-Amavis-Modified: Mail body modified (using disclaimer) - mta4.zcs.xmission.com Received: from mta4.zcs.xmission.com ([127.0.0.1]) by localhost (mta4.zcs.xmission.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id M6g3NFah2-uh; Mon, 23 Nov 2020 17:57:40 -0700 (MST) Received: from smic.int.bluestop.org (c-174-52-16-57.hsd1.ut.comcast.net [174.52.16.57]) by mta4.zcs.xmission.com (Postfix) with ESMTPSA id A8899500668; Mon, 23 Nov 2020 17:57:40 -0700 (MST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Peter Grehan Date: Mon, 23 Nov 2020 17:57:32 -0700 Message-Id: <20201124005733.18107-3-rebecca@bsdio.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201124005733.18107-1-rebecca@bsdio.com> References: <20201124005733.18107-1-rebecca@bsdio.com> MIME-Version: 1.0 X-XM-SPF: eid=1khMeL-0008Qu-2l;;;mid=<20201124005733.18107-3-rebecca@bsdio.com>;;;hst=in01.mta.xmission.com;;;ip=166.70.13.68;;;frm=rebecca@bsdio.com;;;spf=none X-SA-Exim-Connect-IP: 166.70.13.68 X-SA-Exim-Mail-From: rebecca@bsdio.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa06.xmission.com X-Spam-Level: X-Spam-Status: No, score=0.5 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE,XMSubLong autolearn=disabled version=3.4.2 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5000] * 0.7 XMSubLong Long Subject * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa06 1397; IP=ok Body=1 Fuz1=1] [Fuz2=1] X-Spam-DCC: XMission; sa06 1397; IP=ok Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;devel@edk2.groups.io X-Spam-Relay-Country: X-Spam-Timing: total 363 ms - load_scoreonly_sql: 0.05 (0.0%), signal_user_changed: 11 (3.1%), b_tie_ro: 10 (2.6%), parse: 1.03 (0.3%), extract_message_metadata: 13 (3.7%), get_uri_detail_list: 1.48 (0.4%), tests_pri_-1000: 15 (4.1%), tests_pri_-950: 1.27 (0.4%), tests_pri_-900: 1.01 (0.3%), tests_pri_-90: 111 (30.7%), check_bayes: 108 (29.8%), b_tokenize: 8 (2.1%), b_tok_get_all: 6 (1.8%), b_comp_prob: 1.91 (0.5%), b_tok_touch_all: 88 (24.3%), b_finish: 0.85 (0.2%), tests_pri_0: 197 (54.3%), check_dkim_signature: 0.55 (0.2%), check_dkim_adsp: 2.3 (0.6%), poll_dns_idle: 0.69 (0.2%), tests_pri_10: 2.1 (0.6%), tests_pri_500: 7 (1.9%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH v2 2/3] OvmfPkg/Bhyve: Add support for the AMD host bridge X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Thu, 05 May 2016 13:38:54 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Content-Transfer-Encoding: 8bit On bhyve, either an Intel or AMD host bridge can be specified, with the default being Intel. Both are identical, except the AMD one uses a PCI vendor ID of AMD. Signed-off-by: Rebecca Cran Reviewed-by: Peter Grehan Acked-by: Laszlo Ersek --- OvmfPkg/Bhyve/PlatformPei/Platform.c | 3 ++- OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/Bhyve/PlatformPei/Platform.c b/OvmfPkg/Bhyve/PlatformPei/Platform.c index 11658d478c3b..9f1900626d6b 100644 --- a/OvmfPkg/Bhyve/PlatformPei/Platform.c +++ b/OvmfPkg/Bhyve/PlatformPei/Platform.c @@ -349,7 +349,8 @@ MiscInitialization ( // Determine platform type and save Host Bridge DID to PCD // switch (mHostBridgeDevId) { - case 0x1275: // BHYVE + case 0x7432: // BHYVE (AMD hostbridge) + case 0x1275: // BHYVE (Intel hostbridge) case INTEL_82441_DEVICE_ID: PmCmd = POWER_MGMT_REGISTER_PIIX4 (PCI_COMMAND_OFFSET); Pmba = POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA); diff --git a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c index 3b94630ac732..eaade4adeae2 100644 --- a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c @@ -1066,7 +1066,8 @@ SetPciIntLine ( // and should match SeaBIOS src/fw/pciinit.c *_pci_slot_get_irq() // switch (mHostBridgeDevId) { - case 0x1275: // BHYVE + case 0x7432: // BHYVE (AMD hostbridge) + case 0x1275: // BHYVE (Intel hostbridge) case INTEL_82441_DEVICE_ID: Idx -= 1; break; @@ -1143,7 +1144,8 @@ PciAcpiInitialization ( // mHostBridgeDevId = PcdGet16 (PcdOvmfHostBridgePciDevId); switch (mHostBridgeDevId) { - case 0x1275: // BHYVE + case 0x7432: // BHYVE (AMD hostbridge) + case 0x1275: // BHYVE (Intel hostbridge) case INTEL_82441_DEVICE_ID: Pmba = POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA); // -- 2.29.2