All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
	"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
	"Chris Wilson" <chris@chris-wilson.co.uk>,
	"Paulo Zanoni" <paulo.r.zanoni@intel.com>,
	"Thomas Gleixner" <tglx@linutronix.de>,
	"Ingo Molnar" <mingo@kernel.org>,
	"H . Peter Anvin" <hpa@zytor.com>,
	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	[thread overview]
Message-ID: <20171205210249.8875-4-matthew.auld@intel.com> (raw)
In-Reply-To: <20171205210249.8875-1-matthew.auld@intel.com>

Makes things a little easier to follow.

Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
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

WARNING: multiple messages have this Message-ID (diff)
From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: x86@kernel.org, Paulo Zanoni <paulo.r.zanoni@intel.com>,
	linux-kernel@vger.kernel.org, "H . Peter Anvin" <hpa@zytor.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@kernel.org>
Subject: [PATCH 3/9] x86/early-quirks: reverse the if ladders
Date: Tue,  5 Dec 2017 21:02:43 +0000	[thread overview]
Message-ID: <20171205210249.8875-4-matthew.auld@intel.com> (raw)
In-Reply-To: <20171205210249.8875-1-matthew.auld@intel.com>

Makes things a little easier to follow.

Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2017-12-05 21:03 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-05 21:02 [PATCH 0/9] make stolen resource centric Matthew Auld
2017-12-05 21:02 ` [PATCH 1/9] x86/early-quirks: Extend Intel graphics stolen memory placement to 64bit Matthew Auld
2017-12-05 21:02 ` [PATCH 2/9] x86/early-quirks: replace the magical increment start values Matthew Auld
2017-12-05 21:02   ` Matthew Auld
2017-12-05 21:02 ` Matthew Auld [this message]
2017-12-05 21:02   ` [PATCH 3/9] x86/early-quirks: reverse the if ladders Matthew Auld
2017-12-05 21:08   ` Ville Syrjälä
2017-12-05 21:08     ` Ville Syrjälä
2017-12-05 21:02 ` [PATCH 4/9] drm/i915: nuke the duplicated stolen discovery Matthew Auld
2017-12-05 21:02 ` [PATCH 5/9] drm/i915: make dsm struct resource centric Matthew Auld
2017-12-05 23:30   ` Chris Wilson
2017-12-05 21:02 ` [PATCH 6/9] drm/i915: make reserved " Matthew Auld
2017-12-05 23:27   ` Chris Wilson
2017-12-05 21:02 ` [PATCH 7/9] drm/i915: make mappable " Matthew Auld
2017-12-05 23:26   ` Chris Wilson
2017-12-05 21:02 ` [PATCH 8/9] drm/i915: prefer resource_size_t for everything stolen Matthew Auld
2017-12-05 23:22   ` Chris Wilson
2017-12-05 21:02 ` [PATCH 9/9] drm/i915: use stolen_usable_size for the range sanity check Matthew Auld
2017-12-05 21:25 ` ✓ Fi.CI.BAT: success for make stolen resource centric (rev4) Patchwork
2017-12-05 22:50 ` ✗ Fi.CI.IGT: failure " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2017-12-07 12:28 [PATCH 0/9] make stolen resource centric Matthew Auld
2017-12-07 12:28 ` [PATCH 3/9] x86/early-quirks: reverse the if ladders Matthew Auld
2017-12-07 12:28   ` Matthew Auld
2017-12-08 23:05   ` Thomas Gleixner
2017-12-08 23:05     ` Thomas Gleixner
2017-11-24 21:29 [PATCH 0/9] make stolen resource centric Matthew Auld
2017-11-24 21:29 ` [PATCH 3/9] x86/early-quirks: reverse the if ladders Matthew Auld

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171205210249.8875-4-matthew.auld@intel.com \
    --to=matthew.auld@intel.com \
    --cc=chris@chris-wilson.co.uk \
    --cc=hpa@zytor.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=joonas.lahtinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=paulo.r.zanoni@intel.com \
    --cc=tglx@linutronix.de \
    --cc=ville.syrjala@linux.intel.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.