diff mbox

psi: Fix a few typos

Message ID 1441834542.26961.7.camel@kernel.crashing.org
State Accepted
Headers show

Commit Message

Benjamin Herrenschmidt Sept. 9, 2015, 9:35 p.m. UTC 
Nothing critical, no functional changes.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
 hw/psi.c      | 12 ++++++------
 include/psi.h | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

Comments

Stewart Smith Sept. 11, 2015, 5:42 a.m. UTC | #1 
Benjamin Herrenschmidt <benh@kernel.crashing.org> writes:
> Nothing critical, no functional changes.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Thanks, applied as of 7d29629
diff mbox

Patch

diff --git a/hw/psi.c b/hw/psi.c
index 982d674..cb0dbab 100644
--- a/hw/psi.c
+++ b/hw/psi.c
@@ -669,11 +669,11 @@  static void psi_register_interrupts(struct psi *psi)
 		/* On P8 we get a block of 8, set up the base/mask
 		 * and mask all the sources for now
 		 */
-		out_be64(psi->regs + PSIHB_ISRN,
-			 SETFIELD(PSIHB_ISRN_COMP, 0ul, psi->interrupt) |
-			 SETFIELD(PSIHB_ISRN_MASK, 0ul, 0x7fff8ul) |
-			 PSIHB_ISRN_DOWNSTREAM_EN |
-			 PSIHB_ISRN_UPSTREAM_EN);
+		out_be64(psi->regs + PSIHB_IRSN,
+			 SETFIELD(PSIHB_IRSN_COMP, 0ul, psi->interrupt) |
+			 SETFIELD(PSIHB_IRSN_MASK, 0ul, 0x7fff8ul) |
+			 PSIHB_IRSN_DOWNSTREAM_EN |
+			 PSIHB_IRSN_UPSTREAM_EN);
 		out_be64(psi->regs + PSIHB_XIVR_FSP,
 			 (0xffull << 32) | (P8_IRQ_PSI_FSP << 29));
 		out_be64(psi->regs + PSIHB_XIVR_OCC,
@@ -843,7 +843,7 @@  static struct psi *psi_probe_p8(struct proc_chip *chip, u64 base)
 		psi->working = true;
 		psi->regs = (void *)(val & ~PSIHB_XSCOM_P8_HBBAR_EN);
 	} else
-		printf("PSI[0x%03x]: Working link not found\n", chip->id);
+		printf("PSI[0x%03x]: Working chip not found\n", chip->id);
 
 	return psi;
 }
diff --git a/include/psi.h b/include/psi.h
index 36240e1..cb8d7ea 100644
--- a/include/psi.h
+++ b/include/psi.h
@@ -91,13 +91,13 @@ 
 #define PSIHB_XIVR_LPC			0x70
 #define PSIHB_XIVR_LOCAL_ERR		0x78
 #define PSIHB_XIVR_HOST_ERR		0x80
-#define PSIHB_ISRN			0x88
-#define PSIHB_ISRN_COMP			PPC_BITMASK(0,18)
-#define PSIHB_ISRN_IRQ_MUX		PPC_BIT(28)
-#define PSIHB_ISRN_IRQ_RESET		PPC_BIT(29)
-#define PSIHB_ISRN_DOWNSTREAM_EN	PPC_BIT(30)
-#define PSIHB_ISRN_UPSTREAM_EN		PPC_BIT(31)
-#define PSIHB_ISRN_MASK			PPC_BITMASK(32,50)
+#define PSIHB_IRSN			0x88
+#define PSIHB_IRSN_COMP			PPC_BITMASK(0,18)
+#define PSIHB_IRSN_IRQ_MUX		PPC_BIT(28)
+#define PSIHB_IRSN_IRQ_RESET		PPC_BIT(29)
+#define PSIHB_IRSN_DOWNSTREAM_EN	PPC_BIT(30)
+#define PSIHB_IRSN_UPSTREAM_EN		PPC_BIT(31)
+#define PSIHB_IRSN_MASK			PPC_BITMASK(32,50)
 
 #define PSIHB_IRQ_STATUS		0x58
 #define   PSIHB_IRQ_STAT_OCC		PPC_BIT(27)