[coreboot] New patch to review for coreboot: 40da02d haswell: Add ULT device IDs

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2646

-gerrit

commit 40da02d497ab66a1ee52e7f6cb61106ca4b87378
Author: Duncan Laurie <dlaurie at chromium.org>
Date:   Mon Dec 17 11:22:57 2012 -0800

    haswell: Add ULT device IDs
    
    Device IDs for northbridge and GPU.
    
    Also mask off the lock bit in the memory map registers.
    
    Change-Id: I9a4955d4541b938285712e82dd0b1696fa272b63
    Signed-off-by: Duncan Laurie <dlaurie at chromium.org>
---
 src/northbridge/intel/haswell/gma.c         | 18 +++++++++++++++---
 src/northbridge/intel/haswell/northbridge.c | 12 +++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index 08c13df..03a8e79 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -659,9 +659,21 @@ static struct device_operations gma_func0_ops = {
 	.ops_pci		= &gma_pci_ops,
 };
 
-static const unsigned short pci_device_ids[] = { 0x0102, 0x0106, 0x010a, 0x0112,
-						 0x0116, 0x0122, 0x0126, 0x0166,
-						 0 };
+static const unsigned short pci_device_ids[] = {
+	0x0402, /* Desktop GT1 */
+	0x0412, /* Desktop GT2 */
+	0x0422, /* Desktop GT3 */
+	0x0406, /* Mobile GT1 */
+	0x0416, /* Mobile GT2 */
+	0x0426, /* Mobile GT3 */
+	0x0d16, /* Mobile 4+3 GT1 */
+	0x0d26, /* Mobile 4+3 GT2 */
+	0x0d36, /* Mobile 4+3 GT3 */
+	0x0a06, /* ULT GT1 */
+	0x0a16, /* ULT GT2 */
+	0x0a26, /* ULT GT3 */
+	0,
+};
 
 static const struct pci_driver pch_lpc __pci_driver = {
 	.ops	 = &gma_func0_ops,
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index 52b24ba..5731077 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -175,15 +175,15 @@ static void pci_domain_set_resources(device_t dev)
 	/* Top of Upper Usable DRAM, including remap */
 	touud = pci_read_config32(dev, TOUUD+4);
 	touud <<= 32;
-	touud |= pci_read_config32(dev, TOUUD);
+	touud |= pci_read_config32(dev, TOUUD) & ~1;
 
 	/* Top of Lower Usable DRAM */
-	tolud = pci_read_config32(dev, TOLUD);
+	tolud = pci_read_config32(dev, TOLUD) & ~1;
 
 	/* Top of Memory - does not account for any UMA */
 	tom = pci_read_config32(dev, 0xa4);
 	tom <<= 32;
-	tom |= pci_read_config32(dev, 0xa0);
+	tom |= pci_read_config32(dev, 0xa0) & ~1;
 
 	printk(BIOS_DEBUG, "TOUUD 0x%llx TOLUD 0x%08x TOM 0x%llx\n",
 	       touud, tolud, tom);
@@ -467,6 +467,12 @@ static const struct pci_driver mc_driver_hsw_mobile __pci_driver = {
 	.device = 0x0c04, /* Mobile Haswell */
 };
 
+static const struct pci_driver mc_driver_hsw_ult __pci_driver = {
+	.ops    = &mc_ops,
+	.vendor = PCI_VENDOR_ID_INTEL,
+	.device = 0x0a04, /* ULT Haswell */
+};
+
 static void cpu_bus_init(device_t dev)
 {
 	initialize_cpus(dev->link_list);