]> git.kernelconcepts.de Git - karo-tx-linux.git/blobdiff - drivers/scsi/csiostor/csio_mb.c
cxgb4/cxgb4vf/csiostor: Cleanup macros/register defines related to queues
[karo-tx-linux.git] / drivers / scsi / csiostor / csio_mb.c
index ffa84898760818713263c027aafd57b313103a5c..5a514b6bc8ec2ad737483b912be347c05d781929 100644 (file)
@@ -85,13 +85,13 @@ csio_mb_hello(struct csio_hw *hw, struct csio_mb *mbp, uint32_t tmo,
                                       FW_CMD_REQUEST_F | FW_CMD_WRITE_F);
        cmdp->retval_len16 = htonl(FW_CMD_LEN16_V(sizeof(*cmdp) / 16));
        cmdp->err_to_clearinit = htonl(
-               FW_HELLO_CMD_MASTERDIS(master == CSIO_MASTER_CANT)      |
-               FW_HELLO_CMD_MASTERFORCE(master == CSIO_MASTER_MUST)    |
-               FW_HELLO_CMD_MBMASTER(master == CSIO_MASTER_MUST ?
-                               m_mbox : FW_HELLO_CMD_MBMASTER_MASK)    |
-               FW_HELLO_CMD_MBASYNCNOT(a_mbox) |
-               FW_HELLO_CMD_STAGE(fw_hello_cmd_stage_os) |
-               FW_HELLO_CMD_CLEARINIT);
+               FW_HELLO_CMD_MASTERDIS_V(master == CSIO_MASTER_CANT)    |
+               FW_HELLO_CMD_MASTERFORCE_V(master == CSIO_MASTER_MUST)  |
+               FW_HELLO_CMD_MBMASTER_V(master == CSIO_MASTER_MUST ?
+                               m_mbox : FW_HELLO_CMD_MBMASTER_M)       |
+               FW_HELLO_CMD_MBASYNCNOT_V(a_mbox) |
+               FW_HELLO_CMD_STAGE_V(fw_hello_cmd_stage_os) |
+               FW_HELLO_CMD_CLEARINIT_F);
 
 }
 
@@ -118,11 +118,11 @@ csio_mb_process_hello_rsp(struct csio_hw *hw, struct csio_mb *mbp,
                hw->fwrev = ntohl(rsp->fwrev);
 
                value = ntohl(rsp->err_to_clearinit);
-               *mpfn = FW_HELLO_CMD_MBMASTER_GET(value);
+               *mpfn = FW_HELLO_CMD_MBMASTER_G(value);
 
-               if (value & FW_HELLO_CMD_INIT)
+               if (value & FW_HELLO_CMD_INIT_F)
                        *state = CSIO_DEV_STATE_INIT;
-               else if (value & FW_HELLO_CMD_ERR)
+               else if (value & FW_HELLO_CMD_ERR_F)
                        *state = CSIO_DEV_STATE_ERR;
                else
                        *state = CSIO_DEV_STATE_UNINIT;
@@ -205,8 +205,8 @@ csio_mb_params(struct csio_hw *hw, struct csio_mb *mbp, uint32_t tmo,
        cmdp->op_to_vfn = htonl(FW_CMD_OP_V(FW_PARAMS_CMD)              |
                                FW_CMD_REQUEST_F                        |
                                (wr ? FW_CMD_WRITE_F : FW_CMD_READ_F)   |
-                               FW_PARAMS_CMD_PFN(pf)                   |
-                               FW_PARAMS_CMD_VFN(vf));
+                               FW_PARAMS_CMD_PFN_V(pf)                 |
+                               FW_PARAMS_CMD_VFN_V(vf));
        cmdp->retval_len16 = htonl(FW_CMD_LEN16_V(sizeof(*cmdp) / 16));
 
        /* Write Params */
@@ -274,11 +274,11 @@ csio_mb_ldst(struct csio_hw *hw, struct csio_mb *mbp, uint32_t tmo, int reg)
                        htonl(FW_CMD_OP_V(FW_LDST_CMD)  |
                        FW_CMD_REQUEST_F                        |
                        FW_CMD_READ_F                   |
-                       FW_LDST_CMD_ADDRSPACE(FW_LDST_ADDRSPC_FUNC_PCIE));
+                       FW_LDST_CMD_ADDRSPACE_V(FW_LDST_ADDRSPC_FUNC_PCIE));
        ldst_cmd->cycles_to_len16 = htonl(FW_LEN16(struct fw_ldst_cmd));
