From nobody Mon May 25 04:34:30 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1743382F13 for ; Mon, 18 May 2026 18:41:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779129687; cv=none; b=V0JPeBJTuGfUKpuBdQ21GJfUqzSQGBjvHMp1Y/OmxT8K+1WS0QcU0e5YB7tXuoGkrMxF4O2AbT1mHgOwxeP0or/G4M+kxLIgkhY99bDNEcKkwW6qBxqo7ThVrg6mw2GKFH3DKaDYu/X0tIRGb29lKbYNRH3tXZOKHL6AV8gL5E0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779129687; c=relaxed/simple; bh=Bt3my+6l00h9cgScvXgngonjEUgxY/cU8mMorKuK7Cg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XgGfvT5K4lPQ/XdknTB/vUmsf9tLhAgc6ThdtI/zLs8/O3vF5NdIVNaIGxP/ltD5G9GrRuynRP59LCSLG0o7reQl8wxIBgI/ByYYSxbOqfuIA+AAI6itBHHU/1Is4jOksdunkWWL5Hs288Z9bEF1cm5JILLIjLPaJh0BGF9Nzwg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=m3ahKnax; arc=none smtp.client-ip=209.85.221.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="m3ahKnax" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-43d76dd4ee8so73550f8f.2 for ; Mon, 18 May 2026 11:41:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779129684; x=1779734484; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f8+wQM4a4tsMzXZ7biCKDr40TVU55tRrbtX6KIaXn24=; b=m3ahKnaxaW1Ou8SvREKiHiQ4UNGReS5iZBkWTeovQ66QE9Poyyx3zYwc2C4XrG7k86 U8/i6uOdicL96UWoDgGr+ReQxxvRMPYW+5KkclmSqWsaS1IeoOYbeBJXW8kfo6LeG1WM hhzI3pnGs8L67zdyxveQDp4Vj+WogXAhWAO00tOyRm7q9y9LTov1DRHOwtPUNwwb4Gwe BEkPKygmL4S2WzB9XMbb50NvKEJ1Ygvy9tWru6xL65w44vI9QpJOsxL/nMdFArzHrH32 OFYyacVT8WYzQ5v5bjvb1km+1+1NWBNDXpE4bLIjbUmkCOTkZxmE4EqPBkbYJTaAkTsE mjug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779129684; x=1779734484; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=f8+wQM4a4tsMzXZ7biCKDr40TVU55tRrbtX6KIaXn24=; b=C8GWcByiCfdZ6H3d4lEma20fXqkfyJMpAKhiPQJ0Jjnu3/THLiQNRctvdi0tNXF295 AJFuZh7zL/5xt+fLFNV733hfqdh7WwtkhEJbro88O0qB1TsAnMGOGKdGzrfBvPt+zKUe DMs0P8GdXybUbfBDTqT1JJ0P9YrRxUwrvCeu+njHg/JgO5i8Am1/0AtbgiFhPkSh+B9I OrwPgGFAQffq0jS0hClJDhVro/hEs7oTjeNNcYOhp8vrdO0FvJZN56cA3EHIzIENnM1g 5TP8003/a2btsg7lB2vCLrTOLglO8DWdZbI75Rt4AtOPpruQEybUZ05lMSyzGNAc9mAk 4ySw== X-Forwarded-Encrypted: i=1; AFNElJ+2vDveRKyyPEOO45HINkZhsRjFpWaATQDSQ00DAREBjS2kzuiTgRfdpR8R7z7W0Z1Az/75btYMu9Ju19c=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2EjXulUcShlJJtGBHZ8E36czJAr6eX2n5te20/59fSqg3q3zR ZKbPTsfYjAyvaJQ3Pa7JNReSYHEBs4nMl86SdtIbNAW76Ftg7y1J8tGq X-Gm-Gg: Acq92OGd/c9m6uqGXJJYcZcWECLzR4DC3JoKLje8hBRQUMXy4PsQB+7Jn2TR/7EpR3o gY9DxJADy21y1IdSVR/h6i9I5x5np75dbXDFxNdMufq4EnilV1rD14qR2bbEwD1jRKAwjQPXDxd e2fHypRTkpAvGy09N0TeibwrzxlbJMe5edb8FNqTxOcCUHmxW0fJDvdMHxp5eVc6vnP943WsFC1 uOQy+v/RVls/HTqyE2A+J6hDxMPQ1NwKihY03DBY30rkbPFswQ7glbWRwZ85Ewrl8z1nB7m0HoM CyqXT/uro/Xo96dEZ58UQj55qO7TizQnGnrVwN7wu7xiCokUD7ZvKZblah73hZznp/DNZgwmFML HBBhf3QE3iiaatIFYJlcbwb/uaKXJWhtPFuRqtt8SRGkjzzINlAIEFl4cFhNsC1IeLgxHJmGOhz 22b83jAVw= X-Received: by 2002:adf:f784:0:b0:45e:7997:8b82 with SMTP id ffacd0b85a97d-45e79978bfbmr9017983f8f.16.1779129684055; Mon, 18 May 2026 11:41:24 -0700 (PDT) Received: from localhost ([2603:c027:c000:3cde::f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9e768c4fsm39305594f8f.8.2026.05.18.11.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2026 11:41:23 -0700 (PDT) From: Louis Sautier To: Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani , Ranjan Kumar , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Guenter Roeck , MPT-FusionLinux.pdl@broadcom.com, linux-scsi@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] scsi: mpt3sas: add IO Unit Page 7 config accessor Date: Mon, 18 May 2026 20:41:08 +0200 Message-ID: <20260518184109.770185-2-sautier.louis@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260518184109.770185-1-sautier.louis@gmail.com> References: <20260518184109.770185-1-sautier.louis@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add mpt3sas_config_get_iounit_pg7(), mirroring the existing iounit page accessors. Used by the hwmon driver added in the following patch to read the IOC and board temperatures. Assisted-by: Claude:claude-opus-4-7 Signed-off-by: Louis Sautier --- drivers/scsi/mpt3sas/mpt3sas_base.h | 2 ++ drivers/scsi/mpt3sas/mpt3sas_config.c | 36 +++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt= 3sas_base.h index d4597d058705..c655742d0dde 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@ -1904,6 +1904,8 @@ int mpt3sas_config_get_iounit_pg3(struct MPT3SAS_ADAP= TER *ioc, Mpi2ConfigReply_t *mpi_reply, Mpi2IOUnitPage3_t *config_page, u16 sz); int mpt3sas_config_set_iounit_pg1(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigR= eply_t *mpi_reply, Mpi2IOUnitPage1_t *config_page); +int mpt3sas_config_get_iounit_pg7(struct MPT3SAS_ADAPTER *ioc, + Mpi2ConfigReply_t *mpi_reply, Mpi2IOUnitPage7_t *config_page); int mpt3sas_config_get_iounit_pg8(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigR= eply_t *mpi_reply, Mpi2IOUnitPage8_t *config_page); int mpt3sas_config_get_sas_iounit_pg1(struct MPT3SAS_ADAPTER *ioc, diff --git a/drivers/scsi/mpt3sas/mpt3sas_config.c b/drivers/scsi/mpt3sas/m= pt3sas_config.c index 45ac853e1289..ef07825046bc 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_config.c +++ b/drivers/scsi/mpt3sas/mpt3sas_config.c @@ -991,6 +991,42 @@ mpt3sas_config_get_iounit_pg3(struct MPT3SAS_ADAPTER *= ioc, return r; } =20 +/** + * mpt3sas_config_get_iounit_pg7 - obtain iounit page 7 + * @ioc: per adapter object + * @mpi_reply: reply mf payload returned from firmware + * @config_page: contents of the config page + * Context: sleep. + * + * Return: 0 for success, non-zero for failure. + */ +int +mpt3sas_config_get_iounit_pg7(struct MPT3SAS_ADAPTER *ioc, + Mpi2ConfigReply_t *mpi_reply, Mpi2IOUnitPage7_t *config_page) +{ + Mpi2ConfigRequest_t mpi_request; + int r; + + memset(&mpi_request, 0, sizeof(Mpi2ConfigRequest_t)); + mpi_request.Function =3D MPI2_FUNCTION_CONFIG; + mpi_request.Action =3D MPI2_CONFIG_ACTION_PAGE_HEADER; + mpi_request.Header.PageType =3D MPI2_CONFIG_PAGETYPE_IO_UNIT; + mpi_request.Header.PageNumber =3D 7; + mpi_request.Header.PageVersion =3D MPI2_IOUNITPAGE7_PAGEVERSION; + ioc->build_zero_len_sge_mpi(ioc, &mpi_request.PageBufferSGE); + r =3D _config_request(ioc, &mpi_request, mpi_reply, + MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, NULL, 0); + if (r) + goto out; + + mpi_request.Action =3D MPI2_CONFIG_ACTION_PAGE_READ_CURRENT; + r =3D _config_request(ioc, &mpi_request, mpi_reply, + MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, config_page, + sizeof(*config_page)); + out: + return r; +} + /** * mpt3sas_config_get_iounit_pg8 - obtain iounit page 8 * @ioc: per adapter object --=20 2.54.0 From nobody Mon May 25 04:34:30 2026 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87BC43845B7 for ; Mon, 18 May 2026 18:41:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779129688; cv=none; b=luotH4xRIvT4qXMZwggZO8RiwXZy4VLhH5SrR8XwtnCz/Nln1BPv0nd9stVjQDjWzq//Fdt6/z/7iHN07Gu9VwvLH1Bwc8banOA7OkIBpZuaGfIhTxSF9g5wtZJ4gy+UyzOAL+00Nijn54xtu2VlyUJPdsdj+7f/RJinhMO45Pk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779129688; c=relaxed/simple; bh=hG2us0VjneKIFIJFxN4jeg/lE8bpmENA8nnholiUizA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kM2fHgCRO7AvBkxpGggkEsZkCQ4n8zbvmRFPs+PZoltWWfWulztEAEIGG2woWirwaiAUXyMNJHY6/zC6PUFEegAZW7B/LtQFJgYbLOVE85tvcJZFqE3SBZf2ZU/PPAUgFaIplzhgZaUgIJz0Gsfo1kqLOI3+4e3x7fH17dkz4eM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KsmhoVVr; arc=none smtp.client-ip=209.85.221.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KsmhoVVr" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-45ae6a0e523so1353813f8f.1 for ; Mon, 18 May 2026 11:41:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779129685; x=1779734485; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LZg22ZhGJMaOt5Df+ZHhboxIbuSeyw23ZlwI4pfXN4c=; b=KsmhoVVrwFZFNrByqfvXxwHhZZsaNZY24mGKxr3m/FXFtUk2WOS5sGVbqnLGiikG9F fzvSpC1PPfep9NvTgmx2a0WfM7fkE9fjVWn3/cgGdoDUSPbz9NkceQPeLo44TAtj5qai huLA+gqIqNkrU0kE4Jv9Ux93BRO0vz+ey2o9MZ2EWT6HjFNtGFKKEJTor+tVfIsdpqx8 Q3nHdB2Pg/9FBFNTa+zlOtDNMNM17qsWAq5u7yKQSndH6nxiPlQCN2asKwGMkVWQ5kS+ mi0giJBPqr3mJLRv6/rRB18MQ/khB4zCMP3j/WssuQph2Zw9OiwhpGeKEEgd2qjZ91Kg k0Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779129685; x=1779734485; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=LZg22ZhGJMaOt5Df+ZHhboxIbuSeyw23ZlwI4pfXN4c=; b=ayFBdte4M9wRcZTmk9tCS/1p+jEarHBXdP/Skc2zh/hMfCMIG+mjETGtZwBK9qGslr nVeSNZEcjIegMNGK04bDfEI2LxsCt8z6h2YKZxfjdCkLWyMBBgF1ZYOfUx9M7NhviDM/ OLQ1rMjRh9Ecqt2Zb+fLN5ehYTvkmic7/con4MgzJ2kBpeazSEBLAcOrSeUuI336kuao pNU/Le60j5nNMIsi3ReEQaVSHZiJFlcYDQQV6TjAD06jLEvyEdxFSFEfhVRcujThQnTO NAjkFU0Qoiv+kOMwOk5149a7jwM1tt7GZH3Z49hzkpHr5zW5dZyVWyjIPl+qjvsfBtWp mwrA== X-Forwarded-Encrypted: i=1; AFNElJ8a7npjZMBXz/MC2n77RsAJF8kJ4/LobMihB5o5D6Nys3sqPfuw1d7rU0ezGbRNryxepN60rnt7vIFq7iE=@vger.kernel.org X-Gm-Message-State: AOJu0YyCvqVx/+/L+itXOK9lvRAILIUxCstmQsHNIrWMxpFPWeLOxaXc fjROjlDdQXL7XzbzwmT3WYiSUkWPPot8P8Ygdq/igCR23kfllaVRGXIF3N7Ft4Gn X-Gm-Gg: Acq92OEM7eolMEvtt2TCPLs75ccQvsvWwLUYjxbF2n6+yC9NiQZKMI5weOBH/+P9qSd 2m+SI74DcI+jVTwLxOnXDIlbX/tMWoWzgIZpSJNT/fd6dvk9kt/tZ6dKd9ZnNYQsJqF40r19F8H T5lJZUuyxej9H9Vn5vSwjcvFbDCmvJ1q06KniIqvCjX/Nf1CQe+isVZTnMXeTP5NFy++xYpjcjJ aGniYR1xl5Mb2Rp4CDuxKKnDp2SJNPibGh+R5hm4bJM4Z2eYgQa0wCHgYJ3zY1qLS1iyGIOoocC AVfrpstn6q+o2MmE8RkPA7NsBqxOAFRMsHrluWD9KewEM9qHElH+QYfPbhSH4uzc2MXk0+wQrlC Nrk7vHt3DEbZgdhsT80H6bAX3cxcOifNNo/hevXgKSHKw/CmXDq3Qx3VuPmarwJYdpAgLa3oDCm FgX8f9KdI= X-Received: by 2002:a05:6000:2c10:b0:44a:525b:2851 with SMTP id ffacd0b85a97d-45e5c367149mr25942038f8f.10.1779129684842; Mon, 18 May 2026 11:41:24 -0700 (PDT) Received: from localhost ([2603:c027:c000:3cde::f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9e768c4fsm39305594f8f.8.2026.05.18.11.41.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2026 11:41:24 -0700 (PDT) From: Louis Sautier To: Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani , Ranjan Kumar , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Guenter Roeck , MPT-FusionLinux.pdl@broadcom.com, linux-scsi@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] scsi: mpt3sas: add hwmon support Date: Mon, 18 May 2026 20:41:09 +0200 Message-ID: <20260518184109.770185-3-sautier.louis@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260518184109.770185-1-sautier.louis@gmail.com> References: <20260518184109.770185-1-sautier.louis@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=C2=B0C 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. Built into mpt3sas.ko under a new CONFIG_SCSI_MPT3SAS_HWMON Kconfig option. Assisted-by: Claude:claude-opus-4-7 Signed-off-by: Louis Sautier --- drivers/scsi/mpt3sas/Kconfig | 9 ++ drivers/scsi/mpt3sas/Makefile | 2 + drivers/scsi/mpt3sas/mpt3sas_base.h | 17 +++ drivers/scsi/mpt3sas/mpt3sas_hwmon.c | 200 +++++++++++++++++++++++++++ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 6 + 5 files changed, 234 insertions(+) create mode 100644 drivers/scsi/mpt3sas/mpt3sas_hwmon.c diff --git a/drivers/scsi/mpt3sas/Kconfig b/drivers/scsi/mpt3sas/Kconfig index c299f7e078fb..638acd2c6623 100644 --- a/drivers/scsi/mpt3sas/Kconfig +++ b/drivers/scsi/mpt3sas/Kconfig @@ -73,6 +73,15 @@ config SCSI_MPT3SAS_MAX_SGE can be 256. However, it may decreased down to 16. Decreasing this parameter will reduce memory requirements on a per controller instance. =20 +config SCSI_MPT3SAS_HWMON + bool "LSI MPT Fusion SAS hwmon support" + depends on SCSI_MPT3SAS && HWMON + depends on !(SCSI_MPT3SAS=3Dy && HWMON=3Dm) + help + Say Y here to expose the IOC and board temperature sensors of + LSI / Broadcom SAS HBAs (such as the 9300, 9400, and 9500 series) + through hwmon. See Documentation/hwmon/mpt3sas.rst for details. + config SCSI_MPT2SAS tristate "Legacy MPT2SAS config option" default n diff --git a/drivers/scsi/mpt3sas/Makefile b/drivers/scsi/mpt3sas/Makefile index e76d994dbed3..9a2f3ce4158a 100644 --- a/drivers/scsi/mpt3sas/Makefile +++ b/drivers/scsi/mpt3sas/Makefile @@ -9,3 +9,5 @@ mpt3sas-y +=3D mpt3sas_base.o \ mpt3sas_trigger_diag.o \ mpt3sas_warpdrive.o \ mpt3sas_debugfs.o \ + +mpt3sas-$(CONFIG_SCSI_MPT3SAS_HWMON) +=3D mpt3sas_hwmon.o diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt= 3sas_base.h index c655742d0dde..63252f30343b 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@ -1629,6 +1629,7 @@ struct MPT3SAS_ADAPTER { u8 is_aero_ioc; struct dentry *debugfs_root; struct dentry *ioc_dump; + struct mpt3sas_hwmon *hwmon; 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; @@ -2049,6 +2050,22 @@ void mpt3sas_destroy_debugfs(struct MPT3SAS_ADAPTER = *ioc); void mpt3sas_init_debugfs(void); void mpt3sas_exit_debugfs(void); =20 +#if IS_ENABLED(CONFIG_SCSI_MPT3SAS_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. diff --git a/drivers/scsi/mpt3sas/mpt3sas_hwmon.c b/drivers/scsi/mpt3sas/mp= t3sas_hwmon.c new file mode 100644 index 000000000000..26227a992f35 --- /dev/null +++ b/drivers/scsi/mpt3sas/mpt3sas_hwmon.c @@ -0,0 +1,200 @@ +// 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 +#include +#include +#include + +#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 =3D (long)raw * 1000; + return 0; + case MPI2_IOUNITPAGE7_IOC_TEMP_FAHRENHEIT: + /* (F - 32) * 5 / 9, expressed in milli-units */ + *out =3D ((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 =3D drvdata; + + if (type !=3D hwmon_temp) + return 0; + if (attr !=3D hwmon_temp_input && attr !=3D hwmon_temp_label) + return 0; + if (channel =3D=3D 0 && h->ioc_present) + return 0444; + if (channel =3D=3D 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 =3D dev_get_drvdata(dev); + Mpi2ConfigReply_t mpi_reply; + Mpi2IOUnitPage7_t page; + int r; + + if (type !=3D hwmon_temp || attr !=3D hwmon_temp_input) + return -EOPNOTSUPP; + + r =3D mpt3sas_config_get_iounit_pg7(h->ioc, &mpi_reply, &page); + if (r) + return r; + + if (channel =3D=3D 0) + return _hwmon_to_mdegc((s16)le16_to_cpu(page.IOCTemperature), + page.IOCTemperatureUnits, val); + if (channel =3D=3D 1) + return _hwmon_to_mdegc((s16)le16_to_cpu(page.BoardTemperature), + page.BoardTemperatureUnits, val); + return -EOPNOTSUPP; +} + +static const char * const mpt3sas_hwmon_temp_labels[] =3D { + "IOC", + "Board", +}; + +static int +_hwmon_read_string(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, const char **str) +{ + if (type !=3D hwmon_temp || attr !=3D hwmon_temp_label) + return -EOPNOTSUPP; + *str =3D mpt3sas_hwmon_temp_labels[channel]; + return 0; +} + +static const struct hwmon_channel_info * const mpt3sas_hwmon_info[] =3D { + 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 =3D { + .is_visible =3D _hwmon_is_visible, + .read =3D _hwmon_read, + .read_string =3D _hwmon_read_string, +}; + +static const struct hwmon_chip_info mpt3sas_hwmon_chip_info =3D { + .ops =3D &mpt3sas_hwmon_ops, + .info =3D 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 =3D &ioc->pdev->dev; + struct mpt3sas_hwmon *h; + struct device *hwdev; + Mpi2ConfigReply_t mpi_reply; + Mpi2IOUnitPage7_t page; + int r; + + h =3D kzalloc_obj(*h); + if (!h) + return -ENOMEM; + + h->ioc =3D ioc; + + r =3D mpt3sas_config_get_iounit_pg7(ioc, &mpi_reply, &page); + if (r) { + kfree(h); + return r; + } + + h->ioc_present =3D page.IOCTemperatureUnits !=3D MPI2_IOUNITPAGE7_IOC_TEM= P_NOT_PRESENT; + h->board_present =3D page.BoardTemperatureUnits !=3D MPI2_IOUNITPAGE7_BOA= RD_TEMP_NOT_PRESENT; + + /* + * 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 (!h->ioc_present && !h->board_present) { + kfree(h); + return 0; + } + + hwdev =3D 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 =3D hwdev; + ioc->hwmon =3D 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 =3D ioc->hwmon; + + if (!h) + return; + hwmon_device_unregister(h->hwmon_dev); + kfree(h); + ioc->hwmon =3D NULL; +} diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mp= t3sas_scsih.c index 12caffeed3a0..dea78688cc9b 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -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 pc= i_device_id *id) } =20 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: --=20 2.54.0