From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 16A6637F72E for ; Mon, 24 Aug 2026 17:51:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787593876; cv=none; b=UvqMgIGHqWu0tNwogPtPuvWLleRoLYG1q4JnSV7ACWR8kODoqjsiH/I8KSo95D4Hg+OyQq2XP003egXLmkg9NBUWsIDfdcte48CAaWZnCFqfkEVwOSWQR5a+N7NHXXD3LfOZGhuNTbX6FYVVjrqs92TQrWHsGsIqIrnAv/d3B1U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787593876; c=relaxed/simple; bh=7ryBp4J/qEyf2/01p+hdf/8QZoypRA4clk5o6hi7rC0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Lzxy0D5rMwYaxti3S6kAlDE3R7x0Dhd0pphRv0k9OIIpxNamP+xhYqtglttz4bqbte7mgwE0z9T5VMRjM6GoJUtTLIaJhFxbEUBmzNBQCcFSu3YU4XJMtQ7sP1Gn2D0SOYjuSWebiBnWQVHqU5MrqxwU8ajePvXVfXpqfNWRGz8= 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=n3WUE3Hq; arc=none smtp.client-ip=209.85.214.181 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="n3WUE3Hq" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2cfbbdfa60bso30944735ad.3 for ; Mon, 24 Aug 2026 10:51:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787593871; x=1788198671; 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:content-type; bh=VGnbInnCX26l95VXtFdZ6NsvhwlhpXxdn0FnqPhv8qQ=; b=n3WUE3HqyfSf4QGrYJ9npwF05sPEA0GOeey0JkGqVdX/F3Oy6ILZ5iSgWb7v0KWYc+ 08NQVNvysFZQOgHGDe+QFB2XMd97C8HHXg7e5jyHoAe23seirJtNXeA0/2U/79t7DK57 r462fqwz2ou8fSby+3wFHr13eNunT0vdcuiAiQt6skpbzOkGWu6ap0p8eoIPYFf/X9PW UPOMnRSlTHWhKCpWFcsqOpUiBJV3FPS/MbaVebhIXnwmH5LMw3uC0e1f/1zSV0nVRvdP 7M6XEKa0KuZY3o4VHCeHJQLGjW+/Ir5tTMolMtpflUq8w7rBINIJ0lbEaURUkGkJvfvi y72w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787593871; x=1788198671; 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:content-type; bh=VGnbInnCX26l95VXtFdZ6NsvhwlhpXxdn0FnqPhv8qQ=; b=YEgH4cFNL6kdQwkCNw5L5e0ESqu2TEloKud0FRhSmTM3F59z5sygb+2/mmJjNcIJjs 3wDLn3OsH+qYY+4W1k9reXXoo9aHPHkkvXGuFauIJRTM28UDjUG4p2tYvmEYl6Ul5HFL E86G/s0w9amu20yZXXGb3D8yX0YxRbnZ8jdShHg2PgXDYkR8dL5KE5GwcnjCg72xhnYB 6UsaZQzre6Hi1KBrHDOOdc99NJIY6XwcAYoXy3x5Gw/72/dwlqjUL0Zv4RHAFVTis/15 w3ti5T2mPJcahJeIgtjIXiKU5acaI95wD4MDj17Qnz/okrDsG5Gd20c3E36TcfgeUCPD lKug== X-Forwarded-Encrypted: i=1; AHgh+Rr3C7LQMVYWViT0Y76DXJhae+zJWziPGvfvyqaJH2RJNIysI5YF/cALYmQPMzfqZV/2uhuPClOJHLO4wg==@vger.kernel.org X-Gm-Message-State: AFuF++kPSopYZNfqg6hs6vvZG2apacd+WsUqe//NsgcwEWMxXHXUtjJE X8zxRkY1bVDBAVFPbZrUiCPtG1bgfcW/EB+N60lQJ/ZTwrcD7dv8ther X-Gm-Gg: AR+sD11kzUkDGU5hwdhvqFisjMJA+rfDuZlayP5GSSGevZVRlpvyNqzz8AZMwVdE784 bjN00hUhdVvuBbonyIalnyJ35uxXmj3SSFd6tXz3E2TrrJmUinclT1CdZM5TG9G+UQzIeLLFHFE Ac98zdwbqg2RkEGJrTew/zxXrEWCuMwDEJY96wyaS1cBVxej2FcIZH8or5rIwq1psKqE7LTnfBd +EW0f7ppLjYCyVwuKf3jtf5NW2hWkSRmWwk5phW2mmXTMfSYc8EnDOUL/1o+Gw+ehZNFcH//OUJ pI4UAknwMieJBFFt7IXBpG9PG+98xzFpN0DyqBeiE5U0j4rJdbCnTFCokUDefoK6ubcT0IS31gt vqDyRaBEdxWws8L7crspY53u1cP5cIvrXPSqeJkJi4ZkWJavuUoWWEV7twx3B67sGSCgHmYMrS4 SV24YcIgnjNStweNTYOn+1hi8TAGAiGCy2IQrriMEWAdm5UVxksDuoEAJcIW76A+bH3vw= X-Received: by 2002:a17:90b:53c7:b0:38e:5c6:4db9 with SMTP id 98e67ed59e1d1-396464a15f2mr1063732a91.11.1787593871092; Mon, 24 Aug 2026 10:51:11 -0700 (PDT) Received: from localhost ([2620:10d:c090:500::4:ddd2]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-141860c6989sm26462410c88.2.2026.08.24.10.51.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2026 10:51:10 -0700 (PDT) From: Zinc Lim To: Alexander Duyck , Jakub Kicinski , Andrew Lunn , "David S . Miller" , Eric Dumazet , Paolo Abeni , Guenter Roeck , Simon Horman , Mohsin Bashir Cc: kernel-team@meta.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, zinclim@meta.com, Zinc Lim Subject: [PATCH net-next v2 4/6] eth: fbnic: report temperature and voltage thresholds via hwmon Date: Mon, 24 Aug 2026 10:50:57 -0700 Message-ID: <20260824175059.2485048-5-limzhineng2@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260824175059.2485048-1-limzhineng2@gmail.com> References: <20260824175059.2485048-1-limzhineng2@gmail.com> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The firmware capability response carries per-board temperature (min/max/crit) and voltage (min/max) thresholds. Parse and store them in fbnic_fw_cap, and expose them through the hwmon interface as temp1_{min,max,crit} and in0_{min,max}. The thresholds are always exposed. Values the firmware did not report are stored as the FBNIC_SENSOR_NO_DATA sentinel in the capability response parser, and a read of such an attribute returns -ENODATA. Signed-off-by: Zinc Lim --- drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 21 ++++++ drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 14 ++++ drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c | 67 ++++++++++++++----- 3 files changed, 87 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c index 283d25fae79e..d814bd4041a0 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c +++ b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c @@ -575,6 +575,11 @@ static const struct fbnic_tlv_index fbnic_fw_cap_resp_index[] = { FBNIC_TLV_ATTR_STRING(FBNIC_FW_CAP_RESP_UEFI_COMMIT_STR, FBNIC_FW_CAP_RESP_COMMIT_MAX_SIZE), FBNIC_TLV_ATTR_U32(FBNIC_FW_CAP_RESP_ANTI_ROLLBACK_VERSION), + FBNIC_TLV_ATTR_S32(FBNIC_FW_CAP_RESP_TEMP_MIN), + FBNIC_TLV_ATTR_S32(FBNIC_FW_CAP_RESP_TEMP_MAX), + FBNIC_TLV_ATTR_S32(FBNIC_FW_CAP_RESP_TEMP_CRIT), + FBNIC_TLV_ATTR_S32(FBNIC_FW_CAP_RESP_VOLT_MIN), + FBNIC_TLV_ATTR_S32(FBNIC_FW_CAP_RESP_VOLT_MAX), FBNIC_TLV_ATTR_LAST }; @@ -702,6 +707,22 @@ static int fbnic_fw_parse_cap_resp(void *opaque, struct fbnic_tlv_msg **results) /* Always assume we need a BMC reinit */ fbd->fw_cap.need_bmc_tcam_reinit = true; + fbd->fw_cap.temp.min = + fbnic_tlv_attr_get_signed(results[FBNIC_FW_CAP_RESP_TEMP_MIN], + FBNIC_SENSOR_NO_DATA); + fbd->fw_cap.temp.max = + fbnic_tlv_attr_get_signed(results[FBNIC_FW_CAP_RESP_TEMP_MAX], + FBNIC_SENSOR_NO_DATA); + fbd->fw_cap.temp.crit = + fbnic_tlv_attr_get_signed(results[FBNIC_FW_CAP_RESP_TEMP_CRIT], + FBNIC_SENSOR_NO_DATA); + fbd->fw_cap.volt.min = + fbnic_tlv_attr_get_signed(results[FBNIC_FW_CAP_RESP_VOLT_MIN], + FBNIC_SENSOR_NO_DATA); + fbd->fw_cap.volt.max = + fbnic_tlv_attr_get_signed(results[FBNIC_FW_CAP_RESP_VOLT_MAX], + FBNIC_SENSOR_NO_DATA); + return 0; } diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_fw.h b/drivers/net/ethernet/meta/fbnic/fbnic_fw.h index 42a5f83ddb45..68ffd49e0cdd 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_fw.h +++ b/drivers/net/ethernet/meta/fbnic/fbnic_fw.h @@ -51,6 +51,12 @@ struct fbnic_fw_ver { */ #define FBNIC_SENSOR_NO_DATA S32_MIN +struct fbnic_threshold { + s32 min; + s32 max; + s32 crit; +}; + struct fbnic_fw_cap { struct { struct fbnic_fw_ver mgmt, bootloader; @@ -67,6 +73,8 @@ struct fbnic_fw_cap { u8 link_speed; u8 link_fec; u32 anti_rollback_version; + struct fbnic_threshold temp; + struct fbnic_threshold volt; }; struct fbnic_fw_completion { @@ -249,6 +257,12 @@ enum { FBNIC_FW_CAP_RESP_UEFI_VERSION = 0x11, FBNIC_FW_CAP_RESP_UEFI_COMMIT_STR = 0x12, FBNIC_FW_CAP_RESP_ANTI_ROLLBACK_VERSION = 0x15, + /* 0x16 and 0x17 are reserved for future use */ + FBNIC_FW_CAP_RESP_TEMP_MIN = 0x18, + FBNIC_FW_CAP_RESP_TEMP_MAX = 0x19, + FBNIC_FW_CAP_RESP_TEMP_CRIT = 0x1a, + FBNIC_FW_CAP_RESP_VOLT_MIN = 0x1b, + FBNIC_FW_CAP_RESP_VOLT_MAX = 0x1c, FBNIC_FW_CAP_RESP_MSG_MAX }; diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c b/drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c index f35cb0065093..4938f7b39140 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c +++ b/drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c @@ -7,16 +7,6 @@ #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) @@ -88,14 +78,58 @@ static int fbnic_hwmon_sensor_read(struct fbnic_dev *fbd, int id, long *val) return err; } +static int fbnic_hwmon_read_threshold(long thr, long *val) +{ + if (thr == FBNIC_SENSOR_NO_DATA) + return -ENODATA; + + *val = thr; + return 0; +} + +static int fbnic_hwmon_temp_read(struct fbnic_dev *fbd, u32 attr, long *val) +{ + switch (attr) { + case hwmon_temp_input: + return fbnic_hwmon_sensor_read(fbd, FBNIC_SENSOR_TEMP, val); + case hwmon_temp_min: + return fbnic_hwmon_read_threshold(fbd->fw_cap.temp.min, val); + case hwmon_temp_max: + return fbnic_hwmon_read_threshold(fbd->fw_cap.temp.max, val); + case hwmon_temp_crit: + return fbnic_hwmon_read_threshold(fbd->fw_cap.temp.crit, val); + default: + return -EOPNOTSUPP; + } +} + +static int fbnic_hwmon_in_read(struct fbnic_dev *fbd, u32 attr, long *val) +{ + switch (attr) { + case hwmon_in_input: + return fbnic_hwmon_sensor_read(fbd, FBNIC_SENSOR_VOLTAGE, val); + case hwmon_in_min: + return fbnic_hwmon_read_threshold(fbd->fw_cap.volt.min, val); + case hwmon_in_max: + return fbnic_hwmon_read_threshold(fbd->fw_cap.volt.max, val); + default: + return -EOPNOTSUPP; + } +} + 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); - int id; - id = fbnic_hwmon_sensor_id(type); - return id < 0 ? id : fbnic_hwmon_sensor_read(fbd, id, val); + switch (type) { + case hwmon_temp: + return fbnic_hwmon_temp_read(fbd, attr, val); + case hwmon_in: + return fbnic_hwmon_in_read(fbd, attr, val); + default: + return -EOPNOTSUPP; + } } static const struct hwmon_ops fbnic_hwmon_ops = { @@ -104,8 +138,11 @@ static const struct hwmon_ops fbnic_hwmon_ops = { }; static const struct hwmon_channel_info *fbnic_hwmon_info[] = { - HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT), - HWMON_CHANNEL_INFO(in, HWMON_I_INPUT), + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MAX | + HWMON_T_CRIT), + HWMON_CHANNEL_INFO(in, + HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX), NULL }; -- 2.53.0-Meta