-       ldst_cmd->u.pcie.select_naccess = FW_LDST_CMD_NACCESS(1);
+       ldst_cmd->u.pcie.select_naccess = FW_LDST_CMD_NACCESS_V(1);
        ldst_cmd->u.pcie.ctrl_to_fn =
-               (FW_LDST_CMD_LC | FW_LDST_CMD_FN(hw->pfn));
+               (FW_LDST_CMD_LC_F | FW_LDST_CMD_FN_V(hw->pfn));
        ldst_cmd->u.pcie.r = (uint8_t)reg;
 }
 
@@ -445,16 +445,16 @@ csio_mb_iq_alloc(struct csio_hw *hw, struct csio_mb *mbp, void *priv,
 
        cmdp->op_to_vfn = htonl(FW_CMD_OP_V(FW_IQ_CMD)          |
                                FW_CMD_REQUEST_F | FW_CMD_EXEC_F        |
-                               FW_IQ_CMD_PFN(iq_params->pfn)   |
-                               FW_IQ_CMD_VFN(iq_params->vfn));
+                               FW_IQ_CMD_PFN_V(iq_params->pfn) |
+                               FW_IQ_CMD_VFN_V(iq_params->vfn));
 
-       cmdp->alloc_to_len16 = htonl(FW_IQ_CMD_ALLOC            |
+       cmdp->alloc_to_len16 = htonl(FW_IQ_CMD_ALLOC_F          |
                                FW_CMD_LEN16_V(sizeof(*cmdp) / 16));
 
        cmdp->type_to_iqandstindex = htonl(
-                               FW_IQ_CMD_VIID(iq_params->viid) |
-                               FW_IQ_CMD_TYPE(iq_params->type) |
-                               FW_IQ_CMD_IQASYNCH(iq_params->iqasynch));
+                               FW_IQ_CMD_VIID_V(iq_params->viid)       |
+                               FW_IQ_CMD_TYPE_V(iq_params->type)       |
+                               FW_IQ_CMD_IQASYNCH_V(iq_params->iqasynch));
 
        cmdp->fl0size = htons(iq_params->fl0size);
        cmdp->fl0size = htons(iq_params->fl1size);
@@ -488,8 +488,8 @@ csio_mb_iq_write(struct csio_hw *hw, struct csio_mb *mbp, void *priv,
        struct fw_iq_cmd *cmdp = (struct fw_iq_cmd *)(mbp->mb);
 
        uint32_t iq_start_stop = (iq_params->iq_start)  ?
-                                       FW_IQ_CMD_IQSTART(1) :
-                                       FW_IQ_CMD_IQSTOP(1);
+                                       FW_IQ_CMD_IQSTART_F :
+                                       FW_IQ_CMD_IQSTOP_F;
 
        /*
         * If this IQ write is cascaded with IQ alloc request, do not
@@ -501,49 +501,49 @@ csio_mb_iq_write(struct csio_hw *hw, struct csio_mb *mbp, void *priv,
 
        cmdp->op_to_vfn |= htonl(FW_CMD_OP_V(FW_IQ_CMD)         |
                                FW_CMD_REQUEST_F | FW_CMD_WRITE_F       |
-                               FW_IQ_CMD_PFN(iq_params->pfn)   |
-                               FW_IQ_CMD_VFN(iq_params->vfn));
+                               FW_IQ_CMD_PFN_V(iq_params->pfn) |
+                               FW_IQ_CMD_VFN_V(iq_params->vfn));
        cmdp->alloc_to_len16 |= htonl(iq_start_stop |
                                FW_CMD_LEN16_V(sizeof(*cmdp) / 16));
        cmdp->iqid |= htons(iq_params->iqid);
        cmdp->fl0id |= htons(iq_params->fl0id);
        cmdp->fl1id |= htons(iq_params->fl1id);
        cmdp->type_to_iqandstindex |= htonl(
-                       FW_IQ_CMD_IQANDST(iq_params->iqandst)   |
-                       FW_IQ_CMD_IQANUS(iq_params->iqanus)     |
-                       FW_IQ_CMD_IQANUD(iq_params->iqanud)     |
-                       FW_IQ_CMD_IQANDSTINDEX(iq_params->iqandstindex));
+                       FW_IQ_CMD_IQANDST_V(iq_params->iqandst) |
+                       FW_IQ_CMD_IQANUS_V(iq_params->iqanus)   |
+                       FW_IQ_CMD_IQANUD_V(iq_params->iqanud)   |
+                       FW_IQ_CMD_IQANDSTINDEX_V(iq_params->iqandstindex));
        cmdp->iqdroprss_to_iqesize |= htons(
-                       FW_IQ_CMD_IQPCIECH(iq_params->iqpciech)         |
-                       FW_IQ_CMD_IQDCAEN(iq_params->iqdcaen)           |
-                       FW_IQ_CMD_IQDCACPU(iq_params->iqdcacpu)         |
-                       FW_IQ_CMD_IQINTCNTTHRESH(iq_params->iqintcntthresh) |
-                       FW_IQ_CMD_IQCPRIO(iq_params->iqcprio)           |
-                       FW_IQ_CMD_IQESIZE(iq_params->iqesize));
+                       FW_IQ_CMD_IQPCIECH_V(iq_params->iqpciech)       |
+                       FW_IQ_CMD_IQDCAEN_V(iq_params->iqdcaen)         |
+                       FW_IQ_CMD_IQDCACPU_V(iq_params->iqdcacpu)       |
+                       FW_IQ_CMD_IQINTCNTTHRESH_V(iq_params->iqintcntthresh) |
+                       FW_IQ_CMD_IQCPRIO_V(iq_params->iqcprio)         |
+                       FW_IQ_CMD_IQESIZE_V(iq_params->iqesize));
 
        cmdp->iqsize |= htons(iq_params->iqsize);
        cmdp->iqaddr |= cpu_to_be64(iq_params->iqaddr);
 
        if (iq_params->type == 0) {
                cmdp->iqns_to_fl0congen |= htonl(
-                       FW_IQ_CMD_IQFLINTIQHSEN(iq_params->iqflintiqhsen)|
-                       FW_IQ_CMD_IQFLINTCONGEN(iq_params->iqflintcongen));
+                       FW_IQ_CMD_IQFLINTIQHSEN_V(iq_params->iqflintiqhsen)|
+                       FW_IQ_CMD_IQFLINTCONGEN_V(iq_params->iqflintcongen));
        }
 
        if (iq_params->fl0size && iq_params->fl0addr &&
            (iq_params->fl0id != 0xFFFF)) {
 
                cmdp->iqns_to_fl0congen |= htonl(
-                       FW_IQ_CMD_FL0HOSTFCMODE(iq_params->fl0hostfcmode)|
-                       FW_IQ_CMD_FL0CPRIO(iq_params->fl0cprio)         |
-                       FW_IQ_CMD_FL0PADEN(iq_params->fl0paden)         |
-                       FW_IQ_CMD_FL0PACKEN(iq_params->fl0packen));
+                       FW_IQ_CMD_FL0HOSTFCMODE_V(iq_params->fl0hostfcmode)|
+                       FW_IQ_CMD_FL0CPRIO_V(iq_params->fl0cprio)       |
+                       FW_IQ_CMD_FL0PADEN_V(iq_params->fl0paden)       |
+                       FW_IQ_CMD_FL0PACKEN_V(iq_params->fl0packen));
                cmdp->fl0dcaen_to_fl0cidxfthresh |= htons(
-                       FW_IQ_CMD_FL0DCAEN(iq_params->fl0dcaen)         |
-                       FW_IQ_CMD_FL0DCACPU(iq_params->fl0dcacpu)       |
-                       FW_IQ_CMD_FL0FBMIN(iq_params->fl0fbmin)         |
-                       FW_IQ_CMD_FL0FBMAX(iq_params->fl0fbmax)         |
-                       FW_IQ_CMD_FL0CIDXFTHRESH(iq_params->fl0cidxfthresh));
+                       FW_IQ_CMD_FL0DCAEN_V(iq_params->fl0dcaen)       |
+                       FW_IQ_CMD_FL0DCACPU_V(iq_params->fl0dcacpu)     |
+                       FW_IQ_CMD_FL0FBMIN_V(iq_params->fl0fbmin)       |
+                       FW_IQ_CMD_FL0FBMAX_V(iq_params->fl0fbmax)       |
+                       FW_IQ_CMD_FL0CIDXFTHRESH_V(iq_params->fl0cidxfthresh));
                cmdp->fl0size |= htons(iq_params->fl0size);
                cmdp->fl0addr |= cpu_to_be64(iq_params->fl0addr);
        }
@@ -624,11 +624,11 @@ csio_mb_iq_free(struct csio_hw *hw, struct csio_mb *mbp, void *priv,
 
        cmdp->op_to_vfn = htonl(FW_CMD_OP_V(FW_IQ_CMD)          |
                                FW_CMD_REQUEST_F | FW_CMD_EXEC_F        |
-                               FW_IQ_CMD_PFN(iq_params->pfn)   |
-                               FW_IQ_CMD_VFN(iq_params->vfn));
-       cmdp->alloc_to_len16 = htonl(FW_IQ_CMD_FREE             |
+                               FW_IQ_CMD_PFN_V(iq_params->pfn) |
+                               FW_IQ_CMD_VFN_V(iq_params->vfn));
+       cmdp->alloc_to_len16 = htonl(FW_IQ_CMD_FREE_F           |
                                FW_CMD_LEN16_V(sizeof(*cmdp) / 16));
-       cmdp->type_to_iqandstindex = htonl(FW_IQ_CMD_TYPE(iq_params->type));
+       cmdp->type_to_iqandstindex = htonl(FW_IQ_CMD_TYPE_V(iq_params->type));
 
        cmdp->iqid = htons(iq_params->iqid);
        cmdp->fl0id = htons(iq_params->fl0id);
@@ -659,9 +659,9 @@ csio_mb_eq_ofld_alloc(struct csio_hw *hw, struct csio_mb *mbp, void *priv,
        CSIO_INIT_MBP(mbp, cmdp, mb_tmo, priv, cbfn, 1);
        cmdp->op_to_vfn = htonl(FW_CMD_OP_V(FW_EQ_OFLD_CMD)             |
                                FW_CMD_REQUEST_F | FW_CMD_EXEC_F        |
-                               FW_EQ_OFLD_CMD_PFN(eq_ofld_params->pfn) |
-                               FW_EQ_OFLD_CMD_VFN(eq_ofld_params->vfn));
-       cmdp->alloc_to_len16 = htonl(FW_EQ_OFLD_CMD_ALLOC       |
+                               FW_EQ_OFLD_CMD_PFN_V(eq_ofld_params->pfn) |
+                               FW_EQ_OFLD_CMD_VFN_V(eq_ofld_params->vfn));
+       cmdp->alloc_to_len16 = htonl(FW_EQ_OFLD_CMD_ALLOC_F     |
                                FW_CMD_LEN16_V(sizeof(*cmdp) / 16));
 
 } /* csio_mb_eq_ofld_alloc */
@@ -694,7 +694,8 @@ csio_mb_eq_ofld_write(struct csio_hw *hw, struct csio_mb *mbp, void *priv,
        struct fw_eq_ofld_cmd *cmdp = (struct fw_eq_ofld_cmd *)(mbp->mb);
 
        uint32_t eq_start_stop = (eq_ofld_params->eqstart)      ?
-                               FW_EQ_OFLD_CMD_EQSTART  : FW_EQ_OFLD_CMD_EQSTOP;
+                               FW_EQ_OFLD_CMD_EQSTART_F :
+                               FW_EQ_OFLD_CMD_EQSTOP_F;
 
        /*
         * If this EQ write is cascaded with EQ alloc request, do not
@@ -706,27 +707,27 @@ csio_mb_eq_ofld_write(struct csio_hw *hw, struct csio_mb *mbp, void *priv,
 
        cmdp->op_to_vfn |= htonl(FW_CMD_OP_V(FW_EQ_OFLD_CMD)    |
                                FW_CMD_REQUEST_F | FW_CMD_WRITE_F       |
-                               FW_EQ_OFLD_CMD_PFN(eq_ofld_params->pfn) |
-                               FW_EQ_OFLD_CMD_VFN(eq_ofld_params->vfn));
+                               FW_EQ_OFLD_CMD_PFN_V(eq_ofld_params->pfn) |
+                               FW_EQ_OFLD_CMD_VFN_V(eq_ofld_params->vfn));
        cmdp->alloc_to_len16 |= htonl(eq_start_stop             |
                                      FW_CMD_LEN16_V(sizeof(*cmdp) / 16));
 
-       cmdp->eqid_pkd |= htonl(FW_EQ_OFLD_CMD_EQID(eq_ofld_params->eqid));
+       cmdp->eqid_pkd |= htonl(FW_EQ_OFLD_CMD_EQID_V(eq_ofld_params->eqid));
 
        cmdp->fetchszm_to_iqid |= htonl(
-               FW_EQ_OFLD_CMD_HOSTFCMODE(eq_ofld_params->hostfcmode)   |
-               FW_EQ_OFLD_CMD_CPRIO(eq_ofld_params->cprio)             |
-               FW_EQ_OFLD_CMD_PCIECHN(eq_ofld_params->pciechn)         |
-               FW_EQ_OFLD_CMD_IQID(eq_ofld_params->iqid));
+               FW_EQ_OFLD_CMD_HOSTFCMODE_V(eq_ofld_params->hostfcmode) |
+               FW_EQ_OFLD_CMD_CPRIO_V(eq_ofld_params->cprio)           |
+               FW_EQ_OFLD_CMD_PCIECHN_V(eq_ofld_params->pciechn)       |
+               FW_EQ_OFLD_CMD_IQID_V(eq_ofld_params->iqid));
 
        cmdp->dcaen_to_eqsize |= htonl(
-               FW_EQ_OFLD_CMD_DCAEN(eq_ofld_params->dcaen)             |
-               FW_EQ_OFLD_CMD_DCACPU(eq_ofld_params->dcacpu)           |
-               FW_EQ_OFLD_CMD_FBMIN(eq_ofld_params->fbmin)             |
-               FW_EQ_OFLD_CMD_FBMAX(eq_ofld_params->fbmax)             |
-               FW_EQ_OFLD_CMD_CIDXFTHRESHO(eq_ofld_params->cidxfthresho) |
-               FW_EQ_OFLD_CMD_CIDXFTHRESH(eq_ofld_params->cidxfthresh) |
-               FW_EQ_OFLD_CMD_EQSIZE(eq_ofld_params->eqsize));
+               FW_EQ_OFLD_CMD_DCAEN_V(eq_ofld_params->dcaen)           |
+               FW_EQ_OFLD_CMD_DCACPU_V(eq_ofld_params->dcacpu)         |
+               FW_EQ_OFLD_CMD_FBMIN_V(eq_ofld_params->fbmin)           |
+               FW_EQ_OFLD_CMD_FBMAX_V(eq_ofld_params->fbmax)           |
+               FW_EQ_OFLD_CMD_CIDXFTHRESHO_V(eq_ofld_params->cidxfthresho) |
+               FW_EQ_OFLD_CMD_CIDXFTHRESH_V(eq_ofld_params->cidxfthresh) |
+               FW_EQ_OFLD_CMD_EQSIZE_V(eq_ofld_params->eqsize));
 
        cmdp->eqaddr |= cpu_to_be64(eq_ofld_params->eqaddr);
 
@@ -776,9 +777,9 @@ csio_mb_eq_ofld_alloc_write_rsp(struct csio_hw *hw,
        *ret_val = FW_CMD_RETVAL_G(ntohl(rsp->alloc_to_len16));
 
        if (*ret_val == FW_SUCCESS) {
-               eq_ofld_params->eqid = FW_EQ_OFLD_CMD_EQID_GET(
+               eq_ofld_params->eqid = FW_EQ_OFLD_CMD_EQID_G(
                                                ntohl(rsp->eqid_pkd));
-               eq_ofld_params->physeqid = FW_EQ_OFLD_CMD_PHYSEQID_GET(
+               eq_ofld_params->physeqid = FW_EQ_OFLD_CMD_PHYSEQID_G(
                                                ntohl(rsp->physeqid_pkd));
        } else
                eq_ofld_params->eqid = 0;
@@ -809,11 +810,11 @@ csio_mb_eq_ofld_free(struct csio_hw *hw, struct csio_mb *mbp, void *priv,
 
        cmdp->op_to_vfn = htonl(FW_CMD_OP_V(FW_EQ_OFLD_CMD)     |
                                FW_CMD_REQUEST_F | FW_CMD_EXEC_F        |
-                               FW_EQ_OFLD_CMD_PFN(eq_ofld_params->pfn) |
-                               FW_EQ_OFLD_CMD_VFN(eq_ofld_params->vfn));
-       cmdp->alloc_to_len16 = htonl(FW_EQ_OFLD_CMD_FREE |
+                               FW_EQ_OFLD_CMD_PFN_V(eq_ofld_params->pfn) |
+                               FW_EQ_OFLD_CMD_VFN_V(eq_ofld_params->vfn));
+       cmdp->alloc_to_len16 = htonl(FW_EQ_OFLD_CMD_FREE_F |
                                FW_CMD_LEN16_V(sizeof(*cmdp) / 16));
-       cmdp->eqid_pkd = htonl(FW_EQ_OFLD_CMD_EQID(eq_ofld_params->eqid));
+       cmdp->eqid_pkd = htonl(FW_EQ_OFLD_CMD_EQID_V(eq_ofld_params->eqid));
 
 } /* csio_mb_eq_ofld_free */