This is a note to let you know that I've just added the patch titled
mips: ralink: mt7621: define MT7621_SYSC_BASE with __iomem
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mips-ralink-mt7621-define-mt7621_sysc_base-with-__iomem.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a2cab953b4c077cc02878d424466d3a6eac32aaf Mon Sep 17 00:00:00 2001
From: John Thomson <git@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Mon, 14 Nov 2022 11:56:56 +1000
Subject: mips: ralink: mt7621: define MT7621_SYSC_BASE with __iomem
From: John Thomson <git@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit a2cab953b4c077cc02878d424466d3a6eac32aaf upstream.
So that MT7621_SYSC_BASE can be used later in multiple functions without
needing to repeat this __iomem declaration each time
Signed-off-by: John Thomson <git@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/mips/include/asm/mach-ralink/mt7621.h | 4 +++-
arch/mips/ralink/mt7621.c | 7 +++----
2 files changed, 6 insertions(+), 5 deletions(-)
--- a/arch/mips/include/asm/mach-ralink/mt7621.h
+++ b/arch/mips/include/asm/mach-ralink/mt7621.h
@@ -7,10 +7,12 @@
#ifndef _MT7621_REGS_H_
#define _MT7621_REGS_H_
+#define IOMEM(x) ((void __iomem *)(KSEG1ADDR(x)))
+
#define MT7621_PALMBUS_BASE 0x1C000000
#define MT7621_PALMBUS_SIZE 0x03FFFFFF
-#define MT7621_SYSC_BASE 0x1E000000
+#define MT7621_SYSC_BASE IOMEM(0x1E000000)
#define SYSC_REG_CHIP_NAME0 0x00
#define SYSC_REG_CHIP_NAME1 0x04
--- a/arch/mips/ralink/mt7621.c
+++ b/arch/mips/ralink/mt7621.c
@@ -126,7 +126,6 @@ static void soc_dev_init(struct ralink_s
void __init prom_soc_init(struct ralink_soc_info *soc_info)
{
- void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7621_SYSC_BASE);
unsigned char *name = NULL;
u32 n0;
u32 n1;
@@ -154,8 +153,8 @@ void __init prom_soc_init(struct ralink_
__sync();
}
- n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);
- n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
+ n0 = __raw_readl(MT7621_SYSC_BASE + SYSC_REG_CHIP_NAME0);
+ n1 = __raw_readl(MT7621_SYSC_BASE + SYSC_REG_CHIP_NAME1);
if (n0 == MT7621_CHIP_NAME0 && n1 == MT7621_CHIP_NAME1) {
name = "MT7621";
@@ -164,7 +163,7 @@ void __init prom_soc_init(struct ralink_
panic("mt7621: unknown SoC, n0:%08x n1:%08x\n", n0, n1);
}
ralink_soc = MT762X_SOC_MT7621AT;
- rev = __raw_readl(sysc + SYSC_REG_CHIP_REV);
+ rev = __raw_readl(MT7621_SYSC_BASE + SYSC_REG_CHIP_REV);
snprintf(soc_info->sys_type, RAMIPS_SYS_TYPE_LEN,
"MediaTek %s ver:%u eco:%u",
Patches currently in stable-queue which might be from git@xxxxxxxxxxxxxxxxxxxxxxxxxxx are
queue-6.1/mips-ralink-mt7621-do-not-use-kzalloc-too-early.patch
queue-6.1/mips-ralink-mt7621-soc-queries-and-tests-as-functions.patch
queue-6.1/mips-ralink-mt7621-define-mt7621_sysc_base-with-__iomem.patch
queue-6.1/pci-mt7621-add-sentinel-to-quirks-table.patch
