s390/cio: use bitwise types to allow for type checking

Change types of I/O structure members which contain physical addresses to
dma32_t and dma64_t bitwise types.

This allows to make use of sparse (aka "make C=1") to find incorrect usage
of physical addresses.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h
index 1c4f585..80aeff8 100644 (file)
--- a/arch/s390/include/asm/cio.h
+++ b/arch/s390/include/asm/cio.h
@@ -7,6 +7,7 @@
 
 #include <linux/bitops.h>
 #include <linux/genalloc.h>
+#include <asm/dma-types.h>
 #include <asm/types.h>
 #include <asm/tpi.h>
 
@@ -32,7 +33,7 @@ struct ccw1 {
        __u8  cmd_code;
        __u8  flags;
        __u16 count;
-       __u32 cda;
+       dma32_t cda;
 } __attribute__ ((packed,aligned(8)));
 
 /**
@@ -152,8 +153,8 @@ struct sublog {
 struct esw0 {
        struct sublog sublog;
        struct erw erw;
-       __u32  faddr[2];
-       __u32  saddr;
+       dma32_t faddr[2];
+       dma32_t saddr;
 } __attribute__ ((packed));
 
 /**

diff --git a/arch/s390/include/asm/eadm.h b/arch/s390/include/asm/eadm.h
index 06f7958..c4589ec 100644 (file)
--- a/arch/s390/include/asm/eadm.h
+++ b/arch/s390/include/asm/eadm.h
@@ -5,6 +5,7 @@
 #include <linux/types.h>
 #include <linux/device.h>
 #include <linux/blk_types.h>
+#include <asm/dma-types.h>
 
 struct arqb {
        u64 data;
@@ -45,7 +46,7 @@ struct msb {
        u16:12;
        u16 bs:4;
        u32 blk_count;
-       u64 data_addr;
+       dma64_t data_addr;
        u64 scm_addr;
        u64:64;
 } __packed;
@@ -54,7 +55,7 @@ struct aidaw {
        u8 flags;
        u32 :24;
        u32 :32;
-       u64 data_addr;
+       dma64_t data_addr;
 } __packed;
 
 #define MSB_OC_CLEAR   0

diff --git a/arch/s390/include/asm/fcx.h b/arch/s390/include/asm/fcx.h
index 29784b4..80f82a7 100644 (file)
--- a/arch/s390/include/asm/fcx.h
+++ b/arch/s390/include/asm/fcx.h
@@ -10,6 +10,7 @@
 #define _ASM_S390_FCX_H
 
 #include <linux/types.h>
+#include <asm/dma-types.h>
 
 #define TCW_FORMAT_DEFAULT             0
 #define TCW_TIDAW_FORMAT_DEFAULT       0
@@ -43,16 +44,16 @@ struct tcw {
        u32 r:1;
        u32 w:1;
        u32 :16;
-       u64 output;
-       u64 input;
-       u64 tsb;
-       u64 tccb;
+       dma64_t output;
+       dma64_t input;
+       dma64_t tsb;
+       dma64_t tccb;
        u32 output_count;
        u32 input_count;
        u32 :32;
        u32 :32;
        u32 :32;
-       u32 intrg;
+       dma32_t intrg;
 } __attribute__ ((packed, aligned(64)));
 
 #define TIDAW_FLAGS_LAST               (1 << (7 - 0))
@@ -73,7 +74,7 @@ struct tidaw {
        u32 flags:8;
        u32 :24;
        u32 count;
-       u64 addr;
+       dma64_t addr;
 } __attribute__ ((packed, aligned(16)));
 
 /**

diff --git a/arch/s390/include/asm/qdio.h b/arch/s390/include/asm/qdio.h
index 2f983e0..69c4ead 100644 (file)
--- a/arch/s390/include/asm/qdio.h
+++ b/arch/s390/include/asm/qdio.h
@@ -9,8 +9,9 @@
 #define __QDIO_H__
 
 #include <linux/interrupt.h>
-#include <asm/cio.h>
+#include <asm/dma-types.h>
 #include <asm/ccwdev.h>
+#include <asm/cio.h>
 
 /* only use 4 queues to save some cachelines */
 #define QDIO_MAX_QUEUES_PER_IRQ                4
