bnxt_en: Use macros for firmware message doorbell offsets.

In preparation for adding a 2nd communication channel to firmware.

Signed-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 72ba07cb39d37c40eecbaad980fd8d3b5557d56b..945e78b1d468cbc36d35f2124b8c2f79171f8972 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -3755,6 +3755,8 @@ static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len,
        struct hwrm_err_output *resp = bp->hwrm_cmd_resp_addr;
        u16 max_req_len = BNXT_HWRM_MAX_REQ_LEN;
        struct hwrm_short_input short_input = {0};
+       u32 doorbell_offset = BNXT_GRCPF_REG_CHIMP_COMM_TRIGGER;
+       u32 bar_offset = BNXT_GRCPF_REG_CHIMP_COMM;
 
        req->seq_id = cpu_to_le16(bp->hwrm_cmd_seq++);
        memset(resp, 0, PAGE_SIZE);
@@ -3800,17 +3802,17 @@ static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len,
        }
 
        /* Write request msg to hwrm channel */
-       __iowrite32_copy(bp->bar0, data, msg_len / 4);
+       __iowrite32_copy(bp->bar0 + bar_offset, data, msg_len / 4);
 
        for (i = msg_len; i < max_req_len; i += 4)
-               writel(0, bp->bar0 + i);
+               writel(0, bp->bar0 + bar_offset + i);
 
        /* currently supports only one outstanding message */
        if (intr_process)
                bp->hwrm_intr_seq_id = le16_to_cpu(req->seq_id);
 
        /* Ring channel doorbell */
-       writel(1, bp->bar0 + 0x100);
+       writel(1, bp->bar0 + doorbell_offset);
 
        if (!timeout)
                timeout = DFLT_HWRM_CMD_TIMEOUT;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 7a75977c1729742c7b03b317b51a5559e1fb2832..57598164830c229b90c0f6cf3c3dc1df486e0d87 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1112,9 +1112,11 @@ struct bnxt_test_info {
        char string[BNXT_MAX_TEST][ETH_GSTRING_LEN];
 };
 
-#define BNXT_GRCPF_REG_WINDOW_BASE_OUT 0x400
-#define BNXT_CAG_REG_LEGACY_INT_STATUS 0x4014
-#define BNXT_CAG_REG_BASE              0x300000
+#define BNXT_GRCPF_REG_CHIMP_COMM              0x0
+#define BNXT_GRCPF_REG_CHIMP_COMM_TRIGGER      0x100
+#define BNXT_GRCPF_REG_WINDOW_BASE_OUT         0x400
+#define BNXT_CAG_REG_LEGACY_INT_STATUS         0x4014
+#define BNXT_CAG_REG_BASE                      0x300000
 
 struct bnxt_tc_flow_stats {
        u64             packets;