OMAP3 HAL cache clean fix

Detail:
  s/Top - Fix cache clean code to iterate sets/ways/cache levels correctly
Admin:
  Tested on rev C2 beagleboard


Version 0.07. Tagged as 'OMAP3-0_07'

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "0.06"
-Module_Version          SETA    6
+Module_MajorVersion     SETS    "0.07"
+Module_Version          SETA    7
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "22 Apr 2009"
-Module_ApplicationDate  SETS    "22-Apr-09"
+Module_Date             SETS    "24 Apr 2009"
+Module_ApplicationDate  SETS    "24-Apr-09"
 Module_ComponentName    SETS    "OMAP3"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/HAL/OMAP3"
-Module_FullVersion      SETS    "0.06"
-Module_HelpVersion      SETS    "0.06 (22 Apr 2009)"
+Module_FullVersion      SETS    "0.07"
+Module_HelpVersion      SETS    "0.07 (24 Apr 2009)"
                         END

VersionNum

-/* (0.06)
+/* (0.07)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.06
+#define Module_MajorVersion_CMHG        0.07
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                22 Apr 2009
+#define Module_Date_CMHG                24 Apr 2009
 
-#define Module_MajorVersion             "0.06"
-#define Module_Version                  6
+#define Module_MajorVersion             "0.07"
+#define Module_Version                  7
 #define Module_MinorVersion             ""
-#define Module_Date                     "22 Apr 2009"
+#define Module_Date                     "24 Apr 2009"
 
-#define Module_ApplicationDate          "22-Apr-09"
+#define Module_ApplicationDate          "24-Apr-09"
 
 #define Module_ComponentName            "OMAP3"
 #define Module_ComponentPath            "castle/RiscOS/Sources/HAL/OMAP3"
 
-#define Module_FullVersion              "0.06"
-#define Module_HelpVersion              "0.06 (22 Apr 2009)"
-#define Module_LibraryVersionInfo       "0:6"
+#define Module_FullVersion              "0.07"
+#define Module_HelpVersion              "0.07 (24 Apr 2009)"
+#define Module_LibraryVersionInfo       "0:7"

s/Top

@@ -154,13 +154,13 @@ restart
         AND     v1, a3, #&7 ; log2(Line size)-2
         BIC     a3, a3, #&F0000007 ; Clear flags & line size
         MOV     v2, a3, LSL #19 ; Number of ways-1 in upper 10 bits
-        MOV     v3, a3, LSR #13 ; Number of sets-1 in upper 15 bits
+        MOV     v3, a3, LSR #13 ; Number of sets-1 in lower 15 bits
         ; Way number needs to be packed right up at the high end of the data word; shift it up
         CLZ     a4, v2
         MOV     v2, v2, LSL a4
-        ; Set number needs to start at log2(Line size)
-        MOV     v3, v3, LSR #15 ; Start at bit 2
-        MOV     v3, v3, LSL v1 ; Start at log2(Line size)
+        ; Set number needs to start at log2(Line size)+2
+        MOV     v3, v3, LSL #4 ; Start at bit 4
+        MOV     v3, v3, LSL v1 ; Start at log2(Line size)+2
         ; Now calculate the offset numbers we will use to increment sets & ways
         BIC     v4, v2, v2, LSL #1 ; Way increment
         BIC     v5, v3, v3, LSL #1 ; Set increment