From: Markus Lidel <Markus.Lidel@shadowconnect.com>
- added support for Promise I2O controllers, which need a different
initialization sequence (original from Alan Cox)
Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/message/i2o/iop.c | 62 +++++++++++++++++++++++++++++++++++---
25-akpm/drivers/message/i2o/pci.c | 2 -
2 files changed, 59 insertions(+), 5 deletions(-)
diff -puN drivers/message/i2o/iop.c~i2o-added-support-for-promise-controllers drivers/message/i2o/iop.c
--- 25/drivers/message/i2o/iop.c~i2o-added-support-for-promise-controllers Fri Oct 8 14:32:28 2004
+++ 25-akpm/drivers/message/i2o/iop.c Fri Oct 8 14:32:28 2004
@@ -27,6 +27,7 @@
#include <linux/module.h>
#include <linux/i2o.h>
+#include <linux/delay.h>
/* global I2O controller list */
LIST_HEAD(i2o_controllers);
@@ -470,7 +471,7 @@ static int i2o_iop_reset(struct i2o_cont
if (m == I2O_QUEUE_EMPTY)
return -ETIMEDOUT;
- memset(status, 0, 4);
+ memset(status, 0, 8);
/* Quiesce all IOPs first */
i2o_iop_quiesce_all();
@@ -495,6 +496,13 @@ static int i2o_iop_reset(struct i2o_cont
rc = -ETIMEDOUT;
goto exit;
}
+
+ /* Promise bug */
+ if (status[1] || status[4]) {
+ *status = 0;
+ break;
+ }
+
set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(1);
@@ -605,6 +613,7 @@ int i2o_iop_init_outbound_queue(struct i
/* Post frames */
for (i = 0; i < NMBR_MSG_FRAMES; i++) {
i2o_flush_reply(c, m);
+ udelay(1); /* Promise */
m += MSG_FRAME_SIZE * 4;
}
@@ -612,6 +621,23 @@ int i2o_iop_init_outbound_queue(struct i
}
/**
+ * i2o_iop_send_nop - send a core NOP message
+ * @c: controller
+ *
+ * Send a no-operation message with a reply set to cause no
+ * action either. Needed for bringing up promise controllers.
+ */
+static int i2o_iop_send_nop(struct i2o_controller *c)
+{
+ struct i2o_message *msg;
+ u32 m = i2o_msg_get_wait(c, &msg, HZ);
+ if (m == I2O_QUEUE_EMPTY)
+ return -ETIMEDOUT;
+ i2o_msg_nop(c, m);
+ return 0;
+}
+
+/**
* i2o_iop_activate - Bring controller up to HOLD
* @c: controller
*
@@ -622,8 +648,27 @@ int i2o_iop_init_outbound_queue(struct i
*/
static int i2o_iop_activate(struct i2o_controller *c)
{
+ struct pci_dev *i960 = NULL;
i2o_status_block *sb = c->status_block.virt;
int rc;
+
+ if (c->promise) {
+ /* Beat up the hardware first of all */
+ i960 =
+ pci_find_slot(c->pdev->bus->number,
+ PCI_DEVFN(PCI_SLOT(c->pdev->devfn), 0));
+ if (i960)
+ pci_write_config_word(i960, 0x42, 0);
+
+ /* Follow this sequence precisely or the controller
+ ceases to perform useful functions until reboot */
+ if ((rc = i2o_iop_send_nop(c)))
+ return rc;
+
+ if ((rc = i2o_iop_reset(c)))
+ return rc;
+ }
+
/* In INIT state, Wait Inbound Q to initialize (in i2o_status_get) */
/* In READY state, Get status */
@@ -659,13 +704,22 @@ static int i2o_iop_activate(struct i2o_c
if (rc)
return rc;
+ if (c->promise) {
+ if ((rc = i2o_iop_send_nop(c)))
+ return rc;
+
+ if ((rc = i2o_status_get(c)))
+ return rc;
+
+ if (i960)
+ pci_write_config_word(i960, 0x42, 0x3FF);
+ }
+
/* In HOLD state */
rc = i2o_hrt_get(c);
- if (rc)
- return rc;
- return 0;
+ return rc;
};
/**
diff -puN drivers/message/i2o/pci.c~i2o-added-support-for-promise-controllers drivers/message/i2o/pci.c
--- 25/drivers/message/i2o/pci.c~i2o-added-support-for-promise-controllers Fri Oct 8 14:32:28 2004
+++ 25-akpm/drivers/message/i2o/pci.c Fri Oct 8 14:32:28 2004
@@ -231,7 +231,7 @@ static int __devinit i2o_pci_alloc(struc
}
#endif
- if (i2o_dma_alloc(dev, &c->status, 4, GFP_KERNEL)) {
+ if (i2o_dma_alloc(dev, &c->status, 8, GFP_KERNEL)) {
i2o_pci_free(c);
return -ENOMEM;
}
_