Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752436AbdLKOdp (ORCPT ); Mon, 11 Dec 2017 09:33:45 -0500 Received: from mga01.intel.com ([192.55.52.88]:16970 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750759AbdLKOdn (ORCPT ); Mon, 11 Dec 2017 09:33:43 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,391,1508828400"; d="scan'208";a="157731481" Message-ID: <1513002818.5315.54.camel@linux.intel.com> Subject: Re: [PATCH 1/8] x86/early-quirks: Extend Intel graphics stolen memory placement to 64bit From: Joonas Lahtinen To: Thomas Gleixner , Ingo Molnar Cc: Ville =?ISO-8859-1?Q?Syrj=E4l=E4?= , Chris Wilson , Paulo Zanoni , "H . Peter Anvin" , x86@kernel.org, linux-kernel@vger.kernel.org, Matthew Auld , intel-gfx@lists.freedesktop.org Date: Mon, 11 Dec 2017 16:33:38 +0200 In-Reply-To: <20171211121427.26205-2-matthew.auld@intel.com> References: <20171211121427.26205-1-matthew.auld@intel.com> <20171211121427.26205-2-matthew.auld@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.26.2 (3.26.2-1.fc27) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 10383 Lines: 287 Hi Ingo & Thomas, Now would be a great moment to slap the final Acked-bys (first two patches of this series) as the comments have been addressed and Reviewed-by was refreshed by Chris. I consider the series ready to be merged in this state. Once acked, I will then proceed to merge these through the drm-tip tree as previously discussed. Regards, Joonas On Mon, 2017-12-11 at 12:14 +0000, Matthew Auld wrote: > From: Joonas Lahtinen > > To give upcoming SKU BIOSes more flexibility in placing the Intel > graphics stolen memory, make all variables storing the placement or size > compatible with full 64 bit range. Also by exporting the stolen region > as a resource, we can then nuke the duplicated stolen discovery in i915. > > Signed-off-by: Joonas Lahtinen > Signed-off-by: Matthew Auld > Cc: Joonas Lahtinen > Cc: Ville Syrjälä > Cc: Chris Wilson > Cc: Paulo Zanoni > Cc: Thomas Gleixner > Cc: Ingo Molnar > Cc: H. Peter Anvin > Cc: x86@kernel.org > Cc: linux-kernel@vger.kernel.org > Reviewed-by: Chris Wilson #v3 > --- > > v2: export the stolen region as a resource > fix u16 << 16 (Chris) > v3: actually fix u16 << 16 > v4: mark intel_graphics_stolen_res as __ro_after_init (Thomas) > > arch/x86/kernel/early-quirks.c | 86 +++++++++++++++++++++++------------------- > include/drm/i915_drm.h | 3 ++ > 2 files changed, 50 insertions(+), 39 deletions(-) > > diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c > index 1e82f787c160..6c1624889011 100644 > --- a/arch/x86/kernel/early-quirks.c > +++ b/arch/x86/kernel/early-quirks.c > @@ -243,7 +243,7 @@ static void __init intel_remapping_check(int num, int slot, int func) > #define KB(x) ((x) * 1024UL) > #define MB(x) (KB (KB (x))) > > -static size_t __init i830_tseg_size(void) > +static resource_size_t __init i830_tseg_size(void) > { > u8 esmramc = read_pci_config_byte(0, 0, 0, I830_ESMRAMC); > > @@ -256,7 +256,7 @@ static size_t __init i830_tseg_size(void) > return KB(512); > } > > -static size_t __init i845_tseg_size(void) > +static resource_size_t __init i845_tseg_size(void) > { > u8 esmramc = read_pci_config_byte(0, 0, 0, I845_ESMRAMC); > u8 tseg_size = esmramc & I845_TSEG_SIZE_MASK; > @@ -273,7 +273,7 @@ static size_t __init i845_tseg_size(void) > return 0; > } > > -static size_t __init i85x_tseg_size(void) > +static resource_size_t __init i85x_tseg_size(void) > { > u8 esmramc = read_pci_config_byte(0, 0, 0, I85X_ESMRAMC); > > @@ -283,12 +283,12 @@ static size_t __init i85x_tseg_size(void) > return MB(1); > } > > -static size_t __init i830_mem_size(void) > +static resource_size_t __init i830_mem_size(void) > { > return read_pci_config_byte(0, 0, 0, I830_DRB3) * MB(32); > } > > -static size_t __init i85x_mem_size(void) > +static resource_size_t __init i85x_mem_size(void) > { > return read_pci_config_byte(0, 0, 1, I85X_DRB3) * MB(32); > } > @@ -297,36 +297,36 @@ static size_t __init i85x_mem_size(void) > * On 830/845/85x the stolen memory base isn't available in any > * register. We need to calculate it as TOM-TSEG_SIZE-stolen_size. > */ > -static phys_addr_t __init i830_stolen_base(int num, int slot, int func, > - size_t stolen_size) > +static resource_size_t __init i830_stolen_base(int num, int slot, int func, > + resource_size_t stolen_size) > { > - return (phys_addr_t)i830_mem_size() - i830_tseg_size() - stolen_size; > + return i830_mem_size() - i830_tseg_size() - stolen_size; > } > > -static phys_addr_t __init i845_stolen_base(int num, int slot, int func, > - size_t stolen_size) > +static resource_size_t __init i845_stolen_base(int num, int slot, int func, > + resource_size_t stolen_size) > { > - return (phys_addr_t)i830_mem_size() - i845_tseg_size() - stolen_size; > + return i830_mem_size() - i845_tseg_size() - stolen_size; > } > > -static phys_addr_t __init i85x_stolen_base(int num, int slot, int func, > - size_t stolen_size) > +static resource_size_t __init i85x_stolen_base(int num, int slot, int func, > + resource_size_t stolen_size) > { > - return (phys_addr_t)i85x_mem_size() - i85x_tseg_size() - stolen_size; > + return i85x_mem_size() - i85x_tseg_size() - stolen_size; > } > > -static phys_addr_t __init i865_stolen_base(int num, int slot, int func, > - size_t stolen_size) > +static resource_size_t __init i865_stolen_base(int num, int slot, int func, > + resource_size_t stolen_size) > { > u16 toud = 0; > > toud = read_pci_config_16(0, 0, 0, I865_TOUD); > > - return (phys_addr_t)(toud << 16) + i845_tseg_size(); > + return toud * KB(64) + i845_tseg_size(); > } > > -static phys_addr_t __init gen3_stolen_base(int num, int slot, int func, > - size_t stolen_size) > +static resource_size_t __init gen3_stolen_base(int num, int slot, int func, > + resource_size_t stolen_size) > { > u32 bsm; > > @@ -337,10 +337,10 @@ static phys_addr_t __init gen3_stolen_base(int num, int slot, int func, > */ > bsm = read_pci_config(num, slot, func, INTEL_BSM); > > - return (phys_addr_t)bsm & INTEL_BSM_MASK; > + return bsm & INTEL_BSM_MASK; > } > > -static size_t __init i830_stolen_size(int num, int slot, int func) > +static resource_size_t __init i830_stolen_size(int num, int slot, int func) > { > u16 gmch_ctrl; > u16 gms; > @@ -361,7 +361,7 @@ static size_t __init i830_stolen_size(int num, int slot, int func) > return 0; > } > > -static size_t __init gen3_stolen_size(int num, int slot, int func) > +static resource_size_t __init gen3_stolen_size(int num, int slot, int func) > { > u16 gmch_ctrl; > u16 gms; > @@ -390,7 +390,7 @@ static size_t __init gen3_stolen_size(int num, int slot, int func) > return 0; > } > > -static size_t __init gen6_stolen_size(int num, int slot, int func) > +static resource_size_t __init gen6_stolen_size(int num, int slot, int func) > { > u16 gmch_ctrl; > u16 gms; > @@ -398,10 +398,10 @@ static size_t __init gen6_stolen_size(int num, int slot, int func) > gmch_ctrl = read_pci_config_16(num, slot, func, SNB_GMCH_CTRL); > gms = (gmch_ctrl >> SNB_GMCH_GMS_SHIFT) & SNB_GMCH_GMS_MASK; > > - return (size_t)gms * MB(32); > + return gms * MB(32); > } > > -static size_t __init gen8_stolen_size(int num, int slot, int func) > +static resource_size_t __init gen8_stolen_size(int num, int slot, int func) > { > u16 gmch_ctrl; > u16 gms; > @@ -409,10 +409,10 @@ static size_t __init gen8_stolen_size(int num, int slot, int func) > gmch_ctrl = read_pci_config_16(num, slot, func, SNB_GMCH_CTRL); > gms = (gmch_ctrl >> BDW_GMCH_GMS_SHIFT) & BDW_GMCH_GMS_MASK; > > - return (size_t)gms * MB(32); > + return gms * MB(32); > } > > -static size_t __init chv_stolen_size(int num, int slot, int func) > +static resource_size_t __init chv_stolen_size(int num, int slot, int func) > { > u16 gmch_ctrl; > u16 gms; > @@ -426,14 +426,14 @@ static size_t __init chv_stolen_size(int num, int slot, int func) > * 0x17 to 0x1d: 4MB increments start at 36MB > */ > if (gms < 0x11) > - return (size_t)gms * MB(32); > + return gms * MB(32); > else if (gms < 0x17) > - return (size_t)(gms - 0x11 + 2) * MB(4); > + return (gms - 0x11 + 2) * MB(4); > else > - return (size_t)(gms - 0x17 + 9) * MB(4); > + return (gms - 0x17 + 9) * MB(4); > } > > -static size_t __init gen9_stolen_size(int num, int slot, int func) > +static resource_size_t __init gen9_stolen_size(int num, int slot, int func) > { > u16 gmch_ctrl; > u16 gms; > @@ -444,14 +444,15 @@ static size_t __init gen9_stolen_size(int num, int slot, int func) > /* 0x0 to 0xef: 32MB increments starting at 0MB */ > /* 0xf0 to 0xfe: 4MB increments starting at 4MB */ > if (gms < 0xf0) > - return (size_t)gms * MB(32); > + return gms * MB(32); > else > - return (size_t)(gms - 0xf0 + 1) * MB(4); > + return (gms - 0xf0 + 1) * MB(4); > } > > struct intel_early_ops { > - size_t (*stolen_size)(int num, int slot, int func); > - phys_addr_t (*stolen_base)(int num, int slot, int func, size_t size); > + resource_size_t (*stolen_size)(int num, int slot, int func); > + resource_size_t (*stolen_base)(int num, int slot, int func, > + resource_size_t size); > }; > > static const struct intel_early_ops i830_early_ops __initconst = { > @@ -531,12 +532,15 @@ static const struct pci_device_id intel_early_ids[] __initconst = { > INTEL_CNL_IDS(&gen9_early_ops), > }; > > +struct resource intel_graphics_stolen_res __ro_after_init = DEFINE_RES_MEM(0, 0); > +EXPORT_SYMBOL(intel_graphics_stolen_res); > + > static void __init > intel_graphics_stolen(int num, int slot, int func, > const struct intel_early_ops *early_ops) > { > - phys_addr_t base, end; > - size_t size; > + resource_size_t base, size; > + resource_size_t end; > > size = early_ops->stolen_size(num, slot, func); > base = early_ops->stolen_base(num, slot, func, size); > @@ -545,8 +549,12 @@ intel_graphics_stolen(int num, int slot, int func, > return; > > end = base + size - 1; > - printk(KERN_INFO "Reserving Intel graphics memory at %pa-%pa\n", > - &base, &end); > + > + intel_graphics_stolen_res.start = base; > + intel_graphics_stolen_res.end = end; > + > + printk(KERN_INFO "Reserving Intel graphics memory at %pR\n", > + &intel_graphics_stolen_res); > > /* Mark this space as reserved */ > e820__range_add(base, size, E820_TYPE_RESERVED); > diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h > index 4e1b274e1164..c9e5a6621b95 100644 > --- a/include/drm/i915_drm.h > +++ b/include/drm/i915_drm.h > @@ -36,6 +36,9 @@ extern bool i915_gpu_lower(void); > extern bool i915_gpu_busy(void); > extern bool i915_gpu_turbo_disable(void); > > +/* Exported from arch/x86/kernel/early-quirks.c */ > +extern struct resource intel_graphics_stolen_res; > + > /* > * The Bridge device's PCI config space has information about the > * fb aperture size and the amount of pre-reserved memory. -- Joonas Lahtinen Open Source Technology Center Intel Corporation