diff options
Diffstat (limited to 'drivers/s390/scsi/zfcp_fsf.c')
-rw-r--r-- | drivers/s390/scsi/zfcp_fsf.c | 110 |
1 files changed, 63 insertions, 47 deletions
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 3b0fc1163f5f..59587951c847 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c | |||
@@ -554,6 +554,17 @@ static void | |||
554 | zfcp_fsf_link_down_info_eval(struct zfcp_adapter *adapter, | 554 | zfcp_fsf_link_down_info_eval(struct zfcp_adapter *adapter, |
555 | struct fsf_link_down_info *link_down) | 555 | struct fsf_link_down_info *link_down) |
556 | { | 556 | { |
557 | if (atomic_test_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, | ||
558 | &adapter->status)) | ||
559 | return; | ||
560 | |||
561 | atomic_set_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, &adapter->status); | ||
562 | |||
563 | if (link_down == NULL) { | ||
564 | zfcp_erp_adapter_reopen(adapter, 0); | ||
565 | return; | ||
566 | } | ||
567 | |||
557 | switch (link_down->error_code) { | 568 | switch (link_down->error_code) { |
558 | case FSF_PSQ_LINK_NO_LIGHT: | 569 | case FSF_PSQ_LINK_NO_LIGHT: |
559 | ZFCP_LOG_NORMAL("The local link to adapter %s is down " | 570 | ZFCP_LOG_NORMAL("The local link to adapter %s is down " |
@@ -634,20 +645,15 @@ zfcp_fsf_link_down_info_eval(struct zfcp_adapter *adapter, | |||
634 | link_down->explanation_code, | 645 | link_down->explanation_code, |
635 | link_down->vendor_specific_code); | 646 | link_down->vendor_specific_code); |
636 | 647 | ||
637 | if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, | 648 | switch (link_down->error_code) { |
638 | &adapter->status)) { | 649 | case FSF_PSQ_LINK_NO_LIGHT: |
639 | atomic_set_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, | 650 | case FSF_PSQ_LINK_WRAP_PLUG: |
640 | &adapter->status); | 651 | case FSF_PSQ_LINK_NO_FCP: |
641 | switch (link_down->error_code) { | 652 | case FSF_PSQ_LINK_FIRMWARE_UPDATE: |
642 | case FSF_PSQ_LINK_NO_LIGHT: | 653 | zfcp_erp_adapter_reopen(adapter, 0); |
643 | case FSF_PSQ_LINK_WRAP_PLUG: | 654 | break; |
644 | case FSF_PSQ_LINK_NO_FCP: | 655 | default: |
645 | case FSF_PSQ_LINK_FIRMWARE_UPDATE: | 656 | zfcp_erp_adapter_failed(adapter); |
646 | zfcp_erp_adapter_reopen(adapter, 0); | ||
647 | break; | ||
648 | default: | ||
649 | zfcp_erp_adapter_failed(adapter); | ||
650 | } | ||
651 | } | 657 | } |
652 | } | 658 | } |
653 | 659 | ||
@@ -919,30 +925,36 @@ zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req) | |||
919 | case FSF_STATUS_READ_SUB_NO_PHYSICAL_LINK: | 925 | case FSF_STATUS_READ_SUB_NO_PHYSICAL_LINK: |
920 | ZFCP_LOG_INFO("Physical link to adapter %s is down\n", | 926 | ZFCP_LOG_INFO("Physical link to adapter %s is down\n", |
921 | zfcp_get_busid_by_adapter(adapter)); | 927 | zfcp_get_busid_by_adapter(adapter)); |
928 | zfcp_fsf_link_down_info_eval(adapter, | ||
929 | (struct fsf_link_down_info *) | ||
930 | &status_buffer->payload); | ||
922 | break; | 931 | break; |
923 | case FSF_STATUS_READ_SUB_FDISC_FAILED: | 932 | case FSF_STATUS_READ_SUB_FDISC_FAILED: |
924 | ZFCP_LOG_INFO("Local link to adapter %s is down " | 933 | ZFCP_LOG_INFO("Local link to adapter %s is down " |
925 | "due to failed FDISC login\n", | 934 | "due to failed FDISC login\n", |
926 | zfcp_get_busid_by_adapter(adapter)); | 935 | zfcp_get_busid_by_adapter(adapter)); |
936 | zfcp_fsf_link_down_info_eval(adapter, | ||
937 | (struct fsf_link_down_info *) | ||
938 | &status_buffer->payload); | ||
927 | break; | 939 | break; |
928 | case FSF_STATUS_READ_SUB_FIRMWARE_UPDATE: | 940 | case FSF_STATUS_READ_SUB_FIRMWARE_UPDATE: |
929 | ZFCP_LOG_INFO("Local link to adapter %s is down " | 941 | ZFCP_LOG_INFO("Local link to adapter %s is down " |
930 | "due to firmware update on adapter\n", | 942 | "due to firmware update on adapter\n", |
931 | zfcp_get_busid_by_adapter(adapter)); | 943 | zfcp_get_busid_by_adapter(adapter)); |
944 | zfcp_fsf_link_down_info_eval(adapter, NULL); | ||
932 | break; | 945 | break; |
933 | default: | 946 | default: |
934 | ZFCP_LOG_INFO("Local link to adapter %s is down " | 947 | ZFCP_LOG_INFO("Local link to adapter %s is down " |
935 | "due to unknown reason\n", | 948 | "due to unknown reason\n", |
936 | zfcp_get_busid_by_adapter(adapter)); | 949 | zfcp_get_busid_by_adapter(adapter)); |
950 | zfcp_fsf_link_down_info_eval(adapter, NULL); | ||
937 | }; | 951 | }; |
938 | zfcp_fsf_link_down_info_eval(adapter, | ||
939 | (struct fsf_link_down_info *) &status_buffer->payload); | ||
940 | break; | 952 | break; |
941 | 953 | ||
942 | case FSF_STATUS_READ_LINK_UP: | 954 | case FSF_STATUS_READ_LINK_UP: |
943 | ZFCP_LOG_NORMAL("Local link to adapter %s was replugged. " | 955 | ZFCP_LOG_NORMAL("Local link to adapter %s was replugged. " |
944 | "Restarting operations on this adapter\n", | 956 | "Restarting operations on this adapter\n", |
945 | zfcp_get_busid_by_adapter(adapter)); | 957 | zfcp_get_busid_by_adapter(adapter)); |
946 | /* All ports should be marked as ready to run again */ | 958 | /* All ports should be marked as ready to run again */ |
947 | zfcp_erp_modify_adapter_status(adapter, | 959 | zfcp_erp_modify_adapter_status(adapter, |
948 | ZFCP_STATUS_COMMON_RUNNING, | 960 | ZFCP_STATUS_COMMON_RUNNING, |
@@ -2191,13 +2203,10 @@ zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action, | |||
2191 | return -EOPNOTSUPP; | 2203 | return -EOPNOTSUPP; |
2192 | } | 2204 | } |
2193 | 2205 | ||
2194 | timer = kmalloc(sizeof(struct timer_list), GFP_KERNEL); | ||
2195 | if (!timer) | ||
2196 | return -ENOMEM; | ||
2197 | |||
2198 | /* setup new FSF request */ | 2206 | /* setup new FSF request */ |
2199 | retval = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, | 2207 | retval = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, |
2200 | 0, 0, &lock_flags, &fsf_req); | 2208 | erp_action ? ZFCP_REQ_AUTO_CLEANUP : 0, |
2209 | 0, &lock_flags, &fsf_req); | ||
2201 | if (retval < 0) { | 2210 | if (retval < 0) { |
2202 | ZFCP_LOG_INFO("error: Out of resources. Could not create an " | 2211 | ZFCP_LOG_INFO("error: Out of resources. Could not create an " |
2203 | "exchange port data request for" | 2212 | "exchange port data request for" |
@@ -2205,25 +2214,33 @@ zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action, | |||
2205 | zfcp_get_busid_by_adapter(adapter)); | 2214 | zfcp_get_busid_by_adapter(adapter)); |
2206 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, | 2215 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, |
2207 | lock_flags); | 2216 | lock_flags); |
2208 | goto out; | 2217 | return retval; |
2209 | } | ||
2210 | |||
2211 | if (erp_action) { | ||
2212 | erp_action->fsf_req = fsf_req; | ||
2213 | fsf_req->erp_action = erp_action; | ||
2214 | } | 2218 | } |
2215 | 2219 | ||
2216 | if (data) | 2220 | if (data) |
2217 | fsf_req->data = (unsigned long) data; | 2221 | fsf_req->data = (unsigned long) data; |
2218 | 2222 | ||
2219 | sbale = zfcp_qdio_sbale_req(fsf_req, fsf_req->sbal_curr, 0); | 2223 | sbale = zfcp_qdio_sbale_req(fsf_req, fsf_req->sbal_curr, 0); |
2220 | sbale[0].flags |= SBAL_FLAGS0_TYPE_READ; | 2224 | sbale[0].flags |= SBAL_FLAGS0_TYPE_READ; |
2221 | sbale[1].flags |= SBAL_FLAGS_LAST_ENTRY; | 2225 | sbale[1].flags |= SBAL_FLAGS_LAST_ENTRY; |
2222 | 2226 | ||
2223 | init_timer(timer); | 2227 | if (erp_action) { |
2224 | timer->function = zfcp_fsf_request_timeout_handler; | 2228 | erp_action->fsf_req = fsf_req; |
2225 | timer->data = (unsigned long) adapter; | 2229 | fsf_req->erp_action = erp_action; |
2226 | timer->expires = ZFCP_FSF_REQUEST_TIMEOUT; | 2230 | timer = &erp_action->timer; |
2231 | } else { | ||
2232 | timer = kmalloc(sizeof(struct timer_list), GFP_ATOMIC); | ||
2233 | if (!timer) { | ||
2234 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, | ||
2235 | lock_flags); | ||
2236 | zfcp_fsf_req_free(fsf_req); | ||
2237 | return -ENOMEM; | ||
2238 | } | ||
2239 | init_timer(timer); | ||
2240 | timer->function = zfcp_fsf_request_timeout_handler; | ||
2241 | timer->data = (unsigned long) adapter; | ||
2242 | timer->expires = ZFCP_FSF_REQUEST_TIMEOUT; | ||
2243 | } | ||
2227 | 2244 | ||
2228 | retval = zfcp_fsf_req_send(fsf_req, timer); | 2245 | retval = zfcp_fsf_req_send(fsf_req, timer); |
2229 | if (retval) { | 2246 | if (retval) { |
@@ -2233,23 +2250,22 @@ zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action, | |||
2233 | zfcp_fsf_req_free(fsf_req); | 2250 | zfcp_fsf_req_free(fsf_req); |
2234 | if (erp_action) | 2251 | if (erp_action) |
2235 | erp_action->fsf_req = NULL; | 2252 | erp_action->fsf_req = NULL; |
2253 | else | ||
2254 | kfree(timer); | ||
2236 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, | 2255 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, |
2237 | lock_flags); | 2256 | lock_flags); |
2238 | goto out; | 2257 | return retval; |
2239 | } | 2258 | } |
2240 | 2259 | ||
2241 | ZFCP_LOG_DEBUG("Exchange Port Data request initiated (adapter %s)\n", | 2260 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, lock_flags); |
2242 | zfcp_get_busid_by_adapter(adapter)); | ||
2243 | |||
2244 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, | ||
2245 | lock_flags); | ||
2246 | 2261 | ||
2247 | wait_event(fsf_req->completion_wq, | 2262 | if (!erp_action) { |
2248 | fsf_req->status & ZFCP_STATUS_FSFREQ_COMPLETED); | 2263 | wait_event(fsf_req->completion_wq, |
2249 | del_timer_sync(timer); | 2264 | fsf_req->status & ZFCP_STATUS_FSFREQ_COMPLETED); |
2250 | zfcp_fsf_req_free(fsf_req); | 2265 | del_timer_sync(timer); |
2251 | out: | 2266 | zfcp_fsf_req_free(fsf_req); |
2252 | kfree(timer); | 2267 | kfree(timer); |
2268 | } | ||
2253 | return retval; | 2269 | return retval; |
2254 | } | 2270 | } |
2255 | 2271 | ||