[coreboot-gerrit] Patch set updated for coreboot: nb/intel/pineview: Native VGA init (CRT)
Damien Zammit (damien@zamaudio.com)
gerrit at coreboot.org
Mon Jan 18 08:43:08 CET 2016
Damien Zammit (damien at zamaudio.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12921
-gerrit
commit 36e60fc71e9f40adc46730d0e4272e3bc12b72c1
Author: Damien Zammit <damien at zamaudio.com>
Date: Mon Jan 18 18:34:52 2016 +1100
nb/intel/pineview: Native VGA init (CRT)
VGA grub console works but display wobbles left/right
drm/i915 driver reports one error:
- [drm:i915_irq_handler] *ERROR* pipe A underrun
- Monitor does not display 1920x1080 after modeset
- Other resolutions look out of sync
Cause: suspect single bug in raminit (chipset init)
Change-Id: I2dcf59f8f30efe98f17a937bf98f5ab7221fc3ac
Signed-off-by: Damien Zammit <damien at zamaudio.com>
---
src/mainboard/intel/d510mo/mainboard.c | 7 --
src/northbridge/intel/pineview/Kconfig | 2 +
src/northbridge/intel/pineview/Makefile.inc | 1 +
src/northbridge/intel/pineview/early_init.c | 145 ++++++++++++++++++---------
src/northbridge/intel/pineview/northbridge.c | 99 +++++++-----------
src/northbridge/intel/pineview/pineview.h | 1 -
src/northbridge/intel/pineview/raminit.c | 22 ++--
7 files changed, 151 insertions(+), 126 deletions(-)
diff --git a/src/mainboard/intel/d510mo/mainboard.c b/src/mainboard/intel/d510mo/mainboard.c
index 3b0ef0f..94bee7e 100644
--- a/src/mainboard/intel/d510mo/mainboard.c
+++ b/src/mainboard/intel/d510mo/mainboard.c
@@ -16,16 +16,9 @@
#include <device/device.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
-#include <drivers/intel/gma/i915.h>
#include <pc80/mc146818rtc.h>
#include <device/pci.h>
-const struct i915_gpu_controller_info *
-intel_gma_get_controller_info(void)
-{
- return NULL;
-}
-
static void mainboard_enable(device_t dev)
{
dev->ops->init = NULL;
diff --git a/src/northbridge/intel/pineview/Kconfig b/src/northbridge/intel/pineview/Kconfig
index 767bb81..c6bbee1 100644
--- a/src/northbridge/intel/pineview/Kconfig
+++ b/src/northbridge/intel/pineview/Kconfig
@@ -26,6 +26,8 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
select HAVE_DEBUG_RAM_SETUP
select LAPIC_MONOTONIC_TIMER
select LATE_CBMEM_INIT
+ select VGA
+ select INTEL_EDID
config BOOTBLOCK_NORTHBRIDGE_INIT
string
diff --git a/src/northbridge/intel/pineview/Makefile.inc b/src/northbridge/intel/pineview/Makefile.inc
index f63018a..a4c08c8 100644
--- a/src/northbridge/intel/pineview/Makefile.inc
+++ b/src/northbridge/intel/pineview/Makefile.inc
@@ -18,6 +18,7 @@ ifeq ($(CONFIG_NORTHBRIDGE_INTEL_PINEVIEW),y)
ramstage-y += ram_calc.c
ramstage-y += northbridge.c
+ramstage-y += gma.c
ramstage-y += acpi.c
romstage-y += ram_calc.c
diff --git a/src/northbridge/intel/pineview/early_init.c b/src/northbridge/intel/pineview/early_init.c
index dcbdbb1..ddac31b 100644
--- a/src/northbridge/intel/pineview/early_init.c
+++ b/src/northbridge/intel/pineview/early_init.c
@@ -27,74 +27,84 @@
#define LPC PCI_DEV(0, 0x1f, 0)
#define D0F0 PCI_DEV(0, 0, 0)
-static void pineview_setup_bars(void)
+#define PCI_GCFC 0xf0
+#define MCH_GCFGC 0xc8c
+#define CRCLK_PINEVIEW 0x02
+#define CDCLK_PINEVIEW 0x10
+#define MCH_HPLLVCO 0xc38
+
+static void early_graphics_setup(void)
{
u8 reg8;
u16 reg16;
- u32 reg32;
- /* Setting up Southbridge. In the northbridge code. */
- printk(BIOS_DEBUG, "Setting up static southbridge registers...");
- pci_write_config32(LPC, RCBA, (uintptr_t)DEFAULT_RCBA | 1);
- pci_write_config32(LPC, PMBASE, DEFAULT_PMBASE | 1);
- pci_write_config8(LPC, 0x44 /* ACPI_CNTL */ , 0x80); /* Enable ACPI */
- pci_write_config32(LPC, GPIOBASE, DEFAULT_GPIOBASE | 1);
- pci_write_config8(LPC, 0x4c /* GC */ , 0x10); /* Enable GPIOs */
- pci_write_config32(LPC, 0x88, 0x007c0291);
+ pci_write_config8(D0F0, DEVEN, BOARD_DEVEN);
+ pci_write_config16(D0F0, GGC, 0x130); // 1MB GTT 8MB UMA
+
+ printk(BIOS_SPEW, "Set GFX clocks...");
+ reg16 = MCHBAR16(MCH_GCFGC);
+ MCHBAR16(MCH_GCFGC) = reg16 | (1 << 9);
+ reg16 &= ~0x7f;
+ reg16 |= CDCLK_PINEVIEW | CRCLK_PINEVIEW;
+ reg16 &= ~(1 << 9);
+ MCHBAR16(MCH_GCFGC) = reg16;
+
+ /* Graphics core */
+ reg8 = MCHBAR8(MCH_HPLLVCO);
+ reg8 &= 0x7;
+
+ reg16 = pci_read_config16(PCI_DEV(0,2,0), 0xcc) & ~0x1ff;
+
+ if (reg8 == 0x4) {
+ // 2666MHz
+ reg16 |= 0xad;
+ } else if (reg8 == 0) {
+ // 3200MHz
+ reg16 |= 0xa0;
+ } else if (reg8 == 1) {
+ // 4000MHz
+ reg16 |= 0xad;
+ }
+
+ pci_write_config16(PCI_DEV(0,2,0), 0xcc, reg16);
+
+ pci_write_config8(PCI_DEV(0,2,0), 0x62,
+ pci_read_config8(PCI_DEV(0,2,0), 0x62) & ~0x3);
+ pci_write_config8(PCI_DEV(0,2,0), 0x62,
+ pci_read_config8(PCI_DEV(0,2,0), 0x62) | 2);
+
+ /* LVDS from vendor bios */
+ MCHBAR32(0x3004) = 0x48000000;
+ MCHBAR32(0x3008) = 0xfffffe00;
- pci_write_config32(PCI_DEV(0, 0x1e, 0), 0x1b, 0x20);
- printk(BIOS_DEBUG, " done.\n");
+ /* Enable VGA */
+ MCHBAR32(0xb08) = MCHBAR32(0xb08) | (1 << 15);
- printk(BIOS_DEBUG, "Disabling Watchdog reboot...");
- RCBA32(GCS) = RCBA32(GCS) | (1 << 5); /* No reset */
- outw((1 << 11), DEFAULT_PMBASE | 0x60 | 0x08); /* halt timer */
- printk(BIOS_DEBUG, " done.\n");
+ /* Disable LVDS */
+ MCHBAR32(0xb08) = MCHBAR32(0xb08) | (3 << 25);
- /* Enable upper 128bytes of CMOS */
- RCBA32(0x3400) = (1 << 2);
+ MCHBAR32(0xff4) = 0x0c6db8b5f;
+ MCHBAR16(0xff8) = 0x24f;
- printk(BIOS_DEBUG, "Setting up static northbridge registers...");
- pci_write_config8(D0F0, 0x8, 0x69);
+ MCHBAR32(0xb08) = MCHBAR32(0xb08) & 0xffffff00;
+ MCHBAR32(0xb08) = MCHBAR32(0xb08) | (1 << 5);
- /* Set up all hardcoded northbridge BARs */
- pci_write_config32(D0F0, EPBAR, DEFAULT_EPBAR | 1);
- pci_write_config32(D0F0, MCHBAR, (uintptr_t)DEFAULT_MCHBAR | 1);
- pci_write_config32(D0F0, DMIBAR, (uintptr_t)DEFAULT_DMIBAR | 1);
- pci_write_config32(D0F0, PMIOBAR, (uintptr_t)0x400 | 1);
+ /* Legacy backlight control */
+ pci_write_config8(PCI_DEV(0, 2, 0), 0xf4, 0x4c);
+}
+static void early_misc_setup(void)
+{
+ u32 reg32;
reg32 = MCHBAR32(0x30);
MCHBAR32(0x30) = 0x21800;
DMIBAR32(0x2c) = 0x86000040;
- pci_write_config8(D0F0, DEVEN, 0x09);
pci_write_config32(PCI_DEV(0, 0x1e, 0), 0x18, 0x00020200);
pci_write_config32(PCI_DEV(0, 0x1e, 0), 0x18, 0x00000000);
- reg8 = pci_read_config8(D0F0, 0xe5); // 0x10
- reg16 = pci_read_config16(PCI_DEV(0, 0x02, 0), 0x0); // 0x8086
-
- reg16 = pci_read_config16(D0F0, GGC);
- pci_write_config16(D0F0, GGC, 0x130);
- reg16 = pci_read_config16(D0F0, GGC);
- pci_write_config16(D0F0, GGC, 0x130);
- MCHBAR8(0xb08) = 0x20;
- reg8 = pci_read_config8(D0F0, 0xe6); // 0x11
- reg16 = MCHBAR16(0xc8c);
- MCHBAR16(0xc8c) = reg16 | 0x0200;
- reg8 = MCHBAR8(0xc8c);
- MCHBAR8(0xc8c) = reg8;
- MCHBAR8(0xc8c) = 0x12;
- pci_write_config8(PCI_DEV(0, 0x02, 0), 0x62, 0x02);
- pci_write_config16(PCI_DEV(0, 0x02, 0), 0xe8, 0x8000);
- MCHBAR32(0x3004) = 0x48000000;
- MCHBAR32(0x3008) = 0xfffffe00;
- MCHBAR32(0xb08) = 0x06028220;
- MCHBAR32(0xff4) = 0xc6db8b5f;
- MCHBAR16(0xff8) = 0x024f;
- // PLL Voltage controlled oscillator
- //MCHBAR8(0xc38) = 0x04;
+ early_graphics_setup();
- pci_write_config16(PCI_DEV(0, 0x02, 0), 0xcc, 0x014d);
reg32 = MCHBAR32(0x40);
MCHBAR32(0x40) = 0x0;
reg32 = MCHBAR32(0x40);
@@ -138,6 +148,38 @@ static void pineview_setup_bars(void)
RCBA32(0x3144) = 0x32010237;
RCBA32(0x3146) = 0x01463201;
RCBA32(0x3148) = 0x146;
+}
+
+static void pineview_setup_bars(void)
+{
+ /* Setting up Southbridge. In the northbridge code. */
+ printk(BIOS_DEBUG, "Setting up static southbridge registers...");
+ pci_write_config32(LPC, RCBA, (uintptr_t)DEFAULT_RCBA | 1);
+ pci_write_config32(LPC, PMBASE, DEFAULT_PMBASE | 1);
+ pci_write_config8(LPC, 0x44 /* ACPI_CNTL */ , 0x80); /* Enable ACPI */
+ pci_write_config32(LPC, GPIOBASE, DEFAULT_GPIOBASE | 1);
+ pci_write_config8(LPC, 0x4c /* GC */ , 0x10); /* Enable GPIOs */
+ pci_write_config32(LPC, 0x88, 0x007c0291);
+
+ pci_write_config32(PCI_DEV(0, 0x1e, 0), 0x1b, 0x20);
+ printk(BIOS_DEBUG, " done.\n");
+
+ printk(BIOS_DEBUG, "Disabling Watchdog reboot...");
+ RCBA32(GCS) = RCBA32(GCS) | (1 << 5); /* No reset */
+ outw((1 << 11), DEFAULT_PMBASE | 0x60 | 0x08); /* halt timer */
+ printk(BIOS_DEBUG, " done.\n");
+
+ /* Enable upper 128bytes of CMOS */
+ RCBA32(0x3400) = (1 << 2);
+
+ printk(BIOS_DEBUG, "Setting up static northbridge registers...");
+ pci_write_config8(D0F0, 0x8, 0x69);
+
+ /* Set up all hardcoded northbridge BARs */
+ pci_write_config32(D0F0, EPBAR, DEFAULT_EPBAR | 1);
+ pci_write_config32(D0F0, MCHBAR, (uintptr_t)DEFAULT_MCHBAR | 1);
+ pci_write_config32(D0F0, DMIBAR, (uintptr_t)DEFAULT_DMIBAR | 1);
+ pci_write_config32(D0F0, PMIOBAR, (uintptr_t)0x400 | 1);
/* Set C0000-FFFFF to access RAM on both reads and writes */
pci_write_config8(D0F0, PAM0, 0x30);
@@ -160,6 +202,9 @@ void pineview_early_initialization(void)
/* Setup all BARs required for early PCIe and raminit */
pineview_setup_bars();
+ /* Miscellaneous set up */
+ early_misc_setup();
+
/* Change port80 to LPC */
RCBA32(GCS) &= (~0x04);
RCBA32(0x2010) |= (1 << 10);
diff --git a/src/northbridge/intel/pineview/northbridge.c b/src/northbridge/intel/pineview/northbridge.c
index 0f534dc..d2b1aa6 100644
--- a/src/northbridge/intel/pineview/northbridge.c
+++ b/src/northbridge/intel/pineview/northbridge.c
@@ -29,17 +29,35 @@
#include <cbmem.h>
#include <northbridge/intel/pineview/pineview.h>
-/* Reserve segments A and B:
+/* Reserve everything between A segment and 1MB:
*
* 0xa0000 - 0xbffff: legacy VGA
+ * 0xc0000 - 0xcffff: VGA OPROM (needed by kernel)
+ * 0xe0000 - 0xfffff: SeaBIOS, if used, otherwise DMI
*/
static const int legacy_hole_base_k = 0xa0000 / 1024;
static const int legacy_hole_size_k = 128;
+static void add_fixed_resources(device_t dev, int index)
+{
+ struct resource *resource;
+
+ resource = new_resource(dev, index++);
+ resource->base = (resource_t) 0xfed00000;
+ resource->size = (resource_t) 0x00100000;
+ resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE |
+ IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED;
+
+ mmio_resource(dev, index++, legacy_hole_base_k,
+ (0xc0000 >> 10) - legacy_hole_base_k);
+ reserved_ram_resource(dev, index++, 0xc0000 >> 10,
+ (0x100000 - 0xc0000) >> 10);
+}
+
static void mch_domain_read_resources(device_t dev)
{
u64 tom, touud;
- u32 tomk, tolud, uma_sizek = 0, usable_tomk;
+ u32 tomk, tolud;
u32 pcie_config_base, pcie_config_size;
pci_domain_read_resources(dev);
@@ -56,15 +74,13 @@ static void mch_domain_read_resources(device_t dev)
tom = pci_read_config16(dev, TOM) & 0x1ff;
tom <<= 27;
- printk(BIOS_DEBUG, "TOUUD 0x%llx TOLUD 0x%08x TOM 0x%llx\n",
+ printk(BIOS_DEBUG, "TOUUD 0x%llx TOLUD 0x%08x TOM 0x%llx ",
touud, tolud, tom);
tomk = tolud >> 10;
- /* Graphics memory comes next */
- const u16 ggc = pci_read_config16(dev, GGC);
-
/* Graphics memory */
+ const u16 ggc = pci_read_config16(dev, GGC);
const u32 gms_sizek = decode_igd_memory_size((ggc >> 4) & 0xf);
printk(BIOS_DEBUG, "%uM UMA", gms_sizek >> 10);
tomk -= gms_sizek;
@@ -74,45 +90,40 @@ static void mch_domain_read_resources(device_t dev)
printk(BIOS_DEBUG, " and %uM GTT\n", gsm_sizek >> 10);
tomk -= gsm_sizek;
- uma_sizek = gms_sizek + gsm_sizek;
+ const u32 tseg_basek = pci_read_config32(dev, TSEG) >> 10;
+ tomk -= 1024;
- usable_tomk = ALIGN_DOWN(tomk, 64 << 10);
- if (tomk - usable_tomk > (16 << 10))
- usable_tomk = tomk;
-
- printk(BIOS_INFO, "Available memory below 4GB: %uM\n", usable_tomk >> 10);
+ const u32 igd_basek = pci_read_config32(dev, GBSM) >> 10;
+ const u32 gtt_basek = pci_read_config32(dev, BGSM) >> 10;
/* Report the memory regions */
- ram_resource(dev, 3, 0, legacy_hole_base_k);
- ram_resource(dev, 4, legacy_hole_base_k + legacy_hole_size_k,
- (usable_tomk - (legacy_hole_base_k + legacy_hole_size_k)));
+ ram_resource(dev, 3, 0, 640);
+ ram_resource(dev, 4, 768, tomk - 768);
+ reserved_ram_resource(dev, 5, tseg_basek, 1024);
- mmio_resource(dev, 5, legacy_hole_base_k,
- (0xc0000 >> 10) - legacy_hole_base_k);
+ reserved_ram_resource(dev, 6, gtt_basek, gsm_sizek);
+ reserved_ram_resource(dev, 7, igd_basek, gms_sizek);
/*
- * If >= 4GB installed then memory from TOLUD to 4GB
+ * If > 4GB installed then memory from TOLUD to 4GB
* is remapped above TOM, TOUUD will account for both
*/
touud >>= 10; /* Convert to KB */
if (touud > 4096 * 1024) {
- ram_resource(dev, 6, 4096 * 1024, touud - (4096 * 1024));
+ ram_resource(dev, 8, 4096 * 1024, touud - (4096 * 1024));
printk(BIOS_INFO, "Available memory above 4GB: %lluM\n",
(touud >> 10) - 4096);
}
- printk(BIOS_DEBUG, "Adding UMA memory area base=0x%llx "
- "size=0x%llx\n", ((u64)tomk) << 10, ((u64)uma_sizek) << 10);
- /* Don't use uma_resource() as our UMA touches the PCI hole. */
- fixed_mem_resource(dev, 7, tomk, uma_sizek, IORESOURCE_RESERVE);
-
if (decode_pciebar(&pcie_config_base, &pcie_config_size)) {
printk(BIOS_DEBUG, "Adding PCIe config bar base=0x%08x "
- "size=0x%x\n", pcie_config_base, pcie_config_size);
- fixed_mem_resource(dev, 8, pcie_config_base >> 10,
+ "size=0x%x\n", pcie_config_base, pcie_config_size);
+ fixed_mem_resource(dev, 9, pcie_config_base >> 10,
pcie_config_size >> 10, IORESOURCE_RESERVE);
}
+ add_fixed_resources(dev, 10);
+
set_top_of_ram(tomk << 10);
}
@@ -121,7 +132,7 @@ static void mch_domain_set_resources(device_t dev)
struct resource *resource;
int i;
- for (i = 3; i < 9; ++i) {
+ for (i = 3; i < 13; ++i) {
/* Report read resources. */
resource = probe_resource(dev, i);
if (resource)
@@ -190,41 +201,7 @@ static void enable_dev(device_t dev)
}
}
-static void pineview_init(void *const chip_info)
-{
- int dev, fn;
-
- struct device *const d0f0 = dev_find_slot(0, 0);
-
- const struct {
- u8 fn;
- u8 bitbase;
- } intfunc[] = {
- {0, 0},
- {0, 1}, /* PEG */
- {1, 3}, /* IGD */
- {3, 6}, /* ME */
- };
-
- /* Hide internal functions based on devicetree info. */
- for (dev = 3; dev > 0; --dev) {
- for (fn = intfunc[dev].fn; fn >= 0; --fn) {
- const struct device *const d =
- dev_find_slot(0, PCI_DEVFN(dev, fn));
- if (!d || d->enabled) continue;
- const u32 deven = pci_read_config32(d0f0, DEVEN);
- pci_write_config32(d0f0, DEVEN, deven
- & ~(1 << (intfunc[dev].bitbase + fn)));
- }
- }
-
- const u32 deven = pci_read_config32(d0f0, DEVEN);
- if (!(deven & (0xf << 6)))
- pci_write_config32(d0f0, DEVEN, deven & ~(1 << 14));
-}
-
struct chip_operations northbridge_intel_pineview_ops = {
CHIP_NAME("Intel Pineview Northbridge")
.enable_dev = enable_dev,
- .init = pineview_init,
};
diff --git a/src/northbridge/intel/pineview/pineview.h b/src/northbridge/intel/pineview/pineview.h
index d807340..36f0c3c 100644
--- a/src/northbridge/intel/pineview/pineview.h
+++ b/src/northbridge/intel/pineview/pineview.h
@@ -92,7 +92,6 @@
#define GMADR 0x18
#define GTTADR 0x1c
#define BSM 0x5c
-#define GCFC 0xf0 /* Graphics Clock Frequency & Gating Control */
#define GPIO32(x) *((volatile u32 *)(DEFAULT_GPIOBASE + x))
diff --git a/src/northbridge/intel/pineview/raminit.c b/src/northbridge/intel/pineview/raminit.c
index a80aeac..a94a2eb 100644
--- a/src/northbridge/intel/pineview/raminit.c
+++ b/src/northbridge/intel/pineview/raminit.c
@@ -2057,8 +2057,9 @@ static void sdram_mmap_regs(struct sysinfo *s)
reclaimbase = 0;
reclaimlimit = 0;
ggc = pci_read_config16(PCI_DEV(0,0,0), GGC);
+ printk(BIOS_DEBUG, "GGC = 0x%04x\n", ggc);
gfxsize = ggc_to_uma[(ggc & 0xf0) >> 4];
- gttsize = ggc_to_gtt[(ggc & 0xc00) >> 8];
+ gttsize = ggc_to_gtt[(ggc & 0x300) >> 8];
tom = s->channel_capacity[0];
tsegsize = 0x1; // 1MB
@@ -2085,16 +2086,23 @@ static void sdram_mmap_regs(struct sysinfo *s)
tsegbase = gttbase - tsegsize;
/* Program the regs */
- pci_write_config16(PCI_DEV(0,0,0), 0xb0, (u16)(tolud << 4));
- pci_write_config16(PCI_DEV(0,0,0), 0xa0, (u16)(tom >> 6));
+ pci_write_config16(PCI_DEV(0,0,0), TOLUD, (u16)(tolud << 4));
+ pci_write_config16(PCI_DEV(0,0,0), TOM, (u16)(tom >> 6));
if (reclaim) {
pci_write_config16(PCI_DEV(0,0,0), 0x98, (u16)(reclaimbase >> 6));
pci_write_config16(PCI_DEV(0,0,0), 0x9a, (u16)(reclaimlimit >> 6));
}
- pci_write_config16(PCI_DEV(0,0,0), 0xa2, (u16)(touud));
- pci_write_config32(PCI_DEV(0,0,0), 0xa4, gfxbase << 20);
- pci_write_config32(PCI_DEV(0,0,0), 0xa8, gttbase << 20);
- pci_write_config32(PCI_DEV(0,0,0), 0xac, tsegbase << 20);
+ pci_write_config16(PCI_DEV(0,0,0), TOUUD, (u16)(touud));
+ pci_write_config32(PCI_DEV(0,0,0), GBSM, gfxbase << 20);
+ pci_write_config32(PCI_DEV(0,0,0), BGSM, gttbase << 20);
+ pci_write_config32(PCI_DEV(0,0,0), TSEG, tsegbase << 20);
+
+ printk(BIOS_DEBUG, "GBSM (igd) = verified %08x (written %08x)\n",
+ pci_read_config32(PCI_DEV(0,0,0), GBSM), gfxbase << 20);
+ printk(BIOS_DEBUG, "BGSM (gtt) = verified %08x (written %08x)\n",
+ pci_read_config32(PCI_DEV(0,0,0), BGSM), gttbase << 20);
+ printk(BIOS_DEBUG, "TSEG (smm) = verified %08x (written %08x)\n",
+ pci_read_config32(PCI_DEV(0,0,0), TSEG), tsegbase << 20);
}
static void sdram_enhancedmode(struct sysinfo *s)
More information about the coreboot-gerrit
mailing list