[SRU][N:linux-azure-nvidia][PATCH 1/3] UBUNTU: SAUCE: net: mana: Add speed support in mana_get_link_ksettings
Vinicius Peixoto
vinicius.peixoto at canonical.com
Tue Apr 29 19:33:31 UTC 2025
From: Erni Sri Satya Vennela <ernis at linux.microsoft.com>
BugLink: https://bugs.launchpad.net/bugs/2109536
Add support for speed in mana ethtool get_link_ksettings
operation. This feature is not supported by all hardware.
Signed-off-by: Erni Sri Satya Vennela <ernis at linux.microsoft.com>
Reviewed-by: Shradha Gupta <shradhagupta at linux.microsoft.com>
Reviewed-by: Haiyang Zhang <haiyangz at microsoft.com>
(cherry picked from https://lore.kernel.org/all/1745217220-11468-1-git-send-email-ernis@linux.microsoft.com/)
Signed-off-by: Vinicius Peixoto <vinicius.peixoto at canonical.com>
---
drivers/net/ethernet/microsoft/mana/mana_en.c | 42 +++++++++++++++++++
.../ethernet/microsoft/mana/mana_ethtool.c | 6 +++
include/net/mana/mana.h | 17 ++++++++
3 files changed, 65 insertions(+)
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 791ffe17e8ab..4f94c66e8760 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -1147,6 +1147,48 @@ static int mana_cfg_vport_steering(struct mana_port_context *apc,
return err;
}
+int mana_query_link_cfg(struct mana_port_context *apc)
+{
+ struct net_device *ndev = apc->ndev;
+ struct mana_query_link_config_resp resp = {};
+ struct mana_query_link_config_req req = {};
+ int err;
+
+ mana_gd_init_req_hdr(&req.hdr, MANA_QUERY_LINK_CONFIG,
+ sizeof(req), sizeof(resp));
+
+ req.vport = apc->port_handle;
+
+ err = mana_send_request(apc->ac, &req, sizeof(req), &resp,
+ sizeof(resp));
+
+ if (err) {
+ netdev_err(ndev, "Failed to query link config: %d\n", err);
+ goto out;
+ }
+
+ err = mana_verify_resp_hdr(&resp.hdr, MANA_QUERY_LINK_CONFIG,
+ sizeof(resp));
+
+ if (err || resp.hdr.status) {
+ netdev_err(ndev, "Failed to query link config: %d, 0x%x\n", err,
+ resp.hdr.status);
+ if (!err)
+ err = -EOPNOTSUPP;
+ goto out;
+ }
+
+ if (resp.qos_unconfigured) {
+ err = -EINVAL;
+ goto out;
+ }
+ apc->speed = resp.link_speed_mbps;
+ return 0;
+
+out:
+ return err;
+}
+
int mana_create_wq_obj(struct mana_port_context *apc,
mana_handle_t vport,
u32 wq_type, struct mana_obj_spec *wq_spec,
diff --git a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
index 3b8d2f5739e7..422a3ab4d982 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
@@ -435,6 +435,12 @@ static int mana_set_ringparam(struct net_device *ndev,
static int mana_get_link_ksettings(struct net_device *ndev,
struct ethtool_link_ksettings *cmd)
{
+ struct mana_port_context *apc = netdev_priv(ndev);
+ int err;
+
+ err = mana_query_link_cfg(apc);
+
+ cmd->base.speed = (err) ? SPEED_UNKNOWN : apc->speed;
cmd->base.duplex = DUPLEX_FULL;
cmd->base.port = PORT_OTHER;
diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h
index eccad6bb0dea..a177311719e9 100644
--- a/include/net/mana/mana.h
+++ b/include/net/mana/mana.h
@@ -467,6 +467,8 @@ struct mana_port_context {
u16 port_idx;
+ u32 speed;
+
bool port_is_up;
bool port_st_save; /* Saved port state */
@@ -496,6 +498,7 @@ struct bpf_prog *mana_xdp_get(struct mana_port_context *apc);
void mana_chn_setxdp(struct mana_port_context *apc, struct bpf_prog *prog);
int mana_bpf(struct net_device *ndev, struct netdev_bpf *bpf);
void mana_query_gf_stats(struct mana_port_context *apc);
+int mana_query_link_cfg(struct mana_port_context *apc);
int mana_pre_alloc_rxbufs(struct mana_port_context *apc, int mtu, int num_queues);
void mana_pre_dealloc_rxbufs(struct mana_port_context *apc);
@@ -522,6 +525,7 @@ enum mana_command_code {
MANA_FENCE_RQ = 0x20006,
MANA_CONFIG_VPORT_RX = 0x20007,
MANA_QUERY_VPORT_CONFIG = 0x20008,
+ MANA_QUERY_LINK_CONFIG = 0x2000A,
/* Privileged commands for the PF mode */
MANA_REGISTER_FILTER = 0x28000,
@@ -530,6 +534,19 @@ enum mana_command_code {
MANA_DEREGISTER_HW_PORT = 0x28004,
};
+/* Query Link Configuration*/
+struct mana_query_link_config_req {
+ struct gdma_req_hdr hdr;
+ mana_handle_t vport;
+}; /* HW DATA */
+
+struct mana_query_link_config_resp {
+ struct gdma_resp_hdr hdr;
+ u32 link_speed_mbps;
+ u8 qos_unconfigured;
+ u8 reserved[3];
+}; /* HW DATA */
+
/* Query Device Configuration */
struct mana_query_device_cfg_req {
struct gdma_req_hdr hdr;
--
2.45.2
More information about the kernel-team
mailing list