Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 64deb6efdc5504ce97b5c1c6f281fffbc150bd93

Authored by Christof Schmitt
Committed by James Bottomley
1 parent 6b9e152009
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[SCSI] zfcp: Use status_read_buf_num provided by FCP channel 

The FCP channel provides the number of status read buffers to issue.
Use the provided number instead of the hardcoded number in zfcp.

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

Showing 5 changed files with 6 additions and 3 deletions Side-by-side Diff

drivers/s390/scsi/zfcp_aux.c
Diff comments   View file @ 64deb6e
... ... @@ -425,7 +425,8 @@
425 425 {
426 426 while (atomic_read(&adapter->stat_miss) > 0)
427 427 if (zfcp_fsf_status_read(adapter->qdio)) {
428   - if (atomic_read(&adapter->stat_miss) >= 16) {
  428 + if (atomic_read(&adapter->stat_miss) >=
  429 + adapter->stat_read_buf_num) {
429 430 zfcp_erp_adapter_reopen(adapter, 0, "axsref1",
430 431 NULL);
431 432 return 1;
drivers/s390/scsi/zfcp_def.h
Diff comments   View file @ 64deb6e
... ... @@ -164,6 +164,7 @@
164 164 stack abort/command
165 165 completion races */
166 166 atomic_t stat_miss; /* # missing status reads*/
  167 + unsigned int stat_read_buf_num;
167 168 struct work_struct stat_work;
168 169 atomic_t status; /* status of this adapter */
169 170 struct list_head erp_ready_head; /* error recovery for this
drivers/s390/scsi/zfcp_erp.c
Diff comments   View file @ 64deb6e
... ... @@ -714,7 +714,7 @@
714 714 if (zfcp_erp_adapter_strategy_open_fsf_xport(act) == ZFCP_ERP_FAILED)
715 715 return ZFCP_ERP_FAILED;
716 716  
717   - atomic_set(&act->adapter->stat_miss, 16);
  717 + atomic_set(&act->adapter->stat_miss, act->adapter->stat_read_buf_num);
718 718 if (zfcp_status_read_refill(act->adapter))
719 719 return ZFCP_ERP_FAILED;
720 720  
drivers/s390/scsi/zfcp_fsf.c
Diff comments   View file @ 64deb6e
... ... @@ -496,6 +496,7 @@
496 496  
497 497 adapter->hydra_version = bottom->adapter_type;
498 498 adapter->timer_ticks = bottom->timer_interval;
  499 + adapter->stat_read_buf_num = max(bottom->status_read_buf_num, (u16)16);
499 500  
500 501 if (fc_host_permanent_port_name(shost) == -1)
501 502 fc_host_permanent_port_name(shost) = fc_host_port_name(shost);
drivers/s390/scsi/zfcp_fsf.h
Diff comments   View file @ 64deb6e
... ... @@ -366,7 +366,7 @@
366 366 u32 adapter_type;
367 367 u8 res0;
368 368 u8 peer_d_id[3];
369   - u8 res1[2];
  369 + u16 status_read_buf_num;
370 370 u16 timer_interval;
371 371 u8 res2[9];
372 372 u8 s_id[3];