patch-2.4.21 linux-2.4.21/arch/ia64/sn/io/hubspc.c
Next file: linux-2.4.21/arch/ia64/sn/io/ifconfig_bus.c
Previous file: linux-2.4.21/arch/ia64/sn/io/hubdev.c
Back to the patch index
Back to the overall index
- Lines: 96
- Date:
2003-06-13 07:51:30.000000000 -0700
- Orig file:
linux-2.4.20/arch/ia64/sn/io/hubspc.c
- Orig date:
2002-08-02 17:39:42.000000000 -0700
diff -urN linux-2.4.20/arch/ia64/sn/io/hubspc.c linux-2.4.21/arch/ia64/sn/io/hubspc.c
@@ -161,69 +161,8 @@
sizeof(invent_miscinfo_t));
}
-#define FPROM_CONFIG_ADDR MD_JUNK_BUS_TIMING
-#define FPROM_ENABLE_MASK MJT_FPROM_ENABLE_MASK
-#define FPROM_ENABLE_SHFT MJT_FPROM_ENABLE_SHFT
-#define FPROM_SETUP_MASK MJT_FPROM_SETUP_MASK
-#define FPROM_SETUP_SHFT MJT_FPROM_SETUP_SHFT
+#endif /* CONFIG_IA64_SGI_SN1 */
-/*ARGSUSED*/
-int
-cpuprom_map(devfs_handle_t dev, vhandl_t *vt, off_t addr, size_t len)
-{
- int errcode = 0;
- caddr_t kvaddr;
- devfs_handle_t node;
- cnodeid_t cnode;
-
- node = prominfo_nodeget(dev);
-
- if (!node)
- return EIO;
-
-
- kvaddr = hubdev_prombase_get(node);
- cnode = hubdev_cnodeid_get(node);
-#ifdef HUBSPC_DEBUG
- printk("cpuprom_map: hubnode %d kvaddr 0x%x\n", node, kvaddr);
-#endif
-
- if (len > RBOOT_SIZE)
- len = RBOOT_SIZE;
- /*
- * Map in the prom space
- */
- errcode = v_mapphys(vt, kvaddr, len);
-
- if (errcode == 0 ){
- /*
- * Set the MD configuration registers suitably.
- */
- nasid_t nasid;
- uint64_t value;
- volatile hubreg_t *regaddr;
-
- nasid = COMPACT_TO_NASID_NODEID(cnode);
- regaddr = REMOTE_HUB_ADDR(nasid, FPROM_CONFIG_ADDR);
- value = HUB_L(regaddr);
- value &= ~(FPROM_SETUP_MASK | FPROM_ENABLE_MASK);
- {
- value |= (((long)CONFIG_FPROM_SETUP << FPROM_SETUP_SHFT) |
- ((long)CONFIG_FPROM_ENABLE << FPROM_ENABLE_SHFT));
- }
- HUB_S(regaddr, value);
-
- }
- return (errcode);
-}
-#endif /* CONFIG_IA64_SGI_SN1 */
-
-/*ARGSUSED*/
-int
-cpuprom_unmap(devfs_handle_t dev, vhandl_t *vt)
-{
- return 0;
-}
/***********************************************************************/
/* Base Hub Space Driver */
@@ -245,13 +184,14 @@
hubdev_register(mem_refcnt_attach);
#endif
+#ifdef CONFIG_IA64_SGI_SN1
/* L1 system controller link */
if ( !IS_RUNNING_ON_SIMULATOR() ) {
/* initialize the L1 link */
extern void l1_init(void);
l1_init();
}
-
+#endif /* CONFIG_IA64_SGI_SN1 */
#ifdef HUBSPC_DEBUG
printk("hubspc_init: Completed\n");
#endif /* HUBSPC_DEBUG */
@@ -283,7 +223,7 @@
/* check validity of request */
if( len == 0 ) {
- return ENXIO;
+ return -ENXIO;
}
return errcode;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)