Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / drivers / scsi / libsas / sas_scsi_host.c

diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 1f8241563c6ccea625640eb69c22554d931f3d87..601ec5b6a7f6ab1a240ff130b0dbc6f989b3ec4e 100644 (file)
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -24,6 +24,8 @@
  */
 
 #include <linux/kthread.h>
+#include <linux/firmware.h>
+#include <linux/ctype.h>
 
 #include "sas_internal.h"
 
@@ -1064,6 +1066,45 @@ void sas_target_destroy(struct scsi_target *starget)
        return;
 }
 
+static void sas_parse_addr(u8 *sas_addr, const char *p)
+{
+       int i;
+       for (i = 0; i < SAS_ADDR_SIZE; i++) {
+               u8 h, l;
+               if (!*p)
+                       break;
+               h = isdigit(*p) ? *p-'0' : toupper(*p)-'A'+10;
+               p++;
+               l = isdigit(*p) ? *p-'0' : toupper(*p)-'A'+10;
+               p++;
+               sas_addr[i] = (h<<4) | l;
+       }
+}
+
+#define SAS_STRING_ADDR_SIZE   16
+
+int sas_request_addr(struct Scsi_Host *shost, u8 *addr)
+{
+       int res;
+       const struct firmware *fw;
+
+       res = request_firmware(&fw, "sas_addr", &shost->shost_gendev);
+       if (res)
+               return res;
+
+       if (fw->size < SAS_STRING_ADDR_SIZE) {
+               res = -ENODEV;
+               goto out;
+       }
+
+       sas_parse_addr(addr, fw->data);
+
+out:
+       release_firmware(fw);
+       return res;
+}
+EXPORT_SYMBOL_GPL(sas_request_addr);
+
 EXPORT_SYMBOL_GPL(sas_queuecommand);
 EXPORT_SYMBOL_GPL(sas_target_alloc);
 EXPORT_SYMBOL_GPL(sas_slave_configure);