Re: [U-Boot-Users] [PATCH 2/4 V4] PPC: Change lib_ppc/bat_rw.c to use high bats

[Wolfgang Denk]

In message [EMAIL PROTECTED] you wrote:
 From: Becky Bruce [EMAIL PROTECTED]
 
 Currently, this code only deals with BATs 0-3, which makes
 it useless on systems that support BATs 4-7.  Add the
 support for these registers.
 
 Signed-off-by: Becky Bruce [EMAIL PROTECTED]
 ---
 
 No, I'm not striving for a world record in trivial patch resubmissions.
 This fixes a typo where I write DBAT3 with a value intended for DBAT4,
 which, you might imagine, causes much breakage.  Fortunately, nobody but
 me is running this code right now, so I only broke myself :)
 
  include/asm-ppc/mmu.h |6 ++-
  lib_ppc/bat_rw.c  |  132 
 ++---
  2 files changed, 97 insertions(+), 41 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH, MD: Wolfgang Denk  Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
Maintain an awareness for contribution --  to  your  schedule,  your
project, our company. - A Group of Employees

-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users

[U-Boot-Users] [PATCH 2/4 V4] PPC: Change lib_ppc/bat_rw.c to use high bats

[becky . bruce]

From: Becky Bruce [EMAIL PROTECTED]

Currently, this code only deals with BATs 0-3, which makes
it useless on systems that support BATs 4-7.  Add the
support for these registers.

Signed-off-by: Becky Bruce [EMAIL PROTECTED]
---

No, I'm not striving for a world record in trivial patch resubmissions.
This fixes a typo where I write DBAT3 with a value intended for DBAT4,
which, you might imagine, causes much breakage.  Fortunately, nobody but
me is running this code right now, so I only broke myself :)

 include/asm-ppc/mmu.h |6 ++-
 lib_ppc/bat_rw.c  |  132 ++---
 2 files changed, 97 insertions(+), 41 deletions(-)

diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h
index 49d6860..dc4d66c 100644
--- a/include/asm-ppc/mmu.h
+++ b/include/asm-ppc/mmu.h
@@ -140,7 +140,11 @@ extern void _tlbia(void);  /* invalidate all TLB 
entries */
 
 typedef enum {
IBAT0 = 0, IBAT1, IBAT2, IBAT3,
-   DBAT0, DBAT1, DBAT2, DBAT3
+   DBAT0, DBAT1, DBAT2, DBAT3,
+#ifdef CONFIG_HIGH_BATS
+   IBAT4, IBAT5, IBAT6, IBAT7,
+   DBAT4, DBAT5, DBAT6, DBAT7
+#endif
 } ppc_bat_t;
 
 extern int read_bat(ppc_bat_t bat, unsigned long *upper, unsigned long *lower);
diff --git a/lib_ppc/bat_rw.c b/lib_ppc/bat_rw.c
index 912efa7..c87d8b2 100644
--- a/lib_ppc/bat_rw.c
+++ b/lib_ppc/bat_rw.c
@@ -29,46 +29,72 @@
 int write_bat (ppc_bat_t bat, unsigned long upper, unsigned long lower)
 {
switch (bat) {
+   case DBAT0:
+   mtspr (DBAT0L, lower);
+   mtspr (DBAT0U, upper);
+   break;
case IBAT0:
mtspr (IBAT0L, lower);
mtspr (IBAT0U, upper);
break;
-
+   case DBAT1:
+   mtspr (DBAT1L, lower);
+   mtspr (DBAT1U, upper);
+   break;
case IBAT1:
mtspr (IBAT1L, lower);
mtspr (IBAT1U, upper);
break;
-
+   case DBAT2:
+   mtspr (DBAT2L, lower);
+   mtspr (DBAT2U, upper);
+   break;
case IBAT2:
mtspr (IBAT2L, lower);
mtspr (IBAT2U, upper);
break;
-
+   case DBAT3:
+   mtspr (DBAT3L, lower);
+   mtspr (DBAT3U, upper);
+   break;
case IBAT3:
mtspr (IBAT3L, lower);
mtspr (IBAT3U, upper);
break;
-
-   case DBAT0:
-   mtspr (DBAT0L, lower);
-   mtspr (DBAT0U, upper);
+#ifdef CONFIG_HIGH_BATS
+   case DBAT4:
+   mtspr (DBAT4L, lower);
+   mtspr (DBAT4U, upper);
break;
-
-   case DBAT1:
-   mtspr (DBAT1L, lower);
-   mtspr (DBAT1U, upper);
+   case IBAT4:
+   mtspr (IBAT4L, lower);
+   mtspr (IBAT4U, upper);
break;
-
-   case DBAT2:
-   mtspr (DBAT2L, lower);
-   mtspr (DBAT2U, upper);
+   case DBAT5:
+   mtspr (DBAT5L, lower);
+   mtspr (DBAT5U, upper);
break;
-
-   case DBAT3:
-   mtspr (DBAT3L, lower);
-   mtspr (DBAT3U, upper);
+   case IBAT5:
+   mtspr (IBAT5L, lower);
+   mtspr (IBAT5U, upper);
break;
-
+   case DBAT6:
+   mtspr (DBAT6L, lower);
+   mtspr (DBAT6U, upper);
+   break;
+   case IBAT6:
+   mtspr (IBAT6L, lower);
+   mtspr (IBAT6U, upper);
+   break;
+   case DBAT7:
+   mtspr (DBAT7L, lower);
+   mtspr (DBAT7U, upper);
+   break;
+   case IBAT7:
+   mtspr (IBAT7L, lower);
+   mtspr (IBAT7U, upper);
+   break;
+#endif
default:
return (-1);
}
@@ -82,46 +108,72 @@ int read_bat (ppc_bat_t bat, unsigned long *upper, 
unsigned long *lower)
unsigned long register l;
 
switch (bat) {
+   case DBAT0:
+   l = mfspr (DBAT0L);
+   u = mfspr (DBAT0U);
+   break;
case IBAT0:
l = mfspr (IBAT0L);
u = mfspr (IBAT0U);
break;
-
+   case DBAT1:
+   l = mfspr (DBAT1L);
+   u = mfspr (DBAT1U);
+   break;
case IBAT1:
l = mfspr (IBAT1L);
u = mfspr (IBAT1U);
break;
-
+   case DBAT2:
+   l = mfspr (DBAT2L);
+   u = mfspr (DBAT2U);
+   break;
case IBAT2:
l = mfspr (IBAT2L);
u = mfspr (IBAT2U);
break;
-
+   case DBAT3:
+   l = mfspr (DBAT3L);
+   u = mfspr (DBAT3U);
+   break;
case IBAT3:
l = mfspr (IBAT3L);
u = mfspr (IBAT3U);
break;
-