summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Artamonov <freeartman@wechall.net>2013-08-21 15:51:58 +0300
committerArtur Artamonov <freeartman@wechall.net>2013-08-21 15:51:58 +0300
commit2789830761da86a4537ab198203138c082b3058e (patch)
tree7112232224aa59242e2656c8d982b04e2498dc6d
parent2f0d8aacec03ebfa955e9c1ba77259740f73452e (diff)
git mips16 based fixes
-rw-r--r--target/linux/realtek/patches-2.6.30/fix-z_mips16_rtl_nic.patch32
-rw-r--r--target/linux/realtek/patches-2.6.30/mips16_fixes.patch94
2 files changed, 126 insertions, 0 deletions
diff --git a/target/linux/realtek/patches-2.6.30/fix-z_mips16_rtl_nic.patch b/target/linux/realtek/patches-2.6.30/fix-z_mips16_rtl_nic.patch
new file mode 100644
index 000000000..f700fe34c
--- /dev/null
+++ b/target/linux/realtek/patches-2.6.30/fix-z_mips16_rtl_nic.patch
@@ -0,0 +1,32 @@
+--- linux-2.6.30.9/drivers/net/rtl819x/rtl_nic.c 2013-07-26 16:34:07.000000000 +0300
++++ linux-2.6.30.9/drivers/net/rtl819x/rtl_nic.c 2013-08-02 00:21:39.283271578 +0300
+@@ -1693,8 +1693,10 @@ extern void br_signal_igmpProxy(void);
+
+ static inline struct iphdr * re865x_getIpv4Header(uint8 *macFrame)
+ {
++
+ uint8 *ptr;
+ struct iphdr *iph=NULL;
++ asm __volatile__(".set nomips16");
+
+ ptr=macFrame+12;
+ if(*(int16 *)(ptr)==(int16)htons(ETH_P_8021Q))
+@@ -1718,7 +1720,8 @@ static inline struct ipv6hdr* re865x_get
+ {
+ uint8 *ptr;
+ struct ipv6hdr *ipv6h=NULL;
+-
++ asm __volatile__(".set nomips16");
++
+ ptr=macFrame+12;
+ if(*(int16 *)(ptr)==(int16)htons(ETH_P_8021Q))
+ {
+@@ -2068,7 +2071,7 @@ static bool rtl_MulticastRxFilterOff(str
+ }
+ #endif
+
+-__MIPS16
++//__MIPS16
+ int rtl_MulticastRxCheck(struct sk_buff *skb,rtl_nicRx_info *info)
+ {
+
diff --git a/target/linux/realtek/patches-2.6.30/mips16_fixes.patch b/target/linux/realtek/patches-2.6.30/mips16_fixes.patch
new file mode 100644
index 000000000..4e6a7aef8
--- /dev/null
+++ b/target/linux/realtek/patches-2.6.30/mips16_fixes.patch
@@ -0,0 +1,94 @@
+diff -rupN a/arch/rlx/include/asm/irqflags.h b/arch/rlx/include/asm/irqflags.h
+--- a/arch/rlx/include/asm/irqflags.h 2013-07-20 00:37:16.990879755 +0300
++++ b/arch/rlx/include/asm/irqflags.h 2013-07-30 20:33:40.000000000 +0300
+@@ -82,6 +82,7 @@ __asm__(
+ " .macro raw_local_save_flags flags \n"
+ " .set push \n"
+ " .set reorder \n"
++ " .set nomips16\n"
+ " mfc0 \\flags, $12 \n"
+ " .set pop \n"
+ " .endm \n");
+@@ -96,6 +97,7 @@ __asm__(
+ " .set push \n"
+ " .set reorder \n"
+ " .set noat \n"
++ " .set nomips16\n"
+ " mfc0 \\result, $12 \n"
+ " ori $1, \\result, 0x1f \n"
+ " xori $1, 0x1f \n"
+@@ -117,6 +119,7 @@ __asm__(
+ " .set push \n"
+ " .set noreorder \n"
+ " .set noat \n"
++ " .set nomips16\n"
+ " mfc0 $1, $12 \n"
+ " andi \\flags, 1 \n"
+ " ori $1, 0x1f \n"
+diff -rupN a/arch/rlx/include/asm/spinlock.h b/arch/rlx/include/asm/spinlock.h
+--- a/arch/rlx/include/asm/spinlock.h 2013-07-20 00:37:16.997546422 +0300
++++ b/arch/rlx/include/asm/spinlock.h 2013-07-30 20:54:42.000000000 +0300
+@@ -61,6 +61,7 @@ static inline void __raw_spin_lock(raw_s
+ __asm__ __volatile__ (
+ " .set push # __raw_spin_lock \n"
+ " .set noreorder \n"
++ " .set mips32\n"
+ " \n"
+ " ll %[ticket], %[ticket_ptr] \n"
+ #if defined(CONFIG_CPU_RLX4181) || defined(CONFIG_CPU_RLX5181)
+@@ -110,6 +111,7 @@ static inline void __raw_spin_unlock(raw
+ __asm__ __volatile__ (
+ " .set push # __raw_spin_unlock \n"
+ " .set noreorder \n"
++ " .set mips32\n"
+ " \n"
+ " ll %[ticket], %[ticket_ptr] \n"
+ "1: addiu %[ticket], %[ticket], 1 \n"
+@@ -135,6 +137,7 @@ static inline unsigned int __raw_spin_tr
+ __asm__ __volatile__ (
+ " .set push # __raw_spin_trylock \n"
+ " .set noreorder \n"
++ " .set mips32\n"
+ " \n"
+ " ll %[ticket], %[ticket_ptr] \n"
+ #if defined(CONFIG_CPU_RLX4181) || defined(CONFIG_CPU_RLX5181)
+@@ -193,6 +196,7 @@ static inline void __raw_read_lock(raw_r
+
+ __asm__ __volatile__(
+ " .set noreorder # __raw_read_lock \n"
++ " .set mips16\n"
+ "1: ll %1, %2 \n"
+ #if defined(CONFIG_CPU_RLX4181) || defined(CONFIG_CPU_RLX5181)
+ " nop \n"
+@@ -231,6 +235,7 @@ static inline void __raw_read_unlock(raw
+
+ __asm__ __volatile__(
+ " .set noreorder # __raw_read_unlock \n"
++ " .set mips16\n"
+ "1: ll %1, %2 \n"
+ #if defined(CONFIG_CPU_RLX4181) || defined(CONFIG_CPU_RLX5181)
+ " nop \n"
+@@ -255,6 +260,7 @@ static inline void __raw_write_lock(raw_
+
+ __asm__ __volatile__(
+ " .set noreorder # __raw_write_lock \n"
++ " .set mips32\n"
+ "1: ll %1, %2 \n"
+ #if defined(CONFIG_CPU_RLX4181) || defined(CONFIG_CPU_RLX5181)
+ " nop \n"
+@@ -301,6 +307,7 @@ static inline int __raw_read_trylock(raw
+
+ __asm__ __volatile__(
+ " .set noreorder # __raw_read_trylock \n"
++ " .set mips16\n"
+ " li %2, 0 \n"
+ "1: ll %1, %3 \n"
+ #if defined(CONFIG_CPU_RLX4181) || defined(CONFIG_CPU_RLX5181)
+@@ -329,6 +336,7 @@ static inline int __raw_write_trylock(ra
+
+ __asm__ __volatile__(
+ " .set noreorder # __raw_write_trylock \n"
++ " .set mips32\n"
+ " li %2, 0 \n"
+ "1: ll %1, %3 \n"
+ #if defined(CONFIG_CPU_RLX4181) || defined(CONFIG_CPU_RLX5181)