* [PATCH] Fix UV4 Hub Revision adjustment
@ 2020-12-03 15:22 Mike Travis
2020-12-03 15:59 ` Steve Wahl
2020-12-03 17:25 ` [tip: x86/urgent] x86/platform/uv: Fix UV4 hub revision adjustment tip-bot2 for Mike Travis
0 siblings, 2 replies; 3+ messages in thread
From: Mike Travis @ 2020-12-03 15:22 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, Borislav Petkov, Hans de Goede,
Steve Wahl, x86
Cc: Mike Travis, Dimitri Sivanich, Russ Anderson, H. Peter Anvin,
linux-kernel
Fix UV4 Hub Revision adjustment as Hub chip starts with revision 1.
Incorrectly identifies UV4 as UV4A and UV4A as UV5.
Fixes 647128f1536ef: x86/platform/uv: Update UV MMRs for UV5
Signed-off-by: Mike Travis <mike.travis@hpe.com>
Acked-by: Dimitri Sivanich <dimitri.sivanich@hpe.com>
---
arch/x86/kernel/apic/x2apic_uv_x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 1b98f8c12b96..235f5cde06fc 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -161,7 +161,7 @@ static int __init early_set_hub_type(void)
/* UV4/4A only have a revision difference */
case UV4_HUB_PART_NUMBER:
uv_min_hub_revision_id = node_id.s.revision
- + UV4_HUB_REVISION_BASE;
+ + UV4_HUB_REVISION_BASE - 1;
uv_hub_type_set(UV4);
if (uv_min_hub_revision_id == UV4A_HUB_REVISION_BASE)
uv_hub_type_set(UV4|UV4A);
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix UV4 Hub Revision adjustment
2020-12-03 15:22 [PATCH] Fix UV4 Hub Revision adjustment Mike Travis
@ 2020-12-03 15:59 ` Steve Wahl
2020-12-03 17:25 ` [tip: x86/urgent] x86/platform/uv: Fix UV4 hub revision adjustment tip-bot2 for Mike Travis
1 sibling, 0 replies; 3+ messages in thread
From: Steve Wahl @ 2020-12-03 15:59 UTC (permalink / raw)
To: Mike Travis
Cc: Thomas Gleixner, Ingo Molnar, Borislav Petkov, Hans de Goede,
Steve Wahl, x86, Dimitri Sivanich, Russ Anderson, H. Peter Anvin,
linux-kernel
Reviewed-by: Steve Wahl <steve.wahl@hpe.com>
On Thu, Dec 03, 2020 at 09:22:52AM -0600, Mike Travis wrote:
> Fix UV4 Hub Revision adjustment as Hub chip starts with revision 1.
> Incorrectly identifies UV4 as UV4A and UV4A as UV5.
>
> Fixes 647128f1536ef: x86/platform/uv: Update UV MMRs for UV5
>
> Signed-off-by: Mike Travis <mike.travis@hpe.com>
> Acked-by: Dimitri Sivanich <dimitri.sivanich@hpe.com>
> ---
> arch/x86/kernel/apic/x2apic_uv_x.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
> index 1b98f8c12b96..235f5cde06fc 100644
> --- a/arch/x86/kernel/apic/x2apic_uv_x.c
> +++ b/arch/x86/kernel/apic/x2apic_uv_x.c
> @@ -161,7 +161,7 @@ static int __init early_set_hub_type(void)
> /* UV4/4A only have a revision difference */
> case UV4_HUB_PART_NUMBER:
> uv_min_hub_revision_id = node_id.s.revision
> - + UV4_HUB_REVISION_BASE;
> + + UV4_HUB_REVISION_BASE - 1;
> uv_hub_type_set(UV4);
> if (uv_min_hub_revision_id == UV4A_HUB_REVISION_BASE)
> uv_hub_type_set(UV4|UV4A);
> --
> 2.21.0
>
--
Steve Wahl, Hewlett Packard Enterprise
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip: x86/urgent] x86/platform/uv: Fix UV4 hub revision adjustment
2020-12-03 15:22 [PATCH] Fix UV4 Hub Revision adjustment Mike Travis
2020-12-03 15:59 ` Steve Wahl
@ 2020-12-03 17:25 ` tip-bot2 for Mike Travis
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Mike Travis @ 2020-12-03 17:25 UTC (permalink / raw)
To: linux-tip-commits
Cc: Mike Travis, Borislav Petkov, Steve Wahl, Dimitri Sivanich, x86,
linux-kernel
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 8dcc0e19dfbd73ad6b3172924d6da8f7f3f8b3b0
Gitweb: https://git.kernel.org/tip/8dcc0e19dfbd73ad6b3172924d6da8f7f3f8b3b0
Author: Mike Travis <mike.travis@hpe.com>
AuthorDate: Thu, 03 Dec 2020 09:22:52 -06:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Thu, 03 Dec 2020 18:09:18 +01:00
x86/platform/uv: Fix UV4 hub revision adjustment
Currently, UV4 is incorrectly identified as UV4A and UV4A as UV5. Hub
chip starts with revision 1, fix it.
[ bp: Massage commit message. ]
Fixes: 647128f1536e ("x86/platform/uv: Update UV MMRs for UV5")
Signed-off-by: Mike Travis <mike.travis@hpe.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Steve Wahl <steve.wahl@hpe.com>
Acked-by: Dimitri Sivanich <dimitri.sivanich@hpe.com>
Link: https://lkml.kernel.org/r/20201203152252.371199-1-mike.travis@hpe.com
---
arch/x86/kernel/apic/x2apic_uv_x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 1b98f8c..235f5cd 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -161,7 +161,7 @@ static int __init early_set_hub_type(void)
/* UV4/4A only have a revision difference */
case UV4_HUB_PART_NUMBER:
uv_min_hub_revision_id = node_id.s.revision
- + UV4_HUB_REVISION_BASE;
+ + UV4_HUB_REVISION_BASE - 1;
uv_hub_type_set(UV4);
if (uv_min_hub_revision_id == UV4A_HUB_REVISION_BASE)
uv_hub_type_set(UV4|UV4A);
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-03 17:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-03 15:22 [PATCH] Fix UV4 Hub Revision adjustment Mike Travis
2020-12-03 15:59 ` Steve Wahl
2020-12-03 17:25 ` [tip: x86/urgent] x86/platform/uv: Fix UV4 hub revision adjustment tip-bot2 for Mike Travis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).