/* Execution environment IDs */
 enum gsi_ee_id {
-       GSI_EE_AP       = 0,
-       GSI_EE_MODEM    = 1,
-       GSI_EE_UC       = 2,
-       GSI_EE_TZ       = 3,
+       GSI_EE_AP                               = 0x0,
+       GSI_EE_MODEM                            = 0x1,
+       GSI_EE_UC                               = 0x2,
+       GSI_EE_TZ                               = 0x3,
 };
 
 struct gsi_ring {
 
 /* Hardware values signifying the state of a channel */
 enum gsi_channel_state {
-       GSI_CHANNEL_STATE_NOT_ALLOCATED = 0x0,
-       GSI_CHANNEL_STATE_ALLOCATED     = 0x1,
-       GSI_CHANNEL_STATE_STARTED       = 0x2,
-       GSI_CHANNEL_STATE_STOPPED       = 0x3,
-       GSI_CHANNEL_STATE_STOP_IN_PROC  = 0x4,
-       GSI_CHANNEL_STATE_ERROR         = 0xf,
+       GSI_CHANNEL_STATE_NOT_ALLOCATED         = 0x0,
+       GSI_CHANNEL_STATE_ALLOCATED             = 0x1,
+       GSI_CHANNEL_STATE_STARTED               = 0x2,
+       GSI_CHANNEL_STATE_STOPPED               = 0x3,
+       GSI_CHANNEL_STATE_STOP_IN_PROC          = 0x4,
+       GSI_CHANNEL_STATE_ERROR                 = 0xf,
 };
 
 /* We only care about channels between IPA and AP */
 
 #define ERINDEX_FMASK                  GENMASK(18, 14)
 #define CHSTATE_FMASK                  GENMASK(23, 20)
 #define ELEMENT_SIZE_FMASK             GENMASK(31, 24)
+
 /** enum gsi_channel_type - CHTYPE_PROTOCOL field values in CH_C_CNTXT_0 */
 enum gsi_channel_type {
        GSI_CHANNEL_TYPE_MHI                    = 0x0,
                        (0x0001f008 + 0x4000 * (ee))
 #define CH_CHID_FMASK                  GENMASK(7, 0)
 #define CH_OPCODE_FMASK                        GENMASK(31, 24)
+
 /** enum gsi_ch_cmd_opcode - CH_OPCODE field values in CH_CMD */
 enum gsi_ch_cmd_opcode {
        GSI_CH_ALLOCATE                         = 0x0,
                        (0x0001f010 + 0x4000 * (ee))
 #define EV_CHID_FMASK                  GENMASK(7, 0)
 #define EV_OPCODE_FMASK                        GENMASK(31, 24)
+
 /** enum gsi_evt_cmd_opcode - EV_OPCODE field values in EV_CH_CMD */
 enum gsi_evt_cmd_opcode {
        GSI_EVT_ALLOCATE                        = 0x0,
 #define GENERIC_OPCODE_FMASK           GENMASK(4, 0)
 #define GENERIC_CHID_FMASK             GENMASK(9, 5)
 #define GENERIC_EE_FMASK               GENMASK(13, 10)
+
 /** enum gsi_generic_cmd_opcode - GENERIC_OPCODE field values in GENERIC_CMD */
 enum gsi_generic_cmd_opcode {
        GSI_GENERIC_HALT_CHANNEL                = 0x1,
 /* Fields below are present for IPA v4.2 and above */
 #define GSI_USE_RD_WR_ENG_FMASK                GENMASK(30, 30)
 #define GSI_USE_INTER_EE_FMASK         GENMASK(31, 31)
+
 /** enum gsi_iram_size - IRAM_SIZE field values in HW_PARAM_2 */
 enum gsi_iram_size {
        IRAM_SIZE_ONE_KB                        = 0x0,
                        GSI_EE_N_CNTXT_TYPE_IRQ_MSK_OFFSET(GSI_EE_AP)
 #define GSI_EE_N_CNTXT_TYPE_IRQ_MSK_OFFSET(ee) \
                        (0x0001f088 + 0x4000 * (ee))
+
 /* Values here are bit positions in the TYPE_IRQ and TYPE_IRQ_MSK registers */
 enum gsi_irq_type_id {
-       GSI_CH_CTRL             = 0,    /* channel allocation, etc.  */
-       GSI_EV_CTRL             = 1,    /* event ring allocation, etc. */
-       GSI_GLOB_EE             = 2,    /* global/general event */
-       GSI_IEOB                = 3,    /* TRE completion */
-       GSI_INTER_EE_CH_CTRL    = 4,    /* remote-issued stop/reset (unused) */
-       GSI_INTER_EE_EV_CTRL    = 5,    /* remote-issued event reset (unused) */
-       GSI_GENERAL             = 6,    /* general-purpose event */
+       GSI_CH_CTRL             = 0x0,  /* channel allocation, etc.  */
+       GSI_EV_CTRL             = 0x1,  /* event ring allocation, etc. */
+       GSI_GLOB_EE             = 0x2,  /* global/general event */
+       GSI_IEOB                = 0x3,  /* TRE completion */
+       GSI_INTER_EE_CH_CTRL    = 0x4,  /* remote-issued stop/reset (unused) */
+       GSI_INTER_EE_EV_CTRL    = 0x5,  /* remote-issued event reset (unused) */
+       GSI_GENERAL             = 0x6,  /* general-purpose event */
 };
 
 #define GSI_CNTXT_SRC_CH_IRQ_OFFSET \
 #define ERR_VIRT_IDX_FMASK             GENMASK(23, 19)
 #define ERR_TYPE_FMASK                 GENMASK(27, 24)
 #define ERR_EE_FMASK                   GENMASK(31, 28)
+
 /** enum gsi_err_code - ERR_CODE field values in EE_ERR_LOG */
 enum gsi_err_code {
        GSI_INVALID_TRE                         = 0x1,
        /* 7 is not assigned */
        GSI_HWO_1                               = 0x8,
 };
+
 /** enum gsi_err_type - ERR_TYPE field values in EE_ERR_LOG */
 enum gsi_err_type {
        GSI_ERR_TYPE_GLOB                       = 0x1,
                        (0x0001f400 + 0x4000 * (ee))
 #define INTER_EE_RESULT_FMASK          GENMASK(2, 0)
 #define GENERIC_EE_RESULT_FMASK                GENMASK(7, 5)
+
+/** enum gsi_generic_ee_result - GENERIC_EE_RESULT field values in SCRATCH_0 */
 enum gsi_generic_ee_result {
        GENERIC_EE_SUCCESS                      = 0x1,
        GENERIC_EE_CHANNEL_NOT_RUNNING          = 0x2,
        GENERIC_EE_RETRY                        = 0x6,
        GENERIC_EE_NO_RESOURCES                 = 0x7,
 };
+
 #define USB_MAX_PACKET_FMASK           GENMASK(15, 15) /* 0: HS; 1: SS */
 #define MHI_BASE_CHANNEL_FMASK         GENMASK(31, 24)
 
 
 
 /* Some commands can wait until indicated pipeline stages are clear */
 enum pipeline_clear_options {
-       pipeline_clear_hps      = 0,
-       pipeline_clear_src_grp  = 1,
-       pipeline_clear_full     = 2,
+       pipeline_clear_hps              = 0x0,
+       pipeline_clear_src_grp          = 0x1,
+       pipeline_clear_full             = 0x2,
 };
 
 /* IPA_CMD_IP_V{4,6}_{FILTER,ROUTING}_INIT */
 
  * a request is *not* an immediate command.
  */
 enum ipa_cmd_opcode {
-       IPA_CMD_NONE                    = 0,
-       IPA_CMD_IP_V4_FILTER_INIT       = 3,
-       IPA_CMD_IP_V6_FILTER_INIT       = 4,
-       IPA_CMD_IP_V4_ROUTING_INIT      = 7,
-       IPA_CMD_IP_V6_ROUTING_INIT      = 8,
-       IPA_CMD_HDR_INIT_LOCAL          = 9,
-       IPA_CMD_REGISTER_WRITE          = 12,
-       IPA_CMD_IP_PACKET_INIT          = 16,
-       IPA_CMD_DMA_SHARED_MEM          = 19,
-       IPA_CMD_IP_PACKET_TAG_STATUS    = 20,
+       IPA_CMD_NONE                    = 0x0,
+       IPA_CMD_IP_V4_FILTER_INIT       = 0x3,
+       IPA_CMD_IP_V6_FILTER_INIT       = 0x4,
+       IPA_CMD_IP_V4_ROUTING_INIT      = 0x7,
+       IPA_CMD_IP_V6_ROUTING_INIT      = 0x8,
+       IPA_CMD_HDR_INIT_LOCAL          = 0x9,
+       IPA_CMD_REGISTER_WRITE          = 0xc,
+       IPA_CMD_IP_PACKET_INIT          = 0x10,
+       IPA_CMD_DMA_SHARED_MEM          = 0x13,
+       IPA_CMD_IP_PACKET_TAG_STATUS    = 0x14,
 };
 
 /**
        enum dma_data_direction direction;
 };
 
-
 #ifdef IPA_VALIDATE
 
 /**
 
 #define IPA_MTU                        ETH_DATA_LEN
 
 enum ipa_endpoint_name {
-       IPA_ENDPOINT_AP_MODEM_TX        = 0,
+       IPA_ENDPOINT_AP_MODEM_TX,
        IPA_ENDPOINT_MODEM_LAN_TX,
        IPA_ENDPOINT_MODEM_COMMAND_TX,
        IPA_ENDPOINT_AP_COMMAND_TX,
 
  * for an AP RX endpoint whose underlying GSI channel is suspended/stopped.
  */
 enum ipa_irq_id {
-       IPA_IRQ_UC_0            = 2,
-       IPA_IRQ_UC_1            = 3,
-       IPA_IRQ_TX_SUSPEND      = 14,
+       IPA_IRQ_UC_0            = 0x2,
+       IPA_IRQ_UC_1            = 0x3,
+       IPA_IRQ_TX_SUSPEND      = 0xe,
        IPA_IRQ_COUNT,          /* Number of interrupt types (not an index) */
 };
 
 
 
 /* The AP tells the modem its platform type.  We assume Android. */
 enum ipa_platform_type {
-       IPA_QMI_PLATFORM_TYPE_INVALID           = 0,    /* Invalid */
-       IPA_QMI_PLATFORM_TYPE_TN                = 1,    /* Data card */
-       IPA_QMI_PLATFORM_TYPE_LE                = 2,    /* Data router */
-       IPA_QMI_PLATFORM_TYPE_MSM_ANDROID       = 3,    /* Android MSM */
-       IPA_QMI_PLATFORM_TYPE_MSM_WINDOWS       = 4,    /* Windows MSM */
-       IPA_QMI_PLATFORM_TYPE_MSM_QNX_V01       = 5,    /* QNX MSM */
+       IPA_QMI_PLATFORM_TYPE_INVALID           = 0x0,  /* Invalid */
+       IPA_QMI_PLATFORM_TYPE_TN                = 0x1,  /* Data card */
+       IPA_QMI_PLATFORM_TYPE_LE                = 0x2,  /* Data router */
+       IPA_QMI_PLATFORM_TYPE_MSM_ANDROID       = 0x3,  /* Android MSM */
+       IPA_QMI_PLATFORM_TYPE_MSM_WINDOWS       = 0x4,  /* Windows MSM */
+       IPA_QMI_PLATFORM_TYPE_MSM_QNX_V01       = 0x5,  /* QNX MSM */
 };
 
 /* This defines the start and end offset of a range of memory.  Both
 
 
 /** enum ipa_cs_offload_en - checksum offload field in ENDP_INIT_CFG_N */
 enum ipa_cs_offload_en {
-       IPA_CS_OFFLOAD_NONE     = 0,
-       IPA_CS_OFFLOAD_UL       = 1,
-       IPA_CS_OFFLOAD_DL       = 2,
-       IPA_CS_RSVD
+       IPA_CS_OFFLOAD_NONE             = 0x0,
+       IPA_CS_OFFLOAD_UL               = 0x1,
+       IPA_CS_OFFLOAD_DL               = 0x2,
+       IPA_CS_RSVD                     = 0x3,
 };
 
 /** enum ipa_aggr_en - aggregation enable field in ENDP_INIT_AGGR_N */
 enum ipa_aggr_en {
-       IPA_BYPASS_AGGR         = 0,
-       IPA_ENABLE_AGGR         = 1,
-       IPA_ENABLE_DEAGGR       = 2,
+       IPA_BYPASS_AGGR                 = 0x0,
+       IPA_ENABLE_AGGR                 = 0x1,
+       IPA_ENABLE_DEAGGR               = 0x2,
 };
 
 /** enum ipa_aggr_type - aggregation type field in in_ENDP_INIT_AGGR_N */
 enum ipa_aggr_type {
-       IPA_MBIM_16     = 0,
-       IPA_HDLC        = 1,
-       IPA_TLP         = 2,
-       IPA_RNDIS       = 3,
-       IPA_GENERIC     = 4,
-       IPA_COALESCE    = 5,
-       IPA_QCMAP       = 6,
+       IPA_MBIM_16                     = 0x0,
+       IPA_HDLC                        = 0x1,
+       IPA_TLP                         = 0x2,
+       IPA_RNDIS                       = 0x3,
+       IPA_GENERIC                     = 0x4,
+       IPA_COALESCE                    = 0x5,
+       IPA_QCMAP                       = 0x6,
 };
 
 /** enum ipa_mode - mode field in ENDP_INIT_MODE_N */
 enum ipa_mode {
-       IPA_BASIC                       = 0,
-       IPA_ENABLE_FRAMING_HDLC         = 1,
-       IPA_ENABLE_DEFRAMING_HDLC       = 2,
-       IPA_DMA                         = 3,
+       IPA_BASIC                       = 0x0,
+       IPA_ENABLE_FRAMING_HDLC         = 0x1,
+       IPA_ENABLE_DEFRAMING_HDLC       = 0x2,
+       IPA_DMA                         = 0x3,
 };
 
 /**
 
 
 /** enum ipa_uc_command - commands from the AP to the microcontroller */
 enum ipa_uc_command {
-       IPA_UC_COMMAND_NO_OP            = 0,
-       IPA_UC_COMMAND_UPDATE_FLAGS     = 1,
-       IPA_UC_COMMAND_DEBUG_RUN_TEST   = 2,
-       IPA_UC_COMMAND_DEBUG_GET_INFO   = 3,
-       IPA_UC_COMMAND_ERR_FATAL        = 4,
-       IPA_UC_COMMAND_CLK_GATE         = 5,
-       IPA_UC_COMMAND_CLK_UNGATE       = 6,
-       IPA_UC_COMMAND_MEMCPY           = 7,
-       IPA_UC_COMMAND_RESET_PIPE       = 8,
-       IPA_UC_COMMAND_REG_WRITE        = 9,
-       IPA_UC_COMMAND_GSI_CH_EMPTY     = 10,
+       IPA_UC_COMMAND_NO_OP            = 0x0,
+       IPA_UC_COMMAND_UPDATE_FLAGS     = 0x1,
+       IPA_UC_COMMAND_DEBUG_RUN_TEST   = 0x2,
+       IPA_UC_COMMAND_DEBUG_GET_INFO   = 0x3,
+       IPA_UC_COMMAND_ERR_FATAL        = 0x4,
+       IPA_UC_COMMAND_CLK_GATE         = 0x5,
+       IPA_UC_COMMAND_CLK_UNGATE       = 0x6,
+       IPA_UC_COMMAND_MEMCPY           = 0x7,
+       IPA_UC_COMMAND_RESET_PIPE       = 0x8,
+       IPA_UC_COMMAND_REG_WRITE        = 0x9,
+       IPA_UC_COMMAND_GSI_CH_EMPTY     = 0xa,
 };
 
 /** enum ipa_uc_response - microcontroller response codes */
 enum ipa_uc_response {
-       IPA_UC_RESPONSE_NO_OP           = 0,
-       IPA_UC_RESPONSE_INIT_COMPLETED  = 1,
-       IPA_UC_RESPONSE_CMD_COMPLETED   = 2,
-       IPA_UC_RESPONSE_DEBUG_GET_INFO  = 3,
+       IPA_UC_RESPONSE_NO_OP           = 0x0,
+       IPA_UC_RESPONSE_INIT_COMPLETED  = 0x1,
+       IPA_UC_RESPONSE_CMD_COMPLETED   = 0x2,
+       IPA_UC_RESPONSE_DEBUG_GET_INFO  = 0x3,
 };
 
 /** enum ipa_uc_event - common cpu events reported by the microcontroller */
 enum ipa_uc_event {
-       IPA_UC_EVENT_NO_OP     = 0,
-       IPA_UC_EVENT_ERROR     = 1,
-       IPA_UC_EVENT_LOG_INFO  = 2,
+       IPA_UC_EVENT_NO_OP              = 0x0,
+       IPA_UC_EVENT_ERROR              = 0x1,
+       IPA_UC_EVENT_LOG_INFO           = 0x2,
 };
 
 static struct ipa_uc_mem_area *ipa_uc_shared(struct ipa *ipa)