Commit 6ad71984 authored by Kalesh AP's avatar Kalesh AP Committed by David S. Miller

bnxt_en: Enhance hwmon temperature reporting

Driver currently does hwmon device register and unregister
in open and close() respectively. As a result, user will not
be able to query hwmon temperature when interface is in
ifdown state.

Enhance it by moving the hwmon register/unregister to the
probe/remove functions.
Reviewed-by: default avatarSomnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 754fbf60
...@@ -10280,7 +10280,7 @@ static struct attribute *bnxt_attrs[] = { ...@@ -10280,7 +10280,7 @@ static struct attribute *bnxt_attrs[] = {
}; };
ATTRIBUTE_GROUPS(bnxt); ATTRIBUTE_GROUPS(bnxt);
static void bnxt_hwmon_close(struct bnxt *bp) static void bnxt_hwmon_uninit(struct bnxt *bp)
{ {
if (bp->hwmon_dev) { if (bp->hwmon_dev) {
hwmon_device_unregister(bp->hwmon_dev); hwmon_device_unregister(bp->hwmon_dev);
...@@ -10288,7 +10288,7 @@ static void bnxt_hwmon_close(struct bnxt *bp) ...@@ -10288,7 +10288,7 @@ static void bnxt_hwmon_close(struct bnxt *bp)
} }
} }
static void bnxt_hwmon_open(struct bnxt *bp) static void bnxt_hwmon_init(struct bnxt *bp)
{ {
struct hwrm_temp_monitor_query_input *req; struct hwrm_temp_monitor_query_input *req;
struct pci_dev *pdev = bp->pdev; struct pci_dev *pdev = bp->pdev;
...@@ -10298,7 +10298,7 @@ static void bnxt_hwmon_open(struct bnxt *bp) ...@@ -10298,7 +10298,7 @@ static void bnxt_hwmon_open(struct bnxt *bp)
if (!rc) if (!rc)
rc = hwrm_req_send_silent(bp, req); rc = hwrm_req_send_silent(bp, req);
if (rc == -EACCES || rc == -EOPNOTSUPP) { if (rc == -EACCES || rc == -EOPNOTSUPP) {
bnxt_hwmon_close(bp); bnxt_hwmon_uninit(bp);
return; return;
} }
...@@ -10314,11 +10314,11 @@ static void bnxt_hwmon_open(struct bnxt *bp) ...@@ -10314,11 +10314,11 @@ static void bnxt_hwmon_open(struct bnxt *bp)
} }
} }
#else #else
static void bnxt_hwmon_close(struct bnxt *bp) static void bnxt_hwmon_uninit(struct bnxt *bp)
{ {
} }
static void bnxt_hwmon_open(struct bnxt *bp) static void bnxt_hwmon_init(struct bnxt *bp)
{ {
} }
#endif #endif
...@@ -10651,7 +10651,6 @@ static int bnxt_open(struct net_device *dev) ...@@ -10651,7 +10651,6 @@ static int bnxt_open(struct net_device *dev)
bnxt_reenable_sriov(bp); bnxt_reenable_sriov(bp);
} }
} }
bnxt_hwmon_open(bp);
} }
return rc; return rc;
...@@ -10736,7 +10735,6 @@ static int bnxt_close(struct net_device *dev) ...@@ -10736,7 +10735,6 @@ static int bnxt_close(struct net_device *dev)
{ {
struct bnxt *bp = netdev_priv(dev); struct bnxt *bp = netdev_priv(dev);
bnxt_hwmon_close(bp);
bnxt_close_nic(bp, true, true); bnxt_close_nic(bp, true, true);
bnxt_hwrm_shutdown_link(bp); bnxt_hwrm_shutdown_link(bp);
bnxt_hwrm_if_change(bp, false); bnxt_hwrm_if_change(bp, false);
...@@ -12300,6 +12298,7 @@ static int bnxt_fw_init_one_p2(struct bnxt *bp) ...@@ -12300,6 +12298,7 @@ static int bnxt_fw_init_one_p2(struct bnxt *bp)
if (bp->fw_cap & BNXT_FW_CAP_PTP) if (bp->fw_cap & BNXT_FW_CAP_PTP)
__bnxt_hwrm_ptp_qcfg(bp); __bnxt_hwrm_ptp_qcfg(bp);
bnxt_dcb_init(bp); bnxt_dcb_init(bp);
bnxt_hwmon_init(bp);
return 0; return 0;
} }
...@@ -13205,6 +13204,7 @@ static void bnxt_remove_one(struct pci_dev *pdev) ...@@ -13205,6 +13204,7 @@ static void bnxt_remove_one(struct pci_dev *pdev)
bnxt_clear_int_mode(bp); bnxt_clear_int_mode(bp);
bnxt_hwrm_func_drv_unrgtr(bp); bnxt_hwrm_func_drv_unrgtr(bp);
bnxt_free_hwrm_resources(bp); bnxt_free_hwrm_resources(bp);
bnxt_hwmon_uninit(bp);
bnxt_ethtool_free(bp); bnxt_ethtool_free(bp);
bnxt_dcb_free(bp); bnxt_dcb_free(bp);
kfree(bp->ptp_cfg); kfree(bp->ptp_cfg);
...@@ -13801,6 +13801,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -13801,6 +13801,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
init_err_pci_clean: init_err_pci_clean:
bnxt_hwrm_func_drv_unrgtr(bp); bnxt_hwrm_func_drv_unrgtr(bp);
bnxt_free_hwrm_resources(bp); bnxt_free_hwrm_resources(bp);
bnxt_hwmon_uninit(bp);
bnxt_ethtool_free(bp); bnxt_ethtool_free(bp);
bnxt_ptp_clear(bp); bnxt_ptp_clear(bp);
kfree(bp->ptp_cfg); kfree(bp->ptp_cfg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment