MIPS: SGI-IP27: add support for the IP35 (Bedrock hub) machines
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest53 patches 22 repliesIn review
- v138 patches 5 repliesSuperseded
Changes in v2 from the cover letter
- New patches 1-5 (Bridge config space and slot fixes), 37 (Origin 300 IO8 serial interrupts), 45-47 and 49 (IOC4 ATA/ATAPI), 48 (ip27_defconfig update) and 50-53 (front-panel LEDs).
- Patch 15 (was 10): slot 0 takes master_nasid as its node, not 0.
- Patch 24 (was 19): also enables the SGI 1-wire master and the DS250x slave the Bridge probe waits for.
- Patch 25 (was 20): comment and message name the IOC3 on the 32-bit window behind an XBridge or PIC.
- Patch 26 (was 21), retitled (Christoph Hellwig): an XBridge or PIC device with a 64-bit DMA mask uses the 64-bit direct form with bit 55 set, other devices the 32-bit window with SWIOTLB and ZONE_DMA32; a PIC bus in PCI-X mode uses the direct form only; the IOC3 and IOC4 always use the window, with byte swapping off; an IOC3 or IOC4 MFD cell maps through its PCI parent.
- Patch 29 (was 24): the PIC slot count goes through bridge_nslots() from patch 1.
- Patch 30 (was 25): probe fails without a platform device id.
- Patch 31 (was 26): probe fails on a PCI id without variant data; const mfd_cell array; MAINTAINERS covers sgi-ioc3-serial.h; the IOC4 register layout includes the ATA/ATAPI block; the IOC4 firmware revision is printed, and the serial ports need revision 62 or later; the PCI id is PCI_DEVICE_ID_SGI_IOC4, which patch 26 adds.
- Patch 36 (was 31): const mfd_cell array.
- Patch 38 (was 32): the random fallback address is set with eth_hw_addr_random().
- Patch 42 (was 36): passes the "sgi,master-widget" property.
- Patch 43 (was 37): the PROM's console baud rate is printed unsigned, so 38400 does not come out negative.
- mfd subjects capitalised; rebased onto v7.3-rc7 and the NMI v2 patch.
- v1: https://lore.kernel.org/all/[email protected]/
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/53 | MIPS: PCI: xtalk-bridge: refuse device numbers past the last slotarch/ | +16 | 0 replies | |
| 2/53 | MIPS: PCI: xtalk-bridge: assign slots the PROM leaves unconfiguredarch/ | +192 | 0 replies | |
| 3/53 | MIPS: PCI: xtalk-bridge: write a type 1 IOC3 through the type 1 windowarch/ | +1 | 0 replies | |
| 4/53 | MIPS: PCI: xtalk-bridge: flush config space writesarch/ | +5 | 0 replies | |
| 5/53 | MIPS: PCI: xtalk-bridge: reassign slots whose devio window maps elsewherearch/ | +58 | 0 replies | |
| 6/53 | MIPS: Xtalk: guard the widget identification table from assemblyarch/ | +2 | 0 replies | |
| 7/53 | MIPS: SGI-IP27: dump the NMI save areas the CPU scan recordedarch/ | +8 | 0 replies | |
| 8/53 | MIPS: SGI-IP27: add REMOTE_HUB_PI_S()/REMOTE_HUB_PI_L()arch/ | +21 | 0 replies | |
| 9/53 | MIPS: SGI-IP27: detect Bedrock hubs at bootarch/ arch/ | +15 | 0 replies | |
| 10/53 | MIPS: SGI-IP27: widen Kconfig for the Bedrock-based machinesarch/ | +5 | 0 replies | |
| 11/53 | MIPS: SGI-IP27: fold the dead SN1 arm out of klconfig.harch/ | +2 | 0 replies | |
| 12/53 | MIPS: SGI-IP27: choose the node address layout at runtimearch/ arch/ arch/ | +37 | 0 replies | |
| 13/53 | MIPS: SGI-IP27: add the Bedrock hub register windowsarch/ arch/ | +16 | 0 replies | |
| 14/53 | MIPS: SGI-IP27: decode a Bedrock hub's node id and system sizearch/ arch/ arch/ +4 more | +63 | 0 replies | |
| 15/53 | MIPS: SGI-IP27: put a Bedrock hub's boot CPU in slot 0arch/ | +11 | 0 replies | |
| 16/53 | MIPS: SGI-IP27: lay out node memory in 1GB banks on Bedrock hubsarch/ | +20 | 0 replies | |
| 17/53 | MIPS: SGI-IP27: reserve the bottom 64MB of node 0 on Bedrock hubsarch/ | +12 | 0 replies | |
| 18/53 | MIPS: SGI-IP27: route interrupt masks and slices through both PIsarch/ arch/ arch/ +3 more | +36 | 0 replies | |
| 19/53 | MIPS: SGI-IP27: address a CPU's own PI for NMI, IPI and RT counterarch/ arch/ arch/ +5 more | +73 | 0 replies | |
| 20/53 | MIPS: SGI-IP27: take a CPU's node from the CPU table in per_cpu_init()arch/ | +1 | 0 replies | |
| 21/53 | MIPS: SGI-IP27: resolve the mapped-kernel node shift at runtimearch/ | +20 | 0 replies | |
| 22/53 | MIPS: SGI-IP27: load the kernel at node offset 0x40000arch/ arch/ arch/ | +10 | 0 replies | |
| 23/53 | MIPS: SGI-IP27: xbow_probe(): recognize KLTYPE_PBRICK_XBOWarch/ | +13 | 2 replies | |
| 24/53 | MIPS: ip27_defconfig: enable the IOC3 MFD, its cell drivers and tg3arch/ | +7 | 0 replies | |
| 25/53 | net: ethernet: sgi: ioc3-eth: apply the DMA attributes only to 64-bit addressesdrivers/ | +22 | 0 replies | |
| 26/53 | MIPS: SGI-IP27: pick the XBridge and PIC DMA address form by maskarch/ arch/ arch/ +4 more | +139 | 0 replies | |
| 27/53 | MIPS: SGI-IP27: recognize the PXBow crossbararch/ arch/ | +9 | 0 replies | |
| 28/53 | MIPS: PCI: xtalk-bridge: recognize the PIC widget's 64-bit-only registersarch/ arch/ | +89 | 0 replies | |
| 29/53 | MIPS: PCI: xtalk-bridge: match PIC's register-level differencesarch/ arch/ | +58 | 0 replies | |
| 30/53 | rtc: m48t35: support the SGI IP35 timekeeper's 1968 year basedrivers/ | +19 | 2 replies | |
| 31/53 | mfd: ioc3: Add support for IOC4MAINTAINERS arch/ drivers/ +2 more | +438 | 2 replies | |
| 32/53 | MIPS: SGI-IP27: dispatch the early console between IOC3 and IOC4arch/ | +46 | 0 replies | |
| 33/53 | MIPS: SGI-IP27: add L1 system controller supportarch/ arch/ arch/ +1 more | +440 | 0 replies | |
| 34/53 | MIPS: SGI-IP27: wire the L1 into reset and the Ethernet addressarch/ arch/ | +305 | 0 replies | |
| 35/53 | MIPS: PCI: xtalk-bridge: take the board part number from the L1arch/ arch/ arch/ | +125 | 0 replies | |
| 36/53 | mfd: ioc3: Add IP34 system-board entry to ioc3_infos[]drivers/ | +46 | 0 replies | |
| 37/53 | mfd: ioc3: Cross the serial IRQs on the Origin 300 IO8drivers/ | +63 | 0 replies | |
| 38/53 | net: ethernet: sgi: ioc3-eth: fall back to the platform MAC addressdrivers/ | +15 | 0 replies | |
| 39/53 | MIPS: SGI-IP27: don't register a w1 master on an XBridge or PICarch/ | +31 | 0 replies | |
| 40/53 | MIPS: SGI-IP27: report a Bedrock machine as SGI IP35arch/ | +3 | 0 replies | |
| 41/53 | MIPS: SGI-IP27: identify the machine by the L1 brick typearch/ arch/ arch/ | +114 | 0 replies | |
| 42/53 | MIPS: SGI-IP27: register the Odyssey graphics widgetarch/ | +39 | 0 replies | |
| 43/53 | MIPS: SGI-IP27: take the console from the KLCONFIG header on IP35arch/ | +22 | 0 replies | |
| 44/53 | MIPS: SGI-IP27: give each CPU its own topology package idarch/ | +8 | 0 replies | |
| 45/53 | ata: add pata_sgiioc4 driver for the SGI IOC4 ATA/ATAPI controllerdrivers/ drivers/ drivers/ | +322 | 0 replies | |
| 46/53 | mfd: ioc3: Add IOC4 ATA/ATAPI cellarch/ drivers/ | +20 | 2 replies | |
| 47/53 | MAINTAINERS: add an entry for the SGI IOC4 ATA driverMAINTAINERS | +6 | 3 replies | |
| 48/53 | MIPS: ip27_defconfig: update for the onboard hardwarearch/ | +13 | 0 replies | |
| 49/53 | MIPS: ip27_defconfig: enable pata_sgiioc4 and the DVD-ROM patharch/ | +5 | 0 replies | |
| 50/53 | MIPS: SGI-IP27: add L1 front-panel LED and display requestsarch/ arch/ | +83 | 0 replies | |
| 51/53 | leds: Add driver for the SGI Fuel and Tezro front-panel LEDsdrivers/ drivers/ drivers/ | +157 | 2 replies | |
| 52/53 | MIPS: SGI-IP27: show the OS state on the Fuel and Tezro front panelsarch/ | +52 | 0 replies | |
| 53/53 | MIPS: ip27_defconfig: enable the Fuel and Tezro front-panel LEDsarch/ | +7 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
Cover letter [PATCH v2 00/53] MIPS: SGI-IP27: add support for the IP35 (Bedrock hub) machines
This series adds support for the SGI machines built around the Bedrock hub (IP35), such as Fuel and Tezro, to the IP27 platform code.
Patches 1-5 fix the config space accessors and slot setup of the Bridge, XBridge and PIC driver: device numbers past the last slot, slots the PROM leaves unconfigured, the type 1 IOC3 write, posted config writes and slots whose devio window the PROM maps elsewhere.
Patches 6-22 teach the IP27 code the Bedrock hub: detection, the node address layout and register windows, the node id, CPU slots, memory banks, both PIs and the kernel load address.
Patches 23-32 add the crossbar, bridge and I/O parts of these machines:
PXBow, XBridge, PIC and IOC4.
Patches 33-44 add the L1 system controller and what it provides, the Origin 300 IO8 serial interrupts, the Odyssey graphics widget, the KLCONFIG console and a topology package id per CPU.
Patches 45-47 add a libata driver for the IOC4 ATA/ATAPI controller, which carries the DVD-ROM of Tezro and Origin 350 I-bricks. It drives PIO4 and multiword DMA mode 2.
Patch 48 updates ip27_defconfig to the onboard hardware of these machines, dropping add-in card drivers and enabling USB and PS/2 input. Patch 49 enables the IOC4 ATA driver in it.
Patches 50-53 add a driver for the Fuel and Tezro front-panel LEDs, which the L1 sets, as white:status and red:fault. The red LED blinks on panic, and a Tezro shows the OS state on its L1 display.
The series applies on top of "[PATCH v2] MIPS: SGI-IP27: print the NMI dump on an nbcon console", which the NMI dump needs to reach the 8250 console.
Tested on SGI Fuel and Tezro, the Fuel with an LSI 53C1030 and an NVMe drive behind a PCI-X-to-PCIe bridge in slots the PROM leaves unconfigured, on a 4GB Tezro with an LSI SAS1064 on a PCI-X bus, and for patch 5 also on an Octane. Patches 50-53 were tested on a Tezro only, and patch 48 was only built.
On IP27 (Hub) machines:
- patch 22 moves the kernel up by 144KB, and the 144KB below it stays reserved and unused;
- with patch 26 SWIOTLB takes 64MB of node 0 on a multi-node Origin, and ZONE_DMA32 spans the first 2GB;
- the XBridge and PIC DMA address forms (patch 26) and the w1 change (patch 39) do nothing on a Hub with classic Bridges;
- patches 1-5 change the config space handling of its Bridges as well.
Given I have no IP27 boxes, none of this was booted on one. ip27_defconfig builds at every patch, ip30_defconfig at every patch that changes code it builds.
An XBridge or PIC on a Bedrock hub takes its board setup from the first board part number the L1 reports that the setup table knows (patch 35), so on a machine with several bricks every such bridge gets that one board's setup.
Patch 42 registers the Odyssey graphics widget as the "sgi-odyssey" platform device used by the Odyssey DRM driver, a separate series, and passes it the master widget id as the "sgi,master-widget" property.
checkpatch reports "spaces required around that ':'" in patches 14 and 21 for the GAS numeric local labels 1: and 2: in assembler macros.
Changes in v2:
- New patches 1-5 (Bridge config space and slot fixes), 37 (Origin 300 IO8 serial interrupts), 45-47 and 49 (IOC4 ATA/ATAPI), 48 (ip27_defconfig update) and 50-53 (front-panel LEDs).
- Patch 15 (was 10): slot 0 takes master_nasid as its node, not 0.
- Patch 24 (was 19): also enables the SGI 1-wire master and the DS250x slave the Bridge probe waits for.
- Patch 25 (was 20): comment and message name the IOC3 on the 32-bit window behind an XBridge or PIC.
- Patch 26 (was 21), retitled (Christoph Hellwig): an XBridge or PIC device with a 64-bit DMA mask uses the 64-bit direct form with bit 55 set, other devices the 32-bit window with SWIOTLB and ZONE_DMA32; a PIC bus in PCI-X mode uses the direct form only; the IOC3 and IOC4 always use the window, with byte swapping off; an IOC3 or IOC4 MFD cell maps through its PCI parent.
- Patch 29 (was 24): the PIC slot count goes through bridge_nslots() from patch 1.
- Patch 30 (was 25): probe fails without a platform device id.
- Patch 31 (was 26): probe fails on a PCI id without variant data; const mfd_cell array; MAINTAINERS covers sgi-ioc3-serial.h; the IOC4 register layout includes the ATA/ATAPI block; the IOC4 firmware revision is printed, and the serial ports need revision 62 or later; the PCI id is PCI_DEVICE_ID_SGI_IOC4, which patch 26 adds.
- Patch 36 (was 31): const mfd_cell array.
- Patch 38 (was 32): the random fallback address is set with eth_hw_addr_random().
- Patch 42 (was 36): passes the "sgi,master-widget" property.
- Patch 43 (was 37): the PROM's console baud rate is printed unsigned, so 38400 does not come out negative.
- mfd subjects capitalised; rebased onto v7.3-rc7 and the NMI v2 patch.
- v1: https://lore.kernel.org/all/[email protected]/
Imre Kaloz (53):
MIPS: PCI: xtalk-bridge: refuse device numbers past the last slot
MIPS: PCI: xtalk-bridge: assign slots the PROM leaves unconfigured
MIPS: PCI: xtalk-bridge: write a type 1 IOC3 through the type 1 window
MIPS: PCI: xtalk-bridge: flush config space writes
MIPS: PCI: xtalk-bridge: reassign slots whose devio window maps
elsewhere
MIPS: Xtalk: guard the widget identification table from assembly
MIPS: SGI-IP27: dump the NMI save areas the CPU scan recorded
MIPS: SGI-IP27: add REMOTE_HUB_PI_S()/REMOTE_HUB_PI_L()
MIPS: SGI-IP27: detect Bedrock hubs at boot
MIPS: SGI-IP27: widen Kconfig for the Bedrock-based machines
MIPS: SGI-IP27: fold the dead SN1 arm out of klconfig.h
MIPS: SGI-IP27: choose the node address layout at runtime
MIPS: SGI-IP27: add the Bedrock hub register windows
MIPS: SGI-IP27: decode a Bedrock hub's node id and system size
MIPS: SGI-IP27: put a Bedrock hub's boot CPU in slot 0
MIPS: SGI-IP27: lay out node memory in 1GB banks on Bedrock hubs
MIPS: SGI-IP27: reserve the bottom 64MB of node 0 on Bedrock hubs
MIPS: SGI-IP27: route interrupt masks and slices through both PIs
MIPS: SGI-IP27: address a CPU's own PI for NMI, IPI and RT counter
MIPS: SGI-IP27: take a CPU's node from the CPU table in per_cpu_init()
MIPS: SGI-IP27: resolve the mapped-kernel node shift at runtime
MIPS: SGI-IP27: load the kernel at node offset 0x40000
MIPS: SGI-IP27: xbow_probe(): recognize KLTYPE_PBRICK_XBOW
MIPS: ip27_defconfig: enable the IOC3 MFD, its cell drivers and tg3
net: ethernet: sgi: ioc3-eth: apply the DMA attributes only to 64-bit
addresses
MIPS: SGI-IP27: pick the XBridge and PIC DMA address form by mask
MIPS: SGI-IP27: recognize the PXBow crossbar
MIPS: PCI: xtalk-bridge: recognize the PIC widget's 64-bit-only
registers
MIPS: PCI: xtalk-bridge: match PIC's register-level differences
rtc: m48t35: support the SGI IP35 timekeeper's 1968 year base
mfd: ioc3: Add support for IOC4
MIPS: SGI-IP27: dispatch the early console between IOC3 and IOC4
MIPS: SGI-IP27: add L1 system controller support
MIPS: SGI-IP27: wire the L1 into reset and the Ethernet address
MIPS: PCI: xtalk-bridge: take the board part number from the L1
mfd: ioc3: Add IP34 system-board entry to ioc3_infos[]
mfd: ioc3: Cross the serial IRQs on the Origin 300 IO8
net: ethernet: sgi: ioc3-eth: fall back to the platform MAC address
MIPS: SGI-IP27: don't register a w1 master on an XBridge or PIC
MIPS: SGI-IP27: report a Bedrock machine as SGI IP35
MIPS: SGI-IP27: identify the machine by the L1 brick type
MIPS: SGI-IP27: register the Odyssey graphics widget
MIPS: SGI-IP27: take the console from the KLCONFIG header on IP35
MIPS: SGI-IP27: give each CPU its own topology package id
ata: add pata_sgiioc4 driver for the SGI IOC4 ATA/ATAPI controller
mfd: ioc3: Add IOC4 ATA/ATAPI cell
MAINTAINERS: add an entry for the SGI IOC4 ATA driver
MIPS: ip27_defconfig: update for the onboard hardware
MIPS: ip27_defconfig: enable pata_sgiioc4 and the DVD-ROM path
MIPS: SGI-IP27: add L1 front-panel LED and display requests
leds: Add driver for the SGI Fuel and Tezro front-panel LEDs
MIPS: SGI-IP27: show the OS state on the Fuel and Tezro front panels
MIPS: ip27_defconfig: enable the Fuel and Tezro front-panel LEDs
MAINTAINERS | 7 + arch/mips/Kconfig | 13 +- arch/mips/configs/ip27_defconfig | 192 +--- .../include/asm/mach-ip27/kernel-entry-init.h | 33 +- arch/mips/include/asm/pci/bridge.h | 88 +- arch/mips/include/asm/sn/addrs.h | 39 +- arch/mips/include/asm/sn/agent.h | 5 +- arch/mips/include/asm/sn/arch.h | 8 + arch/mips/include/asm/sn/intr.h | 14 +- arch/mips/include/asm/sn/ioc4.h | 143 +++ arch/mips/include/asm/sn/klconfig.h | 19 +- arch/mips/include/asm/sn/kldir.h | 1 + arch/mips/include/asm/sn/l1.h | 38 + arch/mips/include/asm/sn/mapped_kernel.h | 6 +- arch/mips/include/asm/sn/sn0/addrs.h | 8 +- arch/mips/include/asm/sn/sn0/hub.h | 37 +- arch/mips/include/asm/sn/sn0/hubni.h | 3 + arch/mips/include/asm/sn/sn1/addrs.h | 22 + arch/mips/include/asm/sn/sn1/hub.h | 40 + arch/mips/include/asm/sn/sn1/kldir.h | 14 + arch/mips/include/asm/xtalk/xwidget.h | 11 +- arch/mips/pci/pci-xtalk-bridge.c | 467 ++++++++- arch/mips/sgi-ip27/Makefile | 4 +- arch/mips/sgi-ip27/Platform | 11 +- arch/mips/sgi-ip27/ip27-berr.c | 4 +- arch/mips/sgi-ip27/ip27-console.c | 47 +- arch/mips/sgi-ip27/ip27-init.c | 178 +++- arch/mips/sgi-ip27/ip27-irq.c | 17 +- arch/mips/sgi-ip27/ip27-l1.c | 884 ++++++++++++++++++ arch/mips/sgi-ip27/ip27-memory.c | 55 +- arch/mips/sgi-ip27/ip27-nmi.c | 54 +- arch/mips/sgi-ip27/ip27-reset.c | 47 +- arch/mips/sgi-ip27/ip27-smp.c | 41 +- arch/mips/sgi-ip27/ip27-timer.c | 12 +- arch/mips/sgi-ip27/ip27-xtalk.c | 138 ++- drivers/ata/Kconfig | 10 + drivers/ata/Makefile | 1 + drivers/ata/pata_sgiioc4.c | 311 ++++++ drivers/leds/Kconfig | 12 + drivers/leds/Makefile | 1 + drivers/leds/leds-ip35.c | 144 +++ drivers/mfd/ioc3.c | 455 ++++++++- drivers/net/ethernet/sgi/ioc3-eth.c | 44 +- drivers/rtc/rtc-m48t35.c | 33 +- drivers/tty/serial/8250/8250_ioc3.c | 5 +- include/linux/pci_ids.h | 1 + include/linux/platform_data/sgi-ioc3-serial.h | 13 + include/linux/platform_data/xtalk-bridge.h | 2 + 48 files changed, 3334 insertions(+), 398 deletions(-) create mode 100644 arch/mips/include/asm/sn/ioc4.h create mode 100644 arch/mips/include/asm/sn/l1.h create mode 100644 arch/mips/include/asm/sn/sn1/addrs.h create mode 100644 arch/mips/include/asm/sn/sn1/hub.h create mode 100644 arch/mips/include/asm/sn/sn1/kldir.h create mode 100644 arch/mips/sgi-ip27/ip27-l1.c create mode 100644 drivers/ata/pata_sgiioc4.c create mode 100644 drivers/leds/leds-ip35.c create mode 100644 include/linux/platform_data/sgi-ioc3-serial.h
base-commit: 24a19b953e2a3d0ea5a8c4951a0ab8f32720c907
prerequisite-patch-id: 642054c4c189f29a3f589a119d2311c20e395a23
Signature · 1 line
2.47.3