1 files changed, 125 insertions, 20 deletions
diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index 3056ede2424d..ae6af29938a1 100644
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -25,6 +25,11 @@
 #include <asm/thread_info.h>
 #include <asm/asm-offsets.h>
+#ifdef CONFIG_8xx
+#define ISYNC_8xx isync
+#else
+#define ISYNC_8xx
+#endif
        .text
        .align  5
@@ -800,8 +805,18 @@ _GLOBAL(_insb)
        subi    r4,r4,1
        blelr-
 00:     lbz     r5,0(r3)
-        eieio
+01:     eieio
-        stbu    r5,1(r4)
+02:     stbu    r5,1(r4)
+        ISYNC_8xx
+        .section .fixup,"ax"
+03:     blr
+        .text
+        .section __ex_table, "a"
+                .align 2
+                .long 00b, 03b
+                .long 01b, 03b
+                .long 02b, 03b
+        .text
        bdnz    00b
        blr
@@ -811,8 +826,18 @@ _GLOBAL(_outsb)
        subi    r4,r4,1
        blelr-
 00:     lbzu    r5,1(r4)
-        stb     r5,0(r3)
+01:     stb     r5,0(r3)
-        eieio
+02:     eieio
+        ISYNC_8xx
+        .section .fixup,"ax"
+03:     blr
+        .text
+        .section __ex_table, "a"
+                .align 2
+                .long 00b, 03b
+                .long 01b, 03b
+                .long 02b, 03b
+        .text
        bdnz    00b
        blr
@@ -822,8 +847,18 @@ _GLOBAL(_insw)
        subi    r4,r4,2
        blelr-
 00:     lhbrx   r5,0,r3
-        eieio
+01:     eieio
-        sthu    r5,2(r4)
+02:     sthu    r5,2(r4)
+        ISYNC_8xx
+        .section .fixup,"ax"
+03:     blr
+        .text
+        .section __ex_table, "a"
+                .align 2
+                .long 00b, 03b
+                .long 01b, 03b
+                .long 02b, 03b
+        .text
        bdnz    00b
        blr
@@ -833,8 +868,18 @@ _GLOBAL(_outsw)
        subi    r4,r4,2
        blelr-
 00:     lhzu    r5,2(r4)
-        eieio
+01:     eieio
-        sthbrx  r5,0,r3
+02:     sthbrx  r5,0,r3
+        ISYNC_8xx
+        .section .fixup,"ax"
+03:     blr
+        .text
+        .section __ex_table, "a"
+                .align 2
+                .long 00b, 03b
+                .long 01b, 03b
+                .long 02b, 03b
+        .text
        bdnz    00b
        blr
@@ -844,8 +889,18 @@ _GLOBAL(_insl)
        subi    r4,r4,4
        blelr-
 00:     lwbrx   r5,0,r3
-        eieio
+01:     eieio
-        stwu    r5,4(r4)
+02:     stwu    r5,4(r4)
+        ISYNC_8xx
+        .section .fixup,"ax"
+03:     blr
+        .text
+        .section __ex_table, "a"
+                .align 2
+                .long 00b, 03b
+                .long 01b, 03b
+                .long 02b, 03b
+        .text
        bdnz    00b
        blr
@@ -855,8 +910,18 @@ _GLOBAL(_outsl)
        subi    r4,r4,4
        blelr-
 00:     lwzu    r5,4(r4)
-        stwbrx  r5,0,r3
+01:     stwbrx  r5,0,r3
-        eieio
+02:     eieio
+        ISYNC_8xx
+        .section .fixup,"ax"
+03:     blr
+        .text
+        .section __ex_table, "a"
+                .align 2
+                .long 00b, 03b
+                .long 01b, 03b
+                .long 02b, 03b
+        .text
        bdnz    00b
        blr
@@ -867,8 +932,18 @@ _GLOBAL(_insw_ns)
        subi    r4,r4,2
        blelr-
 00:     lhz     r5,0(r3)
-        eieio
+01:     eieio
-        sthu    r5,2(r4)
+02:     sthu    r5,2(r4)
+        ISYNC_8xx
+        .section .fixup,"ax"
+03:     blr
+        .text
+        .section __ex_table, "a"
+                .align 2
+                .long 00b, 03b
+                .long 01b, 03b
+                .long 02b, 03b
+        .text
        bdnz    00b
        blr
@@ -879,8 +954,18 @@ _GLOBAL(_outsw_ns)
        subi    r4,r4,2
        blelr-
 00:     lhzu    r5,2(r4)
