aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/scsi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390/scsi')
-rw-r--r--drivers/s390/scsi/zfcp_def.h1
-rw-r--r--drivers/s390/scsi/zfcp_qdio.c11
2 files changed, 11 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index cb3640c6477c..6c6374ba1807 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -77,6 +77,7 @@ struct zfcp_reqlist;
77#define ZFCP_STATUS_ADAPTER_HOST_CON_INIT 0x00000010 77#define ZFCP_STATUS_ADAPTER_HOST_CON_INIT 0x00000010
78#define ZFCP_STATUS_ADAPTER_ERP_PENDING 0x00000100 78#define ZFCP_STATUS_ADAPTER_ERP_PENDING 0x00000100
79#define ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED 0x00000200 79#define ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED 0x00000200
80#define ZFCP_STATUS_ADAPTER_DATA_DIV_ENABLED 0x00000400
80 81
81/* remote port status */ 82/* remote port status */
82#define ZFCP_STATUS_PORT_PHYS_OPEN 0x00000001 83#define ZFCP_STATUS_PORT_PHYS_OPEN 0x00000001
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index a638278c6025..c4559b29bebc 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -283,6 +283,7 @@ static void zfcp_qdio_setup_init_data(struct qdio_initialize *id,
283 id->q_format = QDIO_ZFCP_QFMT; 283 id->q_format = QDIO_ZFCP_QFMT;
284 memcpy(id->adapter_name, dev_name(&id->cdev->dev), 8); 284 memcpy(id->adapter_name, dev_name(&id->cdev->dev), 8);
285 ASCEBC(id->adapter_name, 8); 285 ASCEBC(id->adapter_name, 8);
286 id->qib_rflags = QIB_RFLAGS_ENABLE_DATA_DIV;
286 id->qib_param_field_format = 0; 287 id->qib_param_field_format = 0;
287 id->qib_param_field = NULL; 288 id->qib_param_field = NULL;
288 id->input_slib_elements = NULL; 289 id->input_slib_elements = NULL;
@@ -294,8 +295,8 @@ static void zfcp_qdio_setup_init_data(struct qdio_initialize *id,
294 id->int_parm = (unsigned long) qdio; 295 id->int_parm = (unsigned long) qdio;
295 id->input_sbal_addr_array = (void **) (qdio->res_q); 296 id->input_sbal_addr_array = (void **) (qdio->res_q);
296 id->output_sbal_addr_array = (void **) (qdio->req_q); 297 id->output_sbal_addr_array = (void **) (qdio->req_q);
297
298} 298}
299
299/** 300/**
300 * zfcp_qdio_allocate - allocate queue memory and initialize QDIO data 301 * zfcp_qdio_allocate - allocate queue memory and initialize QDIO data
301 * @adapter: pointer to struct zfcp_adapter 302 * @adapter: pointer to struct zfcp_adapter
@@ -358,6 +359,7 @@ int zfcp_qdio_open(struct zfcp_qdio *qdio)
358 struct qdio_initialize init_data; 359 struct qdio_initialize init_data;
359 struct zfcp_adapter *adapter = qdio->adapter; 360 struct zfcp_adapter *adapter = qdio->adapter;
360 struct ccw_device *cdev = adapter->ccw_device; 361 struct ccw_device *cdev = adapter->ccw_device;
362 struct qdio_ssqd_desc ssqd;
361 int cc; 363 int cc;
362 364
363 if (atomic_read(&adapter->status) & ZFCP_STATUS_ADAPTER_QDIOUP) 365 if (atomic_read(&adapter->status) & ZFCP_STATUS_ADAPTER_QDIOUP)
@@ -368,6 +370,13 @@ int zfcp_qdio_open(struct zfcp_qdio *qdio)
368 if (qdio_establish(&init_data)) 370 if (qdio_establish(&init_data))
369 goto failed_establish; 371 goto failed_establish;
370 372
373 if (qdio_get_ssqd_desc(init_data.cdev, &ssqd))
374 goto failed_qdio;
375
376 if (ssqd.qdioac2 & CHSC_AC2_DATA_DIV_ENABLED)
377 atomic_set_mask(ZFCP_STATUS_ADAPTER_DATA_DIV_ENABLED,
378 &qdio->adapter->status);
379
371 if (qdio_activate(cdev)) 380 if (qdio_activate(cdev))
372 goto failed_qdio; 381 goto failed_qdio;
373 382