mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

eth: fbnic: Revert "eth: fbnic: Add hardware monitoring support via HWMON interface"

Browse source 
There is a garbage value problem in fbnic_mac_get_sensor_asic(). 'fw_cmpl'
is uninitialized which makes 'sensor' and '*val' to be stored garbage
value. Revert commit d85ebade02 ("eth: fbnic: Add hardware monitoring
support via HWMON interface") to avoid this problem.

Fixes: d85ebade02 ("eth: fbnic: Add hardware monitoring support via HWMON interface")
Signed-off-by: Su Hui <suhui@nfschina.com>
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Suggested-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Link: https://patch.msgid.link/20250106023647.47756-1-suhui@nfschina.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Su Hui 2025-01-06 10:36:48 +08:00 committed by Jakub Kicinski
parent fd48f071a3
commit 95978931d5
7 changed files with 0 additions and 126 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/ethernet/meta/fbnic/Makefile
View file

@ -13,7 +13,6 @@ fbnic-y := fbnic_csr.o \
fbnic_ethtool.o \ fbnic_ethtool.o \
fbnic_fw.o \ fbnic_fw.o \
fbnic_hw_stats.o \ fbnic_hw_stats.o \
fbnic_hwmon.o \
fbnic_irq.o \ fbnic_irq.o \
fbnic_mac.o \ fbnic_mac.o \
fbnic_netdev.o \ fbnic_netdev.o \

5
drivers/net/ethernet/meta/fbnic/fbnic.h
View file

@ -20,7 +20,6 @@ struct fbnic_dev {
struct device *dev; struct device *dev;
struct net_device *netdev; struct net_device *netdev;
struct dentry *dbg_fbd; struct dentry *dbg_fbd;
struct device *hwmon;
u32 __iomem *uc_addr0; u32 __iomem *uc_addr0;
u32 __iomem *uc_addr4; u32 __iomem *uc_addr4;
@ -33,7 +32,6 @@ struct fbnic_dev {
struct fbnic_fw_mbx mbx[FBNIC_IPC_MBX_INDICES]; struct fbnic_fw_mbx mbx[FBNIC_IPC_MBX_INDICES];
struct fbnic_fw_cap fw_cap; struct fbnic_fw_cap fw_cap;
struct fbnic_fw_completion *cmpl_data;
/* Lock protecting Tx Mailbox queue to prevent possible races */ /* Lock protecting Tx Mailbox queue to prevent possible races */
spinlock_t fw_tx_lock; spinlock_t fw_tx_lock;
@ -142,9 +140,6 @@ void fbnic_devlink_unregister(struct fbnic_dev *fbd);
int fbnic_fw_enable_mbx(struct fbnic_dev *fbd); int fbnic_fw_enable_mbx(struct fbnic_dev *fbd);
void fbnic_fw_disable_mbx(struct fbnic_dev *fbd); void fbnic_fw_disable_mbx(struct fbnic_dev *fbd);
void fbnic_hwmon_register(struct fbnic_dev *fbd);
void fbnic_hwmon_unregister(struct fbnic_dev *fbd);
int fbnic_pcs_irq_enable(struct fbnic_dev *fbd); int fbnic_pcs_irq_enable(struct fbnic_dev *fbd);
void fbnic_pcs_irq_disable(struct fbnic_dev *fbd); void fbnic_pcs_irq_disable(struct fbnic_dev *fbd);

7
drivers/net/ethernet/meta/fbnic/fbnic_fw.h
View file

@ -44,13 +44,6 @@ struct fbnic_fw_cap {
u8 link_fec; u8 link_fec;
}; };
struct fbnic_fw_completion {
struct {
s32 millivolts;
s32 millidegrees;
} tsene;
};
void fbnic_mbx_init(struct fbnic_dev *fbd); void fbnic_mbx_init(struct fbnic_dev *fbd);
void fbnic_mbx_clean(struct fbnic_dev *fbd); void fbnic_mbx_clean(struct fbnic_dev *fbd);
void fbnic_mbx_poll(struct fbnic_dev *fbd); void fbnic_mbx_poll(struct fbnic_dev *fbd);

81
drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c
View file

@ -1,81 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright (c) Meta Platforms, Inc. and affiliates. */
#include <linux/hwmon.h>
#include "fbnic.h"
#include "fbnic_mac.h"
static int fbnic_hwmon_sensor_id(enum hwmon_sensor_types type)
{
if (type == hwmon_temp)
return FBNIC_SENSOR_TEMP;
if (type == hwmon_in)
return FBNIC_SENSOR_VOLTAGE;
return -EOPNOTSUPP;
}
static umode_t fbnic_hwmon_is_visible(const void *drvdata,
enum hwmon_sensor_types type,
u32 attr, int channel)
{
if (type == hwmon_temp && attr == hwmon_temp_input)
return 0444;
if (type == hwmon_in && attr == hwmon_in_input)
return 0444;
return 0;
}
static int fbnic_hwmon_read(struct device *dev, enum hwmon_sensor_types type,
u32 attr, int channel, long *val)
{
struct fbnic_dev *fbd = dev_get_drvdata(dev);
const struct fbnic_mac *mac = fbd->mac;
int id;
id = fbnic_hwmon_sensor_id(type);
return id < 0 ? id : mac->get_sensor(fbd, id, val);
}
static const struct hwmon_ops fbnic_hwmon_ops = {
.is_visible = fbnic_hwmon_is_visible,
.read = fbnic_hwmon_read,
};
static const struct hwmon_channel_info *fbnic_hwmon_info[] = {
HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT),
HWMON_CHANNEL_INFO(in, HWMON_I_INPUT),
NULL
};
static const struct hwmon_chip_info fbnic_chip_info = {
.ops = &fbnic_hwmon_ops,
.info = fbnic_hwmon_info,
};
void fbnic_hwmon_register(struct fbnic_dev *fbd)
{
if (!IS_REACHABLE(CONFIG_HWMON))
return;
fbd->hwmon = hwmon_device_register_with_info(fbd->dev, "fbnic",
fbd, &fbnic_chip_info,
NULL);
if (IS_ERR(fbd->hwmon)) {
dev_notice(fbd->dev,
"Failed to register hwmon device %pe\n",
fbd->hwmon);
fbd->hwmon = NULL;
}
}
void fbnic_hwmon_unregister(struct fbnic_dev *fbd)
{
if (!IS_REACHABLE(CONFIG_HWMON) || !fbd->hwmon)
return;
hwmon_device_unregister(fbd->hwmon);
fbd->hwmon = NULL;
}

22
drivers/net/ethernet/meta/fbnic/fbnic_mac.c
View file

@ -686,27 +686,6 @@ fbnic_mac_get_eth_mac_stats(struct fbnic_dev *fbd, bool reset,
MAC_STAT_TX_BROADCAST); MAC_STAT_TX_BROADCAST);
} }
static int fbnic_mac_get_sensor_asic(struct fbnic_dev *fbd, int id, long *val)
{
struct fbnic_fw_completion fw_cmpl;
s32 *sensor;
switch (id) {
case FBNIC_SENSOR_TEMP:
sensor = &fw_cmpl.tsene.millidegrees;
break;
case FBNIC_SENSOR_VOLTAGE:
sensor = &fw_cmpl.tsene.millivolts;
break;
default:
return -EINVAL;
}
*val = *sensor;
return 0;
}
static const struct fbnic_mac fbnic_mac_asic = { static const struct fbnic_mac fbnic_mac_asic = {
.init_regs = fbnic_mac_init_regs, .init_regs = fbnic_mac_init_regs,
.pcs_enable = fbnic_pcs_enable_asic, .pcs_enable = fbnic_pcs_enable_asic,
@ -716,7 +695,6 @@ static const struct fbnic_mac fbnic_mac_asic = {
.get_eth_mac_stats = fbnic_mac_get_eth_mac_stats, .get_eth_mac_stats = fbnic_mac_get_eth_mac_stats,
.link_down = fbnic_mac_link_down_asic, .link_down = fbnic_mac_link_down_asic,
.link_up = fbnic_mac_link_up_asic, .link_up = fbnic_mac_link_up_asic,
.get_sensor = fbnic_mac_get_sensor_asic,
}; };
/** /**

7
drivers/net/ethernet/meta/fbnic/fbnic_mac.h
View file

@ -47,11 +47,6 @@ enum {
#define FBNIC_LINK_MODE_PAM4 (FBNIC_LINK_50R1) #define FBNIC_LINK_MODE_PAM4 (FBNIC_LINK_50R1)
#define FBNIC_LINK_MODE_MASK (FBNIC_LINK_AUTO - 1) #define FBNIC_LINK_MODE_MASK (FBNIC_LINK_AUTO - 1)
enum fbnic_sensor_id {
FBNIC_SENSOR_TEMP, /* Temp in millidegrees Centigrade */
FBNIC_SENSOR_VOLTAGE, /* Voltage in millivolts */
};
/* This structure defines the interface hooks for the MAC. The MAC hooks /* This structure defines the interface hooks for the MAC. The MAC hooks
* will be configured as a const struct provided with a set of function * will be configured as a const struct provided with a set of function
* pointers. * pointers.
@ -88,8 +83,6 @@ struct fbnic_mac {
void (*link_down)(struct fbnic_dev *fbd); void (*link_down)(struct fbnic_dev *fbd);
void (*link_up)(struct fbnic_dev *fbd, bool tx_pause, bool rx_pause); void (*link_up)(struct fbnic_dev *fbd, bool tx_pause, bool rx_pause);
int (*get_sensor)(struct fbnic_dev *fbd, int id, long *val);
}; };
int fbnic_mac_init(struct fbnic_dev *fbd); int fbnic_mac_init(struct fbnic_dev *fbd);

3
drivers/net/ethernet/meta/fbnic/fbnic_pci.c
View file

@ -296,8 +296,6 @@ static int fbnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* Capture snapshot of hardware stats so netdev can calculate delta */ /* Capture snapshot of hardware stats so netdev can calculate delta */
fbnic_reset_hw_stats(fbd); fbnic_reset_hw_stats(fbd);
fbnic_hwmon_register(fbd);
if (!fbd->dsn) { if (!fbd->dsn) {
dev_warn(&pdev->dev, "Reading serial number failed\n"); dev_warn(&pdev->dev, "Reading serial number failed\n");
goto init_failure_mode; goto init_failure_mode;
@ -360,7 +358,6 @@ static void fbnic_remove(struct pci_dev *pdev)
fbnic_netdev_free(fbd); fbnic_netdev_free(fbd);
} }
fbnic_hwmon_unregister(fbd);
fbnic_dbg_fbd_exit(fbd); fbnic_dbg_fbd_exit(fbd);
fbnic_devlink_unregister(fbd); fbnic_devlink_unregister(fbd);
fbnic_fw_disable_mbx(fbd); fbnic_fw_disable_mbx(fbd);