[PATCH net-next 02/15] bnxt_en: Define macros for the various health register states.

[Michael Chan]

Define macros to check for the various states in the lower 16 bits of
the health register.  Replace the C code that checks for these values
with the newly defined macros.

Reviewed-by: Edwin Peer <edwin.p...@broadcom.com>
Signed-off-by: Michael Chan <michael.c...@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.h         | 10 ++++++++++
 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c |  7 +++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h 
b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index d68065367cf2..a1dd80a0fcf6 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1534,9 +1534,19 @@ struct bnxt_fw_reporter_ctx {
 #define BNXT_FW_HEALTH_WIN_OFF(reg)    (BNXT_FW_HEALTH_WIN_BASE +      \
                                         ((reg) & BNXT_GRC_OFFSET_MASK))
 
+#define BNXT_FW_STATUS_HEALTH_MSK      0xffff
 #define BNXT_FW_STATUS_HEALTHY         0x8000
 #define BNXT_FW_STATUS_SHUTDOWN                0x100000
 
+#define BNXT_FW_IS_HEALTHY(sts)                (((sts) & 
BNXT_FW_STATUS_HEALTH_MSK) ==\
+                                        BNXT_FW_STATUS_HEALTHY)
+
+#define BNXT_FW_IS_BOOTING(sts)                (((sts) & 
BNXT_FW_STATUS_HEALTH_MSK) < \
+                                        BNXT_FW_STATUS_HEALTHY)
+
+#define BNXT_FW_IS_ERR(sts)            (((sts) & BNXT_FW_STATUS_HEALTH_MSK) > \
+                                        BNXT_FW_STATUS_HEALTHY)
+
 struct bnxt {
        void __iomem            *bar0;
        void __iomem            *bar1;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c 
b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index 6b7b69ed62db..90a31b4a3020 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -44,21 +44,20 @@ static int bnxt_fw_reporter_diagnose(struct 
devlink_health_reporter *reporter,
                                     struct netlink_ext_ack *extack)
 {
        struct bnxt *bp = devlink_health_reporter_priv(reporter);
-       u32 val, health_status;
+       u32 val;
        int rc;
 
        if (test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))
                return 0;
 
        val = bnxt_fw_health_readl(bp, BNXT_FW_HEALTH_REG);
-       health_status = val & 0xffff;
 
-       if (health_status < BNXT_FW_STATUS_HEALTHY) {
+       if (BNXT_FW_IS_BOOTING(val)) {
                rc = devlink_fmsg_string_pair_put(fmsg, "Description",
                                                  "Not yet completed 
initialization");
                if (rc)
                        return rc;
-       } else if (health_status > BNXT_FW_STATUS_HEALTHY) {
+       } else if (BNXT_FW_IS_ERR(val)) {
                rc = devlink_fmsg_string_pair_put(fmsg, "Description",
                                                  "Encountered fatal error and 
cannot recover");
                if (rc)
-- 
2.18.1