ses: fix discovery of SATA devices in SAS enclosures

[karo-tx-linux.git] / drivers / scsi / ses.c

diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index dcb0d76d7312847d37809df1f5763206567d5daf..53ef1cb6418e33f0ce9542468359d2ad0297444d 100644 (file)
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -34,6 +34,8 @@
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_host.h>
 
+#include <scsi/scsi_transport_sas.h>
+
 struct ses_device {
        unsigned char *page1;
        unsigned char *page1_types;
@@ -84,6 +86,7 @@ static void init_device_slot_control(unsigned char *dest_desc,
 static int ses_recv_diag(struct scsi_device *sdev, int page_code,
                         void *buf, int bufflen)
 {
+       int ret;
        unsigned char cmd[] = {
                RECEIVE_DIAGNOSTIC,
                1,              /* Set PCV bit */
@@ -92,9 +95,26 @@ static int ses_recv_diag(struct scsi_device *sdev, int page_code,
                bufflen & 0xff,
                0
        };
+       unsigned char recv_page_code;
 
-       return scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, bufflen,
+       ret =  scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, bufflen,
                                NULL, SES_TIMEOUT, SES_RETRIES, NULL);
+       if (unlikely(!ret))
+               return ret;
+
+       recv_page_code = ((unsigned char *)buf)[0];
+
+       if (likely(recv_page_code == page_code))
+               return ret;
+
+       /* successful diagnostic but wrong page code.  This happens to some
+        * USB devices, just print a message and pretend there was an error */
+
+       sdev_printk(KERN_ERR, sdev,
+                   "Wrong diagnostic page; asked for %d got %u\n",
+                   page_code, recv_page_code);
+
+       return -EINVAL;
 }
 
 static int ses_send_diag(struct scsi_device *sdev, int page_code,
@@ -541,7 +561,15 @@ static void ses_enclosure_data_process(struct enclosure_device *edev,
                        if (desc_ptr)
                                desc_ptr += len;
 
-                       if (addl_desc_ptr)
+                       if (addl_desc_ptr &&
+                           /* only find additional descriptions for specific devices */
+                           (type_ptr[0] == ENCLOSURE_COMPONENT_DEVICE ||
+                            type_ptr[0] == ENCLOSURE_COMPONENT_ARRAY_DEVICE ||
+                            type_ptr[0] == ENCLOSURE_COMPONENT_SAS_EXPANDER ||
+                            /* these elements are optional */
+                            type_ptr[0] == ENCLOSURE_COMPONENT_SCSI_TARGET_PORT ||
+                            type_ptr[0] == ENCLOSURE_COMPONENT_SCSI_INITIATOR_PORT ||
+                            type_ptr[0] == ENCLOSURE_COMPONENT_CONTROLLER_ELECTRONICS))
                                addl_desc_ptr += addl_desc_ptr[1] + 2;
 
                }
@@ -553,31 +581,15 @@ static void ses_enclosure_data_process(struct enclosure_device *edev,
 static void ses_match_to_enclosure(struct enclosure_device *edev,
                                   struct scsi_device *sdev)
 {
-       unsigned char *desc;
        struct efd efd = {
                .addr = 0,
        };
 
        ses_enclosure_data_process(edev, to_scsi_device(edev->edev.parent), 0);
 
-       if (!sdev->vpd_pg83_len)
-               return;
-
-       desc = sdev->vpd_pg83 + 4;
-       while (desc < sdev->vpd_pg83 + sdev->vpd_pg83_len) {
-               enum scsi_protocol proto = desc[0] >> 4;
-               u8 code_set = desc[0] & 0x0f;
-               u8 piv = desc[1] & 0x80;
-               u8 assoc = (desc[1] & 0x30) >> 4;
-               u8 type = desc[1] & 0x0f;
-               u8 len = desc[3];
+       if (is_sas_attached(sdev))
+               efd.addr = sas_get_address(sdev);
 
-               if (piv && code_set == 1 && assoc == 1
-                   && proto == SCSI_PROTOCOL_SAS && type == 3 && len == 8)
-                       efd.addr = get_unaligned_be64(&desc[4]);
-
-               desc += len + 4;
-       }
        if (efd.addr) {
                efd.dev = &sdev->sdev_gendev;