-        sth     r5,0(r3)
+01:     sth     r5,0(r3)
-        eieio
+02:     eieio
+        ISYNC_8xx
+        .section .fixup,"ax"
+03:     blr
+        .text
+        .section __ex_table, "a"
+                .align 2
+                .long 00b, 03b
+                .long 01b, 03b
+                .long 02b, 03b
+        .text
        bdnz    00b
        blr
@@ -891,8 +976,18 @@ _GLOBAL(_insl_ns)
        subi    r4,r4,4
        blelr-
 00:     lwz     r5,0(r3)
-        eieio
+01:     eieio
-        stwu    r5,4(r4)
+02:     stwu    r5,4(r4)
+        ISYNC_8xx
+        .section .fixup,"ax"
+03:     blr
+        .text
+        .section __ex_table, "a"
+                .align 2
+                .long 00b, 03b
+                .long 01b, 03b
+                .long 02b, 03b
+        .text
        bdnz    00b
        blr
@@ -903,8 +998,18 @@ _GLOBAL(_outsl_ns)
        subi    r4,r4,4
        blelr-
 00:     lwzu    r5,4(r4)
-        stw     r5,0(r3)
+01:     stw     r5,0(r3)
-        eieio
+02:     eieio
+        ISYNC_8xx
+        .section .fixup,"ax"
+03:     blr
+        .text
+        .section __ex_table, "a"
+                .align 2
+                .long 00b, 03b
+                .long 01b, 03b
+                .long 02b, 03b
+        .text
        bdnz    00b
        blr

diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S index 3056ede2424d..ae6af29938a1 100644 --- a/arch/ppc/kernel/misc.S +++ b/arch/ppc/kernel/misc.S
@@ -25,6 +25,11 @@
25	#include <asm/thread_info.h>	25	#include <asm/thread_info.h>
26	#include <asm/asm-offsets.h>	26	#include <asm/asm-offsets.h>
27		27
		28	#ifdef CONFIG_8xx
		29	#define ISYNC_8xx isync
		30	#else
		31	#define ISYNC_8xx
		32	#endif
28	.text	33	.text
29		34
30	.align 5	35	.align 5
@@ -800,8 +805,18 @@ _GLOBAL(_insb)
800	subi r4,r4,1	805	subi r4,r4,1
801	blelr-	806	blelr-
802	00: lbz r5,0(r3)	807	00: lbz r5,0(r3)
803	eieio	808	01: eieio
804	stbu r5,1(r4)	809	02: stbu r5,1(r4)
		810	ISYNC_8xx
		811	.section .fixup,"ax"
		812	03: blr
		813	.text
		814	.section __ex_table, "a"
		815	.align 2
		816	.long 00b, 03b
		817	.long 01b, 03b
		818	.long 02b, 03b
		819	.text
805	bdnz 00b	820	bdnz 00b
806	blr	821	blr
807		822
@@ -811,8 +826,18 @@ _GLOBAL(_outsb)
811	subi r4,r4,1	826	subi r4,r4,1
812	blelr-	827	blelr-
813	00: lbzu r5,1(r4)	828	00: lbzu r5,1(r4)
814	stb r5,0(r3)	829	01: stb r5,0(r3)
815	eieio	830	02: eieio
		831	ISYNC_8xx
		832	.section .fixup,"ax"
		833	03: blr
		834	.text
		835	.section __ex_table, "a"
		836	.align 2
		837	.long 00b, 03b
		838	.long 01b, 03b
		839	.long 02b, 03b
		840	.text
816	bdnz 00b	841	bdnz 00b
817	blr	842	blr
818		843
@@ -822,8 +847,18 @@ _GLOBAL(_insw)
822	subi r4,r4,2	847	subi r4,r4,2
823	blelr-	848	blelr-
824	00: lhbrx r5,0,r3	849	00: lhbrx r5,0,r3
825	eieio	850	01: eieio
826	sthu r5,2(r4)	851	02: sthu r5,2(r4)
		852	ISYNC_8xx
		853	.section .fixup,"ax"
		854	03: blr
		855	.text
		856	.section __ex_table, "a"
		857	.align 2
		858	.long 00b, 03b
		859	.long 01b, 03b
		860	.long 02b, 03b
		861	.text
827	bdnz 00b	862	bdnz 00b
828	blr	863	blr
829		864
@@ -833,8 +868,18 @@ _GLOBAL(_outsw)
833	subi r4,r4,2	868	subi r4,r4,2
834	blelr-	869	blelr-
835	00: lhzu r5,2(r4)	870	00: lhzu r5,2(r4)
836	eieio	871	01: eieio
837	sthbrx r5,0,r3	872	02: sthbrx r5,0,r3
		873	ISYNC_8xx
		874	.section .fixup,"ax"
		875	03: blr
		876	.text
		877	.section __ex_table, "a"
		878	.align 2
		879	.long 00b, 03b
		880	.long 01b, 03b
		881	.long 02b, 03b
		882	.text
