From nobody Wed Dec 17 19:08:06 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3A05C61D97 for ; Wed, 22 Nov 2023 18:34:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344276AbjKVSe6 (ORCPT ); Wed, 22 Nov 2023 13:34:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343972AbjKVSe4 (ORCPT ); Wed, 22 Nov 2023 13:34:56 -0500 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD2D2B2; Wed, 22 Nov 2023 10:34:51 -0800 (PST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AMIU7WG010444; Wed, 22 Nov 2023 10:34:44 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=nnAMkel0k8y1T9oDp6Vw8fbx9YgqIo8UMTp42Oh5n5s=; b=RbR6N4mLQfxDGqTgTZNYkxRqn1NdnO1jeaGsUYXz/mFuuib41ZKEPE/dmdKM1XvsLn15 kVDFknMPY7nbdcrFQTZkEVM3OElalgPiAcOUm7qbIZjD+FRp4OZrZpBQOMmrH2GciHdS 1zCE/KsaTYcIHtKMy7kGdrAs4WBGDbISOzuPSyJ/pSsTTaqflHaQGuv8XnKqDnwEY0qt ZNSAyHGTo7N+4QRXVAN/TvK3KlB0hcMd0YZEaKzBDuWwo5Tc8pvr2jYQZVu91jJ/FdnY aWVNSQnqExuKb+1c5bS8rM6Ph4VblukWOcSBcVUuImgF6zdPH4mO088NniaNyoGu7o7K Lg== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3uh1jbcs7t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 22 Nov 2023 10:34:43 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Wed, 22 Nov 2023 10:34:41 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Wed, 22 Nov 2023 10:34:42 -0800 Received: from ubuntu-PowerEdge-T110-II.sclab.marvell.com (unknown [10.106.27.86]) by maili.marvell.com (Postfix) with ESMTP id 8FAB33F7040; Wed, 22 Nov 2023 10:34:41 -0800 (PST) From: Shinas Rasheed To: , CC: , , , , , , , , , , , , Shinas Rasheed , Veerasenareddy Burru , Sathesh Edara , Eric Dumazet Subject: [PATCH net-next v2 1/2] octeon_ep: Solve style issues in control net files Date: Wed, 22 Nov 2023 10:34:34 -0800 Message-ID: <20231122183435.2510656-2-srasheed@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231122183435.2510656-1-srasheed@marvell.com> References: <20231122183435.2510656-1-srasheed@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: pukhpuMS17sL-hK2UXC37r-8WlEaiK8B X-Proofpoint-GUID: pukhpuMS17sL-hK2UXC37r-8WlEaiK8B X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-22_13,2023-11-22_01,2023-05-22_02 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Solve observed style issues for kernel documentation and structure declarations in control net API definitions. Signed-off-by: Shinas Rasheed --- V2: - Introduced the patch due to kernel doc style and structure initialisation comments obtained in V1 of patch 2 .../marvell/octeon_ep/octep_ctrl_net.c | 24 ++-- .../marvell/octeon_ep/octep_ctrl_net.h | 115 ++++++++++-------- 2 files changed, 76 insertions(+), 63 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c b/driv= ers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c index 0594607a2585..2eeeaa7188b1 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c @@ -122,7 +122,7 @@ int octep_ctrl_net_init(struct octep_device *oct) =20 int octep_ctrl_net_get_link_status(struct octep_device *oct, int vfid) { - struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_wait_data d =3D {}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; int err; =20 @@ -139,7 +139,7 @@ int octep_ctrl_net_get_link_status(struct octep_device = *oct, int vfid) int octep_ctrl_net_set_link_status(struct octep_device *oct, int vfid, boo= l up, bool wait_for_response) { - struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_wait_data d =3D {}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 init_send_req(&d.msg, req, state_sz, vfid); @@ -154,7 +154,7 @@ int octep_ctrl_net_set_link_status(struct octep_device = *oct, int vfid, bool up, int octep_ctrl_net_set_rx_state(struct octep_device *oct, int vfid, bool u= p, bool wait_for_response) { - struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_wait_data d =3D {}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 init_send_req(&d.msg, req, state_sz, vfid); @@ -168,7 +168,7 @@ int octep_ctrl_net_set_rx_state(struct octep_device *oc= t, int vfid, bool up, =20 int octep_ctrl_net_get_mac_addr(struct octep_device *oct, int vfid, u8 *ad= dr) { - struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_wait_data d =3D {}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; int err; =20 @@ -187,7 +187,7 @@ int octep_ctrl_net_get_mac_addr(struct octep_device *oc= t, int vfid, u8 *addr) int octep_ctrl_net_set_mac_addr(struct octep_device *oct, int vfid, u8 *ad= dr, bool wait_for_response) { - struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_wait_data d =3D {}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 init_send_req(&d.msg, req, mac_sz, vfid); @@ -201,7 +201,7 @@ int octep_ctrl_net_set_mac_addr(struct octep_device *oc= t, int vfid, u8 *addr, int octep_ctrl_net_set_mtu(struct octep_device *oct, int vfid, int mtu, bool wait_for_response) { - struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_wait_data d =3D {}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 init_send_req(&d.msg, req, mtu_sz, vfid); @@ -216,7 +216,7 @@ int octep_ctrl_net_get_if_stats(struct octep_device *oc= t, int vfid, struct octep_iface_rx_stats *rx_stats, struct octep_iface_tx_stats *tx_stats) { - struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_wait_data d =3D {}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; struct octep_ctrl_net_h2f_resp *resp; int err; @@ -236,7 +236,7 @@ int octep_ctrl_net_get_if_stats(struct octep_device *oc= t, int vfid, int octep_ctrl_net_get_link_info(struct octep_device *oct, int vfid, struct octep_iface_link_info *link_info) { - struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_wait_data d =3D {}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; struct octep_ctrl_net_h2f_resp *resp; int err; @@ -262,7 +262,7 @@ int octep_ctrl_net_set_link_info(struct octep_device *o= ct, int vfid, struct octep_iface_link_info *link_info, bool wait_for_response) { - struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_wait_data d =3D {}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 init_send_req(&d.msg, req, link_info_sz, vfid); @@ -331,8 +331,8 @@ static int process_mbox_notify(struct octep_device *oct, void octep_ctrl_net_recv_fw_messages(struct octep_device *oct) { static u16 msg_sz =3D sizeof(union octep_ctrl_net_max_data); - union octep_ctrl_net_max_data data =3D {0}; - struct octep_ctrl_mbox_msg msg =3D {0}; + union octep_ctrl_net_max_data data =3D {}; + struct octep_ctrl_mbox_msg msg =3D {}; int ret; =20 msg.hdr.s.sz =3D msg_sz; @@ -356,7 +356,7 @@ void octep_ctrl_net_recv_fw_messages(struct octep_devic= e *oct) int octep_ctrl_net_get_info(struct octep_device *oct, int vfid, struct octep_fw_info *info) { - struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_wait_data d =3D {}; struct octep_ctrl_net_h2f_resp *resp; struct octep_ctrl_net_h2f_req *req; int err; diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h b/driv= ers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h index b330f370131b..02b8fcf890d0 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h @@ -218,87 +218,95 @@ struct octep_ctrl_net_wait_data { } data; }; =20 -/** Initialize data for ctrl net. +/** + * octep_ctrl_net_init() - Initialize data for ctrl net. * - * @param oct: non-null pointer to struct octep_device. + * @oct: non-null pointer to struct octep_device. * * return value: 0 on success, -errno on error. */ int octep_ctrl_net_init(struct octep_device *oct); =20 -/** Get link status from firmware. +/**=20 + * octep_ctrl_net_get_link_status() - Get link status from firmware. * - * @param oct: non-null pointer to struct octep_device. - * @param vfid: Index of virtual function. + * @oct: non-null pointer to struct octep_device. + * @vfid: Index of virtual function. * * return value: link status 0=3Ddown, 1=3Dup. */ int octep_ctrl_net_get_link_status(struct octep_device *oct, int vfid); =20 -/** Set link status in firmware. +/** + * octep_ctrl_net_set_link_status() - Set link status in firmware. * - * @param oct: non-null pointer to struct octep_device. - * @param vfid: Index of virtual function. - * @param up: boolean status. - * @param wait_for_response: poll for response. + * @oct: non-null pointer to struct octep_device. + * @vfid: Index of virtual function. + * @up: boolean status. + * @wait_for_response: poll for response. * * return value: 0 on success, -errno on failure */ int octep_ctrl_net_set_link_status(struct octep_device *oct, int vfid, boo= l up, bool wait_for_response); =20 -/** Set rx state in firmware. +/** + * octep_ctrl_net_set_rx_state() - Set rx state in firmware. * - * @param oct: non-null pointer to struct octep_device. - * @param vfid: Index of virtual function. - * @param up: boolean status. - * @param wait_for_response: poll for response. + * @oct: non-null pointer to struct octep_device. + * @vfid: Index of virtual function. + * @up: boolean status. + * @wait_for_response: poll for response. * * return value: 0 on success, -errno on failure. */ int octep_ctrl_net_set_rx_state(struct octep_device *oct, int vfid, bool u= p, bool wait_for_response); =20 -/** Get mac address from firmware. +/**=20 + * octep_ctrl_net_get_mac_addr() - Get mac address from firmware. * - * @param oct: non-null pointer to struct octep_device. - * @param vfid: Index of virtual function. - * @param addr: non-null pointer to mac address. + * @oct: non-null pointer to struct octep_device. + * @vfid: Index of virtual function. + * @addr: non-null pointer to mac address. * * return value: 0 on success, -errno on failure. */ int octep_ctrl_net_get_mac_addr(struct octep_device *oct, int vfid, u8 *ad= dr); =20 -/** Set mac address in firmware. +/** + * octep_ctrl_net_set_mac_addr() - Set mac address in firmware. * - * @param oct: non-null pointer to struct octep_device. - * @param vfid: Index of virtual function. - * @param addr: non-null pointer to mac address. - * @param wait_for_response: poll for response. + * @oct: non-null pointer to struct octep_device. + * @vfid: Index of virtual function. + * @addr: non-null pointer to mac address. + * @wait_for_response: poll for response. * * return value: 0 on success, -errno on failure. */ int octep_ctrl_net_set_mac_addr(struct octep_device *oct, int vfid, u8 *ad= dr, bool wait_for_response); =20 -/** Set mtu in firmware. +/**=20 + * octep_ctrl_net_set_mtu() - Set mtu in firmware. * - * @param oct: non-null pointer to struct octep_device. - * @param vfid: Index of virtual function. - * @param mtu: mtu. - * @param wait_for_response: poll for response. + * @oct: non-null pointer to struct octep_device. + * @vfid: Index of virtual function. + * @mtu: mtu. + * @wait_for_response: poll for response. * * return value: 0 on success, -errno on failure. */ int octep_ctrl_net_set_mtu(struct octep_device *oct, int vfid, int mtu, bool wait_for_response); =20 -/** Get interface statistics from firmware. +/** + * octep_ctrl_net_get_if_stats() - Get interface statistics from firmware. * - * @param oct: non-null pointer to struct octep_device. - * @param vfid: Index of virtual function. - * @param rx_stats: non-null pointer struct octep_iface_rx_stats. - * @param tx_stats: non-null pointer struct octep_iface_tx_stats. + * @oct: non-null pointer to struct octep_device. + * @vfid: Index of virtual function. + * @rx_stats: non-null pointer struct octep_iface_rx_stats. + * @tx_stats: non-null pointer struct octep_iface_tx_stats. * * return value: 0 on success, -errno on failure. */ @@ -306,23 +314,25 @@ int octep_ctrl_net_get_if_stats(struct octep_device *= oct, int vfid, struct octep_iface_rx_stats *rx_stats, struct octep_iface_tx_stats *tx_stats); =20 -/** Get link info from firmware. +/** + * octep_ctrl_net_get_link_info() - Get link info from firmware. * - * @param oct: non-null pointer to struct octep_device. - * @param vfid: Index of virtual function. - * @param link_info: non-null pointer to struct octep_iface_link_info. + * @oct: non-null pointer to struct octep_device. + * @vfid: Index of virtual function. + * @link_info: non-null pointer to struct octep_iface_link_info. * * return value: 0 on success, -errno on failure. */ int octep_ctrl_net_get_link_info(struct octep_device *oct, int vfid, struct octep_iface_link_info *link_info); =20 -/** Set link info in firmware. +/** + * octep_ctrl_net_set_link_info() - Set link info in firmware. * - * @param oct: non-null pointer to struct octep_device. - * @param vfid: Index of virtual function. - * @param link_info: non-null pointer to struct octep_iface_link_info. - * @param wait_for_response: poll for response. + * @oct: non-null pointer to struct octep_device. + * @vfid: Index of virtual function. + * @link_info: non-null pointer to struct octep_iface_link_info. + * @wait_for_response: poll for response. * * return value: 0 on success, -errno on failure. */ @@ -331,26 +341,29 @@ int octep_ctrl_net_set_link_info(struct octep_device = *oct, struct octep_iface_link_info *link_info, bool wait_for_response); =20 -/** Poll for firmware messages and process them. +/** + * octep_ctrl_net_recv_fw_messages() - Poll for firmware messages and proc= ess them. * - * @param oct: non-null pointer to struct octep_device. + * @oct: non-null pointer to struct octep_device. */ void octep_ctrl_net_recv_fw_messages(struct octep_device *oct); =20 -/** Get info from firmware. +/** + * octep_ctrl_net_get_info() - Get info from firmware. * - * @param oct: non-null pointer to struct octep_device. - * @param vfid: Index of virtual function. - * @param info: non-null pointer to struct octep_fw_info. + * @oct: non-null pointer to struct octep_device. + * @vfid: Index of virtual function. + * @info: non-null pointer to struct octep_fw_info. * * return value: 0 on success, -errno on failure. */ int octep_ctrl_net_get_info(struct octep_device *oct, int vfid, struct octep_fw_info *info); =20 -/** Uninitialize data for ctrl net. +/** + * octep_ctrl_net_uninit() - Uninitialize data for ctrl net. * - * @param oct: non-null pointer to struct octep_device. + * @oct: non-null pointer to struct octep_device. * * return value: 0 on success, -errno on error. */ --=20 2.25.1 From nobody Wed Dec 17 19:08:06 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA5E3C61D9D for ; Wed, 22 Nov 2023 18:34:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344331AbjKVSfA (ORCPT ); Wed, 22 Nov 2023 13:35:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231478AbjKVSe4 (ORCPT ); Wed, 22 Nov 2023 13:34:56 -0500 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3CB41B3; Wed, 22 Nov 2023 10:34:52 -0800 (PST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AMIU3jT010198; Wed, 22 Nov 2023 10:34:45 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=Ad5Pfud6yw74v4+PGflZFf1MJQXBE8TwlIsl0hXwWQw=; b=ZZ2iV9+9eBOfR4W1C3ORmgoxq161jiqlSTbm8PmSlQqFAVYN0BW7NVshiZNpHBARDmLW 06ZYrTmXyrBcnVF2D4LPpH49X/b8FDYpZgubSgLVt1rZnmwKB8SV10bWF0R49m6MMUWC PGKPbe9io3ukVOIZn1PnADnQVT4zOLf9p4t7Se5YkRtUZFhnp+uRmumoF2HEOJxDPels kf4GPrAYLgzlMl/Xgfr69KiOQhYSK4pQNz1+0k5uJs2l8/lKKQZ3FXtgVn+SyMO1wYTD z2ly/IPXYHSkZxfcXDm35hAojPLrB4NbDec/q+Qeg/Yon2c3mZyHeMu+2dHtcM0vFiBm Jg== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3uh1jbcs7x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 22 Nov 2023 10:34:45 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Wed, 22 Nov 2023 10:34:44 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Wed, 22 Nov 2023 10:34:43 -0800 Received: from ubuntu-PowerEdge-T110-II.sclab.marvell.com (unknown [10.106.27.86]) by maili.marvell.com (Postfix) with ESMTP id 9AF8F3F7040; Wed, 22 Nov 2023 10:34:43 -0800 (PST) From: Shinas Rasheed To: , CC: , , , , , , , , , , , , Shinas Rasheed , Veerasenareddy Burru , Sathesh Edara , Eric Dumazet Subject: [PATCH net-next v2 2/2] octeon_ep: get max rx packet length from firmware Date: Wed, 22 Nov 2023 10:34:35 -0800 Message-ID: <20231122183435.2510656-3-srasheed@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231122183435.2510656-1-srasheed@marvell.com> References: <20231122183435.2510656-1-srasheed@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: sS0qxrASVjdDszlCOTrR99-JjLFL4uCp X-Proofpoint-GUID: sS0qxrASVjdDszlCOTrR99-JjLFL4uCp X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-22_13,2023-11-22_01,2023-05-22_02 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Max receive packet length can vary across SoCs, so this needs to be queried from respective firmware and filled by driver. A control net get mtu api should be implemented to do the same. Signed-off-by: Shinas Rasheed --- V2: - Removed OCTEP_MAX_MTU macro as it is redundant. V1: https://lore.kernel.org/all/20231121191224.2489474-1-srasheed@marvell.c= om/ .../ethernet/marvell/octeon_ep/octep_config.h | 2 -- .../marvell/octeon_ep/octep_ctrl_net.c | 18 ++++++++++++++++++ .../marvell/octeon_ep/octep_ctrl_net.h | 10 ++++++++++ .../ethernet/marvell/octeon_ep/octep_main.c | 10 +++++++++- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_config.h b/driver= s/net/ethernet/marvell/octeon_ep/octep_config.h index 91cfa19c65b9..4c937ba5589f 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_config.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_config.h @@ -45,8 +45,6 @@ =20 /* Minimum MTU supported by Octeon network interface */ #define OCTEP_MIN_MTU ETH_MIN_MTU -/* Maximum MTU supported by Octeon interface*/ -#define OCTEP_MAX_MTU (10000 - (ETH_HLEN + ETH_FCS_LEN)) /* Default MTU */ #define OCTEP_DEFAULT_MTU 1500 =20 diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c b/driv= ers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c index 2eeeaa7188b1..5fa596c674da 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c @@ -198,6 +198,24 @@ int octep_ctrl_net_set_mac_addr(struct octep_device *o= ct, int vfid, u8 *addr, return octep_send_mbox_req(oct, &d, wait_for_response); } =20 +int octep_ctrl_net_get_mtu(struct octep_device *oct, int vfid) +{ + struct octep_ctrl_net_wait_data d =3D {}; + struct octep_ctrl_net_h2f_req *req; + int err; + + req =3D &d.data.req; + init_send_req(&d.msg, req, mtu_sz, vfid); + req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_MTU; + req->mtu.cmd =3D OCTEP_CTRL_NET_CMD_GET; + + err =3D octep_send_mbox_req(oct, &d, true); + if (err < 0) + return err; + + return d.data.resp.mtu.val; +} + int octep_ctrl_net_set_mtu(struct octep_device *oct, int vfid, int mtu, bool wait_for_response) { diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h b/driv= ers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h index 02b8fcf890d0..a2463b460ad9 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h @@ -287,6 +287,16 @@ int octep_ctrl_net_get_mac_addr(struct octep_device *o= ct, int vfid, u8 *addr); int octep_ctrl_net_set_mac_addr(struct octep_device *oct, int vfid, u8 *ad= dr, bool wait_for_response); =20 +/** + * octep_ctrl_net_get_mtu() - Get max MTU from firmware. + * + * @oct: non-null pointer to struct octep_device. + * @vfid: Index of virtual function. + * + * return value: mtu on success, -errno on failure. + */ +int octep_ctrl_net_get_mtu(struct octep_device *oct, int vfid); + /**=20 * octep_ctrl_net_set_mtu() - Set mtu in firmware. * diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/= net/ethernet/marvell/octeon_ep/octep_main.c index 2da00a701df2..423eec5ff3ad 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -1307,6 +1307,7 @@ static int octep_probe(struct pci_dev *pdev, const st= ruct pci_device_id *ent) { struct octep_device *octep_dev =3D NULL; struct net_device *netdev; + int max_rx_pktlen; int err; =20 err =3D pci_enable_device(pdev); @@ -1377,8 +1378,15 @@ static int octep_probe(struct pci_dev *pdev, const s= truct pci_device_id *ent) =20 netdev->hw_features =3D NETIF_F_SG; netdev->features |=3D netdev->hw_features; + + max_rx_pktlen =3D octep_ctrl_net_get_mtu(octep_dev, OCTEP_CTRL_NET_INVALI= D_VFID); + if (max_rx_pktlen < 0) { + dev_err(&octep_dev->pdev->dev, + "Failed to get max receive packet size; err =3D %d\n", max_rx_pktlen); + goto register_dev_err; + } netdev->min_mtu =3D OCTEP_MIN_MTU; - netdev->max_mtu =3D OCTEP_MAX_MTU; + netdev->max_mtu =3D max_rx_pktlen - (ETH_HLEN + ETH_FCS_LEN); netdev->mtu =3D OCTEP_DEFAULT_MTU; =20 err =3D octep_ctrl_net_get_mac_addr(octep_dev, OCTEP_CTRL_NET_INVALID_VFI= D, --=20 2.25.1