@@ -34,9 +35,9 @@
  * @dkey: access key for SLSB
  */
 struct qdesfmt0 {
-       u64 sliba;
-       u64 sla;
-       u64 slsba;
+       dma64_t sliba;
+       dma64_t sla;
+       dma64_t slsba;
        u32      : 32;
        u32 akey : 4;
        u32 bkey : 4;
@@ -74,7 +75,7 @@ struct qdr {
        /* private: */
        u32 res[9];
        /* public: */
-       u64 qiba;
+       dma64_t qiba;
        u32        : 32;
        u32 qkey   : 4;
        u32        : 28;
@@ -146,7 +147,7 @@ struct qaob {
        u8 flags;
        u16 cbtbs;
        u8 sb_count;
-       u64 sba[QDIO_MAX_ELEMENTS_PER_BUFFER];
+       dma64_t sba[QDIO_MAX_ELEMENTS_PER_BUFFER];
        u16 dcount[QDIO_MAX_ELEMENTS_PER_BUFFER];
        u64 user0;
        u64 res4[2];
@@ -208,7 +209,7 @@ struct qdio_buffer_element {
        u8 scount;
        u8 sflags;
        u32 length;
-       u64 addr;
+       dma64_t addr;
 } __attribute__ ((packed, aligned(16)));
 
 /**
@@ -224,7 +225,7 @@ struct qdio_buffer {
  * @sbal: absolute SBAL address
  */
 struct sl_element {
-       u64 sbal;
+       dma64_t sbal;
 } __attribute__ ((packed));
 
 /**

diff --git a/arch/s390/include/asm/scsw.h b/arch/s390/include/asm/scsw.h
index 322bdcd..56003e2 100644 (file)
--- a/arch/s390/include/asm/scsw.h
+++ b/arch/s390/include/asm/scsw.h
@@ -11,6 +11,7 @@
 
 #include <linux/types.h>
 #include <asm/css_chars.h>
+#include <asm/dma-types.h>
 #include <asm/cio.h>
 
 /**
@@ -53,7 +54,7 @@ struct cmd_scsw {
        __u32 fctl : 3;
        __u32 actl : 7;
        __u32 stctl : 5;
-       __u32 cpa;
+       dma32_t cpa;
        __u32 dstat : 8;
        __u32 cstat : 8;
        __u32 count : 16;
@@ -93,7 +94,7 @@ struct tm_scsw {
        u32 fctl:3;
        u32 actl:7;
        u32 stctl:5;
-       u32 tcw;
+       dma32_t tcw;
        u32 dstat:8;
        u32 cstat:8;
        u32 fcxs:8;
@@ -125,7 +126,7 @@ struct eadm_scsw {
        u32 fctl:3;
        u32 actl:7;
        u32 stctl:5;
-       u32 aob;
+       dma32_t aob;
        u32 dstat:8;
        u32 cstat:8;
        u32:16;

diff --git a/drivers/s390/cio/chsc.h b/drivers/s390/cio/chsc.h
index d1caacb..5d51c3f 100644 (file)
--- a/drivers/s390/cio/chsc.h
+++ b/drivers/s390/cio/chsc.h
@@ -91,8 +91,8 @@ struct chsc_scssc_area {
        u16:16;
        u32:32;
        u32:32;
-       u64 summary_indicator_addr;
-       u64 subchannel_indicator_addr;
+       dma64_t summary_indicator_addr;
+       dma64_t subchannel_indicator_addr;
        u32 ks:4;
        u32 kc:4;
        u32:21;

diff --git a/drivers/s390/cio/orb.h b/drivers/s390/cio/orb.h
index a2d3778..14d2a18 100644 (file)
--- a/drivers/s390/cio/orb.h
+++ b/drivers/s390/cio/orb.h
@@ -12,6 +12,9 @@
 #ifndef S390_ORB_H
 #define S390_ORB_H
 
+#include <linux/types.h>
+#include <asm/dma-types.h>
+
 /*
  * Command-mode operation request block
  */
@@ -34,7 +37,7 @@ struct cmd_orb {
        u32 ils:1;      /* incorrect length */
        u32 zero:6;     /* reserved zeros */
        u32 orbx:1;     /* ORB extension control */
-       u32 cpa;        /* channel program address */
+       dma32_t cpa;    /* channel program address */
 }  __packed __aligned(4);
 
 /*
@@ -49,7 +52,7 @@ struct tm_orb {
        u32 lpm:8;
        u32:7;
        u32 x:1;
-       u32 tcw;
+       dma32_t tcw;
        u32 prio:8;
        u32:8;
        u32 rsvpgm:8;
@@ -71,7 +74,7 @@ struct eadm_orb {
        u32 compat2:1;
        u32:21;
        u32 x:1;
-       u32 aob;
+       dma32_t aob;
        u32 css_prio:8;
        u32:8;
        u32 scm_prio:8;