realtek: arch: rtl-otto: add rtl9607 model info support

Add the registers, family id and cpu port defines to the mach header.
Since RTL96xx SoCs has additional "subtype" info, add the respective
property to soc_info struct to be used in prom file.

The same way as rtl838x, the chip_info register requires 0xa to be
written. Similarly, 0xb must be written to get the subtype info.
There doesn't seem any check for testchip in RTL96xx so, we ignore it.

Add subtype information to set_system_type function if it is present
using the added subtype variable.

There are some RTL9607 chips out there with 512MB so add the check
for RTL9607 in the prepare_highmem. The registers are the same as
in RTL9300 so nothing else need to be changed.

Signed-off-by: Rustam Adilov <adilov@tutamail.com>
Link: https://github.com/openwrt/openwrt/pull/23023
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/realtek/files-6.18/arch/mips/include/asm/mach-rtl-otto/mach-rtl-otto.h b/target/linux/realtek/files-6.18/arch/mips/include/asm/mach-rtl-otto/mach-rtl-otto.h
index f85dee65913faa5c9cbce91afcd70d96b81fc6d5..64b1cbe1e3422202f98f8b780e347823ef6cefd7 100644 (file)
--- a/target/linux/realtek/files-6.18/arch/mips/include/asm/mach-rtl-otto/mach-rtl-otto.h
+++ b/target/linux/realtek/files-6.18/arch/mips/include/asm/mach-rtl-otto/mach-rtl-otto.h
@@ -25,6 +25,9 @@
 #define RTL839X_CHIP_INFO              (0x0FF4)
 #define RTL93XX_MODEL_NAME_INFO                (0x0004)
 #define RTL93XX_CHIP_INFO              (0x0008)
+#define RTL96XX_MODEL_NAME_INFO                (0x10000)
+#define RTL96XX_CHIP_INFO              (0x10004)
+#define RTL96XX_CHIP_SUB_INFO          (0x10008)
 
 #define RTL838X_INT_RW_CTRL            (0x0058)
 #define RTL838X_EXT_VERSION            (0x00D0)
@@ -38,12 +41,14 @@
 #define RTL8390_FAMILY_ID              (0x8390)
 #define RTL9300_FAMILY_ID              (0x9300)
 #define RTL9310_FAMILY_ID              (0x9310)
+#define RTL9607_FAMILY_ID              (0x9607)
 
 /* Basic SoC Features */
 #define RTL838X_CPU_PORT               28
 #define RTL839X_CPU_PORT               52
 #define RTL930X_CPU_PORT               28
 #define RTL931X_CPU_PORT               56
+#define RTL9607_CPU_PORT               9
 
 struct rtl83xx_soc_info {
        unsigned char *name;
@@ -52,6 +57,7 @@ struct rtl83xx_soc_info {
        unsigned int revision;
        unsigned int cpu;
        bool testchip;
+       unsigned int subtype;
        int cpu_port;
        int memory_size;
 };

diff --git a/target/linux/realtek/files-6.18/arch/mips/rtl-otto/prom.c b/target/linux/realtek/files-6.18/arch/mips/rtl-otto/prom.c
index e558944964e4a15b050b8920f71fdad8a6795376..7b26426097710e3911554fb1c763ee74e9b1b7c2 100644 (file)
--- a/target/linux/realtek/files-6.18/arch/mips/rtl-otto/prom.c
+++ b/target/linux/realtek/files-6.18/arch/mips/rtl-otto/prom.c
@@ -215,6 +215,23 @@ static void __init rtl93xx_read_details(u32 model)
                soc_info.testchip = true;
 }
 
+static void __init rtl96xx_read_details(u32 model)
+{
+       u32 chip_info, chip_subtype;
+
+       sw_w32(0xa << 28, RTL96XX_CHIP_INFO);
+
+       chip_info = sw_r32(RTL96XX_CHIP_INFO);
+       soc_info.cpu = chip_info & 0xffff;
+
+       sw_w32(0xb << 28, RTL96XX_CHIP_SUB_INFO);
+
+       chip_subtype = sw_r32(RTL96XX_CHIP_SUB_INFO);
+       soc_info.subtype = chip_subtype & 0x1f;
+
+       soc_info.revision = model & 0xf;
+}
+
 static u32 __init read_model(void)
 {
        u32 model, id;
@@ -259,6 +276,16 @@ static u32 __init read_model(void)
                return model;
        }
 
+       model = sw_r32(RTL96XX_MODEL_NAME_INFO);
+       id = model >> 16 & 0xffff;
+       if (id == 0x9607) {
+               soc_info.id = id;
+               soc_info.family = RTL9607_FAMILY_ID;
+               soc_info.cpu_port = RTL9607_CPU_PORT;
+               rtl96xx_read_details(model);
+               return model;
+       }
+
        return 0;
 }
 
@@ -281,6 +308,7 @@ static void __init set_system_type(void)
 {
        char revision = '?';
        char *es = "";
+       char subtype[12] = "";
 
        if (soc_info.revision >= 0 && soc_info.revision < 26)
                revision = 'A' + soc_info.revision;
@@ -288,9 +316,12 @@ static void __init set_system_type(void)
        if (soc_info.testchip)
                es = " ES";
 
+       if (soc_info.subtype)
+               snprintf(subtype, sizeof(subtype), " subtype %02X", soc_info.subtype);
+
        snprintf(rtl_system_type, sizeof(rtl_system_type),
-                "Realtek %s%s rev %c (%04X)",
-                soc_info.name, es, revision, soc_info.cpu);
+                "Realtek %s%s%s rev %c (%04X)",
+                soc_info.name, es, subtype, revision, soc_info.cpu);
 }
 
 static void get_system_memory(void)
@@ -311,8 +342,11 @@ static void get_system_memory(void)
 
 static void prepare_highmem(void)
 {
-       if ((soc_info.family != RTL9300_FAMILY_ID) ||
-           (soc_info.memory_size <= 256 * 1024 * 1024) ||
+       if (soc_info.family != RTL9300_FAMILY_ID &&
+           soc_info.family != RTL9607_FAMILY_ID)
+               return;
+
+       if ((soc_info.memory_size <= 256 * 1024 * 1024) ||
            !IS_ENABLED(CONFIG_HIGHMEM))
                return;