From nobody Sun Jun 14 01:56:10 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 AD1929475 for ; Sat, 13 Jun 2026 02:39:01 +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=1781318343; cv=none; b=ktpqZGoUo9XABNygP0Po5eVnaKtCF3fJRHgW2EHwWKBN/GvW5lvkI1FDkFWGDQu4Wrcj9EnIR7ZBH+f8lFCSuyuy6exkGP3SSSCPoxo2e/V0e3ZVkC88pPW8r5brTx5T40eGV5IZc/Fpsm576DpPM/RdZ8GZOV8yoJG48zX9VlA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781318343; c=relaxed/simple; bh=KHwt4VywKXahV6WokSspiyABJUFGu96lEtBUDy+TEgE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MpLhWdwJN/8I1pa3kCg+exFvCUzRbqqdP9b+M+EMPLKmhDvZ4d4j3eACbDNM0f/yIQtwy1k8R5s9nhvVzHbWlw5PoXk13wBBTmwYbJFmJsyb1XWbRoseJU3cCWbzq8iKNPcqe3rAPrSeH25lXlLzCRMRZgugl1A9mXtsPWyFejU= 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=mNxLf5yT; 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="mNxLf5yT" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-45ef1629ff4so1028427f8f.0 for ; Fri, 12 Jun 2026 19:39:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781318340; x=1781923140; 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=XF2BPxT6RGXOvylZIStDuHxnCtiMXDzVdoPv3lbFrwE=; b=mNxLf5yTqYMs7RN7dVu66sIKvO60OzOTaD2us+UoP81YMfDAn9tYYkFZjePmdzZtS2 Z6mS2RvgtUKTMlOpMM5yDewMR+vZ75WnYU/sBWlfvvAZZ4URQVFk6hhzmtsk/EER/dHa /+ftHiCpw3xdRkCPNRrYXCCsjkks4TBBp5pnHYOXJ8nvJ5xhAfKheszMY0evZ8184xdu r0yN6aonfX8HvHulGpvu8i9L+5gDP/50qVM8WgAs4/5pM7EZ6wTWE2po9eXrMD+/jOH4 YVJW4V5RCCJ7hA3HcUDJbkR9+tS7yusyFI3YYPba68to57c2G0TRuvC3UagRgmihFsMx +Ukg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781318340; x=1781923140; 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=XF2BPxT6RGXOvylZIStDuHxnCtiMXDzVdoPv3lbFrwE=; b=TG7KBnrRJh4MicurpvNi6EVkVsTatYJClmzizjAEWp66LnmXhVy57xSS6YTHR0eLyA bGLwSPNAOMU2Y4ibBf/pQbxX9l7zovqo9NLUTq1q6c0ahm+BxTEUiyc/d3Zoirdy5oY0 lUlmaTdOMkVRE2ZcTVCdTjr7sV8wLVCLRTcs/swmpRcuFgIkQ0Cia1LINuRvDJO1TXNO 1b6WIhY1C7BhFiR0ge4CtxtnB4JV4mbTdzbciyKVsIsRD0cI0Egj3cL8UqdaJ/0Qd6Y7 EoFT52SN5qWjbIczz63D5qYsmXeOAqn2lc4xjB1ryPCBPvl2+GlEST3rKYRTW1azadbv udTg== X-Forwarded-Encrypted: i=1; AFNElJ9XomX8Q8Bbn8F7p3kq6O1Hc38/jy4uzpCWKsQnlgzEV/VJShHZlwYOIVHCucXPE1R7ENkaw8fyqsJ7Sow=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/y5LNekUqUVnV34o7dk6NEaNnqsmVrymqu0jEAHDkODqdcA7u j/B5Y8hZN/M63pMn3mfQ6RIigkMcV+HGqRnNdZxK50txND2v9glIp8Pa X-Gm-Gg: Acq92OHEc2pjQSyD/VaNfeulBWNCbfj2hsrFYwDf83pKXQkcZtf3bUhp0r9oc7OtOly zHwXbWz7EBRJD+Ks63bC3ECTX8mq9KjkBbZ8U704O5+fDTvr0DORsObmI3iQumzN097NsRigGjn r0JzaGNaSYFY3D5kByHDqzxizW5nRjnnsaHM5VCr+WoYkJYe9Q+rOZzpCbGKj/4niUxbzmC033u PlVfSe53I6TipJLFuXs26IaDSZemN8g8wWAHr6A5wdAxaZYa5aJaf5KRNkasx2nFVuBna6z3td8 3KTRZulFzwNOMk83k4ZBpKzKh6O/ILXEGnymq1avDQ+zy1syqI//7Ye92XzElzho6F07gfu1sVp gQsdc61QXigKqR7PLo/l0Xni5emHHEPnvdQj58GEbLj714kp3VD+xfnnwps4Vzm3daeHMXpq+DR FhF9ejiY4= X-Received: by 2002:a5d:5d13:0:b0:460:e2e:6e2b with SMTP id ffacd0b85a97d-46074a8a1b7mr2065810f8f.20.1781318339849; Fri, 12 Jun 2026 19:38:59 -0700 (PDT) Received: from localhost ([2603:c027:c000:3cde::f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4606f2c473bsm11468595f8f.28.2026.06.12.19.38.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 19:38:59 -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, Damien Le Moal Subject: [PATCH v4 1/2] scsi: mpt3sas: add IO Unit Page 7 config accessor Date: Sat, 13 Jun 2026 04:38:32 +0200 Message-ID: <20260613023833.3163507-2-sautier.louis@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260613023833.3163507-1-sautier.louis@gmail.com> References: <20260613023833.3163507-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 Reviewed-by: Damien Le Moal --- drivers/scsi/mpt3sas/mpt3sas_base.h | 3 +++ drivers/scsi/mpt3sas/mpt3sas_config.c | 36 +++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt= 3sas_base.h index d4597d058705..fe21b0425047 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@ -1904,6 +1904,9 @@ 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..b0d5ef893600 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 Sun Jun 14 01:56:10 2026 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 4C37333E347 for ; Sat, 13 Jun 2026 02:39:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781318344; cv=none; b=DnPu+yDlm4heqESnfkKYinZlROuW4nRf9TP/bYQS1AFZ4JOKR4P58XXWwNvIz0OsrfOM3Kn0S8/XHhiVgPlSUR4t8XW6mdWERULomTC+Q0747Drz9QJ6Wyykdcu23H2OxrKRA0m5ojEoHA2rnhFaOw+6OyExu1Yi6ddQC8err+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781318344; c=relaxed/simple; bh=i9iNVKbbdYwZRGKcNzLSUNFyXWPROZ+7uVtQLeOSjOk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=q15WVK0y2hPC8j3Ks5RAX1jmyiqLa59oR2JdOCzqNX+lC3Owxj9KLvABOrFli+HLf3YSehHmF22pHN5dbFPY7qNRFb8VbV6HbuToJp72n7ytdgZ2pc7QSIQhgbopegAybtx4X2DZbHTxoDP3dvRCAHS+EBWdJ7nzgCt+bWDE0r8= 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=VIR1jNT1; arc=none smtp.client-ip=209.85.221.41 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="VIR1jNT1" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-45eedc94d37so897368f8f.3 for ; Fri, 12 Jun 2026 19:39:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781318341; x=1781923141; 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=cTUyapQ4BSxNuXC2zcdDRNn7Xjcqncz+nsTtTzP9eNc=; b=VIR1jNT1r3BZc/rAahpY1+AbLjc0l2GeuqS4AB2RgUpfxvFTlxbMa9dPV8POI7eogb DbZbs1ADZHHOg8Q/ncACnEQFblAkoY87uA9eUvEuO18KvidHi94qQbV/xJJaCFEVfWfu 3zTj8nCWlCzvlOXrGT7ljS+HeQC1XEICRdGxoHWsAonDsR+ZwaKjcimLDaUh9+kc6qFE bdOjHu6amkZyvwlV06zyA9QSTh+ASiBfGcxjGDCIYKPVFvNVD/EYurBOmJdn/gSG2LH9 FjIP2eifsFEzlHxfieiHBCYoh0kqFoNoFwtl6DTW9hOAn58iEPAqLLY1PCrTiy6CnP10 CY/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781318341; x=1781923141; 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=cTUyapQ4BSxNuXC2zcdDRNn7Xjcqncz+nsTtTzP9eNc=; b=cCEhuS9HLegEFhdSBOFtw13Za5xLMRdZykNsIS37mKGA+SO6+f3eJZJOpCgULj14TR lvFDHv6UmJgTL/RSsP8gOev2jGuWRCIuxb66fhH3JXSUxi/MDmi2k1YiuOSfKbZgc2xj k+ErH9eT8XPr+QqfqrJPiCSiaqJwQr/3cozZSAH7C8xzw5wNb5XR9GXnSlPRoxIeE+z0 6D9DEu2Pi9X5X5u43xq8RmLSEOmQTUXFza53jxiceJmEzUIg77UKoV6bkHLr9smUftXW xdC9RwImKU2jxCQYKQWebR65tBklTZnvgr3dsOFrCdc+6OuGp+QVvShA+sVhVrvs3Iqj HNNw== X-Forwarded-Encrypted: i=1; AFNElJ/w4Lxk0SemOXTwOYPMtgvBi07gvdBCQcWyaH7al1/3Kiln1mMTQ1xJzibjnvT8rTa42QMHInL3MNm/rSA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw22Mxkmv1/cj1kOypGD+1OjKefRGs/4BuTNjEww4Xq81+DKn+P Y//ILNI+7AE2JodWAgFch5SwJVyxm065bztiZojer5DIBFs6rfO7/hZy X-Gm-Gg: Acq92OGUGJxXiiyKROidaQUbv+fq+QSf9HchYhVX5njdd3n4bhYQXQ1Ltm3mAr6SDbu y22s6y9QNBl4fFs4JXOhCMZjdWjCfcE9XUk2oPrhE+JJLSj9CuGD3AcYPRvhLHXn8N4fdzIU8M3 ySoS2LUmlPDY6U8V2KOoY3U15V5X6OmQrOCt6t2weQhZfPSwneO/vWl2WfcZ734B8s4w6586gdc QeoYid7cjzZ8Rfj9DRNNlE+Ekpkrex5BDqV3QpPnT0OXJH6iIz7feERA3mBrhPYknITYQ9qATGK GjF82qx+o2xCjZV6OuJMFA6oKTg//MuMTF0MshzrixGX++SSmkOHWPHmxO8X1qCfYosOoIT8kN6 j6a8xKb8vGWwlFqYm/gWOf04q695HDaOAyjIyl7MOgWemIZU+6J+Xn5LiZJ6IKo1aDS3+dCPisq 7f1K2Bb5g= X-Received: by 2002:a05:6000:2dc2:b0:460:3b5d:43b6 with SMTP id ffacd0b85a97d-4606dba0623mr8422998f8f.31.1781318340521; Fri, 12 Jun 2026 19:39:00 -0700 (PDT) Received: from localhost ([2603:c027:c000:3cde::f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4606f2c473bsm11468595f8f.28.2026.06.12.19.38.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 19:39:00 -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 v4 2/2] scsi: mpt3sas: add hwmon support Date: Sat, 13 Jun 2026 04:38:33 +0200 Message-ID: <20260613023833.3163507-3-sautier.louis@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260613023833.3163507-1-sautier.louis@gmail.com> References: <20260613023833.3163507-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. The hwmon code is gated directly on CONFIG_HWMON. IS_REACHABLE() is used rather than IS_ENABLED() so that SCSI_MPT3SAS=3Dy with HWMON=3Dm 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 --- drivers/scsi/mpt3sas/Makefile | 2 + drivers/scsi/mpt3sas/mpt3sas_base.h | 17 +++ drivers/scsi/mpt3sas/mpt3sas_hwmon.c | 195 +++++++++++++++++++++++++++ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 6 + 4 files changed, 220 insertions(+) create mode 100644 drivers/scsi/mpt3sas/mpt3sas_hwmon.c diff --git a/drivers/scsi/mpt3sas/Makefile b/drivers/scsi/mpt3sas/Makefile index e76d994dbed3..18e2d87eb4a2 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_HWMON) +=3D mpt3sas_hwmon.o diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt= 3sas_base.h index fe21b0425047..47255bf9cdda 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@ -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); =20 +#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. diff --git a/drivers/scsi/mpt3sas/mpt3sas_hwmon.c b/drivers/scsi/mpt3sas/mp= t3sas_hwmon.c new file mode 100644 index 000000000000..6941f50b8aba --- /dev/null +++ b/drivers/scsi/mpt3sas/mpt3sas_hwmon.c @@ -0,0 +1,195 @@ +// 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 "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