From: Simon Glass Date: Thu, 6 Oct 2016 02:42:20 +0000 (-0600) Subject: dm: x86: Move link to use driver model for video X-Git-Tag: v2016.11-rc2~11^2~27 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b6409ec3027de01336da41994518f6704c61e7e5;p=u-boot dm: x86: Move link to use driver model for video Update the configuration to use the new driver. Drop the existing plumbing code and unused header files. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- diff --git a/arch/x86/cpu/ivybridge/Makefile b/arch/x86/cpu/ivybridge/Makefile index 9cdb07bdf2..498e71a1b9 100644 --- a/arch/x86/cpu/ivybridge/Makefile +++ b/arch/x86/cpu/ivybridge/Makefile @@ -9,7 +9,6 @@ obj-y += fsp_configs.o ivybridge.o else obj-y += cpu.o obj-y += early_me.o -obj-y += gma.o obj-y += lpc.o obj-y += model_206ax.o obj-y += northbridge.o diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c index 5b58d6c427..e63ea6b22e 100644 --- a/arch/x86/cpu/ivybridge/bd82x6x.c +++ b/arch/x86/cpu/ivybridge/bd82x6x.c @@ -9,14 +9,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include @@ -155,22 +153,12 @@ void pch_iobp_update(struct udevice *dev, u32 address, u32 andvalue, static int bd82x6x_probe(struct udevice *dev) { - struct udevice *gma_dev; - int ret; - if (!(gd->flags & GD_FLG_RELOC)) return 0; /* Cause the SATA device to do its init */ uclass_first_device(UCLASS_AHCI, &dev); - ret = syscon_get_by_driver_data(X86_SYSCON_GMA, &gma_dev); - if (ret) - return ret; - ret = gma_func0_init(gma_dev); - if (ret) - return ret; - return 0; } #endif /* CONFIG_HAVE_FSP */ diff --git a/arch/x86/cpu/ivybridge/early_me.c b/arch/x86/cpu/ivybridge/early_me.c index cda96ab398..5435a92afa 100644 --- a/arch/x86/cpu/ivybridge/early_me.c +++ b/arch/x86/cpu/ivybridge/early_me.c @@ -162,7 +162,6 @@ int intel_early_me_init_done(struct udevice *dev, struct udevice *me_dev, static const struct udevice_id ivybridge_syscon_ids[] = { { .compatible = "intel,me", .data = X86_SYSCON_ME }, - { .compatible = "intel,gma", .data = X86_SYSCON_GMA }, { } }; diff --git a/arch/x86/cpu/ivybridge/gma.c b/arch/x86/cpu/ivybridge/gma.c deleted file mode 100644 index 37e2e6ead8..0000000000 --- a/arch/x86/cpu/ivybridge/gma.c +++ /dev/null @@ -1,850 +0,0 @@ -/* - * From Coreboot file of the same name - * - * Copyright (C) 2011 Chromium OS Authors - * - * SPDX-License-Identifier: GPL-2.0 - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -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 ourselves. - */ - -u32 map_oprom_vendev(u32 vendev) -{ - u32 new_vendev = vendev; - - switch (vendev) { - case 0x80860102: /* GT1 Desktop */ - case 0x8086010a: /* GT1 Server */ - case 0x80860112: /* GT2 Desktop */ - case 0x80860116: /* GT2 Mobile */ - case 0x80860122: /* GT2 Desktop >=1.3GHz */ - case 0x80860126: /* GT2 Mobile >=1.3GHz */ - case 0x80860156: /* IVB */ - case 0x80860166: /* IVB */ - /* Set to GT1 Mobile */ - new_vendev = 0x80860106; - break; - } - - return new_vendev; -} - -static inline u32 gtt_read(void *bar, u32 reg) -{ - return readl(bar + reg); -} - -static inline void gtt_write(void *bar, u32 reg, u32 data) -{ - writel(data, bar + reg); -} - -static void gtt_write_powermeter(void *bar, const struct gt_powermeter *pm) -{ - for (; pm && pm->reg; pm++) - gtt_write(bar, pm->reg, pm->value); -} - -#define GTT_RETRY 1000 -static int gtt_poll(void *bar, u32 reg, u32 mask, u32 value) -{ - unsigned try = GTT_RETRY; - u32 data; - - while (try--) { - data = gtt_read(bar, reg); - if ((data & mask) == value) - return 1; - udelay(10); - } - - printf("GT init timeout\n"); - return 0; -} - -static int gma_pm_init_pre_vbios(void *gtt_bar, int rev) -{ - u32 reg32; - - debug("GT Power Management Init, silicon = %#x\n", rev); - - if (rev < IVB_STEP_C0) { - /* 1: Enable force wake */ - gtt_write(gtt_bar, 0xa18c, 0x00000001); - gtt_poll(gtt_bar, 0x130090, (1 << 0), (1 << 0)); - } else { - gtt_write(gtt_bar, 0xa180, 1 << 5); - gtt_write(gtt_bar, 0xa188, 0xffff0001); - gtt_poll(gtt_bar, 0x130040, (1 << 0), (1 << 0)); - } - - if ((rev & BASE_REV_MASK) == BASE_REV_SNB) { - /* 1d: Set GTT+0x42004 [15:14]=11 (SnB C1+) */ - reg32 = gtt_read(gtt_bar, 0x42004); - reg32 |= (1 << 14) | (1 << 15); - gtt_write(gtt_bar, 0x42004, reg32); - } - - if (rev >= IVB_STEP_A0) { - /* Display Reset Acknowledge Settings */ - reg32 = gtt_read(gtt_bar, 0x45010); - reg32 |= (1 << 1) | (1 << 0); - gtt_write(gtt_bar, 0x45010, reg32); - } - - /* 2: Get GT SKU from GTT+0x911c[13] */ - reg32 = gtt_read(gtt_bar, 0x911c); - if ((rev & BASE_REV_MASK) == BASE_REV_SNB) { - if (reg32 & (1 << 13)) { - debug("SNB GT1 Power Meter Weights\n"); - gtt_write_powermeter(gtt_bar, snb_pm_gt1); - } else { - debug("SNB GT2 Power Meter Weights\n"); - gtt_write_powermeter(gtt_bar, snb_pm_gt2); - } - } else { - u32 unit = readl(MCHBAR_REG(0x5938)) & 0xf; - - if (reg32 & (1 << 13)) { - /* GT1 SKU */ - debug("IVB GT1 Power Meter Weights\n"); - gtt_write_powermeter(gtt_bar, ivb_pm_gt1); - } else { - /* GT2 SKU */ - u32 tdp = readl(MCHBAR_REG(0x5930)) & 0x7fff; - tdp /= (1 << unit); - - if (tdp <= 17) { - /* <=17W ULV */ - debug("IVB GT2 17W Power Meter Weights\n"); - gtt_write_powermeter(gtt_bar, ivb_pm_gt2_17w); - } else if ((tdp >= 25) && (tdp <= 35)) { - /* 25W-35W */ - debug("IVB GT2 25W-35W Power Meter Weights\n"); - gtt_write_powermeter(gtt_bar, ivb_pm_gt2_35w); - } else { - /* All others */ - debug("IVB GT2 35W Power Meter Weights\n"); - gtt_write_powermeter(gtt_bar, ivb_pm_gt2_35w); - } - } - } - - /* 3: Gear ratio map */ - gtt_write(gtt_bar, 0xa004, 0x00000010); - - /* 4: GFXPAUSE */ - gtt_write(gtt_bar, 0xa000, 0x00070020); - - /* 5: Dynamic EU trip control */ - gtt_write(gtt_bar, 0xa080, 0x00000004); - - /* 6: ECO bits */ - reg32 = gtt_read(gtt_bar, 0xa180); - reg32 |= (1 << 26) | (1 << 31); - /* (bit 20=1 for SNB step D1+ / IVB A0+) */ - if (rev >= SNB_STEP_D1) - reg32 |= (1 << 20); - gtt_write(gtt_bar, 0xa180, reg32); - - /* 6a: for SnB step D2+ only */ - if (((rev & BASE_REV_MASK) == BASE_REV_SNB) && - (rev >= SNB_STEP_D2)) { - reg32 = gtt_read(gtt_bar, 0x9400); - reg32 |= (1 << 7); - gtt_write(gtt_bar, 0x9400, reg32); - - reg32 = gtt_read(gtt_bar, 0x941c); - reg32 &= 0xf; - reg32 |= (1 << 1); - gtt_write(gtt_bar, 0x941c, reg32); - gtt_poll(gtt_bar, 0x941c, (1 << 1), (0 << 1)); - } - - if ((rev & BASE_REV_MASK) == BASE_REV_IVB) { - reg32 = gtt_read(gtt_bar, 0x907c); - reg32 |= (1 << 16); - gtt_write(gtt_bar, 0x907c, reg32); - - /* 6b: Clocking reset controls */ - gtt_write(gtt_bar, 0x9424, 0x00000001); - } else { - /* 6b: Clocking reset controls */ - gtt_write(gtt_bar, 0x9424, 0x00000000); - } - - /* 7 */ - if (gtt_poll(gtt_bar, 0x138124, (1 << 31), (0 << 31))) { - gtt_write(gtt_bar, 0x138128, 0x00000029); /* Mailbox Data */ - /* Mailbox Cmd for RC6 VID */ - gtt_write(gtt_bar, 0x138124, 0x80000004); - if (gtt_poll(gtt_bar, 0x138124, (1 << 31), (0 << 31))) - gtt_write(gtt_bar, 0x138124, 0x8000000a); - gtt_poll(gtt_bar, 0x138124, (1 << 31), (0 << 31)); - } - - /* 8 */ - gtt_write(gtt_bar, 0xa090, 0x00000000); /* RC Control */ - gtt_write(gtt_bar, 0xa098, 0x03e80000); /* RC1e Wake Rate Limit */ - gtt_write(gtt_bar, 0xa09c, 0x0028001e); /* RC6/6p Wake Rate Limit */ - gtt_write(gtt_bar, 0xa0a0, 0x0000001e); /* RC6pp Wake Rate Limit */ - gtt_write(gtt_bar, 0xa0a8, 0x0001e848); /* RC Evaluation Interval */ - gtt_write(gtt_bar, 0xa0ac, 0x00000019); /* RC Idle Hysteresis */ - - /* 9 */ - gtt_write(gtt_bar, 0x2054, 0x0000000a); /* Render Idle Max Count */ - gtt_write(gtt_bar, 0x12054, 0x0000000a); /* Video Idle Max Count */ - gtt_write(gtt_bar, 0x22054, 0x0000000a); /* Blitter Idle Max Count */ - - /* 10 */ - gtt_write(gtt_bar, 0xa0b0, 0x00000000); /* Unblock Ack to Busy */ - gtt_write(gtt_bar, 0xa0b4, 0x000003e8); /* RC1e Threshold */ - gtt_write(gtt_bar, 0xa0b8, 0x0000c350); /* RC6 Threshold */ - gtt_write(gtt_bar, 0xa0bc, 0x000186a0); /* RC6p Threshold */ - gtt_write(gtt_bar, 0xa0c0, 0x0000fa00); /* RC6pp Threshold */ - - /* 11 */ - gtt_write(gtt_bar, 0xa010, 0x000f4240); /* RP Down Timeout */ - gtt_write(gtt_bar, 0xa014, 0x12060000); /* RP Interrupt Limits */ - gtt_write(gtt_bar, 0xa02c, 0x00015f90); /* RP Up Threshold */ - gtt_write(gtt_bar, 0xa030, 0x000186a0); /* RP Down Threshold */ - gtt_write(gtt_bar, 0xa068, 0x000186a0); /* RP Up EI */ - gtt_write(gtt_bar, 0xa06c, 0x000493e0); /* RP Down EI */ - gtt_write(gtt_bar, 0xa070, 0x0000000a); /* RP Idle Hysteresis */ - - /* 11a: Enable Render Standby (RC6) */ - if ((rev & 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(gtt_bar, 0xa090, 0x88040000); /* HW RC Control */ - } else { - gtt_write(gtt_bar, 0xa090, 0x88040000); /* HW RC Control */ - } - - /* 12: Normal Frequency Request */ - /* RPNFREQ_VAL comes from MCHBAR 0x5998 23:16 (8 bits!? use 7) */ - reg32 = readl(MCHBAR_REG(0x5998)); - reg32 >>= 16; - reg32 &= 0xef; - reg32 <<= 25; - gtt_write(gtt_bar, 0xa008, reg32); - - /* 13: RP Control */ - gtt_write(gtt_bar, 0xa024, 0x00000592); - - /* 14: Enable PM Interrupts */ - gtt_write(gtt_bar, 0x4402c, 0x03000076); - - /* Clear 0x6c024 [8:6] */ - reg32 = gtt_read(gtt_bar, 0x6c024); - reg32 &= ~0x000001c0; - gtt_write(gtt_bar, 0x6c024, reg32); - - return 0; -} - -int gma_pm_init_post_vbios(struct udevice *dev, int rev, void *gtt_bar) -{ - const void *blob = gd->fdt_blob; - int node = dev->of_offset; - u32 reg32, cycle_delay; - - debug("GT Power Management Init (post VBIOS)\n"); - - /* 15: Deassert Force Wake */ - if (rev < IVB_STEP_C0) { - gtt_write(gtt_bar, 0xa18c, gtt_read(gtt_bar, 0xa18c) & ~1); - gtt_poll(gtt_bar, 0x130090, (1 << 0), (0 << 0)); - } else { - gtt_write(gtt_bar, 0xa188, 0x1fffe); - if (gtt_poll(gtt_bar, 0x130040, (1 << 0), (0 << 0))) { - gtt_write(gtt_bar, 0xa188, - gtt_read(gtt_bar, 0xa188) | 1); - } - } - - /* 16: SW RC Control */ - gtt_write(gtt_bar, 0xa094, 0x00060000); - - /* Setup Digital Port Hotplug */ - reg32 = gtt_read(gtt_bar, 0xc4030); - if (!reg32) { - u32 dp_hotplug[3]; - - if (fdtdec_get_int_array(blob, node, "intel,dp_hotplug", - dp_hotplug, ARRAY_SIZE(dp_hotplug))) - return -EINVAL; - - reg32 = (dp_hotplug[0] & 0x7) << 2; - reg32 |= (dp_hotplug[0] & 0x7) << 10; - reg32 |= (dp_hotplug[0] & 0x7) << 18; - gtt_write(gtt_bar, 0xc4030, reg32); - } - - /* Setup Panel Power On Delays */ - reg32 = gtt_read(gtt_bar, 0xc7208); - if (!reg32) { - reg32 = (unsigned)fdtdec_get_int(blob, node, - "panel-port-select", 0) << 30; - reg32 |= fdtdec_get_int(blob, node, "panel-power-up-delay", 0) - << 16; - reg32 |= fdtdec_get_int(blob, node, - "panel-power-backlight-on-delay", 0); - gtt_write(gtt_bar, 0xc7208, reg32); - } - - /* Setup Panel Power Off Delays */ - reg32 = gtt_read(gtt_bar, 0xc720c); - if (!reg32) { - reg32 = fdtdec_get_int(blob, node, "panel-power-down-delay", 0) - << 16; - reg32 |= fdtdec_get_int(blob, node, - "panel-power-backlight-off-delay", 0); - gtt_write(gtt_bar, 0xc720c, reg32); - } - - /* Setup Panel Power Cycle Delay */ - cycle_delay = fdtdec_get_int(blob, node, - "intel,panel-power-cycle-delay", 0); - if (cycle_delay) { - reg32 = gtt_read(gtt_bar, 0xc7210); - reg32 &= ~0xff; - reg32 |= cycle_delay; - gtt_write(gtt_bar, 0xc7210, reg32); - } - - /* Enable Backlight if needed */ - reg32 = fdtdec_get_int(blob, node, "intel,cpu-backlight", 0); - if (reg32) { - gtt_write(gtt_bar, 0x48250, (1 << 31)); - gtt_write(gtt_bar, 0x48254, reg32); - } - reg32 = fdtdec_get_int(blob, node, "intel,pch-backlight", 0); - if (reg32) { - gtt_write(gtt_bar, 0xc8250, (1 << 31)); - gtt_write(gtt_bar, 0xc8254, reg32); - } - - return 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 ourselves. - */ - -uint32_t board_map_oprom_vendev(uint32_t vendev) -{ - switch (vendev) { - case 0x80860102: /* GT1 Desktop */ - case 0x8086010a: /* GT1 Server */ - case 0x80860112: /* GT2 Desktop */ - case 0x80860116: /* GT2 Mobile */ - case 0x80860122: /* GT2 Desktop >=1.3GHz */ - case 0x80860126: /* GT2 Mobile >=1.3GHz */ - case 0x80860156: /* IVB */ - case 0x80860166: /* IVB */ - return 0x80860106; /* GT1 Mobile */ - } - - return vendev; -} - -static int int15_handler(void) -{ - int res = 0; - - debug("%s: INT15 function %04x!\n", __func__, M.x86.R_AX); - - switch (M.x86.R_AX) { - case 0x5f34: - /* - * Set Panel Fitting Hook: - * bit 2 = Graphics Stretching - * bit 1 = Text Stretching - * bit 0 = Centering (do not set with bit1 or bit2) - * 0 = video bios default - */ - M.x86.R_AX = 0x005f; - M.x86.R_CL = 0x00; /* Use video bios default */ - res = 1; - break; - case 0x5f35: - /* - * Boot Display Device Hook: - * bit 0 = CRT - * bit 1 = TV (eDP) - * bit 2 = EFP - * bit 3 = LFP - * bit 4 = CRT2 - * bit 5 = TV2 (eDP) - * bit 6 = EFP2 - * bit 7 = LFP2 - */ - M.x86.R_AX = 0x005f; - M.x86.R_CX = 0x0000; /* Use video bios default */ - res = 1; - break; - case 0x5f51: - /* - * Hook to select active LFP configuration: - * 00h = No LVDS, VBIOS does not enable LVDS - * 01h = Int-LVDS, LFP driven by integrated LVDS decoder - * 02h = SVDO-LVDS, LFP driven by SVDO decoder - * 03h = eDP, LFP Driven by Int-DisplayPort encoder - */ - M.x86.R_AX = 0x005f; - M.x86.R_CX = 0x0003; /* eDP */ - res = 1; - break; - case 0x5f70: - switch (M.x86.R_CH) { - case 0: - /* Get Mux */ - M.x86.R_AX = 0x005f; - M.x86.R_CX = 0x0000; - res = 1; - break; - case 1: - /* Set Mux */ - M.x86.R_AX = 0x005f; - M.x86.R_CX = 0x0000; - res = 1; - break; - case 2: - /* Get SG/Non-SG mode */ - M.x86.R_AX = 0x005f; - M.x86.R_CX = 0x0000; - res = 1; - break; - default: - /* Interrupt was not handled */ - debug("Unknown INT15 5f70 function: 0x%02x\n", - M.x86.R_CH); - break; - } - break; - case 0x5fac: - res = 1; - break; - default: - debug("Unknown INT15 function %04x!\n", M.x86.R_AX); - break; - } - return res; -} - -void sandybridge_setup_graphics(struct udevice *dev, struct udevice *video_dev) -{ - u32 reg32; - u16 reg16; - u8 reg8; - - dm_pci_read_config16(video_dev, PCI_DEVICE_ID, ®16); - switch (reg16) { - case 0x0102: /* GT1 Desktop */ - case 0x0106: /* GT1 Mobile */ - case 0x010a: /* GT1 Server */ - case 0x0112: /* GT2 Desktop */ - case 0x0116: /* GT2 Mobile */ - case 0x0122: /* GT2 Desktop >=1.3GHz */ - case 0x0126: /* GT2 Mobile >=1.3GHz */ - case 0x0156: /* IvyBridge */ - case 0x0166: /* IvyBridge */ - break; - default: - debug("Graphics not supported by this CPU/chipset\n"); - return; - } - - debug("Initialising Graphics\n"); - - /* Setup IGD memory by setting GGC[7:3] = 1 for 32MB */ - dm_pci_read_config16(dev, GGC, ®16); - reg16 &= ~0x00f8; - reg16 |= 1 << 3; - /* Program GTT memory by setting GGC[9:8] = 2MB */ - reg16 &= ~0x0300; - reg16 |= 2 << 8; - /* Enable VGA decode */ - reg16 &= ~0x0002; - dm_pci_write_config16(dev, GGC, reg16); - - /* Enable 256MB aperture */ - dm_pci_read_config8(video_dev, MSAC, ®8); - reg8 &= ~0x06; - reg8 |= 0x02; - dm_pci_write_config8(video_dev, MSAC, reg8); - - /* Erratum workarounds */ - reg32 = readl(MCHBAR_REG(0x5f00)); - reg32 |= (1 << 9) | (1 << 10); - writel(reg32, MCHBAR_REG(0x5f00)); - - /* Enable SA Clock Gating */ - reg32 = readl(MCHBAR_REG(0x5f00)); - writel(reg32 | 1, MCHBAR_REG(0x5f00)); - - /* GPU RC6 workaround for sighting 366252 */ - reg32 = readl(MCHBAR_REG(0x5d14)); - reg32 |= (1 << 31); - writel(reg32, MCHBAR_REG(0x5d14)); - - /* VLW */ - reg32 = readl(MCHBAR_REG(0x6120)); - reg32 &= ~(1 << 0); - writel(reg32, MCHBAR_REG(0x6120)); - - reg32 = readl(MCHBAR_REG(0x5418)); - reg32 |= (1 << 4) | (1 << 5); - writel(reg32, MCHBAR_REG(0x5418)); -} - -int gma_func0_init(struct udevice *dev) -{ -#ifdef CONFIG_VIDEO - ulong start; -#endif - struct udevice *nbridge; - void *gtt_bar; - ulong base; - u32 reg32; - int ret; - int rev; - - /* Enable PCH Display Port */ - writew(0x0010, RCB_REG(DISPBDF)); - setbits_le32(RCB_REG(FD2), PCH_ENABLE_DBDF); - - ret = uclass_first_device_err(UCLASS_NORTHBRIDGE, &nbridge); - if (ret) - return ret; - rev = bridge_silicon_revision(nbridge); - sandybridge_setup_graphics(nbridge, dev); - - /* IGD needs to be Bus Master */ - dm_pci_read_config32(dev, PCI_COMMAND, ®32); - reg32 |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO; - dm_pci_write_config32(dev, PCI_COMMAND, reg32); - - /* Use write-combining for the graphics memory, 256MB */ - base = dm_pci_read_bar32(dev, 2); - mtrr_add_request(MTRR_TYPE_WRCOMB, base, 256 << 20); - mtrr_commit(true); - - gtt_bar = (void *)dm_pci_read_bar32(dev, 0); - debug("GT bar %p\n", gtt_bar); - ret = gma_pm_init_pre_vbios(gtt_bar, rev); - if (ret) - return ret; - -#ifdef CONFIG_VIDEO - start = get_timer(0); - ret = dm_pci_run_vga_bios(dev, int15_handler, - PCI_ROM_USE_NATIVE | PCI_ROM_ALLOW_FALLBACK); - debug("BIOS ran in %lums\n", get_timer(start)); -#endif - /* Post VBIOS init */ - ret = gma_pm_init_post_vbios(dev, rev, gtt_bar); - if (ret) - return ret; - - return 0; -} diff --git a/arch/x86/cpu/ivybridge/gma.h b/arch/x86/cpu/ivybridge/gma.h deleted file mode 100644 index e7ec649b80..0000000000 --- a/arch/x86/cpu/ivybridge/gma.h +++ /dev/null @@ -1,156 +0,0 @@ -/* - * From Coreboot file of the same name - * - * Copyright (C) 2012 Chromium OS Authors - * - * SPDX-License-Identifier: GPL-2.0 - */ - -/* mailbox 0: header */ -__packed struct opregion_header { - u8 signature[16]; - u32 size; - u32 version; - u8 sbios_version[32]; - u8 vbios_version[16]; - u8 driver_version[16]; - u32 mailboxes; - u8 reserved[164]; -}; - -#define IGD_OPREGION_SIGNATURE "IntelGraphicsMem" -#define IGD_OPREGION_VERSION 2 - -#define IGD_MBOX1 (1 << 0) -#define IGD_MBOX2 (1 << 1) -#define IGD_MBOX3 (1 << 2) -#define IGD_MBOX4 (1 << 3) -#define IGD_MBOX5 (1 << 4) - -#define MAILBOXES_MOBILE (IGD_MBOX1 | IGD_MBOX2 | IGD_MBOX3 | \ - IGD_MBOX4 | IGD_MBOX5) -#define MAILBOXES_DESKTOP (IGD_MBOX2 | IGD_MBOX4) - -#define SBIOS_VERSION_SIZE 32 - -/* mailbox 1: public acpi methods */ -__packed struct opregion_mailbox1 { - u32 drdy; - u32 csts; - u32 cevt; - u8 reserved1[20]; - u32 didl[8]; - u32 cpdl[8]; - u32 cadl[8]; - u32 nadl[8]; - u32 aslp; - u32 tidx; - u32 chpd; - u32 clid; - u32 cdck; - u32 sxsw; - u32 evts; - u32 cnot; - u32 nrdy; - u8 reserved2[60]; -}; - -/* mailbox 2: software sci interface */ -__packed struct opregion_mailbox2 { - u32 scic; - u32 parm; - u32 dslp; - u8 reserved[244]; -}; - -/* mailbox 3: power conservation */ -__packed struct opregion_mailbox3 { - u32 ardy; - u32 aslc; - u32 tche; - u32 alsi; - u32 bclp; - u32 pfit; - u32 cblv; - u16 bclm[20]; - u32 cpfm; - u32 epfm; - u8 plut[74]; - u32 pfmb; - u32 ccdv; - u32 pcft; - u8 reserved[94]; -}; - -#define IGD_BACKLIGHT_BRIGHTNESS 0xff -#define IGD_INITIAL_BRIGHTNESS 0x64 - -#define IGD_FIELD_VALID (1 << 31) -#define IGD_WORD_FIELD_VALID (1 << 15) -#define IGD_PFIT_STRETCH 6 - -/* mailbox 4: vbt */ -__packed struct { - u8 gvd1[7168]; -} opregion_vbt_t; - -/* IGD OpRegion */ -__packed struct igd_opregion { - opregion_header_t header; - opregion_mailbox1_t mailbox1; - opregion_mailbox2_t mailbox2; - opregion_mailbox3_t mailbox3; - opregion_vbt_t vbt; -}; - -/* Intel Video BIOS (Option ROM) */ -__packed struct optionrom_header { - u16 signature; - u8 size; - u8 reserved[21]; - u16 pcir_offset; - u16 vbt_offset; -}; - -#define OPROM_SIGNATURE 0xaa55 - -__packed struct optionrom_pcir { - u32 signature; - u16 vendor; - u16 device; - u16 reserved1; - u16 length; - u8 revision; - u8 classcode[3]; - u16 imagelength; - u16 coderevision; - u8 codetype; - u8 indicator; - u16 reserved2; -}; - -__packed struct optionrom_vbt { - u8 hdr_signature[20]; - u16 hdr_version; - u16 hdr_size; - u16 hdr_vbt_size; - u8 hdr_vbt_checksum; - u8 hdr_reserved; - u32 hdr_vbt_datablock; - u32 hdr_aim[4]; - u8 datahdr_signature[16]; - u16 datahdr_version; - u16 datahdr_size; - u16 datahdr_datablocksize; - u8 coreblock_id; - u16 coreblock_size; - u16 coreblock_biossize; - u8 coreblock_biostype; - u8 coreblock_releasestatus; - u8 coreblock_hwsupported; - u8 coreblock_integratedhw; - u8 coreblock_biosbuild[4]; - u8 coreblock_biossignon[155]; -}; - -#define VBT_SIGNATURE 0x54425624 diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c index 38e244b05e..b0743674ff 100644 --- a/arch/x86/cpu/ivybridge/model_206ax.c +++ b/arch/x86/cpu/ivybridge/model_206ax.c @@ -20,7 +20,6 @@ #include #include #include -#include #include static void enable_vmx(void) diff --git a/arch/x86/cpu/ivybridge/sata.c b/arch/x86/cpu/ivybridge/sata.c index 1ce81959e3..87ff872e20 100644 --- a/arch/x86/cpu/ivybridge/sata.c +++ b/arch/x86/cpu/ivybridge/sata.c @@ -12,7 +12,6 @@ #include #include #include -#include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/include/asm/arch-ivybridge/bd82x6x.h b/arch/x86/include/asm/arch-ivybridge/bd82x6x.h deleted file mode 100644 index e866580046..0000000000 --- a/arch/x86/include/asm/arch-ivybridge/bd82x6x.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (C) 2014 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _ASM_ARCH_BD82X6X_H -#define _ASM_ARCH_BD82X6X_H - -int gma_func0_init(struct udevice *dev); - -#endif diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index 789275792f..540024a859 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -53,7 +53,6 @@ enum { enum { X86_NONE, X86_SYSCON_ME, /* Intel Management Engine */ - X86_SYSCON_GMA, /* Intel Graphics Media Accelerator */ X86_SYSCON_PINCONF, /* Intel x86 pin configuration */ }; diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index 8c91bfea0a..247522270f 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -57,8 +57,10 @@ CONFIG_TPM_TIS_LPC=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y +CONFIG_VIDEO_IVYBRIDGE_IGD=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_TPM=y