838	bdnz 00b	883	bdnz 00b
839	blr	884	blr
840		885
@@ -844,8 +889,18 @@ _GLOBAL(_insl)
844	subi r4,r4,4	889	subi r4,r4,4
845	blelr-	890	blelr-
846	00: lwbrx r5,0,r3	891	00: lwbrx r5,0,r3
847	eieio	892	01: eieio
848	stwu r5,4(r4)	893	02: stwu r5,4(r4)
		894	ISYNC_8xx
		895	.section .fixup,"ax"
		896	03: blr
		897	.text
		898	.section __ex_table, "a"
		899	.align 2
		900	.long 00b, 03b
		901	.long 01b, 03b
		902	.long 02b, 03b
		903	.text
849	bdnz 00b	904	bdnz 00b
850	blr	905	blr
851		906
@@ -855,8 +910,18 @@ _GLOBAL(_outsl)
855	subi r4,r4,4	910	subi r4,r4,4
856	blelr-	911	blelr-
857	00: lwzu r5,4(r4)	912	00: lwzu r5,4(r4)
858	stwbrx r5,0,r3	913	01: stwbrx r5,0,r3
859	eieio	914	02: eieio
		915	ISYNC_8xx
		916	.section .fixup,"ax"
		917	03: blr
		918	.text
		919	.section __ex_table, "a"
		920	.align 2
		921	.long 00b, 03b
		922	.long 01b, 03b
		923	.long 02b, 03b
		924	.text
860	bdnz 00b	925	bdnz 00b
861	blr	926	blr
862		927
@@ -867,8 +932,18 @@ _GLOBAL(_insw_ns)
867	subi r4,r4,2	932	subi r4,r4,2
868	blelr-	933	blelr-
869	00: lhz r5,0(r3)	934	00: lhz r5,0(r3)
870	eieio	935	01: eieio
871	sthu r5,2(r4)	936	02: sthu r5,2(r4)
		937	ISYNC_8xx
		938	.section .fixup,"ax"
		939	03: blr
		940	.text
		941	.section __ex_table, "a"
		942	.align 2
		943	.long 00b, 03b
		944	.long 01b, 03b
		945	.long 02b, 03b
		946	.text
872	bdnz 00b	947	bdnz 00b
873	blr	948	blr
874		949
@@ -879,8 +954,18 @@ _GLOBAL(_outsw_ns)
879	subi r4,r4,2	954	subi r4,r4,2
880	blelr-	955	blelr-
881	00: lhzu r5,2(r4)	956	00: lhzu r5,2(r4)
882	sth r5,0(r3)	957	01: sth r5,0(r3)
883	eieio	958	02: eieio
		959	ISYNC_8xx
		960	.section .fixup,"ax"
		961	03: blr
		962	.text
		963	.section __ex_table, "a"
		964	.align 2
		965	.long 00b, 03b
		966	.long 01b, 03b
		967	.long 02b, 03b
		968	.text
884	bdnz 00b	969	bdnz 00b
885	blr	970	blr
886		971
@@ -891,8 +976,18 @@ _GLOBAL(_insl_ns)
891	subi r4,r4,4	976	subi r4,r4,4
892	blelr-	977	blelr-
893	00: lwz r5,0(r3)	978	00: lwz r5,0(r3)
894	eieio	979	01: eieio
895	stwu r5,4(r4)	980	02: stwu r5,4(r4)
		981	ISYNC_8xx
		982	.section .fixup,"ax"
		983	03: blr
		984	.text
		985	.section __ex_table, "a"
		986	.align 2
		987	.long 00b, 03b
		988	.long 01b, 03b
		989	.long 02b, 03b
		990	.text
896	bdnz 00b	991	bdnz 00b
897	blr	992	blr
898		993
@@ -903,8 +998,18 @@ _GLOBAL(_outsl_ns)
903	subi r4,r4,4	998	subi r4,r4,4
904	blelr-	999	blelr-
905	00: lwzu r5,4(r4)	1000	00: lwzu r5,4(r4)
906	stw r5,0(r3)	1001	01: stw r5,0(r3)
907	eieio	1002	02: eieio
		1003	ISYNC_8xx
		1004	.section .fixup,"ax"
		1005	03: blr
		1006	.text
		1007	.section __ex_table, "a"
		1008	.align 2
		1009	.long 00b, 03b
		1010	.long 01b, 03b
		1011	.long 02b, 03b
		1012	.text
908	bdnz 00b	1013	bdnz 00b
909	blr	1014	blr
910		1015