* Re: Commits added to powerpc.git next and master branches
2008-12-21 6:37 Commits added to powerpc.git next and master branches Paul Mackerras
@ 2008-12-21 9:07 ` Grant Likely
2008-12-21 9:32 ` Benjamin Herrenschmidt
2008-12-21 10:01 ` Grant Likely
` (4 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Grant Likely @ 2008-12-21 9:07 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Hey Paul,
Top of your -next tree fails with a stack overflow on the MPC5200 when
attempting to mount an NFS rootfs (log below). I haven't had a chance
to bisect yet, but I'm posting this in case someone has already seen
and solved this.
Cheers,
g.
Linux/PowerPC load: ip=192.168.0.64::192.168.0.1
nfsroot=192.168.0.200:/home/srv/nfs/gdc/efika-1,tcp rw
console=ttyPSC0,115200 libata.force=udma2
Finalizing device tree... using OF tree (promptr=01003ed8)
OF stdout device is: /failsafe
command line: ip=192.168.0.64::192.168.0.1
nfsroot=192.168.0.200:/home/srv/nfs/gdc/efika-1,tcp rw
console=ttyPSC0,115200 libata.force=udma2
memory layout at init:
alloc_bottom : 01ba7000
alloc_top : 30000000
alloc_top_hi : f000c000
rmo_top : 30000000
ram_top : f000c000
Looking for displays
instantiating rtas at 0x07ffb000 ... done
Applying EFIKA device tree fixups
Fixing bestcomm interrupts property
Adding sound interrupts property
Adding Ethernet MDIO node
Adding Ethernet PHY node
copying OF device tree ...
Building dt strings...
Building dt structure...
Device tree strings 0x01ba8000 -> 0x01ba87ae
Device tree struct 0x01ba9000 -> 0x01bac000
Calling quiesce ...
returning from prom_init
psc_console=fdfe2000
[ 0.000000] Using Efika machine description
[ 0.000000] Only using first contiguous memory region<5>Linux
version 2.6.28-rc8-00225-gf06f0c2 (grant@trillian) (gcc version 4.1.2)
#57 Sun Dec 21 01:59:34 MST 2008
[ 0.000000] console [udbg0] enabled
[ 0.000000] Efika: PCI bus 0 controlled by /pci@80000000
[ 0.000000]
[ 0.000000] PCI host bridge /pci@80000000 ranges:
[ 0.000000] IO 0x00000000f8000000..0x00000000f800ffff -> 0x0000000000000000
[ 0.000000] MEM 0x0000000080000000..0x00000000bfffffff ->
0x0000000080000000
[ 0.000000] Top of RAM: 0x8000000, Total RAM: 0x8000000
[ 0.000000] Memory hole size: 0MB
[ 0.000000] Zone PFN ranges:
[ 0.000000] DMA 0x00000000 -> 0x00008000
[ 0.000000] Normal 0x00008000 -> 0x00008000
[ 0.000000] Movable zone start PFN for each node
[ 0.000000] early_node_map[1] active PFN ranges
[ 0.000000] 0: 0x00000000 -> 0x00008000
[ 0.000000] On node 0 totalpages: 32768
[ 0.000000] free_area_init_node: node 0, pgdat c0379b4c,
node_mem_map c03a5000
[ 0.000000] DMA zone: 256 pages used for memmap
[ 0.000000] DMA zone: 0 pages reserved
[ 0.000000] DMA zone: 32512 pages, LIFO batch:7
[ 0.000000] Normal zone: 0 pages used for memmap
[ 0.000000] Movable zone: 0 pages used for memmap
[ 0.000000] Built 1 zonelists in Zone order, mobility grouping on.
Total pages: 32512
[ 0.000000] Kernel command line: ip=192.168.0.64::192.168.0.1
nfsroot=192.168.0.200:/home/srv/nfs/gdc/efika-1,tcp rw
console=ttyPSC0,115200 libata.force=udma2
[ 0.000000] MPC52xx PIC is up and running!
[ 0.000000] PID hash table entries: 512 (order: 9, 2048 bytes)
[ 0.000000] time_init: decrementer frequency = 33.000000 MHz
[ 0.000000] time_init: processor frequency = 396.000000 MHz
[ 0.000000] clocksource: timebase mult[79364d9] shift[22] registered
[ 0.000000] clockevent: decrementer mult[872] shift[16] cpu[0]
[ 0.012342] Console: colour dummy device 80x25
[ 0.022389] console handover: boot [udbg0] -> real [ttyPSC0]
[ 0.022903] Dentry cache hash table entries: 16384 (order: 4, 65536 bytes)
[ 0.035946] Inode-cache hash table entries: 8192 (order: 3, 32768 bytes)
[ 0.061939] Memory: 125980k/131072k available (3420k kernel code,
4932k reserved, 144k data, 122k bss, 184k init)
[ 0.072632] SLUB: Genslabs=12, HWalign=32, Order=0-3, MinObjects=0,
CPUs=1, Nodes=1
[ 0.080527] Calibrating delay loop... 65.79 BogoMIPS (lpj=131584)
[ 0.175504] Mount-cache hash table entries: 512
[ 0.185228] net_namespace: 288 bytes
[ 0.189594] NET: Registered protocol family 16
[ 0.205009] PCI: Probing PCI hardware
[ 0.209622] pci 0000:00:18.0: reg 10 io port: [0x1000-0x107f]
[ 0.215597] pci 0000:00:18.0: reg 14 32bit mmio: [0x80000000-0x8000007f]
[ 0.222715] pci 0000:00:18.0: reg 30 32bit mmio: [0x80020000-0x8003ffff]
[ 0.229673] pci 0000:00:18.0: supports D1 D2
[ 0.234086] pci 0000:00:18.0: PME# supported from D0 D1 D2 D3hot D3cold
[ 0.240899] pci 0000:00:18.0: PME# disabled
[ 0.246731] bus: 00 index 0 io port: [0xfdfd0000-0xfdfdffff]
[ 0.252580] bus: 00 index 1 mmio: [0x80000000-0xbfffffff]
[ 0.258277] DMA: MPC52xx BestComm driver
[ 0.262509] DMA: MPC52xx BestComm engine @f0001200 ok !
[ 0.295488] SCSI subsystem initialized
[ 0.299714] libata version 3.00 loaded.
[ 0.323846] Switched to high resolution mode on CPU 0
[ 0.330777] NET: Registered protocol family 2
[ 0.376005] IP route cache hash table entries: 1024 (order: 0, 4096 bytes)
[ 0.383536] TCP established hash table entries: 4096 (order: 3, 32768 bytes)
[ 0.391093] TCP bind hash table entries: 4096 (order: 2, 16384 bytes)
[ 0.397898] TCP: Hash tables configured (established 4096 bind 4096)
[ 0.404450] TCP reno registered
[ 0.416069] NET: Registered protocol family 1
[ 0.459008] msgmni has been set to 246
[ 0.464366] alg: No test for stdrng (krng)
[ 0.468759] io scheduler noop registered
[ 0.472902] io scheduler anticipatory registered (default)
[ 0.478563] io scheduler deadline registered
[ 0.483162] io scheduler cfq registered
[ 1.001144] Generic RTC Driver v1.07
[ 1.005815] Serial: MPC52xx PSC UART driver
[ 1.010416] f0002000.serial: ttyPSC0 at MMIO 0xf0002000 (irq = 129)
is a MPC52xx PSC
[ 1.036995] brd: module loaded
[ 1.048974] loop: module loaded
[ 1.056105] mpc52xx MII bus: probed
[ 1.061429] net eth0: Using PHY at MDIO address 16
[ 1.067254] Driver 'sd' needs updating - please use bus_type methods
[ 1.074314] ata: MPC52xx IDE/ATA libata driver
[ 1.079598] scsi0 : mpc52xx_ata
[ 1.083744] ata1: PATA max PIO4 ata_regs 0xf0003a00 irq 135
[ 1.252244] ata1.00: ATA-4: TRANSCEND, 20070418, max UDMA/66
[ 1.258098] ata1.00: 994896 sectors, multi 0: LBA
[ 1.263139] ata1.00: FORCE: xfer_mask set to udma2
[ 1.284181] ata1.00: configured for UDMA/33
[ 1.289209] scsi 0:0:0:0: Direct-Access ATA TRANSCEND
2007 PQ: 0 ANSI: 5
[ 1.299207] sd 0:0:0:0: [sda] 994896 512-byte hardware sectors:
(509 MB/485 MiB)
[ 1.307048] sd 0:0:0:0: [sda] Write Protect is off
[ 1.312027] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
[ 1.317653] sd 0:0:0:0: [sda] Write cache: disabled, read cache:
enabled, doesn't support DPO or FUA
[ 1.327702] sd 0:0:0:0: [sda] 994896 512-byte hardware sectors:
(509 MB/485 MiB)
[ 1.335536] sd 0:0:0:0: [sda] Write Protect is off
[ 1.340507] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
[ 1.346099] sd 0:0:0:0: [sda] Write cache: disabled, read cache:
enabled, doesn't support DPO or FUA
[ 1.355506] sda: sda1
[ 1.360460] sd 0:0:0:0: [sda] Attached SCSI disk
[ 1.368173] mice: PS/2 mouse device common for all mice
[ 1.374670] i2c /dev entries driver
[ 1.381619] TCP cubic registered
[ 1.385040] NET: Registered protocol family 17
[ 1.391136] RPC: Registered udp transport module.
[ 1.396025] RPC: Registered tcp transport module.
[ 1.912532] net eth0: attached phy 16 to driver Generic PHY
[ 2.919875] IP-Config: Guessing netmask 255.255.255.0
[ 2.925414] IP-Config: Complete:
[ 2.928599] device=eth0, addr=192.168.0.64,
mask=255.255.255.0, gw=192.168.0.1,
[ 2.936518] host=192.168.0.64, domain=, nis-domain=(none),
[ 2.942608] bootserver=255.255.255.255,
rootserver=192.168.0.200, rootpath=
[ 2.950769] Looking up port of RPC 100003/2 on 192.168.0.200
[ 3.912011] PHY: f0003000:10 - Link is Up - 100/Full
[ 4.258019] Looking up port of RPC 100005/1 on 192.168.0.200
[ 9.286978] VFS: Mounted root (nfs filesystem).
[ 9.291906] Freeing unused kernel memory: 184k init
[ 9.315799] Kernel stack overflow in process c7828000, r1=c7825b60
[ 9.322122] NIP: c0018028 LR: c0018064 CTR: 00000226
[ 9.327192] REGS: c7825ab0 TRAP: 0901 Not tainted
(2.6.28-rc8-00225-gf06f0c2)
[ 9.334740] MSR: 00009032 <EE,ME,IR,DR> CR: 48002022 XER: 00000000
[ 9.341245] TASK = c7828000[1] 'init' THREAD: c7826000
[ 9.346309] GPR00: 00000000 c7825b60 c7828000 c78ad520 c01da000
c0000000 c0000000 00000315
[ 9.354853] GPR08: 00356795 c0380000 c7a24000 00000001 c7826000
[ 9.361197] NIP [c0018028] _tlbia+0x14/0x20
[ 9.365470] LR [c0018064] tlb_flush+0x30/0x40
[ 9.369911] Call Trace:
[ 9.372399] Instruction dump:
[ 9.375424] 4185ffe4 7d400124 4c00012c 4e800020 7c001a64 7c0004ac
4e800020 7c0004ac
[ 9.383344] 38800400 7c8903a6 3c80c000 7c002264 <38841000> 4200fff8
7c0004ac 9421fff0
[ 9.391445] Kernel panic - not syncing: kernel stack overflow
[ 9.397309] Rebooting in 180 seconds..
On Sat, Dec 20, 2008 at 11:37 PM, Paul Mackerras <paulus@samba.org> wrote:
> Anton Vorontsov (3):
> of: Minor simplification for the of_parse_phandles_with_args()
> of: of_parse_phandles_with_args() learns to differentiate 'hole' cells
> of/gpio: Implement of_gpio_count()
>
> Benjamin Herrenschmidt (10):
> powerpc/4xx: Extended DCR support v2
> powerpc/mm: Split mmu_context handling
> powerpc/mm: Rework context management for CPUs with no hash table
> powerpc/mm: Introduce MMU features
> powerpc/mm: Add SMP support to no-hash TLB handling
> powerpc/mm: Split low level tlb invalidate for nohash processors
> powerpc/44x: No need to mask MSR:CE, ME or DE in _tlbil_va on 440
> powerpc/mm: Runtime allocation of mmu context maps for nohash CPUs
> powerpc/mm: Rework usage of _PAGE_COHERENT/NO_CACHE/GUARDED
> powerpc/44x: 44x TLB doesn't need "Guarded" set for all pages
>
> Brian King (2):
> powerpc: Disable Collaborative Memory Manager for kdump
> powerpc: Add reboot notifier to Collaborative Memory Manager
>
> David Howells (1):
> powerpc: Rename struct vm_region to avoid conflict with NOMMU
>
> Grant Erickson (1):
> powerpc: Const-qualify Device Node Argument to DCR Resource Extent API
>
> Hendrik Brueckner (1):
> hvc_console: Escape magic sysrq key
>
> Nathan Lynch (3):
> powerpc: Add of_find_next_cache_node()
> powerpc: Convert cpu_to_l2cache() to of_find_next_cache_node()
> powerpc: Convert sysfs cache code to of_find_next_cache_node()
>
> Scott Wood (1):
> powerpc/bootwrapper: Use the child-bus #address-cells to decide which range entry to use
>
> Stephen Rothwell (1):
> powerpc/iseries: viodasd needs to depend on CONFIG_BLOCK
>
> Tony Breeds (2):
> powerpc: Protect against NULL pointer deref in phyp-dump code
> powerpc: Pass a valid token to rtas_call() in phyp-dump code
>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: Commits added to powerpc.git next and master branches
2008-12-21 9:07 ` Grant Likely
@ 2008-12-21 9:32 ` Benjamin Herrenschmidt
2008-12-21 9:34 ` Grant Likely
2008-12-21 9:40 ` Benjamin Herrenschmidt
0 siblings, 2 replies; 13+ messages in thread
From: Benjamin Herrenschmidt @ 2008-12-21 9:32 UTC (permalink / raw)
To: Grant Likely; +Cc: linuxppc-dev, Paul Mackerras
On Sun, 2008-12-21 at 02:07 -0700, Grant Likely wrote:
> Hey Paul,
>
> Top of your -next tree fails with a stack overflow on the MPC5200 when
> attempting to mount an NFS rootfs (log below). I haven't had a chance
> to bisect yet, but I'm posting this in case someone has already seen
> and solved this.
>From the NIP & LR values, it looks like it could be my fault.
MPC5200 is a 603 core right ?
Cheers,
Ben.
> Cheers,
> g.
>
> Linux/PowerPC load: ip=192.168.0.64::192.168.0.1
> nfsroot=192.168.0.200:/home/srv/nfs/gdc/efika-1,tcp rw
> console=ttyPSC0,115200 libata.force=udma2
> Finalizing device tree... using OF tree (promptr=01003ed8)
> OF stdout device is: /failsafe
> command line: ip=192.168.0.64::192.168.0.1
> nfsroot=192.168.0.200:/home/srv/nfs/gdc/efika-1,tcp rw
> console=ttyPSC0,115200 libata.force=udma2
> memory layout at init:
> alloc_bottom : 01ba7000
> alloc_top : 30000000
> alloc_top_hi : f000c000
> rmo_top : 30000000
> ram_top : f000c000
> Looking for displays
> instantiating rtas at 0x07ffb000 ... done
> Applying EFIKA device tree fixups
> Fixing bestcomm interrupts property
> Adding sound interrupts property
> Adding Ethernet MDIO node
> Adding Ethernet PHY node
> copying OF device tree ...
> Building dt strings...
> Building dt structure...
> Device tree strings 0x01ba8000 -> 0x01ba87ae
> Device tree struct 0x01ba9000 -> 0x01bac000
> Calling quiesce ...
> returning from prom_init
> psc_console=fdfe2000
> [ 0.000000] Using Efika machine description
> [ 0.000000] Only using first contiguous memory region<5>Linux
> version 2.6.28-rc8-00225-gf06f0c2 (grant@trillian) (gcc version 4.1.2)
> #57 Sun Dec 21 01:59:34 MST 2008
> [ 0.000000] console [udbg0] enabled
> [ 0.000000] Efika: PCI bus 0 controlled by /pci@80000000
> [ 0.000000]
> [ 0.000000] PCI host bridge /pci@80000000 ranges:
> [ 0.000000] IO 0x00000000f8000000..0x00000000f800ffff -> 0x0000000000000000
> [ 0.000000] MEM 0x0000000080000000..0x00000000bfffffff ->
> 0x0000000080000000
> [ 0.000000] Top of RAM: 0x8000000, Total RAM: 0x8000000
> [ 0.000000] Memory hole size: 0MB
> [ 0.000000] Zone PFN ranges:
> [ 0.000000] DMA 0x00000000 -> 0x00008000
> [ 0.000000] Normal 0x00008000 -> 0x00008000
> [ 0.000000] Movable zone start PFN for each node
> [ 0.000000] early_node_map[1] active PFN ranges
> [ 0.000000] 0: 0x00000000 -> 0x00008000
> [ 0.000000] On node 0 totalpages: 32768
> [ 0.000000] free_area_init_node: node 0, pgdat c0379b4c,
> node_mem_map c03a5000
> [ 0.000000] DMA zone: 256 pages used for memmap
> [ 0.000000] DMA zone: 0 pages reserved
> [ 0.000000] DMA zone: 32512 pages, LIFO batch:7
> [ 0.000000] Normal zone: 0 pages used for memmap
> [ 0.000000] Movable zone: 0 pages used for memmap
> [ 0.000000] Built 1 zonelists in Zone order, mobility grouping on.
> Total pages: 32512
> [ 0.000000] Kernel command line: ip=192.168.0.64::192.168.0.1
> nfsroot=192.168.0.200:/home/srv/nfs/gdc/efika-1,tcp rw
> console=ttyPSC0,115200 libata.force=udma2
> [ 0.000000] MPC52xx PIC is up and running!
> [ 0.000000] PID hash table entries: 512 (order: 9, 2048 bytes)
> [ 0.000000] time_init: decrementer frequency = 33.000000 MHz
> [ 0.000000] time_init: processor frequency = 396.000000 MHz
> [ 0.000000] clocksource: timebase mult[79364d9] shift[22] registered
> [ 0.000000] clockevent: decrementer mult[872] shift[16] cpu[0]
> [ 0.012342] Console: colour dummy device 80x25
> [ 0.022389] console handover: boot [udbg0] -> real [ttyPSC0]
> [ 0.022903] Dentry cache hash table entries: 16384 (order: 4, 65536 bytes)
> [ 0.035946] Inode-cache hash table entries: 8192 (order: 3, 32768 bytes)
> [ 0.061939] Memory: 125980k/131072k available (3420k kernel code,
> 4932k reserved, 144k data, 122k bss, 184k init)
> [ 0.072632] SLUB: Genslabs=12, HWalign=32, Order=0-3, MinObjects=0,
> CPUs=1, Nodes=1
> [ 0.080527] Calibrating delay loop... 65.79 BogoMIPS (lpj=131584)
> [ 0.175504] Mount-cache hash table entries: 512
> [ 0.185228] net_namespace: 288 bytes
> [ 0.189594] NET: Registered protocol family 16
> [ 0.205009] PCI: Probing PCI hardware
> [ 0.209622] pci 0000:00:18.0: reg 10 io port: [0x1000-0x107f]
> [ 0.215597] pci 0000:00:18.0: reg 14 32bit mmio: [0x80000000-0x8000007f]
> [ 0.222715] pci 0000:00:18.0: reg 30 32bit mmio: [0x80020000-0x8003ffff]
> [ 0.229673] pci 0000:00:18.0: supports D1 D2
> [ 0.234086] pci 0000:00:18.0: PME# supported from D0 D1 D2 D3hot D3cold
> [ 0.240899] pci 0000:00:18.0: PME# disabled
> [ 0.246731] bus: 00 index 0 io port: [0xfdfd0000-0xfdfdffff]
> [ 0.252580] bus: 00 index 1 mmio: [0x80000000-0xbfffffff]
> [ 0.258277] DMA: MPC52xx BestComm driver
> [ 0.262509] DMA: MPC52xx BestComm engine @f0001200 ok !
> [ 0.295488] SCSI subsystem initialized
> [ 0.299714] libata version 3.00 loaded.
> [ 0.323846] Switched to high resolution mode on CPU 0
> [ 0.330777] NET: Registered protocol family 2
> [ 0.376005] IP route cache hash table entries: 1024 (order: 0, 4096 bytes)
> [ 0.383536] TCP established hash table entries: 4096 (order: 3, 32768 bytes)
> [ 0.391093] TCP bind hash table entries: 4096 (order: 2, 16384 bytes)
> [ 0.397898] TCP: Hash tables configured (established 4096 bind 4096)
> [ 0.404450] TCP reno registered
> [ 0.416069] NET: Registered protocol family 1
> [ 0.459008] msgmni has been set to 246
> [ 0.464366] alg: No test for stdrng (krng)
> [ 0.468759] io scheduler noop registered
> [ 0.472902] io scheduler anticipatory registered (default)
> [ 0.478563] io scheduler deadline registered
> [ 0.483162] io scheduler cfq registered
> [ 1.001144] Generic RTC Driver v1.07
> [ 1.005815] Serial: MPC52xx PSC UART driver
> [ 1.010416] f0002000.serial: ttyPSC0 at MMIO 0xf0002000 (irq = 129)
> is a MPC52xx PSC
> [ 1.036995] brd: module loaded
> [ 1.048974] loop: module loaded
> [ 1.056105] mpc52xx MII bus: probed
> [ 1.061429] net eth0: Using PHY at MDIO address 16
> [ 1.067254] Driver 'sd' needs updating - please use bus_type methods
> [ 1.074314] ata: MPC52xx IDE/ATA libata driver
> [ 1.079598] scsi0 : mpc52xx_ata
> [ 1.083744] ata1: PATA max PIO4 ata_regs 0xf0003a00 irq 135
> [ 1.252244] ata1.00: ATA-4: TRANSCEND, 20070418, max UDMA/66
> [ 1.258098] ata1.00: 994896 sectors, multi 0: LBA
> [ 1.263139] ata1.00: FORCE: xfer_mask set to udma2
> [ 1.284181] ata1.00: configured for UDMA/33
> [ 1.289209] scsi 0:0:0:0: Direct-Access ATA TRANSCEND
> 2007 PQ: 0 ANSI: 5
> [ 1.299207] sd 0:0:0:0: [sda] 994896 512-byte hardware sectors:
> (509 MB/485 MiB)
> [ 1.307048] sd 0:0:0:0: [sda] Write Protect is off
> [ 1.312027] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
> [ 1.317653] sd 0:0:0:0: [sda] Write cache: disabled, read cache:
> enabled, doesn't support DPO or FUA
> [ 1.327702] sd 0:0:0:0: [sda] 994896 512-byte hardware sectors:
> (509 MB/485 MiB)
> [ 1.335536] sd 0:0:0:0: [sda] Write Protect is off
> [ 1.340507] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
> [ 1.346099] sd 0:0:0:0: [sda] Write cache: disabled, read cache:
> enabled, doesn't support DPO or FUA
> [ 1.355506] sda: sda1
> [ 1.360460] sd 0:0:0:0: [sda] Attached SCSI disk
> [ 1.368173] mice: PS/2 mouse device common for all mice
> [ 1.374670] i2c /dev entries driver
> [ 1.381619] TCP cubic registered
> [ 1.385040] NET: Registered protocol family 17
> [ 1.391136] RPC: Registered udp transport module.
> [ 1.396025] RPC: Registered tcp transport module.
> [ 1.912532] net eth0: attached phy 16 to driver Generic PHY
> [ 2.919875] IP-Config: Guessing netmask 255.255.255.0
> [ 2.925414] IP-Config: Complete:
> [ 2.928599] device=eth0, addr=192.168.0.64,
> mask=255.255.255.0, gw=192.168.0.1,
> [ 2.936518] host=192.168.0.64, domain=, nis-domain=(none),
> [ 2.942608] bootserver=255.255.255.255,
> rootserver=192.168.0.200, rootpath=
> [ 2.950769] Looking up port of RPC 100003/2 on 192.168.0.200
> [ 3.912011] PHY: f0003000:10 - Link is Up - 100/Full
> [ 4.258019] Looking up port of RPC 100005/1 on 192.168.0.200
> [ 9.286978] VFS: Mounted root (nfs filesystem).
> [ 9.291906] Freeing unused kernel memory: 184k init
> [ 9.315799] Kernel stack overflow in process c7828000, r1=c7825b60
> [ 9.322122] NIP: c0018028 LR: c0018064 CTR: 00000226
> [ 9.327192] REGS: c7825ab0 TRAP: 0901 Not tainted
> (2.6.28-rc8-00225-gf06f0c2)
> [ 9.334740] MSR: 00009032 <EE,ME,IR,DR> CR: 48002022 XER: 00000000
> [ 9.341245] TASK = c7828000[1] 'init' THREAD: c7826000
> [ 9.346309] GPR00: 00000000 c7825b60 c7828000 c78ad520 c01da000
> c0000000 c0000000 00000315
> [ 9.354853] GPR08: 00356795 c0380000 c7a24000 00000001 c7826000
> [ 9.361197] NIP [c0018028] _tlbia+0x14/0x20
> [ 9.365470] LR [c0018064] tlb_flush+0x30/0x40
> [ 9.369911] Call Trace:
> [ 9.372399] Instruction dump:
> [ 9.375424] 4185ffe4 7d400124 4c00012c 4e800020 7c001a64 7c0004ac
> 4e800020 7c0004ac
> [ 9.383344] 38800400 7c8903a6 3c80c000 7c002264 <38841000> 4200fff8
> 7c0004ac 9421fff0
> [ 9.391445] Kernel panic - not syncing: kernel stack overflow
> [ 9.397309] Rebooting in 180 seconds..
>
>
> On Sat, Dec 20, 2008 at 11:37 PM, Paul Mackerras <paulus@samba.org> wrote:
> > Anton Vorontsov (3):
> > of: Minor simplification for the of_parse_phandles_with_args()
> > of: of_parse_phandles_with_args() learns to differentiate 'hole' cells
> > of/gpio: Implement of_gpio_count()
> >
> > Benjamin Herrenschmidt (10):
> > powerpc/4xx: Extended DCR support v2
> > powerpc/mm: Split mmu_context handling
> > powerpc/mm: Rework context management for CPUs with no hash table
> > powerpc/mm: Introduce MMU features
> > powerpc/mm: Add SMP support to no-hash TLB handling
> > powerpc/mm: Split low level tlb invalidate for nohash processors
> > powerpc/44x: No need to mask MSR:CE, ME or DE in _tlbil_va on 440
> > powerpc/mm: Runtime allocation of mmu context maps for nohash CPUs
> > powerpc/mm: Rework usage of _PAGE_COHERENT/NO_CACHE/GUARDED
> > powerpc/44x: 44x TLB doesn't need "Guarded" set for all pages
> >
> > Brian King (2):
> > powerpc: Disable Collaborative Memory Manager for kdump
> > powerpc: Add reboot notifier to Collaborative Memory Manager
> >
> > David Howells (1):
> > powerpc: Rename struct vm_region to avoid conflict with NOMMU
> >
> > Grant Erickson (1):
> > powerpc: Const-qualify Device Node Argument to DCR Resource Extent API
> >
> > Hendrik Brueckner (1):
> > hvc_console: Escape magic sysrq key
> >
> > Nathan Lynch (3):
> > powerpc: Add of_find_next_cache_node()
> > powerpc: Convert cpu_to_l2cache() to of_find_next_cache_node()
> > powerpc: Convert sysfs cache code to of_find_next_cache_node()
> >
> > Scott Wood (1):
> > powerpc/bootwrapper: Use the child-bus #address-cells to decide which range entry to use
> >
> > Stephen Rothwell (1):
> > powerpc/iseries: viodasd needs to depend on CONFIG_BLOCK
> >
> > Tony Breeds (2):
> > powerpc: Protect against NULL pointer deref in phyp-dump code
> > powerpc: Pass a valid token to rtas_call() in phyp-dump code
> >
> > _______________________________________________
> > Linuxppc-dev mailing list
> > Linuxppc-dev@ozlabs.org
> > https://ozlabs.org/mailman/listinfo/linuxppc-dev
> >
>
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Commits added to powerpc.git next and master branches
2008-12-21 9:32 ` Benjamin Herrenschmidt
@ 2008-12-21 9:34 ` Grant Likely
2008-12-21 9:40 ` Benjamin Herrenschmidt
1 sibling, 0 replies; 13+ messages in thread
From: Grant Likely @ 2008-12-21 9:34 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev, Paul Mackerras
On Sun, Dec 21, 2008 at 2:32 AM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
> On Sun, 2008-12-21 at 02:07 -0700, Grant Likely wrote:
>> Hey Paul,
>>
>> Top of your -next tree fails with a stack overflow on the MPC5200 when
>> attempting to mount an NFS rootfs (log below). I haven't had a chance
>> to bisect yet, but I'm posting this in case someone has already seen
>> and solved this.
>
> >From the NIP & LR values, it looks like it could be my fault.
>
> MPC5200 is a 603 core right ?
Yes
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Commits added to powerpc.git next and master branches
2008-12-21 9:32 ` Benjamin Herrenschmidt
2008-12-21 9:34 ` Grant Likely
@ 2008-12-21 9:40 ` Benjamin Herrenschmidt
2008-12-21 10:02 ` Grant Likely
1 sibling, 1 reply; 13+ messages in thread
From: Benjamin Herrenschmidt @ 2008-12-21 9:40 UTC (permalink / raw)
To: Grant Likely; +Cc: linuxppc-dev, Paul Mackerras
On Sun, 2008-12-21 at 20:32 +1100, Benjamin Herrenschmidt wrote:
> On Sun, 2008-12-21 at 02:07 -0700, Grant Likely wrote:
> > Hey Paul,
> >
> > Top of your -next tree fails with a stack overflow on the MPC5200 when
> > attempting to mount an NFS rootfs (log below). I haven't had a chance
> > to bisect yet, but I'm posting this in case someone has already seen
> > and solved this.
>
> >From the NIP & LR values, it looks like it could be my fault.
>
> MPC5200 is a 603 core right ?
Looks like a brown paper bag for me.
Try this:
Index: linux-work/arch/powerpc/mm/hash_low_32.S
===================================================================
--- linux-work.orig/arch/powerpc/mm/hash_low_32.S 2008-12-21 20:38:10.000000000 +1100
+++ linux-work/arch/powerpc/mm/hash_low_32.S 2008-12-21 20:38:14.000000000 +1100
@@ -709,3 +709,4 @@ _GLOBAL(_tlbia)
tlbia
sync
#endif /* CONFIG_SMP */
+ blr
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Commits added to powerpc.git next and master branches
2008-12-21 9:40 ` Benjamin Herrenschmidt
@ 2008-12-21 10:02 ` Grant Likely
0 siblings, 0 replies; 13+ messages in thread
From: Grant Likely @ 2008-12-21 10:02 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev, Paul Mackerras
On Sun, Dec 21, 2008 at 2:40 AM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
> On Sun, 2008-12-21 at 20:32 +1100, Benjamin Herrenschmidt wrote:
>> On Sun, 2008-12-21 at 02:07 -0700, Grant Likely wrote:
>> > Hey Paul,
>> >
>> > Top of your -next tree fails with a stack overflow on the MPC5200 when
>> > attempting to mount an NFS rootfs (log below). I haven't had a chance
>> > to bisect yet, but I'm posting this in case someone has already seen
>> > and solved this.
>>
>> >From the NIP & LR values, it looks like it could be my fault.
>>
>> MPC5200 is a 603 core right ?
>
> Looks like a brown paper bag for me.
>
> Try this:
Yup, that solved it. Committed into my tree and pushed out for Paulus
to pick it up.
Thanks,
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Commits added to powerpc.git next and master branches
2008-12-21 6:37 Commits added to powerpc.git next and master branches Paul Mackerras
2008-12-21 9:07 ` Grant Likely
@ 2008-12-21 10:01 ` Grant Likely
2008-12-21 10:47 ` Paul Mackerras
2008-12-25 7:26 ` Wolfram Sang
2008-12-22 21:34 ` [patch 0/2] please pull from cell next branch arnd
` (3 subsequent siblings)
5 siblings, 2 replies; 13+ messages in thread
From: Grant Likely @ 2008-12-21 10:01 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Hi Paul,
Here are a few more for you. These are all the MPC5200 patches that
I've currently got in my queue and they are based off of your current
-next tree.
The first commit is Ben's fix for the missing blr instruction in
_tlbia() which is critical to get in ASAP.
Thanks,
g.
The following changes since commit 49e6e3f1aec2d46f5865d3ada38fe9a5d660ef5d=
:
Scott Wood (1):
powerpc/bootwrapper: Use the child-bus #address-cells to
decide which range entry to use
are available in the git repository at:
git://git.secretlab.ca/git/linux-2.6-mpc52xx next
Benjamin Herrenschmidt (1):
powerpc: Fix missing 'blr' in _tlbia()
Grant Likely (4):
powerpc/mpc5200: Document and tidy irq driver
powerpc/mpc5200: Make internal 5200 PIC the default interrupt control=
ler
powerpc/mpc5200: Bugfix on handling variable sized buffer descriptors
powerpc/mpc5200: Disable bestcomm prefetching when ATA DMA enabled
Ren=E9 B=FCrgel (1):
powerpc/mpc5200: Make PSC UART driver update serial errors counters
Tim Yamin (2):
powerpc/mpc5200: Bestcomm fixes to ATA support
powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
Wolfram Sang (3):
powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
powerpc/mpc5200: add rts/cts handling in PSC UART driver
powerpc/mpc5200: fix error paths in PSC UART probe function
arch/powerpc/include/asm/mpc52xx.h | 19 +
arch/powerpc/include/asm/mpc52xx_psc.h | 11 +-
arch/powerpc/mm/hash_low_32.S | 1 +
arch/powerpc/platforms/52xx/lite5200_pm.c | 1 -
arch/powerpc/platforms/52xx/mpc52xx_pic.c | 237 ++++++++---
arch/powerpc/platforms/52xx/mpc52xx_pic.h | 53 ---
arch/powerpc/platforms/52xx/mpc52xx_pm.c | 3 -
arch/powerpc/sysdev/bestcomm/ata.c | 3 +
arch/powerpc/sysdev/bestcomm/ata.h | 19 +-
arch/powerpc/sysdev/bestcomm/bestcomm.c | 7 +-
arch/powerpc/sysdev/bestcomm/bestcomm.h | 61 ++-
arch/powerpc/sysdev/bestcomm/bestcomm_priv.h | 20 +-
drivers/ata/Kconfig | 3 +-
drivers/ata/pata_mpc52xx.c | 546 ++++++++++++++++++++++=
+---
drivers/net/fec_mpc52xx_phy.c | 5 +-
drivers/serial/mpc52xx_uart.c | 74 +++-
16 files changed, 817 insertions(+), 246 deletions(-)
delete mode 100644 arch/powerpc/platforms/52xx/mpc52xx_pic.h
On Sat, Dec 20, 2008 at 11:37 PM, Paul Mackerras <paulus@samba.org> wrote:
> Anton Vorontsov (3):
> of: Minor simplification for the of_parse_phandles_with_args()
> of: of_parse_phandles_with_args() learns to differentiate 'hole' cel=
ls
> of/gpio: Implement of_gpio_count()
>
> Benjamin Herrenschmidt (10):
> powerpc/4xx: Extended DCR support v2
> powerpc/mm: Split mmu_context handling
> powerpc/mm: Rework context management for CPUs with no hash table
> powerpc/mm: Introduce MMU features
> powerpc/mm: Add SMP support to no-hash TLB handling
> powerpc/mm: Split low level tlb invalidate for nohash processors
> powerpc/44x: No need to mask MSR:CE, ME or DE in _tlbil_va on 440
> powerpc/mm: Runtime allocation of mmu context maps for nohash CPUs
> powerpc/mm: Rework usage of _PAGE_COHERENT/NO_CACHE/GUARDED
> powerpc/44x: 44x TLB doesn't need "Guarded" set for all pages
>
> Brian King (2):
> powerpc: Disable Collaborative Memory Manager for kdump
> powerpc: Add reboot notifier to Collaborative Memory Manager
>
> David Howells (1):
> powerpc: Rename struct vm_region to avoid conflict with NOMMU
>
> Grant Erickson (1):
> powerpc: Const-qualify Device Node Argument to DCR Resource Extent A=
PI
>
> Hendrik Brueckner (1):
> hvc_console: Escape magic sysrq key
>
> Nathan Lynch (3):
> powerpc: Add of_find_next_cache_node()
> powerpc: Convert cpu_to_l2cache() to of_find_next_cache_node()
> powerpc: Convert sysfs cache code to of_find_next_cache_node()
>
> Scott Wood (1):
> powerpc/bootwrapper: Use the child-bus #address-cells to decide whic=
h range entry to use
>
> Stephen Rothwell (1):
> powerpc/iseries: viodasd needs to depend on CONFIG_BLOCK
>
> Tony Breeds (2):
> powerpc: Protect against NULL pointer deref in phyp-dump code
> powerpc: Pass a valid token to rtas_call() in phyp-dump code
>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev
>
--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: Commits added to powerpc.git next and master branches
2008-12-21 10:01 ` Grant Likely
@ 2008-12-21 10:47 ` Paul Mackerras
2008-12-25 7:26 ` Wolfram Sang
1 sibling, 0 replies; 13+ messages in thread
From: Paul Mackerras @ 2008-12-21 10:47 UTC (permalink / raw)
To: Grant Likely; +Cc: linuxppc-dev
Grant Likely writes:
> Here are a few more for you. These are all the MPC5200 patches that
> I've currently got in my queue and they are based off of your current
> -next tree.
>
> The first commit is Ben's fix for the missing blr instruction in
> _tlbia() which is critical to get in ASAP.
Thanks, pulled and pushed out.
Paul.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Commits added to powerpc.git next and master branches
2008-12-21 10:01 ` Grant Likely
2008-12-21 10:47 ` Paul Mackerras
@ 2008-12-25 7:26 ` Wolfram Sang
1 sibling, 0 replies; 13+ messages in thread
From: Wolfram Sang @ 2008-12-25 7:26 UTC (permalink / raw)
To: Grant Likely; +Cc: linuxppc-dev
[-- Attachment #1: Type: text/plain, Size: 603 bytes --]
Hello Grant,
On Sun, Dec 21, 2008 at 03:01:05AM -0700, Grant Likely wrote:
> Wolfram Sang (3):
> powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
> powerpc/mpc5200: add rts/cts handling in PSC UART driver
> powerpc/mpc5200: fix error paths in PSC UART probe function
Thanks a lot! Can you also pick up this one, too. It seems to have
slipped out.
http://oldpatchwork.ozlabs.org/linuxppc-embedded/patch?id=21061
Regards,
Wolfram
--
Dipl.-Ing. Wolfram Sang | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* [patch 0/2] please pull from cell next branch
2008-12-21 6:37 Commits added to powerpc.git next and master branches Paul Mackerras
2008-12-21 9:07 ` Grant Likely
2008-12-21 10:01 ` Grant Likely
@ 2008-12-22 21:34 ` arnd
2008-12-22 21:34 ` [patch 1/2] powerpc/cell: fix build breakage with CONFIG_SPUFS disabled arnd
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: arnd @ 2008-12-22 21:34 UTC (permalink / raw)
To: paulus; +Cc: linuxppc-dev, cbe-oss-dev
Hi Paul,
here are my 2 pending patches I have queued up for 2.6.29, please add
them to your next branch or pull directly from
git://git.kernel.org/pub/scm/linux/kernel/git/arnd/cell-2.6.git next
Arnd <><
^ permalink raw reply [flat|nested] 13+ messages in thread* [patch 1/2] powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
2008-12-21 6:37 Commits added to powerpc.git next and master branches Paul Mackerras
` (2 preceding siblings ...)
2008-12-22 21:34 ` [patch 0/2] please pull from cell next branch arnd
@ 2008-12-22 21:34 ` arnd
2008-12-22 21:34 ` [patch 2/2] powerpc/cell: add QPACE as a separate Cell platform arnd
2008-12-23 13:20 ` Commits added to powerpc.git next and master branches Peter Korsgaard
5 siblings, 0 replies; 13+ messages in thread
From: arnd @ 2008-12-22 21:34 UTC (permalink / raw)
To: paulus; +Cc: linuxppc-dev, cbe-oss-dev
CBE_THERM and OPROFILE_CELL both cannot be built without
SPU_FS disabled, so make the dependency explicit.
Reported-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/powerpc/platforms/cell/Kconfig | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index c14d7d8..617f845 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -102,7 +102,7 @@ config PPC_IBM_CELL_POWERBUTTON
config CBE_THERM
tristate "CBE thermal support"
default m
- depends on CBE_RAS
+ depends on CBE_RAS && SPU_BASE
config CBE_CPUFREQ
tristate "CBE frequency scaling"
@@ -136,5 +136,5 @@ endmenu
config OPROFILE_CELL
def_bool y
- depends on PPC_CELL_NATIVE && (OPROFILE = m || OPROFILE = y)
+ depends on PPC_CELL_NATIVE && (OPROFILE = m || OPROFILE = y) && SPU_BASE
--
1.5.6.3
--
^ permalink raw reply related [flat|nested] 13+ messages in thread* [patch 2/2] powerpc/cell: add QPACE as a separate Cell platform
2008-12-21 6:37 Commits added to powerpc.git next and master branches Paul Mackerras
` (3 preceding siblings ...)
2008-12-22 21:34 ` [patch 1/2] powerpc/cell: fix build breakage with CONFIG_SPUFS disabled arnd
@ 2008-12-22 21:34 ` arnd
2008-12-23 13:20 ` Commits added to powerpc.git next and master branches Peter Korsgaard
5 siblings, 0 replies; 13+ messages in thread
From: arnd @ 2008-12-22 21:34 UTC (permalink / raw)
To: paulus; +Cc: linuxppc-dev, cbe-oss-dev
Since the QPACE (Chromodynamics Parallel Computing on the
Cell Broadband Engine) platform doesn't use a iommu, doesn't
have PCI devices and a MPIC much lesser setup and
configurations are needed. So far all devices are detected
as OF device. A notifier function is used to set the dma_ops
for the of_platform bus. Further this patch splits the
PPC_CELL_NATIVE into PPC_CELL_COMMON which are parts that are
shared with the QPACE platform and the rest.
Signed-off-by: Benjamin Krill <ben@codiert.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/powerpc/boot/Makefile | 1 +
arch/powerpc/platforms/cell/Kconfig | 19 +++--
arch/powerpc/platforms/cell/Makefile | 17 ++--
arch/powerpc/platforms/cell/qpace_setup.c | 152 +++++++++++++++++++++++++++++
drivers/edac/Kconfig | 2 +-
5 files changed, 175 insertions(+), 16 deletions(-)
create mode 100644 arch/powerpc/platforms/cell/qpace_setup.c
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 3d3daa6..f328299 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -194,6 +194,7 @@ image-$(CONFIG_PPC_MAPLE) += zImage.pseries
image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries
image-$(CONFIG_PPC_PS3) += dtbImage.ps3
image-$(CONFIG_PPC_CELLEB) += zImage.pseries
+image-$(CONFIG_PPC_CELL_QPACE) += zImage.pseries
image-$(CONFIG_PPC_CHRP) += zImage.chrp
image-$(CONFIG_PPC_EFIKA) += zImage.chrp
image-$(CONFIG_PPC_PMAC) += zImage.pmac
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 617f845..5cc3279 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -2,13 +2,18 @@ config PPC_CELL
bool
default n
-config PPC_CELL_NATIVE
+config PPC_CELL_COMMON
bool
select PPC_CELL
select PPC_DCR_MMIO
- select PPC_OF_PLATFORM_PCI
select PPC_INDIRECT_IO
select PPC_NATIVE
+ select PPC_RTAS
+
+config PPC_CELL_NATIVE
+ bool
+ select PPC_CELL_COMMON
+ select PPC_OF_PLATFORM_PCI
select MPIC
select IBM_NEW_EMAC_EMAC4
select IBM_NEW_EMAC_RGMII
@@ -20,7 +25,6 @@ config PPC_IBM_CELL_BLADE
bool "IBM Cell Blade"
depends on PPC_MULTIPLATFORM && PPC64
select PPC_CELL_NATIVE
- select PPC_RTAS
select MMIO_NVRAM
select PPC_UDBG_16550
select UDBG_RTAS_CONSOLE
@@ -28,16 +32,17 @@ config PPC_IBM_CELL_BLADE
config PPC_CELLEB
bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
depends on PPC_MULTIPLATFORM && PPC64
- select PPC_CELL
select PPC_CELL_NATIVE
- select PPC_RTAS
- select PPC_INDIRECT_IO
- select PPC_OF_PLATFORM_PCI
select HAS_TXX9_SERIAL
select PPC_UDBG_BEAT
select USB_OHCI_BIG_ENDIAN_MMIO
select USB_EHCI_BIG_ENDIAN_MMIO
+config PPC_CELL_QPACE
+ bool "IBM Cell - QPACE"
+ depends on PPC_MULTIPLATFORM && PPC64
+ select PPC_CELL_COMMON
+
menu "Cell Broadband Engine options"
depends on PPC_CELL
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 7fd8308..43eccb2 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -1,7 +1,7 @@
-obj-$(CONFIG_PPC_CELL_NATIVE) += interrupt.o iommu.o setup.o \
- cbe_regs.o spider-pic.o \
- pervasive.o pmu.o io-workarounds.o \
- spider-pci.o
+obj-$(CONFIG_PPC_CELL_COMMON) += cbe_regs.o interrupt.o pervasive.o
+
+obj-$(CONFIG_PPC_CELL_NATIVE) += iommu.o setup.o spider-pic.o \
+ pmu.o io-workarounds.o spider-pci.o
obj-$(CONFIG_CBE_RAS) += ras.o
obj-$(CONFIG_CBE_THERM) += cbe_thermal.o
@@ -14,13 +14,12 @@ obj-$(CONFIG_PPC_IBM_CELL_POWERBUTTON) += cbe_powerbutton.o
ifeq ($(CONFIG_SMP),y)
obj-$(CONFIG_PPC_CELL_NATIVE) += smp.o
+obj-$(CONFIG_PPC_CELL_QPACE) += smp.o
endif
# needed only when building loadable spufs.ko
-spu-priv1-$(CONFIG_PPC_CELL_NATIVE) += spu_priv1_mmio.o
-
-spu-manage-$(CONFIG_PPC_CELLEB) += spu_manage.o
-spu-manage-$(CONFIG_PPC_CELL_NATIVE) += spu_manage.o
+spu-priv1-$(CONFIG_PPC_CELL_COMMON) += spu_priv1_mmio.o
+spu-manage-$(CONFIG_PPC_CELL_COMMON) += spu_manage.o
obj-$(CONFIG_SPU_BASE) += spu_callbacks.o spu_base.o \
spu_notify.o \
@@ -31,6 +30,8 @@ obj-$(CONFIG_SPU_BASE) += spu_callbacks.o spu_base.o \
obj-$(CONFIG_PCI_MSI) += axon_msi.o
+# qpace setup
+obj-$(CONFIG_PPC_CELL_QPACE) += qpace_setup.o
# celleb stuff
ifeq ($(CONFIG_PPC_CELLEB),y)
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c
new file mode 100644
index 0000000..be84e6a
--- /dev/null
+++ b/arch/powerpc/platforms/cell/qpace_setup.c
@@ -0,0 +1,152 @@
+/*
+ * linux/arch/powerpc/platforms/cell/qpace_setup.c
+ *
+ * Copyright (C) 1995 Linus Torvalds
+ * Adapted from 'alpha' version by Gary Thomas
+ * Modified by Cort Dougan (cort@cs.nmt.edu)
+ * Modified by PPC64 Team, IBM Corp
+ * Modified by Cell Team, IBM Deutschland Entwicklung GmbH
+ * Modified by Benjamin Krill <ben@codiert.org>, IBM Corp.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/console.h>
+#include <linux/of_platform.h>
+
+#include <asm/mmu.h>
+#include <asm/processor.h>
+#include <asm/io.h>
+#include <asm/kexec.h>
+#include <asm/pgtable.h>
+#include <asm/prom.h>
+#include <asm/rtas.h>
+#include <asm/dma.h>
+#include <asm/machdep.h>
+#include <asm/time.h>
+#include <asm/cputable.h>
+#include <asm/irq.h>
+#include <asm/spu.h>
+#include <asm/spu_priv1.h>
+#include <asm/udbg.h>
+#include <asm/cell-regs.h>
+
+#include "interrupt.h"
+#include "pervasive.h"
+#include "ras.h"
+#include "io-workarounds.h"
+
+static void qpace_show_cpuinfo(struct seq_file *m)
+{
+ struct device_node *root;
+ const char *model = "";
+
+ root = of_find_node_by_path("/");
+ if (root)
+ model = of_get_property(root, "model", NULL);
+ seq_printf(m, "machine\t\t: CHRP %s\n", model);
+ of_node_put(root);
+}
+
+static void qpace_progress(char *s, unsigned short hex)
+{
+ printk("*** %04x : %s\n", hex, s ? s : "");
+}
+
+static int __init qpace_publish_devices(void)
+{
+ int node;
+
+ /* Publish OF platform devices for southbridge IOs */
+ of_platform_bus_probe(NULL, NULL, NULL);
+
+ /* There is no device for the MIC memory controller, thus we create
+ * a platform device for it to attach the EDAC driver to.
+ */
+ for_each_online_node(node) {
+ if (cbe_get_cpu_mic_tm_regs(cbe_node_to_cpu(node)) == NULL)
+ continue;
+ platform_device_register_simple("cbe-mic", node, NULL, 0);
+ }
+
+ return 0;
+}
+machine_subsys_initcall(qpace, qpace_publish_devices);
+
+extern int qpace_notify(struct device *dev)
+{
+ /* set dma_ops for of_platform bus */
+ if (dev->bus && dev->bus->name
+ && !strcmp(dev->bus->name, "of_platform"))
+ set_dma_ops(dev, &dma_direct_ops);
+
+ return 0;
+}
+
+static void __init qpace_setup_arch(void)
+{
+#ifdef CONFIG_SPU_BASE
+ spu_priv1_ops = &spu_priv1_mmio_ops;
+ spu_management_ops = &spu_management_of_ops;
+#endif
+
+ cbe_regs_init();
+
+#ifdef CONFIG_CBE_RAS
+ cbe_ras_init();
+#endif
+
+#ifdef CONFIG_SMP
+ smp_init_cell();
+#endif
+
+ /* init to some ~sane value until calibrate_delay() runs */
+ loops_per_jiffy = 50000000;
+
+ cbe_pervasive_init();
+#ifdef CONFIG_DUMMY_CONSOLE
+ conswitchp = &dummy_con;
+#endif
+
+ /* set notifier function */
+ platform_notify = &qpace_notify;
+}
+
+static int __init qpace_probe(void)
+{
+ unsigned long root = of_get_flat_dt_root();
+
+ if (!of_flat_dt_is_compatible(root, "IBM,QPACE"))
+ return 0;
+
+ hpte_init_native();
+
+ return 1;
+}
+
+define_machine(qpace) {
+ .name = "QPACE",
+ .probe = qpace_probe,
+ .setup_arch = qpace_setup_arch,
+ .show_cpuinfo = qpace_show_cpuinfo,
+ .restart = rtas_restart,
+ .power_off = rtas_power_off,
+ .halt = rtas_halt,
+ .get_boot_time = rtas_get_boot_time,
+ .calibrate_decr = generic_calibrate_decr,
+ .progress = qpace_progress,
+ .init_IRQ = iic_init_IRQ,
+#ifdef CONFIG_KEXEC
+ .machine_kexec = default_machine_kexec,
+ .machine_kexec_prepare = default_machine_kexec_prepare,
+ .machine_crash_shutdown = default_machine_crash_shutdown,
+#endif
+};
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index e0dbd38..e2667a8 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -161,7 +161,7 @@ config EDAC_PASEMI
config EDAC_CELL
tristate "Cell Broadband Engine memory controller"
- depends on EDAC_MM_EDAC && PPC_CELL_NATIVE
+ depends on EDAC_MM_EDAC && PPC_CELL_COMMON
help
Support for error detection and correction on the
Cell Broadband Engine internal memory controller
--
1.5.6.3
--
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: Commits added to powerpc.git next and master branches
2008-12-21 6:37 Commits added to powerpc.git next and master branches Paul Mackerras
` (4 preceding siblings ...)
2008-12-22 21:34 ` [patch 2/2] powerpc/cell: add QPACE as a separate Cell platform arnd
@ 2008-12-23 13:20 ` Peter Korsgaard
5 siblings, 0 replies; 13+ messages in thread
From: Peter Korsgaard @ 2008-12-23 13:20 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
>>>>> "Paul" == Paul Mackerras <paulus@samba.org> writes:
Hi,
I still don't see 'make udbg 16550 boot console configurable for
EMBEDDED' (http://patchwork.ozlabs.org/patch/15441/) - Please
consider.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 13+ messages in thread