From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 900323803DB for ; Mon, 24 Aug 2026 17:51:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787593867; cv=none; b=E0mV7/PTwpp7mU/DQiEZK/H2s2s4KMQnVBEmOpsWBFFlZRAcCXj/gxVbLtQfynRTDX0e7MMV8ijRf622IGPtkx6pvZ1fz6oi57vl7FQ+AdgYEH32G5eJwX0G0F3RHZFMlnyhFweRiaf4RrCYZvjXkSFQyXUYuA0xwGUxuVFT8Pc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787593867; c=relaxed/simple; bh=Vi3BmT7ZDkiqyokg+wo6JFBFy7A29xrg2kuZJqXCm60=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VxNqx5W5LAxy1OqNXHVPkFF5X38qF27fqzZyGnw0jmD4bpNsO0SaW6XYLxohLoSmW/qs3weLIicj20Cr5KLur1Vpsz2SigNi1R1Wv6nUP4NMxqGOEjJmewoofq0BVFNe85ty8N9rJXVGN/eEqPNiwvTZqac3B488NUnoIOvyfHU= 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=LiupDtPl; arc=none smtp.client-ip=209.85.210.180 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="LiupDtPl" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-84fa3b14ee1so2977638b3a.0 for ; Mon, 24 Aug 2026 10:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787593865; x=1788198665; 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=sfnOswr7eo1XQosDaF0vBD6HXJXxp8BEfMaGl2218a4=; b=LiupDtPlmaE69qlJIwKRyViHHcNI0rXof9dDweopa0kvNjbRV/tzMqMbFSV80tmCiV dxHC15G8jy4c1xHX17ZY1IYT4F+6zWGAlkYTKj2LFPirTEVgwUV+QeymbDwuZiZ5Fa30 ZHCBKAPxgMB4Kwm9qy6A7Rp4IF11p/s3h3rUBpNsoND6zm5udB1wKCLUOGRe+2LFqjPx wgw8eOSIQNdmbWRyJ/lMQwWqonTZ1BeYYHTCx6Jb8IjhDYLrrOPl8vPBuZAG5CfbXH5B GTo/373URFUGVrVG4p+N7M+SkOQYv1qiT7Qr5tFpwSwcc2unX3CNB4JIr32zvrqKPUQV k2AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787593865; x=1788198665; 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=sfnOswr7eo1XQosDaF0vBD6HXJXxp8BEfMaGl2218a4=; b=F5+QjtxxeB8haYGdsINDqRwsGbfEjnhFh87/bEmODoOashTZq76wGMIRcoBZI4nkai ebfRsjP/Ih+qEkS0lUoI8Dbhs/Ql7KYlIWQ5jMxxvhNPbJea9wnf/xqzcK7Xiff4QBYZ nxh28rTPTJx/eQ/ypfQFfYeXon0glgP0SOSAFS4PcZnvMaxvvyT9wQoSviluwzQHh/Wm U/3NNG0TgTd32rETqcDRbPtuRGo+4sH+7T/eSMAHyUu8cL6G1c5qZ3mUgOcmoq9x+k2w eiw0pfhCvj2jyGPSnhHcRaMskL5dEndQf2T6ku20mw+KhY/7klB+1SG3otn0Fayb0yq8 7UOg== X-Forwarded-Encrypted: i=1; AHgh+RqIMiaF3L9xG0sjLJOnyoUm8Huu975x1/Op3BuyOBAWoZCL0n/6NK/OoUtn0RWbYtadUWPiw0uXvAxUS1g=@vger.kernel.org X-Gm-Message-State: AFuF++mEXeEBSm2VAyQJMlDwn5crpFnhrmrij24zAssb8Vm1Wlx3FxZF 8/t9Nn85ErDgGwf3sgdW8UuJIem7X7StaBX7bu/Ki+QtMXw+HX6kYOmXBODKMg== X-Gm-Gg: AR+sD13xvFcU16l1N+1ZXsxc/lDMwm0gyER4a3zyTIy/QwZOSzaAM5rglLlzMG2Iee8 jNzeET1DDH7opEW9jrO5pNlTjVS+pXi8hoj2N1O45hwZLc5zOUHvMcbFVjrm/QBgfK0VpLeKu83 FCG/qV0m8JHmP286MC9nbiFu+/JCtMJOGRL8A0CtcV3CHvL/Zcc+c9SyRyZ04wXZl9j8FNNjVmV /kUvxvpoCAdbRiye1lshWTfK9oUxrqQN2ep3lz4YmyD9c+tmwfGpSWWueDbb9DXW0VSIAl0J+/G PAMLxikqoe9Qj803uuHYxwilMr6t0LMQB7htyhek8ww6tfY4/8Ryc8ZMdUEkZSnCKTeAIBrO3fS tD0UJVpItfE8XPsQKtzwuTRtIbogEFagfH0OCozT3aV0utdPtvbuq9ilbsAo17ZI2ZXTWRMLV5c KgakJ+mrBu0N0a2CCqdN9VstU2pYjhrGOStVyQ7Fpb04uDV38K/cHMyKTfNSFSc2x/eKs= X-Received: by 2002:a05:6a20:d529:b0:3bf:b182:94e with SMTP id adf61e73a8af0-3cd2fe47253mr59858710637.5.1787593864596; Mon, 24 Aug 2026 10:51:04 -0700 (PDT) Received: from localhost ([2620:10d:c090:500::4:ddd2]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-14186183c0esm41854731c88.12.2026.08.24.10.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2026 10:51:04 -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 1/6] eth: fbnic: move sensor read logic out of fbnic_mac Date: Mon, 24 Aug 2026 10:50:54 -0700 Message-ID: <20260824175059.2485048-2-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The sensor read lived behind the fbnic_mac get_sensor op, but it is only ever used by the hwmon subsystem. Move the read into fbnic_hwmon.c and call it directly there, closer to where it is used, and drop the now-unused get_sensor op from struct fbnic_mac. No functional change. Signed-off-by: Zinc Lim --- drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c | 56 ++++++++++++++++++- drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 55 ------------------ drivers/net/ethernet/meta/fbnic/fbnic_mac.h | 2 - 3 files changed, 54 insertions(+), 59 deletions(-) diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c b/drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c index def8598aceec..6c8c66ab86c1 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c +++ b/drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c @@ -28,15 +28,67 @@ static umode_t fbnic_hwmon_is_visible(const void *drvdata, return 0; } +static int fbnic_hwmon_sensor_read(struct fbnic_dev *fbd, int id, long *val) +{ + struct fbnic_fw_completion *fw_cmpl; + int err = 0; + s32 *sensor; + + fw_cmpl = fbnic_fw_alloc_cmpl(FBNIC_TLV_MSG_ID_TSENE_READ_RESP); + if (!fw_cmpl) + return -ENOMEM; + + switch (id) { + case FBNIC_SENSOR_TEMP: + sensor = &fw_cmpl->u.tsene.millidegrees; + break; + case FBNIC_SENSOR_VOLTAGE: + sensor = &fw_cmpl->u.tsene.millivolts; + break; + default: + err = -EINVAL; + goto exit_free; + } + + err = fbnic_fw_xmit_tsene_read_msg(fbd, fw_cmpl); + if (err) { + dev_err(fbd->dev, + "Failed to transmit TSENE read msg, err %d\n", + err); + goto exit_free; + } + + if (!wait_for_completion_timeout(&fw_cmpl->done, 10 * HZ)) { + dev_err(fbd->dev, "Timed out waiting for TSENE read\n"); + err = -ETIMEDOUT; + goto exit_cleanup; + } + + /* Handle error returned by firmware */ + if (fw_cmpl->result) { + err = fw_cmpl->result; + dev_err(fbd->dev, "%s: Firmware returned error %d\n", + __func__, err); + goto exit_cleanup; + } + + *val = *sensor; +exit_cleanup: + fbnic_mbx_clear_cmpl(fbd, fw_cmpl); +exit_free: + fbnic_fw_put_cmpl(fw_cmpl); + + return err; +} + 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); + return id < 0 ? id : fbnic_hwmon_sensor_read(fbd, id, val); } static const struct hwmon_ops fbnic_hwmon_ops = { diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_mac.c b/drivers/net/ethernet/meta/fbnic/fbnic_mac.c index 53b7a938b4c2..fba2e2efaeb8 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_mac.c +++ b/drivers/net/ethernet/meta/fbnic/fbnic_mac.c @@ -899,60 +899,6 @@ fbnic_mac_get_rmon_stats(struct fbnic_dev *fbd, bool reset, TMI_STAT_TX_PACKET_9217_MAX_BYTES); } -static int fbnic_mac_get_sensor_asic(struct fbnic_dev *fbd, int id, - long *val) -{ - struct fbnic_fw_completion *fw_cmpl; - int err = 0; - s32 *sensor; - - fw_cmpl = fbnic_fw_alloc_cmpl(FBNIC_TLV_MSG_ID_TSENE_READ_RESP); - if (!fw_cmpl) - return -ENOMEM; - - switch (id) { - case FBNIC_SENSOR_TEMP: - sensor = &fw_cmpl->u.tsene.millidegrees; - break; - case FBNIC_SENSOR_VOLTAGE: - sensor = &fw_cmpl->u.tsene.millivolts; - break; - default: - err = -EINVAL; - goto exit_free; - } - - err = fbnic_fw_xmit_tsene_read_msg(fbd, fw_cmpl); - if (err) { - dev_err(fbd->dev, - "Failed to transmit TSENE read msg, err %d\n", - err); - goto exit_free; - } - - if (!wait_for_completion_timeout(&fw_cmpl->done, 10 * HZ)) { - dev_err(fbd->dev, "Timed out waiting for TSENE read\n"); - err = -ETIMEDOUT; - goto exit_cleanup; - } - - /* Handle error returned by firmware */ - if (fw_cmpl->result) { - err = fw_cmpl->result; - dev_err(fbd->dev, "%s: Firmware returned error %d\n", - __func__, err); - goto exit_cleanup; - } - - *val = *sensor; -exit_cleanup: - fbnic_mbx_clear_cmpl(fbd, fw_cmpl); -exit_free: - fbnic_fw_put_cmpl(fw_cmpl); - - return err; -} - static const struct fbnic_mac fbnic_mac_asic = { .init_regs = fbnic_mac_init_regs, .get_link = fbnic_mac_get_link, @@ -966,7 +912,6 @@ static const struct fbnic_mac fbnic_mac_asic = { .get_rmon_stats = fbnic_mac_get_rmon_stats, .link_down = fbnic_mac_link_down_asic, .link_up = fbnic_mac_link_up_asic, - .get_sensor = fbnic_mac_get_sensor_asic, }; /** diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_mac.h b/drivers/net/ethernet/meta/fbnic/fbnic_mac.h index 10f30e0e8f69..bde2daa65645 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_mac.h +++ b/drivers/net/ethernet/meta/fbnic/fbnic_mac.h @@ -137,8 +137,6 @@ struct fbnic_mac { void (*link_down)(struct fbnic_dev *fbd); 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); -- 2.53.0-Meta