MIPS: SGI-IP27: use generic PCI driver
Converted bridge code to a platform driver using the PCI generic driver framework and use adding platform devices during xtalk scan. This allows easier sharing bridge driver for other SGI platforms like IP30 (Octane) and IP35 (Origin 3k, Fuel, Tezro). Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> [paul.burton@mips.com: - Leave __phys_to_dma(), __dma_to_phys() & pcibus_to_node() in arch/mips/pci/pci-ip27.c since the motivation for moving them disappeared when the driver stopped being moved to drivers/pci.] Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <jhogan@kernel.org> Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org
This commit is contained in:

committed by
Paul Burton

父節點
8041edb592
當前提交
a57140e9a8
@@ -184,5 +184,7 @@ void __init plat_mem_setup(void)
|
||||
|
||||
ioc3_eth_init();
|
||||
|
||||
ioport_resource.start = 0;
|
||||
ioport_resource.end = ~0UL;
|
||||
set_io_port_base(IO_BASE);
|
||||
}
|
||||
|
@@ -9,6 +9,9 @@
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/smp.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/platform_data/xtalk-bridge.h>
|
||||
#include <asm/sn/addrs.h>
|
||||
#include <asm/sn/types.h>
|
||||
#include <asm/sn/klconfig.h>
|
||||
#include <asm/sn/hub.h>
|
||||
@@ -20,7 +23,48 @@
|
||||
#define XXBOW_WIDGET_PART_NUM 0xd000 /* Xbow in Xbridge */
|
||||
#define BASE_XBOW_PORT 8 /* Lowest external port */
|
||||
|
||||
extern int bridge_probe(nasid_t nasid, int widget, int masterwid);
|
||||
static void bridge_platform_create(nasid_t nasid, int widget, int masterwid)
|
||||
{
|
||||
struct xtalk_bridge_platform_data *bd;
|
||||
struct platform_device *pdev;
|
||||
unsigned long offset;
|
||||
|
||||
bd = kzalloc(sizeof(*bd), GFP_KERNEL);
|
||||
if (!bd)
|
||||
goto no_mem;
|
||||
pdev = platform_device_alloc("xtalk-bridge", PLATFORM_DEVID_AUTO);
|
||||
if (!pdev) {
|
||||
kfree(bd);
|
||||
goto no_mem;
|
||||
}
|
||||
|
||||
offset = NODE_OFFSET(nasid);
|
||||
|
||||
bd->bridge_addr = RAW_NODE_SWIN_BASE(nasid, widget);
|
||||
bd->intr_addr = BIT_ULL(47) + 0x01800000 + PI_INT_PEND_MOD;
|
||||
bd->nasid = nasid;
|
||||
bd->masterwid = masterwid;
|
||||
|
||||
bd->mem.name = "Bridge PCI MEM";
|
||||
bd->mem.start = offset + (widget << SWIN_SIZE_BITS);
|
||||
bd->mem.end = bd->mem.start + SWIN_SIZE - 1;
|
||||
bd->mem.flags = IORESOURCE_MEM;
|
||||
bd->mem_offset = offset;
|
||||
|
||||
bd->io.name = "Bridge PCI IO";
|
||||
bd->io.start = offset + (widget << SWIN_SIZE_BITS);
|
||||
bd->io.end = bd->io.start + SWIN_SIZE - 1;
|
||||
bd->io.flags = IORESOURCE_IO;
|
||||
bd->io_offset = offset;
|
||||
|
||||
platform_device_add_data(pdev, bd, sizeof(*bd));
|
||||
platform_device_add(pdev);
|
||||
pr_info("xtalk:n%d/%x bridge widget\n", nasid, widget);
|
||||
return;
|
||||
|
||||
no_mem:
|
||||
pr_warn("xtalk:n%d/%x bridge create out of memory\n", nasid, widget);
|
||||
}
|
||||
|
||||
static int probe_one_port(nasid_t nasid, int widget, int masterwid)
|
||||
{
|
||||
@@ -31,13 +75,10 @@ static int probe_one_port(nasid_t nasid, int widget, int masterwid)
|
||||
(RAW_NODE_SWIN_BASE(nasid, widget) + WIDGET_ID);
|
||||
partnum = XWIDGET_PART_NUM(widget_id);
|
||||
|
||||
printk(KERN_INFO "Cpu %d, Nasid 0x%x, widget 0x%x (partnum 0x%x) is ",
|
||||
smp_processor_id(), nasid, widget, partnum);
|
||||
|
||||
switch (partnum) {
|
||||
case BRIDGE_WIDGET_PART_NUM:
|
||||
case XBRIDGE_WIDGET_PART_NUM:
|
||||
bridge_probe(nasid, widget, masterwid);
|
||||
bridge_platform_create(nasid, widget, masterwid);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -52,8 +93,6 @@ static int xbow_probe(nasid_t nasid)
|
||||
klxbow_t *xbow_p;
|
||||
unsigned masterwid, i;
|
||||
|
||||
printk("is xbow\n");
|
||||
|
||||
/*
|
||||
* found xbow, so may have multiple bridges
|
||||
* need to probe xbow
|
||||
@@ -117,19 +156,17 @@ static void xtalk_probe_node(cnodeid_t nid)
|
||||
(RAW_NODE_SWIN_BASE(nasid, 0x0) + WIDGET_ID);
|
||||
partnum = XWIDGET_PART_NUM(widget_id);
|
||||
|
||||
printk(KERN_INFO "Cpu %d, Nasid 0x%x: partnum 0x%x is ",
|
||||
smp_processor_id(), nasid, partnum);
|
||||
|
||||
switch (partnum) {
|
||||
case BRIDGE_WIDGET_PART_NUM:
|
||||
bridge_probe(nasid, 0x8, 0xa);
|
||||
bridge_platform_create(nasid, 0x8, 0xa);
|
||||
break;
|
||||
case XBOW_WIDGET_PART_NUM:
|
||||
case XXBOW_WIDGET_PART_NUM:
|
||||
pr_info("xtalk:n%d/0 xbow widget\n", nasid);
|
||||
xbow_probe(nasid);
|
||||
break;
|
||||
default:
|
||||
printk(" unknown widget??\n");
|
||||
pr_info("xtalk:n%d/0 unknown widget (0x%x)\n", nasid, partnum);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user