aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2014-02-05 14:28:59 -0500
committerIngo Molnar <mingo@kernel.org>2014-02-09 09:11:30 -0500
commita4dff76924fe4f6d53a9f34196a67a32149e7270 (patch)
tree6e164fec7a94f5c2f2192d7f1786c5b8091fa841 /arch/x86/kernel
parent52ca70454ea5ff29bc39f7871d28f8e6f4713867 (diff)
x86/gpu: Add Intel graphics stolen memory quirk for gen2 platforms
There isn't an explicit stolen memory base register on gen2. Some old comment in the i915 code suggests we should get it via max_low_pfn_mapped, but that's clearly a bad idea on my MGM. The e820 map in said machine looks like this: BIOS-e820: [mem 0x0000000000000000-0x000000000009f7ff] usable BIOS-e820: [mem 0x000000000009f800-0x000000000009ffff] reserved BIOS-e820: [mem 0x00000000000ce000-0x00000000000cffff] reserved BIOS-e820: [mem 0x00000000000dc000-0x00000000000fffff] reserved BIOS-e820: [mem 0x0000000000100000-0x000000001f6effff] usable BIOS-e820: [mem 0x000000001f6f0000-0x000000001f6f7fff] ACPI data BIOS-e820: [mem 0x000000001f6f8000-0x000000001f6fffff] ACPI NVS BIOS-e820: [mem 0x000000001f700000-0x000000001fffffff] reserved BIOS-e820: [mem 0x00000000fec10000-0x00000000fec1ffff] reserved BIOS-e820: [mem 0x00000000ffb00000-0x00000000ffbfffff] reserved BIOS-e820: [mem 0x00000000fff00000-0x00000000ffffffff] reserved That makes max_low_pfn_mapped = 1f6f0000, so assuming our stolen memory would start there would place it on top of some ACPI memory regions. So not a good idea as already stated. The 9MB region after the ACPI regions at 0x1f700000 however looks promising given that the macine reports the stolen memory size to be 8MB. Looking at the PGTBL_CTL register, the GTT entries are at offset 0x1fee00000, and given that the GTT entries occupy 128KB, it looks like the stolen memory could start at 0x1f700000 and the GTT entries would occupy the last 128KB of the stolen memory. After some more digging through chipset documentation, I've determined the BIOS first allocates space for something called TSEG (something to do with SMM) from the top of memory, and then it allocates the graphics stolen memory below that. Accordind to the chipset documentation TSEG has a fixed size of 1MB on 855. So that explains the top 1MB in the e820 region. And it also confirms that the GTT entries are in fact at the end of the the stolen memory region. Derive the stolen memory base address on gen2 the same as the BIOS does (TOM-TSEG_SIZE-stolen_size). There are a few differences between the registers on various gen2 chipsets, so a few different codepaths are required. 865G is again bit more special since it seems to support enough memory to hit 4GB address space issues. This means the PCI allocations will also affect the location of the stolen memory. Fortunately there appears to be the TOUD register which may give us the correct answer directly. But the chipset docs are a bit unclear, so I'm not 100% sure that the graphics stolen memory is always the last thing the BIOS steals. Someone would need to verify it on a real system. I tested this on the my 830 and 855 machines, and so far everything looks peachy. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Link: http://lkml.kernel.org/r/1391628540-23072-3-git-send-email-ville.syrjala@linux.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/early-quirks.c132
1 files changed, 132 insertions, 0 deletions
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index fddd4d05d1fa..5218dd209ede 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -247,6 +247,114 @@ static u32 __init intel_stolen_base(int num, int slot, int func, size_t stolen_s
247#define MB(x) (KB (KB (x))) 247#define MB(x) (KB (KB (x)))
248#define GB(x) (MB (KB (x))) 248#define GB(x) (MB (KB (x)))
249 249
250static size_t __init i830_tseg_size(void)
251{
252 u8 tmp = read_pci_config_byte(0, 0, 0, I830_ESMRAMC);
253
254 if (!(tmp & TSEG_ENABLE))
255 return 0;
256
257 if (tmp & I830_TSEG_SIZE_1M)
258 return MB(1);
259 else
260 return KB(512);
261}
262
263static size_t __init i845_tseg_size(void)
264{
265 u8 tmp = read_pci_config_byte(0, 0, 0, I845_ESMRAMC);
266
267 if (!(tmp & TSEG_ENABLE))
268 return 0;
269
270 switch (tmp & I845_TSEG_SIZE_MASK) {
271 case I845_TSEG_SIZE_512K:
272 return KB(512);
273 case I845_TSEG_SIZE_1M:
274 return MB(1);
275 default:
276 WARN_ON(1);
277 return 0;
278 }
279}
280
281static size_t __init i85x_tseg_size(void)
282{
283 u8 tmp = read_pci_config_byte(0, 0, 0, I85X_ESMRAMC);
284
285 if (!(tmp & TSEG_ENABLE))
286 return 0;
287
288 return MB(1);
289}
290
291static size_t __init i830_mem_size(void)
292{
293 return read_pci_config_byte(0, 0, 0, I830_DRB3) * MB(32);
294}
295
296static size_t __init i85x_mem_size(void)
297{
298 return read_pci_config_byte(0, 0, 1, I85X_DRB3) * MB(32);
299}
300
301/*
302 * On 830/845/85x the stolen memory base isn't available in any
303 * register. We need to calculate it as TOM-TSEG_SIZE-stolen_size.
304 */
305static u32 __init i830_stolen_base(int num, int slot, int func, size_t stolen_size)
306{
307 return i830_mem_size() - i830_tseg_size() - stolen_size;
308}
309
310static u32 __init i845_stolen_base(int num, int slot, int func, size_t stolen_size)
311{
312 return i830_mem_size() - i845_tseg_size() - stolen_size;
313}
314
315static u32 __init i85x_stolen_base(int num, int slot, int func, size_t stolen_size)
316{
317 return i85x_mem_size() - i85x_tseg_size() - stolen_size;
318}
319
320static u32 __init i865_stolen_base(int num, int slot, int func, size_t stolen_size)
321{
322 /*
323 * FIXME is the graphics stolen memory region
324 * always at TOUD? Ie. is it always the last
325 * one to be allocated by the BIOS?
326 */
327 return read_pci_config_16(0, 0, 0, I865_TOUD) << 16;
328}
329
330static size_t __init i830_stolen_size(int num, int slot, int func)
331{
332 size_t stolen_size;
333 u16 gmch_ctrl;
334
335 gmch_ctrl = read_pci_config_16(0, 0, 0, I830_GMCH_CTRL);
336
337 switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
338 case I830_GMCH_GMS_STOLEN_512:
339 stolen_size = KB(512);
340 break;
341 case I830_GMCH_GMS_STOLEN_1024:
342 stolen_size = MB(1);
343 break;
344 case I830_GMCH_GMS_STOLEN_8192:
345 stolen_size = MB(8);
346 break;
347 case I830_GMCH_GMS_LOCAL:
348 /* local memory isn't part of the normal address space */
349 stolen_size = 0;
350 break;
351 default:
352 return 0;
353 }
354
355 return stolen_size;
356}
357
250static size_t __init gen3_stolen_size(int num, int slot, int func) 358static size_t __init gen3_stolen_size(int num, int slot, int func)
251{ 359{
252 size_t stolen_size; 360 size_t stolen_size;
@@ -329,6 +437,26 @@ struct intel_stolen_funcs {
329 u32 (*base)(int num, int slot, int func, size_t size); 437 u32 (*base)(int num, int slot, int func, size_t size);
330}; 438};
331 439
440static const struct intel_stolen_funcs i830_stolen_funcs = {
441 .base = i830_stolen_base,
442 .size = i830_stolen_size,
443};
444
445static const struct intel_stolen_funcs i845_stolen_funcs = {
446 .base = i845_stolen_base,
447 .size = i830_stolen_size,
448};
449
450static const struct intel_stolen_funcs i85x_stolen_funcs = {
451 .base = i85x_stolen_base,
452 .size = gen3_stolen_size,
453};
454
455static const struct intel_stolen_funcs i865_stolen_funcs = {
456 .base = i865_stolen_base,
457 .size = gen3_stolen_size,
458};
459
332static const struct intel_stolen_funcs gen3_stolen_funcs = { 460static const struct intel_stolen_funcs gen3_stolen_funcs = {
333 .base = intel_stolen_base, 461 .base = intel_stolen_base,
334 .size = gen3_stolen_size, 462 .size = gen3_stolen_size,
@@ -345,6 +473,10 @@ static const struct intel_stolen_funcs gen8_stolen_funcs = {
345}; 473};
346 474
347static struct pci_device_id intel_stolen_ids[] __initdata = { 475static struct pci_device_id intel_stolen_ids[] __initdata = {
476 INTEL_I830_IDS(&i830_stolen_funcs),
477 INTEL_I845G_IDS(&i845_stolen_funcs),
478 INTEL_I85X_IDS(&i85x_stolen_funcs),
479 INTEL_I865G_IDS(&i865_stolen_funcs),
348 INTEL_I915G_IDS(&gen3_stolen_funcs), 480 INTEL_I915G_IDS(&gen3_stolen_funcs),
349 INTEL_I915GM_IDS(&gen3_stolen_funcs), 481 INTEL_I915GM_IDS(&gen3_stolen_funcs),
350 INTEL_I945G_IDS(&gen3_stolen_funcs), 482 INTEL_I945G_IDS(&gen3_stolen_funcs),