From 238be18d0331a7a87e3ea8ea0d24b78e451357cb Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Sat, 12 Apr 2014 00:08:11 +0200
Subject: hwstub: add proper PP support

- drop support for PP500x: it's very different from other PP and although
  it would be possible to support them, I don't have one to test the code
- make sure only the CPU is started
- add PP descriptor to report chip ID and revision
- add code in shell and lua to support pp (no register description yet)
- compile for ARMv4 because PP502x is an ARM7TDMI

Change-Id: I36c4e465dfc2cfdfe7433b2f65cc8f6f0720fe62
---
 utils/hwstub/stub/pp/target.c | 65 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 61 insertions(+), 4 deletions(-)

(limited to 'utils/hwstub/stub/pp/target.c')

diff --git a/utils/hwstub/stub/pp/target.c b/utils/hwstub/stub/pp/target.c
index 14eab80080..5e3a819114 100644
--- a/utils/hwstub/stub/pp/target.c
+++ b/utils/hwstub/stub/pp/target.c
@@ -30,28 +30,85 @@
  *
  */
 
-/* FIXME wrong for PP500x */
-#define USEC_TIMER   (*(volatile unsigned long *)(0x60005010))
+enum pp_family_t
+{
+    UNKNOWN,
+    PP502x,
+    PP611x
+};
+
+static enum pp_family_t g_pp_family = UNKNOWN;
+
+#define USEC_TIMER      (*(volatile unsigned long *)(0x60005010))
+
+// NOTE only valid for PP502x and above */
+#define PP_VER1          (*(volatile unsigned long *)(0x70000000))
+#define PP_VER2          (*(volatile unsigned long *)(0x70000004))
 
 struct hwstub_target_desc_t __attribute__((aligned(2))) target_descriptor =
 {
     sizeof(struct hwstub_target_desc_t),
     HWSTUB_DT_TARGET,
     HWSTUB_TARGET_PP,
-    "PP500x / PP502x / PP610x"
+    "PP502x / PP611x"
 };
 
+static struct hwstub_pp_desc_t __attribute__((aligned(2))) pp_descriptor =
+{
+    sizeof(struct hwstub_pp_desc_t),
+    HWSTUB_DT_PP,
+    0, {' ', ' '},
+};
+
+static uint16_t char2hex(uint8_t c)
+{
+    if(c >= '0' && c <= '9')
+        return c - '0';
+    else
+        return 0xf;
+}
+
 void target_init(void)
 {
+    /* try to read version for PP502x */
+    if(PP_VER2 >> 16 != ('P' | 'P' << 8))
+    {
+        logf("unidentified PP family");
+        g_pp_family = UNKNOWN;
+    }
+    else
+    {
+        pp_descriptor.wChipID = char2hex((PP_VER2 >> 8) & 0xff) << 12 |
+            char2hex(PP_VER2 & 0xff) << 8 |
+            char2hex((PP_VER1 >> 24) & 0xff) << 4 |
+            char2hex((PP_VER1 >> 16) & 0xff);
+        pp_descriptor.bRevision[0] = (PP_VER1 >> 8) & 0xff;
+        pp_descriptor.bRevision[1] = PP_VER1 & 0xff;
+        if(pp_descriptor.wChipID >= 0x6110)
+        {
+            logf("identified PP611x family");
+            g_pp_family = PP611x;
+        }
+        else
+        {
+            logf("identified PP502x family");
+            g_pp_family = PP502x;
+        }
+    }
 }
 
 void target_get_desc(int desc, void **buffer)
 {
-    *buffer = NULL;
+    if(desc == HWSTUB_DT_PP)
+        *buffer = &pp_descriptor;
+    else
+        *buffer = NULL;
 }
 
 void target_get_config_desc(void *buffer, int *size)
 {
+    memcpy(buffer, &pp_descriptor, sizeof(pp_descriptor));
+    *size += sizeof(pp_descriptor);
 }
 
 void target_udelay(int us)
-- 
cgit v1.2.3