s390/pci: fix struct definition for set PCI function

Recent firmware will store PCI MIO information also when enabling MIO
instructions via set PCI function. We do not use this information but
currently calling enable MIO will fail because of insufficient response
block length. Fix this by putting a struct mio_info at the end of the
affected response block struct.

Fixes: 71ba41c9b1d9 ("s390/pci: provide support for MIO instructions")
Signed-off-by: Sebastian Ott <sebott@linux.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

diff --git a/arch/s390/include/asm/pci_clp.h b/arch/s390/include/asm/pci_clp.h
index 3ec52a05d50061348cd730a953341584d27d642c..50359172cc488b538845ebbfe8f2c32bcc35985b 100644 (file)
--- a/arch/s390/include/asm/pci_clp.h
+++ b/arch/s390/include/asm/pci_clp.h
@@ -70,6 +70,17 @@ struct clp_rsp_list_pci {
        struct clp_fh_list_entry fh_list[CLP_FH_LIST_NR_ENTRIES];
 } __packed;
 
+struct mio_info {
+       u32 valid : 6;
+       u32 : 26;
+       u32 : 32;
+       struct {
+               u64 wb;
+               u64 wt;
+       } addr[PCI_BAR_COUNT];
+       u32 reserved[6];
+} __packed;
+
 /* Query PCI function request */
 struct clp_req_query_pci {
        struct clp_req_hdr hdr;
@@ -100,14 +111,7 @@ struct clp_rsp_query_pci {
        u32 uid;                        /* user defined id */
        u8 util_str[CLP_UTIL_STR_LEN];  /* utility string */
        u32 reserved2[16];
-       u32 mio_valid : 6;
-       u32 : 26;
-       u32 : 32;
-       struct {
-               u64 wb;
-               u64 wt;
-       } addr[PCI_BAR_COUNT];
-       u32 reserved3[6];
+       struct mio_info mio;
 } __packed;
 
 /* Query PCI function group request */
@@ -155,8 +159,9 @@ struct clp_req_set_pci {
 struct clp_rsp_set_pci {
        struct clp_rsp_hdr hdr;
        u32 fh;                         /* function handle */
-       u32 reserved3;
-       u64 reserved4;
+       u32 reserved1;
+       u64 reserved2;
+       struct mio_info mio;
 } __packed;
 
 /* Combined request/response block structures used by clp insn */

diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
index 3a36b07a557134a41e70ce2f2d50b1055360b9ad..d03631dba7c257923eb2182e277522a0a289e14f 100644 (file)
--- a/arch/s390/pci/pci_clp.c
+++ b/arch/s390/pci/pci_clp.c
@@ -165,11 +165,11 @@ static int clp_store_query_pci_fn(struct zpci_dev *zdev,
        }
        zdev->mio_capable = response->mio_addr_avail;
        for (i = 0; i < PCI_BAR_COUNT; i++) {
-               if (!(response->mio_valid & (1 << (PCI_BAR_COUNT - i - 1))))
+               if (!(response->mio.valid & (1 << (PCI_BAR_COUNT - i - 1))))
                        continue;
 
-               zdev->bars[i].mio_wb = (void __iomem *) response->addr[i].wb;
-               zdev->bars[i].mio_wt = (void __iomem *) response->addr[i].wt;
+               zdev->bars[i].mio_wb = (void __iomem *) response->mio.addr[i].wb;
+               zdev->bars[i].mio_wt = (void __iomem *) response->mio.addr[i].wt;
        }
        return 0;
 }