diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:05:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:05:55 -0400 |
commit | c548f08a4f7b89b93c805e0c4024b8302afa7121 (patch) | |
tree | 5cf791db4912831469b70390aa58376f1c724386 /arch/powerpc | |
parent | 347c53dca73fca317d57781f510f5ff4f6c0d0d7 (diff) | |
parent | 4acadb965c4aa587aac29a0a91203c4745d6fb4e (diff) |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (24 commits)
[POWERPC] Fix vmemmap warning in init_64.c
[POWERPC] Fix 64 bits vDSO DWARF info for CR register
[POWERPC] Add 1TB workaround for PA6T
[POWERPC] Enable NO_HZ and high res timers for pseries and ppc64 configs
[POWERPC] Quieten cache information at boot
[POWERPC] Quieten clockevent printk
[POWERPC] Enable SLUB in *_defconfig
[POWERPC] Fix 1TB segment detection
[POWERPC] Fix iSeries_hpte_insert prototype
[POWERPC] Fix copyright symbol
[POWERPC] ibmebus: Move to of_device and of_platform_driver, match eHCA and eHEA drivers
[POWERPC] ibmebus: Add device creation and bus probing based on of_device
[POWERPC] ibmebus: Remove bus match/probe/remove functions
[POWERPC] Move of_device allocation into of_device.[ch]
[POWERPC] mpc52xx: device tree changes for FEC and MDIO
[POWERPC] bestcomm: GenBD task support
[POWERPC] bestcomm: FEC task support
[POWERPC] bestcomm: ATA task support
[POWERPC] bestcomm: core bestcomm support for Freescale MPC5200
[POWERPC] mpc52xx: Update mpc52xx_psc structure with B revision changes
...
Diffstat (limited to 'arch/powerpc')
77 files changed, 2921 insertions, 392 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index d11a746975bc..3763f681ce4c 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -698,3 +698,7 @@ source "crypto/Kconfig" | |||
698 | config PPC_CLOCK | 698 | config PPC_CLOCK |
699 | bool | 699 | bool |
700 | default n | 700 | default n |
701 | |||
702 | config PPC_LIB_RHEAP | ||
703 | bool | ||
704 | |||
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts index a6bb1d0558ef..6582c9a39b27 100644 --- a/arch/powerpc/boot/dts/lite5200b.dts +++ b/arch/powerpc/boot/dts/lite5200b.dts | |||
@@ -277,10 +277,26 @@ | |||
277 | ethernet@3000 { | 277 | ethernet@3000 { |
278 | device_type = "network"; | 278 | device_type = "network"; |
279 | compatible = "mpc5200b-fec","mpc5200-fec"; | 279 | compatible = "mpc5200b-fec","mpc5200-fec"; |
280 | reg = <3000 800>; | 280 | reg = <3000 400>; |
281 | mac-address = [ 02 03 04 05 06 07 ]; // Bad! | 281 | mac-address = [ 02 03 04 05 06 07 ]; // Bad! |
282 | interrupts = <2 5 0>; | 282 | interrupts = <2 5 0>; |
283 | interrupt-parent = <&mpc5200_pic>; | 283 | interrupt-parent = <&mpc5200_pic>; |
284 | phy-handle = <&phy0>; | ||
285 | }; | ||
286 | |||
287 | mdio@3000 { | ||
288 | #address-cells = <1>; | ||
289 | #size-cells = <0>; | ||
290 | device_type = "mdio"; | ||
291 | compatible = "mpc5200b-fec-phy"; | ||
292 | reg = <3000 400>; // fec range, since we need to setup fec interrupts | ||
293 | interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co. | ||
294 | interrupt-parent = <&mpc5200_pic>; | ||
295 | |||
296 | phy0:ethernet-phy@0 { | ||
297 | device_type = "ethernet-phy"; | ||
298 | reg = <0>; | ||
299 | }; | ||
284 | }; | 300 | }; |
285 | 301 | ||
286 | ata@3a00 { | 302 | ata@3a00 { |
diff --git a/arch/powerpc/configs/bamboo_defconfig b/arch/powerpc/configs/bamboo_defconfig index b592dec4640f..d22fed6d2cd9 100644 --- a/arch/powerpc/configs/bamboo_defconfig +++ b/arch/powerpc/configs/bamboo_defconfig | |||
@@ -91,8 +91,9 @@ CONFIG_TIMERFD=y | |||
91 | CONFIG_EVENTFD=y | 91 | CONFIG_EVENTFD=y |
92 | CONFIG_SHMEM=y | 92 | CONFIG_SHMEM=y |
93 | CONFIG_VM_EVENT_COUNTERS=y | 93 | CONFIG_VM_EVENT_COUNTERS=y |
94 | CONFIG_SLAB=y | 94 | CONFIG_SLUB_DEBUG=y |
95 | # CONFIG_SLUB is not set | 95 | # CONFIG_SLAB is not set |
96 | CONFIG_SLUB=y | ||
96 | # CONFIG_SLOB is not set | 97 | # CONFIG_SLOB is not set |
97 | CONFIG_RT_MUTEXES=y | 98 | CONFIG_RT_MUTEXES=y |
98 | # CONFIG_TINY_SHMEM is not set | 99 | # CONFIG_TINY_SHMEM is not set |
@@ -695,7 +696,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
695 | CONFIG_SCHED_DEBUG=y | 696 | CONFIG_SCHED_DEBUG=y |
696 | # CONFIG_SCHEDSTATS is not set | 697 | # CONFIG_SCHEDSTATS is not set |
697 | # CONFIG_TIMER_STATS is not set | 698 | # CONFIG_TIMER_STATS is not set |
698 | # CONFIG_DEBUG_SLAB is not set | 699 | # CONFIG_SLUB_DEBUG_ON is not set |
699 | # CONFIG_DEBUG_RT_MUTEXES is not set | 700 | # CONFIG_DEBUG_RT_MUTEXES is not set |
700 | # CONFIG_RT_MUTEX_TESTER is not set | 701 | # CONFIG_RT_MUTEX_TESTER is not set |
701 | # CONFIG_DEBUG_SPINLOCK is not set | 702 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/celleb_defconfig b/arch/powerpc/configs/celleb_defconfig index b4ac498c3cce..2c5969801bd6 100644 --- a/arch/powerpc/configs/celleb_defconfig +++ b/arch/powerpc/configs/celleb_defconfig | |||
@@ -92,8 +92,9 @@ CONFIG_TIMERFD=y | |||
92 | CONFIG_EVENTFD=y | 92 | CONFIG_EVENTFD=y |
93 | CONFIG_SHMEM=y | 93 | CONFIG_SHMEM=y |
94 | CONFIG_VM_EVENT_COUNTERS=y | 94 | CONFIG_VM_EVENT_COUNTERS=y |
95 | CONFIG_SLAB=y | 95 | CONFIG_SLUB_DEBUG=y |
96 | # CONFIG_SLUB is not set | 96 | # CONFIG_SLAB is not set |
97 | CONFIG_SLUB=y | ||
97 | # CONFIG_SLOB is not set | 98 | # CONFIG_SLOB is not set |
98 | CONFIG_RT_MUTEXES=y | 99 | CONFIG_RT_MUTEXES=y |
99 | # CONFIG_TINY_SHMEM is not set | 100 | # CONFIG_TINY_SHMEM is not set |
@@ -1218,7 +1219,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1218 | CONFIG_SCHED_DEBUG=y | 1219 | CONFIG_SCHED_DEBUG=y |
1219 | # CONFIG_SCHEDSTATS is not set | 1220 | # CONFIG_SCHEDSTATS is not set |
1220 | # CONFIG_TIMER_STATS is not set | 1221 | # CONFIG_TIMER_STATS is not set |
1221 | # CONFIG_DEBUG_SLAB is not set | 1222 | # CONFIG_SLUB_DEBUG_ON is not set |
1222 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1223 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1223 | # CONFIG_RT_MUTEX_TESTER is not set | 1224 | # CONFIG_RT_MUTEX_TESTER is not set |
1224 | # CONFIG_DEBUG_SPINLOCK is not set | 1225 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig index c3977e334b3b..6f27e57331d5 100644 --- a/arch/powerpc/configs/chrp32_defconfig +++ b/arch/powerpc/configs/chrp32_defconfig | |||
@@ -92,8 +92,9 @@ CONFIG_TIMERFD=y | |||
92 | CONFIG_EVENTFD=y | 92 | CONFIG_EVENTFD=y |
93 | CONFIG_SHMEM=y | 93 | CONFIG_SHMEM=y |
94 | CONFIG_VM_EVENT_COUNTERS=y | 94 | CONFIG_VM_EVENT_COUNTERS=y |
95 | CONFIG_SLAB=y | 95 | CONFIG_SLUB_DEBUG=y |
96 | # CONFIG_SLUB is not set | 96 | # CONFIG_SLAB is not set |
97 | CONFIG_SLUB=y | ||
97 | # CONFIG_SLOB is not set | 98 | # CONFIG_SLOB is not set |
98 | CONFIG_RT_MUTEXES=y | 99 | CONFIG_RT_MUTEXES=y |
99 | # CONFIG_TINY_SHMEM is not set | 100 | # CONFIG_TINY_SHMEM is not set |
@@ -1373,7 +1374,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1373 | CONFIG_SCHED_DEBUG=y | 1374 | CONFIG_SCHED_DEBUG=y |
1374 | # CONFIG_SCHEDSTATS is not set | 1375 | # CONFIG_SCHEDSTATS is not set |
1375 | # CONFIG_TIMER_STATS is not set | 1376 | # CONFIG_TIMER_STATS is not set |
1376 | # CONFIG_DEBUG_SLAB is not set | 1377 | # CONFIG_SLUB_DEBUG_ON is not set |
1377 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1378 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1378 | # CONFIG_RT_MUTEX_TESTER is not set | 1379 | # CONFIG_RT_MUTEX_TESTER is not set |
1379 | # CONFIG_DEBUG_SPINLOCK is not set | 1380 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/ebony_defconfig b/arch/powerpc/configs/ebony_defconfig index 3a50467b1f75..35a95dda681e 100644 --- a/arch/powerpc/configs/ebony_defconfig +++ b/arch/powerpc/configs/ebony_defconfig | |||
@@ -90,8 +90,9 @@ CONFIG_TIMERFD=y | |||
90 | CONFIG_EVENTFD=y | 90 | CONFIG_EVENTFD=y |
91 | CONFIG_SHMEM=y | 91 | CONFIG_SHMEM=y |
92 | CONFIG_VM_EVENT_COUNTERS=y | 92 | CONFIG_VM_EVENT_COUNTERS=y |
93 | CONFIG_SLAB=y | 93 | CONFIG_SLUB_DEBUG=y |
94 | # CONFIG_SLUB is not set | 94 | # CONFIG_SLAB is not set |
95 | CONFIG_SLUB=y | ||
95 | # CONFIG_SLOB is not set | 96 | # CONFIG_SLOB is not set |
96 | CONFIG_RT_MUTEXES=y | 97 | CONFIG_RT_MUTEXES=y |
97 | # CONFIG_TINY_SHMEM is not set | 98 | # CONFIG_TINY_SHMEM is not set |
@@ -773,7 +774,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
773 | CONFIG_SCHED_DEBUG=y | 774 | CONFIG_SCHED_DEBUG=y |
774 | # CONFIG_SCHEDSTATS is not set | 775 | # CONFIG_SCHEDSTATS is not set |
775 | # CONFIG_TIMER_STATS is not set | 776 | # CONFIG_TIMER_STATS is not set |
776 | # CONFIG_DEBUG_SLAB is not set | 777 | # CONFIG_SLUB_DEBUG_ON is not set |
777 | # CONFIG_DEBUG_RT_MUTEXES is not set | 778 | # CONFIG_DEBUG_RT_MUTEXES is not set |
778 | # CONFIG_RT_MUTEX_TESTER is not set | 779 | # CONFIG_RT_MUTEX_TESTER is not set |
779 | # CONFIG_DEBUG_SPINLOCK is not set | 780 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index a655d87b3f8b..0a6fa1fc9766 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig | |||
@@ -92,8 +92,9 @@ CONFIG_TIMERFD=y | |||
92 | CONFIG_EVENTFD=y | 92 | CONFIG_EVENTFD=y |
93 | CONFIG_SHMEM=y | 93 | CONFIG_SHMEM=y |
94 | CONFIG_VM_EVENT_COUNTERS=y | 94 | CONFIG_VM_EVENT_COUNTERS=y |
95 | CONFIG_SLAB=y | 95 | CONFIG_SLUB_DEBUG=y |
96 | # CONFIG_SLUB is not set | 96 | # CONFIG_SLAB is not set |
97 | CONFIG_SLUB=y | ||
97 | # CONFIG_SLOB is not set | 98 | # CONFIG_SLOB is not set |
98 | CONFIG_RT_MUTEXES=y | 99 | CONFIG_RT_MUTEXES=y |
99 | # CONFIG_TINY_SHMEM is not set | 100 | # CONFIG_TINY_SHMEM is not set |
@@ -1580,7 +1581,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1580 | CONFIG_SCHED_DEBUG=y | 1581 | CONFIG_SCHED_DEBUG=y |
1581 | # CONFIG_SCHEDSTATS is not set | 1582 | # CONFIG_SCHEDSTATS is not set |
1582 | # CONFIG_TIMER_STATS is not set | 1583 | # CONFIG_TIMER_STATS is not set |
1583 | # CONFIG_DEBUG_SLAB is not set | 1584 | # CONFIG_SLUB_DEBUG_ON is not set |
1584 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1585 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1585 | # CONFIG_RT_MUTEX_TESTER is not set | 1586 | # CONFIG_RT_MUTEX_TESTER is not set |
1586 | # CONFIG_DEBUG_SPINLOCK is not set | 1587 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig index 97d0202a9fe0..11009185d230 100644 --- a/arch/powerpc/configs/holly_defconfig +++ b/arch/powerpc/configs/holly_defconfig | |||
@@ -88,8 +88,9 @@ CONFIG_TIMERFD=y | |||
88 | CONFIG_EVENTFD=y | 88 | CONFIG_EVENTFD=y |
89 | CONFIG_SHMEM=y | 89 | CONFIG_SHMEM=y |
90 | CONFIG_VM_EVENT_COUNTERS=y | 90 | CONFIG_VM_EVENT_COUNTERS=y |
91 | CONFIG_SLAB=y | 91 | CONFIG_SLUB_DEBUG=y |
92 | # CONFIG_SLUB is not set | 92 | # CONFIG_SLAB is not set |
93 | CONFIG_SLUB=y | ||
93 | # CONFIG_SLOB is not set | 94 | # CONFIG_SLOB is not set |
94 | CONFIG_RT_MUTEXES=y | 95 | CONFIG_RT_MUTEXES=y |
95 | # CONFIG_TINY_SHMEM is not set | 96 | # CONFIG_TINY_SHMEM is not set |
@@ -909,7 +910,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
909 | # CONFIG_SCHED_DEBUG is not set | 910 | # CONFIG_SCHED_DEBUG is not set |
910 | # CONFIG_SCHEDSTATS is not set | 911 | # CONFIG_SCHEDSTATS is not set |
911 | # CONFIG_TIMER_STATS is not set | 912 | # CONFIG_TIMER_STATS is not set |
912 | # CONFIG_DEBUG_SLAB is not set | 913 | # CONFIG_SLUB_DEBUG_ON is not set |
913 | # CONFIG_DEBUG_RT_MUTEXES is not set | 914 | # CONFIG_DEBUG_RT_MUTEXES is not set |
914 | # CONFIG_RT_MUTEX_TESTER is not set | 915 | # CONFIG_RT_MUTEX_TESTER is not set |
915 | # CONFIG_DEBUG_SPINLOCK is not set | 916 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index 3fe1929460e7..d78e3a6fc68c 100644 --- a/arch/powerpc/configs/iseries_defconfig +++ b/arch/powerpc/configs/iseries_defconfig | |||
@@ -93,8 +93,9 @@ CONFIG_TIMERFD=y | |||
93 | CONFIG_EVENTFD=y | 93 | CONFIG_EVENTFD=y |
94 | CONFIG_SHMEM=y | 94 | CONFIG_SHMEM=y |
95 | CONFIG_VM_EVENT_COUNTERS=y | 95 | CONFIG_VM_EVENT_COUNTERS=y |
96 | CONFIG_SLAB=y | 96 | CONFIG_SLUB_DEBUG=y |
97 | # CONFIG_SLUB is not set | 97 | # CONFIG_SLAB is not set |
98 | CONFIG_SLUB=y | ||
98 | # CONFIG_SLOB is not set | 99 | # CONFIG_SLOB is not set |
99 | CONFIG_RT_MUTEXES=y | 100 | CONFIG_RT_MUTEXES=y |
100 | # CONFIG_TINY_SHMEM is not set | 101 | # CONFIG_TINY_SHMEM is not set |
@@ -1056,7 +1057,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1056 | CONFIG_SCHED_DEBUG=y | 1057 | CONFIG_SCHED_DEBUG=y |
1057 | # CONFIG_SCHEDSTATS is not set | 1058 | # CONFIG_SCHEDSTATS is not set |
1058 | # CONFIG_TIMER_STATS is not set | 1059 | # CONFIG_TIMER_STATS is not set |
1059 | # CONFIG_DEBUG_SLAB is not set | 1060 | # CONFIG_SLUB_DEBUG_ON is not set |
1060 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1061 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1061 | # CONFIG_RT_MUTEX_TESTER is not set | 1062 | # CONFIG_RT_MUTEX_TESTER is not set |
1062 | # CONFIG_DEBUG_SPINLOCK is not set | 1063 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/kilauea_defconfig b/arch/powerpc/configs/kilauea_defconfig index 31790d329269..fd1c530aa3ec 100644 --- a/arch/powerpc/configs/kilauea_defconfig +++ b/arch/powerpc/configs/kilauea_defconfig | |||
@@ -91,8 +91,9 @@ CONFIG_SIGNALFD=y | |||
91 | CONFIG_EVENTFD=y | 91 | CONFIG_EVENTFD=y |
92 | CONFIG_SHMEM=y | 92 | CONFIG_SHMEM=y |
93 | CONFIG_VM_EVENT_COUNTERS=y | 93 | CONFIG_VM_EVENT_COUNTERS=y |
94 | CONFIG_SLAB=y | 94 | CONFIG_SLUB_DEBUG=y |
95 | # CONFIG_SLUB is not set | 95 | # CONFIG_SLAB is not set |
96 | CONFIG_SLUB=y | ||
96 | # CONFIG_SLOB is not set | 97 | # CONFIG_SLOB is not set |
97 | CONFIG_RT_MUTEXES=y | 98 | CONFIG_RT_MUTEXES=y |
98 | # CONFIG_TINY_SHMEM is not set | 99 | # CONFIG_TINY_SHMEM is not set |
@@ -700,7 +701,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
700 | CONFIG_SCHED_DEBUG=y | 701 | CONFIG_SCHED_DEBUG=y |
701 | # CONFIG_SCHEDSTATS is not set | 702 | # CONFIG_SCHEDSTATS is not set |
702 | # CONFIG_TIMER_STATS is not set | 703 | # CONFIG_TIMER_STATS is not set |
703 | # CONFIG_DEBUG_SLAB is not set | 704 | # CONFIG_SLUB_DEBUG_ON is not set |
704 | # CONFIG_DEBUG_RT_MUTEXES is not set | 705 | # CONFIG_DEBUG_RT_MUTEXES is not set |
705 | # CONFIG_RT_MUTEX_TESTER is not set | 706 | # CONFIG_RT_MUTEX_TESTER is not set |
706 | # CONFIG_DEBUG_SPINLOCK is not set | 707 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig index a4e3ee045a6a..401033aefd40 100644 --- a/arch/powerpc/configs/linkstation_defconfig +++ b/arch/powerpc/configs/linkstation_defconfig | |||
@@ -89,8 +89,9 @@ CONFIG_TIMERFD=y | |||
89 | CONFIG_EVENTFD=y | 89 | CONFIG_EVENTFD=y |
90 | CONFIG_SHMEM=y | 90 | CONFIG_SHMEM=y |
91 | CONFIG_VM_EVENT_COUNTERS=y | 91 | CONFIG_VM_EVENT_COUNTERS=y |
92 | CONFIG_SLAB=y | 92 | CONFIG_SLUB_DEBUG=y |
93 | # CONFIG_SLUB is not set | 93 | # CONFIG_SLAB is not set |
94 | CONFIG_SLUB=y | ||
94 | # CONFIG_SLOB is not set | 95 | # CONFIG_SLOB is not set |
95 | CONFIG_RT_MUTEXES=y | 96 | CONFIG_RT_MUTEXES=y |
96 | # CONFIG_TINY_SHMEM is not set | 97 | # CONFIG_TINY_SHMEM is not set |
@@ -1459,7 +1460,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1459 | CONFIG_SCHED_DEBUG=y | 1460 | CONFIG_SCHED_DEBUG=y |
1460 | # CONFIG_SCHEDSTATS is not set | 1461 | # CONFIG_SCHEDSTATS is not set |
1461 | # CONFIG_TIMER_STATS is not set | 1462 | # CONFIG_TIMER_STATS is not set |
1462 | # CONFIG_DEBUG_SLAB is not set | 1463 | # CONFIG_SLUB_DEBUG_ON is not set |
1463 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1464 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1464 | # CONFIG_RT_MUTEX_TESTER is not set | 1465 | # CONFIG_RT_MUTEX_TESTER is not set |
1465 | # CONFIG_DEBUG_SPINLOCK is not set | 1466 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig index d42e226d3a28..dd78ed955eb0 100644 --- a/arch/powerpc/configs/lite5200_defconfig +++ b/arch/powerpc/configs/lite5200_defconfig | |||
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y | |||
87 | CONFIG_EVENTFD=y | 87 | CONFIG_EVENTFD=y |
88 | CONFIG_SHMEM=y | 88 | CONFIG_SHMEM=y |
89 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
90 | CONFIG_SLAB=y | 90 | CONFIG_SLUB_DEBUG=y |
91 | # CONFIG_SLUB is not set | 91 | # CONFIG_SLAB is not set |
92 | CONFIG_SLUB=y | ||
92 | # CONFIG_SLOB is not set | 93 | # CONFIG_SLOB is not set |
93 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
94 | # CONFIG_TINY_SHMEM is not set | 95 | # CONFIG_TINY_SHMEM is not set |
@@ -816,7 +817,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
816 | CONFIG_SCHED_DEBUG=y | 817 | CONFIG_SCHED_DEBUG=y |
817 | # CONFIG_SCHEDSTATS is not set | 818 | # CONFIG_SCHEDSTATS is not set |
818 | # CONFIG_TIMER_STATS is not set | 819 | # CONFIG_TIMER_STATS is not set |
819 | # CONFIG_DEBUG_SLAB is not set | 820 | # CONFIG_SLUB_DEBUG_ON is not set |
820 | # CONFIG_DEBUG_RT_MUTEXES is not set | 821 | # CONFIG_DEBUG_RT_MUTEXES is not set |
821 | # CONFIG_RT_MUTEX_TESTER is not set | 822 | # CONFIG_RT_MUTEX_TESTER is not set |
822 | # CONFIG_DEBUG_SPINLOCK is not set | 823 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig index 96b538bc676b..84b9ab4a5a92 100644 --- a/arch/powerpc/configs/maple_defconfig +++ b/arch/powerpc/configs/maple_defconfig | |||
@@ -90,8 +90,9 @@ CONFIG_TIMERFD=y | |||
90 | CONFIG_EVENTFD=y | 90 | CONFIG_EVENTFD=y |
91 | CONFIG_SHMEM=y | 91 | CONFIG_SHMEM=y |
92 | CONFIG_VM_EVENT_COUNTERS=y | 92 | CONFIG_VM_EVENT_COUNTERS=y |
93 | CONFIG_SLAB=y | 93 | CONFIG_SLUB_DEBUG=y |
94 | # CONFIG_SLUB is not set | 94 | # CONFIG_SLAB is not set |
95 | CONFIG_SLUB=y | ||
95 | # CONFIG_SLOB is not set | 96 | # CONFIG_SLOB is not set |
96 | CONFIG_RT_MUTEXES=y | 97 | CONFIG_RT_MUTEXES=y |
97 | # CONFIG_TINY_SHMEM is not set | 98 | # CONFIG_TINY_SHMEM is not set |
@@ -1095,8 +1096,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1095 | CONFIG_SCHED_DEBUG=y | 1096 | CONFIG_SCHED_DEBUG=y |
1096 | # CONFIG_SCHEDSTATS is not set | 1097 | # CONFIG_SCHEDSTATS is not set |
1097 | # CONFIG_TIMER_STATS is not set | 1098 | # CONFIG_TIMER_STATS is not set |
1098 | CONFIG_DEBUG_SLAB=y | 1099 | # CONFIG_SLUB_DEBUG_ON is not set |
1099 | # CONFIG_DEBUG_SLAB_LEAK is not set | ||
1100 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1100 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1101 | # CONFIG_RT_MUTEX_TESTER is not set | 1101 | # CONFIG_RT_MUTEX_TESTER is not set |
1102 | # CONFIG_DEBUG_SPINLOCK is not set | 1102 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig index 05814a3b0e33..87ae894551b7 100644 --- a/arch/powerpc/configs/mpc7448_hpc2_defconfig +++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig | |||
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y | |||
87 | CONFIG_EVENTFD=y | 87 | CONFIG_EVENTFD=y |
88 | CONFIG_SHMEM=y | 88 | CONFIG_SHMEM=y |
89 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
90 | CONFIG_SLAB=y | 90 | CONFIG_SLUB_DEBUG=y |
91 | # CONFIG_SLUB is not set | 91 | # CONFIG_SLAB is not set |
92 | CONFIG_SLUB=y | ||
92 | # CONFIG_SLOB is not set | 93 | # CONFIG_SLOB is not set |
93 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
94 | # CONFIG_TINY_SHMEM is not set | 95 | # CONFIG_TINY_SHMEM is not set |
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index 6b7951ec941a..865a942ecc69 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_defconfig | |||
@@ -85,8 +85,9 @@ CONFIG_TIMERFD=y | |||
85 | CONFIG_EVENTFD=y | 85 | CONFIG_EVENTFD=y |
86 | CONFIG_SHMEM=y | 86 | CONFIG_SHMEM=y |
87 | CONFIG_VM_EVENT_COUNTERS=y | 87 | CONFIG_VM_EVENT_COUNTERS=y |
88 | CONFIG_SLAB=y | 88 | CONFIG_SLUB_DEBUG=y |
89 | # CONFIG_SLUB is not set | 89 | # CONFIG_SLAB is not set |
90 | CONFIG_SLUB=y | ||
90 | # CONFIG_SLOB is not set | 91 | # CONFIG_SLOB is not set |
91 | CONFIG_RT_MUTEXES=y | 92 | CONFIG_RT_MUTEXES=y |
92 | # CONFIG_TINY_SHMEM is not set | 93 | # CONFIG_TINY_SHMEM is not set |
@@ -867,7 +868,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
867 | CONFIG_SCHED_DEBUG=y | 868 | CONFIG_SCHED_DEBUG=y |
868 | # CONFIG_SCHEDSTATS is not set | 869 | # CONFIG_SCHEDSTATS is not set |
869 | # CONFIG_TIMER_STATS is not set | 870 | # CONFIG_TIMER_STATS is not set |
870 | # CONFIG_DEBUG_SLAB is not set | 871 | # CONFIG_SLUB_DEBUG_ON is not set |
871 | # CONFIG_DEBUG_RT_MUTEXES is not set | 872 | # CONFIG_DEBUG_RT_MUTEXES is not set |
872 | # CONFIG_RT_MUTEX_TESTER is not set | 873 | # CONFIG_RT_MUTEX_TESTER is not set |
873 | # CONFIG_DEBUG_SPINLOCK is not set | 874 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/mpc8313_rdb_defconfig b/arch/powerpc/configs/mpc8313_rdb_defconfig index f387dac69d09..259d40d1eb5a 100644 --- a/arch/powerpc/configs/mpc8313_rdb_defconfig +++ b/arch/powerpc/configs/mpc8313_rdb_defconfig | |||
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y | |||
87 | CONFIG_EVENTFD=y | 87 | CONFIG_EVENTFD=y |
88 | CONFIG_SHMEM=y | 88 | CONFIG_SHMEM=y |
89 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
90 | CONFIG_SLAB=y | 90 | CONFIG_SLUB_DEBUG=y |
91 | # CONFIG_SLUB is not set | 91 | # CONFIG_SLAB is not set |
92 | CONFIG_SLUB=y | ||
92 | # CONFIG_SLOB is not set | 93 | # CONFIG_SLOB is not set |
93 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
94 | # CONFIG_TINY_SHMEM is not set | 95 | # CONFIG_TINY_SHMEM is not set |
@@ -1272,7 +1273,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1272 | CONFIG_SCHED_DEBUG=y | 1273 | CONFIG_SCHED_DEBUG=y |
1273 | # CONFIG_SCHEDSTATS is not set | 1274 | # CONFIG_SCHEDSTATS is not set |
1274 | # CONFIG_TIMER_STATS is not set | 1275 | # CONFIG_TIMER_STATS is not set |
1275 | # CONFIG_DEBUG_SLAB is not set | 1276 | # CONFIG_SLUB_DEBUG_ON is not set |
1276 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1277 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1277 | # CONFIG_RT_MUTEX_TESTER is not set | 1278 | # CONFIG_RT_MUTEX_TESTER is not set |
1278 | # CONFIG_DEBUG_SPINLOCK is not set | 1279 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/mpc832x_mds_defconfig b/arch/powerpc/configs/mpc832x_mds_defconfig index fc6695302cc8..dd68d1818d6b 100644 --- a/arch/powerpc/configs/mpc832x_mds_defconfig +++ b/arch/powerpc/configs/mpc832x_mds_defconfig | |||
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y | |||
87 | CONFIG_EVENTFD=y | 87 | CONFIG_EVENTFD=y |
88 | CONFIG_SHMEM=y | 88 | CONFIG_SHMEM=y |
89 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
90 | CONFIG_SLAB=y | 90 | CONFIG_SLUB_DEBUG=y |
91 | # CONFIG_SLUB is not set | 91 | # CONFIG_SLAB is not set |
92 | CONFIG_SLUB=y | ||
92 | # CONFIG_SLOB is not set | 93 | # CONFIG_SLOB is not set |
93 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
94 | # CONFIG_TINY_SHMEM is not set | 95 | # CONFIG_TINY_SHMEM is not set |
diff --git a/arch/powerpc/configs/mpc832x_rdb_defconfig b/arch/powerpc/configs/mpc832x_rdb_defconfig index 6d1c3e842051..4f391028c79c 100644 --- a/arch/powerpc/configs/mpc832x_rdb_defconfig +++ b/arch/powerpc/configs/mpc832x_rdb_defconfig | |||
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y | |||
87 | CONFIG_EVENTFD=y | 87 | CONFIG_EVENTFD=y |
88 | CONFIG_SHMEM=y | 88 | CONFIG_SHMEM=y |
89 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
90 | CONFIG_SLAB=y | 90 | CONFIG_SLUB_DEBUG=y |
91 | # CONFIG_SLUB is not set | 91 | # CONFIG_SLAB is not set |
92 | CONFIG_SLUB=y | ||
92 | # CONFIG_SLOB is not set | 93 | # CONFIG_SLOB is not set |
93 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
94 | # CONFIG_TINY_SHMEM is not set | 95 | # CONFIG_TINY_SHMEM is not set |
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig index ddafa6b9af05..eb28dd85cb2b 100644 --- a/arch/powerpc/configs/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/mpc834x_itx_defconfig | |||
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y | |||
87 | CONFIG_EVENTFD=y | 87 | CONFIG_EVENTFD=y |
88 | CONFIG_SHMEM=y | 88 | CONFIG_SHMEM=y |
89 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
90 | CONFIG_SLAB=y | 90 | CONFIG_SLUB_DEBUG=y |
91 | # CONFIG_SLUB is not set | 91 | # CONFIG_SLAB is not set |
92 | CONFIG_SLUB=y | ||
92 | # CONFIG_SLOB is not set | 93 | # CONFIG_SLOB is not set |
93 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
94 | # CONFIG_TINY_SHMEM is not set | 95 | # CONFIG_TINY_SHMEM is not set |
diff --git a/arch/powerpc/configs/mpc834x_itxgp_defconfig b/arch/powerpc/configs/mpc834x_itxgp_defconfig index 8241c6985861..22b95462c913 100644 --- a/arch/powerpc/configs/mpc834x_itxgp_defconfig +++ b/arch/powerpc/configs/mpc834x_itxgp_defconfig | |||
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y | |||
87 | CONFIG_EVENTFD=y | 87 | CONFIG_EVENTFD=y |
88 | CONFIG_SHMEM=y | 88 | CONFIG_SHMEM=y |
89 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
90 | CONFIG_SLAB=y | 90 | CONFIG_SLUB_DEBUG=y |
91 | # CONFIG_SLUB is not set | 91 | # CONFIG_SLAB is not set |
92 | CONFIG_SLUB=y | ||
92 | # CONFIG_SLOB is not set | 93 | # CONFIG_SLOB is not set |
93 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
94 | # CONFIG_TINY_SHMEM is not set | 95 | # CONFIG_TINY_SHMEM is not set |
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig index 06233b1a9418..e59a88e95486 100644 --- a/arch/powerpc/configs/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/mpc834x_mds_defconfig | |||
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y | |||
87 | CONFIG_EVENTFD=y | 87 | CONFIG_EVENTFD=y |
88 | CONFIG_SHMEM=y | 88 | CONFIG_SHMEM=y |
89 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
90 | CONFIG_SLAB=y | 90 | CONFIG_SLUB_DEBUG=y |
91 | # CONFIG_SLUB is not set | 91 | # CONFIG_SLAB is not set |
92 | CONFIG_SLUB=y | ||
92 | # CONFIG_SLOB is not set | 93 | # CONFIG_SLOB is not set |
93 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
94 | # CONFIG_TINY_SHMEM is not set | 95 | # CONFIG_TINY_SHMEM is not set |
diff --git a/arch/powerpc/configs/mpc836x_mds_defconfig b/arch/powerpc/configs/mpc836x_mds_defconfig index 3045749d62fe..75657528518e 100644 --- a/arch/powerpc/configs/mpc836x_mds_defconfig +++ b/arch/powerpc/configs/mpc836x_mds_defconfig | |||
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y | |||
87 | CONFIG_EVENTFD=y | 87 | CONFIG_EVENTFD=y |
88 | CONFIG_SHMEM=y | 88 | CONFIG_SHMEM=y |
89 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
90 | CONFIG_SLAB=y | 90 | CONFIG_SLUB_DEBUG=y |
91 | # CONFIG_SLUB is not set | 91 | # CONFIG_SLAB is not set |
92 | CONFIG_SLUB=y | ||
92 | # CONFIG_SLOB is not set | 93 | # CONFIG_SLOB is not set |
93 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
94 | # CONFIG_TINY_SHMEM is not set | 95 | # CONFIG_TINY_SHMEM is not set |
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig index b282c3521dd5..b953b2c51453 100644 --- a/arch/powerpc/configs/mpc8540_ads_defconfig +++ b/arch/powerpc/configs/mpc8540_ads_defconfig | |||
@@ -90,8 +90,9 @@ CONFIG_TIMERFD=y | |||
90 | CONFIG_EVENTFD=y | 90 | CONFIG_EVENTFD=y |
91 | CONFIG_SHMEM=y | 91 | CONFIG_SHMEM=y |
92 | CONFIG_VM_EVENT_COUNTERS=y | 92 | CONFIG_VM_EVENT_COUNTERS=y |
93 | CONFIG_SLAB=y | 93 | CONFIG_SLUB_DEBUG=y |
94 | # CONFIG_SLUB is not set | 94 | # CONFIG_SLAB is not set |
95 | CONFIG_SLUB=y | ||
95 | # CONFIG_SLOB is not set | 96 | # CONFIG_SLOB is not set |
96 | CONFIG_RT_MUTEXES=y | 97 | CONFIG_RT_MUTEXES=y |
97 | # CONFIG_TINY_SHMEM is not set | 98 | # CONFIG_TINY_SHMEM is not set |
@@ -704,7 +705,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
704 | CONFIG_SCHED_DEBUG=y | 705 | CONFIG_SCHED_DEBUG=y |
705 | # CONFIG_SCHEDSTATS is not set | 706 | # CONFIG_SCHEDSTATS is not set |
706 | # CONFIG_TIMER_STATS is not set | 707 | # CONFIG_TIMER_STATS is not set |
707 | # CONFIG_DEBUG_SLAB is not set | 708 | # CONFIG_SLUB_DEBUG_ON is not set |
708 | # CONFIG_DEBUG_RT_MUTEXES is not set | 709 | # CONFIG_DEBUG_RT_MUTEXES is not set |
709 | # CONFIG_RT_MUTEX_TESTER is not set | 710 | # CONFIG_RT_MUTEX_TESTER is not set |
710 | # CONFIG_DEBUG_SPINLOCK is not set | 711 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/mpc8544_ds_defconfig b/arch/powerpc/configs/mpc8544_ds_defconfig index 150221f6f723..9a3e08bcd188 100644 --- a/arch/powerpc/configs/mpc8544_ds_defconfig +++ b/arch/powerpc/configs/mpc8544_ds_defconfig | |||
@@ -93,8 +93,9 @@ CONFIG_TIMERFD=y | |||
93 | CONFIG_EVENTFD=y | 93 | CONFIG_EVENTFD=y |
94 | CONFIG_SHMEM=y | 94 | CONFIG_SHMEM=y |
95 | CONFIG_VM_EVENT_COUNTERS=y | 95 | CONFIG_VM_EVENT_COUNTERS=y |
96 | CONFIG_SLAB=y | 96 | CONFIG_SLUB_DEBUG=y |
97 | # CONFIG_SLUB is not set | 97 | # CONFIG_SLAB is not set |
98 | CONFIG_SLUB=y | ||
98 | # CONFIG_SLOB is not set | 99 | # CONFIG_SLOB is not set |
99 | CONFIG_RT_MUTEXES=y | 100 | CONFIG_RT_MUTEXES=y |
100 | # CONFIG_TINY_SHMEM is not set | 101 | # CONFIG_TINY_SHMEM is not set |
@@ -1427,7 +1428,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1427 | CONFIG_SCHED_DEBUG=y | 1428 | CONFIG_SCHED_DEBUG=y |
1428 | # CONFIG_SCHEDSTATS is not set | 1429 | # CONFIG_SCHEDSTATS is not set |
1429 | # CONFIG_TIMER_STATS is not set | 1430 | # CONFIG_TIMER_STATS is not set |
1430 | # CONFIG_DEBUG_SLAB is not set | 1431 | # CONFIG_SLUB_DEBUG_ON is not set |
1431 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1432 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1432 | # CONFIG_RT_MUTEX_TESTER is not set | 1433 | # CONFIG_RT_MUTEX_TESTER is not set |
1433 | # CONFIG_DEBUG_SPINLOCK is not set | 1434 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/mpc8560_ads_defconfig b/arch/powerpc/configs/mpc8560_ads_defconfig index 3d68c65212cf..0211e6b68e1a 100644 --- a/arch/powerpc/configs/mpc8560_ads_defconfig +++ b/arch/powerpc/configs/mpc8560_ads_defconfig | |||
@@ -94,8 +94,9 @@ CONFIG_SIGNALFD=y | |||
94 | CONFIG_EVENTFD=y | 94 | CONFIG_EVENTFD=y |
95 | CONFIG_SHMEM=y | 95 | CONFIG_SHMEM=y |
96 | CONFIG_VM_EVENT_COUNTERS=y | 96 | CONFIG_VM_EVENT_COUNTERS=y |
97 | CONFIG_SLAB=y | 97 | CONFIG_SLUB_DEBUG=y |
98 | # CONFIG_SLUB is not set | 98 | # CONFIG_SLAB is not set |
99 | CONFIG_SLUB=y | ||
99 | # CONFIG_SLOB is not set | 100 | # CONFIG_SLOB is not set |
100 | CONFIG_RT_MUTEXES=y | 101 | CONFIG_RT_MUTEXES=y |
101 | # CONFIG_TINY_SHMEM is not set | 102 | # CONFIG_TINY_SHMEM is not set |
@@ -791,7 +792,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
791 | CONFIG_SCHED_DEBUG=y | 792 | CONFIG_SCHED_DEBUG=y |
792 | # CONFIG_SCHEDSTATS is not set | 793 | # CONFIG_SCHEDSTATS is not set |
793 | # CONFIG_TIMER_STATS is not set | 794 | # CONFIG_TIMER_STATS is not set |
794 | # CONFIG_DEBUG_SLAB is not set | 795 | # CONFIG_SLUB_DEBUG_ON is not set |
795 | # CONFIG_DEBUG_RT_MUTEXES is not set | 796 | # CONFIG_DEBUG_RT_MUTEXES is not set |
796 | # CONFIG_RT_MUTEX_TESTER is not set | 797 | # CONFIG_RT_MUTEX_TESTER is not set |
797 | # CONFIG_DEBUG_SPINLOCK is not set | 798 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/mpc8568mds_defconfig b/arch/powerpc/configs/mpc8568mds_defconfig index 0307fe7b0487..883d8af9debd 100644 --- a/arch/powerpc/configs/mpc8568mds_defconfig +++ b/arch/powerpc/configs/mpc8568mds_defconfig | |||
@@ -88,8 +88,9 @@ CONFIG_TIMERFD=y | |||
88 | CONFIG_EVENTFD=y | 88 | CONFIG_EVENTFD=y |
89 | CONFIG_SHMEM=y | 89 | CONFIG_SHMEM=y |
90 | CONFIG_VM_EVENT_COUNTERS=y | 90 | CONFIG_VM_EVENT_COUNTERS=y |
91 | CONFIG_SLAB=y | 91 | CONFIG_SLUB_DEBUG=y |
92 | # CONFIG_SLUB is not set | 92 | # CONFIG_SLAB is not set |
93 | CONFIG_SLUB=y | ||
93 | # CONFIG_SLOB is not set | 94 | # CONFIG_SLOB is not set |
94 | CONFIG_RT_MUTEXES=y | 95 | CONFIG_RT_MUTEXES=y |
95 | # CONFIG_TINY_SHMEM is not set | 96 | # CONFIG_TINY_SHMEM is not set |
@@ -949,7 +950,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
949 | CONFIG_SCHED_DEBUG=y | 950 | CONFIG_SCHED_DEBUG=y |
950 | # CONFIG_SCHEDSTATS is not set | 951 | # CONFIG_SCHEDSTATS is not set |
951 | # CONFIG_TIMER_STATS is not set | 952 | # CONFIG_TIMER_STATS is not set |
952 | # CONFIG_DEBUG_SLAB is not set | 953 | # CONFIG_SLUB_DEBUG_ON is not set |
953 | # CONFIG_DEBUG_RT_MUTEXES is not set | 954 | # CONFIG_DEBUG_RT_MUTEXES is not set |
954 | # CONFIG_RT_MUTEX_TESTER is not set | 955 | # CONFIG_RT_MUTEX_TESTER is not set |
955 | # CONFIG_DEBUG_SPINLOCK is not set | 956 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/mpc8572_ds_defconfig b/arch/powerpc/configs/mpc8572_ds_defconfig index 7f1a3e987138..4e85b2e88525 100644 --- a/arch/powerpc/configs/mpc8572_ds_defconfig +++ b/arch/powerpc/configs/mpc8572_ds_defconfig | |||
@@ -93,8 +93,9 @@ CONFIG_TIMERFD=y | |||
93 | CONFIG_EVENTFD=y | 93 | CONFIG_EVENTFD=y |
94 | CONFIG_SHMEM=y | 94 | CONFIG_SHMEM=y |
95 | CONFIG_VM_EVENT_COUNTERS=y | 95 | CONFIG_VM_EVENT_COUNTERS=y |
96 | CONFIG_SLAB=y | 96 | CONFIG_SLUB_DEBUG=y |
97 | # CONFIG_SLUB is not set | 97 | # CONFIG_SLAB is not set |
98 | CONFIG_SLUB=y | ||
98 | # CONFIG_SLOB is not set | 99 | # CONFIG_SLOB is not set |
99 | CONFIG_RT_MUTEXES=y | 100 | CONFIG_RT_MUTEXES=y |
100 | # CONFIG_TINY_SHMEM is not set | 101 | # CONFIG_TINY_SHMEM is not set |
@@ -1427,7 +1428,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1427 | CONFIG_SCHED_DEBUG=y | 1428 | CONFIG_SCHED_DEBUG=y |
1428 | # CONFIG_SCHEDSTATS is not set | 1429 | # CONFIG_SCHEDSTATS is not set |
1429 | # CONFIG_TIMER_STATS is not set | 1430 | # CONFIG_TIMER_STATS is not set |
1430 | # CONFIG_DEBUG_SLAB is not set | 1431 | # CONFIG_SLUB_DEBUG_ON is not set |
1431 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1432 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1432 | # CONFIG_RT_MUTEX_TESTER is not set | 1433 | # CONFIG_RT_MUTEX_TESTER is not set |
1433 | # CONFIG_DEBUG_SPINLOCK is not set | 1434 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig index e6850c619f88..a4f33d110542 100644 --- a/arch/powerpc/configs/mpc85xx_cds_defconfig +++ b/arch/powerpc/configs/mpc85xx_cds_defconfig | |||
@@ -90,8 +90,9 @@ CONFIG_TIMERFD=y | |||
90 | CONFIG_EVENTFD=y | 90 | CONFIG_EVENTFD=y |
91 | CONFIG_SHMEM=y | 91 | CONFIG_SHMEM=y |
92 | CONFIG_VM_EVENT_COUNTERS=y | 92 | CONFIG_VM_EVENT_COUNTERS=y |
93 | CONFIG_SLAB=y | 93 | CONFIG_SLUB_DEBUG=y |
94 | # CONFIG_SLUB is not set | 94 | # CONFIG_SLAB is not set |
95 | CONFIG_SLUB=y | ||
95 | # CONFIG_SLOB is not set | 96 | # CONFIG_SLOB is not set |
96 | CONFIG_RT_MUTEXES=y | 97 | CONFIG_RT_MUTEXES=y |
97 | # CONFIG_TINY_SHMEM is not set | 98 | # CONFIG_TINY_SHMEM is not set |
@@ -832,7 +833,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
832 | CONFIG_SCHED_DEBUG=y | 833 | CONFIG_SCHED_DEBUG=y |
833 | # CONFIG_SCHEDSTATS is not set | 834 | # CONFIG_SCHEDSTATS is not set |
834 | # CONFIG_TIMER_STATS is not set | 835 | # CONFIG_TIMER_STATS is not set |
835 | # CONFIG_DEBUG_SLAB is not set | 836 | # CONFIG_SLUB_DEBUG_ON is not set |
836 | # CONFIG_DEBUG_RT_MUTEXES is not set | 837 | # CONFIG_DEBUG_RT_MUTEXES is not set |
837 | # CONFIG_RT_MUTEX_TESTER is not set | 838 | # CONFIG_RT_MUTEX_TESTER is not set |
838 | # CONFIG_DEBUG_SPINLOCK is not set | 839 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig index de19b781937f..0483211f52be 100644 --- a/arch/powerpc/configs/mpc8610_hpcd_defconfig +++ b/arch/powerpc/configs/mpc8610_hpcd_defconfig | |||
@@ -88,8 +88,9 @@ CONFIG_SIGNALFD=y | |||
88 | CONFIG_EVENTFD=y | 88 | CONFIG_EVENTFD=y |
89 | CONFIG_SHMEM=y | 89 | CONFIG_SHMEM=y |
90 | CONFIG_VM_EVENT_COUNTERS=y | 90 | CONFIG_VM_EVENT_COUNTERS=y |
91 | CONFIG_SLAB=y | 91 | CONFIG_SLUB_DEBUG=y |
92 | # CONFIG_SLUB is not set | 92 | # CONFIG_SLAB is not set |
93 | CONFIG_SLUB=y | ||
93 | # CONFIG_SLOB is not set | 94 | # CONFIG_SLOB is not set |
94 | CONFIG_RT_MUTEXES=y | 95 | CONFIG_RT_MUTEXES=y |
95 | # CONFIG_TINY_SHMEM is not set | 96 | # CONFIG_TINY_SHMEM is not set |
@@ -993,7 +994,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
993 | CONFIG_SCHED_DEBUG=y | 994 | CONFIG_SCHED_DEBUG=y |
994 | # CONFIG_SCHEDSTATS is not set | 995 | # CONFIG_SCHEDSTATS is not set |
995 | # CONFIG_TIMER_STATS is not set | 996 | # CONFIG_TIMER_STATS is not set |
996 | # CONFIG_DEBUG_SLAB is not set | 997 | # CONFIG_SLUB_DEBUG_ON is not set |
997 | # CONFIG_DEBUG_RT_MUTEXES is not set | 998 | # CONFIG_DEBUG_RT_MUTEXES is not set |
998 | # CONFIG_RT_MUTEX_TESTER is not set | 999 | # CONFIG_RT_MUTEX_TESTER is not set |
999 | # CONFIG_DEBUG_SPINLOCK is not set | 1000 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig index b2f389dcaded..ed214fcd8abe 100644 --- a/arch/powerpc/configs/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/mpc8641_hpcn_defconfig | |||
@@ -94,8 +94,9 @@ CONFIG_TIMERFD=y | |||
94 | CONFIG_EVENTFD=y | 94 | CONFIG_EVENTFD=y |
95 | CONFIG_SHMEM=y | 95 | CONFIG_SHMEM=y |
96 | CONFIG_VM_EVENT_COUNTERS=y | 96 | CONFIG_VM_EVENT_COUNTERS=y |
97 | CONFIG_SLAB=y | 97 | CONFIG_SLUB_DEBUG=y |
98 | # CONFIG_SLUB is not set | 98 | # CONFIG_SLAB is not set |
99 | CONFIG_SLUB=y | ||
99 | # CONFIG_SLOB is not set | 100 | # CONFIG_SLOB is not set |
100 | CONFIG_RT_MUTEXES=y | 101 | CONFIG_RT_MUTEXES=y |
101 | # CONFIG_TINY_SHMEM is not set | 102 | # CONFIG_TINY_SHMEM is not set |
@@ -1432,7 +1433,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1432 | CONFIG_SCHED_DEBUG=y | 1433 | CONFIG_SCHED_DEBUG=y |
1433 | # CONFIG_SCHEDSTATS is not set | 1434 | # CONFIG_SCHEDSTATS is not set |
1434 | # CONFIG_TIMER_STATS is not set | 1435 | # CONFIG_TIMER_STATS is not set |
1435 | # CONFIG_DEBUG_SLAB is not set | 1436 | # CONFIG_SLUB_DEBUG_ON is not set |
1436 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1437 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1437 | # CONFIG_RT_MUTEX_TESTER is not set | 1438 | # CONFIG_RT_MUTEX_TESTER is not set |
1438 | # CONFIG_DEBUG_SPINLOCK is not set | 1439 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig index 143a0cd83327..070b0a5b9c0d 100644 --- a/arch/powerpc/configs/mpc866_ads_defconfig +++ b/arch/powerpc/configs/mpc866_ads_defconfig | |||
@@ -83,8 +83,9 @@ CONFIG_TIMERFD=y | |||
83 | CONFIG_EVENTFD=y | 83 | CONFIG_EVENTFD=y |
84 | CONFIG_SHMEM=y | 84 | CONFIG_SHMEM=y |
85 | # CONFIG_VM_EVENT_COUNTERS is not set | 85 | # CONFIG_VM_EVENT_COUNTERS is not set |
86 | CONFIG_SLAB=y | 86 | CONFIG_SLUB_DEBUG=y |
87 | # CONFIG_SLUB is not set | 87 | # CONFIG_SLAB is not set |
88 | CONFIG_SLUB=y | ||
88 | # CONFIG_SLOB is not set | 89 | # CONFIG_SLOB is not set |
89 | CONFIG_RT_MUTEXES=y | 90 | CONFIG_RT_MUTEXES=y |
90 | # CONFIG_TINY_SHMEM is not set | 91 | # CONFIG_TINY_SHMEM is not set |
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig index 295207030c60..1ccf3ed7693e 100644 --- a/arch/powerpc/configs/pasemi_defconfig +++ b/arch/powerpc/configs/pasemi_defconfig | |||
@@ -90,8 +90,9 @@ CONFIG_TIMERFD=y | |||
90 | CONFIG_EVENTFD=y | 90 | CONFIG_EVENTFD=y |
91 | CONFIG_SHMEM=y | 91 | CONFIG_SHMEM=y |
92 | CONFIG_VM_EVENT_COUNTERS=y | 92 | CONFIG_VM_EVENT_COUNTERS=y |
93 | CONFIG_SLAB=y | 93 | CONFIG_SLUB_DEBUG=y |
94 | # CONFIG_SLUB is not set | 94 | # CONFIG_SLAB is not set |
95 | CONFIG_SLUB=y | ||
95 | # CONFIG_SLOB is not set | 96 | # CONFIG_SLOB is not set |
96 | CONFIG_RT_MUTEXES=y | 97 | CONFIG_RT_MUTEXES=y |
97 | # CONFIG_TINY_SHMEM is not set | 98 | # CONFIG_TINY_SHMEM is not set |
@@ -1588,7 +1589,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1588 | CONFIG_SCHED_DEBUG=y | 1589 | CONFIG_SCHED_DEBUG=y |
1589 | # CONFIG_SCHEDSTATS is not set | 1590 | # CONFIG_SCHEDSTATS is not set |
1590 | # CONFIG_TIMER_STATS is not set | 1591 | # CONFIG_TIMER_STATS is not set |
1591 | # CONFIG_DEBUG_SLAB is not set | 1592 | # CONFIG_SLUB_DEBUG_ON is not set |
1592 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1593 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1593 | # CONFIG_RT_MUTEX_TESTER is not set | 1594 | # CONFIG_RT_MUTEX_TESTER is not set |
1594 | # CONFIG_DEBUG_SPINLOCK is not set | 1595 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index cfc9c6573a3c..95b823b60c97 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig | |||
@@ -91,8 +91,9 @@ CONFIG_TIMERFD=y | |||
91 | CONFIG_EVENTFD=y | 91 | CONFIG_EVENTFD=y |
92 | CONFIG_SHMEM=y | 92 | CONFIG_SHMEM=y |
93 | CONFIG_VM_EVENT_COUNTERS=y | 93 | CONFIG_VM_EVENT_COUNTERS=y |
94 | CONFIG_SLAB=y | 94 | CONFIG_SLUB_DEBUG=y |
95 | # CONFIG_SLUB is not set | 95 | # CONFIG_SLAB is not set |
96 | CONFIG_SLUB=y | ||
96 | # CONFIG_SLOB is not set | 97 | # CONFIG_SLOB is not set |
97 | CONFIG_RT_MUTEXES=y | 98 | CONFIG_RT_MUTEXES=y |
98 | # CONFIG_TINY_SHMEM is not set | 99 | # CONFIG_TINY_SHMEM is not set |
@@ -1829,7 +1830,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1829 | CONFIG_SCHED_DEBUG=y | 1830 | CONFIG_SCHED_DEBUG=y |
1830 | # CONFIG_SCHEDSTATS is not set | 1831 | # CONFIG_SCHEDSTATS is not set |
1831 | # CONFIG_TIMER_STATS is not set | 1832 | # CONFIG_TIMER_STATS is not set |
1832 | # CONFIG_DEBUG_SLAB is not set | 1833 | # CONFIG_SLUB_DEBUG_ON is not set |
1833 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1834 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1834 | # CONFIG_RT_MUTEX_TESTER is not set | 1835 | # CONFIG_RT_MUTEX_TESTER is not set |
1835 | # CONFIG_DEBUG_SPINLOCK is not set | 1836 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 5f6224a1feb8..bb8d4e46f0c5 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -96,8 +96,9 @@ CONFIG_TIMERFD=y | |||
96 | CONFIG_EVENTFD=y | 96 | CONFIG_EVENTFD=y |
97 | CONFIG_SHMEM=y | 97 | CONFIG_SHMEM=y |
98 | CONFIG_VM_EVENT_COUNTERS=y | 98 | CONFIG_VM_EVENT_COUNTERS=y |
99 | CONFIG_SLAB=y | 99 | CONFIG_SLUB_DEBUG=y |
100 | # CONFIG_SLUB is not set | 100 | # CONFIG_SLAB is not set |
101 | CONFIG_SLUB=y | ||
101 | # CONFIG_SLOB is not set | 102 | # CONFIG_SLOB is not set |
102 | CONFIG_RT_MUTEXES=y | 103 | CONFIG_RT_MUTEXES=y |
103 | # CONFIG_TINY_SHMEM is not set | 104 | # CONFIG_TINY_SHMEM is not set |
@@ -216,6 +217,10 @@ CONFIG_AXON_RAM=m | |||
216 | # | 217 | # |
217 | # Kernel options | 218 | # Kernel options |
218 | # | 219 | # |
220 | CONFIG_TICK_ONESHOT=y | ||
221 | CONFIG_NO_HZ=y | ||
222 | CONFIG_HIGH_RES_TIMERS=y | ||
223 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
219 | # CONFIG_HZ_100 is not set | 224 | # CONFIG_HZ_100 is not set |
220 | CONFIG_HZ_250=y | 225 | CONFIG_HZ_250=y |
221 | # CONFIG_HZ_300 is not set | 226 | # CONFIG_HZ_300 is not set |
@@ -1750,7 +1755,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1750 | CONFIG_SCHED_DEBUG=y | 1755 | CONFIG_SCHED_DEBUG=y |
1751 | # CONFIG_SCHEDSTATS is not set | 1756 | # CONFIG_SCHEDSTATS is not set |
1752 | # CONFIG_TIMER_STATS is not set | 1757 | # CONFIG_TIMER_STATS is not set |
1753 | # CONFIG_DEBUG_SLAB is not set | 1758 | # CONFIG_SLUB_DEBUG_ON is not set |
1754 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1759 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1755 | # CONFIG_RT_MUTEX_TESTER is not set | 1760 | # CONFIG_RT_MUTEX_TESTER is not set |
1756 | # CONFIG_DEBUG_SPINLOCK is not set | 1761 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig index a51fc39dea4e..9191f557b044 100644 --- a/arch/powerpc/configs/pq2fads_defconfig +++ b/arch/powerpc/configs/pq2fads_defconfig | |||
@@ -86,8 +86,9 @@ CONFIG_TIMERFD=y | |||
86 | CONFIG_EVENTFD=y | 86 | CONFIG_EVENTFD=y |
87 | CONFIG_SHMEM=y | 87 | CONFIG_SHMEM=y |
88 | CONFIG_VM_EVENT_COUNTERS=y | 88 | CONFIG_VM_EVENT_COUNTERS=y |
89 | CONFIG_SLAB=y | 89 | CONFIG_SLUB_DEBUG=y |
90 | # CONFIG_SLUB is not set | 90 | # CONFIG_SLAB is not set |
91 | CONFIG_SLUB=y | ||
91 | # CONFIG_SLOB is not set | 92 | # CONFIG_SLOB is not set |
92 | CONFIG_RT_MUTEXES=y | 93 | CONFIG_RT_MUTEXES=y |
93 | # CONFIG_TINY_SHMEM is not set | 94 | # CONFIG_TINY_SHMEM is not set |
@@ -930,7 +931,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
930 | # CONFIG_SCHED_DEBUG is not set | 931 | # CONFIG_SCHED_DEBUG is not set |
931 | # CONFIG_SCHEDSTATS is not set | 932 | # CONFIG_SCHEDSTATS is not set |
932 | # CONFIG_TIMER_STATS is not set | 933 | # CONFIG_TIMER_STATS is not set |
933 | # CONFIG_DEBUG_SLAB is not set | 934 | # CONFIG_SLUB_DEBUG_ON is not set |
934 | # CONFIG_DEBUG_RT_MUTEXES is not set | 935 | # CONFIG_DEBUG_RT_MUTEXES is not set |
935 | # CONFIG_RT_MUTEX_TESTER is not set | 936 | # CONFIG_RT_MUTEX_TESTER is not set |
936 | # CONFIG_DEBUG_SPINLOCK is not set | 937 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig index cce3d3da086b..3e87faf9b5c2 100644 --- a/arch/powerpc/configs/prpmc2800_defconfig +++ b/arch/powerpc/configs/prpmc2800_defconfig | |||
@@ -89,8 +89,9 @@ CONFIG_TIMERFD=y | |||
89 | CONFIG_EVENTFD=y | 89 | CONFIG_EVENTFD=y |
90 | CONFIG_SHMEM=y | 90 | CONFIG_SHMEM=y |
91 | CONFIG_VM_EVENT_COUNTERS=y | 91 | CONFIG_VM_EVENT_COUNTERS=y |
92 | CONFIG_SLAB=y | 92 | CONFIG_SLUB_DEBUG=y |
93 | # CONFIG_SLUB is not set | 93 | # CONFIG_SLAB is not set |
94 | CONFIG_SLUB=y | ||
94 | # CONFIG_SLOB is not set | 95 | # CONFIG_SLOB is not set |
95 | CONFIG_RT_MUTEXES=y | 96 | CONFIG_RT_MUTEXES=y |
96 | # CONFIG_TINY_SHMEM is not set | 97 | # CONFIG_TINY_SHMEM is not set |
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index ca7a197998ee..3566c448bdc0 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig | |||
@@ -91,8 +91,9 @@ CONFIG_TIMERFD=y | |||
91 | CONFIG_EVENTFD=y | 91 | CONFIG_EVENTFD=y |
92 | CONFIG_SHMEM=y | 92 | CONFIG_SHMEM=y |
93 | CONFIG_VM_EVENT_COUNTERS=y | 93 | CONFIG_VM_EVENT_COUNTERS=y |
94 | CONFIG_SLAB=y | 94 | CONFIG_SLUB_DEBUG=y |
95 | # CONFIG_SLUB is not set | 95 | # CONFIG_SLAB is not set |
96 | CONFIG_SLUB=y | ||
96 | # CONFIG_SLOB is not set | 97 | # CONFIG_SLOB is not set |
97 | CONFIG_RT_MUTEXES=y | 98 | CONFIG_RT_MUTEXES=y |
98 | # CONFIG_TINY_SHMEM is not set | 99 | # CONFIG_TINY_SHMEM is not set |
@@ -1059,7 +1060,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1059 | CONFIG_SCHED_DEBUG=y | 1060 | CONFIG_SCHED_DEBUG=y |
1060 | # CONFIG_SCHEDSTATS is not set | 1061 | # CONFIG_SCHEDSTATS is not set |
1061 | # CONFIG_TIMER_STATS is not set | 1062 | # CONFIG_TIMER_STATS is not set |
1062 | # CONFIG_DEBUG_SLAB is not set | 1063 | # CONFIG_SLUB_DEBUG_ON is not set |
1063 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1064 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1064 | # CONFIG_RT_MUTEX_TESTER is not set | 1065 | # CONFIG_RT_MUTEX_TESTER is not set |
1065 | CONFIG_DEBUG_SPINLOCK=y | 1066 | CONFIG_DEBUG_SPINLOCK=y |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 0f274e5f6926..c09eb8cfbe71 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
@@ -96,8 +96,9 @@ CONFIG_TIMERFD=y | |||
96 | CONFIG_EVENTFD=y | 96 | CONFIG_EVENTFD=y |
97 | CONFIG_SHMEM=y | 97 | CONFIG_SHMEM=y |
98 | CONFIG_VM_EVENT_COUNTERS=y | 98 | CONFIG_VM_EVENT_COUNTERS=y |
99 | CONFIG_SLAB=y | 99 | CONFIG_SLUB_DEBUG=y |
100 | # CONFIG_SLUB is not set | 100 | # CONFIG_SLAB is not set |
101 | CONFIG_SLUB=y | ||
101 | # CONFIG_SLOB is not set | 102 | # CONFIG_SLOB is not set |
102 | CONFIG_RT_MUTEXES=y | 103 | CONFIG_RT_MUTEXES=y |
103 | # CONFIG_TINY_SHMEM is not set | 104 | # CONFIG_TINY_SHMEM is not set |
@@ -176,6 +177,10 @@ CONFIG_IBMEBUS=y | |||
176 | # | 177 | # |
177 | # Kernel options | 178 | # Kernel options |
178 | # | 179 | # |
180 | CONFIG_TICK_ONESHOT=y | ||
181 | CONFIG_NO_HZ=y | ||
182 | CONFIG_HIGH_RES_TIMERS=y | ||
183 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
179 | # CONFIG_HZ_100 is not set | 184 | # CONFIG_HZ_100 is not set |
180 | CONFIG_HZ_250=y | 185 | CONFIG_HZ_250=y |
181 | # CONFIG_HZ_300 is not set | 186 | # CONFIG_HZ_300 is not set |
@@ -1504,7 +1509,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1504 | CONFIG_SCHED_DEBUG=y | 1509 | CONFIG_SCHED_DEBUG=y |
1505 | # CONFIG_SCHEDSTATS is not set | 1510 | # CONFIG_SCHEDSTATS is not set |
1506 | # CONFIG_TIMER_STATS is not set | 1511 | # CONFIG_TIMER_STATS is not set |
1507 | # CONFIG_DEBUG_SLAB is not set | 1512 | # CONFIG_SLUB_DEBUG_ON is not set |
1508 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1513 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1509 | # CONFIG_RT_MUTEX_TESTER is not set | 1514 | # CONFIG_RT_MUTEX_TESTER is not set |
1510 | # CONFIG_DEBUG_SPINLOCK is not set | 1515 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/sequoia_defconfig b/arch/powerpc/configs/sequoia_defconfig index bc7f5089a894..45a4ca0e0d7d 100644 --- a/arch/powerpc/configs/sequoia_defconfig +++ b/arch/powerpc/configs/sequoia_defconfig | |||
@@ -91,8 +91,9 @@ CONFIG_TIMERFD=y | |||
91 | CONFIG_EVENTFD=y | 91 | CONFIG_EVENTFD=y |
92 | CONFIG_SHMEM=y | 92 | CONFIG_SHMEM=y |
93 | CONFIG_VM_EVENT_COUNTERS=y | 93 | CONFIG_VM_EVENT_COUNTERS=y |
94 | CONFIG_SLAB=y | 94 | CONFIG_SLUB_DEBUG=y |
95 | # CONFIG_SLUB is not set | 95 | # CONFIG_SLAB is not set |
96 | CONFIG_SLUB=y | ||
96 | # CONFIG_SLOB is not set | 97 | # CONFIG_SLOB is not set |
97 | CONFIG_RT_MUTEXES=y | 98 | CONFIG_RT_MUTEXES=y |
98 | # CONFIG_TINY_SHMEM is not set | 99 | # CONFIG_TINY_SHMEM is not set |
@@ -781,7 +782,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
781 | CONFIG_SCHED_DEBUG=y | 782 | CONFIG_SCHED_DEBUG=y |
782 | # CONFIG_SCHEDSTATS is not set | 783 | # CONFIG_SCHEDSTATS is not set |
783 | # CONFIG_TIMER_STATS is not set | 784 | # CONFIG_TIMER_STATS is not set |
784 | # CONFIG_DEBUG_SLAB is not set | 785 | # CONFIG_SLUB_DEBUG_ON is not set |
785 | # CONFIG_DEBUG_RT_MUTEXES is not set | 786 | # CONFIG_DEBUG_RT_MUTEXES is not set |
786 | # CONFIG_RT_MUTEX_TESTER is not set | 787 | # CONFIG_RT_MUTEX_TESTER is not set |
787 | # CONFIG_DEBUG_SPINLOCK is not set | 788 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/configs/walnut_defconfig b/arch/powerpc/configs/walnut_defconfig index 766bf840c18d..7724292cc06d 100644 --- a/arch/powerpc/configs/walnut_defconfig +++ b/arch/powerpc/configs/walnut_defconfig | |||
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y | |||
87 | CONFIG_EVENTFD=y | 87 | CONFIG_EVENTFD=y |
88 | CONFIG_SHMEM=y | 88 | CONFIG_SHMEM=y |
89 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
90 | CONFIG_SLAB=y | 90 | CONFIG_SLUB_DEBUG=y |
91 | # CONFIG_SLUB is not set | 91 | # CONFIG_SLAB is not set |
92 | CONFIG_SLUB=y | ||
92 | # CONFIG_SLOB is not set | 93 | # CONFIG_SLOB is not set |
93 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
94 | # CONFIG_TINY_SHMEM is not set | 95 | # CONFIG_TINY_SHMEM is not set |
@@ -706,7 +707,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
706 | CONFIG_SCHED_DEBUG=y | 707 | CONFIG_SCHED_DEBUG=y |
707 | # CONFIG_SCHEDSTATS is not set | 708 | # CONFIG_SCHEDSTATS is not set |
708 | # CONFIG_TIMER_STATS is not set | 709 | # CONFIG_TIMER_STATS is not set |
709 | # CONFIG_DEBUG_SLAB is not set | 710 | # CONFIG_SLUB_DEBUG_ON is not set |
710 | # CONFIG_DEBUG_RT_MUTEXES is not set | 711 | # CONFIG_DEBUG_RT_MUTEXES is not set |
711 | # CONFIG_RT_MUTEX_TESTER is not set | 712 | # CONFIG_RT_MUTEX_TESTER is not set |
712 | # CONFIG_DEBUG_SPINLOCK is not set | 713 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 0ec134034899..148a3547c9aa 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
@@ -408,6 +408,12 @@ END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT) | |||
408 | std r7,SLBSHADOW_STACKVSID(r9) /* Save VSID */ | 408 | std r7,SLBSHADOW_STACKVSID(r9) /* Save VSID */ |
409 | std r0,SLBSHADOW_STACKESID(r9) /* Save ESID */ | 409 | std r0,SLBSHADOW_STACKESID(r9) /* Save ESID */ |
410 | 410 | ||
411 | /* No need to check for CPU_FTR_NO_SLBIE_B here, since when | ||
412 | * we have 1TB segments, the only CPUs known to have the errata | ||
413 | * only support less than 1TB of system memory and we'll never | ||
414 | * actually hit this code path. | ||
415 | */ | ||
416 | |||
411 | slbie r6 | 417 | slbie r6 |
412 | slbie r6 /* Workaround POWER5 < DD2.1 issue */ | 418 | slbie r6 /* Workaround POWER5 < DD2.1 issue */ |
413 | slbmte r7,r0 | 419 | slbmte r7,r0 |
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c index 2e16ca5778a3..289d7e935918 100644 --- a/arch/powerpc/kernel/ibmebus.c +++ b/arch/powerpc/kernel/ibmebus.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <linux/kobject.h> | 41 | #include <linux/kobject.h> |
42 | #include <linux/dma-mapping.h> | 42 | #include <linux/dma-mapping.h> |
43 | #include <linux/interrupt.h> | 43 | #include <linux/interrupt.h> |
44 | #include <linux/of_platform.h> | ||
44 | #include <asm/ibmebus.h> | 45 | #include <asm/ibmebus.h> |
45 | #include <asm/abs_addr.h> | 46 | #include <asm/abs_addr.h> |
46 | 47 | ||
@@ -50,6 +51,13 @@ static struct device ibmebus_bus_device = { /* fake "parent" device */ | |||
50 | 51 | ||
51 | struct bus_type ibmebus_bus_type; | 52 | struct bus_type ibmebus_bus_type; |
52 | 53 | ||
54 | /* These devices will automatically be added to the bus during init */ | ||
55 | static struct of_device_id builtin_matches[] = { | ||
56 | { .compatible = "IBM,lhca" }, | ||
57 | { .compatible = "IBM,lhea" }, | ||
58 | {}, | ||
59 | }; | ||
60 | |||
53 | static void *ibmebus_alloc_coherent(struct device *dev, | 61 | static void *ibmebus_alloc_coherent(struct device *dev, |
54 | size_t size, | 62 | size_t size, |
55 | dma_addr_t *dma_handle, | 63 | dma_addr_t *dma_handle, |
@@ -124,190 +132,87 @@ static struct dma_mapping_ops ibmebus_dma_ops = { | |||
124 | .dma_supported = ibmebus_dma_supported, | 132 | .dma_supported = ibmebus_dma_supported, |
125 | }; | 133 | }; |
126 | 134 | ||
127 | static int ibmebus_bus_probe(struct device *dev) | 135 | static int ibmebus_match_path(struct device *dev, void *data) |
128 | { | 136 | { |
129 | struct ibmebus_dev *ibmebusdev = to_ibmebus_dev(dev); | 137 | struct device_node *dn = to_of_device(dev)->node; |
130 | struct ibmebus_driver *ibmebusdrv = to_ibmebus_driver(dev->driver); | 138 | return (dn->full_name && |
131 | const struct of_device_id *id; | 139 | (strcasecmp((char *)data, dn->full_name) == 0)); |
132 | int error = -ENODEV; | ||
133 | |||
134 | if (!ibmebusdrv->probe) | ||
135 | return error; | ||
136 | |||
137 | id = of_match_device(ibmebusdrv->id_table, &ibmebusdev->ofdev); | ||
138 | if (id) { | ||
139 | error = ibmebusdrv->probe(ibmebusdev, id); | ||
140 | } | ||
141 | |||
142 | return error; | ||
143 | } | 140 | } |
144 | 141 | ||
145 | static int ibmebus_bus_remove(struct device *dev) | 142 | static int ibmebus_match_node(struct device *dev, void *data) |
146 | { | 143 | { |
147 | struct ibmebus_dev *ibmebusdev = to_ibmebus_dev(dev); | 144 | return to_of_device(dev)->node == data; |
148 | struct ibmebus_driver *ibmebusdrv = to_ibmebus_driver(dev->driver); | ||
149 | |||
150 | if (ibmebusdrv->remove) { | ||
151 | return ibmebusdrv->remove(ibmebusdev); | ||
152 | } | ||
153 | |||
154 | return 0; | ||
155 | } | 145 | } |
156 | 146 | ||
157 | static void __devinit ibmebus_dev_release(struct device *dev) | 147 | static int ibmebus_create_device(struct device_node *dn) |
158 | { | 148 | { |
159 | of_node_put(to_ibmebus_dev(dev)->ofdev.node); | 149 | struct of_device *dev; |
160 | kfree(to_ibmebus_dev(dev)); | 150 | int ret; |
161 | } | ||
162 | |||
163 | static int __devinit ibmebus_register_device_common( | ||
164 | struct ibmebus_dev *dev, const char *name) | ||
165 | { | ||
166 | int err = 0; | ||
167 | |||
168 | dev->ofdev.dev.parent = &ibmebus_bus_device; | ||
169 | dev->ofdev.dev.bus = &ibmebus_bus_type; | ||
170 | dev->ofdev.dev.release = ibmebus_dev_release; | ||
171 | 151 | ||
172 | dev->ofdev.dev.archdata.of_node = dev->ofdev.node; | 152 | dev = of_device_alloc(dn, NULL, &ibmebus_bus_device); |
173 | dev->ofdev.dev.archdata.dma_ops = &ibmebus_dma_ops; | ||
174 | dev->ofdev.dev.archdata.numa_node = of_node_to_nid(dev->ofdev.node); | ||
175 | |||
176 | /* An ibmebusdev is based on a of_device. We have to change the | ||
177 | * bus type to use our own DMA mapping operations. | ||
178 | */ | ||
179 | if ((err = of_device_register(&dev->ofdev)) != 0) { | ||
180 | printk(KERN_ERR "%s: failed to register device (%d).\n", | ||
181 | __FUNCTION__, err); | ||
182 | return -ENODEV; | ||
183 | } | ||
184 | |||
185 | return 0; | ||
186 | } | ||
187 | |||
188 | static struct ibmebus_dev* __devinit ibmebus_register_device_node( | ||
189 | struct device_node *dn) | ||
190 | { | ||
191 | struct ibmebus_dev *dev; | ||
192 | int i, len, bus_len; | ||
193 | |||
194 | dev = kzalloc(sizeof(struct ibmebus_dev), GFP_KERNEL); | ||
195 | if (!dev) | 153 | if (!dev) |
196 | return ERR_PTR(-ENOMEM); | 154 | return -ENOMEM; |
197 | |||
198 | dev->ofdev.node = of_node_get(dn); | ||
199 | |||
200 | len = strlen(dn->full_name + 1); | ||
201 | bus_len = min(len, BUS_ID_SIZE - 1); | ||
202 | memcpy(dev->ofdev.dev.bus_id, dn->full_name + 1 | ||
203 | + (len - bus_len), bus_len); | ||
204 | for (i = 0; i < bus_len; i++) | ||
205 | if (dev->ofdev.dev.bus_id[i] == '/') | ||
206 | dev->ofdev.dev.bus_id[i] = '_'; | ||
207 | |||
208 | /* Register with generic device framework. */ | ||
209 | if (ibmebus_register_device_common(dev, dn->name) != 0) { | ||
210 | kfree(dev); | ||
211 | return ERR_PTR(-ENODEV); | ||
212 | } | ||
213 | |||
214 | return dev; | ||
215 | } | ||
216 | |||
217 | static void ibmebus_probe_of_nodes(char* name) | ||
218 | { | ||
219 | struct device_node *dn = NULL; | ||
220 | |||
221 | while ((dn = of_find_node_by_name(dn, name))) { | ||
222 | if (IS_ERR(ibmebus_register_device_node(dn))) { | ||
223 | of_node_put(dn); | ||
224 | return; | ||
225 | } | ||
226 | } | ||
227 | |||
228 | of_node_put(dn); | ||
229 | 155 | ||
230 | return; | 156 | dev->dev.bus = &ibmebus_bus_type; |
231 | } | 157 | dev->dev.archdata.dma_ops = &ibmebus_dma_ops; |
232 | 158 | ||
233 | static void ibmebus_add_devices_by_id(struct of_device_id *idt) | 159 | ret = of_device_register(dev); |
234 | { | 160 | if (ret) { |
235 | while (strlen(idt->name) > 0) { | 161 | of_device_free(dev); |
236 | ibmebus_probe_of_nodes(idt->name); | 162 | return ret; |
237 | idt++; | ||
238 | } | 163 | } |
239 | 164 | ||
240 | return; | ||
241 | } | ||
242 | |||
243 | static int ibmebus_match_name(struct device *dev, void *data) | ||
244 | { | ||
245 | const struct ibmebus_dev *ebus_dev = to_ibmebus_dev(dev); | ||
246 | const char *name; | ||
247 | |||
248 | name = of_get_property(ebus_dev->ofdev.node, "name", NULL); | ||
249 | |||
250 | if (name && (strcmp(data, name) == 0)) | ||
251 | return 1; | ||
252 | |||
253 | return 0; | 165 | return 0; |
254 | } | 166 | } |
255 | 167 | ||
256 | static int ibmebus_unregister_device(struct device *dev) | 168 | static int ibmebus_create_devices(const struct of_device_id *matches) |
257 | { | 169 | { |
258 | of_device_unregister(to_of_device(dev)); | 170 | struct device_node *root, *child; |
171 | int ret = 0; | ||
259 | 172 | ||
260 | return 0; | 173 | root = of_find_node_by_path("/"); |
261 | } | ||
262 | 174 | ||
263 | static void ibmebus_remove_devices_by_id(struct of_device_id *idt) | 175 | for (child = NULL; (child = of_get_next_child(root, child)); ) { |
264 | { | 176 | if (!of_match_node(matches, child)) |
265 | struct device *dev; | 177 | continue; |
266 | 178 | ||
267 | while (strlen(idt->name) > 0) { | 179 | if (bus_find_device(&ibmebus_bus_type, NULL, child, |
268 | while ((dev = bus_find_device(&ibmebus_bus_type, NULL, | 180 | ibmebus_match_node)) |
269 | (void*)idt->name, | 181 | continue; |
270 | ibmebus_match_name))) { | 182 | |
271 | ibmebus_unregister_device(dev); | 183 | ret = ibmebus_create_device(child); |
184 | if (ret) { | ||
185 | printk(KERN_ERR "%s: failed to create device (%i)", | ||
186 | __FUNCTION__, ret); | ||
187 | of_node_put(child); | ||
188 | break; | ||
272 | } | 189 | } |
273 | idt++; | ||
274 | } | 190 | } |
275 | 191 | ||
276 | return; | 192 | of_node_put(root); |
193 | return ret; | ||
277 | } | 194 | } |
278 | 195 | ||
279 | int ibmebus_register_driver(struct ibmebus_driver *drv) | 196 | int ibmebus_register_driver(struct of_platform_driver *drv) |
280 | { | 197 | { |
281 | int err = 0; | 198 | /* If the driver uses devices that ibmebus doesn't know, add them */ |
199 | ibmebus_create_devices(drv->match_table); | ||
282 | 200 | ||
283 | drv->driver.name = drv->name; | 201 | drv->driver.name = drv->name; |
284 | drv->driver.bus = &ibmebus_bus_type; | 202 | drv->driver.bus = &ibmebus_bus_type; |
285 | drv->driver.probe = ibmebus_bus_probe; | ||
286 | drv->driver.remove = ibmebus_bus_remove; | ||
287 | 203 | ||
288 | if ((err = driver_register(&drv->driver) != 0)) | 204 | return driver_register(&drv->driver); |
289 | return err; | ||
290 | |||
291 | /* remove all supported devices first, in case someone | ||
292 | * probed them manually before registering the driver */ | ||
293 | ibmebus_remove_devices_by_id(drv->id_table); | ||
294 | ibmebus_add_devices_by_id(drv->id_table); | ||
295 | |||
296 | return 0; | ||
297 | } | 205 | } |
298 | EXPORT_SYMBOL(ibmebus_register_driver); | 206 | EXPORT_SYMBOL(ibmebus_register_driver); |
299 | 207 | ||
300 | void ibmebus_unregister_driver(struct ibmebus_driver *drv) | 208 | void ibmebus_unregister_driver(struct of_platform_driver *drv) |
301 | { | 209 | { |
302 | driver_unregister(&drv->driver); | 210 | driver_unregister(&drv->driver); |
303 | ibmebus_remove_devices_by_id(drv->id_table); | ||
304 | } | 211 | } |
305 | EXPORT_SYMBOL(ibmebus_unregister_driver); | 212 | EXPORT_SYMBOL(ibmebus_unregister_driver); |
306 | 213 | ||
307 | int ibmebus_request_irq(struct ibmebus_dev *dev, | 214 | int ibmebus_request_irq(u32 ist, irq_handler_t handler, |
308 | u32 ist, | 215 | unsigned long irq_flags, const char *devname, |
309 | irq_handler_t handler, | ||
310 | unsigned long irq_flags, const char * devname, | ||
311 | void *dev_id) | 216 | void *dev_id) |
312 | { | 217 | { |
313 | unsigned int irq = irq_create_mapping(NULL, ist); | 218 | unsigned int irq = irq_create_mapping(NULL, ist); |
@@ -315,12 +220,11 @@ int ibmebus_request_irq(struct ibmebus_dev *dev, | |||
315 | if (irq == NO_IRQ) | 220 | if (irq == NO_IRQ) |
316 | return -EINVAL; | 221 | return -EINVAL; |
317 | 222 | ||
318 | return request_irq(irq, handler, | 223 | return request_irq(irq, handler, irq_flags, devname, dev_id); |
319 | irq_flags, devname, dev_id); | ||
320 | } | 224 | } |
321 | EXPORT_SYMBOL(ibmebus_request_irq); | 225 | EXPORT_SYMBOL(ibmebus_request_irq); |
322 | 226 | ||
323 | void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id) | 227 | void ibmebus_free_irq(u32 ist, void *dev_id) |
324 | { | 228 | { |
325 | unsigned int irq = irq_find_mapping(NULL, ist); | 229 | unsigned int irq = irq_find_mapping(NULL, ist); |
326 | 230 | ||
@@ -328,29 +232,10 @@ void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id) | |||
328 | } | 232 | } |
329 | EXPORT_SYMBOL(ibmebus_free_irq); | 233 | EXPORT_SYMBOL(ibmebus_free_irq); |
330 | 234 | ||
331 | static int ibmebus_bus_match(struct device *dev, struct device_driver *drv) | ||
332 | { | ||
333 | const struct ibmebus_dev *ebus_dev = to_ibmebus_dev(dev); | ||
334 | struct ibmebus_driver *ebus_drv = to_ibmebus_driver(drv); | ||
335 | const struct of_device_id *ids = ebus_drv->id_table; | ||
336 | const struct of_device_id *found_id; | ||
337 | |||
338 | if (!ids) | ||
339 | return 0; | ||
340 | |||
341 | found_id = of_match_device(ids, &ebus_dev->ofdev); | ||
342 | if (found_id) | ||
343 | return 1; | ||
344 | |||
345 | return 0; | ||
346 | } | ||
347 | |||
348 | static ssize_t name_show(struct device *dev, | 235 | static ssize_t name_show(struct device *dev, |
349 | struct device_attribute *attr, char *buf) | 236 | struct device_attribute *attr, char *buf) |
350 | { | 237 | { |
351 | struct ibmebus_dev *ebus_dev = to_ibmebus_dev(dev); | 238 | return sprintf(buf, "%s\n", to_of_device(dev)->node->name); |
352 | const char *name = of_get_property(ebus_dev->ofdev.node, "name", NULL); | ||
353 | return sprintf(buf, "%s\n", name); | ||
354 | } | 239 | } |
355 | 240 | ||
356 | static struct device_attribute ibmebus_dev_attrs[] = { | 241 | static struct device_attribute ibmebus_dev_attrs[] = { |
@@ -358,18 +243,6 @@ static struct device_attribute ibmebus_dev_attrs[] = { | |||
358 | __ATTR_NULL | 243 | __ATTR_NULL |
359 | }; | 244 | }; |
360 | 245 | ||
361 | static int ibmebus_match_path(struct device *dev, void *data) | ||
362 | { | ||
363 | int rc; | ||
364 | struct device_node *dn = | ||
365 | of_node_get(to_ibmebus_dev(dev)->ofdev.node); | ||
366 | |||
367 | rc = (dn->full_name && (strcasecmp((char*)data, dn->full_name) == 0)); | ||
368 | |||
369 | of_node_put(dn); | ||
370 | return rc; | ||
371 | } | ||
372 | |||
373 | static char *ibmebus_chomp(const char *in, size_t count) | 246 | static char *ibmebus_chomp(const char *in, size_t count) |
374 | { | 247 | { |
375 | char *out = kmalloc(count + 1, GFP_KERNEL); | 248 | char *out = kmalloc(count + 1, GFP_KERNEL); |
@@ -389,9 +262,8 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus, | |||
389 | const char *buf, size_t count) | 262 | const char *buf, size_t count) |
390 | { | 263 | { |
391 | struct device_node *dn = NULL; | 264 | struct device_node *dn = NULL; |
392 | struct ibmebus_dev *dev; | ||
393 | char *path; | 265 | char *path; |
394 | ssize_t rc; | 266 | ssize_t rc = 0; |
395 | 267 | ||
396 | path = ibmebus_chomp(buf, count); | 268 | path = ibmebus_chomp(buf, count); |
397 | if (!path) | 269 | if (!path) |
@@ -406,9 +278,8 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus, | |||
406 | } | 278 | } |
407 | 279 | ||
408 | if ((dn = of_find_node_by_path(path))) { | 280 | if ((dn = of_find_node_by_path(path))) { |
409 | dev = ibmebus_register_device_node(dn); | 281 | rc = ibmebus_create_device(dn); |
410 | of_node_put(dn); | 282 | of_node_put(dn); |
411 | rc = IS_ERR(dev) ? PTR_ERR(dev) : count; | ||
412 | } else { | 283 | } else { |
413 | printk(KERN_WARNING "%s: no such device node: %s\n", | 284 | printk(KERN_WARNING "%s: no such device node: %s\n", |
414 | __FUNCTION__, path); | 285 | __FUNCTION__, path); |
@@ -417,7 +288,9 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus, | |||
417 | 288 | ||
418 | out: | 289 | out: |
419 | kfree(path); | 290 | kfree(path); |
420 | return rc; | 291 | if (rc) |
292 | return rc; | ||
293 | return count; | ||
421 | } | 294 | } |
422 | 295 | ||
423 | static ssize_t ibmebus_store_remove(struct bus_type *bus, | 296 | static ssize_t ibmebus_store_remove(struct bus_type *bus, |
@@ -432,7 +305,7 @@ static ssize_t ibmebus_store_remove(struct bus_type *bus, | |||
432 | 305 | ||
433 | if ((dev = bus_find_device(&ibmebus_bus_type, NULL, path, | 306 | if ((dev = bus_find_device(&ibmebus_bus_type, NULL, path, |
434 | ibmebus_match_path))) { | 307 | ibmebus_match_path))) { |
435 | ibmebus_unregister_device(dev); | 308 | of_device_unregister(to_of_device(dev)); |
436 | 309 | ||
437 | kfree(path); | 310 | kfree(path); |
438 | return count; | 311 | return count; |
@@ -452,8 +325,7 @@ static struct bus_attribute ibmebus_bus_attrs[] = { | |||
452 | }; | 325 | }; |
453 | 326 | ||
454 | struct bus_type ibmebus_bus_type = { | 327 | struct bus_type ibmebus_bus_type = { |
455 | .name = "ibmebus", | 328 | .uevent = of_device_uevent, |
456 | .match = ibmebus_bus_match, | ||
457 | .dev_attrs = ibmebus_dev_attrs, | 329 | .dev_attrs = ibmebus_dev_attrs, |
458 | .bus_attrs = ibmebus_bus_attrs | 330 | .bus_attrs = ibmebus_bus_attrs |
459 | }; | 331 | }; |
@@ -465,9 +337,9 @@ static int __init ibmebus_bus_init(void) | |||
465 | 337 | ||
466 | printk(KERN_INFO "IBM eBus Device Driver\n"); | 338 | printk(KERN_INFO "IBM eBus Device Driver\n"); |
467 | 339 | ||
468 | err = bus_register(&ibmebus_bus_type); | 340 | err = of_bus_type_init(&ibmebus_bus_type, "ibmebus"); |
469 | if (err) { | 341 | if (err) { |
470 | printk(KERN_ERR ":%s: failed to register IBM eBus.\n", | 342 | printk(KERN_ERR "%s: failed to register IBM eBus.\n", |
471 | __FUNCTION__); | 343 | __FUNCTION__); |
472 | return err; | 344 | return err; |
473 | } | 345 | } |
@@ -481,6 +353,13 @@ static int __init ibmebus_bus_init(void) | |||
481 | return err; | 353 | return err; |
482 | } | 354 | } |
483 | 355 | ||
356 | err = ibmebus_create_devices(builtin_matches); | ||
357 | if (err) { | ||
358 | device_unregister(&ibmebus_bus_device); | ||
359 | bus_unregister(&ibmebus_bus_type); | ||
360 | return err; | ||
361 | } | ||
362 | |||
484 | return 0; | 363 | return 0; |
485 | } | 364 | } |
486 | __initcall(ibmebus_bus_init); | 365 | postcore_initcall(ibmebus_bus_init); |
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c index 8f3db32fac8b..3388ad619996 100644 --- a/arch/powerpc/kernel/of_device.c +++ b/arch/powerpc/kernel/of_device.c | |||
@@ -7,8 +7,88 @@ | |||
7 | #include <linux/slab.h> | 7 | #include <linux/slab.h> |
8 | 8 | ||
9 | #include <asm/errno.h> | 9 | #include <asm/errno.h> |
10 | #include <asm/dcr.h> | ||
10 | #include <asm/of_device.h> | 11 | #include <asm/of_device.h> |
11 | 12 | ||
13 | static void of_device_make_bus_id(struct of_device *dev) | ||
14 | { | ||
15 | static atomic_t bus_no_reg_magic; | ||
16 | struct device_node *node = dev->node; | ||
17 | char *name = dev->dev.bus_id; | ||
18 | const u32 *reg; | ||
19 | u64 addr; | ||
20 | int magic; | ||
21 | |||
22 | /* | ||
23 | * If it's a DCR based device, use 'd' for native DCRs | ||
24 | * and 'D' for MMIO DCRs. | ||
25 | */ | ||
26 | #ifdef CONFIG_PPC_DCR | ||
27 | reg = of_get_property(node, "dcr-reg", NULL); | ||
28 | if (reg) { | ||
29 | #ifdef CONFIG_PPC_DCR_NATIVE | ||
30 | snprintf(name, BUS_ID_SIZE, "d%x.%s", | ||
31 | *reg, node->name); | ||
32 | #else /* CONFIG_PPC_DCR_NATIVE */ | ||
33 | addr = of_translate_dcr_address(node, *reg, NULL); | ||
34 | if (addr != OF_BAD_ADDR) { | ||
35 | snprintf(name, BUS_ID_SIZE, | ||
36 | "D%llx.%s", (unsigned long long)addr, | ||
37 | node->name); | ||
38 | return; | ||
39 | } | ||
40 | #endif /* !CONFIG_PPC_DCR_NATIVE */ | ||
41 | } | ||
42 | #endif /* CONFIG_PPC_DCR */ | ||
43 | |||
44 | /* | ||
45 | * For MMIO, get the physical address | ||
46 | */ | ||
47 | reg = of_get_property(node, "reg", NULL); | ||
48 | if (reg) { | ||
49 | addr = of_translate_address(node, reg); | ||
50 | if (addr != OF_BAD_ADDR) { | ||
51 | snprintf(name, BUS_ID_SIZE, | ||
52 | "%llx.%s", (unsigned long long)addr, | ||
53 | node->name); | ||
54 | return; | ||
55 | } | ||
56 | } | ||
57 | |||
58 | /* | ||
59 | * No BusID, use the node name and add a globally incremented | ||
60 | * counter (and pray...) | ||
61 | */ | ||
62 | magic = atomic_add_return(1, &bus_no_reg_magic); | ||
63 | snprintf(name, BUS_ID_SIZE, "%s.%d", node->name, magic - 1); | ||
64 | } | ||
65 | |||
66 | struct of_device *of_device_alloc(struct device_node *np, | ||
67 | const char *bus_id, | ||
68 | struct device *parent) | ||
69 | { | ||
70 | struct of_device *dev; | ||
71 | |||
72 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); | ||
73 | if (!dev) | ||
74 | return NULL; | ||
75 | |||
76 | dev->node = of_node_get(np); | ||
77 | dev->dev.dma_mask = &dev->dma_mask; | ||
78 | dev->dev.parent = parent; | ||
79 | dev->dev.release = of_release_dev; | ||
80 | dev->dev.archdata.of_node = np; | ||
81 | dev->dev.archdata.numa_node = of_node_to_nid(np); | ||
82 | |||
83 | if (bus_id) | ||
84 | strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE); | ||
85 | else | ||
86 | of_device_make_bus_id(dev); | ||
87 | |||
88 | return dev; | ||
89 | } | ||
90 | EXPORT_SYMBOL(of_device_alloc); | ||
91 | |||
12 | ssize_t of_device_get_modalias(struct of_device *ofdev, | 92 | ssize_t of_device_get_modalias(struct of_device *ofdev, |
13 | char *str, ssize_t len) | 93 | char *str, ssize_t len) |
14 | { | 94 | { |
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c index eca8ccc3fa12..aeaa20268ce2 100644 --- a/arch/powerpc/kernel/of_platform.c +++ b/arch/powerpc/kernel/of_platform.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <linux/of_platform.h> | 23 | #include <linux/of_platform.h> |
24 | 24 | ||
25 | #include <asm/errno.h> | 25 | #include <asm/errno.h> |
26 | #include <asm/dcr.h> | ||
27 | #include <asm/topology.h> | 26 | #include <asm/topology.h> |
28 | #include <asm/pci-bridge.h> | 27 | #include <asm/pci-bridge.h> |
29 | #include <asm/ppc-pci.h> | 28 | #include <asm/ppc-pci.h> |
@@ -53,8 +52,6 @@ static struct of_device_id of_default_bus_ids[] = { | |||
53 | {}, | 52 | {}, |
54 | }; | 53 | }; |
55 | 54 | ||
56 | static atomic_t bus_no_reg_magic; | ||
57 | |||
58 | struct bus_type of_platform_bus_type = { | 55 | struct bus_type of_platform_bus_type = { |
59 | .uevent = of_device_uevent, | 56 | .uevent = of_device_uevent, |
60 | }; | 57 | }; |
@@ -87,89 +84,26 @@ void of_unregister_platform_driver(struct of_platform_driver *drv) | |||
87 | } | 84 | } |
88 | EXPORT_SYMBOL(of_unregister_platform_driver); | 85 | EXPORT_SYMBOL(of_unregister_platform_driver); |
89 | 86 | ||
90 | static void of_platform_make_bus_id(struct of_device *dev) | ||
91 | { | ||
92 | struct device_node *node = dev->node; | ||
93 | char *name = dev->dev.bus_id; | ||
94 | const u32 *reg; | ||
95 | u64 addr; | ||
96 | int magic; | ||
97 | |||
98 | /* | ||
99 | * If it's a DCR based device, use 'd' for native DCRs | ||
100 | * and 'D' for MMIO DCRs. | ||
101 | */ | ||
102 | #ifdef CONFIG_PPC_DCR | ||
103 | reg = of_get_property(node, "dcr-reg", NULL); | ||
104 | if (reg) { | ||
105 | #ifdef CONFIG_PPC_DCR_NATIVE | ||
106 | snprintf(name, BUS_ID_SIZE, "d%x.%s", | ||
107 | *reg, node->name); | ||
108 | #else /* CONFIG_PPC_DCR_NATIVE */ | ||
109 | addr = of_translate_dcr_address(node, *reg, NULL); | ||
110 | if (addr != OF_BAD_ADDR) { | ||
111 | snprintf(name, BUS_ID_SIZE, | ||
112 | "D%llx.%s", (unsigned long long)addr, | ||
113 | node->name); | ||
114 | return; | ||
115 | } | ||
116 | #endif /* !CONFIG_PPC_DCR_NATIVE */ | ||
117 | } | ||
118 | #endif /* CONFIG_PPC_DCR */ | ||
119 | |||
120 | /* | ||
121 | * For MMIO, get the physical address | ||
122 | */ | ||
123 | reg = of_get_property(node, "reg", NULL); | ||
124 | if (reg) { | ||
125 | addr = of_translate_address(node, reg); | ||
126 | if (addr != OF_BAD_ADDR) { | ||
127 | snprintf(name, BUS_ID_SIZE, | ||
128 | "%llx.%s", (unsigned long long)addr, | ||
129 | node->name); | ||
130 | return; | ||
131 | } | ||
132 | } | ||
133 | |||
134 | /* | ||
135 | * No BusID, use the node name and add a globally incremented | ||
136 | * counter (and pray...) | ||
137 | */ | ||
138 | magic = atomic_add_return(1, &bus_no_reg_magic); | ||
139 | snprintf(name, BUS_ID_SIZE, "%s.%d", node->name, magic - 1); | ||
140 | } | ||
141 | |||
142 | struct of_device* of_platform_device_create(struct device_node *np, | 87 | struct of_device* of_platform_device_create(struct device_node *np, |
143 | const char *bus_id, | 88 | const char *bus_id, |
144 | struct device *parent) | 89 | struct device *parent) |
145 | { | 90 | { |
146 | struct of_device *dev; | 91 | struct of_device *dev; |
147 | 92 | ||
148 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); | 93 | dev = of_device_alloc(np, bus_id, parent); |
149 | if (!dev) | 94 | if (!dev) |
150 | return NULL; | 95 | return NULL; |
151 | 96 | ||
152 | dev->node = of_node_get(np); | ||
153 | dev->dma_mask = 0xffffffffUL; | 97 | dev->dma_mask = 0xffffffffUL; |
154 | dev->dev.dma_mask = &dev->dma_mask; | ||
155 | dev->dev.parent = parent; | ||
156 | dev->dev.bus = &of_platform_bus_type; | 98 | dev->dev.bus = &of_platform_bus_type; |
157 | dev->dev.release = of_release_dev; | ||
158 | dev->dev.archdata.of_node = np; | ||
159 | dev->dev.archdata.numa_node = of_node_to_nid(np); | ||
160 | 99 | ||
161 | /* We do not fill the DMA ops for platform devices by default. | 100 | /* We do not fill the DMA ops for platform devices by default. |
162 | * This is currently the responsibility of the platform code | 101 | * This is currently the responsibility of the platform code |
163 | * to do such, possibly using a device notifier | 102 | * to do such, possibly using a device notifier |
164 | */ | 103 | */ |
165 | 104 | ||
166 | if (bus_id) | ||
167 | strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE); | ||
168 | else | ||
169 | of_platform_make_bus_id(dev); | ||
170 | |||
171 | if (of_device_register(dev) != 0) { | 105 | if (of_device_register(dev) != 0) { |
172 | kfree(dev); | 106 | of_device_free(dev); |
173 | return NULL; | 107 | return NULL; |
174 | } | 108 | } |
175 | 109 | ||
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 0e014550b83f..ede77dbbd4df 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
@@ -426,11 +426,14 @@ void __init setup_system(void) | |||
426 | printk("-----------------------------------------------------\n"); | 426 | printk("-----------------------------------------------------\n"); |
427 | printk("ppc64_pft_size = 0x%lx\n", ppc64_pft_size); | 427 | printk("ppc64_pft_size = 0x%lx\n", ppc64_pft_size); |
428 | printk("physicalMemorySize = 0x%lx\n", lmb_phys_mem_size()); | 428 | printk("physicalMemorySize = 0x%lx\n", lmb_phys_mem_size()); |
429 | printk("ppc64_caches.dcache_line_size = 0x%x\n", | 429 | if (ppc64_caches.dline_size != 0x80) |
430 | ppc64_caches.dline_size); | 430 | printk("ppc64_caches.dcache_line_size = 0x%x\n", |
431 | printk("ppc64_caches.icache_line_size = 0x%x\n", | 431 | ppc64_caches.dline_size); |
432 | ppc64_caches.iline_size); | 432 | if (ppc64_caches.iline_size != 0x80) |
433 | printk("htab_address = 0x%p\n", htab_address); | 433 | printk("ppc64_caches.icache_line_size = 0x%x\n", |
434 | ppc64_caches.iline_size); | ||
435 | if (htab_address) | ||
436 | printk("htab_address = 0x%p\n", htab_address); | ||
434 | printk("htab_hash_mask = 0x%lx\n", htab_hash_mask); | 437 | printk("htab_hash_mask = 0x%lx\n", htab_hash_mask); |
435 | #if PHYSICAL_START > 0 | 438 | #if PHYSICAL_START > 0 |
436 | printk("physical_start = 0x%x\n", PHYSICAL_START); | 439 | printk("physical_start = 0x%x\n", PHYSICAL_START); |
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 9368da371f36..863a5d6d9b18 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
@@ -829,7 +829,7 @@ static void register_decrementer_clockevent(int cpu) | |||
829 | *dec = decrementer_clockevent; | 829 | *dec = decrementer_clockevent; |
830 | dec->cpumask = cpumask_of_cpu(cpu); | 830 | dec->cpumask = cpumask_of_cpu(cpu); |
831 | 831 | ||
832 | printk(KERN_ERR "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n", | 832 | printk(KERN_INFO "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n", |
833 | dec->name, dec->mult, dec->shift, cpu); | 833 | dec->name, dec->mult, dec->shift, cpu); |
834 | 834 | ||
835 | clockevents_register_device(dec); | 835 | clockevents_register_device(dec); |
diff --git a/arch/powerpc/kernel/vdso64/sigtramp.S b/arch/powerpc/kernel/vdso64/sigtramp.S index 17a83fa6dc52..59eb59bb4082 100644 --- a/arch/powerpc/kernel/vdso64/sigtramp.S +++ b/arch/powerpc/kernel/vdso64/sigtramp.S | |||
@@ -134,13 +134,16 @@ V_FUNCTION_END(__kernel_sigtramp_rt64) | |||
134 | 9: | 134 | 9: |
135 | 135 | ||
136 | /* This is where the pt_regs pointer can be found on the stack. */ | 136 | /* This is where the pt_regs pointer can be found on the stack. */ |
137 | #define PTREGS 128+168+56 | 137 | #define PTREGS 128+168+56 |
138 | 138 | ||
139 | /* Size of regs. */ | 139 | /* Size of regs. */ |
140 | #define RSIZE 8 | 140 | #define RSIZE 8 |
141 | |||
142 | /* Size of CR reg in DWARF unwind info. */ | ||
143 | #define CRSIZE 4 | ||
141 | 144 | ||
142 | /* This is the offset of the VMX reg pointer. */ | 145 | /* This is the offset of the VMX reg pointer. */ |
143 | #define VREGS 48*RSIZE+33*8 | 146 | #define VREGS 48*RSIZE+33*8 |
144 | 147 | ||
145 | /* Describe where general purpose regs are saved. */ | 148 | /* Describe where general purpose regs are saved. */ |
146 | #define EH_FRAME_GEN \ | 149 | #define EH_FRAME_GEN \ |
@@ -178,7 +181,7 @@ V_FUNCTION_END(__kernel_sigtramp_rt64) | |||
178 | rsave (31, 31*RSIZE); \ | 181 | rsave (31, 31*RSIZE); \ |
179 | rsave (67, 32*RSIZE); /* ap, used as temp for nip */ \ | 182 | rsave (67, 32*RSIZE); /* ap, used as temp for nip */ \ |
180 | rsave (65, 36*RSIZE); /* lr */ \ | 183 | rsave (65, 36*RSIZE); /* lr */ \ |
181 | rsave (70, 38*RSIZE) /* cr */ | 184 | rsave (70, 38*RSIZE + (RSIZE - CRSIZE)) /* cr */ |
182 | 185 | ||
183 | /* Describe where the FP regs are saved. */ | 186 | /* Describe where the FP regs are saved. */ |
184 | #define EH_FRAME_FP \ | 187 | #define EH_FRAME_FP \ |
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 65d492e316a6..4bb023f4c869 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile | |||
@@ -14,7 +14,6 @@ endif | |||
14 | 14 | ||
15 | obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \ | 15 | obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \ |
16 | memcpy_64.o usercopy_64.o mem_64.o string.o | 16 | memcpy_64.o usercopy_64.o mem_64.o string.o |
17 | obj-$(CONFIG_QUICC_ENGINE) += rheap.o | ||
18 | obj-$(CONFIG_XMON) += sstep.o | 17 | obj-$(CONFIG_XMON) += sstep.o |
19 | obj-$(CONFIG_KPROBES) += sstep.o | 18 | obj-$(CONFIG_KPROBES) += sstep.o |
20 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o | 19 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o |
@@ -23,6 +22,4 @@ ifeq ($(CONFIG_PPC64),y) | |||
23 | obj-$(CONFIG_SMP) += locks.o | 22 | obj-$(CONFIG_SMP) += locks.o |
24 | endif | 23 | endif |
25 | 24 | ||
26 | # Temporary hack until we have migrated to asm-powerpc | 25 | obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o |
27 | obj-$(CONFIG_8xx) += rheap.o | ||
28 | obj-$(CONFIG_CPM2) += rheap.o | ||
diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c index ada5b42dd231..22c3b4f53de7 100644 --- a/arch/powerpc/lib/rheap.c +++ b/arch/powerpc/lib/rheap.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
16 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/module.h> | ||
18 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
19 | #include <linux/err.h> | 20 | #include <linux/err.h> |
20 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
@@ -275,6 +276,7 @@ rh_info_t *rh_create(unsigned int alignment) | |||
275 | 276 | ||
276 | return info; | 277 | return info; |
277 | } | 278 | } |
279 | EXPORT_SYMBOL_GPL(rh_create); | ||
278 | 280 | ||
279 | /* | 281 | /* |
280 | * Destroy a dynamically created remote heap. Deallocate only if the areas | 282 | * Destroy a dynamically created remote heap. Deallocate only if the areas |
@@ -288,6 +290,7 @@ void rh_destroy(rh_info_t * info) | |||
288 | if ((info->flags & RHIF_STATIC_INFO) == 0) | 290 | if ((info->flags & RHIF_STATIC_INFO) == 0) |
289 | kfree(info); | 291 | kfree(info); |
290 | } | 292 | } |
293 | EXPORT_SYMBOL_GPL(rh_destroy); | ||
291 | 294 | ||
292 | /* | 295 | /* |
293 | * Initialize in place a remote heap info block. This is needed to support | 296 | * Initialize in place a remote heap info block. This is needed to support |
@@ -320,6 +323,7 @@ void rh_init(rh_info_t * info, unsigned int alignment, int max_blocks, | |||
320 | for (i = 0, blk = block; i < max_blocks; i++, blk++) | 323 | for (i = 0, blk = block; i < max_blocks; i++, blk++) |
321 | list_add(&blk->list, &info->empty_list); | 324 | list_add(&blk->list, &info->empty_list); |
322 | } | 325 | } |
326 | EXPORT_SYMBOL_GPL(rh_init); | ||
323 | 327 | ||
324 | /* Attach a free memory region, coalesces regions if adjuscent */ | 328 | /* Attach a free memory region, coalesces regions if adjuscent */ |
325 | int rh_attach_region(rh_info_t * info, unsigned long start, int size) | 329 | int rh_attach_region(rh_info_t * info, unsigned long start, int size) |
@@ -360,6 +364,7 @@ int rh_attach_region(rh_info_t * info, unsigned long start, int size) | |||
360 | 364 | ||
361 | return 0; | 365 | return 0; |
362 | } | 366 | } |
367 | EXPORT_SYMBOL_GPL(rh_attach_region); | ||
363 | 368 | ||
364 | /* Detatch given address range, splits free block if needed. */ | 369 | /* Detatch given address range, splits free block if needed. */ |
365 | unsigned long rh_detach_region(rh_info_t * info, unsigned long start, int size) | 370 | unsigned long rh_detach_region(rh_info_t * info, unsigned long start, int size) |
@@ -428,6 +433,7 @@ unsigned long rh_detach_region(rh_info_t * info, unsigned long start, int size) | |||
428 | 433 | ||
429 | return s; | 434 | return s; |
430 | } | 435 | } |
436 | EXPORT_SYMBOL_GPL(rh_detach_region); | ||
431 | 437 | ||
432 | /* Allocate a block of memory at the specified alignment. The value returned | 438 | /* Allocate a block of memory at the specified alignment. The value returned |
433 | * is an offset into the buffer initialized by rh_init(), or a negative number | 439 | * is an offset into the buffer initialized by rh_init(), or a negative number |
@@ -502,6 +508,7 @@ unsigned long rh_alloc_align(rh_info_t * info, int size, int alignment, const ch | |||
502 | 508 | ||
503 | return start; | 509 | return start; |
504 | } | 510 | } |
511 | EXPORT_SYMBOL_GPL(rh_alloc_align); | ||
505 | 512 | ||
506 | /* Allocate a block of memory at the default alignment. The value returned is | 513 | /* Allocate a block of memory at the default alignment. The value returned is |
507 | * an offset into the buffer initialized by rh_init(), or a negative number if | 514 | * an offset into the buffer initialized by rh_init(), or a negative number if |
@@ -511,6 +518,7 @@ unsigned long rh_alloc(rh_info_t * info, int size, const char *owner) | |||
511 | { | 518 | { |
512 | return rh_alloc_align(info, size, info->alignment, owner); | 519 | return rh_alloc_align(info, size, info->alignment, owner); |
513 | } | 520 | } |
521 | EXPORT_SYMBOL_GPL(rh_alloc); | ||
514 | 522 | ||
515 | /* Allocate a block of memory at the given offset, rounded up to the default | 523 | /* Allocate a block of memory at the given offset, rounded up to the default |
516 | * alignment. The value returned is an offset into the buffer initialized by | 524 | * alignment. The value returned is an offset into the buffer initialized by |
@@ -594,6 +602,7 @@ unsigned long rh_alloc_fixed(rh_info_t * info, unsigned long start, int size, co | |||
594 | 602 | ||
595 | return start; | 603 | return start; |
596 | } | 604 | } |
605 | EXPORT_SYMBOL_GPL(rh_alloc_fixed); | ||
597 | 606 | ||
598 | /* Deallocate the memory previously allocated by one of the rh_alloc functions. | 607 | /* Deallocate the memory previously allocated by one of the rh_alloc functions. |
599 | * The return value is the size of the deallocated block, or a negative number | 608 | * The return value is the size of the deallocated block, or a negative number |
@@ -626,6 +635,7 @@ int rh_free(rh_info_t * info, unsigned long start) | |||
626 | 635 | ||
627 | return size; | 636 | return size; |
628 | } | 637 | } |
638 | EXPORT_SYMBOL_GPL(rh_free); | ||
629 | 639 | ||
630 | int rh_get_stats(rh_info_t * info, int what, int max_stats, rh_stats_t * stats) | 640 | int rh_get_stats(rh_info_t * info, int what, int max_stats, rh_stats_t * stats) |
631 | { | 641 | { |
@@ -663,6 +673,7 @@ int rh_get_stats(rh_info_t * info, int what, int max_stats, rh_stats_t * stats) | |||
663 | 673 | ||
664 | return nr; | 674 | return nr; |
665 | } | 675 | } |
676 | EXPORT_SYMBOL_GPL(rh_get_stats); | ||
666 | 677 | ||
667 | int rh_set_owner(rh_info_t * info, unsigned long start, const char *owner) | 678 | int rh_set_owner(rh_info_t * info, unsigned long start, const char *owner) |
668 | { | 679 | { |
@@ -687,6 +698,7 @@ int rh_set_owner(rh_info_t * info, unsigned long start, const char *owner) | |||
687 | 698 | ||
688 | return size; | 699 | return size; |
689 | } | 700 | } |
701 | EXPORT_SYMBOL_GPL(rh_set_owner); | ||
690 | 702 | ||
691 | void rh_dump(rh_info_t * info) | 703 | void rh_dump(rh_info_t * info) |
692 | { | 704 | { |
@@ -722,6 +734,7 @@ void rh_dump(rh_info_t * info) | |||
722 | st[i].size, st[i].owner != NULL ? st[i].owner : ""); | 734 | st[i].size, st[i].owner != NULL ? st[i].owner : ""); |
723 | printk(KERN_INFO "\n"); | 735 | printk(KERN_INFO "\n"); |
724 | } | 736 | } |
737 | EXPORT_SYMBOL_GPL(rh_dump); | ||
725 | 738 | ||
726 | void rh_dump_blk(rh_info_t * info, rh_block_t * blk) | 739 | void rh_dump_blk(rh_info_t * info, rh_block_t * blk) |
727 | { | 740 | { |
@@ -729,3 +742,5 @@ void rh_dump_blk(rh_info_t * info, rh_block_t * blk) | |||
729 | "blk @0x%p: 0x%lx-0x%lx (%u)\n", | 742 | "blk @0x%p: 0x%lx-0x%lx (%u)\n", |
730 | blk, blk->start, blk->start + blk->size, blk->size); | 743 | blk, blk->start, blk->start + blk->size, blk->size); |
731 | } | 744 | } |
745 | EXPORT_SYMBOL_GPL(rh_dump_blk); | ||
746 | |||
diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c index 69058b2873de..381306bb1590 100644 --- a/arch/powerpc/math-emu/math.c +++ b/arch/powerpc/math-emu/math.c | |||
@@ -407,11 +407,16 @@ do_mathemu(struct pt_regs *regs) | |||
407 | 407 | ||
408 | case XE: | 408 | case XE: |
409 | idx = (insn >> 16) & 0x1f; | 409 | idx = (insn >> 16) & 0x1f; |
410 | if (!idx) | ||
411 | goto illegal; | ||
412 | |||
413 | op0 = (void *)¤t->thread.fpr[(insn >> 21) & 0x1f]; | 410 | op0 = (void *)¤t->thread.fpr[(insn >> 21) & 0x1f]; |
414 | op1 = (void *)(regs->gpr[idx] + regs->gpr[(insn >> 11) & 0x1f]); | 411 | if (!idx) { |
412 | if (((insn >> 1) & 0x3ff) == STFIWX) | ||
413 | op1 = (void *)(regs->gpr[(insn >> 11) & 0x1f]); | ||
414 | else | ||
415 | goto illegal; | ||
416 | } else { | ||
417 | op1 = (void *)(regs->gpr[idx] + regs->gpr[(insn >> 11) & 0x1f]); | ||
418 | } | ||
419 | |||
415 | break; | 420 | break; |
416 | 421 | ||
417 | case XEU: | 422 | case XEU: |
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 611ad084b7e7..c78dc912411f 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c | |||
@@ -209,9 +209,10 @@ static int __init htab_dt_scan_seg_sizes(unsigned long node, | |||
209 | if (prop[0] == 40) { | 209 | if (prop[0] == 40) { |
210 | DBG("1T segment support detected\n"); | 210 | DBG("1T segment support detected\n"); |
211 | cur_cpu_spec->cpu_features |= CPU_FTR_1T_SEGMENT; | 211 | cur_cpu_spec->cpu_features |= CPU_FTR_1T_SEGMENT; |
212 | return 1; | ||
212 | } | 213 | } |
213 | return 1; | ||
214 | } | 214 | } |
215 | cur_cpu_spec->cpu_features &= ~CPU_FTR_NO_SLBIE_B; | ||
215 | return 0; | 216 | return 0; |
216 | } | 217 | } |
217 | 218 | ||
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index e91da675bb3b..d9c82d3d6482 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c | |||
@@ -240,7 +240,7 @@ int __meminit vmemmap_populate(struct page *start_page, | |||
240 | return -ENOMEM; | 240 | return -ENOMEM; |
241 | 241 | ||
242 | printk(KERN_WARNING "vmemmap %08lx allocated at %p, " | 242 | printk(KERN_WARNING "vmemmap %08lx allocated at %p, " |
243 | "physical %p.\n", start, p, __pa(p)); | 243 | "physical %08lx.\n", start, p, __pa(p)); |
244 | 244 | ||
245 | mapped = htab_bolt_mapping(start, start + page_size, | 245 | mapped = htab_bolt_mapping(start, start + page_size, |
246 | __pa(p), mode_rw, mmu_linear_psize, | 246 | __pa(p), mode_rw, mmu_linear_psize, |
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c index 6c164cec9d2c..bbd2c512ee05 100644 --- a/arch/powerpc/mm/slb.c +++ b/arch/powerpc/mm/slb.c | |||
@@ -157,7 +157,8 @@ void switch_slb(struct task_struct *tsk, struct mm_struct *mm) | |||
157 | unsigned long stack = KSTK_ESP(tsk); | 157 | unsigned long stack = KSTK_ESP(tsk); |
158 | unsigned long unmapped_base; | 158 | unsigned long unmapped_base; |
159 | 159 | ||
160 | if (offset <= SLB_CACHE_ENTRIES) { | 160 | if (!cpu_has_feature(CPU_FTR_NO_SLBIE_B) && |
161 | offset <= SLB_CACHE_ENTRIES) { | ||
161 | int i; | 162 | int i; |
162 | asm volatile("isync" : : : "memory"); | 163 | asm volatile("isync" : : : "memory"); |
163 | for (i = 0; i < offset; i++) { | 164 | for (i = 0; i < offset; i++) { |
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index 186397f283bb..229d355ed86a 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig | |||
@@ -264,6 +264,7 @@ config TAU_AVERAGE | |||
264 | 264 | ||
265 | config QUICC_ENGINE | 265 | config QUICC_ENGINE |
266 | bool | 266 | bool |
267 | select PPC_LIB_RHEAP | ||
267 | help | 268 | help |
268 | The QUICC Engine (QE) is a new generation of communications | 269 | The QUICC Engine (QE) is a new generation of communications |
269 | coprocessors on Freescale embedded CPUs (akin to CPM in older chips). | 270 | coprocessors on Freescale embedded CPUs (akin to CPM in older chips). |
@@ -274,6 +275,7 @@ config CPM2 | |||
274 | bool | 275 | bool |
275 | default n | 276 | default n |
276 | select CPM | 277 | select CPM |
278 | select PPC_LIB_RHEAP | ||
277 | help | 279 | help |
278 | The CPM2 (Communications Processor Module) is a coprocessor on | 280 | The CPM2 (Communications Processor Module) is a coprocessor on |
279 | embedded CPUs made by Freescale. Selecting this option means that | 281 | embedded CPUs made by Freescale. Selecting this option means that |
@@ -313,4 +315,6 @@ config FSL_ULI1575 | |||
313 | config CPM | 315 | config CPM |
314 | bool | 316 | bool |
315 | 317 | ||
318 | source "arch/powerpc/sysdev/bestcomm/Kconfig" | ||
319 | |||
316 | endmenu | 320 | endmenu |
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 4c315be25015..3c7325ec36ec 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype | |||
@@ -37,6 +37,7 @@ config PPC_8xx | |||
37 | select FSL_SOC | 37 | select FSL_SOC |
38 | select 8xx | 38 | select 8xx |
39 | select WANT_DEVICE_TREE | 39 | select WANT_DEVICE_TREE |
40 | select PPC_LIB_RHEAP | ||
40 | 41 | ||
41 | config 40x | 42 | config 40x |
42 | bool "AMCC 40x" | 43 | bool "AMCC 40x" |
diff --git a/arch/powerpc/platforms/iseries/htab.c b/arch/powerpc/platforms/iseries/htab.c index 15a7097e5dd7..f99c6c4b6985 100644 --- a/arch/powerpc/platforms/iseries/htab.c +++ b/arch/powerpc/platforms/iseries/htab.c | |||
@@ -39,9 +39,9 @@ static inline void iSeries_hunlock(unsigned long slot) | |||
39 | spin_unlock(&iSeries_hlocks[(slot >> 4) & 0x3f]); | 39 | spin_unlock(&iSeries_hlocks[(slot >> 4) & 0x3f]); |
40 | } | 40 | } |
41 | 41 | ||
42 | long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va, | 42 | static long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va, |
43 | unsigned long pa, unsigned long rflags, | 43 | unsigned long pa, unsigned long rflags, |
44 | unsigned long vflags, int psize) | 44 | unsigned long vflags, int psize, int ssize) |
45 | { | 45 | { |
46 | long slot; | 46 | long slot; |
47 | struct hash_pte lhpte; | 47 | struct hash_pte lhpte; |
diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c index 910b00b4703e..d6435b03971f 100644 --- a/arch/powerpc/platforms/iseries/vio.c +++ b/arch/powerpc/platforms/iseries/vio.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * Legacy iSeries specific vio initialisation | 2 | * Legacy iSeries specific vio initialisation |
3 | * that needs to be built in (not a module). | 3 | * that needs to be built in (not a module). |
4 | * | 4 | * |
5 | * © Copyright 2007 IBM Corporation | 5 | * © Copyright 2007 IBM Corporation |
6 | * Author: Stephen Rothwell | 6 | * Author: Stephen Rothwell |
7 | * Some parts collected from various other files | 7 | * Some parts collected from various other files |
8 | * | 8 | * |
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 1a6f5641ebc8..99a77d743d48 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile | |||
@@ -14,6 +14,7 @@ obj-$(CONFIG_FSL_SOC) += fsl_soc.o | |||
14 | obj-$(CONFIG_FSL_PCI) += fsl_pci.o | 14 | obj-$(CONFIG_FSL_PCI) += fsl_pci.o |
15 | obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o | 15 | obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o |
16 | obj-$(CONFIG_QUICC_ENGINE) += qe_lib/ | 16 | obj-$(CONFIG_QUICC_ENGINE) += qe_lib/ |
17 | obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/ | ||
17 | mv64x60-$(CONFIG_PCI) += mv64x60_pci.o | 18 | mv64x60-$(CONFIG_PCI) += mv64x60_pci.o |
18 | obj-$(CONFIG_MV64X60) += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o \ | 19 | obj-$(CONFIG_MV64X60) += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o \ |
19 | mv64x60_udbg.o | 20 | mv64x60_udbg.o |
diff --git a/arch/powerpc/sysdev/bestcomm/Kconfig b/arch/powerpc/sysdev/bestcomm/Kconfig new file mode 100644 index 000000000000..57cc56562567 --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/Kconfig | |||
@@ -0,0 +1,39 @@ | |||
1 | # | ||
2 | # Kconfig options for Bestcomm | ||
3 | # | ||
4 | |||
5 | config PPC_BESTCOMM | ||
6 | tristate "Bestcomm DMA engine support" | ||
7 | depends on PPC_MPC52xx | ||
8 | default n | ||
9 | select PPC_LIB_RHEAP | ||
10 | help | ||
11 | BestComm is the name of the communication coprocessor found | ||
12 | on the Freescale MPC5200 family of processor. It's usage is | ||
13 | optionnal for some drivers (like ATA), but required for | ||
14 | others (like FEC). | ||
15 | |||
16 | If you want to use drivers that require DMA operations, | ||
17 | answer Y or M. Otherwise say N. | ||
18 | |||
19 | config PPC_BESTCOMM_ATA | ||
20 | tristate "Bestcomm ATA task support" | ||
21 | depends on PPC_BESTCOMM | ||
22 | default n | ||
23 | help | ||
24 | This option enables the support for the ATA task. | ||
25 | |||
26 | config PPC_BESTCOMM_FEC | ||
27 | tristate "Bestcomm FEC tasks support" | ||
28 | depends on PPC_BESTCOMM | ||
29 | default n | ||
30 | help | ||
31 | This option enables the support for the FEC tasks. | ||
32 | |||
33 | config PPC_BESTCOMM_GEN_BD | ||
34 | tristate "Bestcomm GenBD tasks support" | ||
35 | depends on PPC_BESTCOMM | ||
36 | default n | ||
37 | help | ||
38 | This option enables the support for the GenBD tasks. | ||
39 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/Makefile b/arch/powerpc/sysdev/bestcomm/Makefile new file mode 100644 index 000000000000..aed2df2a6580 --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/Makefile | |||
@@ -0,0 +1,14 @@ | |||
1 | # | ||
2 | # Makefile for BestComm & co | ||
3 | # | ||
4 | |||
5 | bestcomm-core-objs := bestcomm.o sram.o | ||
6 | bestcomm-ata-objs := ata.o bcom_ata_task.o | ||
7 | bestcomm-fec-objs := fec.o bcom_fec_rx_task.o bcom_fec_tx_task.o | ||
8 | bestcomm-gen-bd-objs := gen_bd.o bcom_gen_bd_rx_task.o bcom_gen_bd_tx_task.o | ||
9 | |||
10 | obj-$(CONFIG_PPC_BESTCOMM) += bestcomm-core.o | ||
11 | obj-$(CONFIG_PPC_BESTCOMM_ATA) += bestcomm-ata.o | ||
12 | obj-$(CONFIG_PPC_BESTCOMM_FEC) += bestcomm-fec.o | ||
13 | obj-$(CONFIG_PPC_BESTCOMM_GEN_BD) += bestcomm-gen-bd.o | ||
14 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/ata.c b/arch/powerpc/sysdev/bestcomm/ata.c new file mode 100644 index 000000000000..1f5258fb38c3 --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/ata.c | |||
@@ -0,0 +1,154 @@ | |||
1 | /* | ||
2 | * Bestcomm ATA task driver | ||
3 | * | ||
4 | * | ||
5 | * Patterned after bestcomm/fec.c by Dale Farnsworth <dfarnsworth@mvista.com> | ||
6 | * 2003-2004 (c) MontaVista, Software, Inc. | ||
7 | * | ||
8 | * Copyright (C) 2006-2007 Sylvain Munaut <tnt@246tNt.com> | ||
9 | * Copyright (C) 2006 Freescale - John Rigby | ||
10 | * | ||
11 | * This file is licensed under the terms of the GNU General Public License | ||
12 | * version 2. This program is licensed "as is" without any warranty of any | ||
13 | * kind, whether express or implied. | ||
14 | */ | ||
15 | |||
16 | #include <linux/kernel.h> | ||
17 | #include <linux/module.h> | ||
18 | #include <linux/types.h> | ||
19 | #include <asm/io.h> | ||
20 | |||
21 | #include "bestcomm.h" | ||
22 | #include "bestcomm_priv.h" | ||
23 | #include "ata.h" | ||
24 | |||
25 | |||
26 | /* ======================================================================== */ | ||
27 | /* Task image/var/inc */ | ||
28 | /* ======================================================================== */ | ||
29 | |||
30 | /* ata task image */ | ||
31 | extern u32 bcom_ata_task[]; | ||
32 | |||
33 | /* ata task vars that need to be set before enabling the task */ | ||
34 | struct bcom_ata_var { | ||
35 | u32 enable; /* (u16*) address of task's control register */ | ||
36 | u32 bd_base; /* (struct bcom_bd*) beginning of ring buffer */ | ||
37 | u32 bd_last; /* (struct bcom_bd*) end of ring buffer */ | ||
38 | u32 bd_start; /* (struct bcom_bd*) current bd */ | ||
39 | u32 buffer_size; /* size of receive buffer */ | ||
40 | }; | ||
41 | |||
42 | /* ata task incs that need to be set before enabling the task */ | ||
43 | struct bcom_ata_inc { | ||
44 | u16 pad0; | ||
45 | s16 incr_bytes; | ||
46 | u16 pad1; | ||
47 | s16 incr_dst; | ||
48 | u16 pad2; | ||
49 | s16 incr_src; | ||
50 | }; | ||
51 | |||
52 | |||
53 | /* ======================================================================== */ | ||
54 | /* Task support code */ | ||
55 | /* ======================================================================== */ | ||
56 | |||
57 | struct bcom_task * | ||
58 | bcom_ata_init(int queue_len, int maxbufsize) | ||
59 | { | ||
60 | struct bcom_task *tsk; | ||
61 | struct bcom_ata_var *var; | ||
62 | struct bcom_ata_inc *inc; | ||
63 | |||
64 | tsk = bcom_task_alloc(queue_len, sizeof(struct bcom_ata_bd), 0); | ||
65 | if (!tsk) | ||
66 | return NULL; | ||
67 | |||
68 | tsk->flags = BCOM_FLAGS_NONE; | ||
69 | |||
70 | bcom_ata_reset_bd(tsk); | ||
71 | |||
72 | var = (struct bcom_ata_var *) bcom_task_var(tsk->tasknum); | ||
73 | inc = (struct bcom_ata_inc *) bcom_task_inc(tsk->tasknum); | ||
74 | |||
75 | if (bcom_load_image(tsk->tasknum, bcom_ata_task)) { | ||
76 | bcom_task_free(tsk); | ||
77 | return NULL; | ||
78 | } | ||
79 | |||
80 | var->enable = bcom_eng->regs_base + | ||
81 | offsetof(struct mpc52xx_sdma, tcr[tsk->tasknum]); | ||
82 | var->bd_base = tsk->bd_pa; | ||
83 | var->bd_last = tsk->bd_pa + ((tsk->num_bd-1) * tsk->bd_size); | ||
84 | var->bd_start = tsk->bd_pa; | ||
85 | var->buffer_size = maxbufsize; | ||
86 | |||
87 | /* Configure some stuff */ | ||
88 | bcom_set_task_pragma(tsk->tasknum, BCOM_ATA_PRAGMA); | ||
89 | bcom_set_task_auto_start(tsk->tasknum, tsk->tasknum); | ||
90 | |||
91 | out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_ATA_RX], BCOM_IPR_ATA_RX); | ||
92 | out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_ATA_TX], BCOM_IPR_ATA_TX); | ||
93 | |||
94 | out_be32(&bcom_eng->regs->IntPend, 1<<tsk->tasknum); /* Clear ints */ | ||
95 | |||
96 | return tsk; | ||
97 | } | ||
98 | EXPORT_SYMBOL_GPL(bcom_ata_init); | ||
99 | |||
100 | void bcom_ata_rx_prepare(struct bcom_task *tsk) | ||
101 | { | ||
102 | struct bcom_ata_inc *inc; | ||
103 | |||
104 | inc = (struct bcom_ata_inc *) bcom_task_inc(tsk->tasknum); | ||
105 | |||
106 | inc->incr_bytes = -(s16)sizeof(u32); | ||
107 | inc->incr_src = 0; | ||
108 | inc->incr_dst = sizeof(u32); | ||
109 | |||
110 | bcom_set_initiator(tsk->tasknum, BCOM_INITIATOR_ATA_RX); | ||
111 | } | ||
112 | EXPORT_SYMBOL_GPL(bcom_ata_rx_prepare); | ||
113 | |||
114 | void bcom_ata_tx_prepare(struct bcom_task *tsk) | ||
115 | { | ||
116 | struct bcom_ata_inc *inc; | ||
117 | |||
118 | inc = (struct bcom_ata_inc *) bcom_task_inc(tsk->tasknum); | ||
119 | |||
120 | inc->incr_bytes = -(s16)sizeof(u32); | ||
121 | inc->incr_src = sizeof(u32); | ||
122 | inc->incr_dst = 0; | ||
123 | |||
124 | bcom_set_initiator(tsk->tasknum, BCOM_INITIATOR_ATA_TX); | ||
125 | } | ||
126 | EXPORT_SYMBOL_GPL(bcom_ata_tx_prepare); | ||
127 | |||
128 | void bcom_ata_reset_bd(struct bcom_task *tsk) | ||
129 | { | ||
130 | struct bcom_ata_var *var; | ||
131 | |||
132 | /* Reset all BD */ | ||
133 | memset(tsk->bd, 0x00, tsk->num_bd * tsk->bd_size); | ||
134 | |||
135 | tsk->index = 0; | ||
136 | tsk->outdex = 0; | ||
137 | |||
138 | var = (struct bcom_ata_var *) bcom_task_var(tsk->tasknum); | ||
139 | var->bd_start = var->bd_base; | ||
140 | } | ||
141 | EXPORT_SYMBOL_GPL(bcom_ata_reset_bd); | ||
142 | |||
143 | void bcom_ata_release(struct bcom_task *tsk) | ||
144 | { | ||
145 | /* Nothing special for the ATA tasks */ | ||
146 | bcom_task_free(tsk); | ||
147 | } | ||
148 | EXPORT_SYMBOL_GPL(bcom_ata_release); | ||
149 | |||
150 | |||
151 | MODULE_DESCRIPTION("BestComm ATA task driver"); | ||
152 | MODULE_AUTHOR("John Rigby"); | ||
153 | MODULE_LICENSE("GPL v2"); | ||
154 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/ata.h b/arch/powerpc/sysdev/bestcomm/ata.h new file mode 100644 index 000000000000..10982769c465 --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/ata.h | |||
@@ -0,0 +1,37 @@ | |||
1 | /* | ||
2 | * Header for Bestcomm ATA task driver | ||
3 | * | ||
4 | * | ||
5 | * Copyright (C) 2006 Freescale - John Rigby | ||
6 | * Copyright (C) 2006 Sylvain Munaut <tnt@246tNt.com> | ||
7 | * | ||
8 | * This file is licensed under the terms of the GNU General Public License | ||
9 | * version 2. This program is licensed "as is" without any warranty of any | ||
10 | * kind, whether express or implied. | ||
11 | */ | ||
12 | |||
13 | #ifndef __BESTCOMM_ATA_H__ | ||
14 | #define __BESTCOMM_ATA_H__ | ||
15 | |||
16 | |||
17 | struct bcom_ata_bd { | ||
18 | u32 status; | ||
19 | u32 dst_pa; | ||
20 | u32 src_pa; | ||
21 | }; | ||
22 | |||
23 | extern struct bcom_task * | ||
24 | bcom_ata_init(int queue_len, int maxbufsize); | ||
25 | |||
26 | extern void | ||
27 | bcom_ata_rx_prepare(struct bcom_task *tsk); | ||
28 | |||
29 | extern void | ||
30 | bcom_ata_tx_prepare(struct bcom_task *tsk); | ||
31 | |||
32 | extern void | ||
33 | bcom_ata_reset_bd(struct bcom_task *tsk); | ||
34 | |||
35 | |||
36 | #endif /* __BESTCOMM_ATA_H__ */ | ||
37 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_ata_task.c b/arch/powerpc/sysdev/bestcomm/bcom_ata_task.c new file mode 100644 index 000000000000..cc6049a4e469 --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/bcom_ata_task.c | |||
@@ -0,0 +1,67 @@ | |||
1 | /* | ||
2 | * Bestcomm ATA task microcode | ||
3 | * | ||
4 | * Copyright (c) 2004 Freescale Semiconductor, Inc. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License version 2 as published | ||
8 | * by the Free Software Foundation. | ||
9 | * | ||
10 | * Created based on bestcom/code_dma/image_rtos1/dma_image.hex | ||
11 | */ | ||
12 | |||
13 | #include <asm/types.h> | ||
14 | |||
15 | /* | ||
16 | * The header consists of the following fields: | ||
17 | * u32 magic; | ||
18 | * u8 desc_size; | ||
19 | * u8 var_size; | ||
20 | * u8 inc_size; | ||
21 | * u8 first_var; | ||
22 | * u8 reserved[8]; | ||
23 | * | ||
24 | * The size fields contain the number of 32-bit words. | ||
25 | */ | ||
26 | |||
27 | u32 bcom_ata_task[] = { | ||
28 | /* header */ | ||
29 | 0x4243544b, | ||
30 | 0x0e060709, | ||
31 | 0x00000000, | ||
32 | 0x00000000, | ||
33 | |||
34 | /* Task descriptors */ | ||
35 | 0x8198009b, /* LCD: idx0 = var3; idx0 <= var2; idx0 += inc3 */ | ||
36 | 0x13e00c08, /* DRD1A: var3 = var1; FN=0 MORE init=31 WS=0 RS=0 */ | ||
37 | 0xb8000264, /* LCD: idx1 = *idx0, idx2 = var0; idx1 < var9; idx1 += inc4, idx2 += inc4 */ | ||
38 | 0x10000f00, /* DRD1A: var3 = idx0; FN=0 MORE init=0 WS=0 RS=0 */ | ||
39 | 0x60140002, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=2 RS=2 */ | ||
40 | 0x0c8cfc8a, /* DRD2B1: *idx2 = EU3(); EU3(*idx2,var10) */ | ||
41 | 0xd8988240, /* LCDEXT: idx1 = idx1; idx1 > var9; idx1 += inc0 */ | ||
42 | 0xf845e011, /* LCDEXT: idx2 = *(idx0 + var00000015); ; idx2 += inc2 */ | ||
43 | 0xb845e00a, /* LCD: idx3 = *(idx0 + var00000019); ; idx3 += inc1 */ | ||
44 | 0x0bfecf90, /* DRD1A: *idx3 = *idx2; FN=0 TFD init=31 WS=3 RS=3 */ | ||
45 | 0x9898802d, /* LCD: idx1 = idx1; idx1 once var0; idx1 += inc5 */ | ||
46 | 0x64000005, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 INT EXT init=0 WS=0 RS=0 */ | ||
47 | 0x0c0cf849, /* DRD2B1: *idx0 = EU3(); EU3(idx1,var9) */ | ||
48 | 0x000001f8, /* NOP */ | ||
49 | |||
50 | /* VAR[9]-VAR[14] */ | ||
51 | 0x40000000, | ||
52 | 0x7fff7fff, | ||
53 | 0x00000000, | ||
54 | 0x00000000, | ||
55 | 0x00000000, | ||
56 | 0x00000000, | ||
57 | |||
58 | /* INC[0]-INC[6] */ | ||
59 | 0x40000000, | ||
60 | 0xe0000000, | ||
61 | 0xe0000000, | ||
62 | 0xa000000c, | ||
63 | 0x20000000, | ||
64 | 0x00000000, | ||
65 | 0x00000000, | ||
66 | }; | ||
67 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_fec_rx_task.c b/arch/powerpc/sysdev/bestcomm/bcom_fec_rx_task.c new file mode 100644 index 000000000000..a1ad6a02fcef --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/bcom_fec_rx_task.c | |||
@@ -0,0 +1,78 @@ | |||
1 | /* | ||
2 | * Bestcomm FEC RX task microcode | ||
3 | * | ||
4 | * Copyright (c) 2004 Freescale Semiconductor, Inc. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License version 2 as published | ||
8 | * by the Free Software Foundation. | ||
9 | * | ||
10 | * Automatically created based on BestCommAPI-2.2/code_dma/image_rtos1/dma_image.hex | ||
11 | * on Tue Mar 22 11:19:38 2005 GMT | ||
12 | */ | ||
13 | |||
14 | #include <asm/types.h> | ||
15 | |||
16 | /* | ||
17 | * The header consists of the following fields: | ||
18 | * u32 magic; | ||
19 | * u8 desc_size; | ||
20 | * u8 var_size; | ||
21 | * u8 inc_size; | ||
22 | * u8 first_var; | ||
23 | * u8 reserved[8]; | ||
24 | * | ||
25 | * The size fields contain the number of 32-bit words. | ||
26 | */ | ||
27 | |||
28 | u32 bcom_fec_rx_task[] = { | ||
29 | /* header */ | ||
30 | 0x4243544b, | ||
31 | 0x18060709, | ||
32 | 0x00000000, | ||
33 | 0x00000000, | ||
34 | |||
35 | /* Task descriptors */ | ||
36 | 0x808220e3, /* LCD: idx0 = var1, idx1 = var4; idx1 <= var3; idx0 += inc4, idx1 += inc3 */ | ||
37 | 0x10601010, /* DRD1A: var4 = var2; FN=0 MORE init=3 WS=0 RS=0 */ | ||
38 | 0xb8800264, /* LCD: idx2 = *idx1, idx3 = var0; idx2 < var9; idx2 += inc4, idx3 += inc4 */ | ||
39 | 0x10001308, /* DRD1A: var4 = idx1; FN=0 MORE init=0 WS=0 RS=0 */ | ||
40 | 0x60140002, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=2 RS=2 */ | ||
41 | 0x0cccfcca, /* DRD2B1: *idx3 = EU3(); EU3(*idx3,var10) */ | ||
42 | 0x80004000, /* LCDEXT: idx2 = 0x00000000; ; */ | ||
43 | 0xb8c58029, /* LCD: idx3 = *(idx1 + var00000015); idx3 once var0; idx3 += inc5 */ | ||
44 | 0x60000002, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=0 RS=0 */ | ||
45 | 0x088cf8cc, /* DRD2B1: idx2 = EU3(); EU3(idx3,var12) */ | ||
46 | 0x991982f2, /* LCD: idx2 = idx2, idx3 = idx3; idx2 > var11; idx2 += inc6, idx3 += inc2 */ | ||
47 | 0x006acf80, /* DRD1A: *idx3 = *idx0; FN=0 init=3 WS=1 RS=1 */ | ||
48 | 0x80004000, /* LCDEXT: idx2 = 0x00000000; ; */ | ||
49 | 0x9999802d, /* LCD: idx3 = idx3; idx3 once var0; idx3 += inc5 */ | ||
50 | 0x70000002, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */ | ||
51 | 0x034cfc4e, /* DRD2B1: var13 = EU3(); EU3(*idx1,var14) */ | ||
52 | 0x00008868, /* DRD1A: idx2 = var13; FN=0 init=0 WS=0 RS=0 */ | ||
53 | 0x99198341, /* LCD: idx2 = idx2, idx3 = idx3; idx2 > var13; idx2 += inc0, idx3 += inc1 */ | ||
54 | 0x007ecf80, /* DRD1A: *idx3 = *idx0; FN=0 init=3 WS=3 RS=3 */ | ||
55 | 0x99198272, /* LCD: idx2 = idx2, idx3 = idx3; idx2 > var9; idx2 += inc6, idx3 += inc2 */ | ||
56 | 0x046acf80, /* DRD1A: *idx3 = *idx0; FN=0 INT init=3 WS=1 RS=1 */ | ||
57 | 0x9819002d, /* LCD: idx2 = idx0; idx2 once var0; idx2 += inc5 */ | ||
58 | 0x0060c790, /* DRD1A: *idx1 = *idx2; FN=0 init=3 WS=0 RS=0 */ | ||
59 | 0x000001f8, /* NOP */ | ||
60 | |||
61 | /* VAR[9]-VAR[14] */ | ||
62 | 0x40000000, | ||
63 | 0x7fff7fff, | ||
64 | 0x00000000, | ||
65 | 0x00000003, | ||
66 | 0x40000008, | ||
67 | 0x43ffffff, | ||
68 | |||
69 | /* INC[0]-INC[6] */ | ||
70 | 0x40000000, | ||
71 | 0xe0000000, | ||
72 | 0xe0000000, | ||
73 | 0xa0000008, | ||
74 | 0x20000000, | ||
75 | 0x00000000, | ||
76 | 0x4000ffff, | ||
77 | }; | ||
78 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_fec_tx_task.c b/arch/powerpc/sysdev/bestcomm/bcom_fec_tx_task.c new file mode 100644 index 000000000000..b1c495c3a65a --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/bcom_fec_tx_task.c | |||
@@ -0,0 +1,91 @@ | |||
1 | /* | ||
2 | * Bestcomm FEC TX task microcode | ||
3 | * | ||
4 | * Copyright (c) 2004 Freescale Semiconductor, Inc. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License version 2 as published | ||
8 | * by the Free Software Foundation. | ||
9 | * | ||
10 | * Automatically created based on BestCommAPI-2.2/code_dma/image_rtos1/dma_image.hex | ||
11 | * on Tue Mar 22 11:19:29 2005 GMT | ||
12 | */ | ||
13 | |||
14 | #include <asm/types.h> | ||
15 | |||
16 | /* | ||
17 | * The header consists of the following fields: | ||
18 | * u32 magic; | ||
19 | * u8 desc_size; | ||
20 | * u8 var_size; | ||
21 | * u8 inc_size; | ||
22 | * u8 first_var; | ||
23 | * u8 reserved[8]; | ||
24 | * | ||
25 | * The size fields contain the number of 32-bit words. | ||
26 | */ | ||
27 | |||
28 | u32 bcom_fec_tx_task[] = { | ||
29 | /* header */ | ||
30 | 0x4243544b, | ||
31 | 0x2407070d, | ||
32 | 0x00000000, | ||
33 | 0x00000000, | ||
34 | |||
35 | /* Task descriptors */ | ||
36 | 0x8018001b, /* LCD: idx0 = var0; idx0 <= var0; idx0 += inc3 */ | ||
37 | 0x60000005, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 EXT init=0 WS=0 RS=0 */ | ||
38 | 0x01ccfc0d, /* DRD2B1: var7 = EU3(); EU3(*idx0,var13) */ | ||
39 | 0x8082a123, /* LCD: idx0 = var1, idx1 = var5; idx1 <= var4; idx0 += inc4, idx1 += inc3 */ | ||
40 | 0x10801418, /* DRD1A: var5 = var3; FN=0 MORE init=4 WS=0 RS=0 */ | ||
41 | 0xf88103a4, /* LCDEXT: idx2 = *idx1, idx3 = var2; idx2 < var14; idx2 += inc4, idx3 += inc4 */ | ||
42 | 0x801a6024, /* LCD: idx4 = var0; ; idx4 += inc4 */ | ||
43 | 0x10001708, /* DRD1A: var5 = idx1; FN=0 MORE init=0 WS=0 RS=0 */ | ||
44 | 0x60140002, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=2 RS=2 */ | ||
45 | 0x0cccfccf, /* DRD2B1: *idx3 = EU3(); EU3(*idx3,var15) */ | ||
46 | 0x991a002c, /* LCD: idx2 = idx2, idx3 = idx4; idx2 once var0; idx2 += inc5, idx3 += inc4 */ | ||
47 | 0x70000002, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */ | ||
48 | 0x024cfc4d, /* DRD2B1: var9 = EU3(); EU3(*idx1,var13) */ | ||
49 | 0x60000003, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=3 EXT init=0 WS=0 RS=0 */ | ||
50 | 0x0cccf247, /* DRD2B1: *idx3 = EU3(); EU3(var9,var7) */ | ||
51 | 0x80004000, /* LCDEXT: idx2 = 0x00000000; ; */ | ||
52 | 0xb8c80029, /* LCD: idx3 = *(idx1 + var0000001a); idx3 once var0; idx3 += inc5 */ | ||
53 | 0x70000002, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */ | ||
54 | 0x088cf8d1, /* DRD2B1: idx2 = EU3(); EU3(idx3,var17) */ | ||
55 | 0x00002f10, /* DRD1A: var11 = idx2; FN=0 init=0 WS=0 RS=0 */ | ||
56 | 0x99198432, /* LCD: idx2 = idx2, idx3 = idx3; idx2 > var16; idx2 += inc6, idx3 += inc2 */ | ||
57 | 0x008ac398, /* DRD1A: *idx0 = *idx3; FN=0 init=4 WS=1 RS=1 */ | ||
58 | 0x80004000, /* LCDEXT: idx2 = 0x00000000; ; */ | ||
59 | 0x9999802d, /* LCD: idx3 = idx3; idx3 once var0; idx3 += inc5 */ | ||
60 | 0x70000002, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */ | ||
61 | 0x048cfc53, /* DRD2B1: var18 = EU3(); EU3(*idx1,var19) */ | ||
62 | 0x60000008, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=8 EXT init=0 WS=0 RS=0 */ | ||
63 | 0x088cf48b, /* DRD2B1: idx2 = EU3(); EU3(var18,var11) */ | ||
64 | 0x99198481, /* LCD: idx2 = idx2, idx3 = idx3; idx2 > var18; idx2 += inc0, idx3 += inc1 */ | ||
65 | 0x009ec398, /* DRD1A: *idx0 = *idx3; FN=0 init=4 WS=3 RS=3 */ | ||
66 | 0x991983b2, /* LCD: idx2 = idx2, idx3 = idx3; idx2 > var14; idx2 += inc6, idx3 += inc2 */ | ||
67 | 0x088ac398, /* DRD1A: *idx0 = *idx3; FN=0 TFD init=4 WS=1 RS=1 */ | ||
68 | 0x9919002d, /* LCD: idx2 = idx2; idx2 once var0; idx2 += inc5 */ | ||
69 | 0x60000005, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 EXT init=0 WS=0 RS=0 */ | ||
70 | 0x0c4cf88e, /* DRD2B1: *idx1 = EU3(); EU3(idx2,var14) */ | ||
71 | 0x000001f8, /* NOP */ | ||
72 | |||
73 | /* VAR[13]-VAR[19] */ | ||
74 | 0x0c000000, | ||
75 | 0x40000000, | ||
76 | 0x7fff7fff, | ||
77 | 0x00000000, | ||
78 | 0x00000003, | ||
79 | 0x40000004, | ||
80 | 0x43ffffff, | ||
81 | |||
82 | /* INC[0]-INC[6] */ | ||
83 | 0x40000000, | ||
84 | 0xe0000000, | ||
85 | 0xe0000000, | ||
86 | 0xa0000008, | ||
87 | 0x20000000, | ||
88 | 0x00000000, | ||
89 | 0x4000ffff, | ||
90 | }; | ||
91 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_rx_task.c b/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_rx_task.c new file mode 100644 index 000000000000..efee022b0256 --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_rx_task.c | |||
@@ -0,0 +1,63 @@ | |||
1 | /* | ||
2 | * Bestcomm GenBD RX task microcode | ||
3 | * | ||
4 | * Copyright (C) 2006 AppSpec Computer Technologies Corp. | ||
5 | * Jeff Gibbons <jeff.gibbons@appspec.com> | ||
6 | * Copyright (c) 2004 Freescale Semiconductor, Inc. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify it | ||
9 | * under the terms of the GNU General Public License version 2 as published | ||
10 | * by the Free Software Foundation. | ||
11 | * | ||
12 | * Based on BestCommAPI-2.2/code_dma/image_rtos1/dma_image.hex | ||
13 | * on Tue Mar 4 10:14:12 2006 GMT | ||
14 | * | ||
15 | */ | ||
16 | |||
17 | #include <asm/types.h> | ||
18 | |||
19 | /* | ||
20 | * The header consists of the following fields: | ||
21 | * u32 magic; | ||
22 | * u8 desc_size; | ||
23 | * u8 var_size; | ||
24 | * u8 inc_size; | ||
25 | * u8 first_var; | ||
26 | * u8 reserved[8]; | ||
27 | * | ||
28 | * The size fields contain the number of 32-bit words. | ||
29 | */ | ||
30 | |||
31 | u32 bcom_gen_bd_rx_task[] = { | ||
32 | /* header */ | ||
33 | 0x4243544b, | ||
34 | 0x0d020409, | ||
35 | 0x00000000, | ||
36 | 0x00000000, | ||
37 | |||
38 | /* Task descriptors */ | ||
39 | 0x808220da, /* LCD: idx0 = var1, idx1 = var4; idx1 <= var3; idx0 += inc3, idx1 += inc2 */ | ||
40 | 0x13e01010, /* DRD1A: var4 = var2; FN=0 MORE init=31 WS=0 RS=0 */ | ||
41 | 0xb880025b, /* LCD: idx2 = *idx1, idx3 = var0; idx2 < var9; idx2 += inc3, idx3 += inc3 */ | ||
42 | 0x10001308, /* DRD1A: var4 = idx1; FN=0 MORE init=0 WS=0 RS=0 */ | ||
43 | 0x60140002, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=2 RS=2 */ | ||
44 | 0x0cccfcca, /* DRD2B1: *idx3 = EU3(); EU3(*idx3,var10) */ | ||
45 | 0xd9190240, /* LCDEXT: idx2 = idx2; idx2 > var9; idx2 += inc0 */ | ||
46 | 0xb8c5e009, /* LCD: idx3 = *(idx1 + var00000015); ; idx3 += inc1 */ | ||
47 | 0x07fecf80, /* DRD1A: *idx3 = *idx0; FN=0 INT init=31 WS=3 RS=3 */ | ||
48 | 0x99190024, /* LCD: idx2 = idx2; idx2 once var0; idx2 += inc4 */ | ||
49 | 0x60000005, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 EXT init=0 WS=0 RS=0 */ | ||
50 | 0x0c4cf889, /* DRD2B1: *idx1 = EU3(); EU3(idx2,var9) */ | ||
51 | 0x000001f8, /* NOP */ | ||
52 | |||
53 | /* VAR[9]-VAR[10] */ | ||
54 | 0x40000000, | ||
55 | 0x7fff7fff, | ||
56 | |||
57 | /* INC[0]-INC[3] */ | ||
58 | 0x40000000, | ||
59 | 0xe0000000, | ||
60 | 0xa0000008, | ||
61 | 0x20000000, | ||
62 | }; | ||
63 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_tx_task.c b/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_tx_task.c new file mode 100644 index 000000000000..c605aa42ecbb --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_tx_task.c | |||
@@ -0,0 +1,69 @@ | |||
1 | /* | ||
2 | * Bestcomm GenBD TX task microcode | ||
3 | * | ||
4 | * Copyright (C) 2006 AppSpec Computer Technologies Corp. | ||
5 | * Jeff Gibbons <jeff.gibbons@appspec.com> | ||
6 | * Copyright (c) 2004 Freescale Semiconductor, Inc. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify it | ||
9 | * under the terms of the GNU General Public License version 2 as published | ||
10 | * by the Free Software Foundation. | ||
11 | * | ||
12 | * Based on BestCommAPI-2.2/code_dma/image_rtos1/dma_image.hex | ||
13 | * on Tue Mar 4 10:14:12 2006 GMT | ||
14 | * | ||
15 | */ | ||
16 | |||
17 | #include <asm/types.h> | ||
18 | |||
19 | /* | ||
20 | * The header consists of the following fields: | ||
21 | * u32 magic; | ||
22 | * u8 desc_size; | ||
23 | * u8 var_size; | ||
24 | * u8 inc_size; | ||
25 | * u8 first_var; | ||
26 | * u8 reserved[8]; | ||
27 | * | ||
28 | * The size fields contain the number of 32-bit words. | ||
29 | */ | ||
30 | |||
31 | u32 bcom_gen_bd_tx_task[] = { | ||
32 | /* header */ | ||
33 | 0x4243544b, | ||
34 | 0x0f040609, | ||
35 | 0x00000000, | ||
36 | 0x00000000, | ||
37 | |||
38 | /* Task descriptors */ | ||
39 | 0x800220e3, /* LCD: idx0 = var0, idx1 = var4; idx1 <= var3; idx0 += inc4, idx1 += inc3 */ | ||
40 | 0x13e01010, /* DRD1A: var4 = var2; FN=0 MORE init=31 WS=0 RS=0 */ | ||
41 | 0xb8808264, /* LCD: idx2 = *idx1, idx3 = var1; idx2 < var9; idx2 += inc4, idx3 += inc4 */ | ||
42 | 0x10001308, /* DRD1A: var4 = idx1; FN=0 MORE init=0 WS=0 RS=0 */ | ||
43 | 0x60140002, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=2 RS=2 */ | ||
44 | 0x0cccfcca, /* DRD2B1: *idx3 = EU3(); EU3(*idx3,var10) */ | ||
45 | 0xd9190300, /* LCDEXT: idx2 = idx2; idx2 > var12; idx2 += inc0 */ | ||
46 | 0xb8c5e009, /* LCD: idx3 = *(idx1 + var00000015); ; idx3 += inc1 */ | ||
47 | 0x03fec398, /* DRD1A: *idx0 = *idx3; FN=0 init=31 WS=3 RS=3 */ | ||
48 | 0x9919826a, /* LCD: idx2 = idx2, idx3 = idx3; idx2 > var9; idx2 += inc5, idx3 += inc2 */ | ||
49 | 0x0feac398, /* DRD1A: *idx0 = *idx3; FN=0 TFD INT init=31 WS=1 RS=1 */ | ||
50 | 0x99190036, /* LCD: idx2 = idx2; idx2 once var0; idx2 += inc6 */ | ||
51 | 0x60000005, /* DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 EXT init=0 WS=0 RS=0 */ | ||
52 | 0x0c4cf889, /* DRD2B1: *idx1 = EU3(); EU3(idx2,var9) */ | ||
53 | 0x000001f8, /* NOP */ | ||
54 | |||
55 | /* VAR[9]-VAR[12] */ | ||
56 | 0x40000000, | ||
57 | 0x7fff7fff, | ||
58 | 0x00000000, | ||
59 | 0x40000004, | ||
60 | |||
61 | /* INC[0]-INC[5] */ | ||
62 | 0x40000000, | ||
63 | 0xe0000000, | ||
64 | 0xe0000000, | ||
65 | 0xa0000008, | ||
66 | 0x20000000, | ||
67 | 0x4000ffff, | ||
68 | }; | ||
69 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c new file mode 100644 index 000000000000..48492a83e5a7 --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/bestcomm.c | |||
@@ -0,0 +1,528 @@ | |||
1 | /* | ||
2 | * Driver for MPC52xx processor BestComm peripheral controller | ||
3 | * | ||
4 | * | ||
5 | * Copyright (C) 2006-2007 Sylvain Munaut <tnt@246tNt.com> | ||
6 | * Copyright (C) 2005 Varma Electronics Oy, | ||
7 | * ( by Andrey Volkov <avolkov@varma-el.com> ) | ||
8 | * Copyright (C) 2003-2004 MontaVista, Software, Inc. | ||
9 | * ( by Dale Farnsworth <dfarnsworth@mvista.com> ) | ||
10 | * | ||
11 | * This file is licensed under the terms of the GNU General Public License | ||
12 | * version 2. This program is licensed "as is" without any warranty of any | ||
13 | * kind, whether express or implied. | ||
14 | */ | ||
15 | |||
16 | #include <linux/module.h> | ||
17 | #include <linux/kernel.h> | ||
18 | #include <linux/slab.h> | ||
19 | #include <linux/of.h> | ||
20 | #include <linux/of_device.h> | ||
21 | #include <linux/of_platform.h> | ||
22 | #include <asm/io.h> | ||
23 | #include <asm/irq.h> | ||
24 | #include <asm/mpc52xx.h> | ||
25 | |||
26 | #include "sram.h" | ||
27 | #include "bestcomm_priv.h" | ||
28 | #include "bestcomm.h" | ||
29 | |||
30 | #define DRIVER_NAME "bestcomm-core" | ||
31 | |||
32 | |||
33 | struct bcom_engine *bcom_eng = NULL; | ||
34 | EXPORT_SYMBOL_GPL(bcom_eng); /* needed for inline functions */ | ||
35 | |||
36 | |||
37 | /* ======================================================================== */ | ||
38 | /* Public and private API */ | ||
39 | /* ======================================================================== */ | ||
40 | |||
41 | /* Private API */ | ||
42 | |||
43 | struct bcom_task * | ||
44 | bcom_task_alloc(int bd_count, int bd_size, int priv_size) | ||
45 | { | ||
46 | int i, tasknum = -1; | ||
47 | struct bcom_task *tsk; | ||
48 | |||
49 | /* Get and reserve a task num */ | ||
50 | spin_lock(&bcom_eng->lock); | ||
51 | |||
52 | for (i=0; i<BCOM_MAX_TASKS; i++) | ||
53 | if (!bcom_eng->tdt[i].stop) { /* we use stop as a marker */ | ||
54 | bcom_eng->tdt[i].stop = 0xfffffffful; /* dummy addr */ | ||
55 | tasknum = i; | ||
56 | break; | ||
57 | } | ||
58 | |||
59 | spin_unlock(&bcom_eng->lock); | ||
60 | |||
61 | if (tasknum < 0) | ||
62 | return NULL; | ||
63 | |||
64 | /* Allocate our structure */ | ||
65 | tsk = kzalloc(sizeof(struct bcom_task) + priv_size, GFP_KERNEL); | ||
66 | if (!tsk) | ||
67 | goto error; | ||
68 | |||
69 | tsk->tasknum = tasknum; | ||
70 | if (priv_size) | ||
71 | tsk->priv = (void*)tsk + sizeof(struct bcom_task); | ||
72 | |||
73 | /* Get IRQ of that task */ | ||
74 | tsk->irq = irq_of_parse_and_map(bcom_eng->ofnode, tsk->tasknum); | ||
75 | if (tsk->irq == NO_IRQ) | ||
76 | goto error; | ||
77 | |||
78 | /* Init the BDs, if needed */ | ||
79 | if (bd_count) { | ||
80 | tsk->cookie = kmalloc(sizeof(void*) * bd_count, GFP_KERNEL); | ||
81 | if (!tsk->cookie) | ||
82 | goto error; | ||
83 | |||
84 | tsk->bd = bcom_sram_alloc(bd_count * bd_size, 4, &tsk->bd_pa); | ||
85 | if (!tsk->bd) | ||
86 | goto error; | ||
87 | memset(tsk->bd, 0x00, bd_count * bd_size); | ||
88 | |||
89 | tsk->num_bd = bd_count; | ||
90 | tsk->bd_size = bd_size; | ||
91 | } | ||
92 | |||
93 | return tsk; | ||
94 | |||
95 | error: | ||
96 | if (tsk) { | ||
97 | if (tsk->irq != NO_IRQ) | ||
98 | irq_dispose_mapping(tsk->irq); | ||
99 | bcom_sram_free(tsk->bd); | ||
100 | kfree(tsk->cookie); | ||
101 | kfree(tsk); | ||
102 | } | ||
103 | |||
104 | bcom_eng->tdt[tasknum].stop = 0; | ||
105 | |||
106 | return NULL; | ||
107 | } | ||
108 | EXPORT_SYMBOL_GPL(bcom_task_alloc); | ||
109 | |||
110 | void | ||
111 | bcom_task_free(struct bcom_task *tsk) | ||
112 | { | ||
113 | /* Stop the task */ | ||
114 | bcom_disable_task(tsk->tasknum); | ||
115 | |||
116 | /* Clear TDT */ | ||
117 | bcom_eng->tdt[tsk->tasknum].start = 0; | ||
118 | bcom_eng->tdt[tsk->tasknum].stop = 0; | ||
119 | |||
120 | /* Free everything */ | ||
121 | irq_dispose_mapping(tsk->irq); | ||
122 | bcom_sram_free(tsk->bd); | ||
123 | kfree(tsk->cookie); | ||
124 | kfree(tsk); | ||
125 | } | ||
126 | EXPORT_SYMBOL_GPL(bcom_task_free); | ||
127 | |||
128 | int | ||
129 | bcom_load_image(int task, u32 *task_image) | ||
130 | { | ||
131 | struct bcom_task_header *hdr = (struct bcom_task_header *)task_image; | ||
132 | struct bcom_tdt *tdt; | ||
133 | u32 *desc, *var, *inc; | ||
134 | u32 *desc_src, *var_src, *inc_src; | ||
135 | |||
136 | /* Safety checks */ | ||
137 | if (hdr->magic != BCOM_TASK_MAGIC) { | ||
138 | printk(KERN_ERR DRIVER_NAME | ||
139 | ": Trying to load invalid microcode\n"); | ||
140 | return -EINVAL; | ||
141 | } | ||
142 | |||
143 | if ((task < 0) || (task >= BCOM_MAX_TASKS)) { | ||
144 | printk(KERN_ERR DRIVER_NAME | ||
145 | ": Trying to load invalid task %d\n", task); | ||
146 | return -EINVAL; | ||
147 | } | ||
148 | |||
149 | /* Initial load or reload */ | ||
150 | tdt = &bcom_eng->tdt[task]; | ||
151 | |||
152 | if (tdt->start) { | ||
153 | desc = bcom_task_desc(task); | ||
154 | if (hdr->desc_size != bcom_task_num_descs(task)) { | ||
155 | printk(KERN_ERR DRIVER_NAME | ||
156 | ": Trying to reload wrong task image " | ||
157 | "(%d size %d/%d)!\n", | ||
158 | task, | ||
159 | hdr->desc_size, | ||
160 | bcom_task_num_descs(task)); | ||
161 | return -EINVAL; | ||
162 | } | ||
163 | } else { | ||
164 | phys_addr_t start_pa; | ||
165 | |||
166 | desc = bcom_sram_alloc(hdr->desc_size * sizeof(u32), 4, &start_pa); | ||
167 | if (!desc) | ||
168 | return -ENOMEM; | ||
169 | |||
170 | tdt->start = start_pa; | ||
171 | tdt->stop = start_pa + ((hdr->desc_size-1) * sizeof(u32)); | ||
172 | } | ||
173 | |||
174 | var = bcom_task_var(task); | ||
175 | inc = bcom_task_inc(task); | ||
176 | |||
177 | /* Clear & copy */ | ||
178 | memset(var, 0x00, BCOM_VAR_SIZE); | ||
179 | memset(inc, 0x00, BCOM_INC_SIZE); | ||
180 | |||
181 | desc_src = (u32 *)(hdr + 1); | ||
182 | var_src = desc_src + hdr->desc_size; | ||
183 | inc_src = var_src + hdr->var_size; | ||
184 | |||
185 | memcpy(desc, desc_src, hdr->desc_size * sizeof(u32)); | ||
186 | memcpy(var + hdr->first_var, var_src, hdr->var_size * sizeof(u32)); | ||
187 | memcpy(inc, inc_src, hdr->inc_size * sizeof(u32)); | ||
188 | |||
189 | return 0; | ||
190 | } | ||
191 | EXPORT_SYMBOL_GPL(bcom_load_image); | ||
192 | |||
193 | void | ||
194 | bcom_set_initiator(int task, int initiator) | ||
195 | { | ||
196 | int i; | ||
197 | int num_descs; | ||
198 | u32 *desc; | ||
199 | int next_drd_has_initiator; | ||
200 | |||
201 | bcom_set_tcr_initiator(task, initiator); | ||
202 | |||
203 | /* Just setting tcr is apparently not enough due to some problem */ | ||
204 | /* with it. So we just go thru all the microcode and replace in */ | ||
205 | /* the DRD directly */ | ||
206 | |||
207 | desc = bcom_task_desc(task); | ||
208 | next_drd_has_initiator = 1; | ||
209 | num_descs = bcom_task_num_descs(task); | ||
210 | |||
211 | for (i=0; i<num_descs; i++, desc++) { | ||
212 | if (!bcom_desc_is_drd(*desc)) | ||
213 | continue; | ||
214 | if (next_drd_has_initiator) | ||
215 | if (bcom_desc_initiator(*desc) != BCOM_INITIATOR_ALWAYS) | ||
216 | bcom_set_desc_initiator(desc, initiator); | ||
217 | next_drd_has_initiator = !bcom_drd_is_extended(*desc); | ||
218 | } | ||
219 | } | ||
220 | EXPORT_SYMBOL_GPL(bcom_set_initiator); | ||
221 | |||
222 | |||
223 | /* Public API */ | ||
224 | |||
225 | void | ||
226 | bcom_enable(struct bcom_task *tsk) | ||
227 | { | ||
228 | bcom_enable_task(tsk->tasknum); | ||
229 | } | ||
230 | EXPORT_SYMBOL_GPL(bcom_enable); | ||
231 | |||
232 | void | ||
233 | bcom_disable(struct bcom_task *tsk) | ||
234 | { | ||
235 | bcom_disable_task(tsk->tasknum); | ||
236 | } | ||
237 | EXPORT_SYMBOL_GPL(bcom_disable); | ||
238 | |||
239 | |||
240 | /* ======================================================================== */ | ||
241 | /* Engine init/cleanup */ | ||
242 | /* ======================================================================== */ | ||
243 | |||
244 | /* Function Descriptor table */ | ||
245 | /* this will need to be updated if Freescale changes their task code FDT */ | ||
246 | static u32 fdt_ops[] = { | ||
247 | 0xa0045670, /* FDT[48] - load_acc() */ | ||
248 | 0x80045670, /* FDT[49] - unload_acc() */ | ||
249 | 0x21800000, /* FDT[50] - and() */ | ||
250 | 0x21e00000, /* FDT[51] - or() */ | ||
251 | 0x21500000, /* FDT[52] - xor() */ | ||
252 | 0x21400000, /* FDT[53] - andn() */ | ||
253 | 0x21500000, /* FDT[54] - not() */ | ||
254 | 0x20400000, /* FDT[55] - add() */ | ||
255 | 0x20500000, /* FDT[56] - sub() */ | ||
256 | 0x20800000, /* FDT[57] - lsh() */ | ||
257 | 0x20a00000, /* FDT[58] - rsh() */ | ||
258 | 0xc0170000, /* FDT[59] - crc8() */ | ||
259 | 0xc0145670, /* FDT[60] - crc16() */ | ||
260 | 0xc0345670, /* FDT[61] - crc32() */ | ||
261 | 0xa0076540, /* FDT[62] - endian32() */ | ||
262 | 0xa0000760, /* FDT[63] - endian16() */ | ||
263 | }; | ||
264 | |||
265 | |||
266 | static int __devinit | ||
267 | bcom_engine_init(void) | ||
268 | { | ||
269 | int task; | ||
270 | phys_addr_t tdt_pa, ctx_pa, var_pa, fdt_pa; | ||
271 | unsigned int tdt_size, ctx_size, var_size, fdt_size; | ||
272 | |||
273 | /* Allocate & clear SRAM zones for FDT, TDTs, contexts and vars/incs */ | ||
274 | tdt_size = BCOM_MAX_TASKS * sizeof(struct bcom_tdt); | ||
275 | ctx_size = BCOM_MAX_TASKS * BCOM_CTX_SIZE; | ||
276 | var_size = BCOM_MAX_TASKS * (BCOM_VAR_SIZE + BCOM_INC_SIZE); | ||
277 | fdt_size = BCOM_FDT_SIZE; | ||
278 | |||
279 | bcom_eng->tdt = bcom_sram_alloc(tdt_size, sizeof(u32), &tdt_pa); | ||
280 | bcom_eng->ctx = bcom_sram_alloc(ctx_size, BCOM_CTX_ALIGN, &ctx_pa); | ||
281 | bcom_eng->var = bcom_sram_alloc(var_size, BCOM_VAR_ALIGN, &var_pa); | ||
282 | bcom_eng->fdt = bcom_sram_alloc(fdt_size, BCOM_FDT_ALIGN, &fdt_pa); | ||
283 | |||
284 | if (!bcom_eng->tdt || !bcom_eng->ctx || !bcom_eng->var || !bcom_eng->fdt) { | ||
285 | printk(KERN_ERR "DMA: SRAM alloc failed in engine init !\n"); | ||
286 | |||
287 | bcom_sram_free(bcom_eng->tdt); | ||
288 | bcom_sram_free(bcom_eng->ctx); | ||
289 | bcom_sram_free(bcom_eng->var); | ||
290 | bcom_sram_free(bcom_eng->fdt); | ||
291 | |||
292 | return -ENOMEM; | ||
293 | } | ||
294 | |||
295 | memset(bcom_eng->tdt, 0x00, tdt_size); | ||
296 | memset(bcom_eng->ctx, 0x00, ctx_size); | ||
297 | memset(bcom_eng->var, 0x00, var_size); | ||
298 | memset(bcom_eng->fdt, 0x00, fdt_size); | ||
299 | |||
300 | /* Copy the FDT for the EU#3 */ | ||
301 | memcpy(&bcom_eng->fdt[48], fdt_ops, sizeof(fdt_ops)); | ||
302 | |||
303 | /* Initialize Task base structure */ | ||
304 | for (task=0; task<BCOM_MAX_TASKS; task++) | ||
305 | { | ||
306 | out_be16(&bcom_eng->regs->tcr[task], 0); | ||
307 | out_8(&bcom_eng->regs->ipr[task], 0); | ||
308 | |||
309 | bcom_eng->tdt[task].context = ctx_pa; | ||
310 | bcom_eng->tdt[task].var = var_pa; | ||
311 | bcom_eng->tdt[task].fdt = fdt_pa; | ||
312 | |||
313 | var_pa += BCOM_VAR_SIZE + BCOM_INC_SIZE; | ||
314 | ctx_pa += BCOM_CTX_SIZE; | ||
315 | } | ||
316 | |||
317 | out_be32(&bcom_eng->regs->taskBar, tdt_pa); | ||
318 | |||
319 | /* Init 'always' initiator */ | ||
320 | out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_ALWAYS], BCOM_IPR_ALWAYS); | ||
321 | |||
322 | /* Disable COMM Bus Prefetch, apparently it's not reliable yet */ | ||
323 | /* FIXME: This should be done on 5200 and not 5200B ... */ | ||
324 | out_be16(&bcom_eng->regs->PtdCntrl, in_be16(&bcom_eng->regs->PtdCntrl) | 1); | ||
325 | |||
326 | /* Init lock */ | ||
327 | spin_lock_init(&bcom_eng->lock); | ||
328 | |||
329 | return 0; | ||
330 | } | ||
331 | |||
332 | static void | ||
333 | bcom_engine_cleanup(void) | ||
334 | { | ||
335 | int task; | ||
336 | |||
337 | /* Stop all tasks */ | ||
338 | for (task=0; task<BCOM_MAX_TASKS; task++) | ||
339 | { | ||
340 | out_be16(&bcom_eng->regs->tcr[task], 0); | ||
341 | out_8(&bcom_eng->regs->ipr[task], 0); | ||
342 | } | ||
343 | |||
344 | out_be32(&bcom_eng->regs->taskBar, 0ul); | ||
345 | |||
346 | /* Release the SRAM zones */ | ||
347 | bcom_sram_free(bcom_eng->tdt); | ||
348 | bcom_sram_free(bcom_eng->ctx); | ||
349 | bcom_sram_free(bcom_eng->var); | ||
350 | bcom_sram_free(bcom_eng->fdt); | ||
351 | } | ||
352 | |||
353 | |||
354 | /* ======================================================================== */ | ||
355 | /* OF platform driver */ | ||
356 | /* ======================================================================== */ | ||
357 | |||
358 | static int __devinit | ||
359 | mpc52xx_bcom_probe(struct of_device *op, const struct of_device_id *match) | ||
360 | { | ||
361 | struct device_node *ofn_sram; | ||
362 | struct resource res_bcom; | ||
363 | |||
364 | int rv; | ||
365 | |||
366 | /* Inform user we're ok so far */ | ||
367 | printk(KERN_INFO "DMA: MPC52xx BestComm driver\n"); | ||
368 | |||
369 | /* Get the bestcomm node */ | ||
370 | of_node_get(op->node); | ||
371 | |||
372 | /* Prepare SRAM */ | ||
373 | ofn_sram = of_find_compatible_node(NULL, "sram", "mpc5200-sram"); | ||
374 | if (!ofn_sram) { | ||
375 | printk(KERN_ERR DRIVER_NAME ": " | ||
376 | "No SRAM found in device tree\n"); | ||
377 | rv = -ENODEV; | ||
378 | goto error_ofput; | ||
379 | } | ||
380 | rv = bcom_sram_init(ofn_sram, DRIVER_NAME); | ||
381 | of_node_put(ofn_sram); | ||
382 | |||
383 | if (rv) { | ||
384 | printk(KERN_ERR DRIVER_NAME ": " | ||
385 | "Error in SRAM init\n"); | ||
386 | goto error_ofput; | ||
387 | } | ||
388 | |||
389 | /* Get a clean struct */ | ||
390 | bcom_eng = kzalloc(sizeof(struct bcom_engine), GFP_KERNEL); | ||
391 | if (!bcom_eng) { | ||
392 | printk(KERN_ERR DRIVER_NAME ": " | ||
393 | "Can't allocate state structure\n"); | ||
394 | rv = -ENOMEM; | ||
395 | goto error_sramclean; | ||
396 | } | ||
397 | |||
398 | /* Save the node */ | ||
399 | bcom_eng->ofnode = op->node; | ||
400 | |||
401 | /* Get, reserve & map io */ | ||
402 | if (of_address_to_resource(op->node, 0, &res_bcom)) { | ||
403 | printk(KERN_ERR DRIVER_NAME ": " | ||
404 | "Can't get resource\n"); | ||
405 | rv = -EINVAL; | ||
406 | goto error_sramclean; | ||
407 | } | ||
408 | |||
409 | if (!request_mem_region(res_bcom.start, sizeof(struct mpc52xx_sdma), | ||
410 | DRIVER_NAME)) { | ||
411 | printk(KERN_ERR DRIVER_NAME ": " | ||
412 | "Can't request registers region\n"); | ||
413 | rv = -EBUSY; | ||
414 | goto error_sramclean; | ||
415 | } | ||
416 | |||
417 | bcom_eng->regs_base = res_bcom.start; | ||
418 | bcom_eng->regs = ioremap(res_bcom.start, sizeof(struct mpc52xx_sdma)); | ||
419 | if (!bcom_eng->regs) { | ||
420 | printk(KERN_ERR DRIVER_NAME ": " | ||
421 | "Can't map registers\n"); | ||
422 | rv = -ENOMEM; | ||
423 | goto error_release; | ||
424 | } | ||
425 | |||
426 | /* Now, do the real init */ | ||
427 | rv = bcom_engine_init(); | ||
428 | if (rv) | ||
429 | goto error_unmap; | ||
430 | |||
431 | /* Done ! */ | ||
432 | printk(KERN_INFO "DMA: MPC52xx BestComm engine @%08lx ok !\n", | ||
433 | bcom_eng->regs_base); | ||
434 | |||
435 | return 0; | ||
436 | |||
437 | /* Error path */ | ||
438 | error_unmap: | ||
439 | iounmap(bcom_eng->regs); | ||
440 | error_release: | ||
441 | release_mem_region(res_bcom.start, sizeof(struct mpc52xx_sdma)); | ||
442 | error_sramclean: | ||
443 | kfree(bcom_eng); | ||
444 | bcom_sram_cleanup(); | ||
445 | error_ofput: | ||
446 | of_node_put(op->node); | ||
447 | |||
448 | printk(KERN_ERR "DMA: MPC52xx BestComm init failed !\n"); | ||
449 | |||
450 | return rv; | ||
451 | } | ||
452 | |||
453 | |||
454 | static int | ||
455 | mpc52xx_bcom_remove(struct of_device *op) | ||
456 | { | ||
457 | /* Clean up the engine */ | ||
458 | bcom_engine_cleanup(); | ||
459 | |||
460 | /* Cleanup SRAM */ | ||
461 | bcom_sram_cleanup(); | ||
462 | |||
463 | /* Release regs */ | ||
464 | iounmap(bcom_eng->regs); | ||
465 | release_mem_region(bcom_eng->regs_base, sizeof(struct mpc52xx_sdma)); | ||
466 | |||
467 | /* Release the node */ | ||
468 | of_node_put(bcom_eng->ofnode); | ||
469 | |||
470 | /* Release memory */ | ||
471 | kfree(bcom_eng); | ||
472 | bcom_eng = NULL; | ||
473 | |||
474 | return 0; | ||
475 | } | ||
476 | |||
477 | static struct of_device_id mpc52xx_bcom_of_match[] = { | ||
478 | { | ||
479 | .type = "dma-controller", | ||
480 | .compatible = "mpc5200-bestcomm", | ||
481 | }, | ||
482 | {}, | ||
483 | }; | ||
484 | |||
485 | MODULE_DEVICE_TABLE(of, mpc52xx_bcom_of_match); | ||
486 | |||
487 | |||
488 | static struct of_platform_driver mpc52xx_bcom_of_platform_driver = { | ||
489 | .owner = THIS_MODULE, | ||
490 | .name = DRIVER_NAME, | ||
491 | .match_table = mpc52xx_bcom_of_match, | ||
492 | .probe = mpc52xx_bcom_probe, | ||
493 | .remove = mpc52xx_bcom_remove, | ||
494 | .driver = { | ||
495 | .name = DRIVER_NAME, | ||
496 | .owner = THIS_MODULE, | ||
497 | }, | ||
498 | }; | ||
499 | |||
500 | |||
501 | /* ======================================================================== */ | ||
502 | /* Module */ | ||
503 | /* ======================================================================== */ | ||
504 | |||
505 | static int __init | ||
506 | mpc52xx_bcom_init(void) | ||
507 | { | ||
508 | return of_register_platform_driver(&mpc52xx_bcom_of_platform_driver); | ||
509 | } | ||
510 | |||
511 | static void __exit | ||
512 | mpc52xx_bcom_exit(void) | ||
513 | { | ||
514 | of_unregister_platform_driver(&mpc52xx_bcom_of_platform_driver); | ||
515 | } | ||
516 | |||
517 | /* If we're not a module, we must make sure everything is setup before */ | ||
518 | /* anyone tries to use us ... that's why we use subsys_initcall instead */ | ||
519 | /* of module_init. */ | ||
520 | subsys_initcall(mpc52xx_bcom_init); | ||
521 | module_exit(mpc52xx_bcom_exit); | ||
522 | |||
523 | MODULE_DESCRIPTION("Freescale MPC52xx BestComm DMA"); | ||
524 | MODULE_AUTHOR("Sylvain Munaut <tnt@246tNt.com>"); | ||
525 | MODULE_AUTHOR("Andrey Volkov <avolkov@varma-el.com>"); | ||
526 | MODULE_AUTHOR("Dale Farnsworth <dfarnsworth@mvista.com>"); | ||
527 | MODULE_LICENSE("GPL v2"); | ||
528 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.h b/arch/powerpc/sysdev/bestcomm/bestcomm.h new file mode 100644 index 000000000000..e802cb4eb69a --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/bestcomm.h | |||
@@ -0,0 +1,190 @@ | |||
1 | /* | ||
2 | * Public header for the MPC52xx processor BestComm driver | ||
3 | * | ||
4 | * | ||
5 | * Copyright (C) 2006 Sylvain Munaut <tnt@246tNt.com> | ||
6 | * Copyright (C) 2005 Varma Electronics Oy, | ||
7 | * ( by Andrey Volkov <avolkov@varma-el.com> ) | ||
8 | * Copyright (C) 2003-2004 MontaVista, Software, Inc. | ||
9 | * ( by Dale Farnsworth <dfarnsworth@mvista.com> ) | ||
10 | * | ||
11 | * This file is licensed under the terms of the GNU General Public License | ||
12 | * version 2. This program is licensed "as is" without any warranty of any | ||
13 | * kind, whether express or implied. | ||
14 | */ | ||
15 | |||
16 | #ifndef __BESTCOMM_H__ | ||
17 | #define __BESTCOMM_H__ | ||
18 | |||
19 | struct bcom_bd; /* defined later on ... */ | ||
20 | |||
21 | |||
22 | /* ======================================================================== */ | ||
23 | /* Generic task managment */ | ||
24 | /* ======================================================================== */ | ||
25 | |||
26 | /** | ||
27 | * struct bcom_task - Structure describing a loaded BestComm task | ||
28 | * | ||
29 | * This structure is never built by the driver it self. It's built and | ||
30 | * filled the intermediate layer of the BestComm API, the task dependent | ||
31 | * support code. | ||
32 | * | ||
33 | * Most likely you don't need to poke around inside this structure. The | ||
34 | * fields are exposed in the header just for the sake of inline functions | ||
35 | */ | ||
36 | struct bcom_task { | ||
37 | unsigned int tasknum; | ||
38 | unsigned int flags; | ||
39 | int irq; | ||
40 | |||
41 | struct bcom_bd *bd; | ||
42 | phys_addr_t bd_pa; | ||
43 | void **cookie; | ||
44 | unsigned short index; | ||
45 | unsigned short outdex; | ||
46 | unsigned int num_bd; | ||
47 | unsigned int bd_size; | ||
48 | |||
49 | void* priv; | ||
50 | }; | ||
51 | |||
52 | #define BCOM_FLAGS_NONE 0x00000000ul | ||
53 | #define BCOM_FLAGS_ENABLE_TASK (1ul << 0) | ||
54 | |||
55 | /** | ||
56 | * bcom_enable - Enable a BestComm task | ||
57 | * @tsk: The BestComm task structure | ||
58 | * | ||
59 | * This function makes sure the given task is enabled and can be run | ||
60 | * by the BestComm engine as needed | ||
61 | */ | ||
62 | extern void bcom_enable(struct bcom_task *tsk); | ||
63 | |||
64 | /** | ||
65 | * bcom_disable - Disable a BestComm task | ||
66 | * @tsk: The BestComm task structure | ||
67 | * | ||
68 | * This function disable a given task, making sure it's not executed | ||
69 | * by the BestComm engine. | ||
70 | */ | ||
71 | extern void bcom_disable(struct bcom_task *tsk); | ||
72 | |||
73 | |||
74 | /** | ||
75 | * bcom_get_task_irq - Returns the irq number of a BestComm task | ||
76 | * @tsk: The BestComm task structure | ||
77 | */ | ||
78 | static inline int | ||
79 | bcom_get_task_irq(struct bcom_task *tsk) { | ||
80 | return tsk->irq; | ||
81 | } | ||
82 | |||
83 | /* ======================================================================== */ | ||
84 | /* BD based tasks helpers */ | ||
85 | /* ======================================================================== */ | ||
86 | |||
87 | /** | ||
88 | * struct bcom_bd - Structure describing a generic BestComm buffer descriptor | ||
89 | * @status: The current status of this buffer. Exact meaning depends on the | ||
90 | * task type | ||
91 | * @data: An array of u32 whose meaning depends on the task type. | ||
92 | */ | ||
93 | struct bcom_bd { | ||
94 | u32 status; | ||
95 | u32 data[1]; /* variable, but at least 1 */ | ||
96 | }; | ||
97 | |||
98 | #define BCOM_BD_READY 0x40000000ul | ||
99 | |||
100 | /** _bcom_next_index - Get next input index. | ||
101 | * @tsk: pointer to task structure | ||
102 | * | ||
103 | * Support function; Device drivers should not call this | ||
104 | */ | ||
105 | static inline int | ||
106 | _bcom_next_index(struct bcom_task *tsk) | ||
107 | { | ||
108 | return ((tsk->index + 1) == tsk->num_bd) ? 0 : tsk->index + 1; | ||
109 | } | ||
110 | |||
111 | /** _bcom_next_outdex - Get next output index. | ||
112 | * @tsk: pointer to task structure | ||
113 | * | ||
114 | * Support function; Device drivers should not call this | ||
115 | */ | ||
116 | static inline int | ||
117 | _bcom_next_outdex(struct bcom_task *tsk) | ||
118 | { | ||
119 | return ((tsk->outdex + 1) == tsk->num_bd) ? 0 : tsk->outdex + 1; | ||
120 | } | ||
121 | |||
122 | /** | ||
123 | * bcom_queue_empty - Checks if a BestComm task BD queue is empty | ||
124 | * @tsk: The BestComm task structure | ||
125 | */ | ||
126 | static inline int | ||
127 | bcom_queue_empty(struct bcom_task *tsk) | ||
128 | { | ||
129 | return tsk->index == tsk->outdex; | ||
130 | } | ||
131 | |||
132 | /** | ||
133 | * bcom_queue_full - Checks if a BestComm task BD queue is full | ||
134 | * @tsk: The BestComm task structure | ||
135 | */ | ||
136 | static inline int | ||
137 | bcom_queue_full(struct bcom_task *tsk) | ||
138 | { | ||
139 | return tsk->outdex == _bcom_next_index(tsk); | ||
140 | } | ||
141 | |||
142 | /** | ||
143 | * bcom_buffer_done - Checks if a BestComm | ||
144 | * @tsk: The BestComm task structure | ||
145 | */ | ||
146 | static inline int | ||
147 | bcom_buffer_done(struct bcom_task *tsk) | ||
148 | { | ||
149 | if (bcom_queue_empty(tsk)) | ||
150 | return 0; | ||
151 | return !(tsk->bd[tsk->outdex].status & BCOM_BD_READY); | ||
152 | } | ||
153 | |||
154 | /** | ||
155 | * bcom_prepare_next_buffer - clear status of next available buffer. | ||
156 | * @tsk: The BestComm task structure | ||
157 | * | ||
158 | * Returns pointer to next buffer descriptor | ||
159 | */ | ||
160 | static inline struct bcom_bd * | ||
161 | bcom_prepare_next_buffer(struct bcom_task *tsk) | ||
162 | { | ||
163 | tsk->bd[tsk->index].status = 0; /* cleanup last status */ | ||
164 | return &tsk->bd[tsk->index]; | ||
165 | } | ||
166 | |||
167 | static inline void | ||
168 | bcom_submit_next_buffer(struct bcom_task *tsk, void *cookie) | ||
169 | { | ||
170 | tsk->cookie[tsk->index] = cookie; | ||
171 | mb(); /* ensure the bd is really up-to-date */ | ||
172 | tsk->bd[tsk->index].status |= BCOM_BD_READY; | ||
173 | tsk->index = _bcom_next_index(tsk); | ||
174 | if (tsk->flags & BCOM_FLAGS_ENABLE_TASK) | ||
175 | bcom_enable(tsk); | ||
176 | } | ||
177 | |||
178 | static inline void * | ||
179 | bcom_retrieve_buffer(struct bcom_task *tsk, u32 *p_status, struct bcom_bd **p_bd) | ||
180 | { | ||
181 | void *cookie = tsk->cookie[tsk->outdex]; | ||
182 | if (p_status) | ||
183 | *p_status = tsk->bd[tsk->outdex].status; | ||
184 | if (p_bd) | ||
185 | *p_bd = &tsk->bd[tsk->outdex]; | ||
186 | tsk->outdex = _bcom_next_outdex(tsk); | ||
187 | return cookie; | ||
188 | } | ||
189 | |||
190 | #endif /* __BESTCOMM_H__ */ | ||
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm_priv.h b/arch/powerpc/sysdev/bestcomm/bestcomm_priv.h new file mode 100644 index 000000000000..866a2915ef2f --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/bestcomm_priv.h | |||
@@ -0,0 +1,334 @@ | |||
1 | /* | ||
2 | * Private header for the MPC52xx processor BestComm driver | ||
3 | * | ||
4 | * By private, we mean that driver should not use it directly. It's meant | ||
5 | * to be used by the BestComm engine driver itself and by the intermediate | ||
6 | * layer between the core and the drivers. | ||
7 | * | ||
8 | * Copyright (C) 2006 Sylvain Munaut <tnt@246tNt.com> | ||
9 | * Copyright (C) 2005 Varma Electronics Oy, | ||
10 | * ( by Andrey Volkov <avolkov@varma-el.com> ) | ||
11 | * Copyright (C) 2003-2004 MontaVista, Software, Inc. | ||
12 | * ( by Dale Farnsworth <dfarnsworth@mvista.com> ) | ||
13 | * | ||
14 | * This file is licensed under the terms of the GNU General Public License | ||
15 | * version 2. This program is licensed "as is" without any warranty of any | ||
16 | * kind, whether express or implied. | ||
17 | */ | ||
18 | |||
19 | #ifndef __BESTCOMM_PRIV_H__ | ||
20 | #define __BESTCOMM_PRIV_H__ | ||
21 | |||
22 | #include <linux/spinlock.h> | ||
23 | #include <linux/of.h> | ||
24 | #include <asm/io.h> | ||
25 | #include <asm/mpc52xx.h> | ||
26 | |||
27 | #include "sram.h" | ||
28 | |||
29 | |||
30 | /* ======================================================================== */ | ||
31 | /* Engine related stuff */ | ||
32 | /* ======================================================================== */ | ||
33 | |||
34 | /* Zones sizes and needed alignments */ | ||
35 | #define BCOM_MAX_TASKS 16 | ||
36 | #define BCOM_MAX_VAR 24 | ||
37 | #define BCOM_MAX_INC 8 | ||
38 | #define BCOM_MAX_FDT 64 | ||
39 | #define BCOM_MAX_CTX 20 | ||
40 | #define BCOM_CTX_SIZE (BCOM_MAX_CTX * sizeof(u32)) | ||
41 | #define BCOM_CTX_ALIGN 0x100 | ||
42 | #define BCOM_VAR_SIZE (BCOM_MAX_VAR * sizeof(u32)) | ||
43 | #define BCOM_INC_SIZE (BCOM_MAX_INC * sizeof(u32)) | ||
44 | #define BCOM_VAR_ALIGN 0x80 | ||
45 | #define BCOM_FDT_SIZE (BCOM_MAX_FDT * sizeof(u32)) | ||
46 | #define BCOM_FDT_ALIGN 0x100 | ||
47 | |||
48 | /** | ||
49 | * struct bcom_tdt - Task Descriptor Table Entry | ||
50 | * | ||
51 | */ | ||
52 | struct bcom_tdt { | ||
53 | u32 start; | ||
54 | u32 stop; | ||
55 | u32 var; | ||
56 | u32 fdt; | ||
57 | u32 exec_status; /* used internally by BestComm engine */ | ||
58 | u32 mvtp; /* used internally by BestComm engine */ | ||
59 | u32 context; | ||
60 | u32 litbase; | ||
61 | }; | ||
62 | |||
63 | /** | ||
64 | * struct bcom_engine | ||
65 | * | ||
66 | * This holds all info needed globaly to handle the engine | ||
67 | */ | ||
68 | struct bcom_engine { | ||
69 | struct device_node *ofnode; | ||
70 | struct mpc52xx_sdma __iomem *regs; | ||
71 | phys_addr_t regs_base; | ||
72 | |||
73 | struct bcom_tdt *tdt; | ||
74 | u32 *ctx; | ||
75 | u32 *var; | ||
76 | u32 *fdt; | ||
77 | |||
78 | spinlock_t lock; | ||
79 | }; | ||
80 | |||
81 | extern struct bcom_engine *bcom_eng; | ||
82 | |||
83 | |||
84 | /* ======================================================================== */ | ||
85 | /* Tasks related stuff */ | ||
86 | /* ======================================================================== */ | ||
87 | |||
88 | /* Tasks image header */ | ||
89 | #define BCOM_TASK_MAGIC 0x4243544B /* 'BCTK' */ | ||
90 | |||
91 | struct bcom_task_header { | ||
92 | u32 magic; | ||
93 | u8 desc_size; /* the size fields */ | ||
94 | u8 var_size; /* are given in number */ | ||
95 | u8 inc_size; /* of 32-bits words */ | ||
96 | u8 first_var; | ||
97 | u8 reserved[8]; | ||
98 | }; | ||
99 | |||
100 | /* Descriptors stucture & co */ | ||
101 | #define BCOM_DESC_NOP 0x000001f8 | ||
102 | #define BCOM_LCD_MASK 0x80000000 | ||
103 | #define BCOM_DRD_EXTENDED 0x40000000 | ||
104 | #define BCOM_DRD_INITIATOR_SHIFT 21 | ||
105 | |||
106 | /* Tasks pragma */ | ||
107 | #define BCOM_PRAGMA_BIT_RSV 7 /* reserved pragma bit */ | ||
108 | #define BCOM_PRAGMA_BIT_PRECISE_INC 6 /* increment 0=when possible, */ | ||
109 | /* 1=iter end */ | ||
110 | #define BCOM_PRAGMA_BIT_RST_ERROR_NO 5 /* don't reset errors on */ | ||
111 | /* task enable */ | ||
112 | #define BCOM_PRAGMA_BIT_PACK 4 /* pack data enable */ | ||
113 | #define BCOM_PRAGMA_BIT_INTEGER 3 /* data alignment */ | ||
114 | /* 0=frac(msb), 1=int(lsb) */ | ||
115 | #define BCOM_PRAGMA_BIT_SPECREAD 2 /* XLB speculative read */ | ||
116 | #define BCOM_PRAGMA_BIT_CW 1 /* write line buffer enable */ | ||
117 | #define BCOM_PRAGMA_BIT_RL 0 /* read line buffer enable */ | ||
118 | |||
119 | /* Looks like XLB speculative read generates XLB errors when a buffer | ||
120 | * is at the end of the physical memory. i.e. when accessing the | ||
121 | * lasts words, the engine tries to prefetch the next but there is no | ||
122 | * next ... | ||
123 | */ | ||
124 | #define BCOM_STD_PRAGMA ((0 << BCOM_PRAGMA_BIT_RSV) | \ | ||
125 | (0 << BCOM_PRAGMA_BIT_PRECISE_INC) | \ | ||
126 | (0 << BCOM_PRAGMA_BIT_RST_ERROR_NO) | \ | ||
127 | (0 << BCOM_PRAGMA_BIT_PACK) | \ | ||
128 | (0 << BCOM_PRAGMA_BIT_INTEGER) | \ | ||
129 | (0 << BCOM_PRAGMA_BIT_SPECREAD) | \ | ||
130 | (1 << BCOM_PRAGMA_BIT_CW) | \ | ||
131 | (1 << BCOM_PRAGMA_BIT_RL)) | ||
132 | |||
133 | #define BCOM_PCI_PRAGMA ((0 << BCOM_PRAGMA_BIT_RSV) | \ | ||
134 | (0 << BCOM_PRAGMA_BIT_PRECISE_INC) | \ | ||
135 | (0 << BCOM_PRAGMA_BIT_RST_ERROR_NO) | \ | ||
136 | (0 << BCOM_PRAGMA_BIT_PACK) | \ | ||
137 | (1 << BCOM_PRAGMA_BIT_INTEGER) | \ | ||
138 | (0 << BCOM_PRAGMA_BIT_SPECREAD) | \ | ||
139 | (1 << BCOM_PRAGMA_BIT_CW) | \ | ||
140 | (1 << BCOM_PRAGMA_BIT_RL)) | ||
141 | |||
142 | #define BCOM_ATA_PRAGMA BCOM_STD_PRAGMA | ||
143 | #define BCOM_CRC16_DP_0_PRAGMA BCOM_STD_PRAGMA | ||
144 | #define BCOM_CRC16_DP_1_PRAGMA BCOM_STD_PRAGMA | ||
145 | #define BCOM_FEC_RX_BD_PRAGMA BCOM_STD_PRAGMA | ||
146 | #define BCOM_FEC_TX_BD_PRAGMA BCOM_STD_PRAGMA | ||
147 | #define BCOM_GEN_DP_0_PRAGMA BCOM_STD_PRAGMA | ||
148 | #define BCOM_GEN_DP_1_PRAGMA BCOM_STD_PRAGMA | ||
149 | #define BCOM_GEN_DP_2_PRAGMA BCOM_STD_PRAGMA | ||
150 | #define BCOM_GEN_DP_3_PRAGMA BCOM_STD_PRAGMA | ||
151 | #define BCOM_GEN_DP_BD_0_PRAGMA BCOM_STD_PRAGMA | ||
152 | #define BCOM_GEN_DP_BD_1_PRAGMA BCOM_STD_PRAGMA | ||
153 | #define BCOM_GEN_RX_BD_PRAGMA BCOM_STD_PRAGMA | ||
154 | #define BCOM_GEN_TX_BD_PRAGMA BCOM_STD_PRAGMA | ||
155 | #define BCOM_GEN_LPC_PRAGMA BCOM_STD_PRAGMA | ||
156 | #define BCOM_PCI_RX_PRAGMA BCOM_PCI_PRAGMA | ||
157 | #define BCOM_PCI_TX_PRAGMA BCOM_PCI_PRAGMA | ||
158 | |||
159 | /* Initiators number */ | ||
160 | #define BCOM_INITIATOR_ALWAYS 0 | ||
161 | #define BCOM_INITIATOR_SCTMR_0 1 | ||
162 | #define BCOM_INITIATOR_SCTMR_1 2 | ||
163 | #define BCOM_INITIATOR_FEC_RX 3 | ||
164 | #define BCOM_INITIATOR_FEC_TX 4 | ||
165 | #define BCOM_INITIATOR_ATA_RX 5 | ||
166 | #define BCOM_INITIATOR_ATA_TX 6 | ||
167 | #define BCOM_INITIATOR_SCPCI_RX 7 | ||
168 | #define BCOM_INITIATOR_SCPCI_TX 8 | ||
169 | #define BCOM_INITIATOR_PSC3_RX 9 | ||
170 | #define BCOM_INITIATOR_PSC3_TX 10 | ||
171 | #define BCOM_INITIATOR_PSC2_RX 11 | ||
172 | #define BCOM_INITIATOR_PSC2_TX 12 | ||
173 | #define BCOM_INITIATOR_PSC1_RX 13 | ||
174 | #define BCOM_INITIATOR_PSC1_TX 14 | ||
175 | #define BCOM_INITIATOR_SCTMR_2 15 | ||
176 | #define BCOM_INITIATOR_SCLPC 16 | ||
177 | #define BCOM_INITIATOR_PSC5_RX 17 | ||
178 | #define BCOM_INITIATOR_PSC5_TX 18 | ||
179 | #define BCOM_INITIATOR_PSC4_RX 19 | ||
180 | #define BCOM_INITIATOR_PSC4_TX 20 | ||
181 | #define BCOM_INITIATOR_I2C2_RX 21 | ||
182 | #define BCOM_INITIATOR_I2C2_TX 22 | ||
183 | #define BCOM_INITIATOR_I2C1_RX 23 | ||
184 | #define BCOM_INITIATOR_I2C1_TX 24 | ||
185 | #define BCOM_INITIATOR_PSC6_RX 25 | ||
186 | #define BCOM_INITIATOR_PSC6_TX 26 | ||
187 | #define BCOM_INITIATOR_IRDA_RX 25 | ||
188 | #define BCOM_INITIATOR_IRDA_TX 26 | ||
189 | #define BCOM_INITIATOR_SCTMR_3 27 | ||
190 | #define BCOM_INITIATOR_SCTMR_4 28 | ||
191 | #define BCOM_INITIATOR_SCTMR_5 29 | ||
192 | #define BCOM_INITIATOR_SCTMR_6 30 | ||
193 | #define BCOM_INITIATOR_SCTMR_7 31 | ||
194 | |||
195 | /* Initiators priorities */ | ||
196 | #define BCOM_IPR_ALWAYS 7 | ||
197 | #define BCOM_IPR_SCTMR_0 2 | ||
198 | #define BCOM_IPR_SCTMR_1 2 | ||
199 | #define BCOM_IPR_FEC_RX 6 | ||
200 | #define BCOM_IPR_FEC_TX 5 | ||
201 | #define BCOM_IPR_ATA_RX 4 | ||
202 | #define BCOM_IPR_ATA_TX 3 | ||
203 | #define BCOM_IPR_SCPCI_RX 2 | ||
204 | #define BCOM_IPR_SCPCI_TX 2 | ||
205 | #define BCOM_IPR_PSC3_RX 2 | ||
206 | #define BCOM_IPR_PSC3_TX 2 | ||
207 | #define BCOM_IPR_PSC2_RX 2 | ||
208 | #define BCOM_IPR_PSC2_TX 2 | ||
209 | #define BCOM_IPR_PSC1_RX 2 | ||
210 | #define BCOM_IPR_PSC1_TX 2 | ||
211 | #define BCOM_IPR_SCTMR_2 2 | ||
212 | #define BCOM_IPR_SCLPC 2 | ||
213 | #define BCOM_IPR_PSC5_RX 2 | ||
214 | #define BCOM_IPR_PSC5_TX 2 | ||
215 | #define BCOM_IPR_PSC4_RX 2 | ||
216 | #define BCOM_IPR_PSC4_TX 2 | ||
217 | #define BCOM_IPR_I2C2_RX 2 | ||
218 | #define BCOM_IPR_I2C2_TX 2 | ||
219 | #define BCOM_IPR_I2C1_RX 2 | ||
220 | #define BCOM_IPR_I2C1_TX 2 | ||
221 | #define BCOM_IPR_PSC6_RX 2 | ||
222 | #define BCOM_IPR_PSC6_TX 2 | ||
223 | #define BCOM_IPR_IRDA_RX 2 | ||
224 | #define BCOM_IPR_IRDA_TX 2 | ||
225 | #define BCOM_IPR_SCTMR_3 2 | ||
226 | #define BCOM_IPR_SCTMR_4 2 | ||
227 | #define BCOM_IPR_SCTMR_5 2 | ||
228 | #define BCOM_IPR_SCTMR_6 2 | ||
229 | #define BCOM_IPR_SCTMR_7 2 | ||
230 | |||
231 | |||
232 | /* ======================================================================== */ | ||
233 | /* API */ | ||
234 | /* ======================================================================== */ | ||
235 | |||
236 | extern struct bcom_task *bcom_task_alloc(int bd_count, int bd_size, int priv_size); | ||
237 | extern void bcom_task_free(struct bcom_task *tsk); | ||
238 | extern int bcom_load_image(int task, u32 *task_image); | ||
239 | extern void bcom_set_initiator(int task, int initiator); | ||
240 | |||
241 | |||
242 | #define TASK_ENABLE 0x8000 | ||
243 | |||
244 | static inline void | ||
245 | bcom_enable_task(int task) | ||
246 | { | ||
247 | u16 reg; | ||
248 | reg = in_be16(&bcom_eng->regs->tcr[task]); | ||
249 | out_be16(&bcom_eng->regs->tcr[task], reg | TASK_ENABLE); | ||
250 | } | ||
251 | |||
252 | static inline void | ||
253 | bcom_disable_task(int task) | ||
254 | { | ||
255 | u16 reg = in_be16(&bcom_eng->regs->tcr[task]); | ||
256 | out_be16(&bcom_eng->regs->tcr[task], reg & ~TASK_ENABLE); | ||
257 | } | ||
258 | |||
259 | |||
260 | static inline u32 * | ||
261 | bcom_task_desc(int task) | ||
262 | { | ||
263 | return bcom_sram_pa2va(bcom_eng->tdt[task].start); | ||
264 | } | ||
265 | |||
266 | static inline int | ||
267 | bcom_task_num_descs(int task) | ||
268 | { | ||
269 | return (bcom_eng->tdt[task].stop - bcom_eng->tdt[task].start)/sizeof(u32) + 1; | ||
270 | } | ||
271 | |||
272 | static inline u32 * | ||
273 | bcom_task_var(int task) | ||
274 | { | ||
275 | return bcom_sram_pa2va(bcom_eng->tdt[task].var); | ||
276 | } | ||
277 | |||
278 | static inline u32 * | ||
279 | bcom_task_inc(int task) | ||
280 | { | ||
281 | return &bcom_task_var(task)[BCOM_MAX_VAR]; | ||
282 | } | ||
283 | |||
284 | |||
285 | static inline int | ||
286 | bcom_drd_is_extended(u32 desc) | ||
287 | { | ||
288 | return (desc) & BCOM_DRD_EXTENDED; | ||
289 | } | ||
290 | |||
291 | static inline int | ||
292 | bcom_desc_is_drd(u32 desc) | ||
293 | { | ||
294 | return !(desc & BCOM_LCD_MASK) && desc != BCOM_DESC_NOP; | ||
295 | } | ||
296 | |||
297 | static inline int | ||
298 | bcom_desc_initiator(u32 desc) | ||
299 | { | ||
300 | return (desc >> BCOM_DRD_INITIATOR_SHIFT) & 0x1f; | ||
301 | } | ||
302 | |||
303 | static inline void | ||
304 | bcom_set_desc_initiator(u32 *desc, int initiator) | ||
305 | { | ||
306 | *desc = (*desc & ~(0x1f << BCOM_DRD_INITIATOR_SHIFT)) | | ||
307 | ((initiator & 0x1f) << BCOM_DRD_INITIATOR_SHIFT); | ||
308 | } | ||
309 | |||
310 | |||
311 | static inline void | ||
312 | bcom_set_task_pragma(int task, int pragma) | ||
313 | { | ||
314 | u32 *fdt = &bcom_eng->tdt[task].fdt; | ||
315 | *fdt = (*fdt & ~0xff) | pragma; | ||
316 | } | ||
317 | |||
318 | static inline void | ||
319 | bcom_set_task_auto_start(int task, int next_task) | ||
320 | { | ||
321 | u16 __iomem *tcr = &bcom_eng->regs->tcr[task]; | ||
322 | out_be16(tcr, (in_be16(tcr) & ~0xff) | 0x00c0 | next_task); | ||
323 | } | ||
324 | |||
325 | static inline void | ||
326 | bcom_set_tcr_initiator(int task, int initiator) | ||
327 | { | ||
328 | u16 __iomem *tcr = &bcom_eng->regs->tcr[task]; | ||
329 | out_be16(tcr, (in_be16(tcr) & ~0x1f00) | ((initiator & 0x1f) << 8)); | ||
330 | } | ||
331 | |||
332 | |||
333 | #endif /* __BESTCOMM_PRIV_H__ */ | ||
334 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/fec.c b/arch/powerpc/sysdev/bestcomm/fec.c new file mode 100644 index 000000000000..957a988d23ea --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/fec.c | |||
@@ -0,0 +1,270 @@ | |||
1 | /* | ||
2 | * Bestcomm FEC tasks driver | ||
3 | * | ||
4 | * | ||
5 | * Copyright (C) 2006-2007 Sylvain Munaut <tnt@246tNt.com> | ||
6 | * Copyright (C) 2003-2004 MontaVista, Software, Inc. | ||
7 | * ( by Dale Farnsworth <dfarnsworth@mvista.com> ) | ||
8 | * | ||
9 | * This file is licensed under the terms of the GNU General Public License | ||
10 | * version 2. This program is licensed "as is" without any warranty of any | ||
11 | * kind, whether express or implied. | ||
12 | */ | ||
13 | |||
14 | #include <linux/kernel.h> | ||
15 | #include <linux/module.h> | ||
16 | #include <linux/types.h> | ||
17 | #include <asm/io.h> | ||
18 | |||
19 | #include "bestcomm.h" | ||
20 | #include "bestcomm_priv.h" | ||
21 | #include "fec.h" | ||
22 | |||
23 | |||
24 | /* ======================================================================== */ | ||
25 | /* Task image/var/inc */ | ||
26 | /* ======================================================================== */ | ||
27 | |||
28 | /* fec tasks images */ | ||
29 | extern u32 bcom_fec_rx_task[]; | ||
30 | extern u32 bcom_fec_tx_task[]; | ||
31 | |||
32 | /* rx task vars that need to be set before enabling the task */ | ||
33 | struct bcom_fec_rx_var { | ||
34 | u32 enable; /* (u16*) address of task's control register */ | ||
35 | u32 fifo; /* (u32*) address of fec's fifo */ | ||
36 | u32 bd_base; /* (struct bcom_bd*) beginning of ring buffer */ | ||
37 | u32 bd_last; /* (struct bcom_bd*) end of ring buffer */ | ||
38 | u32 bd_start; /* (struct bcom_bd*) current bd */ | ||
39 | u32 buffer_size; /* size of receive buffer */ | ||
40 | }; | ||
41 | |||
42 | /* rx task incs that need to be set before enabling the task */ | ||
43 | struct bcom_fec_rx_inc { | ||
44 | u16 pad0; | ||
45 | s16 incr_bytes; | ||
46 | u16 pad1; | ||
47 | s16 incr_dst; | ||
48 | u16 pad2; | ||
49 | s16 incr_dst_ma; | ||
50 | }; | ||
51 | |||
52 | /* tx task vars that need to be set before enabling the task */ | ||
53 | struct bcom_fec_tx_var { | ||
54 | u32 DRD; /* (u32*) address of self-modified DRD */ | ||
55 | u32 fifo; /* (u32*) address of fec's fifo */ | ||
56 | u32 enable; /* (u16*) address of task's control register */ | ||
57 | u32 bd_base; /* (struct bcom_bd*) beginning of ring buffer */ | ||
58 | u32 bd_last; /* (struct bcom_bd*) end of ring buffer */ | ||
59 | u32 bd_start; /* (struct bcom_bd*) current bd */ | ||
60 | u32 buffer_size; /* set by uCode for each packet */ | ||
61 | }; | ||
62 | |||
63 | /* tx task incs that need to be set before enabling the task */ | ||
64 | struct bcom_fec_tx_inc { | ||
65 | u16 pad0; | ||
66 | s16 incr_bytes; | ||
67 | u16 pad1; | ||
68 | s16 incr_src; | ||
69 | u16 pad2; | ||
70 | s16 incr_src_ma; | ||
71 | }; | ||
72 | |||
73 | /* private structure in the task */ | ||
74 | struct bcom_fec_priv { | ||
75 | phys_addr_t fifo; | ||
76 | int maxbufsize; | ||
77 | }; | ||
78 | |||
79 | |||
80 | /* ======================================================================== */ | ||
81 | /* Task support code */ | ||
82 | /* ======================================================================== */ | ||
83 | |||
84 | struct bcom_task * | ||
85 | bcom_fec_rx_init(int queue_len, phys_addr_t fifo, int maxbufsize) | ||
86 | { | ||
87 | struct bcom_task *tsk; | ||
88 | struct bcom_fec_priv *priv; | ||
89 | |||
90 | tsk = bcom_task_alloc(queue_len, sizeof(struct bcom_fec_bd), | ||
91 | sizeof(struct bcom_fec_priv)); | ||
92 | if (!tsk) | ||
93 | return NULL; | ||
94 | |||
95 | tsk->flags = BCOM_FLAGS_NONE; | ||
96 | |||
97 | priv = tsk->priv; | ||
98 | priv->fifo = fifo; | ||
99 | priv->maxbufsize = maxbufsize; | ||
100 | |||
101 | if (bcom_fec_rx_reset(tsk)) { | ||
102 | bcom_task_free(tsk); | ||
103 | return NULL; | ||
104 | } | ||
105 | |||
106 | return tsk; | ||
107 | } | ||
108 | EXPORT_SYMBOL_GPL(bcom_fec_rx_init); | ||
109 | |||
110 | int | ||
111 | bcom_fec_rx_reset(struct bcom_task *tsk) | ||
112 | { | ||
113 | struct bcom_fec_priv *priv = tsk->priv; | ||
114 | struct bcom_fec_rx_var *var; | ||
115 | struct bcom_fec_rx_inc *inc; | ||
116 | |||
117 | /* Shutdown the task */ | ||
118 | bcom_disable_task(tsk->tasknum); | ||
119 | |||
120 | /* Reset the microcode */ | ||
121 | var = (struct bcom_fec_rx_var *) bcom_task_var(tsk->tasknum); | ||
122 | inc = (struct bcom_fec_rx_inc *) bcom_task_inc(tsk->tasknum); | ||
123 | |||
124 | if (bcom_load_image(tsk->tasknum, bcom_fec_rx_task)) | ||
125 | return -1; | ||
126 | |||
127 | var->enable = bcom_eng->regs_base + | ||
128 | offsetof(struct mpc52xx_sdma, tcr[tsk->tasknum]); | ||
129 | var->fifo = (u32) priv->fifo; | ||
130 | var->bd_base = tsk->bd_pa; | ||
131 | var->bd_last = tsk->bd_pa + ((tsk->num_bd-1) * tsk->bd_size); | ||
132 | var->bd_start = tsk->bd_pa; | ||
133 | var->buffer_size = priv->maxbufsize; | ||
134 | |||
135 | inc->incr_bytes = -(s16)sizeof(u32); /* These should be in the */ | ||
136 | inc->incr_dst = sizeof(u32); /* task image, but we stick */ | ||
137 | inc->incr_dst_ma= sizeof(u8); /* to the official ones */ | ||
138 | |||
139 | /* Reset the BDs */ | ||
140 | tsk->index = 0; | ||
141 | tsk->outdex = 0; | ||
142 | |||
143 | memset(tsk->bd, 0x00, tsk->num_bd * tsk->bd_size); | ||
144 | |||
145 | /* Configure some stuff */ | ||
146 | bcom_set_task_pragma(tsk->tasknum, BCOM_FEC_RX_BD_PRAGMA); | ||
147 | bcom_set_task_auto_start(tsk->tasknum, tsk->tasknum); | ||
148 | |||
149 | out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_FEC_RX], BCOM_IPR_FEC_RX); | ||
150 | |||
151 | out_be32(&bcom_eng->regs->IntPend, 1<<tsk->tasknum); /* Clear ints */ | ||
152 | |||
153 | return 0; | ||
154 | } | ||
155 | EXPORT_SYMBOL_GPL(bcom_fec_rx_reset); | ||
156 | |||
157 | void | ||
158 | bcom_fec_rx_release(struct bcom_task *tsk) | ||
159 | { | ||
160 | /* Nothing special for the FEC tasks */ | ||
161 | bcom_task_free(tsk); | ||
162 | } | ||
163 | EXPORT_SYMBOL_GPL(bcom_fec_rx_release); | ||
164 | |||
165 | |||
166 | |||
167 | /* Return 2nd to last DRD */ | ||
168 | /* This is an ugly hack, but at least it's only done | ||
169 | once at initialization */ | ||
170 | static u32 *self_modified_drd(int tasknum) | ||
171 | { | ||
172 | u32 *desc; | ||
173 | int num_descs; | ||
174 | int drd_count; | ||
175 | int i; | ||
176 | |||
177 | num_descs = bcom_task_num_descs(tasknum); | ||
178 | desc = bcom_task_desc(tasknum) + num_descs - 1; | ||
179 | drd_count = 0; | ||
180 | for (i=0; i<num_descs; i++, desc--) | ||
181 | if (bcom_desc_is_drd(*desc) && ++drd_count == 3) | ||
182 | break; | ||
183 | return desc; | ||
184 | } | ||
185 | |||
186 | struct bcom_task * | ||
187 | bcom_fec_tx_init(int queue_len, phys_addr_t fifo) | ||
188 | { | ||
189 | struct bcom_task *tsk; | ||
190 | struct bcom_fec_priv *priv; | ||
191 | |||
192 | tsk = bcom_task_alloc(queue_len, sizeof(struct bcom_fec_bd), | ||
193 | sizeof(struct bcom_fec_priv)); | ||
194 | if (!tsk) | ||
195 | return NULL; | ||
196 | |||
197 | tsk->flags = BCOM_FLAGS_ENABLE_TASK; | ||
198 | |||
199 | priv = tsk->priv; | ||
200 | priv->fifo = fifo; | ||
201 | |||
202 | if (bcom_fec_tx_reset(tsk)) { | ||
203 | bcom_task_free(tsk); | ||
204 | return NULL; | ||
205 | } | ||
206 | |||
207 | return tsk; | ||
208 | } | ||
209 | EXPORT_SYMBOL_GPL(bcom_fec_tx_init); | ||
210 | |||
211 | int | ||
212 | bcom_fec_tx_reset(struct bcom_task *tsk) | ||
213 | { | ||
214 | struct bcom_fec_priv *priv = tsk->priv; | ||
215 | struct bcom_fec_tx_var *var; | ||
216 | struct bcom_fec_tx_inc *inc; | ||
217 | |||
218 | /* Shutdown the task */ | ||
219 | bcom_disable_task(tsk->tasknum); | ||
220 | |||
221 | /* Reset the microcode */ | ||
222 | var = (struct bcom_fec_tx_var *) bcom_task_var(tsk->tasknum); | ||
223 | inc = (struct bcom_fec_tx_inc *) bcom_task_inc(tsk->tasknum); | ||
224 | |||
225 | if (bcom_load_image(tsk->tasknum, bcom_fec_tx_task)) | ||
226 | return -1; | ||
227 | |||
228 | var->enable = bcom_eng->regs_base + | ||
229 | offsetof(struct mpc52xx_sdma, tcr[tsk->tasknum]); | ||
230 | var->fifo = (u32) priv->fifo; | ||
231 | var->DRD = bcom_sram_va2pa(self_modified_drd(tsk->tasknum)); | ||
232 | var->bd_base = tsk->bd_pa; | ||
233 | var->bd_last = tsk->bd_pa + ((tsk->num_bd-1) * tsk->bd_size); | ||
234 | var->bd_start = tsk->bd_pa; | ||
235 | |||
236 | inc->incr_bytes = -(s16)sizeof(u32); /* These should be in the */ | ||
237 | inc->incr_src = sizeof(u32); /* task image, but we stick */ | ||
238 | inc->incr_src_ma= sizeof(u8); /* to the official ones */ | ||
239 | |||
240 | /* Reset the BDs */ | ||
241 | tsk->index = 0; | ||
242 | tsk->outdex = 0; | ||
243 | |||
244 | memset(tsk->bd, 0x00, tsk->num_bd * tsk->bd_size); | ||
245 | |||
246 | /* Configure some stuff */ | ||
247 | bcom_set_task_pragma(tsk->tasknum, BCOM_FEC_TX_BD_PRAGMA); | ||
248 | bcom_set_task_auto_start(tsk->tasknum, tsk->tasknum); | ||
249 | |||
250 | out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_FEC_TX], BCOM_IPR_FEC_TX); | ||
251 | |||
252 | out_be32(&bcom_eng->regs->IntPend, 1<<tsk->tasknum); /* Clear ints */ | ||
253 | |||
254 | return 0; | ||
255 | } | ||
256 | EXPORT_SYMBOL_GPL(bcom_fec_tx_reset); | ||
257 | |||
258 | void | ||
259 | bcom_fec_tx_release(struct bcom_task *tsk) | ||
260 | { | ||
261 | /* Nothing special for the FEC tasks */ | ||
262 | bcom_task_free(tsk); | ||
263 | } | ||
264 | EXPORT_SYMBOL_GPL(bcom_fec_tx_release); | ||
265 | |||
266 | |||
267 | MODULE_DESCRIPTION("BestComm FEC tasks driver"); | ||
268 | MODULE_AUTHOR("Dale Farnsworth <dfarnsworth@mvista.com>"); | ||
269 | MODULE_LICENSE("GPL v2"); | ||
270 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/fec.h b/arch/powerpc/sysdev/bestcomm/fec.h new file mode 100644 index 000000000000..ee565d94d503 --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/fec.h | |||
@@ -0,0 +1,61 @@ | |||
1 | /* | ||
2 | * Header for Bestcomm FEC tasks driver | ||
3 | * | ||
4 | * | ||
5 | * Copyright (C) 2006-2007 Sylvain Munaut <tnt@246tNt.com> | ||
6 | * Copyright (C) 2003-2004 MontaVista, Software, Inc. | ||
7 | * ( by Dale Farnsworth <dfarnsworth@mvista.com> ) | ||
8 | * | ||
9 | * This file is licensed under the terms of the GNU General Public License | ||
10 | * version 2. This program is licensed "as is" without any warranty of any | ||
11 | * kind, whether express or implied. | ||
12 | */ | ||
13 | |||
14 | #ifndef __BESTCOMM_FEC_H__ | ||
15 | #define __BESTCOMM_FEC_H__ | ||
16 | |||
17 | |||
18 | struct bcom_fec_bd { | ||
19 | u32 status; | ||
20 | u32 skb_pa; | ||
21 | }; | ||
22 | |||
23 | #define BCOM_FEC_TX_BD_TFD 0x08000000ul /* transmit frame done */ | ||
24 | #define BCOM_FEC_TX_BD_TC 0x04000000ul /* transmit CRC */ | ||
25 | #define BCOM_FEC_TX_BD_ABC 0x02000000ul /* append bad CRC */ | ||
26 | |||
27 | #define BCOM_FEC_RX_BD_L 0x08000000ul /* buffer is last in frame */ | ||
28 | #define BCOM_FEC_RX_BD_BC 0x00800000ul /* DA is broadcast */ | ||
29 | #define BCOM_FEC_RX_BD_MC 0x00400000ul /* DA is multicast and not broadcast */ | ||
30 | #define BCOM_FEC_RX_BD_LG 0x00200000ul /* Rx frame length violation */ | ||
31 | #define BCOM_FEC_RX_BD_NO 0x00100000ul /* Rx non-octet aligned frame */ | ||
32 | #define BCOM_FEC_RX_BD_CR 0x00040000ul /* Rx CRC error */ | ||
33 | #define BCOM_FEC_RX_BD_OV 0x00020000ul /* overrun */ | ||
34 | #define BCOM_FEC_RX_BD_TR 0x00010000ul /* Rx frame truncated */ | ||
35 | #define BCOM_FEC_RX_BD_LEN_MASK 0x000007fful /* mask for length of received frame */ | ||
36 | #define BCOM_FEC_RX_BD_ERRORS (BCOM_FEC_RX_BD_LG | BCOM_FEC_RX_BD_NO | \ | ||
37 | BCOM_FEC_RX_BD_CR | BCOM_FEC_RX_BD_OV | BCOM_FEC_RX_BD_TR) | ||
38 | |||
39 | |||
40 | extern struct bcom_task * | ||
41 | bcom_fec_rx_init(int queue_len, phys_addr_t fifo, int maxbufsize); | ||
42 | |||
43 | extern int | ||
44 | bcom_fec_rx_reset(struct bcom_task *tsk); | ||
45 | |||
46 | extern void | ||
47 | bcom_fec_rx_release(struct bcom_task *tsk); | ||
48 | |||
49 | |||
50 | extern struct bcom_task * | ||
51 | bcom_fec_tx_init(int queue_len, phys_addr_t fifo); | ||
52 | |||
53 | extern int | ||
54 | bcom_fec_tx_reset(struct bcom_task *tsk); | ||
55 | |||
56 | extern void | ||
57 | bcom_fec_tx_release(struct bcom_task *tsk); | ||
58 | |||
59 | |||
60 | #endif /* __BESTCOMM_FEC_H__ */ | ||
61 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/gen_bd.c b/arch/powerpc/sysdev/bestcomm/gen_bd.c new file mode 100644 index 000000000000..8d33eafbb3f4 --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/gen_bd.c | |||
@@ -0,0 +1,260 @@ | |||
1 | /* | ||
2 | * Driver for MPC52xx processor BestComm General Buffer Descriptor | ||
3 | * | ||
4 | * Copyright (C) 2007 Sylvain Munaut <tnt@246tNt.com> | ||
5 | * Copyright (C) 2006 AppSpec Computer Technologies Corp. | ||
6 | * Jeff Gibbons <jeff.gibbons@appspec.com> | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify it | ||
9 | * under the terms of the GNU General Public License version 2 as published | ||
10 | * by the Free Software Foundation. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #include <linux/version.h> | ||
15 | #include <linux/module.h> | ||
16 | #include <linux/kernel.h> | ||
17 | #include <linux/string.h> | ||
18 | #include <linux/types.h> | ||
19 | #include <asm/errno.h> | ||
20 | #include <asm/io.h> | ||
21 | |||
22 | #include <asm/mpc52xx.h> | ||
23 | |||
24 | #include "bestcomm.h" | ||
25 | #include "bestcomm_priv.h" | ||
26 | #include "gen_bd.h" | ||
27 | |||
28 | |||
29 | /* ======================================================================== */ | ||
30 | /* Task image/var/inc */ | ||
31 | /* ======================================================================== */ | ||
32 | |||
33 | /* gen_bd tasks images */ | ||
34 | extern u32 bcom_gen_bd_rx_task[]; | ||
35 | extern u32 bcom_gen_bd_tx_task[]; | ||
36 | |||
37 | /* rx task vars that need to be set before enabling the task */ | ||
38 | struct bcom_gen_bd_rx_var { | ||
39 | u32 enable; /* (u16*) address of task's control register */ | ||
40 | u32 fifo; /* (u32*) address of gen_bd's fifo */ | ||
41 | u32 bd_base; /* (struct bcom_bd*) beginning of ring buffer */ | ||
42 | u32 bd_last; /* (struct bcom_bd*) end of ring buffer */ | ||
43 | u32 bd_start; /* (struct bcom_bd*) current bd */ | ||
44 | u32 buffer_size; /* size of receive buffer */ | ||
45 | }; | ||
46 | |||
47 | /* rx task incs that need to be set before enabling the task */ | ||
48 | struct bcom_gen_bd_rx_inc { | ||
49 | u16 pad0; | ||
50 | s16 incr_bytes; | ||
51 | u16 pad1; | ||
52 | s16 incr_dst; | ||
53 | }; | ||
54 | |||
55 | /* tx task vars that need to be set before enabling the task */ | ||
56 | struct bcom_gen_bd_tx_var { | ||
57 | u32 fifo; /* (u32*) address of gen_bd's fifo */ | ||
58 | u32 enable; /* (u16*) address of task's control register */ | ||
59 | u32 bd_base; /* (struct bcom_bd*) beginning of ring buffer */ | ||
60 | u32 bd_last; /* (struct bcom_bd*) end of ring buffer */ | ||
61 | u32 bd_start; /* (struct bcom_bd*) current bd */ | ||
62 | u32 buffer_size; /* set by uCode for each packet */ | ||
63 | }; | ||
64 | |||
65 | /* tx task incs that need to be set before enabling the task */ | ||
66 | struct bcom_gen_bd_tx_inc { | ||
67 | u16 pad0; | ||
68 | s16 incr_bytes; | ||
69 | u16 pad1; | ||
70 | s16 incr_src; | ||
71 | u16 pad2; | ||
72 | s16 incr_src_ma; | ||
73 | }; | ||
74 | |||
75 | /* private structure */ | ||
76 | struct bcom_gen_bd_priv { | ||
77 | phys_addr_t fifo; | ||
78 | int initiator; | ||
79 | int ipr; | ||
80 | int maxbufsize; | ||
81 | }; | ||
82 | |||
83 | |||
84 | /* ======================================================================== */ | ||
85 | /* Task support code */ | ||
86 | /* ======================================================================== */ | ||
87 | |||
88 | struct bcom_task * | ||
89 | bcom_gen_bd_rx_init(int queue_len, phys_addr_t fifo, | ||
90 | int initiator, int ipr, int maxbufsize) | ||
91 | { | ||
92 | struct bcom_task *tsk; | ||
93 | struct bcom_gen_bd_priv *priv; | ||
94 | |||
95 | tsk = bcom_task_alloc(queue_len, sizeof(struct bcom_gen_bd), | ||
96 | sizeof(struct bcom_gen_bd_priv)); | ||
97 | if (!tsk) | ||
98 | return NULL; | ||
99 | |||
100 | tsk->flags = BCOM_FLAGS_NONE; | ||
101 | |||
102 | priv = tsk->priv; | ||
103 | priv->fifo = fifo; | ||
104 | priv->initiator = initiator; | ||
105 | priv->ipr = ipr; | ||
106 | priv->maxbufsize = maxbufsize; | ||
107 | |||
108 | if (bcom_gen_bd_rx_reset(tsk)) { | ||
109 | bcom_task_free(tsk); | ||
110 | return NULL; | ||
111 | } | ||
112 | |||
113 | return tsk; | ||
114 | } | ||
115 | EXPORT_SYMBOL_GPL(bcom_gen_bd_rx_init); | ||
116 | |||
117 | int | ||
118 | bcom_gen_bd_rx_reset(struct bcom_task *tsk) | ||
119 | { | ||
120 | struct bcom_gen_bd_priv *priv = tsk->priv; | ||
121 | struct bcom_gen_bd_rx_var *var; | ||
122 | struct bcom_gen_bd_rx_inc *inc; | ||
123 | |||
124 | /* Shutdown the task */ | ||
125 | bcom_disable_task(tsk->tasknum); | ||
126 | |||
127 | /* Reset the microcode */ | ||
128 | var = (struct bcom_gen_bd_rx_var *) bcom_task_var(tsk->tasknum); | ||
129 | inc = (struct bcom_gen_bd_rx_inc *) bcom_task_inc(tsk->tasknum); | ||
130 | |||
131 | if (bcom_load_image(tsk->tasknum, bcom_gen_bd_rx_task)) | ||
132 | return -1; | ||
133 | |||
134 | var->enable = bcom_eng->regs_base + | ||
135 | offsetof(struct mpc52xx_sdma, tcr[tsk->tasknum]); | ||
136 | var->fifo = (u32) priv->fifo; | ||
137 | var->bd_base = tsk->bd_pa; | ||
138 | var->bd_last = tsk->bd_pa + ((tsk->num_bd-1) * tsk->bd_size); | ||
139 | var->bd_start = tsk->bd_pa; | ||
140 | var->buffer_size = priv->maxbufsize; | ||
141 | |||
142 | inc->incr_bytes = -(s16)sizeof(u32); | ||
143 | inc->incr_dst = sizeof(u32); | ||
144 | |||
145 | /* Reset the BDs */ | ||
146 | tsk->index = 0; | ||
147 | tsk->outdex = 0; | ||
148 | |||
149 | memset(tsk->bd, 0x00, tsk->num_bd * tsk->bd_size); | ||
150 | |||
151 | /* Configure some stuff */ | ||
152 | bcom_set_task_pragma(tsk->tasknum, BCOM_GEN_RX_BD_PRAGMA); | ||
153 | bcom_set_task_auto_start(tsk->tasknum, tsk->tasknum); | ||
154 | |||
155 | out_8(&bcom_eng->regs->ipr[priv->initiator], priv->ipr); | ||
156 | bcom_set_initiator(tsk->tasknum, priv->initiator); | ||
157 | |||
158 | out_be32(&bcom_eng->regs->IntPend, 1<<tsk->tasknum); /* Clear ints */ | ||
159 | |||
160 | return 0; | ||
161 | } | ||
162 | EXPORT_SYMBOL_GPL(bcom_gen_bd_rx_reset); | ||
163 | |||
164 | void | ||
165 | bcom_gen_bd_rx_release(struct bcom_task *tsk) | ||
166 | { | ||
167 | /* Nothing special for the GenBD tasks */ | ||
168 | bcom_task_free(tsk); | ||
169 | } | ||
170 | EXPORT_SYMBOL_GPL(bcom_gen_bd_rx_release); | ||
171 | |||
172 | |||
173 | extern struct bcom_task * | ||
174 | bcom_gen_bd_tx_init(int queue_len, phys_addr_t fifo, | ||
175 | int initiator, int ipr) | ||
176 | { | ||
177 | struct bcom_task *tsk; | ||
178 | struct bcom_gen_bd_priv *priv; | ||
179 | |||
180 | tsk = bcom_task_alloc(queue_len, sizeof(struct bcom_gen_bd), | ||
181 | sizeof(struct bcom_gen_bd_priv)); | ||
182 | if (!tsk) | ||
183 | return NULL; | ||
184 | |||
185 | tsk->flags = BCOM_FLAGS_NONE; | ||
186 | |||
187 | priv = tsk->priv; | ||
188 | priv->fifo = fifo; | ||
189 | priv->initiator = initiator; | ||
190 | priv->ipr = ipr; | ||
191 | |||
192 | if (bcom_gen_bd_tx_reset(tsk)) { | ||
193 | bcom_task_free(tsk); | ||
194 | return NULL; | ||
195 | } | ||
196 | |||
197 | return tsk; | ||
198 | } | ||
199 | EXPORT_SYMBOL_GPL(bcom_gen_bd_tx_init); | ||
200 | |||
201 | int | ||
202 | bcom_gen_bd_tx_reset(struct bcom_task *tsk) | ||
203 | { | ||
204 | struct bcom_gen_bd_priv *priv = tsk->priv; | ||
205 | struct bcom_gen_bd_tx_var *var; | ||
206 | struct bcom_gen_bd_tx_inc *inc; | ||
207 | |||
208 | /* Shutdown the task */ | ||
209 | bcom_disable_task(tsk->tasknum); | ||
210 | |||
211 | /* Reset the microcode */ | ||
212 | var = (struct bcom_gen_bd_tx_var *) bcom_task_var(tsk->tasknum); | ||
213 | inc = (struct bcom_gen_bd_tx_inc *) bcom_task_inc(tsk->tasknum); | ||
214 | |||
215 | if (bcom_load_image(tsk->tasknum, bcom_gen_bd_tx_task)) | ||
216 | return -1; | ||
217 | |||
218 | var->enable = bcom_eng->regs_base + | ||
219 | offsetof(struct mpc52xx_sdma, tcr[tsk->tasknum]); | ||
220 | var->fifo = (u32) priv->fifo; | ||
221 | var->bd_base = tsk->bd_pa; | ||
222 | var->bd_last = tsk->bd_pa + ((tsk->num_bd-1) * tsk->bd_size); | ||
223 | var->bd_start = tsk->bd_pa; | ||
224 | |||
225 | inc->incr_bytes = -(s16)sizeof(u32); | ||
226 | inc->incr_src = sizeof(u32); | ||
227 | inc->incr_src_ma = sizeof(u8); | ||
228 | |||
229 | /* Reset the BDs */ | ||
230 | tsk->index = 0; | ||
231 | tsk->outdex = 0; | ||
232 | |||
233 | memset(tsk->bd, 0x00, tsk->num_bd * tsk->bd_size); | ||
234 | |||
235 | /* Configure some stuff */ | ||
236 | bcom_set_task_pragma(tsk->tasknum, BCOM_GEN_TX_BD_PRAGMA); | ||
237 | bcom_set_task_auto_start(tsk->tasknum, tsk->tasknum); | ||
238 | |||
239 | out_8(&bcom_eng->regs->ipr[priv->initiator], priv->ipr); | ||
240 | bcom_set_initiator(tsk->tasknum, priv->initiator); | ||
241 | |||
242 | out_be32(&bcom_eng->regs->IntPend, 1<<tsk->tasknum); /* Clear ints */ | ||
243 | |||
244 | return 0; | ||
245 | } | ||
246 | EXPORT_SYMBOL_GPL(bcom_gen_bd_tx_reset); | ||
247 | |||
248 | void | ||
249 | bcom_gen_bd_tx_release(struct bcom_task *tsk) | ||
250 | { | ||
251 | /* Nothing special for the GenBD tasks */ | ||
252 | bcom_task_free(tsk); | ||
253 | } | ||
254 | EXPORT_SYMBOL_GPL(bcom_gen_bd_tx_release); | ||
255 | |||
256 | |||
257 | MODULE_DESCRIPTION("BestComm General Buffer Descriptor tasks driver"); | ||
258 | MODULE_AUTHOR("Jeff Gibbons <jeff.gibbons@appspec.com>"); | ||
259 | MODULE_LICENSE("GPL v2"); | ||
260 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/gen_bd.h b/arch/powerpc/sysdev/bestcomm/gen_bd.h new file mode 100644 index 000000000000..5b6fa803c6aa --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/gen_bd.h | |||
@@ -0,0 +1,48 @@ | |||
1 | /* | ||
2 | * Header for Bestcomm General Buffer Descriptor tasks driver | ||
3 | * | ||
4 | * | ||
5 | * Copyright (C) 2007 Sylvain Munaut <tnt@246tNt.com> | ||
6 | * Copyright (C) 2006 AppSpec Computer Technologies Corp. | ||
7 | * Jeff Gibbons <jeff.gibbons@appspec.com> | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify it | ||
10 | * under the terms of the GNU General Public License version 2 as published | ||
11 | * by the Free Software Foundation. | ||
12 | * | ||
13 | * | ||
14 | */ | ||
15 | |||
16 | #ifndef __BESTCOMM_GEN_BD_H__ | ||
17 | #define __BESTCOMM_GEN_BD_H__ | ||
18 | |||
19 | struct bcom_gen_bd { | ||
20 | u32 status; | ||
21 | u32 buf_pa; | ||
22 | }; | ||
23 | |||
24 | |||
25 | extern struct bcom_task * | ||
26 | bcom_gen_bd_rx_init(int queue_len, phys_addr_t fifo, | ||
27 | int initiator, int ipr, int maxbufsize); | ||
28 | |||
29 | extern int | ||
30 | bcom_gen_bd_rx_reset(struct bcom_task *tsk); | ||
31 | |||
32 | extern void | ||
33 | bcom_gen_bd_rx_release(struct bcom_task *tsk); | ||
34 | |||
35 | |||
36 | extern struct bcom_task * | ||
37 | bcom_gen_bd_tx_init(int queue_len, phys_addr_t fifo, | ||
38 | int initiator, int ipr); | ||
39 | |||
40 | extern int | ||
41 | bcom_gen_bd_tx_reset(struct bcom_task *tsk); | ||
42 | |||
43 | extern void | ||
44 | bcom_gen_bd_tx_release(struct bcom_task *tsk); | ||
45 | |||
46 | |||
47 | #endif /* __BESTCOMM_GEN_BD_H__ */ | ||
48 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/sram.c b/arch/powerpc/sysdev/bestcomm/sram.c new file mode 100644 index 000000000000..99784383a843 --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/sram.c | |||
@@ -0,0 +1,177 @@ | |||
1 | /* | ||
2 | * Simple memory allocator for on-board SRAM | ||
3 | * | ||
4 | * | ||
5 | * Maintainer : Sylvain Munaut <tnt@246tNt.com> | ||
6 | * | ||
7 | * Copyright (C) 2005 Sylvain Munaut <tnt@246tNt.com> | ||
8 | * | ||
9 | * This file is licensed under the terms of the GNU General Public License | ||
10 | * version 2. This program is licensed "as is" without any warranty of any | ||
11 | * kind, whether express or implied. | ||
12 | */ | ||
13 | |||
14 | #include <linux/kernel.h> | ||
15 | #include <linux/module.h> | ||
16 | #include <linux/slab.h> | ||
17 | #include <linux/spinlock.h> | ||
18 | #include <linux/string.h> | ||
19 | #include <linux/ioport.h> | ||
20 | #include <linux/of.h> | ||
21 | |||
22 | #include <asm/io.h> | ||
23 | #include <asm/mmu.h> | ||
24 | |||
25 | #include "sram.h" | ||
26 | |||
27 | |||
28 | /* Struct keeping our 'state' */ | ||
29 | struct bcom_sram *bcom_sram = NULL; | ||
30 | EXPORT_SYMBOL_GPL(bcom_sram); /* needed for inline functions */ | ||
31 | |||
32 | |||
33 | /* ======================================================================== */ | ||
34 | /* Public API */ | ||
35 | /* ======================================================================== */ | ||
36 | /* DO NOT USE in interrupts, if needed in irq handler, we should use the | ||
37 | _irqsave version of the spin_locks */ | ||
38 | |||
39 | int bcom_sram_init(struct device_node *sram_node, char *owner) | ||
40 | { | ||
41 | int rv; | ||
42 | const u32 *regaddr_p; | ||
43 | u64 regaddr64, size64; | ||
44 | unsigned int psize; | ||
45 | |||
46 | /* Create our state struct */ | ||
47 | if (bcom_sram) { | ||
48 | printk(KERN_ERR "%s: bcom_sram_init: " | ||
49 | "Already initialized !\n", owner); | ||
50 | return -EBUSY; | ||
51 | } | ||
52 | |||
53 | bcom_sram = kmalloc(sizeof(struct bcom_sram), GFP_KERNEL); | ||
54 | if (!bcom_sram) { | ||
55 | printk(KERN_ERR "%s: bcom_sram_init: " | ||
56 | "Couldn't allocate internal state !\n", owner); | ||
57 | return -ENOMEM; | ||
58 | } | ||
59 | |||
60 | /* Get address and size of the sram */ | ||
61 | regaddr_p = of_get_address(sram_node, 0, &size64, NULL); | ||
62 | if (!regaddr_p) { | ||
63 | printk(KERN_ERR "%s: bcom_sram_init: " | ||
64 | "Invalid device node !\n", owner); | ||
65 | rv = -EINVAL; | ||
66 | goto error_free; | ||
67 | } | ||
68 | |||
69 | regaddr64 = of_translate_address(sram_node, regaddr_p); | ||
70 | |||
71 | bcom_sram->base_phys = (phys_addr_t) regaddr64; | ||
72 | bcom_sram->size = (unsigned int) size64; | ||
73 | |||
74 | /* Request region */ | ||
75 | if (!request_mem_region(bcom_sram->base_phys, bcom_sram->size, owner)) { | ||
76 | printk(KERN_ERR "%s: bcom_sram_init: " | ||
77 | "Couldn't request region !\n", owner); | ||
78 | rv = -EBUSY; | ||
79 | goto error_free; | ||
80 | } | ||
81 | |||
82 | /* Map SRAM */ | ||
83 | /* sram is not really __iomem */ | ||
84 | bcom_sram->base_virt = (void*) ioremap(bcom_sram->base_phys, bcom_sram->size); | ||
85 | |||
86 | if (!bcom_sram->base_virt) { | ||
87 | printk(KERN_ERR "%s: bcom_sram_init: " | ||
88 | "Map error SRAM zone 0x%08lx (0x%0x)!\n", | ||
89 | owner, bcom_sram->base_phys, bcom_sram->size ); | ||
90 | rv = -ENOMEM; | ||
91 | goto error_release; | ||
92 | } | ||
93 | |||
94 | /* Create an rheap (defaults to 32 bits word alignment) */ | ||
95 | bcom_sram->rh = rh_create(4); | ||
96 | |||
97 | /* Attach the free zones */ | ||
98 | #if 0 | ||
99 | /* Currently disabled ... for future use only */ | ||
100 | reg_addr_p = of_get_property(sram_node, "available", &psize); | ||
101 | #else | ||
102 | regaddr_p = NULL; | ||
103 | psize = 0; | ||
104 | #endif | ||
105 | |||
106 | if (!regaddr_p || !psize) { | ||
107 | /* Attach the whole zone */ | ||
108 | rh_attach_region(bcom_sram->rh, 0, bcom_sram->size); | ||
109 | } else { | ||
110 | /* Attach each zone independently */ | ||
111 | while (psize >= 2 * sizeof(u32)) { | ||
112 | phys_addr_t zbase = of_translate_address(sram_node, regaddr_p); | ||
113 | rh_attach_region(bcom_sram->rh, zbase - bcom_sram->base_phys, regaddr_p[1]); | ||
114 | regaddr_p += 2; | ||
115 | psize -= 2 * sizeof(u32); | ||
116 | } | ||
117 | } | ||
118 | |||
119 | /* Init our spinlock */ | ||
120 | spin_lock_init(&bcom_sram->lock); | ||
121 | |||
122 | return 0; | ||
123 | |||
124 | error_release: | ||
125 | release_mem_region(bcom_sram->base_phys, bcom_sram->size); | ||
126 | error_free: | ||
127 | kfree(bcom_sram); | ||
128 | bcom_sram = NULL; | ||
129 | |||
130 | return rv; | ||
131 | } | ||
132 | EXPORT_SYMBOL_GPL(bcom_sram_init); | ||
133 | |||
134 | void bcom_sram_cleanup(void) | ||
135 | { | ||
136 | /* Free resources */ | ||
137 | if (bcom_sram) { | ||
138 | rh_destroy(bcom_sram->rh); | ||
139 | iounmap((void __iomem *)bcom_sram->base_virt); | ||
140 | release_mem_region(bcom_sram->base_phys, bcom_sram->size); | ||
141 | kfree(bcom_sram); | ||
142 | bcom_sram = NULL; | ||
143 | } | ||
144 | } | ||
145 | EXPORT_SYMBOL_GPL(bcom_sram_cleanup); | ||
146 | |||
147 | void* bcom_sram_alloc(int size, int align, phys_addr_t *phys) | ||
148 | { | ||
149 | unsigned long offset; | ||
150 | |||
151 | spin_lock(&bcom_sram->lock); | ||
152 | offset = rh_alloc_align(bcom_sram->rh, size, align, NULL); | ||
153 | spin_unlock(&bcom_sram->lock); | ||
154 | |||
155 | if (IS_ERR_VALUE(offset)) | ||
156 | return NULL; | ||
157 | |||
158 | *phys = bcom_sram->base_phys + offset; | ||
159 | return bcom_sram->base_virt + offset; | ||
160 | } | ||
161 | EXPORT_SYMBOL_GPL(bcom_sram_alloc); | ||
162 | |||
163 | void bcom_sram_free(void *ptr) | ||
164 | { | ||
165 | unsigned long offset; | ||
166 | |||
167 | if (!ptr) | ||
168 | return; | ||
169 | |||
170 | offset = ptr - bcom_sram->base_virt; | ||
171 | |||
172 | spin_lock(&bcom_sram->lock); | ||
173 | rh_free(bcom_sram->rh, offset); | ||
174 | spin_unlock(&bcom_sram->lock); | ||
175 | } | ||
176 | EXPORT_SYMBOL_GPL(bcom_sram_free); | ||
177 | |||
diff --git a/arch/powerpc/sysdev/bestcomm/sram.h b/arch/powerpc/sysdev/bestcomm/sram.h new file mode 100644 index 000000000000..b6d668963cce --- /dev/null +++ b/arch/powerpc/sysdev/bestcomm/sram.h | |||
@@ -0,0 +1,54 @@ | |||
1 | /* | ||
2 | * Handling of a sram zone for bestcomm | ||
3 | * | ||
4 | * | ||
5 | * Copyright (C) 2007 Sylvain Munaut <tnt@246tNt.com> | ||
6 | * | ||
7 | * This file is licensed under the terms of the GNU General Public License | ||
8 | * version 2. This program is licensed "as is" without any warranty of any | ||
9 | * kind, whether express or implied. | ||
10 | */ | ||
11 | |||
12 | #ifndef __BESTCOMM_SRAM_H__ | ||
13 | #define __BESTCOMM_SRAM_H__ | ||
14 | |||
15 | #include <asm/rheap.h> | ||
16 | #include <asm/mmu.h> | ||
17 | #include <linux/spinlock.h> | ||
18 | |||
19 | |||
20 | /* Structure used internally */ | ||
21 | /* The internals are here for the inline functions | ||
22 | * sake, certainly not for the user to mess with ! | ||
23 | */ | ||
24 | struct bcom_sram { | ||
25 | phys_addr_t base_phys; | ||
26 | void *base_virt; | ||
27 | unsigned int size; | ||
28 | rh_info_t *rh; | ||
29 | spinlock_t lock; | ||
30 | }; | ||
31 | |||
32 | extern struct bcom_sram *bcom_sram; | ||
33 | |||
34 | |||
35 | /* Public API */ | ||
36 | extern int bcom_sram_init(struct device_node *sram_node, char *owner); | ||
37 | extern void bcom_sram_cleanup(void); | ||
38 | |||
39 | extern void* bcom_sram_alloc(int size, int align, phys_addr_t *phys); | ||
40 | extern void bcom_sram_free(void *ptr); | ||
41 | |||
42 | static inline phys_addr_t bcom_sram_va2pa(void *va) { | ||
43 | return bcom_sram->base_phys + | ||
44 | (unsigned long)(va - bcom_sram->base_virt); | ||
45 | } | ||
46 | |||
47 | static inline void *bcom_sram_pa2va(phys_addr_t pa) { | ||
48 | return bcom_sram->base_virt + | ||
49 | (unsigned long)(pa - bcom_sram->base_phys); | ||
50 | } | ||
51 | |||
52 | |||
53 | #endif /* __BESTCOMM_SRAM_H__ */ | ||
54 | |||
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index af090c93be10..33df4c347ca7 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c | |||
@@ -255,7 +255,7 @@ DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533E, quirk_fsl_pcie_transpare | |||
255 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533, quirk_fsl_pcie_transparent); | 255 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533, quirk_fsl_pcie_transparent); |
256 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544E, quirk_fsl_pcie_transparent); | 256 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544E, quirk_fsl_pcie_transparent); |
257 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544, quirk_fsl_pcie_transparent); | 257 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544, quirk_fsl_pcie_transparent); |
258 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8572E, quirk_fsl_pcie_transparent) | 258 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8572E, quirk_fsl_pcie_transparent); |
259 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8572, quirk_fsl_pcie_transparent); | 259 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8572, quirk_fsl_pcie_transparent); |
260 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_transparent); | 260 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_transparent); |
261 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_transparent); | 261 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_transparent); |