eth: fbnic: Prepend TSENE FW fields with FBNIC_FW

[ Upstream commit 56bcc6ecff8fdc06258c637226986ed522027ca5 ]

All other firmware fields are prepended with FBNIC_FW. Update TSENE fields
to follow the same format.

Signed-off-by: Lee Trager <lee@trager.us>
Link: https://patch.msgid.link/20250228191935.3953712-2-lee@trager.us
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c
index 9351a874689f83486b4a77b5255d2a9a7ffe6300..cdd6c3a2109446dc9efceffd6355fae5b10e568a 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c
@@ -747,9 +747,9 @@ free_message:
 }
 
 static const struct fbnic_tlv_index fbnic_tsene_read_resp_index[] = {
-       FBNIC_TLV_ATTR_S32(FBNIC_TSENE_THERM),
-       FBNIC_TLV_ATTR_S32(FBNIC_TSENE_VOLT),
-       FBNIC_TLV_ATTR_S32(FBNIC_TSENE_ERROR),
+       FBNIC_TLV_ATTR_S32(FBNIC_FW_TSENE_THERM),
+       FBNIC_TLV_ATTR_S32(FBNIC_FW_TSENE_VOLT),
+       FBNIC_TLV_ATTR_S32(FBNIC_FW_TSENE_ERROR),
        FBNIC_TLV_ATTR_LAST
 };
 
@@ -766,21 +766,21 @@ static int fbnic_fw_parse_tsene_read_resp(void *opaque,
        if (!cmpl_data)
                return -EINVAL;
 
-       if (results[FBNIC_TSENE_ERROR]) {
-               err = fbnic_tlv_attr_get_unsigned(results[FBNIC_TSENE_ERROR]);
+       if (results[FBNIC_FW_TSENE_ERROR]) {
+               err = fbnic_tlv_attr_get_unsigned(results[FBNIC_FW_TSENE_ERROR]);
                if (err)
                        goto exit_complete;
        }
 
-       if (!results[FBNIC_TSENE_THERM] || !results[FBNIC_TSENE_VOLT]) {
+       if (!results[FBNIC_FW_TSENE_THERM] || !results[FBNIC_FW_TSENE_VOLT]) {
                err = -EINVAL;
                goto exit_complete;
        }
 
        cmpl_data->u.tsene.millidegrees =
-               fbnic_tlv_attr_get_signed(results[FBNIC_TSENE_THERM]);
+               fbnic_tlv_attr_get_signed(results[FBNIC_FW_TSENE_THERM]);
        cmpl_data->u.tsene.millivolts =
-               fbnic_tlv_attr_get_signed(results[FBNIC_TSENE_VOLT]);
+               fbnic_tlv_attr_get_signed(results[FBNIC_FW_TSENE_VOLT]);
 
 exit_complete:
        cmpl_data->result = err;

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_fw.h b/drivers/net/ethernet/meta/fbnic/fbnic_fw.h
index fe68333d51b18f5aee471252834f4d5142ab8a29..a3618e7826c25a34cd75df4019934fee68bf0856 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_fw.h
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_fw.h
@@ -139,10 +139,10 @@ enum {
 };
 
 enum {
-       FBNIC_TSENE_THERM                       = 0x0,
-       FBNIC_TSENE_VOLT                        = 0x1,
-       FBNIC_TSENE_ERROR                       = 0x2,
-       FBNIC_TSENE_MSG_MAX
+       FBNIC_FW_TSENE_THERM                    = 0x0,
+       FBNIC_FW_TSENE_VOLT                     = 0x1,
+       FBNIC_FW_TSENE_ERROR                    = 0x2,
+       FBNIC_FW_TSENE_MSG_MAX
 };
 
 enum {