summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRebecca Cran <rebecca@bsdio.com>2020-11-23 17:57:32 -0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2020-11-27 16:48:47 +0000
commit029677943f04692d6271fd4cbb70d0972dc878d6 (patch)
treecbd03e4c83b387111d954f26ea32efaaf4dbb66c
parent337fda061c7353c6acbf1d2525f42a60c3f107bc (diff)
downloadedk2-029677943f04692d6271fd4cbb70d0972dc878d6.zip
edk2-029677943f04692d6271fd4cbb70d0972dc878d6.tar.gz
edk2-029677943f04692d6271fd4cbb70d0972dc878d6.tar.bz2
OvmfPkg/Bhyve: Add support for the AMD host bridge
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 <rebecca@bsdio.com> Reviewed-by: Peter Grehan <grehan@freebsd.org> Acked-by: Laszlo Ersek <lersek@redhat.com> Message-Id: <20201124005733.18107-3-rebecca@bsdio.com>
-rw-r--r--OvmfPkg/Bhyve/PlatformPei/Platform.c3
-rw-r--r--OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/OvmfPkg/Bhyve/PlatformPei/Platform.c b/OvmfPkg/Bhyve/PlatformPei/Platform.c
index 11658d4..9f19006 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 3b94630..eaade4a 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);
//