Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/gpu: reserve ICL's graphics stolen memory

ICL changes the registers and addresses to 64 bits.

I also briefly looked at implementing an u64 version of the PCI config
read functions, but I concluded this wouldn't be trivial, so it's not
worth doing it for a single user that can't have any racing problems
while reading the register in two separate operations.

v2:
- Scrub the development (non-public) changelog (Joonas).
- Remove the i915.ko bits so this can be easily backported in order
to properly avoid stolen memory even on machines without i915.ko
(Joonas).
- CC stable for the reasons above.

Issue: VIZ-9250
CC: stable@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Fixes: 412310019a20 ("drm/i915/icl: Add initial Icelake definitions.")
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180504203252.28048-1-paulo.r.zanoni@intel.com

authored by

Paulo Zanoni and committed by
Rodrigo Vivi
db0c8d8b 7ab87ede

+21 -1
+18
arch/x86/kernel/early-quirks.c
··· 340 340 return bsm & INTEL_BSM_MASK; 341 341 } 342 342 343 + static resource_size_t __init gen11_stolen_base(int num, int slot, int func, 344 + resource_size_t stolen_size) 345 + { 346 + u64 bsm; 347 + 348 + bsm = read_pci_config(num, slot, func, INTEL_GEN11_BSM_DW0); 349 + bsm &= INTEL_BSM_MASK; 350 + bsm |= (u64)read_pci_config(num, slot, func, INTEL_GEN11_BSM_DW1) << 32; 351 + 352 + return bsm; 353 + } 354 + 343 355 static resource_size_t __init i830_stolen_size(int num, int slot, int func) 344 356 { 345 357 u16 gmch_ctrl; ··· 512 500 .stolen_size = chv_stolen_size, 513 501 }; 514 502 503 + static const struct intel_early_ops gen11_early_ops __initconst = { 504 + .stolen_base = gen11_stolen_base, 505 + .stolen_size = gen9_stolen_size, 506 + }; 507 + 515 508 static const struct pci_device_id intel_early_ids[] __initconst = { 516 509 INTEL_I830_IDS(&i830_early_ops), 517 510 INTEL_I845G_IDS(&i845_early_ops), ··· 548 531 INTEL_CFL_IDS(&gen9_early_ops), 549 532 INTEL_GLK_IDS(&gen9_early_ops), 550 533 INTEL_CNL_IDS(&gen9_early_ops), 534 + INTEL_ICL_11_IDS(&gen11_early_ops), 551 535 }; 552 536 553 537 struct resource intel_graphics_stolen_res __ro_after_init = DEFINE_RES_MEM(0, 0);
+3 -1
include/drm/i915_drm.h
··· 95 95 #define I845_TSEG_SIZE_512K (2 << 1) 96 96 #define I845_TSEG_SIZE_1M (3 << 1) 97 97 98 - #define INTEL_BSM 0x5c 98 + #define INTEL_BSM 0x5c 99 + #define INTEL_GEN11_BSM_DW0 0xc0 100 + #define INTEL_GEN11_BSM_DW1 0xc4 99 101 #define INTEL_BSM_MASK (-(1u << 20)) 100 102 101 103 #endif /* _I915_DRM_H_ */