[S390] qdio: fix qeth port count detection

qeth needs to get the port count information before
qdio has allocated a page for the chsc operation.
Extend qdio_get_ssqd_desc() to store the data in the
specified structure.

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/qdio.h b/arch/s390/include/asm/qdio.h
index 4734c3f053546fe3b68f1d3987fbd4e96d0f96f3..27fc1746de1578a7611f97ce92e252d2227ed3c4 100644 (file)
--- a/arch/s390/include/asm/qdio.h
+++ b/arch/s390/include/asm/qdio.h
@@ -373,16 +373,16 @@ struct qdio_initialize {
 #define QDIO_FLAG_SYNC_OUTPUT          0x02
 #define QDIO_FLAG_PCI_OUT              0x10
 
-extern int qdio_initialize(struct qdio_initialize *init_data);
-extern int qdio_allocate(struct qdio_initialize *init_data);
-extern int qdio_establish(struct qdio_initialize *init_data);
+extern int qdio_initialize(struct qdio_initialize *);
+extern int qdio_allocate(struct qdio_initialize *);
+extern int qdio_establish(struct qdio_initialize *);
 extern int qdio_activate(struct ccw_device *);
 
-extern int do_QDIO(struct ccw_device*, unsigned int flags,
-                  int q_nr, int qidx, int count);
-extern int qdio_cleanup(struct ccw_device*, int how);
-extern int qdio_shutdown(struct ccw_device*, int how);
+extern int do_QDIO(struct ccw_device *cdev, unsigned int callflags,
+                  int q_nr, int bufnr, int count);
+extern int qdio_cleanup(struct ccw_device*, int);
+extern int qdio_shutdown(struct ccw_device*, int);
 extern int qdio_free(struct ccw_device *);
-extern struct qdio_ssqd_desc *qdio_get_ssqd_desc(struct ccw_device *cdev);
+extern int qdio_get_ssqd_desc(struct ccw_device *dev, struct qdio_ssqd_desc*);
 
 #endif /* __QDIO_H__ */

diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index e3ea1d5f2810bae11a9b0918f547339b5c88e314..e4e33839c7fe6a391fed5b56823479322e0b8d50 100644 (file)
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -378,6 +378,9 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
 int qdio_allocate_qs(struct qdio_irq *irq_ptr, int nr_input_qs,
                     int nr_output_qs);
 void qdio_setup_ssqd_info(struct qdio_irq *irq_ptr);
+int qdio_setup_get_ssqd(struct qdio_irq *irq_ptr,
+                       struct subchannel_id *schid,
+                       struct qdio_ssqd_desc *data);
 int qdio_setup_irq(struct qdio_initialize *init_data);
 void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,
                                struct ccw_device *cdev);

diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 7c8659151993d8acfc12d0f02a0b60eb56c91eff..7572a005762370b38ac996daf1a33546dc5f649d 100644 (file)
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -1129,23 +1129,23 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
 /**
  * qdio_get_ssqd_desc - get qdio subchannel description
  * @cdev: ccw device to get description for
+ * @data: where to store the ssqd
  *
- * Returns a pointer to the saved qdio subchannel description,
- * or NULL for not setup qdio devices.
+ * Returns 0 or an error code. The results of the chsc are stored in the
+ * specified structure.
  */
-struct qdio_ssqd_desc *qdio_get_ssqd_desc(struct ccw_device *cdev)
+int qdio_get_ssqd_desc(struct ccw_device *cdev,
+                      struct qdio_ssqd_desc *data)
 {
-       struct qdio_irq *irq_ptr;
        char dbf_text[15];
 
+       if (!cdev || !cdev->private)
+               return -EINVAL;
+
        sprintf(dbf_text, "qssq%4x", cdev->private->schid.sch_no);
        QDIO_DBF_TEXT0(0, setup, dbf_text);
 
-       irq_ptr = cdev->private->qdio_data;
-       if (!irq_ptr)
-               return NULL;
-
-       return &irq_ptr->ssqd_desc;
+       return qdio_setup_get_ssqd(NULL, &cdev->private->schid, data);
 }
 EXPORT_SYMBOL_GPL(qdio_get_ssqd_desc);
 

diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index a0b6b46e746647ae5451d5099c5a8ccde5e89175..22ee0272a1045c4a9fb23dfc17f943abccb7f358 100644 (file)
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -243,22 +243,31 @@ no_qebsm:
        QDIO_DBF_TEXT0(0, setup, "noV=V");
 }
 
-static int __get_ssqd_info(struct qdio_irq *irq_ptr)
+/*
+ * If there is a qdio_irq we use the chsc_page and store the information
+ * in the qdio_irq, otherwise we copy it to the specified structure.
+ */
+int qdio_setup_get_ssqd(struct qdio_irq *irq_ptr,
+                       struct subchannel_id *schid,
+                       struct qdio_ssqd_desc *data)
 {
        struct chsc_ssqd_area *ssqd;
        int rc;
 
        QDIO_DBF_TEXT0(0, setup, "getssqd");
-       ssqd = (struct chsc_ssqd_area *)irq_ptr->chsc_page;
+       if (irq_ptr != NULL)
+               ssqd = (struct chsc_ssqd_area *)irq_ptr->chsc_page;
+       else
+               ssqd = (struct chsc_ssqd_area *)__get_free_page(GFP_KERNEL);
        memset(ssqd, 0, PAGE_SIZE);
 
        ssqd->request = (struct chsc_header) {
                .length = 0x0010,
                .code   = 0x0024,
        };
-       ssqd->first_sch = irq_ptr->schid.sch_no;
-       ssqd->last_sch = irq_ptr->schid.sch_no;
-       ssqd->ssid = irq_ptr->schid.ssid;
+       ssqd->first_sch = schid->sch_no;
+       ssqd->last_sch = schid->sch_no;
+       ssqd->ssid = schid->ssid;
 
        if (chsc(ssqd))
                return -EIO;
@@ -268,11 +277,17 @@ static int __get_ssqd_info(struct qdio_irq *irq_ptr)
 
        if (!(ssqd->qdio_ssqd.flags & CHSC_FLAG_QDIO_CAPABILITY) ||
            !(ssqd->qdio_ssqd.flags & CHSC_FLAG_VALIDITY) ||
-           (ssqd->qdio_ssqd.sch != irq_ptr->schid.sch_no))
+           (ssqd->qdio_ssqd.sch != schid->sch_no))
                return -EINVAL;
 
-       memcpy(&irq_ptr->ssqd_desc, &ssqd->qdio_ssqd,
-              sizeof(struct qdio_ssqd_desc));
+       if (irq_ptr != NULL)
+               memcpy(&irq_ptr->ssqd_desc, &ssqd->qdio_ssqd,
+                      sizeof(struct qdio_ssqd_desc));
+       else {
+               memcpy(data, &ssqd->qdio_ssqd,
+                      sizeof(struct qdio_ssqd_desc));
+               free_page((unsigned long)ssqd);
+       }
        return 0;
 }
 
@@ -282,7 +297,7 @@ void qdio_setup_ssqd_info(struct qdio_irq *irq_ptr)
        char dbf_text[15];
        int rc;
 
-       rc = __get_ssqd_info(irq_ptr);
+       rc = qdio_setup_get_ssqd(irq_ptr, &irq_ptr->schid, NULL);
        if (rc) {
                QDIO_DBF_TEXT2(0, setup, "ssqdasig");
                sprintf(dbf_text, "schn%4x", irq_ptr->schid.sch_no);

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 52d26592c72c1a03ee640710d148d3aa44a1b781..ebdc549da537affc2dacce1c9bbac18c38d7ffd7 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -3757,7 +3757,7 @@ static int qeth_core_driver_group(const char *buf, struct device *root_dev,
 
 int qeth_core_hardsetup_card(struct qeth_card *card)
 {
-       struct qdio_ssqd_desc *qdio_ssqd;
+       struct qdio_ssqd_desc *ssqd;
        int retries = 3;
        int mpno = 0;
        int rc;
@@ -3792,9 +3792,16 @@ retry:
                return rc;
        }
 
-       qdio_ssqd = qdio_get_ssqd_desc(CARD_DDEV(card));
-       if (qdio_ssqd)
-               mpno = qdio_ssqd->pcnt;
+       ssqd = kmalloc(sizeof(struct qdio_ssqd_desc), GFP_KERNEL);
+       if (!ssqd) {
+               rc = -ENOMEM;
+               goto out;
+       }
+       rc = qdio_get_ssqd_desc(CARD_DDEV(card), ssqd);
+       if (rc == 0)
+               mpno = ssqd->pcnt;
+       kfree(ssqd);
+
        if (mpno)
                mpno = min(mpno - 1, QETH_MAX_PORTNO);
        if (card->info.portno > mpno) {