From: Pat Gefre <pfg@sgi.com>
One less panic
---
25-akpm/arch/ia64/sn/io/sn2/ml_iograph.c | 9 ++++++---
25-akpm/arch/ia64/sn/io/sn2/pcibr/pcibr_reg.c | 19 +++++++++++++++++++
2 files changed, 25 insertions(+), 3 deletions(-)
diff -puN arch/ia64/sn/io/sn2/ml_iograph.c~sn41 arch/ia64/sn/io/sn2/ml_iograph.c
--- 25/arch/ia64/sn/io/sn2/ml_iograph.c~sn41 Thu Jan 8 15:25:13 2004
+++ 25-akpm/arch/ia64/sn/io/sn2/ml_iograph.c Thu Jan 8 15:25:13 2004
@@ -587,11 +587,14 @@ io_init_node(cnodeid_t cnodeid)
npdap->basew_id = 0;
} else {
- npdap->basew_id = (((*(volatile int32_t *)(NODE_SWIN_BASE(COMPACT_TO_NASID_NODEID(cnodeid), 0) + BRIDGE_WID_CONTROL))) & WIDGET_WIDGET_ID);
+ void *bridge;
+ extern uint64_t pcireg_control_get(void *);
- panic(" ****io_init_node: Unknown Widget Part Number 0x%x Widget ID 0x%x attached to Hubv 0x%p ****\n", widget_partnum, npdap->basew_id, (void *)hubv);
+ bridge = (void *)NODE_SWIN_BASE(COMPACT_TO_NASID_NODEID(cnodeid), 0);
+ npdap->basew_id = pcireg_control_get(bridge) & WIDGET_WIDGET_ID;
- /*NOTREACHED*/
+ printk(" ****io_init_node: Unknown Widget Part Number 0x%x Widget ID 0x%x attached to Hubv 0x%p ****\n", widget_partnum, npdap->basew_id, (void *)hubv);
+ return;
}
{
char widname[10];
diff -puN arch/ia64/sn/io/sn2/pcibr/pcibr_reg.c~sn41 arch/ia64/sn/io/sn2/pcibr/pcibr_reg.c
--- 25/arch/ia64/sn/io/sn2/pcibr/pcibr_reg.c~sn41 Thu Jan 8 15:25:13 2004
+++ 25-akpm/arch/ia64/sn/io/sn2/pcibr/pcibr_reg.c Thu Jan 8 15:25:13 2004
@@ -17,6 +17,25 @@
#define IS_IOADDR(ptr) (!(((uint64_t)(ptr) & CAC_BASE) == CAC_BASE))
+/*
+ * Control Register Access -- Read/Write 0000_0020
+ */
+
+uint64_t
+pcireg_control_get(void *ptr)
+{
+ uint64_t ret = 0;
+ pic_t *bridge;
+
+ if ( IS_IOADDR(ptr) )
+ bridge = (pic_t *)ptr;
+ else
+ bridge = (pic_t *)((pcibr_soft_t)(ptr))->bs_base;
+
+ ret = ((pic_t *)bridge)->p_wid_control;
+ return ret;
+}
+
void
pcireg_intr_enable_bit_clr(void *ptr, uint64_t bits)
{
_