1 files changed, 28 insertions, 21 deletions

diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index ced3eebe252c..84bb61628372 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -389,7 +389,7 @@ static u8 orc_load_firmware(struct orc_host * host)
 
         outb(PRGMRST | DOWNLOAD, host->base + ORC_RISCCTL);     /* Enable SRAM programming */
         data32_ptr = (u8 *) & data32;
-        data32 = 0;             /* Initial FW address to 0 */
+        data32 = cpu_to_le32(0);                /* Initial FW address to 0 */
         outw(0x0010, host->base + ORC_EBIOSADR0);
         *data32_ptr = inb(host->base + ORC_EBIOSDATA);          /* Read from BIOS */
         outw(0x0011, host->base + ORC_EBIOSADR0);
@@ -397,18 +397,19 @@ static u8 orc_load_firmware(struct orc_host * host)
         outw(0x0012, host->base + ORC_EBIOSADR0);
         *(data32_ptr + 2) = inb(host->base + ORC_EBIOSDATA);    /* Read from BIOS */
         outw(*(data32_ptr + 2), host->base + ORC_EBIOSADR2);
-        outl(data32, host->base + ORC_FWBASEADR);               /* Write FW address */
+        outl(le32_to_cpu(data32), host->base + ORC_FWBASEADR);          /* Write FW address */
 
         /* Copy the code from the BIOS to the SRAM */
 
-        bios_addr = (u16) data32;       /* FW code locate at BIOS address + ? */
+        udelay(500);    /* Required on Sun Ultra 5 ... 350 -> failures */
+        bios_addr = (u16) le32_to_cpu(data32);  /* FW code locate at BIOS address + ? */
         for (i = 0, data32_ptr = (u8 *) & data32;       /* Download the code    */
              i < 0x1000;        /* Firmware code size = 4K      */
              i++, bios_addr++) {
                 outw(bios_addr, host->base + ORC_EBIOSADR0);
                 *data32_ptr++ = inb(host->base + ORC_EBIOSDATA);        /* Read from BIOS */
                 if ((i % 4) == 3) {
-                        outl(data32, host->base + ORC_RISCRAM); /* Write every 4 bytes */
+                        outl(le32_to_cpu(data32), host->base + ORC_RISCRAM);    /* Write every 4 bytes */
                         data32_ptr = (u8 *) & data32;
                 }
         }
@@ -423,7 +424,7 @@ static u8 orc_load_firmware(struct orc_host * host)
                 outw(bios_addr, host->base + ORC_EBIOSADR0);
                 *data32_ptr++ = inb(host->base + ORC_EBIOSDATA);        /* Read from BIOS */
                 if ((i % 4) == 3) {
-                        if (inl(host->base + ORC_RISCRAM) != data32) {
+                        if (inl(host->base + ORC_RISCRAM) != le32_to_cpu(data32)) {
                                 outb(PRGMRST, host->base + ORC_RISCCTL);        /* Reset program to 0 */
                                 outb(data, host->base + ORC_GCFG);      /*Disable EEPROM programming */
                                 return 0;
@@ -459,8 +460,8 @@ static void setup_SCBs(struct orc_host * host)
 
         for (i = 0; i < ORC_MAXQUEUE; i++) {
                 escb_phys = (host->escb_phys + (sizeof(struct orc_extended_scb) * i));
-                scb->sg_addr = (u32) escb_phys;
-                scb->sense_addr = (u32) escb_phys;
+                scb->sg_addr = cpu_to_le32((u32) escb_phys);
+                scb->sense_addr = cpu_to_le32((u32) escb_phys);
                 scb->escb = escb;
                 scb->scbidx = i;
                 scb++;
@@ -642,8 +643,8 @@ static int orc_device_reset(struct orc_host * host, struct scsi_cmnd *cmd, unsig
         scb->link = 0xFF;
         scb->reserved0 = 0;
         scb->reserved1 = 0;
-        scb->xferlen = 0;
-        scb->sg_len = 0;
+        scb->xferlen = cpu_to_le32(0);
+        scb->sg_len = cpu_to_le32(0);
 
         escb->srb = NULL;
         escb->srb = cmd;
@@ -839,7 +840,7 @@ static irqreturn_t orc_interrupt(struct orc_host * host)
  *      Build a host adapter control block from the SCSI mid layer command
  */
 
-static void inia100_build_scb(struct orc_host * host, struct orc_scb * scb, struct scsi_cmnd * cmd)
+static int inia100_build_scb(struct orc_host * host, struct orc_scb * scb, struct scsi_cmnd * cmd)
 {                               /* Create corresponding SCB     */
         struct scatterlist *sg;
         struct orc_sgent *sgent;                /* Pointer to SG list           */
@@ -858,28 +859,30 @@ static void inia100_build_scb(struct orc_host * host, struct orc_scb * scb, stru
         scb->lun = cmd->device->lun;
         scb->reserved0 = 0;
         scb->reserved1 = 0;
-        scb->sg_len = 0;
+        scb->sg_len = cpu_to_le32(0);
 
-        scb->xferlen = (u32) scsi_bufflen(cmd);
+        scb->xferlen = cpu_to_le32((u32) scsi_bufflen(cmd));
         sgent = (struct orc_sgent *) & escb->sglist[0];
 
         count_sg = scsi_dma_map(cmd);
-        BUG_ON(count_sg < 0);
+        if (count_sg < 0)
+                return count_sg;
+        BUG_ON(count_sg > TOTAL_SG_ENTRY);
 
         /* Build the scatter gather lists */
         if (count_sg) {
-                scb->sg_len = (u32) (count_sg * 8);
+                scb->sg_len = cpu_to_le32((u32) (count_sg * 8));
                 scsi_for_each_sg(cmd, sg, count_sg, i) {
-                        sgent->base = (u32) sg_dma_address(sg);
-                        sgent->length = (u32) sg_dma_len(sg);
+                        sgent->base = cpu_to_le32((u32) sg_dma_address(sg));
+                        sgent->length = cpu_to_le32((u32) sg_dma_len(sg));
                         sgent++;
                 }
         } else {
-                scb->sg_len = 0;
-                sgent->base = 0;
-                sgent->length = 0;
+                scb->sg_len = cpu_to_le32(0);
+                sgent->base = cpu_to_le32(0);
+                sgent->length = cpu_to_le32(0);
         }
-        scb->sg_addr = (u32) scb->sense_addr;
+        scb->sg_addr = (u32) scb->sense_addr;   /* sense_addr is already little endian */
         scb->hastat = 0;
         scb->tastat = 0;
         scb->link = 0xFF;
@@ -896,6 +899,7 @@ static void inia100_build_scb(struct orc_host * host, struct orc_scb * scb, stru
                 scb->tag_msg = 0;       /* No tag support               */
         }
         memcpy(scb->cdb, cmd->cmnd, scb->cdb_len);
+        return 0;
 }
 
 /**
@@ -919,7 +923,10 @@ static int inia100_queue(struct scsi_cmnd * cmd, void (*done) (struct scsi_cmnd
         if ((scb = orc_alloc_scb(host)) == NULL)
                 return SCSI_MLQUEUE_HOST_BUSY;
 
-        inia100_build_scb(host, scb, cmd);
+        if (inia100_build_scb(host, scb, cmd)) {
+                orc_release_scb(host, scb);
+                return SCSI_MLQUEUE_HOST_BUSY;
+        }
         orc_exec_scb(host, scb);        /* Start execute SCB            */
         return 0;
 }