Change in coreboot[master]: soc/intel/skylake: Map VBIOS IDs

[Paul Menzel (Code Review)]

Paul Menzel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43853 )

Change subject: soc/intel/skylake: Map VBIOS IDs
......................................................................

soc/intel/skylake: Map VBIOS IDs

The extracted VBIOS Option ROM ships the same ID for several
generations, not matching the ID on the hardware resulting in a
mismatch, and coreboot does not run the Option ROM.

PCI ROM image, vendor ID 8086, device ID 0406,
    ID mismatch: vendor ID 8086, device ID 5916

Add the appropriate mappings.

TEST=coreboot runs the ROM on the TUXEDO Book BU1406.

Change-Id: Ia167d91627a7ff1b329ea75f150b3ce95c0acccb
Signed-off-by: Paul Menzel 
---
M src/soc/intel/skylake/graphics.c
1 file changed, 20 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/43853/1

diff --git a/src/soc/intel/skylake/graphics.c b/src/soc/intel/skylake/graphics.c
index 4ecf67a..f95ca6c 100644
--- a/src/soc/intel/skylake/graphics.c
+++ b/src/soc/intel/skylake/graphics.c
@@ -3,11 +3,13 @@
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <device/mmio.h>
+#include <device/pci_rom.h>
 #include <device/resource.h>
 #include <drivers/intel/gma/i915.h>
 #include <drivers/intel/gma/i915_reg.h>
 #include <intelblocks/graphics.h>
 #include <soc/ramstage.h>
+#include <soc/systemagent.h>
 #include <types.h>

void graphics_soc_init(struct device *dev)
@@ -76,3 +78,21 @@
    struct soc_intel_skylake_config *chip = device->chip_info;
    return &chip->gfx;
 }
+
+/*
+ * Some VGA option roms are used for several chipsets but they only have one PCI ID in their
+ * header. If we encounter such an option rom, we need to do the mapping ourselves.
+ */
+u32 map_oprom_vendev(u32 vendev)
+{
+	u32 new_vendev = vendev;
+
+	switch (vendev) {
+	case 0x80865916: /* PCI_DEVICE_ID_INTEL_KBL_GT2_SULTM */
+	case 0x80865917: /* PCI_DEVICE_ID_INTEL_KBL_GT2_SULTMR */
+		new_vendev = SA_IGD_OPROM_VENDEV;
+		break;
+	}
+
+	return new_vendev;
+}

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43853 )

Change subject: soc/intel/skylake: Map VBIOS IDs
......................................................................

Patch Set 2: Code-Review+1

[Felix Singer (Code Review)]

Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43853 )

Change subject: soc/intel/skylake: Map VBIOS IDs
......................................................................

Patch Set 11: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/43853 )

Change subject: soc/intel/skylake: Map VBIOS IDs
......................................................................

soc/intel/skylake: Map VBIOS IDs

The extracted VBIOS Option ROM ships the same ID for several
generations, not matching the ID on the hardware resulting in a
mismatch, and coreboot does not run the Option ROM.

PCI ROM image, vendor ID 8086, device ID 0406,
    ID mismatch: vendor ID 8086, device ID 5916

Add the appropriate mappings.

TEST=coreboot runs the ROM on the TUXEDO Book BU1406.

Change-Id: Ia167d91627a7ff1b329ea75f150b3ce95c0acccb
Signed-off-by: Paul Menzel 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43853
Reviewed-by:  Felix Singer 
Reviewed-by: Angel Pons 
Tested-by: build bot (Jenkins) 
---
M src/soc/intel/skylake/graphics.c
1 file changed, 20 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
   Felix Singer: Looks good to me, approved
  Angel Pons: Looks good to me, but someone else must approve

diff --git a/src/soc/intel/skylake/graphics.c b/src/soc/intel/skylake/graphics.c
index 4ecf67a..f95ca6c 100644
--- a/src/soc/intel/skylake/graphics.c
+++ b/src/soc/intel/skylake/graphics.c
@@ -3,11 +3,13 @@
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <device/mmio.h>
+#include <device/pci_rom.h>
 #include <device/resource.h>
 #include <drivers/intel/gma/i915.h>
 #include <drivers/intel/gma/i915_reg.h>
 #include <intelblocks/graphics.h>
 #include <soc/ramstage.h>
+#include <soc/systemagent.h>
 #include <types.h>

void graphics_soc_init(struct device *dev)
@@ -76,3 +78,21 @@
    struct soc_intel_skylake_config *chip = device->chip_info;
    return &chip->gfx;
 }
+
+/*
+ * Some VGA option roms are used for several chipsets but they only have one PCI ID in their
+ * header. If we encounter such an option rom, we need to do the mapping ourselves.
+ */
+u32 map_oprom_vendev(u32 vendev)
+{
+	u32 new_vendev = vendev;
+
+	switch (vendev) {
+	case 0x80865916: /* PCI_DEVICE_ID_INTEL_KBL_GT2_SULTM */
+	case 0x80865917: /* PCI_DEVICE_ID_INTEL_KBL_GT2_SULTMR */
+		new_vendev = SA_IGD_OPROM_VENDEV;
+		break;
+	}
+
+	return new_vendev;
+}