lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 7 Dec 2017 12:28:33 +0000 From: Matthew Auld <matthew.auld@...el.com> To: intel-gfx@...ts.freedesktop.org Cc: Joonas Lahtinen <joonas.lahtinen@...ux.intel.com>, Ville Syrjälä <ville.syrjala@...ux.intel.com>, Chris Wilson <chris@...is-wilson.co.uk>, Paulo Zanoni <paulo.r.zanoni@...el.com>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...nel.org>, "H . Peter Anvin" <hpa@...or.com>, x86@...nel.org, linux-kernel@...r.kernel.org Subject: [PATCH 3/9] x86/early-quirks: reverse the if ladders Makes things a little easier to follow. Suggested-by: Ville Syrjälä <ville.syrjala@...ux.intel.com> Signed-off-by: Matthew Auld <matthew.auld@...el.com> Cc: Joonas Lahtinen <joonas.lahtinen@...ux.intel.com> Cc: Ville Syrjälä <ville.syrjala@...ux.intel.com> Cc: Chris Wilson <chris@...is-wilson.co.uk> Cc: Paulo Zanoni <paulo.r.zanoni@...el.com> Cc: Thomas Gleixner <tglx@...utronix.de> Cc: Ingo Molnar <mingo@...nel.org> Cc: H. Peter Anvin <hpa@...or.com> Cc: x86@...nel.org Cc: linux-kernel@...r.kernel.org Reviewed-by: Ville Syrjälä <ville.syrjala@...ux.intel.com> --- 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
Powered by blists - more mailing lists