#define CMDQ_THR_PRIORITY              0x40
 
 #define GCE_GCTL_VALUE                 0x48
+#define GCE_CTRL_BY_SW                         GENMASK(2, 0)
 
 #define CMDQ_THR_ACTIVE_SLOT_CYCLES    0x3200
 #define CMDQ_THR_ENABLED               0x1
 
        WARN_ON(clk_bulk_enable(cmdq->gce_num, cmdq->clocks));
        if (cmdq->control_by_sw)
-               writel(0x7, cmdq->base + GCE_GCTL_VALUE);
+               writel(GCE_CTRL_BY_SW, cmdq->base + GCE_GCTL_VALUE);
+
        writel(CMDQ_THR_ACTIVE_SLOT_CYCLES, cmdq->base + CMDQ_THR_SLOT_CYCLES);
        for (i = 0; i <= CMDQ_MAX_EVENT; i++)
                writel(i, cmdq->base + CMDQ_SYNC_TOKEN_UPDATE);