From: Paul Burton <paul.burton@imgtec.com>
To: <linux-mips@linux-mips.org>
Cc: Paul Burton <paul.burton@imgtec.com>, Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH] fixup: MIPS: CM: Use BIT/GENMASK for register fields, order & drop shifts
Date: Tue, 29 Aug 2017 13:05:37 -0700 [thread overview]
Message-ID: <20170829200537.353-1-paul.burton@imgtec.com> (raw)
In-Reply-To: <20170813024943.14989-4-paul.burton@imgtec.com>
This patch fixes an incorrectly fixed up use of __ffs() on a 64 bit
integer, and a missed usage of CM_GCR_GIC_STATUS_GICEX.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Fixes: 4f1f490f010b ("MIPS: CM: Use BIT/GENMASK for register fields, order & drop shifts")
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---
arch/mips/kernel/mips-cm.c | 2 +-
arch/mips/mti-malta/malta-dtshim.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/mips/kernel/mips-cm.c b/arch/mips/kernel/mips-cm.c
index b0d670af5cb1..e91c8c4e2eb5 100644
--- a/arch/mips/kernel/mips-cm.c
+++ b/arch/mips/kernel/mips-cm.c
@@ -391,7 +391,7 @@ void mips_cm_error_report(void)
ulong core_id_bits, vp_id_bits, cmd_bits, cmd_group_bits;
ulong cm3_cca_bits, mcp_bits, cm3_tr_bits, sched_bit;
- cause = cm_error >> __ffs(CM3_GCR_ERROR_CAUSE_ERRTYPE);
+ cause = cm_error >> __ffs64(CM3_GCR_ERROR_CAUSE_ERRTYPE);
ocause = cm_other >> __ffs(CM_GCR_ERROR_MULT_ERR2ND);
if (!cause)
diff --git a/arch/mips/mti-malta/malta-dtshim.c b/arch/mips/mti-malta/malta-dtshim.c
index 59a723d9a95a..361f7c146b75 100644
--- a/arch/mips/mti-malta/malta-dtshim.c
+++ b/arch/mips/mti-malta/malta-dtshim.c
@@ -236,7 +236,7 @@ static void __init remove_gic(void *fdt)
/* if we have a CM which reports a GIC is present, leave the DT alone */
err = mips_cm_probe();
- if (!err && (read_gcr_gic_status() & CM_GCR_GIC_STATUS_GICEX))
+ if (!err && (read_gcr_gic_status() & CM_GCR_GIC_STATUS_EX))
return;
if (malta_scon() == MIPS_REVISION_SCON_ROCIT) {
--
2.14.1
WARNING: multiple messages have this Message-ID (diff)
From: Paul Burton <paul.burton@imgtec.com>
To: linux-mips@linux-mips.org
Cc: Paul Burton <paul.burton@imgtec.com>, Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH] fixup: MIPS: CM: Use BIT/GENMASK for register fields, order & drop shifts
Date: Tue, 29 Aug 2017 13:05:37 -0700 [thread overview]
Message-ID: <20170829200537.353-1-paul.burton@imgtec.com> (raw)
Message-ID: <20170829200537.KyfWq89WtCaIncA_UpJT6CSDdpiyIwevplTH0Iofjhs@z> (raw)
In-Reply-To: <20170813024943.14989-4-paul.burton@imgtec.com>
This patch fixes an incorrectly fixed up use of __ffs() on a 64 bit
integer, and a missed usage of CM_GCR_GIC_STATUS_GICEX.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Fixes: 4f1f490f010b ("MIPS: CM: Use BIT/GENMASK for register fields, order & drop shifts")
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---
arch/mips/kernel/mips-cm.c | 2 +-
arch/mips/mti-malta/malta-dtshim.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/mips/kernel/mips-cm.c b/arch/mips/kernel/mips-cm.c
index b0d670af5cb1..e91c8c4e2eb5 100644
--- a/arch/mips/kernel/mips-cm.c
+++ b/arch/mips/kernel/mips-cm.c
@@ -391,7 +391,7 @@ void mips_cm_error_report(void)
ulong core_id_bits, vp_id_bits, cmd_bits, cmd_group_bits;
ulong cm3_cca_bits, mcp_bits, cm3_tr_bits, sched_bit;
- cause = cm_error >> __ffs(CM3_GCR_ERROR_CAUSE_ERRTYPE);
+ cause = cm_error >> __ffs64(CM3_GCR_ERROR_CAUSE_ERRTYPE);
ocause = cm_other >> __ffs(CM_GCR_ERROR_MULT_ERR2ND);
if (!cause)
diff --git a/arch/mips/mti-malta/malta-dtshim.c b/arch/mips/mti-malta/malta-dtshim.c
index 59a723d9a95a..361f7c146b75 100644
--- a/arch/mips/mti-malta/malta-dtshim.c
+++ b/arch/mips/mti-malta/malta-dtshim.c
@@ -236,7 +236,7 @@ static void __init remove_gic(void *fdt)
/* if we have a CM which reports a GIC is present, leave the DT alone */
err = mips_cm_probe();
- if (!err && (read_gcr_gic_status() & CM_GCR_GIC_STATUS_GICEX))
+ if (!err && (read_gcr_gic_status() & CM_GCR_GIC_STATUS_EX))
return;
if (malta_scon() == MIPS_REVISION_SCON_ROCIT) {
--
2.14.1
next prev parent reply other threads:[~2017-08-29 20:06 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-13 2:49 [PATCH 00/19] MIPS: Initial multi-cluster support Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 01/19] MIPS: CM: Rename mips_cm_base to mips_gcr_base Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 02/19] MIPS: CM: Specify register size when generating accessors Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 03/19] MIPS: CM: Use BIT/GENMASK for register fields, order & drop shifts Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-29 20:05 ` Paul Burton [this message]
2017-08-29 20:05 ` [PATCH] fixup: " Paul Burton
2017-08-13 2:49 ` [PATCH 04/19] MIPS: CPC: Use common CPS accessor generation macros Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 05/19] MIPS: CPC: Use BIT/GENMASK for register fields, order & drop shifts Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 06/19] MIPS: CPS: Introduce register modify (set/clear/change) accessors Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 07/19] MIPS: CPS: Use change_*, set_* & clear_* where appropriate Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 08/19] MIPS: CPS: Add CM/CPC 3.5 register definitions Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 09/19] MIPS: Add accessor & bit definitions for GlobalNumber Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 10/19] MIPS: CPS: Use GlobalNumber macros rather than magic numbers Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 11/19] MIPS: Abstract CPU core & VP(E) ID access through accessor functions Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 12/19] MIPS: Store core & VP IDs in GlobalNumber-style variable Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 13/19] MIPS: Unify checks for sibling CPUs Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-26 12:27 ` Ralf Baechle
2017-08-26 12:49 ` Rafael J. Wysocki
2017-08-29 7:42 ` Daniel Lezcano
2017-08-13 2:49 ` [PATCH 14/19] MIPS: Add CPU cluster number accessors Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 15/19] MIPS: CM: Add cluster & block args to mips_cm_lock_other() Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 16/19] MIPS: SMP: Allow boot_secondary SMP op to return errors Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-13 2:49 ` [PATCH 17/19] MIPS: CPS: Have asm/mips-cps.h include CM & CPC headers Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-29 20:07 ` [PATCH] fixup: " Paul Burton
2017-08-29 20:07 ` Paul Burton
2017-08-13 2:49 ` [PATCH 18/19] MIPS: CPS: Cluster support for topology functions Paul Burton
2017-08-13 2:49 ` Paul Burton
2017-08-29 20:08 ` [PATCH] fixup: " Paul Burton
2017-08-29 20:08 ` Paul Burton
2017-08-13 2:49 ` [PATCH 19/19] MIPS: CPS: Detect CPUs in secondary clusters Paul Burton
2017-08-13 2:49 ` Paul Burton
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=20170829200537.353-1-paul.burton@imgtec.com \
--to=paul.burton@imgtec.com \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox