Module: xenomai-2.6
Branch: master
Commit: e7c9512d3e3f34562b686dd1d5c3e2c8a7b3b761
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=e7c9512d3e3f34562b686dd1d5c3e2c8a7b3b761
Author: Philippe Gerum <r...@xenomai.org>
Date: Sat Jul 7 19:01:42 2012 +0200
powerpc: upgrade I-pipe support to 2.6.36.4-powerpc-2.12-05,
3.1.10-powerpc-2.13-08
---
... => adeos-ipipe-2.6.36.4-powerpc-2.12-05.patch} | 18 +++++-----
...ch => adeos-ipipe-3.1.10-powerpc-2.13-08.patch} | 36 +++++++++++---------
2 files changed, 29 insertions(+), 25 deletions(-)
diff --git
a/ksrc/arch/powerpc/patches/adeos-ipipe-2.6.36.4-powerpc-2.12-04.patch
b/ksrc/arch/powerpc/patches/adeos-ipipe-2.6.36.4-powerpc-2.12-05.patch
similarity index 99%
rename from ksrc/arch/powerpc/patches/adeos-ipipe-2.6.36.4-powerpc-2.12-04.patch
rename to ksrc/arch/powerpc/patches/adeos-ipipe-2.6.36.4-powerpc-2.12-05.patch
index 2eebfe7..d82980f 100644
--- a/ksrc/arch/powerpc/patches/adeos-ipipe-2.6.36.4-powerpc-2.12-04.patch
+++ b/ksrc/arch/powerpc/patches/adeos-ipipe-2.6.36.4-powerpc-2.12-05.patch
@@ -265,7 +265,7 @@ index bd100fc..8fa1901 100644
* or should we not care like we do now ? --BenH.
diff --git a/arch/powerpc/include/asm/ipipe.h
b/arch/powerpc/include/asm/ipipe.h
new file mode 100644
-index 0000000..9ddee0b
+index 0000000..e37eaad
--- /dev/null
+++ b/arch/powerpc/include/asm/ipipe.h
@@ -0,0 +1,245 @@
@@ -316,10 +316,10 @@ index 0000000..9ddee0b
+#include <asm/paca.h>
+#endif
+
-+#define IPIPE_ARCH_STRING "2.12-04"
++#define IPIPE_ARCH_STRING "2.12-05"
+#define IPIPE_MAJOR_NUMBER 2
+#define IPIPE_MINOR_NUMBER 12
-+#define IPIPE_PATCH_NUMBER 4
++#define IPIPE_PATCH_NUMBER 5
+
+#ifdef CONFIG_IPIPE_WANT_PREEMPTIBLE_SWITCH
+
@@ -391,8 +391,8 @@ index 0000000..9ddee0b
+
+#ifdef CONFIG_PPC64
+#define ipipe_read_tsc(t) (t = mftb())
-+#define ipipe_tsc2ns(t) (((t) * 1000UL) / (__ipipe_cpu_freq /
1000000UL))
-+#define ipipe_tsc2us(t) ((t) / (__ipipe_cpu_freq / 1000000UL))
++#define ipipe_tsc2ns(t) (((t) * 1000UL) / (__ipipe_hrclock_freq
/ 1000000UL))
++#define ipipe_tsc2us(t) ((t) / (__ipipe_hrclock_freq /
1000000UL))
+#else /* CONFIG_PPC32 */
+#define ipipe_read_tsc(t) \
+ ({ \
@@ -409,12 +409,12 @@ index 0000000..9ddee0b
+ })
+
+#define ipipe_tsc2ns(t) \
-+ ((((unsigned long)(t)) * 1000) / (__ipipe_cpu_freq / 1000000))
++ ((((unsigned long)(t)) * 1000) / (__ipipe_hrclock_freq / 1000000))
+
+#define ipipe_tsc2us(t) \
+ ({ \
+ unsigned long long delta = (t); \
-+ do_div(delta, __ipipe_cpu_freq/1000000+1); \
++ do_div(delta, __ipipe_hrclock_freq/1000000+1); \
+ (unsigned long)delta; \
+ })
+#endif /* CONFIG_PPC32 */
@@ -1220,7 +1220,7 @@ index cf51966..e7d287c 100644
desc->chip->eoi(irq);
}
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
-index ff0005e..a25f0f8 100644
+index ff0005eec..a25f0f8 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -948,7 +948,7 @@
@@ -7000,7 +7000,7 @@ index bc2994e..5e2da8d 100644
#define write_unlock_irq(lock) _raw_write_unlock_irq(lock)
diff --git a/include/linux/rwlock_api_smp.h b/include/linux/rwlock_api_smp.h
-index 9c9f049..62c8941 100644
+index 9c9f049..62c894150 100644
--- a/include/linux/rwlock_api_smp.h
+++ b/include/linux/rwlock_api_smp.h
@@ -141,7 +141,9 @@ static inline int __raw_write_trylock(rwlock_t *lock)
diff --git a/ksrc/arch/powerpc/patches/adeos-ipipe-3.1.10-powerpc-2.13-07.patch
b/ksrc/arch/powerpc/patches/adeos-ipipe-3.1.10-powerpc-2.13-08.patch
similarity index 99%
rename from ksrc/arch/powerpc/patches/adeos-ipipe-3.1.10-powerpc-2.13-07.patch
rename to ksrc/arch/powerpc/patches/adeos-ipipe-3.1.10-powerpc-2.13-08.patch
index 31a667f..ca42fe6 100644
--- a/ksrc/arch/powerpc/patches/adeos-ipipe-3.1.10-powerpc-2.13-07.patch
+++ b/ksrc/arch/powerpc/patches/adeos-ipipe-3.1.10-powerpc-2.13-08.patch
@@ -1,14 +1,3 @@
-diff --git a/.gitignore b/.gitignore
-index 57af07c..455244d 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -82,5 +82,6 @@ GSYMS
- GTAGS
-
- *.orig
-+*.rej
- *~
- \#*#
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 6926b61..361330a 100644
--- a/arch/powerpc/Kconfig
@@ -116,7 +105,7 @@ index 3bf9cca..322343f 100644
#define R_PPC_NONE 0
#define R_PPC_ADDR32 1 /* 32bit absolute address */
diff --git a/arch/powerpc/include/asm/exception-64s.h
b/arch/powerpc/include/asm/exception-64s.h
-index 8057f4f..f163820 100644
+index 8057f4f..1da2463 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -48,6 +48,30 @@
@@ -168,7 +157,7 @@ index 8057f4f..f163820 100644
- lbz r10,PACASOFTIRQEN(r13); \
- cmpwi r10,0; \
- beq masked_##h##interrupt
-+ TEST_SOFTISTATE(r10, masked_##h##interrupt); \
++ TEST_SOFTISTATE(r10, masked_##h##interrupt);
#define _SOFTEN_TEST(h) __SOFTEN_TEST(h)
#define SOFTEN_TEST_PR(vec) \
@@ -306,7 +295,7 @@ index bb712c9..8885e9b 100644
* or should we not care like we do now ? --BenH.
diff --git a/arch/powerpc/include/asm/ipipe.h
b/arch/powerpc/include/asm/ipipe.h
new file mode 100644
-index 0000000..43d81fd
+index 0000000..2a61b6a
--- /dev/null
+++ b/arch/powerpc/include/asm/ipipe.h
@@ -0,0 +1,280 @@
@@ -358,10 +347,10 @@ index 0000000..43d81fd
+#include <asm/paca.h>
+#endif
+
-+#define IPIPE_ARCH_STRING "2.13-07"
++#define IPIPE_ARCH_STRING "2.13-08"
+#define IPIPE_MAJOR_NUMBER 2
+#define IPIPE_MINOR_NUMBER 13
-+#define IPIPE_PATCH_NUMBER 7
++#define IPIPE_PATCH_NUMBER 8
+
+#ifdef CONFIG_IPIPE_WANT_PREEMPTIBLE_SWITCH
+
@@ -2456,6 +2445,21 @@ index ba31954..d0a9b16 100644
BEGIN_FTR_SECTION
DSSALL
sync
+diff --git a/arch/powerpc/kernel/idle_power7.S
b/arch/powerpc/kernel/idle_power7.S
+index 3a70845..cef2db7 100644
+--- a/arch/powerpc/kernel/idle_power7.S
++++ b/arch/powerpc/kernel/idle_power7.S
+@@ -52,8 +52,10 @@ _GLOBAL(power7_idle)
+ rotldi r9,r9,16
+ mtmsrd r9,1 /* hard-disable interrupts */
+ li r0,0
++#ifdef CONFIG_SOFTDISABLE
+ stb r0,PACASOFTIRQEN(r13) /* we'll hard-enable shortly */
+ stb r0,PACAHARDIRQEN(r13)
++#endif
+
+ /* Continue saving state */
+ SAVE_GPR(2, r1)
diff --git a/arch/powerpc/kernel/ipipe.c b/arch/powerpc/kernel/ipipe.c
new file mode 100644
index 0000000..8c5710c
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
