From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 3/9] x86/early-quirks: reverse the if ladders Date: Tue, 5 Dec 2017 21:02:43 +0000 Message-ID: <20171205210249.8875-4-matthew.auld@intel.com> References: <20171205210249.8875-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id D44AC6E118 for ; Tue, 5 Dec 2017 21:02:58 +0000 (UTC) In-Reply-To: <20171205210249.8875-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 TWFrZXMgdGhpbmdzIGEgbGl0dGxlIGVhc2llciB0byBmb2xsb3cuCgpTdWdnZXN0ZWQtYnk6IFZp bGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IE1hdHRoZXcgQXVsZCA8bWF0dGhldy5hdWxkQGludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0 aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KQ2M6IFZpbGxlIFN5cmrDpGzD pCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlz QGNocmlzLXdpbHNvbi5jby51az4KQ2M6IFBhdWxvIFphbm9uaSA8cGF1bG8uci56YW5vbmlAaW50 ZWwuY29tPgpDYzogVGhvbWFzIEdsZWl4bmVyIDx0Z2x4QGxpbnV0cm9uaXguZGU+CkNjOiBJbmdv IE1vbG5hciA8bWluZ29Aa2VybmVsLm9yZz4KQ2M6IEguIFBldGVyIEFudmluIDxocGFAenl0b3Iu Y29tPgpDYzogeDg2QGtlcm5lbC5vcmcKQ2M6IGxpbnV4LWtlcm5lbEB2Z2VyLmtlcm5lbC5vcmcK LS0tCiBhcmNoL3g4Ni9rZXJuZWwvZWFybHktcXVpcmtzLmMgfCAxNCArKysrKysrLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9hcmNoL3g4Ni9rZXJuZWwvZWFybHktcXVpcmtzLmMgYi9hcmNoL3g4Ni9rZXJuZWwvZWFy bHktcXVpcmtzLmMKaW5kZXggYjViOTEyZjNkY2U4Li5iYTZlOTYzODFiZmMgMTAwNjQ0Ci0tLSBh L2FyY2gveDg2L2tlcm5lbC9lYXJseS1xdWlya3MuYworKysgYi9hcmNoL3g4Ni9rZXJuZWwvZWFy bHktcXVpcmtzLmMKQEAgLTQyNSwxMiArNDI1LDEyIEBAIHN0YXRpYyByZXNvdXJjZV9zaXplX3Qg X19pbml0IGNodl9zdG9sZW5fc2l6ZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1bmMpCiAJICog MHgxMSB0byAweDE2OiA0TUIgaW5jcmVtZW50cyBzdGFydGluZyBhdCA4TUIKIAkgKiAweDE3IHRv IDB4MWQ6IDRNQiBpbmNyZW1lbnRzIHN0YXJ0IGF0IDM2TUIKIAkgKi8KLQlpZiAoZ21zIDwgMHgx MSkKLQkJcmV0dXJuIGdtcyAqIE1CKDMyKTsKLQllbHNlIGlmIChnbXMgPCAweDE3KQorCWlmIChn bXMgPj0gMHgxNykKKwkJcmV0dXJuIChnbXMgLSAweDE3KSAqIE1CKDQpICsgTUIoMzYpOworCWVs c2UgaWYgKGdtcyA+PSAweDExKQogCQlyZXR1cm4gKGdtcyAtIDB4MTEpICogTUIoNCkgKyBNQig4 KTsKIAllbHNlCi0JCXJldHVybiAoZ21zIC0gMHgxNykgKiBNQig0KSArIE1CKDM2KTsKKwkJcmV0 dXJuIGdtcyAqIE1CKDMyKTsKIH0KIAogc3RhdGljIHJlc291cmNlX3NpemVfdCBfX2luaXQgZ2Vu OV9zdG9sZW5fc2l6ZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1bmMpCkBAIC00NDMsMTAgKzQ0 MywxMCBAQCBzdGF0aWMgcmVzb3VyY2Vfc2l6ZV90IF9faW5pdCBnZW45X3N0b2xlbl9zaXplKGlu dCBudW0sIGludCBzbG90LCBpbnQgZnVuYykKIAogCS8qIDB4MCAgdG8gMHhlZjogMzJNQiBpbmNy ZW1lbnRzIHN0YXJ0aW5nIGF0IDBNQiAqLwogCS8qIDB4ZjAgdG8gMHhmZTogNE1CIGluY3JlbWVu dHMgc3RhcnRpbmcgYXQgNE1CICovCi0JaWYgKGdtcyA8IDB4ZjApCi0JCXJldHVybiBnbXMgKiBN QigzMik7Ci0JZWxzZQorCWlmIChnbXMgPj0gMHhmMCkKIAkJcmV0dXJuIChnbXMgLSAweGYwKSAq IE1CKDQpICsgTUIoNCk7CisJZWxzZQorCQlyZXR1cm4gZ21zICogTUIoMzIpOwogfQogCiBzdHJ1 Y3QgaW50ZWxfZWFybHlfb3BzIHsKLS0gCjIuMTQuMwoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752143AbdLEVDF (ORCPT ); Tue, 5 Dec 2017 16:03:05 -0500 Received: from mga09.intel.com ([134.134.136.24]:58548 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751757AbdLEVC7 (ORCPT ); Tue, 5 Dec 2017 16:02:59 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,365,1508828400"; d="scan'208";a="181662532" 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 3/9] x86/early-quirks: reverse the if ladders Date: Tue, 5 Dec 2017 21:02:43 +0000 Message-Id: <20171205210249.8875-4-matthew.auld@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171205210249.8875-1-matthew.auld@intel.com> References: <20171205210249.8875-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 Makes things a little easier to follow. 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 --- arch/x86/kernel/early-quirks.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index b5b912f3dce8..ba6e96381bfc 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -425,12 +425,12 @@ static resource_size_t __init chv_stolen_size(int num, int slot, int func) * 0x11 to 0x16: 4MB increments starting at 8MB * 0x17 to 0x1d: 4MB increments start at 36MB */ - if (gms < 0x11) - return gms * MB(32); - else if (gms < 0x17) + if (gms >= 0x17) + return (gms - 0x17) * MB(4) + MB(36); + else if (gms >= 0x11) return (gms - 0x11) * MB(4) + MB(8); else - return (gms - 0x17) * MB(4) + MB(36); + return gms * MB(32); } static resource_size_t __init gen9_stolen_size(int num, int slot, int func) @@ -443,10 +443,10 @@ static resource_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 gms * MB(32); - else + if (gms >= 0xf0) return (gms - 0xf0) * MB(4) + MB(4); + else + return gms * MB(32); } struct intel_early_ops { -- 2.14.3