fix(pci-ids): keep ich9 sata at 1f.2 so ovmf-booted guests find the disk
This commit is contained in:
+5
-1
@@ -52,7 +52,11 @@ Against QEMU v11.1.2. Apply in numeric order.
|
||||
|
||||
The numbered patches are the default series and score 0/85 on both VMAware HEAD and v2.8.1.
|
||||
`03-pci-ids` scopes the virtio subsystem-id change so OVMF still binds virtio (its generic default
|
||||
goes to Intel/0, virtio devices keep the Red Hat subsystem ids their drivers and OVMF expect).
|
||||
goes to Intel/0, virtio devices keep the Red Hat subsystem ids their drivers and OVMF expect). It
|
||||
also leaves the ICH9 SATA controller at its stock slot `1f.2`: OVMF locates the q35 AHCI there, so
|
||||
moving it broke first-boot for SATA-booted UEFI guests (macOS fell through to PXE) while buying
|
||||
nothing for the score - the dummy-SATA FIRMWARE tell needs both the `D0FA` name and `_ADR 0x1F0002`,
|
||||
and device 31's functions emit neither. See `docs/ANALYSIS.md`.
|
||||
|
||||
`11-macos-cpu-hotplug` makes the series universal: macOS boots (it needs the `\_SB.CPUS.Cxxx`
|
||||
objects from `build_cpus_aml`) and both VMAware builds still read bare metal, with no opt-in. The
|
||||
|
||||
@@ -90,15 +90,6 @@ index 2c35dd0..2b6a39c 100644
|
||||
#define ICH9_LPC_NB_PIRQS 8 /* PCI A-H */
|
||||
|
||||
#define ICH9_LPC_PMBASE 0x40
|
||||
@@ -177,7 +177,7 @@ struct ICH9LPCState {
|
||||
#define ICH9_GPIO_GSI "gsi"
|
||||
|
||||
/* D31:F2 SATA Controller #1 */
|
||||
-#define ICH9_SATA1_DEV 31
|
||||
+#define ICH9_SATA1_DEV 20
|
||||
#define ICH9_SATA1_FUNC 2
|
||||
|
||||
/* D31:F0 power management I/O registers
|
||||
@@ -213,7 +213,7 @@ struct ICH9LPCState {
|
||||
/* D31:F3 SMBus controller */
|
||||
#define TYPE_ICH9_SMB_DEVICE "ICH9-SMB"
|
||||
|
||||
Reference in New Issue
Block a user