Merge HEAD from ../scsi-misc-2.6-old

1 files changed, 42 insertions, 15 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 93416f760e5a..a913196459d5 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -608,17 +608,43 @@ static char *container_types[] = {
  * files instead of in OS dependant driver source.
  */
 
-static void setinqstr(int devtype, void *data, int tindex)
+static void setinqstr(struct aac_dev *dev, void *data, int tindex)
 {
         struct scsi_inq *str;
-        struct aac_driver_ident *mp;
 
-        mp = aac_get_driver_ident(devtype);
-   
         str = (struct scsi_inq *)(data); /* cast data to scsi inq block */
-
-        inqstrcpy (mp->vname, str->vid); 
-        inqstrcpy (mp->model, str->pid); /* last six chars reserved for vol type */
+        memset(str, ' ', sizeof(*str));
+
+        if (dev->supplement_adapter_info.AdapterTypeText[0]) {
+                char * cp = dev->supplement_adapter_info.AdapterTypeText;
+                int c = sizeof(str->vid);
+                while (*cp && *cp != ' ' && --c)
+                        ++cp;
+                c = *cp;
+                *cp = '\0';
+                inqstrcpy (dev->supplement_adapter_info.AdapterTypeText,
+                  str->vid); 
+                *cp = c;
+                while (*cp && *cp != ' ')
+                        ++cp;
+                while (*cp == ' ')
+                        ++cp;
+                /* last six chars reserved for vol type */
+                c = 0;
+                if (strlen(cp) > sizeof(str->pid)) {
+                        c = cp[sizeof(str->pid)];
+                        cp[sizeof(str->pid)] = '\0';
+                }
+                inqstrcpy (cp, str->pid);
+                if (c)
+                        cp[sizeof(str->pid)] = c;
+        } else {
+                struct aac_driver_ident *mp = aac_get_driver_ident(dev->cardtype);
+   
+                inqstrcpy (mp->vname, str->vid); 
+                /* last six chars reserved for vol type */
+                inqstrcpy (mp->model, str->pid);
+        }
 
         if (tindex < (sizeof(container_types)/sizeof(char *))){
                 char *findit = str->pid;
@@ -627,7 +653,9 @@ static void setinqstr(int devtype, void *data, int tindex)
                 /* RAID is superfluous in the context of a RAID device */
                 if (memcmp(findit-4, "RAID", 4) == 0)
                         *(findit -= 4) = ' ';
-                inqstrcpy (container_types[tindex], findit + 1);
+                if (((findit - str->pid) + strlen(container_types[tindex]))
+                 < (sizeof(str->pid) + sizeof(str->prl)))
+                        inqstrcpy (container_types[tindex], findit + 1);
         }
         inqstrcpy ("V1.0", str->prl);
 }
@@ -822,12 +850,12 @@ int aac_get_adapter_info(struct aac_dev* dev)
                 dev->dac_support = (dacmode!=0);
         }
         if(dev->dac_support != 0) {
-                if (!pci_set_dma_mask(dev->pdev, 0xFFFFFFFFFFFFFFFFULL) &&
-                        !pci_set_consistent_dma_mask(dev->pdev, 0xFFFFFFFFFFFFFFFFULL)) {
+                if (!pci_set_dma_mask(dev->pdev, DMA_64BIT_MASK) &&
+                        !pci_set_consistent_dma_mask(dev->pdev, DMA_64BIT_MASK)) {
                         printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",
                                 dev->name, dev->id);
-                } else if (!pci_set_dma_mask(dev->pdev, 0xFFFFFFFFULL) &&
-                        !pci_set_consistent_dma_mask(dev->pdev, 0xFFFFFFFFULL)) {
+                } else if (!pci_set_dma_mask(dev->pdev, DMA_32BIT_MASK) &&
+                        !pci_set_consistent_dma_mask(dev->pdev, DMA_32BIT_MASK)) {
                         printk(KERN_INFO"%s%d: DMA mask set failed, 64 Bit DAC disabled\n",
                                 dev->name, dev->id);
                         dev->dac_support = 0;
@@ -1438,7 +1466,6 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
         struct Scsi_Host *host = scsicmd->device->host;
         struct aac_dev *dev = (struct aac_dev *)host->hostdata;
         struct fsa_dev_info *fsa_dev_ptr = dev->fsa_dev;
-        int cardtype = dev->cardtype;
         int ret;
         
         /*
@@ -1542,14 +1569,14 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                  *      see: <vendor>.c i.e. aac.c
                  */
                 if (scsicmd->device->id == host->this_id) {
-                        setinqstr(cardtype, (void *) (inq_data.inqd_vid), (sizeof(container_types)/sizeof(char *)));
+                        setinqstr(dev, (void *) (inq_data.inqd_vid), (sizeof(container_types)/sizeof(char *)));
                         inq_data.inqd_pdt = INQD_PDT_PROC;      /* Processor device */
                         aac_internal_transfer(scsicmd, &inq_data, 0, sizeof(inq_data));
                         scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
                         scsicmd->scsi_done(scsicmd);
                         return 0;
                 }
-                setinqstr(cardtype, (void *) (inq_data.inqd_vid), fsa_dev_ptr[cid].type);
+                setinqstr(dev, (void *) (inq_data.inqd_vid), fsa_dev_ptr[cid].type);
                 inq_data.inqd_pdt = INQD_PDT_DA;        /* Direct/random access device */
                 aac_internal_transfer(scsicmd, &inq_data, 0, sizeof(inq_data));
                 return aac_get_container_name(scsicmd, cid);