mirror of
https://github.com/torvalds/linux.git
synced 2026-09-22 20:54:03 +02:00
scsi: mpt3sas: Add hwmon support
Expose the IOC and board temperature sensors of LSI / Broadcom SAS HBAs through hwmon. Readings come from MPI IO Unit Page 7 via the accessor added in the preceding patch. The same fields are exposed by Broadcom's userspace tooling through the /dev/mpt[23]ctl ioctl path (typically root-only): IOCTemperature and BoardTemperature in lsiutil; ROC and Controller in storcli. With this driver, sensors(1) shows them unprivileged: $ sensors mpt3sas-pci-0200 mpt3sas-pci-0200 Adapter: PCI adapter IOC: +42.0°C Each channel is gated independently by its *TemperatureUnits field through is_visible(); cards that populate only one sensor expose only one input file, and cards that populate neither do not register an hwmon device. The hwmon code is gated directly on CONFIG_HWMON. IS_REACHABLE() is used rather than IS_ENABLED() so that SCSI_MPT3SAS=y with HWMON=m still builds; in that configuration, the sensors are not exposed (same pattern as i915 and xe). Assisted-by: Claude:claude-opus-4-7 Signed-off-by: Louis Sautier <sautier.louis@gmail.com> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Link: https://patch.msgid.link/20260630224922.2543096-3-sautier.louis@gmail.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
2601899705
commit
8cbaf7b1ab
|
|
@ -9,3 +9,5 @@ mpt3sas-y += mpt3sas_base.o \
|
|||
mpt3sas_trigger_diag.o \
|
||||
mpt3sas_warpdrive.o \
|
||||
mpt3sas_debugfs.o \
|
||||
|
||||
mpt3sas-$(CONFIG_HWMON) += mpt3sas_hwmon.o
|
||||
|
|
|
|||
|
|
@ -1629,6 +1629,9 @@ struct MPT3SAS_ADAPTER {
|
|||
u8 is_aero_ioc;
|
||||
struct dentry *debugfs_root;
|
||||
struct dentry *ioc_dump;
|
||||
#if IS_REACHABLE(CONFIG_HWMON)
|
||||
struct mpt3sas_hwmon *hwmon;
|
||||
#endif
|
||||
PUT_SMID_IO_FP_HIP put_smid_scsi_io;
|
||||
PUT_SMID_IO_FP_HIP put_smid_fast_path;
|
||||
PUT_SMID_IO_FP_HIP put_smid_hi_priority;
|
||||
|
|
@ -2050,6 +2053,20 @@ void mpt3sas_destroy_debugfs(struct MPT3SAS_ADAPTER *ioc);
|
|||
void mpt3sas_init_debugfs(void);
|
||||
void mpt3sas_exit_debugfs(void);
|
||||
|
||||
#if IS_REACHABLE(CONFIG_HWMON)
|
||||
int mpt3sas_hwmon_register(struct MPT3SAS_ADAPTER *ioc);
|
||||
void mpt3sas_hwmon_unregister(struct MPT3SAS_ADAPTER *ioc);
|
||||
#else
|
||||
static inline int mpt3sas_hwmon_register(struct MPT3SAS_ADAPTER *ioc)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void mpt3sas_hwmon_unregister(struct MPT3SAS_ADAPTER *ioc)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* _scsih_is_pcie_scsi_device - determines if device is an pcie scsi device
|
||||
* @device_info: bitfield providing information about the device.
|
||||
|
|
|
|||
191
drivers/scsi/mpt3sas/mpt3sas_hwmon.c
Normal file
191
drivers/scsi/mpt3sas/mpt3sas_hwmon.c
Normal file
|
|
@ -0,0 +1,191 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
/*
|
||||
* Hardware monitoring (hwmon) support for the LSI / Broadcom mpt3sas
|
||||
* SAS HBA driver. Exposes the IOC and board temperature sensors by
|
||||
* reading MPI IO Unit Page 7.
|
||||
*/
|
||||
|
||||
#include <linux/err.h>
|
||||
#include <linux/hwmon.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#include "mpt3sas_base.h"
|
||||
|
||||
struct mpt3sas_hwmon {
|
||||
struct MPT3SAS_ADAPTER *ioc;
|
||||
struct device *hwmon_dev;
|
||||
bool ioc_present;
|
||||
bool board_present;
|
||||
};
|
||||
|
||||
/*
|
||||
* Convert a (raw, units) reading to millidegrees Celsius.
|
||||
* Returns -ENODATA when the sensor reports "not present" or
|
||||
* unknown units. Temperature values are interpreted as signed
|
||||
* two's-complement integers.
|
||||
*
|
||||
* The MPI2_IOUNITPAGE7_IOC_TEMP_* and MPI2_IOUNITPAGE7_BOARD_TEMP_*
|
||||
* defines in mpi2_cnfg.h share the same values; the IOC ones are
|
||||
* used for both channels.
|
||||
*/
|
||||
static int _hwmon_to_mdegc(s16 raw, u8 units, long *out)
|
||||
{
|
||||
switch (units) {
|
||||
case MPI2_IOUNITPAGE7_IOC_TEMP_CELSIUS:
|
||||
*out = (long)raw * 1000;
|
||||
return 0;
|
||||
case MPI2_IOUNITPAGE7_IOC_TEMP_FAHRENHEIT:
|
||||
/* (F - 32) * 5 / 9, expressed in milli-units */
|
||||
*out = ((long)raw - 32) * 5000 / 9;
|
||||
return 0;
|
||||
default:
|
||||
return -ENODATA;
|
||||
}
|
||||
}
|
||||
|
||||
static umode_t _hwmon_is_visible(const void *drvdata,
|
||||
enum hwmon_sensor_types type,
|
||||
u32 attr, int channel)
|
||||
{
|
||||
const struct mpt3sas_hwmon *h = drvdata;
|
||||
|
||||
if (type != hwmon_temp)
|
||||
return 0;
|
||||
if (attr != hwmon_temp_input && attr != hwmon_temp_label)
|
||||
return 0;
|
||||
if (channel == 0 && h->ioc_present)
|
||||
return 0444;
|
||||
if (channel == 1 && h->board_present)
|
||||
return 0444;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _hwmon_read(struct device *dev, enum hwmon_sensor_types type,
|
||||
u32 attr, int channel, long *val)
|
||||
{
|
||||
struct mpt3sas_hwmon *h = dev_get_drvdata(dev);
|
||||
Mpi2ConfigReply_t mpi_reply;
|
||||
Mpi2IOUnitPage7_t page;
|
||||
int r;
|
||||
|
||||
if (type != hwmon_temp || attr != hwmon_temp_input)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
r = mpt3sas_config_get_iounit_pg7(h->ioc, &mpi_reply, &page);
|
||||
if (r)
|
||||
return r;
|
||||
|
||||
if (channel == 0)
|
||||
return _hwmon_to_mdegc((s16)le16_to_cpu(page.IOCTemperature),
|
||||
page.IOCTemperatureUnits, val);
|
||||
if (channel == 1)
|
||||
return _hwmon_to_mdegc((s16)le16_to_cpu(page.BoardTemperature),
|
||||
page.BoardTemperatureUnits, val);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static const char * const mpt3sas_hwmon_temp_labels[] = {
|
||||
"IOC",
|
||||
"Board",
|
||||
};
|
||||
|
||||
static int _hwmon_read_string(struct device *dev,
|
||||
enum hwmon_sensor_types type,
|
||||
u32 attr, int channel, const char **str)
|
||||
{
|
||||
if (type != hwmon_temp || attr != hwmon_temp_label)
|
||||
return -EOPNOTSUPP;
|
||||
*str = mpt3sas_hwmon_temp_labels[channel];
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct hwmon_channel_info * const mpt3sas_hwmon_info[] = {
|
||||
HWMON_CHANNEL_INFO(temp,
|
||||
HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
HWMON_T_INPUT | HWMON_T_LABEL),
|
||||
NULL,
|
||||
};
|
||||
|
||||
static const struct hwmon_ops mpt3sas_hwmon_ops = {
|
||||
.is_visible = _hwmon_is_visible,
|
||||
.read = _hwmon_read,
|
||||
.read_string = _hwmon_read_string,
|
||||
};
|
||||
|
||||
static const struct hwmon_chip_info mpt3sas_hwmon_chip_info = {
|
||||
.ops = &mpt3sas_hwmon_ops,
|
||||
.info = mpt3sas_hwmon_info,
|
||||
};
|
||||
|
||||
/**
|
||||
* mpt3sas_hwmon_register - register an hwmon device for the IOC
|
||||
* @ioc: per adapter object
|
||||
* Context: sleep.
|
||||
*
|
||||
* Succeeds without registering when no temperature sensors are present,
|
||||
* so cards without thermal monitoring do not expose an empty hwmon node.
|
||||
* Paired with mpt3sas_hwmon_unregister() from the driver's remove path.
|
||||
*
|
||||
* Return: 0 for success, non-zero for failure.
|
||||
*/
|
||||
int mpt3sas_hwmon_register(struct MPT3SAS_ADAPTER *ioc)
|
||||
{
|
||||
struct device *parent = &ioc->pdev->dev;
|
||||
struct mpt3sas_hwmon *h;
|
||||
struct device *hwdev;
|
||||
Mpi2ConfigReply_t mpi_reply;
|
||||
Mpi2IOUnitPage7_t page;
|
||||
int r;
|
||||
|
||||
r = mpt3sas_config_get_iounit_pg7(ioc, &mpi_reply, &page);
|
||||
if (r)
|
||||
return r;
|
||||
|
||||
/*
|
||||
* A page where both *TemperatureUnits are NOT_PRESENT covers
|
||||
* two cases: cards that genuinely lack sensors, and firmware
|
||||
* errors that left the page zero-filled (the accessor mirrors
|
||||
* _config_request() behaviour). Either way: skip registration.
|
||||
*/
|
||||
if (page.IOCTemperatureUnits == MPI2_IOUNITPAGE7_IOC_TEMP_NOT_PRESENT &&
|
||||
page.BoardTemperatureUnits == MPI2_IOUNITPAGE7_BOARD_TEMP_NOT_PRESENT)
|
||||
return 0;
|
||||
|
||||
h = kzalloc_obj(*h);
|
||||
if (!h)
|
||||
return -ENOMEM;
|
||||
|
||||
h->ioc = ioc;
|
||||
h->ioc_present = page.IOCTemperatureUnits != MPI2_IOUNITPAGE7_IOC_TEMP_NOT_PRESENT;
|
||||
h->board_present = page.BoardTemperatureUnits != MPI2_IOUNITPAGE7_BOARD_TEMP_NOT_PRESENT;
|
||||
|
||||
hwdev = hwmon_device_register_with_info(parent, "mpt3sas", h,
|
||||
&mpt3sas_hwmon_chip_info,
|
||||
NULL);
|
||||
if (IS_ERR(hwdev)) {
|
||||
kfree(h);
|
||||
return PTR_ERR(hwdev);
|
||||
}
|
||||
|
||||
h->hwmon_dev = hwdev;
|
||||
ioc->hwmon = h;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* mpt3sas_hwmon_unregister - tear down the hwmon device, if any
|
||||
* @ioc: per adapter object
|
||||
*
|
||||
* Safe to call when registration was skipped (no sensors) or
|
||||
* failed; in those cases ioc->hwmon is NULL and this is a no-op.
|
||||
*/
|
||||
void mpt3sas_hwmon_unregister(struct MPT3SAS_ADAPTER *ioc)
|
||||
{
|
||||
struct mpt3sas_hwmon *h = ioc->hwmon;
|
||||
|
||||
if (!h)
|
||||
return;
|
||||
hwmon_device_unregister(h->hwmon_dev);
|
||||
kfree(h);
|
||||
ioc->hwmon = NULL;
|
||||
}
|
||||
|
|
@ -12562,6 +12562,7 @@ static void scsih_remove(struct pci_dev *pdev)
|
|||
/* release all the volumes */
|
||||
_scsih_ir_shutdown(ioc);
|
||||
mpt3sas_destroy_debugfs(ioc);
|
||||
mpt3sas_hwmon_unregister(ioc);
|
||||
sas_remove_host(shost);
|
||||
list_for_each_entry_safe(raid_device, next, &ioc->raid_device_list,
|
||||
list) {
|
||||
|
|
@ -13651,6 +13652,11 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
}
|
||||
|
||||
scsi_scan_host(shost);
|
||||
|
||||
if (mpt3sas_hwmon_register(ioc))
|
||||
ioc_warn(ioc,
|
||||
"hwmon registration failed; temperatures not exposed\n");
|
||||
|
||||
mpt3sas_setup_debugfs(ioc);
|
||||
return 0;
|
||||
out_add_shost_fail:
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user