summaryrefslogtreecommitdiff
path: root/src/northbridge
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2013-01-10 13:23:04 -0800
committerRonald G. Minnich <rminnich@gmail.com>2013-03-14 05:03:29 +0100
commit67113e95cf054e051c63e813814b91f909798ac9 (patch)
tree2e92b31cd542aead138eb8a8a056686293c36113 /src/northbridge
parent7302d1e4cec1149a3da61824497160cea514e2ca (diff)
downloadcoreboot-67113e95cf054e051c63e813814b91f909798ac9.tar.xz
haswell: Update GPU power management setup
This is the steps outlined in the BWG. It seems this is a lot simpler now (so far) which is good. To test, boot to chromeos with 3.7 kernel + i915.preliminary_hw_support=1 and see that the i915 driver complains a lot less than before and that a splashscreen is displayed. Change-Id: I722c90ecd351860949cedab24533f6c10e5b90e5 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: http://review.coreboot.org/2696 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/northbridge')
-rw-r--r--src/northbridge/intel/haswell/gma.c494
1 files changed, 29 insertions, 465 deletions
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index 08c13df8bc..55c0d755cb 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -27,281 +27,6 @@
#include "chip.h"
#include "haswell.h"
-struct gt_powermeter {
- u16 reg;
- u32 value;
-};
-
-static const struct gt_powermeter snb_pm_gt1[] = {
- { 0xa200, 0xcc000000 },
- { 0xa204, 0x07000040 },
- { 0xa208, 0x0000fe00 },
- { 0xa20c, 0x00000000 },
- { 0xa210, 0x17000000 },
- { 0xa214, 0x00000021 },
- { 0xa218, 0x0817fe19 },
- { 0xa21c, 0x00000000 },
- { 0xa220, 0x00000000 },
- { 0xa224, 0xcc000000 },
- { 0xa228, 0x07000040 },
- { 0xa22c, 0x0000fe00 },
- { 0xa230, 0x00000000 },
- { 0xa234, 0x17000000 },
- { 0xa238, 0x00000021 },
- { 0xa23c, 0x0817fe19 },
- { 0xa240, 0x00000000 },
- { 0xa244, 0x00000000 },
- { 0xa248, 0x8000421e },
- { 0 }
-};
-
-static const struct gt_powermeter snb_pm_gt2[] = {
- { 0xa200, 0x330000a6 },
- { 0xa204, 0x402d0031 },
- { 0xa208, 0x00165f83 },
- { 0xa20c, 0xf1000000 },
- { 0xa210, 0x00000000 },
- { 0xa214, 0x00160016 },
- { 0xa218, 0x002a002b },
- { 0xa21c, 0x00000000 },
- { 0xa220, 0x00000000 },
- { 0xa224, 0x330000a6 },
- { 0xa228, 0x402d0031 },
- { 0xa22c, 0x00165f83 },
- { 0xa230, 0xf1000000 },
- { 0xa234, 0x00000000 },
- { 0xa238, 0x00160016 },
- { 0xa23c, 0x002a002b },
- { 0xa240, 0x00000000 },
- { 0xa244, 0x00000000 },
- { 0xa248, 0x8000421e },
- { 0 }
-};
-
-static const struct gt_powermeter ivb_pm_gt1[] = {
- { 0xa800, 0x00000000 },
- { 0xa804, 0x00021c00 },
- { 0xa808, 0x00000403 },
- { 0xa80c, 0x02001700 },
- { 0xa810, 0x05000200 },
- { 0xa814, 0x00000000 },
- { 0xa818, 0x00690500 },
- { 0xa81c, 0x0000007f },
- { 0xa820, 0x01002501 },
- { 0xa824, 0x00000300 },
- { 0xa828, 0x01000331 },
- { 0xa82c, 0x0000000c },
- { 0xa830, 0x00010016 },
- { 0xa834, 0x01100101 },
- { 0xa838, 0x00010103 },
- { 0xa83c, 0x00041300 },
- { 0xa840, 0x00000b30 },
- { 0xa844, 0x00000000 },
- { 0xa848, 0x7f000000 },
- { 0xa84c, 0x05000008 },
- { 0xa850, 0x00000001 },
- { 0xa854, 0x00000004 },
- { 0xa858, 0x00000007 },
- { 0xa85c, 0x00000000 },
- { 0xa860, 0x00010000 },
- { 0xa248, 0x0000221e },
- { 0xa900, 0x00000000 },
- { 0xa904, 0x00001c00 },
- { 0xa908, 0x00000000 },
- { 0xa90c, 0x06000000 },
- { 0xa910, 0x09000200 },
- { 0xa914, 0x00000000 },
- { 0xa918, 0x00590000 },
- { 0xa91c, 0x00000000 },
- { 0xa920, 0x04002501 },
- { 0xa924, 0x00000100 },
- { 0xa928, 0x03000410 },
- { 0xa92c, 0x00000000 },
- { 0xa930, 0x00020000 },
- { 0xa934, 0x02070106 },
- { 0xa938, 0x00010100 },
- { 0xa93c, 0x00401c00 },
- { 0xa940, 0x00000000 },
- { 0xa944, 0x00000000 },
- { 0xa948, 0x10000e00 },
- { 0xa94c, 0x02000004 },
- { 0xa950, 0x00000001 },
- { 0xa954, 0x00000004 },
- { 0xa960, 0x00060000 },
- { 0xaa3c, 0x00001c00 },
- { 0xaa54, 0x00000004 },
- { 0xaa60, 0x00060000 },
- { 0 }
-};
-
-static const struct gt_powermeter ivb_pm_gt2[] = {
- { 0xa800, 0x10000000 },
- { 0xa804, 0x00033800 },
- { 0xa808, 0x00000902 },
- { 0xa80c, 0x0c002f00 },
- { 0xa810, 0x12000400 },
- { 0xa814, 0x00000000 },
- { 0xa818, 0x00d20800 },
- { 0xa81c, 0x00000002 },
- { 0xa820, 0x03004b02 },
- { 0xa824, 0x00000600 },
- { 0xa828, 0x07000773 },
- { 0xa82c, 0x00000000 },
- { 0xa830, 0x00010032 },
- { 0xa834, 0x1520040d },
- { 0xa838, 0x00020105 },
- { 0xa83c, 0x00083700 },
- { 0xa840, 0x0000151d },
- { 0xa844, 0x00000000 },
- { 0xa848, 0x20001b00 },
- { 0xa84c, 0x0a000010 },
- { 0xa850, 0x00000000 },
- { 0xa854, 0x00000008 },
- { 0xa858, 0x00000008 },
- { 0xa85c, 0x00000000 },
- { 0xa860, 0x00020000 },
- { 0xa248, 0x0000221e },
- { 0xa900, 0x00000000 },
- { 0xa904, 0x00003500 },
- { 0xa908, 0x00000000 },
- { 0xa90c, 0x0c000000 },
- { 0xa910, 0x12000500 },
- { 0xa914, 0x00000000 },
- { 0xa918, 0x00b20000 },
- { 0xa91c, 0x00000000 },
- { 0xa920, 0x08004b02 },
- { 0xa924, 0x00000200 },
- { 0xa928, 0x07000820 },
- { 0xa92c, 0x00000000 },
- { 0xa930, 0x00030000 },
- { 0xa934, 0x050f020d },
- { 0xa938, 0x00020300 },
- { 0xa93c, 0x00903900 },
- { 0xa940, 0x00000000 },
- { 0xa944, 0x00000000 },
- { 0xa948, 0x20001b00 },
- { 0xa94c, 0x0a000010 },
- { 0xa950, 0x00000000 },
- { 0xa954, 0x00000008 },
- { 0xa960, 0x00110000 },
- { 0xaa3c, 0x00003900 },
- { 0xaa54, 0x00000008 },
- { 0xaa60, 0x00110000 },
- { 0 }
-};
-
-static const struct gt_powermeter ivb_pm_gt2_17w[] = {
- { 0xa800, 0x20000000 },
- { 0xa804, 0x000e3800 },
- { 0xa808, 0x00000806 },
- { 0xa80c, 0x0c002f00 },
- { 0xa810, 0x0c000800 },
- { 0xa814, 0x00000000 },
- { 0xa818, 0x00d20d00 },
- { 0xa81c, 0x000000ff },
- { 0xa820, 0x03004b02 },
- { 0xa824, 0x00000600 },
- { 0xa828, 0x07000773 },
- { 0xa82c, 0x00000000 },
- { 0xa830, 0x00020032 },
- { 0xa834, 0x1520040d },
- { 0xa838, 0x00020105 },
- { 0xa83c, 0x00083700 },
- { 0xa840, 0x000016ff },
- { 0xa844, 0x00000000 },
- { 0xa848, 0xff000000 },
- { 0xa84c, 0x0a000010 },
- { 0xa850, 0x00000002 },
- { 0xa854, 0x00000008 },
- { 0xa858, 0x0000000f },
- { 0xa85c, 0x00000000 },
- { 0xa860, 0x00020000 },
- { 0xa248, 0x0000221e },
- { 0xa900, 0x00000000 },
- { 0xa904, 0x00003800 },
- { 0xa908, 0x00000000 },
- { 0xa90c, 0x0c000000 },
- { 0xa910, 0x12000800 },
- { 0xa914, 0x00000000 },
- { 0xa918, 0x00b20000 },
- { 0xa91c, 0x00000000 },
- { 0xa920, 0x08004b02 },
- { 0xa924, 0x00000300 },
- { 0xa928, 0x01000820 },
- { 0xa92c, 0x00000000 },
- { 0xa930, 0x00030000 },
- { 0xa934, 0x15150406 },
- { 0xa938, 0x00020300 },
- { 0xa93c, 0x00903900 },
- { 0xa940, 0x00000000 },
- { 0xa944, 0x00000000 },
- { 0xa948, 0x20001b00 },
- { 0xa94c, 0x0a000010 },
- { 0xa950, 0x00000000 },
- { 0xa954, 0x00000008 },
- { 0xa960, 0x00110000 },
- { 0xaa3c, 0x00003900 },
- { 0xaa54, 0x00000008 },
- { 0xaa60, 0x00110000 },
- { 0 }
-};
-
-static const struct gt_powermeter ivb_pm_gt2_35w[] = {
- { 0xa800, 0x00000000 },
- { 0xa804, 0x00030400 },
- { 0xa808, 0x00000806 },
- { 0xa80c, 0x0c002f00 },
- { 0xa810, 0x0c000300 },
- { 0xa814, 0x00000000 },
- { 0xa818, 0x00d20d00 },
- { 0xa81c, 0x000000ff },
- { 0xa820, 0x03004b02 },
- { 0xa824, 0x00000600 },
- { 0xa828, 0x07000773 },
- { 0xa82c, 0x00000000 },
- { 0xa830, 0x00020032 },
- { 0xa834, 0x1520040d },
- { 0xa838, 0x00020105 },
- { 0xa83c, 0x00083700 },
- { 0xa840, 0x000016ff },
- { 0xa844, 0x00000000 },
- { 0xa848, 0xff000000 },
- { 0xa84c, 0x0a000010 },
- { 0xa850, 0x00000001 },
- { 0xa854, 0x00000008 },
- { 0xa858, 0x00000008 },
- { 0xa85c, 0x00000000 },
- { 0xa860, 0x00020000 },
- { 0xa248, 0x0000221e },
- { 0xa900, 0x00000000 },
- { 0xa904, 0x00003800 },
- { 0xa908, 0x00000000 },
- { 0xa90c, 0x0c000000 },
- { 0xa910, 0x12000800 },
- { 0xa914, 0x00000000 },
- { 0xa918, 0x00b20000 },
- { 0xa91c, 0x00000000 },
- { 0xa920, 0x08004b02 },
- { 0xa924, 0x00000300 },
- { 0xa928, 0x01000820 },
- { 0xa92c, 0x00000000 },
- { 0xa930, 0x00030000 },
- { 0xa934, 0x15150406 },
- { 0xa938, 0x00020300 },
- { 0xa93c, 0x00903900 },
- { 0xa940, 0x00000000 },
- { 0xa944, 0x00000000 },
- { 0xa948, 0x20001b00 },
- { 0xa94c, 0x0a000010 },
- { 0xa950, 0x00000000 },
- { 0xa954, 0x00000008 },
- { 0xa960, 0x00110000 },
- { 0xaa3c, 0x00003900 },
- { 0xaa54, 0x00000008 },
- { 0xaa60, 0x00110000 },
- { 0 }
-};
-
/* 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 ourselfes
@@ -338,12 +63,6 @@ static inline void gtt_write(u32 reg, u32 data)
write32(gtt_res->base + reg, data);
}
-static inline void gtt_write_powermeter(const struct gt_powermeter *pm)
-{
- for (; pm && pm->reg; pm++)
- gtt_write(pm->reg, pm->value);
-}
-
#define GTT_RETRY 1000
static int gtt_poll(u32 reg, u32 mask, u32 value)
{
@@ -363,191 +82,45 @@ static int gtt_poll(u32 reg, u32 mask, u32 value)
static void gma_pm_init_pre_vbios(struct device *dev)
{
- u32 reg32;
-
printk(BIOS_DEBUG, "GT Power Management Init\n");
gtt_res = find_resource(dev, PCI_BASE_ADDRESS_0);
if (!gtt_res || !gtt_res->base)
return;
- if (bridge_silicon_revision() < IVB_STEP_C0) {
- /* 1: Enable force wake */
- gtt_write(0xa18c, 0x00000001);
- gtt_poll(0x130090, (1 << 0), (1 << 0));
- } else {
- gtt_write(0xa180, 1 << 5);
- gtt_write(0xa188, 0xffff0001);
- gtt_poll(0x130040, (1 << 0), (1 << 0));
- }
+ /*
+ * Enable RC6
+ */
- if ((bridge_silicon_revision() & BASE_REV_MASK) == BASE_REV_SNB) {
- /* 1d: Set GTT+0x42004 [15:14]=11 (SnB C1+) */
- reg32 = gtt_read(0x42004);
- reg32 |= (1 << 14) | (1 << 15);
- gtt_write(0x42004, reg32);
- }
+ /* Enable Force Wake */
+ gtt_write(0x0a180, 1 << 5);
+ gtt_write(0x0a188, 0x00010001);
+ gtt_poll(0x130044, 1 << 0, 1 << 0);
- if (bridge_silicon_revision() >= IVB_STEP_A0) {
- /* Display Reset Acknowledge Settings */
- reg32 = gtt_read(0x45010);
- reg32 |= (1 << 1) | (1 << 0);
- gtt_write(0x45010, reg32);
- }
-
- /* 2: Get GT SKU from GTT+0x911c[13] */
- reg32 = gtt_read(0x911c);
- if ((bridge_silicon_revision() & BASE_REV_MASK) == BASE_REV_SNB) {
- if (reg32 & (1 << 13)) {
- printk(BIOS_DEBUG, "SNB GT1 Power Meter Weights\n");
- gtt_write_powermeter(snb_pm_gt1);
- } else {
- printk(BIOS_DEBUG, "SNB GT2 Power Meter Weights\n");
- gtt_write_powermeter(snb_pm_gt2);
- }
- } else {
- u32 unit = MCHBAR32(0x5938) & 0xf;
-
- if (reg32 & (1 << 13)) {
- /* GT1 SKU */
- printk(BIOS_DEBUG, "IVB GT1 Power Meter Weights\n");
- gtt_write_powermeter(ivb_pm_gt1);
- } else {
- /* GT2 SKU */
- u32 tdp = MCHBAR32(0x5930) & 0x7fff;
- tdp /= (1 << unit);
-
- if (tdp <= 17) {
- /* <=17W ULV */
- printk(BIOS_DEBUG, "IVB GT2 17W "
- "Power Meter Weights\n");
- gtt_write_powermeter(ivb_pm_gt2_17w);
- } else if ((tdp >= 25) && (tdp <= 35)) {
- /* 25W-35W */
- printk(BIOS_DEBUG, "IVB GT2 25W-35W "
- "Power Meter Weights\n");
- gtt_write_powermeter(ivb_pm_gt2_35w);
- } else {
- /* All others */
- printk(BIOS_DEBUG, "IVB GT2 35W "
- "Power Meter Weights\n");
- gtt_write_powermeter(ivb_pm_gt2_35w);
- }
- }
- }
+ /* Enable counters and lock */
+ gtt_write(0x0a248, 0x80000016);
+ gtt_write(0x0a000, 0x00070020);
+ gtt_write(0x0a180, 0xc5000020);
- /* 3: Gear ratio map */
- gtt_write(0xa004, 0x00000010);
-
- /* 4: GFXPAUSE */
- gtt_write(0xa000, 0x00070020);
-
- /* 5: Dynamic EU trip control */
- gtt_write(0xa080, 0x00000004);
-
- /* 6: ECO bits */
- reg32 = gtt_read(0xa180);
- reg32 |= (1 << 26) | (1 << 31);
- /* (bit 20=1 for SNB step D1+ / IVB A0+) */
- if (bridge_silicon_revision() >= SNB_STEP_D1)
- reg32 |= (1 << 20);
- gtt_write(0xa180, reg32);
-
- /* 6a: for SnB step D2+ only */
- if (((bridge_silicon_revision() & BASE_REV_MASK) == BASE_REV_SNB) &&
- (bridge_silicon_revision() >= SNB_STEP_D2)) {
- reg32 = gtt_read(0x9400);
- reg32 |= (1 << 7);
- gtt_write(0x9400, reg32);
-
- reg32 = gtt_read(0x941c);
- reg32 &= 0xf;
- reg32 |= (1 << 1);
- gtt_write(0x941c, reg32);
- gtt_poll(0x941c, (1 << 1), (0 << 1));
- }
+ /* Enable DOP clock gating */
+ gtt_write(0x09424, 0x00000001);
- if ((bridge_silicon_revision() & BASE_REV_MASK) == BASE_REV_IVB) {
- reg32 = gtt_read(0x907c);
- reg32 |= (1 << 16);
- gtt_write(0x907c, reg32);
+ /* Enable unit level clock gating */
+ gtt_write(0x09400, 0x00000080);
+ gtt_write(0x09404, 0x40401000);
+ gtt_write(0x09408, 0x00000000);
+ gtt_write(0x0940c, 0x02000001);
- /* 6b: Clocking reset controls */
- gtt_write(0x9424, 0x00000001);
- } else {
- /* 6b: Clocking reset controls */
- gtt_write(0x9424, 0x00000000);
- }
+ /* Configure max ilde count */
+ gtt_write(0x02054, 0x0000000a);
+ gtt_write(0x12054, 0x0000000a);
+ gtt_write(0x22054, 0x0000000a);
- /* 7 */
- if (gtt_poll(0x138124, (1 << 31), (0 << 31))) {
- gtt_write(0x138128, 0x00000029); /* Mailbox Data */
- gtt_write(0x138124, 0x80000004); /* Mailbox Cmd for RC6 VID */
- if (gtt_poll(0x138124, (1 << 31), (0 << 31)))
- gtt_write(0x138124, 0x8000000a);
- gtt_poll(0x138124, (1 << 31), (0 << 31));
- }
+ gtt_write(0x0a008, 0x10000000);
+ gtt_write(0x0a024, 0x00000b92);
- /* 8 */
- gtt_write(0xa090, 0x00000000); /* RC Control */
- gtt_write(0xa098, 0x03e80000); /* RC1e Wake Rate Limit */
- gtt_write(0xa09c, 0x0028001e); /* RC6/6p Wake Rate Limit */
- gtt_write(0xa0a0, 0x0000001e); /* RC6pp Wake Rate Limit */
- gtt_write(0xa0a8, 0x0001e848); /* RC Evaluation Interval */
- gtt_write(0xa0ac, 0x00000019); /* RC Idle Hysteresis */
-
- /* 9 */
- gtt_write(0x2054, 0x0000000a); /* Render Idle Max Count */
- gtt_write(0x12054,0x0000000a); /* Video Idle Max Count */
- gtt_write(0x22054,0x0000000a); /* Blitter Idle Max Count */
-
- /* 10 */
- gtt_write(0xa0b0, 0x00000000); /* Unblock Ack to Busy */
- gtt_write(0xa0b4, 0x000003e8); /* RC1e Threshold */
- gtt_write(0xa0b8, 0x0000c350); /* RC6 Threshold */
- gtt_write(0xa0bc, 0x000186a0); /* RC6p Threshold */
- gtt_write(0xa0c0, 0x0000fa00); /* RC6pp Threshold */
-
- /* 11 */
- gtt_write(0xa010, 0x000f4240); /* RP Down Timeout */
- gtt_write(0xa014, 0x12060000); /* RP Interrupt Limits */
- gtt_write(0xa02c, 0x00015f90); /* RP Up Threshold */
- gtt_write(0xa030, 0x000186a0); /* RP Down Threshold */
- gtt_write(0xa068, 0x000186a0); /* RP Up EI */
- gtt_write(0xa06c, 0x000493e0); /* RP Down EI */
- gtt_write(0xa070, 0x0000000a); /* RP Idle Hysteresis */
-
- /* 11a: Enable Render Standby (RC6) */
- if ((bridge_silicon_revision() & BASE_REV_MASK) == BASE_REV_IVB) {
- /*
- * IvyBridge should also support DeepRenderStandby.
- *
- * Unfortunately it does not work reliably on all SKUs so
- * disable it here and it can be enabled by the kernel.
- */
- gtt_write(0xa090, 0x88040000); /* HW RC Control */
- } else {
- gtt_write(0xa090, 0x88040000); /* HW RC Control */
- }
-
- /* 12: Normal Frequency Request */
- /* RPNFREQ_VAL comes from MCHBAR 0x5998 23:16 (8 bits!? use 7) */
- reg32 = MCHBAR32(0x5998);
- reg32 >>= 16;
- reg32 &= 0xef;
- reg32 <<= 25;
- gtt_write(0xa008, reg32);
-
- /* 13: RP Control */
- gtt_write(0xa024, 0x00000592);
-
- /* 14: Enable PM Interrupts */
- gtt_write(0x4402c, 0x03000076);
-
- /* Clear 0x6c024 [8:6] */
- reg32 = gtt_read(0x6c024);
- reg32 &= ~0x000001c0;
- gtt_write(0x6c024, reg32);
+ /* Enable RC6 in idle */
+ gtt_write(0x0a094, 0x00040000);
}
static void gma_pm_init_post_vbios(struct device *dev)
@@ -557,18 +130,9 @@ static void gma_pm_init_post_vbios(struct device *dev)
printk(BIOS_DEBUG, "GT Power Management Init (post VBIOS)\n");
- /* 15: Deassert Force Wake */
- if (bridge_silicon_revision() < IVB_STEP_C0) {
- gtt_write(0xa18c, gtt_read(0xa18c) & ~1);
- gtt_poll(0x130090, (1 << 0), (0 << 0));
- } else {
- gtt_write(0xa188, 0x1fffe);
- if (gtt_poll(0x130040, (1 << 0), (0 << 0)))
- gtt_write(0xa188, gtt_read(0xa188) | 1);
- }
-
- /* 16: SW RC Control */
- gtt_write(0xa094, 0x00060000);
+ /* Disable Force Wake */
+ gtt_write(0x0a188, 0x00010000);
+ gtt_poll(0x130044, 1 << 0, 0 << 0);
/* Setup Digital Port Hotplug */
reg32 = gtt_read(0xc4030);