diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
commit | e4b636366c00738b9609cda307014d71b1225b7f (patch) | |
tree | 760b67b3624eda62e943e48ce93635c30a5b47bf /drivers/scsi/mpt2sas | |
parent | b9ed7252d219c1c663944bf03846eabb515dbe75 (diff) | |
parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/scsi/mpt2sas')
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.c | 75 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.h | 30 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_ctl.c | 216 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_ctl.h | 7 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_scsih.c | 29 |
5 files changed, 261 insertions, 96 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index a91f5143ceac..f3da592f7bcc 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c | |||
@@ -636,6 +636,14 @@ _base_unmask_interrupts(struct MPT2SAS_ADAPTER *ioc) | |||
636 | static irqreturn_t | 636 | static irqreturn_t |
637 | _base_interrupt(int irq, void *bus_id) | 637 | _base_interrupt(int irq, void *bus_id) |
638 | { | 638 | { |
639 | union reply_descriptor { | ||
640 | u64 word; | ||
641 | struct { | ||
642 | u32 low; | ||
643 | u32 high; | ||
644 | } u; | ||
645 | }; | ||
646 | union reply_descriptor rd; | ||
639 | u32 post_index, post_index_next, completed_cmds; | 647 | u32 post_index, post_index_next, completed_cmds; |
640 | u8 request_desript_type; | 648 | u8 request_desript_type; |
641 | u16 smid; | 649 | u16 smid; |
@@ -656,7 +664,8 @@ _base_interrupt(int irq, void *bus_id) | |||
656 | 664 | ||
657 | completed_cmds = 0; | 665 | completed_cmds = 0; |
658 | do { | 666 | do { |
659 | if (ioc->reply_post_free[post_index].Words == ~0ULL) | 667 | rd.word = ioc->reply_post_free[post_index].Words; |
668 | if (rd.u.low == UINT_MAX || rd.u.high == UINT_MAX) | ||
660 | goto out; | 669 | goto out; |
661 | reply = 0; | 670 | reply = 0; |
662 | cb_idx = 0xFF; | 671 | cb_idx = 0xFF; |
@@ -721,7 +730,7 @@ _base_interrupt(int irq, void *bus_id) | |||
721 | for (i = 0 ; i < completed_cmds; i++) { | 730 | for (i = 0 ; i < completed_cmds; i++) { |
722 | post_index = post_index_next; | 731 | post_index = post_index_next; |
723 | /* poison the reply post descriptor */ | 732 | /* poison the reply post descriptor */ |
724 | ioc->reply_post_free[post_index_next].Words = ~0ULL; | 733 | ioc->reply_post_free[post_index_next].Words = ULLONG_MAX; |
725 | post_index_next = (post_index == | 734 | post_index_next = (post_index == |
726 | (ioc->reply_post_queue_depth - 1)) | 735 | (ioc->reply_post_queue_depth - 1)) |
727 | ? 0 : post_index + 1; | 736 | ? 0 : post_index + 1; |
@@ -1387,6 +1396,64 @@ mpt2sas_base_put_smid_target_assist(struct MPT2SAS_ADAPTER *ioc, u16 smid, | |||
1387 | } | 1396 | } |
1388 | 1397 | ||
1389 | /** | 1398 | /** |
1399 | * _base_display_dell_branding - Disply branding string | ||
1400 | * @ioc: per adapter object | ||
1401 | * | ||
1402 | * Return nothing. | ||
1403 | */ | ||
1404 | static void | ||
1405 | _base_display_dell_branding(struct MPT2SAS_ADAPTER *ioc) | ||
1406 | { | ||
1407 | char dell_branding[MPT2SAS_DELL_BRANDING_SIZE]; | ||
1408 | |||
1409 | if (ioc->pdev->subsystem_vendor != PCI_VENDOR_ID_DELL) | ||
1410 | return; | ||
1411 | |||
1412 | memset(dell_branding, 0, MPT2SAS_DELL_BRANDING_SIZE); | ||
1413 | switch (ioc->pdev->subsystem_device) { | ||
1414 | case MPT2SAS_DELL_6GBPS_SAS_HBA_SSDID: | ||
1415 | strncpy(dell_branding, MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING, | ||
1416 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1417 | break; | ||
1418 | case MPT2SAS_DELL_PERC_H200_ADAPTER_SSDID: | ||
1419 | strncpy(dell_branding, MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING, | ||
1420 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1421 | break; | ||
1422 | case MPT2SAS_DELL_PERC_H200_INTEGRATED_SSDID: | ||
1423 | strncpy(dell_branding, | ||
1424 | MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING, | ||
1425 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1426 | break; | ||
1427 | case MPT2SAS_DELL_PERC_H200_MODULAR_SSDID: | ||
1428 | strncpy(dell_branding, | ||
1429 | MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING, | ||
1430 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1431 | break; | ||
1432 | case MPT2SAS_DELL_PERC_H200_EMBEDDED_SSDID: | ||
1433 | strncpy(dell_branding, | ||
1434 | MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING, | ||
1435 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1436 | break; | ||
1437 | case MPT2SAS_DELL_PERC_H200_SSDID: | ||
1438 | strncpy(dell_branding, MPT2SAS_DELL_PERC_H200_BRANDING, | ||
1439 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1440 | break; | ||
1441 | case MPT2SAS_DELL_6GBPS_SAS_SSDID: | ||
1442 | strncpy(dell_branding, MPT2SAS_DELL_6GBPS_SAS_BRANDING, | ||
1443 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1444 | break; | ||
1445 | default: | ||
1446 | sprintf(dell_branding, "0x%4X", ioc->pdev->subsystem_device); | ||
1447 | break; | ||
1448 | } | ||
1449 | |||
1450 | printk(MPT2SAS_INFO_FMT "%s: Vendor(0x%04X), Device(0x%04X)," | ||
1451 | " SSVID(0x%04X), SSDID(0x%04X)\n", ioc->name, dell_branding, | ||
1452 | ioc->pdev->vendor, ioc->pdev->device, ioc->pdev->subsystem_vendor, | ||
1453 | ioc->pdev->subsystem_device); | ||
1454 | } | ||
1455 | |||
1456 | /** | ||
1390 | * _base_display_ioc_capabilities - Disply IOC's capabilities. | 1457 | * _base_display_ioc_capabilities - Disply IOC's capabilities. |
1391 | * @ioc: per adapter object | 1458 | * @ioc: per adapter object |
1392 | * | 1459 | * |
@@ -1427,6 +1494,8 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc) | |||
1427 | i++; | 1494 | i++; |
1428 | } | 1495 | } |
1429 | 1496 | ||
1497 | _base_display_dell_branding(ioc); | ||
1498 | |||
1430 | i = 0; | 1499 | i = 0; |
1431 | printk("), "); | 1500 | printk("), "); |
1432 | printk("Capabilities=("); | 1501 | printk("Capabilities=("); |
@@ -3068,7 +3137,7 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, u8 VF_ID, | |||
3068 | 3137 | ||
3069 | /* initialize Reply Post Free Queue */ | 3138 | /* initialize Reply Post Free Queue */ |
3070 | for (i = 0; i < ioc->reply_post_queue_depth; i++) | 3139 | for (i = 0; i < ioc->reply_post_queue_depth; i++) |
3071 | ioc->reply_post_free[i].Words = ~0ULL; | 3140 | ioc->reply_post_free[i].Words = ULLONG_MAX; |
3072 | 3141 | ||
3073 | r = _base_send_ioc_init(ioc, VF_ID, sleep_flag); | 3142 | r = _base_send_ioc_init(ioc, VF_ID, sleep_flag); |
3074 | if (r) | 3143 | if (r) |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h index 6945ff4d382e..babd4cc0cb25 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.h +++ b/drivers/scsi/mpt2sas/mpt2sas_base.h | |||
@@ -68,11 +68,11 @@ | |||
68 | #define MPT2SAS_DRIVER_NAME "mpt2sas" | 68 | #define MPT2SAS_DRIVER_NAME "mpt2sas" |
69 | #define MPT2SAS_AUTHOR "LSI Corporation <DL-MPTFusionLinux@lsi.com>" | 69 | #define MPT2SAS_AUTHOR "LSI Corporation <DL-MPTFusionLinux@lsi.com>" |
70 | #define MPT2SAS_DESCRIPTION "LSI MPT Fusion SAS 2.0 Device Driver" | 70 | #define MPT2SAS_DESCRIPTION "LSI MPT Fusion SAS 2.0 Device Driver" |
71 | #define MPT2SAS_DRIVER_VERSION "00.100.11.16" | 71 | #define MPT2SAS_DRIVER_VERSION "01.100.02.00" |
72 | #define MPT2SAS_MAJOR_VERSION 00 | 72 | #define MPT2SAS_MAJOR_VERSION 00 |
73 | #define MPT2SAS_MINOR_VERSION 100 | 73 | #define MPT2SAS_MINOR_VERSION 100 |
74 | #define MPT2SAS_BUILD_VERSION 11 | 74 | #define MPT2SAS_BUILD_VERSION 02 |
75 | #define MPT2SAS_RELEASE_VERSION 16 | 75 | #define MPT2SAS_RELEASE_VERSION 00 |
76 | 76 | ||
77 | /* | 77 | /* |
78 | * Set MPT2SAS_SG_DEPTH value based on user input. | 78 | * Set MPT2SAS_SG_DEPTH value based on user input. |
@@ -130,6 +130,30 @@ | |||
130 | #define MPT2SAS_ERR_FMT KERN_ERR MPT2SAS_FMT | 130 | #define MPT2SAS_ERR_FMT KERN_ERR MPT2SAS_FMT |
131 | 131 | ||
132 | /* | 132 | /* |
133 | * Dell HBA branding | ||
134 | */ | ||
135 | #define MPT2SAS_DELL_BRANDING_SIZE 32 | ||
136 | |||
137 | #define MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING "Dell 6Gbps SAS HBA" | ||
138 | #define MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING "Dell PERC H200 Adapter" | ||
139 | #define MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING "Dell PERC H200 Integrated" | ||
140 | #define MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING "Dell PERC H200 Modular" | ||
141 | #define MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING "Dell PERC H200 Embedded" | ||
142 | #define MPT2SAS_DELL_PERC_H200_BRANDING "Dell PERC H200" | ||
143 | #define MPT2SAS_DELL_6GBPS_SAS_BRANDING "Dell 6Gbps SAS" | ||
144 | |||
145 | /* | ||
146 | * Dell HBA SSDIDs | ||
147 | */ | ||
148 | #define MPT2SAS_DELL_6GBPS_SAS_HBA_SSDID 0x1F1C | ||
149 | #define MPT2SAS_DELL_PERC_H200_ADAPTER_SSDID 0x1F1D | ||
150 | #define MPT2SAS_DELL_PERC_H200_INTEGRATED_SSDID 0x1F1E | ||
151 | #define MPT2SAS_DELL_PERC_H200_MODULAR_SSDID 0x1F1F | ||
152 | #define MPT2SAS_DELL_PERC_H200_EMBEDDED_SSDID 0x1F20 | ||
153 | #define MPT2SAS_DELL_PERC_H200_SSDID 0x1F21 | ||
154 | #define MPT2SAS_DELL_6GBPS_SAS_SSDID 0x1F22 | ||
155 | |||
156 | /* | ||
133 | * per target private data | 157 | * per target private data |
134 | */ | 158 | */ |
135 | #define MPT_TARGET_FLAGS_RAID_COMPONENT 0x01 | 159 | #define MPT_TARGET_FLAGS_RAID_COMPONENT 0x01 |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c index 2d4f85c9d7a1..ba6ab170bdf0 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c | |||
@@ -64,6 +64,9 @@ | |||
64 | static struct fasync_struct *async_queue; | 64 | static struct fasync_struct *async_queue; |
65 | static DECLARE_WAIT_QUEUE_HEAD(ctl_poll_wait); | 65 | static DECLARE_WAIT_QUEUE_HEAD(ctl_poll_wait); |
66 | 66 | ||
67 | static int _ctl_send_release(struct MPT2SAS_ADAPTER *ioc, u8 buffer_type, | ||
68 | u8 *issue_reset); | ||
69 | |||
67 | /** | 70 | /** |
68 | * enum block_state - blocking state | 71 | * enum block_state - blocking state |
69 | * @NON_BLOCKING: non blocking | 72 | * @NON_BLOCKING: non blocking |
@@ -378,10 +381,22 @@ _ctl_verify_adapter(int ioc_number, struct MPT2SAS_ADAPTER **iocpp) | |||
378 | void | 381 | void |
379 | mpt2sas_ctl_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase) | 382 | mpt2sas_ctl_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase) |
380 | { | 383 | { |
384 | int i; | ||
385 | u8 issue_reset; | ||
386 | |||
381 | switch (reset_phase) { | 387 | switch (reset_phase) { |
382 | case MPT2_IOC_PRE_RESET: | 388 | case MPT2_IOC_PRE_RESET: |
383 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " | 389 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " |
384 | "MPT2_IOC_PRE_RESET\n", ioc->name, __func__)); | 390 | "MPT2_IOC_PRE_RESET\n", ioc->name, __func__)); |
391 | for (i = 0; i < MPI2_DIAG_BUF_TYPE_COUNT; i++) { | ||
392 | if (!(ioc->diag_buffer_status[i] & | ||
393 | MPT2_DIAG_BUFFER_IS_REGISTERED)) | ||
394 | continue; | ||
395 | if ((ioc->diag_buffer_status[i] & | ||
396 | MPT2_DIAG_BUFFER_IS_RELEASED)) | ||
397 | continue; | ||
398 | _ctl_send_release(ioc, i, &issue_reset); | ||
399 | } | ||
385 | break; | 400 | break; |
386 | case MPT2_IOC_AFTER_RESET: | 401 | case MPT2_IOC_AFTER_RESET: |
387 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " | 402 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " |
@@ -395,6 +410,17 @@ mpt2sas_ctl_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase) | |||
395 | case MPT2_IOC_DONE_RESET: | 410 | case MPT2_IOC_DONE_RESET: |
396 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " | 411 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " |
397 | "MPT2_IOC_DONE_RESET\n", ioc->name, __func__)); | 412 | "MPT2_IOC_DONE_RESET\n", ioc->name, __func__)); |
413 | |||
414 | for (i = 0; i < MPI2_DIAG_BUF_TYPE_COUNT; i++) { | ||
415 | if (!(ioc->diag_buffer_status[i] & | ||
416 | MPT2_DIAG_BUFFER_IS_REGISTERED)) | ||
417 | continue; | ||
418 | if ((ioc->diag_buffer_status[i] & | ||
419 | MPT2_DIAG_BUFFER_IS_RELEASED)) | ||
420 | continue; | ||
421 | ioc->diag_buffer_status[i] |= | ||
422 | MPT2_DIAG_BUFFER_IS_DIAG_RESET; | ||
423 | } | ||
398 | break; | 424 | break; |
399 | } | 425 | } |
400 | } | 426 | } |
@@ -714,8 +740,10 @@ _ctl_do_mpt_command(struct MPT2SAS_ADAPTER *ioc, | |||
714 | 740 | ||
715 | if (tm_request->TaskType == | 741 | if (tm_request->TaskType == |
716 | MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK) { | 742 | MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK) { |
717 | if (_ctl_do_task_abort(ioc, &karg, tm_request)) | 743 | if (_ctl_do_task_abort(ioc, &karg, tm_request)) { |
744 | mpt2sas_base_free_smid(ioc, smid); | ||
718 | goto out; | 745 | goto out; |
746 | } | ||
719 | } | 747 | } |
720 | 748 | ||
721 | mutex_lock(&ioc->tm_cmds.mutex); | 749 | mutex_lock(&ioc->tm_cmds.mutex); |
@@ -915,9 +943,9 @@ _ctl_getiocinfo(void __user *arg) | |||
915 | karg.pci_information.u.bits.function = PCI_FUNC(ioc->pdev->devfn); | 943 | karg.pci_information.u.bits.function = PCI_FUNC(ioc->pdev->devfn); |
916 | karg.pci_information.segment_id = pci_domain_nr(ioc->pdev->bus); | 944 | karg.pci_information.segment_id = pci_domain_nr(ioc->pdev->bus); |
917 | karg.firmware_version = ioc->facts.FWVersion.Word; | 945 | karg.firmware_version = ioc->facts.FWVersion.Word; |
918 | strncpy(karg.driver_version, MPT2SAS_DRIVER_VERSION, | 946 | strcpy(karg.driver_version, MPT2SAS_DRIVER_NAME); |
919 | MPT2_IOCTL_VERSION_LENGTH); | 947 | strcat(karg.driver_version, "-"); |
920 | karg.driver_version[MPT2_IOCTL_VERSION_LENGTH - 1] = '\0'; | 948 | strcat(karg.driver_version, MPT2SAS_DRIVER_VERSION); |
921 | karg.bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion); | 949 | karg.bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion); |
922 | 950 | ||
923 | if (copy_to_user(arg, &karg, sizeof(karg))) { | 951 | if (copy_to_user(arg, &karg, sizeof(karg))) { |
@@ -1551,81 +1579,38 @@ _ctl_diag_query(void __user *arg) | |||
1551 | } | 1579 | } |
1552 | 1580 | ||
1553 | /** | 1581 | /** |
1554 | * _ctl_diag_release - request to send Diag Release Message to firmware | 1582 | * _ctl_send_release - Diag Release Message |
1555 | * @arg - user space buffer containing ioctl content | 1583 | * @ioc: per adapter object |
1556 | * @state - NON_BLOCKING or BLOCKING | 1584 | * @buffer_type - specifies either TRACE or SNAPSHOT |
1585 | * @issue_reset - specifies whether host reset is required. | ||
1557 | * | 1586 | * |
1558 | * This allows ownership of the specified buffer to returned to the driver, | ||
1559 | * allowing an application to read the buffer without fear that firmware is | ||
1560 | * overwritting information in the buffer. | ||
1561 | */ | 1587 | */ |
1562 | static long | 1588 | static int |
1563 | _ctl_diag_release(void __user *arg, enum block_state state) | 1589 | _ctl_send_release(struct MPT2SAS_ADAPTER *ioc, u8 buffer_type, u8 *issue_reset) |
1564 | { | 1590 | { |
1565 | struct mpt2_diag_release karg; | ||
1566 | struct MPT2SAS_ADAPTER *ioc; | ||
1567 | void *request_data; | ||
1568 | int rc; | ||
1569 | Mpi2DiagReleaseRequest_t *mpi_request; | 1591 | Mpi2DiagReleaseRequest_t *mpi_request; |
1570 | Mpi2DiagReleaseReply_t *mpi_reply; | 1592 | Mpi2DiagReleaseReply_t *mpi_reply; |
1571 | u8 buffer_type; | ||
1572 | unsigned long timeleft; | ||
1573 | u16 smid; | 1593 | u16 smid; |
1574 | u16 ioc_status; | 1594 | u16 ioc_status; |
1575 | u8 issue_reset = 0; | 1595 | u32 ioc_state; |
1576 | 1596 | int rc; | |
1577 | if (copy_from_user(&karg, arg, sizeof(karg))) { | 1597 | unsigned long timeleft; |
1578 | printk(KERN_ERR "failure at %s:%d/%s()!\n", | ||
1579 | __FILE__, __LINE__, __func__); | ||
1580 | return -EFAULT; | ||
1581 | } | ||
1582 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | ||
1583 | return -ENODEV; | ||
1584 | 1598 | ||
1585 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, | 1599 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, |
1586 | __func__)); | 1600 | __func__)); |
1587 | 1601 | ||
1588 | buffer_type = karg.unique_id & 0x000000ff; | 1602 | rc = 0; |
1589 | if (!_ctl_diag_capability(ioc, buffer_type)) { | 1603 | *issue_reset = 0; |
1590 | printk(MPT2SAS_ERR_FMT "%s: doesn't have capability for " | ||
1591 | "buffer_type(0x%02x)\n", ioc->name, __func__, buffer_type); | ||
1592 | return -EPERM; | ||
1593 | } | ||
1594 | |||
1595 | if ((ioc->diag_buffer_status[buffer_type] & | ||
1596 | MPT2_DIAG_BUFFER_IS_REGISTERED) == 0) { | ||
1597 | printk(MPT2SAS_ERR_FMT "%s: buffer_type(0x%02x) is not " | ||
1598 | "registered\n", ioc->name, __func__, buffer_type); | ||
1599 | return -EINVAL; | ||
1600 | } | ||
1601 | |||
1602 | if (karg.unique_id != ioc->unique_id[buffer_type]) { | ||
1603 | printk(MPT2SAS_ERR_FMT "%s: unique_id(0x%08x) is not " | ||
1604 | "registered\n", ioc->name, __func__, karg.unique_id); | ||
1605 | return -EINVAL; | ||
1606 | } | ||
1607 | |||
1608 | if (ioc->diag_buffer_status[buffer_type] & | ||
1609 | MPT2_DIAG_BUFFER_IS_RELEASED) { | ||
1610 | printk(MPT2SAS_ERR_FMT "%s: buffer_type(0x%02x) " | ||
1611 | "is already released\n", ioc->name, __func__, | ||
1612 | buffer_type); | ||
1613 | return 0; | ||
1614 | } | ||
1615 | |||
1616 | request_data = ioc->diag_buffer[buffer_type]; | ||
1617 | 1604 | ||
1618 | if (!request_data) { | 1605 | ioc_state = mpt2sas_base_get_iocstate(ioc, 1); |
1619 | printk(MPT2SAS_ERR_FMT "%s: doesn't have memory allocated for " | 1606 | if (ioc_state != MPI2_IOC_STATE_OPERATIONAL) { |
1620 | "buffer_type(0x%02x)\n", ioc->name, __func__, buffer_type); | 1607 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " |
1621 | return -ENOMEM; | 1608 | "skipping due to FAULT state\n", ioc->name, |
1609 | __func__)); | ||
1610 | rc = -EAGAIN; | ||
1611 | goto out; | ||
1622 | } | 1612 | } |
1623 | 1613 | ||
1624 | if (state == NON_BLOCKING && !mutex_trylock(&ioc->ctl_cmds.mutex)) | ||
1625 | return -EAGAIN; | ||
1626 | else if (mutex_lock_interruptible(&ioc->ctl_cmds.mutex)) | ||
1627 | return -ERESTARTSYS; | ||
1628 | |||
1629 | if (ioc->ctl_cmds.status != MPT2_CMD_NOT_USED) { | 1614 | if (ioc->ctl_cmds.status != MPT2_CMD_NOT_USED) { |
1630 | printk(MPT2SAS_ERR_FMT "%s: ctl_cmd in use\n", | 1615 | printk(MPT2SAS_ERR_FMT "%s: ctl_cmd in use\n", |
1631 | ioc->name, __func__); | 1616 | ioc->name, __func__); |
@@ -1641,7 +1626,6 @@ _ctl_diag_release(void __user *arg, enum block_state state) | |||
1641 | goto out; | 1626 | goto out; |
1642 | } | 1627 | } |
1643 | 1628 | ||
1644 | rc = 0; | ||
1645 | ioc->ctl_cmds.status = MPT2_CMD_PENDING; | 1629 | ioc->ctl_cmds.status = MPT2_CMD_PENDING; |
1646 | memset(ioc->ctl_cmds.reply, 0, ioc->reply_sz); | 1630 | memset(ioc->ctl_cmds.reply, 0, ioc->reply_sz); |
1647 | mpi_request = mpt2sas_base_get_msg_frame(ioc, smid); | 1631 | mpi_request = mpt2sas_base_get_msg_frame(ioc, smid); |
@@ -1660,8 +1644,9 @@ _ctl_diag_release(void __user *arg, enum block_state state) | |||
1660 | _debug_dump_mf(mpi_request, | 1644 | _debug_dump_mf(mpi_request, |
1661 | sizeof(Mpi2DiagReleaseRequest_t)/4); | 1645 | sizeof(Mpi2DiagReleaseRequest_t)/4); |
1662 | if (!(ioc->ctl_cmds.status & MPT2_CMD_RESET)) | 1646 | if (!(ioc->ctl_cmds.status & MPT2_CMD_RESET)) |
1663 | issue_reset = 1; | 1647 | *issue_reset = 1; |
1664 | goto issue_host_reset; | 1648 | rc = -EFAULT; |
1649 | goto out; | ||
1665 | } | 1650 | } |
1666 | 1651 | ||
1667 | /* process the completed Reply Message Frame */ | 1652 | /* process the completed Reply Message Frame */ |
@@ -1687,14 +1672,101 @@ _ctl_diag_release(void __user *arg, enum block_state state) | |||
1687 | rc = -EFAULT; | 1672 | rc = -EFAULT; |
1688 | } | 1673 | } |
1689 | 1674 | ||
1690 | issue_host_reset: | 1675 | out: |
1676 | ioc->ctl_cmds.status = MPT2_CMD_NOT_USED; | ||
1677 | return rc; | ||
1678 | } | ||
1679 | |||
1680 | /** | ||
1681 | * _ctl_diag_release - request to send Diag Release Message to firmware | ||
1682 | * @arg - user space buffer containing ioctl content | ||
1683 | * @state - NON_BLOCKING or BLOCKING | ||
1684 | * | ||
1685 | * This allows ownership of the specified buffer to returned to the driver, | ||
1686 | * allowing an application to read the buffer without fear that firmware is | ||
1687 | * overwritting information in the buffer. | ||
1688 | */ | ||
1689 | static long | ||
1690 | _ctl_diag_release(void __user *arg, enum block_state state) | ||
1691 | { | ||
1692 | struct mpt2_diag_release karg; | ||
1693 | struct MPT2SAS_ADAPTER *ioc; | ||
1694 | void *request_data; | ||
1695 | int rc; | ||
1696 | u8 buffer_type; | ||
1697 | u8 issue_reset = 0; | ||
1698 | |||
1699 | if (copy_from_user(&karg, arg, sizeof(karg))) { | ||
1700 | printk(KERN_ERR "failure at %s:%d/%s()!\n", | ||
1701 | __FILE__, __LINE__, __func__); | ||
1702 | return -EFAULT; | ||
1703 | } | ||
1704 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | ||
1705 | return -ENODEV; | ||
1706 | |||
1707 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, | ||
1708 | __func__)); | ||
1709 | |||
1710 | buffer_type = karg.unique_id & 0x000000ff; | ||
1711 | if (!_ctl_diag_capability(ioc, buffer_type)) { | ||
1712 | printk(MPT2SAS_ERR_FMT "%s: doesn't have capability for " | ||
1713 | "buffer_type(0x%02x)\n", ioc->name, __func__, buffer_type); | ||
1714 | return -EPERM; | ||
1715 | } | ||
1716 | |||
1717 | if ((ioc->diag_buffer_status[buffer_type] & | ||
1718 | MPT2_DIAG_BUFFER_IS_REGISTERED) == 0) { | ||
1719 | printk(MPT2SAS_ERR_FMT "%s: buffer_type(0x%02x) is not " | ||
1720 | "registered\n", ioc->name, __func__, buffer_type); | ||
1721 | return -EINVAL; | ||
1722 | } | ||
1723 | |||
1724 | if (karg.unique_id != ioc->unique_id[buffer_type]) { | ||
1725 | printk(MPT2SAS_ERR_FMT "%s: unique_id(0x%08x) is not " | ||
1726 | "registered\n", ioc->name, __func__, karg.unique_id); | ||
1727 | return -EINVAL; | ||
1728 | } | ||
1729 | |||
1730 | if (ioc->diag_buffer_status[buffer_type] & | ||
1731 | MPT2_DIAG_BUFFER_IS_RELEASED) { | ||
1732 | printk(MPT2SAS_ERR_FMT "%s: buffer_type(0x%02x) " | ||
1733 | "is already released\n", ioc->name, __func__, | ||
1734 | buffer_type); | ||
1735 | return 0; | ||
1736 | } | ||
1737 | |||
1738 | request_data = ioc->diag_buffer[buffer_type]; | ||
1739 | |||
1740 | if (!request_data) { | ||
1741 | printk(MPT2SAS_ERR_FMT "%s: doesn't have memory allocated for " | ||
1742 | "buffer_type(0x%02x)\n", ioc->name, __func__, buffer_type); | ||
1743 | return -ENOMEM; | ||
1744 | } | ||
1745 | |||
1746 | /* buffers were released by due to host reset */ | ||
1747 | if ((ioc->diag_buffer_status[buffer_type] & | ||
1748 | MPT2_DIAG_BUFFER_IS_DIAG_RESET)) { | ||
1749 | ioc->diag_buffer_status[buffer_type] |= | ||
1750 | MPT2_DIAG_BUFFER_IS_RELEASED; | ||
1751 | ioc->diag_buffer_status[buffer_type] &= | ||
1752 | ~MPT2_DIAG_BUFFER_IS_DIAG_RESET; | ||
1753 | printk(MPT2SAS_ERR_FMT "%s: buffer_type(0x%02x) " | ||
1754 | "was released due to host reset\n", ioc->name, __func__, | ||
1755 | buffer_type); | ||
1756 | return 0; | ||
1757 | } | ||
1758 | |||
1759 | if (state == NON_BLOCKING && !mutex_trylock(&ioc->ctl_cmds.mutex)) | ||
1760 | return -EAGAIN; | ||
1761 | else if (mutex_lock_interruptible(&ioc->ctl_cmds.mutex)) | ||
1762 | return -ERESTARTSYS; | ||
1763 | |||
1764 | rc = _ctl_send_release(ioc, buffer_type, &issue_reset); | ||
1765 | |||
1691 | if (issue_reset) | 1766 | if (issue_reset) |
1692 | mpt2sas_base_hard_reset_handler(ioc, CAN_SLEEP, | 1767 | mpt2sas_base_hard_reset_handler(ioc, CAN_SLEEP, |
1693 | FORCE_BIG_HAMMER); | 1768 | FORCE_BIG_HAMMER); |
1694 | 1769 | ||
1695 | out: | ||
1696 | |||
1697 | ioc->ctl_cmds.status = MPT2_CMD_NOT_USED; | ||
1698 | mutex_unlock(&ioc->ctl_cmds.mutex); | 1770 | mutex_unlock(&ioc->ctl_cmds.mutex); |
1699 | return rc; | 1771 | return rc; |
1700 | } | 1772 | } |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.h b/drivers/scsi/mpt2sas/mpt2sas_ctl.h index dbb6c0cf8889..4da11435533f 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.h +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.h | |||
@@ -50,7 +50,7 @@ | |||
50 | #endif | 50 | #endif |
51 | 51 | ||
52 | #define MPT2SAS_DEV_NAME "mpt2ctl" | 52 | #define MPT2SAS_DEV_NAME "mpt2ctl" |
53 | #define MPT2_MAGIC_NUMBER 'm' | 53 | #define MPT2_MAGIC_NUMBER 'L' |
54 | #define MPT2_IOCTL_DEFAULT_TIMEOUT (10) /* in seconds */ | 54 | #define MPT2_IOCTL_DEFAULT_TIMEOUT (10) /* in seconds */ |
55 | 55 | ||
56 | /** | 56 | /** |
@@ -295,8 +295,9 @@ struct mpt2_ioctl_btdh_mapping { | |||
295 | 295 | ||
296 | 296 | ||
297 | /* status bits for ioc->diag_buffer_status */ | 297 | /* status bits for ioc->diag_buffer_status */ |
298 | #define MPT2_DIAG_BUFFER_IS_REGISTERED (0x01) | 298 | #define MPT2_DIAG_BUFFER_IS_REGISTERED (0x01) |
299 | #define MPT2_DIAG_BUFFER_IS_RELEASED (0x02) | 299 | #define MPT2_DIAG_BUFFER_IS_RELEASED (0x02) |
300 | #define MPT2_DIAG_BUFFER_IS_DIAG_RESET (0x04) | ||
300 | 301 | ||
301 | /* application flags for mpt2_diag_register, mpt2_diag_query */ | 302 | /* application flags for mpt2_diag_register, mpt2_diag_query */ |
302 | #define MPT2_APP_FLAGS_APP_OWNED (0x0001) | 303 | #define MPT2_APP_FLAGS_APP_OWNED (0x0001) |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index 0c463c483c02..e3a7967259e7 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c | |||
@@ -119,7 +119,7 @@ struct sense_info { | |||
119 | */ | 119 | */ |
120 | struct fw_event_work { | 120 | struct fw_event_work { |
121 | struct list_head list; | 121 | struct list_head list; |
122 | struct delayed_work work; | 122 | struct work_struct work; |
123 | struct MPT2SAS_ADAPTER *ioc; | 123 | struct MPT2SAS_ADAPTER *ioc; |
124 | u8 VF_ID; | 124 | u8 VF_ID; |
125 | u8 host_reset_handling; | 125 | u8 host_reset_handling; |
@@ -516,12 +516,8 @@ _scsih_sas_device_add(struct MPT2SAS_ADAPTER *ioc, | |||
516 | handle = sas_device->handle; | 516 | handle = sas_device->handle; |
517 | parent_handle = sas_device->parent_handle; | 517 | parent_handle = sas_device->parent_handle; |
518 | sas_address = sas_device->sas_address; | 518 | sas_address = sas_device->sas_address; |
519 | if (!mpt2sas_transport_port_add(ioc, handle, parent_handle)) { | 519 | if (!mpt2sas_transport_port_add(ioc, handle, parent_handle)) |
520 | _scsih_sas_device_remove(ioc, sas_device); | 520 | _scsih_sas_device_remove(ioc, sas_device); |
521 | } else if (!sas_device->starget) { | ||
522 | mpt2sas_transport_port_remove(ioc, sas_address, parent_handle); | ||
523 | _scsih_sas_device_remove(ioc, sas_device); | ||
524 | } | ||
525 | } | 521 | } |
526 | 522 | ||
527 | /** | 523 | /** |
@@ -1203,7 +1199,9 @@ scsih_target_destroy(struct scsi_target *starget) | |||
1203 | rphy = dev_to_rphy(starget->dev.parent); | 1199 | rphy = dev_to_rphy(starget->dev.parent); |
1204 | sas_device = mpt2sas_scsih_sas_device_find_by_sas_address(ioc, | 1200 | sas_device = mpt2sas_scsih_sas_device_find_by_sas_address(ioc, |
1205 | rphy->identify.sas_address); | 1201 | rphy->identify.sas_address); |
1206 | if (sas_device) | 1202 | if (sas_device && (sas_device->starget == starget) && |
1203 | (sas_device->id == starget->id) && | ||
1204 | (sas_device->channel == starget->channel)) | ||
1207 | sas_device->starget = NULL; | 1205 | sas_device->starget = NULL; |
1208 | 1206 | ||
1209 | spin_unlock_irqrestore(&ioc->sas_device_lock, flags); | 1207 | spin_unlock_irqrestore(&ioc->sas_device_lock, flags); |
@@ -2009,8 +2007,8 @@ _scsih_fw_event_add(struct MPT2SAS_ADAPTER *ioc, struct fw_event_work *fw_event) | |||
2009 | 2007 | ||
2010 | spin_lock_irqsave(&ioc->fw_event_lock, flags); | 2008 | spin_lock_irqsave(&ioc->fw_event_lock, flags); |
2011 | list_add_tail(&fw_event->list, &ioc->fw_event_list); | 2009 | list_add_tail(&fw_event->list, &ioc->fw_event_list); |
2012 | INIT_DELAYED_WORK(&fw_event->work, _firmware_event_work); | 2010 | INIT_WORK(&fw_event->work, _firmware_event_work); |
2013 | queue_delayed_work(ioc->firmware_event_thread, &fw_event->work, 1); | 2011 | queue_work(ioc->firmware_event_thread, &fw_event->work); |
2014 | spin_unlock_irqrestore(&ioc->fw_event_lock, flags); | 2012 | spin_unlock_irqrestore(&ioc->fw_event_lock, flags); |
2015 | } | 2013 | } |
2016 | 2014 | ||
@@ -2054,7 +2052,7 @@ _scsih_fw_event_requeue(struct MPT2SAS_ADAPTER *ioc, struct fw_event_work | |||
2054 | return; | 2052 | return; |
2055 | 2053 | ||
2056 | spin_lock_irqsave(&ioc->fw_event_lock, flags); | 2054 | spin_lock_irqsave(&ioc->fw_event_lock, flags); |
2057 | queue_delayed_work(ioc->firmware_event_thread, &fw_event->work, delay); | 2055 | queue_work(ioc->firmware_event_thread, &fw_event->work); |
2058 | spin_unlock_irqrestore(&ioc->fw_event_lock, flags); | 2056 | spin_unlock_irqrestore(&ioc->fw_event_lock, flags); |
2059 | } | 2057 | } |
2060 | 2058 | ||
@@ -2863,8 +2861,9 @@ scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 VF_ID, u32 reply) | |||
2863 | struct sense_info data; | 2861 | struct sense_info data; |
2864 | const void *sense_data = mpt2sas_base_get_sense_buffer(ioc, | 2862 | const void *sense_data = mpt2sas_base_get_sense_buffer(ioc, |
2865 | smid); | 2863 | smid); |
2866 | memcpy(scmd->sense_buffer, sense_data, | 2864 | u32 sz = min_t(u32, SCSI_SENSE_BUFFERSIZE, |
2867 | le32_to_cpu(mpi_reply->SenseCount)); | 2865 | le32_to_cpu(mpi_reply->SenseCount)); |
2866 | memcpy(scmd->sense_buffer, sense_data, sz); | ||
2868 | _scsih_normalize_sense(scmd->sense_buffer, &data); | 2867 | _scsih_normalize_sense(scmd->sense_buffer, &data); |
2869 | /* failure prediction threshold exceeded */ | 2868 | /* failure prediction threshold exceeded */ |
2870 | if (data.asc == 0x5D) | 2869 | if (data.asc == 0x5D) |
@@ -3923,7 +3922,7 @@ _scsih_sas_broadcast_primative_event(struct MPT2SAS_ADAPTER *ioc, u8 VF_ID, | |||
3923 | 3922 | ||
3924 | mpt2sas_scsih_issue_tm(ioc, handle, lun, | 3923 | mpt2sas_scsih_issue_tm(ioc, handle, lun, |
3925 | MPI2_SCSITASKMGMT_TASKTYPE_QUERY_TASK, smid, 30); | 3924 | MPI2_SCSITASKMGMT_TASKTYPE_QUERY_TASK, smid, 30); |
3926 | termination_count += le32_to_cpu(mpi_reply->TerminationCount); | 3925 | ioc->tm_cmds.status = MPT2_CMD_NOT_USED; |
3927 | 3926 | ||
3928 | if ((mpi_reply->IOCStatus == MPI2_IOCSTATUS_SUCCESS) && | 3927 | if ((mpi_reply->IOCStatus == MPI2_IOCSTATUS_SUCCESS) && |
3929 | (mpi_reply->ResponseCode == | 3928 | (mpi_reply->ResponseCode == |
@@ -3933,10 +3932,10 @@ _scsih_sas_broadcast_primative_event(struct MPT2SAS_ADAPTER *ioc, u8 VF_ID, | |||
3933 | continue; | 3932 | continue; |
3934 | 3933 | ||
3935 | mpt2sas_scsih_issue_tm(ioc, handle, lun, | 3934 | mpt2sas_scsih_issue_tm(ioc, handle, lun, |
3936 | MPI2_SCSITASKMGMT_TASKTYPE_ABRT_TASK_SET, smid, 30); | 3935 | MPI2_SCSITASKMGMT_TASKTYPE_ABRT_TASK_SET, 0, 30); |
3936 | ioc->tm_cmds.status = MPT2_CMD_NOT_USED; | ||
3937 | termination_count += le32_to_cpu(mpi_reply->TerminationCount); | 3937 | termination_count += le32_to_cpu(mpi_reply->TerminationCount); |
3938 | } | 3938 | } |
3939 | ioc->tm_cmds.status = MPT2_CMD_NOT_USED; | ||
3940 | ioc->broadcast_aen_busy = 0; | 3939 | ioc->broadcast_aen_busy = 0; |
3941 | mutex_unlock(&ioc->tm_cmds.mutex); | 3940 | mutex_unlock(&ioc->tm_cmds.mutex); |
3942 | 3941 | ||
@@ -4962,7 +4961,7 @@ static void | |||
4962 | _firmware_event_work(struct work_struct *work) | 4961 | _firmware_event_work(struct work_struct *work) |
4963 | { | 4962 | { |
4964 | struct fw_event_work *fw_event = container_of(work, | 4963 | struct fw_event_work *fw_event = container_of(work, |
4965 | struct fw_event_work, work.work); | 4964 | struct fw_event_work, work); |
4966 | unsigned long flags; | 4965 | unsigned long flags; |
4967 | struct MPT2SAS_ADAPTER *ioc = fw_event->ioc; | 4966 | struct MPT2SAS_ADAPTER *ioc = fw_event->ioc; |
4968 | 4967 | ||