scsi: qla2xxx: Fix the code that reads from mailbox registers

Make the MMIO accessors strongly typed such that the compiler checks
whether the accessor function is used that matches the register width. Fix
those MMIO accesses where another number of bits was read or written than
the size of the register.

Link: https://lore.kernel.org/r/20200518211712.11395-11-bvanassche@acm.org
Cc: Nilesh Javali <njavali@marvell.com>
Cc: Quinn Tran <qutran@marvell.com>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 5ca46b1..4b02b48 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -128,15 +128,50 @@ static inline uint32_t make_handle(uint16_t x, uint16_t y)
  * I/O register
 */
 
-#define RD_REG_BYTE(addr)              readb(addr)
-#define RD_REG_WORD(addr)              readw(addr)
-#define RD_REG_DWORD(addr)             readl(addr)
-#define RD_REG_BYTE_RELAXED(addr)      readb_relaxed(addr)
-#define RD_REG_WORD_RELAXED(addr)      readw_relaxed(addr)
-#define RD_REG_DWORD_RELAXED(addr)     readl_relaxed(addr)
-#define WRT_REG_BYTE(addr, data)       writeb(data, addr)
-#define WRT_REG_WORD(addr, data)       writew(data, addr)
-#define WRT_REG_DWORD(addr, data)      writel(data, addr)
+static inline u8 RD_REG_BYTE(const volatile u8 __iomem *addr)
+{
+       return readb(addr);
+}
+
+static inline u16 RD_REG_WORD(const volatile __le16 __iomem *addr)
+{
+       return readw(addr);
+}
+
+static inline u32 RD_REG_DWORD(const volatile __le32 __iomem *addr)
+{
+       return readl(addr);
+}
+
+static inline u8 RD_REG_BYTE_RELAXED(const volatile u8 __iomem *addr)
+{
+       return readb_relaxed(addr);
+}
+
+static inline u16 RD_REG_WORD_RELAXED(const volatile __le16 __iomem *addr)
+{
+       return readw_relaxed(addr);
+}
+
+static inline u32 RD_REG_DWORD_RELAXED(const volatile __le32 __iomem *addr)
+{
+       return readl_relaxed(addr);
+}
+
+static inline void WRT_REG_BYTE(volatile u8 __iomem *addr, u8 data)
+{
+       return writeb(data, addr);
+}
+
+static inline void WRT_REG_WORD(volatile __le16 __iomem *addr, u16 data)
+{
+       return writew(data, addr);
+}
+
+static inline void WRT_REG_DWORD(volatile __le32 __iomem *addr, u32 data)
+{
+       return writel(data, addr);
+}
 
 /*
  * ISP83XX specific remote register addresses

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index f8fe033..a1018f5 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2219,7 +2219,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)
 
        /* Check for secure flash support */
        if (IS_QLA28XX(ha)) {
-               if (RD_REG_DWORD(&reg->mailbox12) & BIT_0)
+               if (RD_REG_WORD(&reg->mailbox12) & BIT_0)
                        ha->flags.secure_adapter = 1;
                ql_log(ql_log_info, vha, 0xffff, "Secure Adapter: %s\n",
                    (ha->flags.secure_adapter) ? "Yes" : "No");
@@ -2780,7 +2780,7 @@ qla24xx_reset_risc(scsi_qla_host_t *vha)
        ql_dbg(ql_dbg_init + ql_dbg_verbose, vha, 0x017f,
            "HCCR: 0x%x, MailBox0 Status 0x%x\n",
            RD_REG_DWORD(&reg->hccr),
-           RD_REG_DWORD(&reg->mailbox0));
+           RD_REG_WORD(&reg->mailbox0));
 
        /* Wait for soft-reset to complete. */
        RD_REG_DWORD(&reg->ctrl_status);
@@ -4098,7 +4098,7 @@ qla24xx_config_rings(struct scsi_qla_host *vha)
        }
 
        /* PCI posting */
-       RD_REG_DWORD(&ioreg->hccr);
+       RD_REG_WORD(&ioreg->hccr);
 }
 
 /**

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 182bd68..4d8039f 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -2268,7 +2268,7 @@ __qla2x00_alloc_iocbs(struct qla_qpair *qpair, srb_t *sp)
                    IS_QLA28XX(ha))
                        cnt = RD_REG_DWORD(&reg->isp25mq.req_q_out);
                else if (IS_P3P_TYPE(ha))
-                       cnt = RD_REG_DWORD(&reg->isp82.req_q_out);
+                       cnt = RD_REG_DWORD(reg->isp82.req_q_out);
                else if (IS_FWI2_CAPABLE(ha))
                        cnt = RD_REG_DWORD(&reg->isp24.req_q_out);
                else if (IS_QLAFX00(ha))

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 54e1ecd..e7d94ac 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -452,7 +452,7 @@ qla81xx_idc_event(scsi_qla_host_t *vha, uint16_t aen, uint16_t descr)
        int rval;
        struct device_reg_24xx __iomem *reg24 = &vha->hw->iobase->isp24;
        struct device_reg_82xx __iomem *reg82 = &vha->hw->iobase->isp82;
-       uint16_t __iomem *wptr;
+       __le16 __iomem *wptr;
        uint16_t cnt, timeout, mb[QLA_IDC_ACK_REGS];
 
        /* Seed data -- mailbox1 -> mailbox7. */
@@ -3164,7 +3164,7 @@ qla24xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)
 {
        uint16_t        cnt;
        uint32_t        mboxes;
-       uint16_t __iomem *wptr;
+       __le16 __iomem *wptr;
        struct qla_hw_data *ha = vha->hw;
        struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
 

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index fb3e481..357fc5a 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -106,7 +106,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
        uint8_t         io_lock_on;
        uint16_t        command = 0;
        uint16_t        *iptr;
-       uint16_t __iomem *optr;
+       __le16 __iomem  *optr;
        uint32_t        cnt;
        uint32_t        mboxes;
        unsigned long   wait_time;

diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index ce98189..0e15bce 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -46,7 +46,7 @@ qlafx00_mailbox_command(scsi_qla_host_t *vha, struct mbx_cmd_32 *mcp)
        uint8_t         io_lock_on;
        uint16_t        command = 0;
        uint32_t        *iptr;
-       uint32_t __iomem *optr;
+       __le32 __iomem *optr;
        uint32_t        cnt;
        uint32_t        mboxes;
        unsigned long   wait_time;
@@ -109,7 +109,7 @@ qlafx00_mailbox_command(scsi_qla_host_t *vha, struct mbx_cmd_32 *mcp)
        spin_lock_irqsave(&ha->hardware_lock, flags);
 
        /* Load mailbox registers. */
-       optr = (uint32_t __iomem *)&reg->ispfx00.mailbox0;
+       optr = &reg->ispfx00.mailbox0;
 
        iptr = mcp->mb;
        command = mcp->mb[0];
@@ -2843,13 +2843,13 @@ qlafx00_async_event(scsi_qla_host_t *vha)
                break;
 
        default:
-               ha->aenmb[1] = RD_REG_WORD(&reg->aenmailbox1);
-               ha->aenmb[2] = RD_REG_WORD(&reg->aenmailbox2);
-               ha->aenmb[3] = RD_REG_WORD(&reg->aenmailbox3);
-               ha->aenmb[4] = RD_REG_WORD(&reg->aenmailbox4);
-               ha->aenmb[5] = RD_REG_WORD(&reg->aenmailbox5);
-               ha->aenmb[6] = RD_REG_WORD(&reg->aenmailbox6);
-               ha->aenmb[7] = RD_REG_WORD(&reg->aenmailbox7);
+               ha->aenmb[1] = RD_REG_DWORD(&reg->aenmailbox1);
+               ha->aenmb[2] = RD_REG_DWORD(&reg->aenmailbox2);
+               ha->aenmb[3] = RD_REG_DWORD(&reg->aenmailbox3);
+               ha->aenmb[4] = RD_REG_DWORD(&reg->aenmailbox4);
+               ha->aenmb[5] = RD_REG_DWORD(&reg->aenmailbox5);
+               ha->aenmb[6] = RD_REG_DWORD(&reg->aenmailbox6);
+               ha->aenmb[7] = RD_REG_DWORD(&reg->aenmailbox7);
                ql_dbg(ql_dbg_async, vha, 0x5078,
                    "AEN:%04x %04x %04x %04x :%04x %04x %04x %04x\n",
                    ha->aenmb[0], ha->aenmb[1], ha->aenmb[2], ha->aenmb[3],
@@ -2869,7 +2869,7 @@ static void
 qlafx00_mbx_completion(scsi_qla_host_t *vha, uint32_t mb0)
 {
        uint16_t        cnt;
-       uint32_t __iomem *wptr;
+       __le32 __iomem *wptr;
        struct qla_hw_data *ha = vha->hw;
        struct device_reg_fx00 __iomem *reg = &ha->iobase->ispfx00;
 
@@ -2879,7 +2879,7 @@ qlafx00_mbx_completion(scsi_qla_host_t *vha, uint32_t mb0)
        /* Load return mailbox registers. */
        ha->flags.mbox_int = 1;
        ha->mailbox_out32[0] = mb0;
-       wptr = (uint32_t __iomem *)&reg->mailbox17;
+       wptr = &reg->mailbox17;
 
        for (cnt = 1; cnt < ha->mbx_count; cnt++) {
                ha->mailbox_out32[cnt] = RD_REG_DWORD(wptr);
@@ -2936,13 +2936,13 @@ qlafx00_intr_handler(int irq, void *dev_id)
                        break;
 
                if (stat & QLAFX00_INTR_MB_CMPLT) {
-                       mb[0] = RD_REG_WORD(&reg->mailbox16);
+                       mb[0] = RD_REG_DWORD(&reg->mailbox16);
                        qlafx00_mbx_completion(vha, mb[0]);
                        status |= MBX_INTERRUPT;
                        clr_intr |= QLAFX00_INTR_MB_CMPLT;
                }
                if (intr_stat & QLAFX00_INTR_ASYNC_CMPLT) {
-                       ha->aenmb[0] = RD_REG_WORD(&reg->aenmailbox0);
+                       ha->aenmb[0] = RD_REG_DWORD(&reg->aenmailbox0);
                        qlafx00_async_event(vha);
                        clr_intr |= QLAFX00_INTR_ASYNC_CMPLT;
                }

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index ec4d667..9cc6ad6 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -1996,11 +1996,11 @@ void
 qla82xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)
 {
        uint16_t        cnt;
-       uint16_t __iomem *wptr;
+       __le16 __iomem *wptr;
        struct qla_hw_data *ha = vha->hw;
        struct device_reg_82xx __iomem *reg = &ha->iobase->isp82;
 
-       wptr = (uint16_t __iomem *)&reg->mailbox_out[1];
+       wptr = &reg->mailbox_out[1];
 
        /* Load return mailbox registers. */
        ha->flags.mbox_int = 1;

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 743c0df..017f4e0 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -7558,7 +7558,7 @@ qla2xxx_pci_mmio_enabled(struct pci_dev *pdev)
 
        spin_lock_irqsave(&ha->hardware_lock, flags);
        if (IS_QLA2100(ha) || IS_QLA2200(ha)){
-               stat = RD_REG_DWORD(&reg->hccr);
+               stat = RD_REG_WORD(&reg->hccr);
                if (stat & HCCR_RISC_PAUSE)
                        risc_paused = 1;
        } else if (IS_QLA23XX(ha)) {