From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 B9C21442107 for ; Tue, 21 Jul 2026 22:15:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784672149; cv=none; b=pXdRbhv+9M3GM8T5fXzubge41EJx+st3ZBLArnACPTjHFl/LbBVWDNRPBmlz2meh98DO+6e8OacxxL5gfAdL0MRSYKZsjjeokAzk+KZuEbnnlNEJC/NtsWuFpgt3Cp+3h4m4682Ym2WzKSMuv+3NVY32P2WQ1NPQub9WURcZnLw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784672149; c=relaxed/simple; bh=Vi3BmT7ZDkiqyokg+wo6JFBFy7A29xrg2kuZJqXCm60=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JADZXSE3Dh9fDa/aNpEitUJBYTXo8xQHJoGkEF91F9nF2RRDzuplOX9Q1EAFRlayDPnbSkyXjm1bgkUGIKpoYeSf6tnRgBY8qYmkoICWJV0ZC9nbJrCTgvkAXoNEQtvxqs3s1u9PG95ZU8CzpzNRlB4slm+sAArwcBjw8wOu80w= 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=lthrF199; arc=none smtp.client-ip=209.85.215.179 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="lthrF199" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-cbb662575d3so815914a12.0 for ; Tue, 21 Jul 2026 15:15:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784672147; x=1785276947; 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=lthrF199YVj06WZVHSpw+5rtObeqQw3x3TgLzpKNay+GrbdzV0uoO5E5bp24SIjsam sOqYl/atZLXVkED6qPN2qpOcu2W1UQGgmpKwtb96BLG4dptB0cxw1I8GpwVypZGx+w3j tCki3xZRzw1h+9Y5Pzke9w/17bgLn2Xl7yv1piMw7xkASB/nsiZkg2zDQGJZ9Z4YG/Ic HpEFBx6Bua0YEji6KriQpXOA0y8xsmCzV1Yd9wSNkZTFBsVsz8cPx2Cflwfz3fPqrLxH yQaE1wR8EMWWyJI/3dzLUpxrbOgjrWINv9jrgI5RtzckfWSwWF07sSPN4gE0xycHCjKs YDlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784672147; x=1785276947; 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=CWdbEpfjSa2qHsBkElw0dV7+d/BHZaqUG5nX7t3r6f6Nq6ZIMXyo/u8yxF2korRIOu q8k3UAYncMYoM7u0JiHx7Gazs5y3tz7F45bfx0pW8DaSQDuYmWOHJmedyGu5E9XQxKIr BYdNfeYncfhGk5gl/fq5KVBQjTyDLzoPH1pYr5zUdCqlQvFRab1gAVfi+Bbz/SLmzyWv SWw6ZV4v8sOKuX6O2Y/5mvcjOlgEgvoCcsSURWokOZyiiPj191hFDlXQUvluRA1VoaTk aYu/vKFYHCM3+asqAaCXoUwuNSh8awuNxttU8CK/x2xoEbrDA09oAf8+S1WBydzB51Xi ULyQ== X-Forwarded-Encrypted: i=1; AHgh+Rr9R8HzGQeVjDqetlfXyfeOSJwbNFmK6jY1731JoSaSuLX58PR6BlIyNkeVbnPcit2SOFdw5Cs=@vger.kernel.org X-Gm-Message-State: AOJu0Yyx4kOa5h8+pNaK4LPyMAk4j41trtWNjpJy2Xq6XJmqrcjPHBCc M3MlbCXn6OXahwT6sdSMVrmceLo7cpuoRAjePsp6DpTa5yDhvqUYN4fd X-Gm-Gg: AR+sD11dtvrxm6J+BwJaLlx+7ieH7G2GmzvIDfI2pADqt3eVmgJdY3GG2WMqoIsnj/T moXm3DczCTEBGBmXdb90x+kbTrzaYrtAwRkg6ifYUsbiB78Scm4hhqpMFimDmSM3aszuJ7lihx9 E18MUzNiv65j3GyLevAAOcq9cOH4z/4cs9uu+aZSi+bMweKE4lPa1mHiExKOJhRCePrYhO+Y6o6 Mczrp8Oj+KIWB5AvadAYpWm5mBAA5rkdAWzYJRSinsMsosaYnqqXs9z0KdbV0hP9NFvvLcWw0EK XmRgWsfgE5uFGeUVJ9z0KwhnNZ0SZEo2BiVQ5SKzJt8ClK2c2VUw+4a2MkeQxfQ3cI3I6mjLCzk jabiKQsaPKm6mSKBPUEpKRY/qCMCnErJaFiZB+XhrX8S+oY5/IQbfIKELQeYE+3nOtPQvChig2C a5NQbZ4A== X-Received: by 2002:a05:6a20:ae2f:b0:39f:2dd0:65d5 with SMTP id adf61e73a8af0-3c3ada1eb31mr18192095637.39.1784672147014; Tue, 21 Jul 2026 15:15:47 -0700 (PDT) Received: from localhost ([2620:10d:c090:500::9edb]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3147dc1e3d9sm1938695eec.5.2026.07.21.15.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 15:15:46 -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 1/6] eth: fbnic: move sensor read logic out of fbnic_mac Date: Tue, 21 Jul 2026 15:15:35 -0700 Message-ID: <20260721221540.648272-2-limzhineng2@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260721221540.648272-1-limzhineng2@gmail.com> References: <20260721221540.648272-1-limzhineng2@gmail.com> Precedence: bulk X-Mailing-List: netdev@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