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>

diff --git a/OvmfPkg/Bhyve/PlatformPei/Platform.c b/OvmfPkg/Bhyve/PlatformPei/Platform.c
index 11658d478c3b3f939c4f9990caa7c1a6d47ba618..9f1900626d6bda07202e0cdc0620c4213925f273 100644 (file)
--- 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\r
   //\r
   switch (mHostBridgeDevId) {\r
-    case 0x1275: // BHYVE\r
+    case 0x7432: // BHYVE (AMD hostbridge)\r
+    case 0x1275: // BHYVE (Intel hostbridge)\r
     case INTEL_82441_DEVICE_ID:\r
       PmCmd      = POWER_MGMT_REGISTER_PIIX4 (PCI_COMMAND_OFFSET);\r
       Pmba       = POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA);\r

diff --git a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
index 3b94630ac732a7a076eaffcf556cb442920b3cb8..eaade4adeae2e0d15a7a0a1f4c7f653dbf2575ff 100644 (file)
--- 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()\r
     //\r
     switch (mHostBridgeDevId) {\r
-      case 0x1275: // BHYVE\r
+      case 0x7432: // BHYVE (AMD hostbridge)\r
+      case 0x1275: // BHYVE (Intel hostbridge)\r
       case INTEL_82441_DEVICE_ID:\r
         Idx -= 1;\r
         break;\r
@@ -1143,7 +1144,8 @@ PciAcpiInitialization (
   //\r
   mHostBridgeDevId = PcdGet16 (PcdOvmfHostBridgePciDevId);\r
   switch (mHostBridgeDevId) {\r
-    case 0x1275: // BHYVE\r
+    case 0x7432: // BHYVE (AMD hostbridge)\r
+    case 0x1275: // BHYVE (Intel hostbridge)\r
     case INTEL_82441_DEVICE_ID:\r
       Pmba = POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA);\r
       //\r