From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH v8 2/9] x86/early-quirks: export the stolen region as a resource Date: Mon, 11 Dec 2017 15:18:15 +0000 Message-ID: <20171211151822.20953-3-matthew.auld@intel.com> References: <20171211151822.20953-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 59B886E1B5 for ; Mon, 11 Dec 2017 15:18:30 +0000 (UTC) In-Reply-To: <20171211151822.20953-1-matthew.auld@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: x86@kernel.org, Paulo Zanoni , linux-kernel@vger.kernel.org, "H . Peter Anvin" , Thomas Gleixner , Ingo Molnar List-Id: intel-gfx@lists.freedesktop.org V2UgZHVwbGljYXRlIHRoZSBzdG9sZW4gZGlzY292ZXJ5IGNvZGUgaW4gZWFybHktcXVpcmtzIGFu ZCBpbiBpOTE1LApob3dldmVyIGlmIHdlIGp1c3QgZXhwb3J0IHRoZSByZWdpb24gYXMgYSByZXNv dXJjZSBmcm9tIGVhcmx5LXF1aXJrcyB3ZQpjYW4gbnVrZSB0aGUgZHVwbGljYXRpb24uCgpTaWdu ZWQtb2ZmLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcuYXVsZEBpbnRlbC5jb20+CkNjOiBKb29u YXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBWaWxsZSBT eXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29u IDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFu b25pQGludGVsLmNvbT4KQ2M6IFRob21hcyBHbGVpeG5lciA8dGdseEBsaW51dHJvbml4LmRlPgpD YzogSW5nbyBNb2xuYXIgPG1pbmdvQGtlcm5lbC5vcmc+CkNjOiBILiBQZXRlciBBbnZpbiA8aHBh QHp5dG9yLmNvbT4KQ2M6IHg4NkBrZXJuZWwub3JnCkNjOiBsaW51eC1rZXJuZWxAdmdlci5rZXJu ZWwub3JnCi0tLQogYXJjaC94ODYva2VybmVsL2Vhcmx5LXF1aXJrcy5jIHwgMTEgKysrKysrKysr LS0KIGluY2x1ZGUvZHJtL2k5MTVfZHJtLmggICAgICAgICB8ICAzICsrKwogMiBmaWxlcyBjaGFu Z2VkLCAxMiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gv eDg2L2tlcm5lbC9lYXJseS1xdWlya3MuYyBiL2FyY2gveDg2L2tlcm5lbC9lYXJseS1xdWlya3Mu YwppbmRleCBhMThkZTVmYjllNjguLjZjMTYyNDg4OTAxMSAxMDA2NDQKLS0tIGEvYXJjaC94ODYv a2VybmVsL2Vhcmx5LXF1aXJrcy5jCisrKyBiL2FyY2gveDg2L2tlcm5lbC9lYXJseS1xdWlya3Mu YwpAQCAtNTMyLDYgKzUzMiw5IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgcGNpX2RldmljZV9pZCBp bnRlbF9lYXJseV9pZHNbXSBfX2luaXRjb25zdCA9IHsKIAlJTlRFTF9DTkxfSURTKCZnZW45X2Vh cmx5X29wcyksCiB9OwogCitzdHJ1Y3QgcmVzb3VyY2UgaW50ZWxfZ3JhcGhpY3Nfc3RvbGVuX3Jl cyBfX3JvX2FmdGVyX2luaXQgPSBERUZJTkVfUkVTX01FTSgwLCAwKTsKK0VYUE9SVF9TWU1CT0wo aW50ZWxfZ3JhcGhpY3Nfc3RvbGVuX3Jlcyk7CisKIHN0YXRpYyB2b2lkIF9faW5pdAogaW50ZWxf Z3JhcGhpY3Nfc3RvbGVuKGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYywKIAkJICAgICAgY29u c3Qgc3RydWN0IGludGVsX2Vhcmx5X29wcyAqZWFybHlfb3BzKQpAQCAtNTQ2LDggKzU0OSwxMiBA QCBpbnRlbF9ncmFwaGljc19zdG9sZW4oaW50IG51bSwgaW50IHNsb3QsIGludCBmdW5jLAogCQly ZXR1cm47CiAKIAllbmQgPSBiYXNlICsgc2l6ZSAtIDE7Ci0JcHJpbnRrKEtFUk5fSU5GTyAiUmVz ZXJ2aW5nIEludGVsIGdyYXBoaWNzIG1lbW9yeSBhdCAlcGEtJXBhXG4iLAotCSAgICAgICAmYmFz ZSwgJmVuZCk7CisKKwlpbnRlbF9ncmFwaGljc19zdG9sZW5fcmVzLnN0YXJ0ID0gYmFzZTsKKwlp bnRlbF9ncmFwaGljc19zdG9sZW5fcmVzLmVuZCA9IGVuZDsKKworCXByaW50ayhLRVJOX0lORk8g IlJlc2VydmluZyBJbnRlbCBncmFwaGljcyBtZW1vcnkgYXQgJXBSXG4iLAorCSAgICAgICAmaW50 ZWxfZ3JhcGhpY3Nfc3RvbGVuX3Jlcyk7CiAKIAkvKiBNYXJrIHRoaXMgc3BhY2UgYXMgcmVzZXJ2 ZWQgKi8KIAllODIwX19yYW5nZV9hZGQoYmFzZSwgc2l6ZSwgRTgyMF9UWVBFX1JFU0VSVkVEKTsK ZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2k5MTVfZHJtLmggYi9pbmNsdWRlL2RybS9pOTE1X2Ry bS5oCmluZGV4IDRlMWIyNzRlMTE2NC4uYzllNWE2NjIxYjk1IDEwMDY0NAotLS0gYS9pbmNsdWRl L2RybS9pOTE1X2RybS5oCisrKyBiL2luY2x1ZGUvZHJtL2k5MTVfZHJtLmgKQEAgLTM2LDYgKzM2 LDkgQEAgZXh0ZXJuIGJvb2wgaTkxNV9ncHVfbG93ZXIodm9pZCk7CiBleHRlcm4gYm9vbCBpOTE1 X2dwdV9idXN5KHZvaWQpOwogZXh0ZXJuIGJvb2wgaTkxNV9ncHVfdHVyYm9fZGlzYWJsZSh2b2lk KTsKIAorLyogRXhwb3J0ZWQgZnJvbSBhcmNoL3g4Ni9rZXJuZWwvZWFybHktcXVpcmtzLmMgKi8K K2V4dGVybiBzdHJ1Y3QgcmVzb3VyY2UgaW50ZWxfZ3JhcGhpY3Nfc3RvbGVuX3JlczsKKwogLyoK ICAqIFRoZSBCcmlkZ2UgZGV2aWNlJ3MgUENJIGNvbmZpZyBzcGFjZSBoYXMgaW5mb3JtYXRpb24g YWJvdXQgdGhlCiAgKiBmYiBhcGVydHVyZSBzaXplIGFuZCB0aGUgYW1vdW50IG9mIHByZS1yZXNl cnZlZCBtZW1vcnkuCi0tIAoyLjE0LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752622AbdLKPS6 (ORCPT ); Mon, 11 Dec 2017 10:18:58 -0500 Received: from mga01.intel.com ([192.55.52.88]:19910 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752165AbdLKPSa (ORCPT ); Mon, 11 Dec 2017 10:18:30 -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,392,1508828400"; d="scan'208";a="11403948" From: Matthew Auld To: intel-gfx@lists.freedesktop.org Cc: Joonas Lahtinen , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Chris Wilson , Paulo Zanoni , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 2/9] x86/early-quirks: export the stolen region as a resource Date: Mon, 11 Dec 2017 15:18:15 +0000 Message-Id: <20171211151822.20953-3-matthew.auld@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171211151822.20953-1-matthew.auld@intel.com> References: <20171211151822.20953-1-matthew.auld@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We duplicate the stolen discovery code in early-quirks and in i915, however if we just export the region as a resource from early-quirks we can nuke the duplication. 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 --- arch/x86/kernel/early-quirks.c | 11 +++++++++-- include/drm/i915_drm.h | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index a18de5fb9e68..6c1624889011 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -532,6 +532,9 @@ 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) @@ -546,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. -- 2.14.3