2.5.63 cciss fix initialization for PCI hotplug
PATCH 1/1 2.5.63 cciss fix initialization for PCI hotplug
* Fix driver to wait for firmware to indicate that it is ready. (Needed for PCI hotplug case, but for normal warm/cold reboot, by the time driver inits, firmware will already be ready.)
(Torben, I made one tiny change to remove the "ready" variable since
the last time you saw this patch.)
-- steve
drivers/block/cciss.c renamed from drivers/block/cciss.c~hotplug_wait +15 -1
@@ -2076,7 +2076,7 @@ static int cciss_pci_init(ctlr_info_t *cunchar cache_line_size, latency_timer;unchar irq, revision;uint addr[6 ]; -__u32 board_id; +__u32 board_id, scratchpad;int cfg_offset;int cfg_base_addr;int cfg_base_addr_index;
@@ -2168,6 +2168,20 @@ static int cciss_pci_init(ctlr_info_t *c#endif /* CCISS_DEBUG */ c->vaddr =remap_pci_mem (c->paddr,200 ); +/* Wait for the board to become ready. (PCI hotplug needs this.) +* We poll for up to 120 secs, once per 100ms. */ +for (i=0 ; i <1200 ; i++) { + scratchpad =readl (c->vaddr +SA5_SCRATCHPAD_OFFSET ); +if (scratchpad ==CCISS_FIRMWARE_READY ) +break ; +set_current_state (TASK_INTERRUPTIBLE ); +schedule_timeout (HZ /10 );/* wait 100ms */ + } +if (scratchpad !=CCISS_FIRMWARE_READY ) { +printk (KERN_WARNING "cciss: Board not ready. Timed out.\n" ); +return -1 ; + } +/* get the address index number */ cfg_base_addr =readl (c->vaddr +SA5_CTCFG_OFFSET );/* I am not prepared to deal with a 64 bit address value */
drivers/block/cciss.h renamed from drivers/block/cciss.h~hotplug_wait +2 -0
@@ -95,6 +95,7 @@ struct ctlr_info#define SA5_REPLY_INTR_MASK_OFFSET 0x34#define SA5_REPLY_PORT_OFFSET 0x44#define SA5_INTR_STATUS 0x30 +#define SA5_SCRATCHPAD_OFFSET 0xB0#define SA5_CTCFG_OFFSET 0xB4#define SA5_CTMEM_OFFSET 0xB8
@@ -104,6 +105,7 @@ struct ctlr_info#define SA5_INTR_PENDING 0x08#define SA5B_INTR_PENDING 0x04#define FIFO_EMPTY 0xffffffff +#define CCISS_FIRMWARE_READY 0xffff0000/* value in scratchpad register */ #define CISS_ERROR_BIT 0x02
_