Received-SPF: pass (google.com: domain of linux-kernel+bounces-14139-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Received-SPF: Pass (protection.outlook.com: domain of duagon.com designates
 194.38.86.34 as permitted sender) receiver=protection.outlook.com;
 client-ip=194.38.86.34; helo=securemail.duagon.com; pr=C
Received-SPF: Pass (protection.outlook.com: domain of duagon.com designates
 20.79.222.204 as permitted sender) receiver=protection.outlook.com;
 client-ip=20.79.222.204; helo=de2-emailsignatures-cloud.codetwo.com; pr=C
From: =?iso-8859-1?Q?Sanju=E1n_Garc=EDa=2C_Jorge?=
	<Jorge.SanjuanGarcia@duagon.com>
To: "davem@davemloft.net" <davem@davemloft.net>, "edumazet@google.com"
	<edumazet@google.com>, "kuba@kernel.org" <kuba@kernel.org>,
	"pabeni@redhat.com" <pabeni@redhat.com>
CC: "s-vadapalli@ti.com" <s-vadapalli@ti.com>, "grygorii.strashko@ti.com"
	<grygorii.strashko@ti.com>, "netdev@vger.kernel.org"
	<netdev@vger.kernel.org>, "linux-kernel@vger.kernel.org"
	<linux-kernel@vger.kernel.org>, =?iso-8859-1?Q?Sanju=E1n_Garc=EDa=2C_Jorge?=
	<Jorge.SanjuanGarcia@duagon.com>
Subject: [PATCH 2/3] net: ethernet: ti: am65-cpsw: Introduce rx_packet_max
 member
Thread-Topic: [PATCH 2/3] net: ethernet: ti: am65-cpsw: Introduce
 rx_packet_max member
Thread-Index: AQHaPVRezQpIKVye7U+GjsdCUkAhwg==
Date: Tue, 2 Jan 2024 08:19:13 +0000
Message-ID: <20240102081825.14635-3-jorge.sanjuangarcia@duagon.com>
References: <20240102081825.14635-1-jorge.sanjuangarcia@duagon.com>
In-Reply-To: <20240102081825.14635-1-jorge.sanjuangarcia@duagon.com>
Accept-Language: es-ES, en-US
Content-Language: en-US
Authentication-Results-Original: dkim=none (message not signed)
 header.d=none;dmarc=none action=none header.from=duagon.com;
X-Microsoft-Antispam-Message-Info-Original:
 dO7HS72PaMdyzbXfar/5MetSb5mIVhF0UG8f/2v6FIiJpTRGYg2SBdvPrp0cbCRgGwFGjZ/qaJm8OL3cKKaYMekKnrkFDUXYoMc0cHHoSkfNAuTuOMoqQ7Whfo3i3WtO3GLxgg7EzKpOgO6WE8NBPWucsCPSQaRLNwLi+ESqSlGbeWkXHLx8AwwAEC4WULMHubpsuOOmWUC4X0L3jUNVO/ALVvvvaP+3Ymlmd48uPUmVzbMoakVpDvQzUhX2m7weNOv/F3OOrjGApn6b8zXPNtfmbS+oACMF5PhSnoDftkzZ0jarNk+NPmtfwOhmJqlRszaoQb/g5hX5J4+IRE1pja/IsmE27WyDwgplFFVubUiX2tpvmMqKukzfzu2LB5rEl9403qNb2dJn/c9H/LvvRdgmLW/jP0X9EsD+pMMI2Sy2DZ1vvhGX4AUfCoe5Grq6+NlIu82DV3ofl7SgLHdXl9fMJC8XDixhmnJH8stdUfHbGp6WHubh22sGAz18eCO4N41/okCoCcKnVGl/08N8EaQaQIKMfztXXQ0NsAbxPP0HpHQ+c7MAhTYkkglGXDuuSQR1Vhovg+8iu9ZB34qwULVLotUauXqbNAL4x7OVQ0zuvoL2yK6NjpUYw0Ymp5VD
X-Forefront-Antispam-Report-Untrusted:
 CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV0P278MB0516.CHEP278.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(136003)(39840400004)(366004)(376002)(396003)(346002)(230922051799003)(451199024)(1800799012)(64100799003)(186009)(2616005)(83380400001)(107886003)(26005)(1076003)(38100700002)(122000001)(41300700001)(8936002)(8676002)(54906003)(316002)(110136005)(4326008)(5660300002)(2906002)(478600001)(71200400001)(6506007)(6512007)(66446008)(76116006)(66556008)(66946007)(64756008)(91956017)(6486002)(66476007)(38070700009)(86362001)(36756003);DIR:OUT;SFP:1102;
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV0P278MB1093
X-CodeTwo-MessageID: 8e86f872-9f70-45e6-854b-6db11b03c2f2.20240102081914@de2-emailsignatures-cloud.codetwo.com
X-CodeTwoProcessed: true
X-EOPAttributedMessage: 1
X-MS-Exchange-Transport-CrossTenantHeadersStripped:
 AM3PEPF0000A799.eurprd04.prod.outlook.com
X-MS-Office365-Filtering-Correlation-Id-Prvs:
 47f68cd4-8fb7-4d82-ced4-08dc0b6b8114
X-Microsoft-Antispam-Untrusted: BCL:0;
X-Microsoft-Antispam-Message-Info-Original:
 0tHJg6Hf4aBCUrO9ONYP19bteb2gn8+xLFAYocGi8Iwx0Yf+gbSjb3hloND/+djuWl4DKo+KU1Mq3MsL1mKT8Fv2vBNAKztRnTDyqcCc8YvY+nncCztgX52eT6LmHxCxVMPQQvynV+906gE7tHd3wmot5qh4oBGEQDEDLahT4vAgXnjG8+YKwv/BrnmsR8e71nM+YWxzFXBdgLxxOLzt8kAZo0gL908DrR7F5I7FuFiuJD1RdnI6Qvf/JTcWp4LvNPgDVHZ0iwM9NqY3aQEXHEyLy2k7umHL1BHkWcjiQ8e1Q7Y1A+qAa7j5DT8NDJ6I3nu68DfEcvBZGYI0yVdD8RsRuTfT5SQQp5TiCExFIfeRqXa2jaoBJBEq5hPraNyWzhsIeM3bIZiBbPpYhaEju5CYigkgqV103J4dTXVIkeWgW3eAeFRalbF1+WtLOqxJ22GgRImoD9kalwcm3bJ0f56WHrlgmpH6Bnavsx6nPeSj+Y4+hkYWbHC2HxF6l+iK9uFkwKhjH7OMy1kUoqsSiW+7iKFbHaEV6tTDmb2YaHQMw9TGPdN55nepspwEUjLwfgruFPCkebQw+XkTkYfzX5DPbiO6CTgLDzywY089EIPb/puizfnvi2+ElEjYNABiSdjuZAUUav9C2LGCh/WFBZMllikOSqLEnykBfEjxCcdr7vVad6JPzWl35U2wHxf3SQj+gGT4PLrzWEwd6nHQVw==
X-Forefront-Antispam-Report-Untrusted:
 CIP:20.79.222.204;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:de2-emailsignatures-cloud.codetwo.com;PTR:de2-emailsignatures-cloud.codetwo.com;CAT:NONE;SFS:(13230031)(136003)(39840400004)(376002)(396003)(346002)(230922051799003)(82310400011)(451199024)(1800799012)(64100799003)(186009)(46966006)(36840700001)(2616005)(83380400001)(47076005)(107886003)(26005)(1076003)(7636003)(336012)(356005)(7596003)(41300700001)(8936002)(8676002)(54906003)(316002)(110136005)(4326008)(5660300002)(2906002)(36860700001)(478600001)(6506007)(6512007)(70206006)(70586007)(6486002)(86362001)(36756003)(40480700001);DIR:OUT;SFP:1102;
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVAP278MB0929
X-MS-Exchange-Transport-CrossTenantHeadersStripped:
 DB5PEPF00014B94.eurprd02.prod.outlook.com
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id-Prvs:
	72c3c2d7-187b-426a-4968-08dc0b6b83f4
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	p4UFARnDckCNj1lmp6poOjXTgpOTbYMKaAyTBb6/6yWcliloXhTRvM95PhTl9eO7abwEsfDfv4VNM/XGH4Bn4BraVvvDShj6FsK1DjKHPUuBH/xqyKxuS/VWUV09l2zlWTEJmQQ9sWAAJmT/JMMZNm/IYrWnp6U4NMCvdXKQA2+aArgDw1MWSZmCxwLxzn77qnlSG9YRH+4MVygJVACIQ1yRihTR1wqLuGNP6Vq0BaGHPxDYiVWv8jfSrapLuJaTh6KJx3L5KRAm+F/UANQzzc+4JvbO8jmdNbj0kbpK+dTnWB5dVKgiNI0dgThbBcA1Ul9ww1AIJUCKb7ZCg+hfwOEi1gZ+bph3/Hai6yRMHMZgFLq9sHtboS0vgoTDdDjzKQeUiNWJvg863YGT5obRta8mXsnlRXgYB8Cn07ftrmpa3T7Ymj5fm8VqbEIzUtD0ReMVab5JuKKmPaGE6KDvu7JZkMJ4Rts04x6d73IErPx1z02KXdylU1MBOU8dRAdZIBLFzJyICgRMNErCSKAQKsAsfjEuCPayz39stMwX14sRAUp+tfljvxtk5LE5YoeGQiMJfcR60U5FsgdghgCAa0MmDkp87q+Of9Wx6cbgcU19LAmyuRjP7z9E2vTeq22+5xVTNY9gMppY2rm+DB/PX3x/LzsiraLpOUDJiKJGcQNfHruB8Joc68cnGh5lHn4VQYT8BDtUHkcOt6AixuwK5nShC/d8NKclqJ9e6GXludVliDcjJQZ2kTitSpqpLzpf
X-Forefront-Antispam-Report:
	CIP:194.38.86.34;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:securemail.duagon.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(136003)(39840400004)(376002)(396003)(346002)(230922051799003)(82310400011)(451199024)(1800799012)(64100799003)(186009)(46966006)(36840700001)(2616005)(83380400001)(47076005)(107886003)(26005)(1076003)(336012)(81166007)(41300700001)(8936002)(8676002)(54906003)(316002)(110136005)(4326008)(5660300002)(2906002)(36860700001)(478600001)(6506007)(6512007)(70206006)(70586007)(6486002)(86362001)(36756003)(40480700001)(36900700001);DIR:OUT;SFP:1102;
X-OriginatorOrg: duagon.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jan 2024 08:19:22.3218
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: b40c304d-b95d-4f60-4a2e-08dc0b6b8687
X-MS-Exchange-CrossTenant-Id: e5e7e96e-8a28-45d6-9093-a40dd5b51a57
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5e7e96e-8a28-45d6-9093-a40dd5b51a57;Ip=[194.38.86.34];Helo=[securemail.duagon.com]
X-MS-Exchange-CrossTenant-AuthSource:
	DB5PEPF00014B94.eurprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV0P278MB1079

The value written to the register AM65_CPSW_PORT_REG_RX_MAXLEN
is currently fixed to what AM65_CPSW_MAX_PACKET_SIZE defines. This
patch prepares the driver so that the maximum received frame length
can be configured in future updates.

Signed-off-by: Jorge Sanjuan Garcia <jorge.sanjuangarcia@duagon.com>
---
 drivers/net/ethernet/ti/am65-cpsw-nuss.c | 13 ++++++++-----
 drivers/net/ethernet/ti/am65-cpsw-nuss.h |  2 ++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/etherne=
t/ti/am65-cpsw-nuss.c
index 378d69b8cb14..a920146d7a60 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -151,9 +151,11 @@ static void am65_cpsw_port_set_sl_mac(struct am65_cpsw=
_port *slave,
=20
 static void am65_cpsw_sl_ctl_reset(struct am65_cpsw_port *port)
 {
+	struct am65_cpsw_common *common =3D port->common;
+
 	cpsw_sl_reset(port->slave.mac_sl, 100);
 	/* Max length register has to be restored after MAC SL reset */
-	writel(AM65_CPSW_MAX_PACKET_SIZE,
+	writel(common->rx_packet_max,
 	       port->port_base + AM65_CPSW_PORT_REG_RX_MAXLEN);
 }
=20
@@ -455,7 +457,7 @@ static int am65_cpsw_nuss_common_open(struct am65_cpsw_=
common *common)
 	       AM65_CPSW_CTL_VLAN_AWARE | AM65_CPSW_CTL_P0_RX_PAD,
 	       common->cpsw_base + AM65_CPSW_REG_CTL);
 	/* Max length register */
-	writel(AM65_CPSW_MAX_PACKET_SIZE,
+	writel(common->rx_packet_max,
 	       host_p->port_base + AM65_CPSW_PORT_REG_RX_MAXLEN);
 	/* set base flow_id */
 	writel(common->rx_flow_id_base,
@@ -507,7 +509,7 @@ static int am65_cpsw_nuss_common_open(struct am65_cpsw_=
common *common)
=20
 	for (i =3D 0; i < common->rx_chns.descs_num; i++) {
 		skb =3D __netdev_alloc_skb_ip_align(NULL,
-						  AM65_CPSW_MAX_PACKET_SIZE,
+						  common->rx_packet_max,
 						  GFP_KERNEL);
 		if (!skb) {
 			ret =3D -ENOMEM;
@@ -848,7 +850,7 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cpsw_c=
ommon *common,
=20
 	k3_cppi_desc_pool_free(rx_chn->desc_pool, desc_rx);
=20
-	new_skb =3D netdev_alloc_skb_ip_align(ndev, AM65_CPSW_MAX_PACKET_SIZE);
+	new_skb =3D netdev_alloc_skb_ip_align(ndev, common->rx_packet_max);
 	if (new_skb) {
 		ndev_priv =3D netdev_priv(ndev);
 		am65_cpsw_nuss_set_offload_fwd_mark(skb, ndev_priv->offload_fwd_mark);
@@ -2196,7 +2198,7 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common=
 *common, u32 port_idx)
 	eth_hw_addr_set(port->ndev, port->slave.mac_addr);
=20
 	port->ndev->min_mtu =3D AM65_CPSW_MIN_PACKET_SIZE;
-	port->ndev->max_mtu =3D AM65_CPSW_MAX_PACKET_SIZE -
+	port->ndev->max_mtu =3D common->rx_packet_max -
 			      (VLAN_ETH_HLEN + ETH_FCS_LEN);
 	port->ndev->hw_features =3D NETIF_F_SG |
 				  NETIF_F_RXCSUM |
@@ -2926,6 +2928,7 @@ static int am65_cpsw_nuss_probe(struct platform_devic=
e *pdev)
 		return -ENOENT;
=20
 	common->rx_flow_id_base =3D -1;
+	common->rx_packet_max =3D AM65_CPSW_MAX_PACKET_SIZE;
 	init_completion(&common->tdown_complete);
 	common->tx_ch_num =3D AM65_CPSW_DEFAULT_TX_CHNS;
 	common->pf_p0_rx_ptype_rrobin =3D false;
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.h b/drivers/net/etherne=
t/ti/am65-cpsw-nuss.h
index f3dad2ab9828..141160223d73 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.h
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.h
@@ -130,6 +130,8 @@ struct am65_cpsw_common {
 	u32			tx_ch_rate_msk;
 	u32			rx_flow_id_base;
=20
+	int			rx_packet_max;
+
 	struct am65_cpsw_tx_chn	tx_chns[AM65_CPSW_MAX_TX_QUEUES];
 	struct completion	tdown_complete;
 	atomic_t		tdown_cnt;
--=20
2.34.1