From: Pat Gefre <pfg@sgi.com>
New code for Opus and CGbrick
More minor clean up
---
25-akpm/arch/ia64/sn/io/machvec/pci_bus_cvlink.c | 2
25-akpm/arch/ia64/sn/io/sn2/klconflib.c | 26 -----
25-akpm/arch/ia64/sn/io/sn2/l1_command.c | 68 +--------------
25-akpm/arch/ia64/sn/io/sn2/ml_iograph.c | 104 ++++++++++-------------
25-akpm/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c | 4
25-akpm/arch/ia64/sn/io/sn2/pic.c | 19 +++-
25-akpm/include/asm-ia64/sn/iograph.h | 14 +--
25-akpm/include/asm-ia64/sn/klconfig.h | 1
25-akpm/include/asm-ia64/sn/ksys/l1.h | 5 -
25-akpm/include/asm-ia64/sn/module.h | 2
10 files changed, 87 insertions(+), 158 deletions(-)
diff -puN arch/ia64/sn/io/machvec/pci_bus_cvlink.c~sn19 arch/ia64/sn/io/machvec/pci_bus_cvlink.c
--- 25/arch/ia64/sn/io/machvec/pci_bus_cvlink.c~sn19 Thu Jan 8 15:18:52 2004
+++ 25-akpm/arch/ia64/sn/io/machvec/pci_bus_cvlink.c Thu Jan 8 15:18:52 2004
@@ -28,6 +28,8 @@ extern void register_pcibr_intr(int irq,
void sn_dma_flush_init(unsigned long start, unsigned long end, int idx, int pin, int slot);
+#define IS_OPUS(nasid) (cbrick_type_get_nasid(nasid) == MODULE_OPUSBRICK)
+#define IS_ALTIX(nasid) (cbrick_type_get_nasid(nasid) == MODULE_CBRICK)
/*
* pci_bus_cvlink_init() - To be called once during initialization before
diff -puN arch/ia64/sn/io/sn2/klconflib.c~sn19 arch/ia64/sn/io/sn2/klconflib.c
--- 25/arch/ia64/sn/io/sn2/klconflib.c~sn19 Thu Jan 8 15:18:52 2004
+++ 25-akpm/arch/ia64/sn/io/sn2/klconflib.c Thu Jan 8 15:18:52 2004
@@ -23,9 +23,6 @@
#include <asm/sn/xtalk/xbow.h>
-#define LDEBUG 0
-#define NIC_UNKNOWN ((nic_t) -1)
-
#undef DEBUG_KLGRAPH
#ifdef DEBUG_KLGRAPH
#define DBG(x...) printk(x)
@@ -37,7 +34,7 @@ u64 klgraph_addr[MAX_COMPACT_NODES];
static int hasmetarouter;
-char brick_types[MAX_BRICK_TYPES + 1] = "crikxdpn%#=012345";
+char brick_types[MAX_BRICK_TYPES + 1] = "crikxdpn%#=vo^34567890123456789...";
lboard_t *
find_lboard(lboard_t *start, unsigned char brd_type)
@@ -268,9 +265,11 @@ board_to_path(lboard_t *brd, char *path)
board_name = EDGE_LBL_PXBRICK;
else if (brd->brd_type == KLTYPE_IXBRICK)
board_name = EDGE_LBL_IXBRICK;
+ else if (brd->brd_type == KLTYPE_OPUSBRICK)
+ board_name = EDGE_LBL_OPUSBRICK;
else if (brd->brd_type == KLTYPE_CGBRICK)
board_name = EDGE_LBL_CGBRICK;
- else
+ else
board_name = EDGE_LBL_IOBRICK;
break;
default:
@@ -283,23 +282,6 @@ board_to_path(lboard_t *brd, char *path)
sprintf(path, EDGE_LBL_MODULE "/%s/" EDGE_LBL_SLAB "/%d/%s", buffer, geo_slab(brd->brd_geoid), board_name);
}
-/*
- * Get the module number for a NASID.
- */
-moduleid_t
-get_module_id(nasid_t nasid)
-{
- lboard_t *brd;
-
- brd = find_lboard((lboard_t *)KL_CONFIG_INFO(nasid), KLTYPE_SNIA);
-
- if (!brd)
- return INVALID_MODULE;
- else
- return geo_module(brd->brd_geoid);
-}
-
-
#define MHZ 1000000
diff -puN arch/ia64/sn/io/sn2/l1_command.c~sn19 arch/ia64/sn/io/sn2/l1_command.c
--- 25/arch/ia64/sn/io/sn2/l1_command.c~sn19 Thu Jan 8 15:18:52 2004
+++ 25-akpm/arch/ia64/sn/io/sn2/l1_command.c Thu Jan 8 15:18:52 2004
@@ -58,8 +58,6 @@ int iobrick_rack_bay_type_get( nasid_t n
*rack = (result & MODULE_RACK_MASK) >> MODULE_RACK_SHFT;
*bay = (result & MODULE_BPOS_MASK) >> MODULE_BPOS_SHFT;
*brick_type = (result & MODULE_BTYPE_MASK) >> MODULE_BTYPE_SHFT;
- *brick_type = toupper(*brick_type);
-
return 0;
}
@@ -74,57 +72,6 @@ int iomoduleid_get(nasid_t nasid)
return result;
}
-int iobrick_module_get(nasid_t nasid)
-{
- uint rnum, rack, bay, brick_type, t;
- int ret;
-
- /* construct module ID from rack and slot info */
-
- if ((ret = iobrick_rack_bay_type_get(nasid, &rnum, &bay, &brick_type)) < 0)
- return ret;
-
- if (bay > MODULE_BPOS_MASK >> MODULE_BPOS_SHFT)
- return ELSC_ERROR_MODULE;
-
- /* Build a moduleid_t-compatible rack number */
-
- rack = 0;
- t = rnum / 100; /* rack class (CPU/IO) */
- if (t > RACK_CLASS_MASK(rack) >> RACK_CLASS_SHFT(rack))
- return ELSC_ERROR_MODULE;
- RACK_ADD_CLASS(rack, t);
- rnum %= 100;
-
- t = rnum / 10; /* rack group */
- if (t > RACK_GROUP_MASK(rack) >> RACK_GROUP_SHFT(rack))
- return ELSC_ERROR_MODULE;
- RACK_ADD_GROUP(rack, t);
-
- t = rnum % 10; /* rack number (one-based) */
- if (t-1 > RACK_NUM_MASK(rack) >> RACK_NUM_SHFT(rack))
- return ELSC_ERROR_MODULE;
- RACK_ADD_NUM(rack, t);
-
- switch( brick_type ) {
- case L1_BRICKTYPE_IX:
- brick_type = MODULE_IXBRICK; break;
- case L1_BRICKTYPE_PX:
- brick_type = MODULE_PXBRICK; break;
- }
-
- ret = RBT_TO_MODULE(rack, bay, brick_type);
-
- return ret;
-}
-
-/*
- * iobrick_module_get_nasid() returns a module_id which has the brick
- * type encoded in bits 15-12, but this is not the true brick type...
- * The module_id returned by iobrick_module_get_nasid() is modified
- * to make a PEBRICKs & PXBRICKs look like a PBRICK. So this routine
- * iobrick_type_get_nasid() returns the true unmodified brick type.
- */
int
iobrick_type_get_nasid(nasid_t nasid)
{
@@ -150,14 +97,6 @@ iobrick_type_get_nasid(nasid_t nasid)
return -1; /* unknown brick */
}
-int iobrick_module_get_nasid(nasid_t nasid)
-{
- int io_moduleid;
-
- io_moduleid = iobrick_module_get(nasid);
- return io_moduleid;
-}
-
/*
* given a L1 bricktype, return a bricktype string. This string is the
* string that will be used in the hwpath for I/O bricks
@@ -171,10 +110,13 @@ iobrick_L1bricktype_to_name(int type)
return("Unknown");
case L1_BRICKTYPE_PX:
- return("PXbrick");
+ return(EDGE_LBL_PXBRICK);
+
+ case L1_BRICKTYPE_OPUS:
+ return(EDGE_LBL_OPUSBRICK);
case L1_BRICKTYPE_IX:
- return("IXbrick");
+ return(EDGE_LBL_IXBRICK);
case L1_BRICKTYPE_C:
return("Cbrick");
diff -puN arch/ia64/sn/io/sn2/ml_iograph.c~sn19 arch/ia64/sn/io/sn2/ml_iograph.c
--- 25/arch/ia64/sn/io/sn2/ml_iograph.c~sn19 Thu Jan 8 15:18:52 2004
+++ 25-akpm/arch/ia64/sn/io/sn2/ml_iograph.c Thu Jan 8 15:18:52 2004
@@ -24,8 +24,6 @@
#define DBG(x...)
#endif /* IOGRAPH_DEBUG */
-/* #define PROBE_TEST */
-
/* At most 2 hubs can be connected to an xswitch */
#define NUM_XSWITCH_VOLUNTEER 2
@@ -69,7 +67,6 @@ xswitch_volunteer_delete(vertex_hdl_t xs
{
xswitch_vol_t xvolinfo;
int rc;
- extern void snia_kmem_free(void *ptr, size_t size);
rc = hwgraph_info_remove_LBL(xswitch,
INFO_LBL_XSWITCH_VOL,
@@ -92,10 +89,12 @@ volunteer_for_widgets(vertex_hdl_t xswit
INFO_LBL_XSWITCH_VOL,
(arbitrary_info_t *)&xvolinfo);
if (xvolinfo == NULL) {
- if (!is_headless_node_vertex(master))
+ if (!is_headless_node_vertex(master)) {
+ char name[MAXDEVNAME];
printk(KERN_WARNING
- "volunteer for widgets: vertex 0x%p has no info label",
- (void *)xswitch);
+ "volunteer for widgets: vertex %s has no info label",
+ vertex_to_name(xswitch, name, MAXDEVNAME));
+ }
return;
}
@@ -149,11 +148,13 @@ assign_widgets_to_volunteers(vertex_hdl_
INFO_LBL_XSWITCH_VOL,
(arbitrary_info_t *)&xvolinfo);
if (xvolinfo == NULL) {
- if (!is_headless_node_vertex(hubv))
+ if (!is_headless_node_vertex(hubv)) {
+ char name[MAXDEVNAME];
printk(KERN_WARNING
- "assign_widgets_to_volunteers:vertex 0x%p has "
+ "assign_widgets_to_volunteers:vertex %s has "
" no info label",
- (void *)xswitch);
+ vertex_to_name(xswitch, name, MAXDEVNAME));
+ }
return;
}
@@ -173,9 +174,6 @@ assign_widgets_to_volunteers(vertex_hdl_
for (widgetnum=HUB_WIDGET_ID_MIN; widgetnum <= HUB_WIDGET_ID_MAX; widgetnum++) {
int i;
- /*
- * Ignore disabled/empty ports.
- */
if (!xbow_port_io_enabled(nasid, widgetnum))
continue;
@@ -192,8 +190,9 @@ assign_widgets_to_volunteers(vertex_hdl_
if (nasid == get_master_baseio_nasid())
goto do_assignment;
}
- panic("Nasid == %d, console nasid == %d",
+ printk("Nasid == %d, console nasid == %d",
nasid, get_master_baseio_nasid());
+ nasid = 0;
}
/*
@@ -384,7 +383,9 @@ io_xswitch_widget_init(vertex_hdl_t xs
buffer,
geo_slab(board->brd_geoid),
(board->brd_type == KLTYPE_PXBRICK) ? EDGE_LBL_PXBRICK :
- (board->brd_type == KLTYPE_IXBRICK) ? EDGE_LBL_IXBRICK : "?brick",
+ (board->brd_type == KLTYPE_IXBRICK) ? EDGE_LBL_IXBRICK :
+ (board->brd_type == KLTYPE_CGBRICK) ? EDGE_LBL_CGBRICK :
+ (board->brd_type == KLTYPE_OPUSBRICK) ? EDGE_LBL_OPUSBRICK : "?brick",
EDGE_LBL_XTALK, widgetnum);
DBG("io_xswitch_widget_init: path= %s\n", pathname);
@@ -421,8 +422,7 @@ io_xswitch_widget_init(vertex_hdl_t xs
(void)xwidget_register(&hwid, widgetv, widgetnum,
hubv, hub_widgetid);
- ia64_sn_sysctl_iobrick_module_get(nasid, &io_module);
-
+ io_module = iomoduleid_get(nasid);
if (io_module >= 0) {
char buffer[16];
vertex_hdl_t to, from;
@@ -433,8 +433,8 @@ io_xswitch_widget_init(vertex_hdl_t xs
memset(buffer, 0, 16);
format_module_id(buffer, geo_module(board->brd_geoid), MODULE_FORMAT_BRIEF);
- if ( islower(MODULE_GET_BTCHAR(io_module)) ) {
- bt = toupper(MODULE_GET_BTCHAR(io_module));
+ if ( isupper(MODULE_GET_BTCHAR(io_module)) ) {
+ bt = tolower(MODULE_GET_BTCHAR(io_module));
}
else {
bt = MODULE_GET_BTCHAR(io_module);
@@ -464,18 +464,12 @@ io_xswitch_widget_init(vertex_hdl_t xs
ASSERT_ALWAYS(to);
rc = hwgraph_edge_add(from, to,
EDGE_LBL_INTERCONNECT);
- if (rc == -EEXIST)
- goto link_done;
- if (rc != GRAPH_SUCCESS) {
+ if (rc != -EEXIST && rc != GRAPH_SUCCESS) {
printk("%s: Unable to establish link"
" for xbmon.", pathname);
}
-link_done:
}
-#ifdef SN0_USE_BTE
- bte_bpush_war(cnode, (void *)board);
-#endif
}
}
@@ -588,23 +582,11 @@ io_init_node(cnodeid_t cnodeid)
ASSERT(hubv != GRAPH_VERTEX_NONE);
- /*
- * Read mfg info on this hub
- */
-
/*
* If nothing connected to this hub's xtalk port, we're done.
*/
early_probe_for_widget(hubv, &hwid);
if (hwid.part_num == XWIDGET_PART_NUM_NONE) {
-#ifdef PROBE_TEST
- if ((cnodeid == 1) || (cnodeid == 2)) {
- int index;
-
- for (index = 0; index < 600; index++)
- DBG("Interfering with device probing!!!\n");
- }
-#endif
DBG("**** io_init_node: Node's 0x%p hub widget has XWIDGET_PART_NUM_NONE ****\n", hubv);
return;
/* NOTREACHED */
@@ -740,14 +722,6 @@ io_init_node(cnodeid_t cnodeid)
down(&npdap->xbow_sema);
}
-#ifdef PROBE_TEST
- if ((cnodeid == 1) || (cnodeid == 2)) {
- int index;
-
- for (index = 0; index < 500; index++)
- DBG("Interfering with device probing!!!\n");
- }
-#endif
/* Now both nodes can safely inititialize widgets */
io_init_xswitch_widgets(switchv, cnodeid);
io_link_xswitch_widgets(switchv, cnodeid);
@@ -756,7 +730,6 @@ io_init_node(cnodeid_t cnodeid)
}
#include <asm/sn/ioerror_handling.h>
-/* #endif */
/*
* Initialize all I/O devices. Starting closest to nodes, probe and
@@ -765,9 +738,6 @@ io_init_node(cnodeid_t cnodeid)
void
init_all_devices(void)
{
- /* Governor on init threads..bump up when safe
- * (beware many devfs races)
- */
cnodeid_t cnodeid, active;
active = 0;
@@ -778,16 +748,12 @@ init_all_devices(void)
DBG("init_all_devices: Done io_init_node() for cnode %d\n", cnodeid);
}
- for (cnodeid = 0; cnodeid < numnodes; cnodeid++)
+ for (cnodeid = 0; cnodeid < numnodes; cnodeid++) {
/*
* Update information generated by IO init.
*/
update_node_information(cnodeid);
-
-#if HWG_PRINT
- hwgraph_print();
-#endif
-
+ }
}
static
@@ -807,6 +773,20 @@ struct io_brick_map_s io_brick_tab[] = {
}
},
+/* OPUSbrick widget number to PCI bus number map */
+ { MODULE_OPUSBRICK, /* OPUSbrick type */
+ /* PCI Bus # Widget # */
+ { 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0 - 0x7 */
+ 0, /* 0x8 */
+ 0, /* 0x9 */
+ 0, 0, /* 0xa - 0xb */
+ 0, /* 0xc */
+ 0, /* 0xd */
+ 0, /* 0xe */
+ 1 /* 0xf */
+ }
+ },
+
/* IXbrick widget number to PCI bus number map */
{ MODULE_IXBRICK, /* IXbrick type */
/* PCI Bus # Widget # */
@@ -820,6 +800,20 @@ struct io_brick_map_s io_brick_tab[] = {
3 /* 0xf */
}
},
+
+/* CG brick widget number to PCI bus number map */
+ { MODULE_CGBRICK, /* CG brick */
+ /* PCI Bus # Widget # */
+ { 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0 - 0x7 */
+ 0, /* 0x8 */
+ 0, /* 0x9 */
+ 0, 1, /* 0xa - 0xb */
+ 0, /* 0xc */
+ 0, /* 0xd */
+ 0, /* 0xe */
+ 0 /* 0xf */
+ }
+ },
};
/*
diff -puN arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c~sn19 arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c
--- 25/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c~sn19 Thu Jan 8 15:18:52 2004
+++ 25-akpm/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c Thu Jan 8 15:18:52 2004
@@ -948,7 +948,7 @@ pcibr_attach2(vertex_hdl_t xconn_vhdl, b
#endif
nasid_t nasid;
int iobrick_type_get_nasid(nasid_t nasid);
- int iobrick_module_get_nasid(nasid_t nasid);
+ int iomoduleid_get(nasid_t nasid);
PCIBR_DEBUG_ALWAYS((PCIBR_DEBUG_ATTACH, pcibr_vhdl,
"pcibr_attach2: bridge=0x%p, busnum=%d\n", bridge, busnum));
@@ -1102,7 +1102,7 @@ pcibr_attach2(vertex_hdl_t xconn_vhdl, b
printk(KERN_WARNING "0x%p: Unknown bricktype : 0x%x\n", (void *)xconn_vhdl,
(unsigned int)pcibr_soft->bs_bricktype);
- pcibr_soft->bs_moduleid = iobrick_module_get_nasid(nasid);
+ pcibr_soft->bs_moduleid = iomoduleid_get(nasid);
if (pcibr_soft->bs_bricktype > 0) {
switch (pcibr_soft->bs_bricktype) {
diff -puN arch/ia64/sn/io/sn2/pic.c~sn19 arch/ia64/sn/io/sn2/pic.c
--- 25/arch/ia64/sn/io/sn2/pic.c~sn19 Thu Jan 8 15:18:52 2004
+++ 25-akpm/arch/ia64/sn/io/sn2/pic.c Thu Jan 8 15:18:52 2004
@@ -160,6 +160,8 @@ pic_attach(vertex_hdl_t conn_v)
vertex_hdl_t pcibr_vhdl0, pcibr_vhdl1 = (vertex_hdl_t)0;
pcibr_soft_t bus0_soft, bus1_soft = (pcibr_soft_t)0;
vertex_hdl_t conn_v0, conn_v1, peer_conn_v;
+ int bricktype;
+ int iobrick_type_get_nasid(nasid_t nasid);
PCIBR_DEBUG_ALWAYS((PCIBR_DEBUG_ATTACH, conn_v, "pic_attach()\n"));
@@ -188,11 +190,18 @@ pic_attach(vertex_hdl_t conn_v)
* Opening this vertex will provide access to
* the Bridge registers themselves.
*/
- /* FIXME: what should the hwgraph path look like ? */
- rc = hwgraph_path_add(conn_v0, EDGE_LBL_PCIX_0, &pcibr_vhdl0);
- ASSERT(rc == GRAPH_SUCCESS);
- rc = hwgraph_path_add(conn_v1, EDGE_LBL_PCIX_1, &pcibr_vhdl1);
- ASSERT(rc == GRAPH_SUCCESS);
+ bricktype = iobrick_type_get_nasid(NASID_GET(bridge0));
+ if ( bricktype == MODULE_CGBRICK ) {
+ rc = hwgraph_path_add(conn_v0, EDGE_LBL_AGP_0, &pcibr_vhdl0);
+ ASSERT(rc == GRAPH_SUCCESS);
+ rc = hwgraph_path_add(conn_v1, EDGE_LBL_AGP_1, &pcibr_vhdl1);
+ ASSERT(rc == GRAPH_SUCCESS);
+ } else {
+ rc = hwgraph_path_add(conn_v0, EDGE_LBL_PCIX_0, &pcibr_vhdl0);
+ ASSERT(rc == GRAPH_SUCCESS);
+ rc = hwgraph_path_add(conn_v1, EDGE_LBL_PCIX_1, &pcibr_vhdl1);
+ ASSERT(rc == GRAPH_SUCCESS);
+ }
PCIBR_DEBUG_ALWAYS((PCIBR_DEBUG_ATTACH, conn_v,
"pic_attach: pcibr_vhdl0=%v, pcibr_vhdl1=%v\n",
diff -puN include/asm-ia64/sn/iograph.h~sn19 include/asm-ia64/sn/iograph.h
--- 25/include/asm-ia64/sn/iograph.h~sn19 Thu Jan 8 15:18:52 2004
+++ 25-akpm/include/asm-ia64/sn/iograph.h Thu Jan 8 15:18:52 2004
@@ -52,6 +52,9 @@
#define EDGE_LBL_PCIX "pci-x"
#define EDGE_LBL_PCIX_0 EDGE_LBL_PCIX "/0"
#define EDGE_LBL_PCIX_1 EDGE_LBL_PCIX "/1"
+#define EDGE_LBL_AGP "agp"
+#define EDGE_LBL_AGP_0 EDGE_LBL_AGP "/0"
+#define EDGE_LBL_AGP_1 EDGE_LBL_AGP "/1"
#define EDGE_LBL_PORT "port"
#define EDGE_LBL_PROM "prom"
#define EDGE_LBL_RACK "rack"
@@ -79,6 +82,7 @@
#define EDGE_LBL_XPLINK_ADMIN "admin" /* Partition admin */
#define EDGE_LBL_IOBRICK "iobrick"
#define EDGE_LBL_PXBRICK "PXbrick"
+#define EDGE_LBL_OPUSBRICK "onboardio"
#define EDGE_LBL_IXBRICK "IXbrick"
#define EDGE_LBL_CGBRICK "CGbrick"
#define EDGE_LBL_CPUBUS "cpubus" /* CPU Interfaces (SysAd) */
@@ -90,9 +94,7 @@
#define INFO_LBL_CPUID "_cpuid"
#define INFO_LBL_CPU_INFO "_cpu"
#define INFO_LBL_DETAIL_INVENT "_detail_invent" /* inventory data*/
-#define INFO_LBL_DEVICE_DESC "_device_desc"
-#define INFO_LBL_DIAGVAL "_diag_reason" /* Reason disabled */
-#define INFO_LBL_DKIOTIME "_dkiotime"
+#define INFO_LBL_DIAGVAL "_diag_reason" /* Reason disabled */
#define INFO_LBL_DRIVER "_driver" /* points to attached device_driver_t */
#define INFO_LBL_ELSC "_elsc"
#define INFO_LBL_SUBCH "_subch" /* system controller subchannel */
@@ -135,12 +137,6 @@
* thread priority
* default class
*/
-/* Special reserved info labels (also hwgfs attributes) */
-#define _DEVNAME_ATTR "_devname" /* device name */
-#define _DRIVERNAME_ATTR "_drivername" /* driver name */
-#define _INVENT_ATTR "_inventory" /* device inventory data */
-#define _MASTERNODE_ATTR "_masternode" /* node that "controls" device */
-
/* Info labels that begin with '_' cannot be overwritten by an attr_set call */
#define INFO_LBL_RESERVED(name) ((name)[0] == '_')
diff -puN include/asm-ia64/sn/klconfig.h~sn19 include/asm-ia64/sn/klconfig.h
--- 25/include/asm-ia64/sn/klconfig.h~sn19 Thu Jan 8 15:18:52 2004
+++ 25-akpm/include/asm-ia64/sn/klconfig.h Thu Jan 8 15:18:52 2004
@@ -354,6 +354,7 @@ typedef struct kl_config_hdr {
#define KLTYPE_PXBRICK (KLCLASS_IOBRICK | 0x6)
#define KLTYPE_IXBRICK (KLCLASS_IOBRICK | 0x7)
#define KLTYPE_CGBRICK (KLCLASS_IOBRICK | 0x8)
+#define KLTYPE_OPUSBRICK (KLCLASS_IOBRICK | 0x9)
#define KLTYPE_PBRICK_BRIDGE KLTYPE_PBRICK
diff -puN include/asm-ia64/sn/ksys/l1.h~sn19 include/asm-ia64/sn/ksys/l1.h
--- 25/include/asm-ia64/sn/ksys/l1.h~sn19 Thu Jan 8 15:18:52 2004
+++ 25-akpm/include/asm-ia64/sn/ksys/l1.h Thu Jan 8 15:18:52 2004
@@ -90,10 +90,11 @@
#define L1_BRICKTYPE_IP45 0x34 /* 4 */
#define L1_BRICKTYPE_C 0x43 /* C */
#define L1_BRICKTYPE_R 0x52 /* R */
-#define L1_BRICKTYPE_CHI_CG 0x76 /* v */
+#define L1_BRICKTYPE_CHI_CG 0x76 /* v */
#define L1_BRICKTYPE_N 0x4e /* N */
#define L1_BRICKTYPE_PX 0x23 /* # */
#define L1_BRICKTYPE_IX 0x3d /* = */
+#define L1_BRICKTYPE_OPUS 0x6f /* o */
/* EEPROM codes (for the "read EEPROM" request) */
/* c brick */
@@ -125,7 +126,7 @@
int elsc_display_line(nasid_t nasid, char *line, int lnum);
int iobrick_rack_bay_type_get( nasid_t nasid, unsigned int *rack,
unsigned int *bay, unsigned int *brick_type );
-int iobrick_module_get( nasid_t nasid );
+int iomoduleid_get( nasid_t nasid );
#endif /* _ASM_IA64_SN_KSYS_L1_H */
diff -puN include/asm-ia64/sn/module.h~sn19 include/asm-ia64/sn/module.h
--- 25/include/asm-ia64/sn/module.h~sn19 Thu Jan 8 15:18:52 2004
+++ 25-akpm/include/asm-ia64/sn/module.h Thu Jan 8 15:18:52 2004
@@ -138,6 +138,8 @@ extern char brick_types[];
#define MODULE_PEBRICK 8
#define MODULE_PXBRICK 9
#define MODULE_IXBRICK 10
+#define MODULE_CGBRICK 11
+#define MODULE_OPUSBRICK 12
/*
* Moduleid_t comparison macros
_