From: Joshua Kinard <kumba@xxxxxxxxxx>
This patch, formerly of two (but the first was added to the tree in
4.1), cleans up the Xtalk detection code used by IP27 with some of the
code used in the IP30 port.
Specifically, it enables use of the static widget_idents struct added in
the earlier 4.1 patch to identify Xtalk devices, and for any
non-BRIDGE/XBRIDGE Xtalk device, will register as a platform_device
(which, right now, should only be the Impact/MardiGras board that can be
converted from an Octane).
Signed-off-by: Joshua Kinard <kumba@xxxxxxxxxx>
---
arch/mips/sgi-ip27/ip27-xtalk.c | 87 +++++++++++++++++++++---------
1 file changed, 61 insertions(+), 26 deletions(-)
This version corrects the diffstat output and is diff'ed against the
post-4.2/pre-4.3 tree.
linux-mips-ip27-xtalk-cleanup.patch
diff --git a/arch/mips/sgi-ip27/ip27-xtalk.c b/arch/mips/sgi-ip27/ip27-xtalk.c
index 20f582a..c262208 100644
--- a/arch/mips/sgi-ip27/ip27-xtalk.c
+++ b/arch/mips/sgi-ip27/ip27-xtalk.c
@@ -9,38 +9,55 @@
#include <linux/kernel.h>
#include <linux/smp.h>
+#include <linux/platform_device.h>
+
#include <asm/sn/types.h>
#include <asm/sn/klconfig.h>
#include <asm/sn/hub.h>
#include <asm/pci/bridge.h>
#include <asm/xtalk/xtalk.h>
+#include <asm/xtalk/xwidget.h>
-
-#define XBOW_WIDGET_PART_NUM 0x0
-#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 int probe_one_port(nasid_t nasid, int widget, int masterwid)
{
- widgetreg_t widget_id;
- xwidget_part_num_t partnum;
+ const struct widget_ident *res;
+ u32 wid_id, wid_part, wid_mfgr, wid_rev;
- widget_id = *(volatile widgetreg_t *)
+ wid_id = *(volatile widgetreg_t *)
(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);
+ wid_mfgr = XWIDGET_MFG_NUM(wid_id);
+ wid_part = XWIDGET_PART_NUM(wid_id);
+ wid_rev = XWIDGET_REV_NUM(wid_id);
+
+ for (res = widget_idents; res->name; res++)
+ if ((res->mfgr == wid_mfgr) &&
+ (res->part == wid_part))
+ break;
+
+ if (res->name == NULL) {
+ pr_info("xtalk:%d unknown widget 0x%08x\n", widget, wid_id);
+ return -ENODEV;
+ }
- switch (partnum) {
- case BRIDGE_WIDGET_PART_NUM:
- case XBRIDGE_WIDGET_PART_NUM:
+ pr_info("Cpu %d, Nasid 0x%x, widget 0x%x (part 0x%x) is ",
+ smp_processor_id(), nasid, widget, wid_part);
+
+ switch (wid_part) {
+ case WIDGET_BRIDG_PART_NUM:
+ case WIDGET_XBRDG_PART_NUM:
bridge_probe(nasid, widget, masterwid);
break;
default:
- break;
+ if (platform_device_register_simple(res->name, widget, NULL, 0))
+ pr_info("xtalk:%d %s widget (rev %s) registered as "
+ "platform device.\n", widget, res->name,
+ (res->revs[wid_rev] ?
+ res->revs[wid_rev] : "unknown"));
}
return 0;
@@ -103,8 +120,8 @@ void xtalk_probe_node(cnodeid_t nid)
{
volatile u64 hubreg;
nasid_t nasid;
- xwidget_part_num_t partnum;
- widgetreg_t widget_id;
+ const struct widget_ident *res;
+ u32 wid_id, wid_part, wid_mfgr, wid_rev;
nasid = COMPACT_TO_NASID_NODEID(nid);
hubreg = REMOTE_HUB_L(nasid, IIO_LLP_CSR);
@@ -113,23 +130,41 @@ void xtalk_probe_node(cnodeid_t nid)
if (!(hubreg & IIO_LLP_CSR_IS_UP))
return;
- widget_id = *(volatile widgetreg_t *)
+ wid_id = *(volatile widgetreg_t *)
(RAW_NODE_SWIN_BASE(nasid, 0x0) + WIDGET_ID);
- partnum = XWIDGET_PART_NUM(widget_id);
+ wid_mfgr = XWIDGET_MFG_NUM(wid_id);
+ wid_part = XWIDGET_PART_NUM(wid_id);
+ wid_rev = XWIDGET_REV_NUM(wid_id);
+
+ for (res = widget_idents; res->name; res++)
+ if ((res->mfgr == wid_mfgr) &&
+ (res->part == wid_part))
+ break;
+
+ if (res->name == NULL) {
+ pr_info("xtalk:%d unknown widget 0x%08x\n", 0x0, wid_id);
+ goto out;
+ }
- printk(KERN_INFO "Cpu %d, Nasid 0x%x: partnum 0x%x is ",
- smp_processor_id(), nasid, partnum);
+ pr_info("Cpu %d, Nasid 0x%x, wid_part 0x%x (part 0x%x) is ",
+ smp_processor_id(), nasid, 0x0, wid_part);
- switch (partnum) {
- case BRIDGE_WIDGET_PART_NUM:
- bridge_probe(nasid, 0x8, 0xa);
+ switch (wid_part) {
+ case WIDGET_BRIDG_PART_NUM:
+ bridge_probe(nasid, 0x8, 0xa); /* XXX: Fix! */
break;
- case XBOW_WIDGET_PART_NUM:
- case XXBOW_WIDGET_PART_NUM:
+ case WIDGET_XBOW_PART_NUM:
+ case WIDGET_XXBOW_PART_NUM:
xbow_probe(nasid);
break;
default:
- printk(" unknown widget??\n");
- break;
+ if (platform_device_register_simple(res->name, 0x0, NULL, 0))
+ pr_info("xtalk:%d %s widget (rev %s) registered as "
+ "as platform device.\n", 0x0, res->name,
+ (res->revs[wid_rev] ?
+ res->revs[wid_rev] : "unknown"));
}
+
+out:
+ return;
}
