From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AAA2F881E; Mon, 21 Apr 2025 06:33:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745217226; cv=none; b=hlfyb7Zx+2I1lUhttc7Hc5o8HCM+c3iEEKvaspP7FrwhxEyiWon2HqcLpOk+zXFMCUrIXWPbJfI0vSKD6gnb/XVsQBFlFGmZ2DJbA8WmpvOEj5aYs1cgWcK/W+JGOHY7xdEwEuoGIk3D7/77Q+prMOgEYz9+tNZh6zMyM5L0zq0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745217226; c=relaxed/simple; bh=klWoQ64du/PdryEQ3d1d06ImhuauwGhe6dJmproT95c=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References; b=HkzCrWC1NmKYoWLyxYThWJ5uK/CMioufT2jMEtO8FFdnqE5PKKOfFCBzKsFHUo7zMCiDYf8cT/KffPpm/rgOl2peN9nBVJhhkyd5gOL+ro9J9Dc6KBQ9yltnyg4yalLVcGP6HKKkZFrLU37lun4xqyfl/7LoKgeEdCm+Y+uCVDc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=UO4WyygE; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="UO4WyygE" Received: by linux.microsoft.com (Postfix, from userid 1173) id 44D5B203B84F; Sun, 20 Apr 2025 23:33:44 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 44D5B203B84F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1745217224; bh=kfzROxqq2F+re+FYHa0ZnQP+29FjcoqIAPMpPXKKBsM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=UO4WyygEbs92BJJ9/JZZUyeAqYnKsjWA9SaWbYY28FMAMA3jTRe5CocOzOBk6r+yl fvSlgmRw02hABIwX3V4l/yuGNNs3qtrhuhUyMFjx48Nkg5levRqdZ6hc0GJP+DjeVT f/LD5m3ZjxCYDiGeNf8ne2cKsDZo4XSt/nZFu3Ds= From: Erni Sri Satya Vennela To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, longli@microsoft.com, kotaranov@microsoft.com, horms@kernel.org, mhklinux@outlook.com, pasha.tatashin@soleen.com, ernis@linux.microsoft.com, kent.overstreet@linux.dev, brett.creeley@amd.com, schakrabarti@linux.microsoft.com, shradhagupta@linux.microsoft.com, ssengar@linux.microsoft.com, leon@kernel.org, rosenp@gmail.com, paulros@microsoft.com, linux-hyperv@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org Subject: [PATCH v2 1/3] net: mana: Add speed support in mana_get_link_ksettings Date: Sun, 20 Apr 2025 23:33:38 -0700 Message-Id: <1745217220-11468-2-git-send-email-ernis@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1745217220-11468-1-git-send-email-ernis@linux.microsoft.com> References: <1745217220-11468-1-git-send-email-ernis@linux.microsoft.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 Reviewed-by: Shradha Gupta Reviewed-by: Haiyang Zhang --- Changes in v2: * Use -EOPNOTSUPP instead of -EPROTO in mana_query_link_cfg(). --- 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 2bac6be8f6a0..ba550fc7ece0 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -1156,6 +1156,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 c419626073f5..48234a738d26 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c +++ b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c @@ -427,6 +427,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 0f78065de8fe..63193613c185 100644 --- a/include/net/mana/mana.h +++ b/include/net/mana/mana.h @@ -468,6 +468,8 @@ struct mana_port_context { u16 port_idx; + u32 speed; + bool port_is_up; bool port_st_save; /* Saved port state */ @@ -497,6 +499,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); @@ -523,6 +526,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, @@ -531,6 +535,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.34.1