From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753236AbdLGMiM (ORCPT ); Thu, 7 Dec 2017 07:38:12 -0500 Received: from mga18.intel.com ([134.134.136.126]:40936 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752698AbdLGMiL (ORCPT ); Thu, 7 Dec 2017 07:38:11 -0500 X-Greylist: delayed 567 seconds by postgrey-1.27 at vger.kernel.org; Thu, 07 Dec 2017 07:38:11 EST X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,373,1508828400"; d="scan'208";a="10360729" 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 2/9] x86/early-quirks: replace the magical increment start values Date: Thu, 7 Dec 2017 12:28:32 +0000 Message-Id: <20171207122839.29925-3-matthew.auld@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171207122839.29925-1-matthew.auld@intel.com> References: <20171207122839.29925-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 Replace the magical +2, +9 etc. with +MB, which is far easier to read. Suggested-by: Ville Syrjälä 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: Ville Syrjälä --- arch/x86/kernel/early-quirks.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index b5855b00a8cc..ef0f4190f290 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -428,9 +428,9 @@ static resource_size_t __init chv_stolen_size(int num, int slot, int func) if (gms < 0x11) return gms * MB(32); else if (gms < 0x17) - return (gms - 0x11 + 2) * MB(4); + return (gms - 0x11) * MB(4) + MB(8); else - return (gms - 0x17 + 9) * MB(4); + return (gms - 0x17) * MB(4) + MB(36); } static resource_size_t __init gen9_stolen_size(int num, int slot, int func) @@ -446,7 +446,7 @@ static resource_size_t __init gen9_stolen_size(int num, int slot, int func) if (gms < 0xf0) return gms * MB(32); else - return (gms - 0xf0 + 1) * MB(4); + return (gms - 0xf0) * MB(4) + MB(4); } struct intel_early_ops { -- 2.14.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 2/9] x86/early-quirks: replace the magical increment start values Date: Thu, 7 Dec 2017 12:28:32 +0000 Message-ID: <20171207122839.29925-3-matthew.auld@intel.com> References: <20171207122839.29925-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 535856E7E8 for ; Thu, 7 Dec 2017 12:28:47 +0000 (UTC) In-Reply-To: <20171207122839.29925-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 UmVwbGFjZSB0aGUgbWFnaWNhbCArMiwgKzkgZXRjLiB3aXRoICtNQiwgd2hpY2ggaXMgZmFyIGVh c2llciB0byByZWFkLgoKU3VnZ2VzdGVkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcu YXVsZEBpbnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51 eC5pbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50 ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBQ YXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KQ2M6IFRob21hcyBHbGVpeG5l ciA8dGdseEBsaW51dHJvbml4LmRlPgpDYzogSW5nbyBNb2xuYXIgPG1pbmdvQGtlcm5lbC5vcmc+ CkNjOiBILiBQZXRlciBBbnZpbiA8aHBhQHp5dG9yLmNvbT4KQ2M6IHg4NkBrZXJuZWwub3JnCkNj OiBsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnClJldmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rs w6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGFyY2gveDg2L2tlcm5lbC9l YXJseS1xdWlya3MuYyB8IDYgKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCsp LCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC9lYXJseS1xdWly a3MuYyBiL2FyY2gveDg2L2tlcm5lbC9lYXJseS1xdWlya3MuYwppbmRleCBiNTg1NWIwMGE4Y2Mu LmVmMGY0MTkwZjI5MCAxMDA2NDQKLS0tIGEvYXJjaC94ODYva2VybmVsL2Vhcmx5LXF1aXJrcy5j CisrKyBiL2FyY2gveDg2L2tlcm5lbC9lYXJseS1xdWlya3MuYwpAQCAtNDI4LDkgKzQyOCw5IEBA IHN0YXRpYyByZXNvdXJjZV9zaXplX3QgX19pbml0IGNodl9zdG9sZW5fc2l6ZShpbnQgbnVtLCBp bnQgc2xvdCwgaW50IGZ1bmMpCiAJaWYgKGdtcyA8IDB4MTEpCiAJCXJldHVybiBnbXMgKiBNQigz Mik7CiAJZWxzZSBpZiAoZ21zIDwgMHgxNykKLQkJcmV0dXJuIChnbXMgLSAweDExICsgMikgKiBN Qig0KTsKKwkJcmV0dXJuIChnbXMgLSAweDExKSAqIE1CKDQpICsgTUIoOCk7CiAJZWxzZQotCQly ZXR1cm4gKGdtcyAtIDB4MTcgKyA5KSAqIE1CKDQpOworCQlyZXR1cm4gKGdtcyAtIDB4MTcpICog TUIoNCkgKyBNQigzNik7CiB9CiAKIHN0YXRpYyByZXNvdXJjZV9zaXplX3QgX19pbml0IGdlbjlf c3RvbGVuX3NpemUoaW50IG51bSwgaW50IHNsb3QsIGludCBmdW5jKQpAQCAtNDQ2LDcgKzQ0Niw3 IEBAIHN0YXRpYyByZXNvdXJjZV9zaXplX3QgX19pbml0IGdlbjlfc3RvbGVuX3NpemUoaW50IG51 bSwgaW50IHNsb3QsIGludCBmdW5jKQogCWlmIChnbXMgPCAweGYwKQogCQlyZXR1cm4gZ21zICog TUIoMzIpOwogCWVsc2UKLQkJcmV0dXJuIChnbXMgLSAweGYwICsgMSkgKiBNQig0KTsKKwkJcmV0 dXJuIChnbXMgLSAweGYwKSAqIE1CKDQpICsgTUIoNCk7CiB9CiAKIHN0cnVjdCBpbnRlbF9lYXJs eV9vcHMgewotLSAKMi4xNC4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK