From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753296AbdLGMiS (ORCPT ); Thu, 7 Dec 2017 07:38:18 -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 S1753253AbdLGMiQ (ORCPT ); Thu, 7 Dec 2017 07:38:16 -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="10360736" 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: Thu, 7 Dec 2017 12:28:33 +0000 Message-Id: <20171207122839.29925-4-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 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 Reviewed-by: Ville Syrjälä --- 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 ef0f4190f290..f5083d82b67b 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