From nobody Fri Apr 3 03:01:33 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C127313545; Wed, 25 Mar 2026 16:28:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774456136; cv=none; b=HjL4Xr4tCJZhxEhXzhKN0rWAGwmsUdJYb8jx6RHCUz1BpJY/iX8gDkBw43zYMou99RBS/9+off0AdQ+w72AUSvy5zW2qKNKt9rDW5I24aXiw3kCu1oKZ9k7UBywx+hY4GasdTsgh6eezhBQ81Tue3nZ5fgYJ0wCpHBjNaCCJcvY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774456136; c=relaxed/simple; bh=/GOCQoMgSCnMdAsfootrNAXNB36Qw+5kApOdsouWTrg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IjAQ69HhZo6omhVRRRfrZOHNfglNfCkER32CjQguIkyedHVzieMIbfZG6wyOuTKqnkvq6zlnNiD9m86gRAkKDAoufamqSIrjfbm5O1cTb6hDmeKEo22VWELr6smTqAaK9xJcOl2zxReXM+thCJDozKBerdP2/6al8Pi19I7YNRg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mhjsYCkm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mhjsYCkm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B359EC19423; Wed, 25 Mar 2026 16:28:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774456136; bh=/GOCQoMgSCnMdAsfootrNAXNB36Qw+5kApOdsouWTrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mhjsYCkmXPLXlS5hIkSmVNAP9VL07zgHD3Zvx6um6gLb2T2EbGKWBzhhpiCdDkwVH CNs2Ur2EP9voDypZrBSYCRQ6CFQQAdpJvPSVxamUi/yL5mcEI0BFoHdmdRXwdSB+cs KuZu840UFgZhQqrjUl/EKSqeUYRVNYCiyg7LdYmIDmeEqhA/WJ5xlx8l/v62l73tad Hka8/Ac9LcvCV7kEKxQ8H02tV1euEgPYX451LKp9Uu2syurqtOLP0OVoOuiLvk3DjA 56mhXsAm+NYKqfnYtDZnOCJDa72GqgVIOaQOYQHcbAnqIcrQHxJRcuH1+CbQHITQ7p RG+WSwXdWHw8A== From: Conor Dooley To: netdev@vger.kernel.org Cc: conor@kernel.org, Conor Dooley , Valentina.FernandezAlanis@microchip.com, Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Daire McNamara , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Nicolas Ferre , Claudiu Beznea , Richard Cochran , Samuel Holland , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Dave Stevenson , Sean Anderson , Vineeth Karumanchi , Abin Joseph , =?UTF-8?q?Th=C3=A9o=20Lebrun?= , Ryan.Wanner@microchip.com, Kevin Hao Subject: [PATCH net-next v5 01/14] Revert "net: macb: Clean up the .usrio settings in macb_config instances" Date: Wed, 25 Mar 2026 16:28:05 +0000 Message-ID: <20260325-rundown-unrushed-dd82c9f5c56c@spud> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325-unsterile-flail-4c7729750dc4@spud> References: <20260325-unsterile-flail-4c7729750dc4@spud> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5036; i=conor.dooley@microchip.com; h=from:subject:message-id; bh=wNAu33LueieiL9BYBWizySOKUamk9hJkFHlIq4AwGik=; b=owGbwMvMwCVWscWwfUFT0iXG02pJDJlHeE0M1P3X3Lq4yPVBftIztQarf4oTjyQv+SL0ovecz eJJfG+dO0pZGMS4GGTFFFkSb/e1SK3/47LDuectzBxWJpAhDFycAjARPmVGhuvZOTemRWg/+3KW y/zZ35tNDjWPLmVvfDbhlaBPiezMpwmMDB2zt82KDGoImPDn8fx3/Kn9ixYdb9Z+EzRNpX1HgYP GRC4A X-Developer-Key: i=conor.dooley@microchip.com; a=openpgp; fpr=F9ECA03CF54F12CD01F1655722E2C55B37CF380C Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Conor Dooley Commit 0ae998c4efd69 ("net: macb: Clean up the .usrio settings in macb_config instances") was a misguided attempt to clean up the driver that actually just propagated problematic code. The default for usrio is actually no usrio, and already there are issues with people using the problematically named "macb_default_usrio" on platforms where the usrio does not have this so-called default behaviour. usrio is platform specific and using the default at91 usrio settings should be opt-in only. Revert the "cleanup" patch. Signed-off-by: Conor Dooley --- drivers/net/ethernet/cadence/macb_main.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/etherne= t/cadence/macb_main.c index 1cb49252abf5a..a48160da6e672 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -5513,31 +5513,37 @@ static const struct macb_config fu540_c000_config = =3D { .clk_init =3D fu540_c000_clk_init, .init =3D fu540_c000_init, .jumbo_max_len =3D 10240, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config at91sam9260_config =3D { .caps =3D MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config sama5d3macb_config =3D { .caps =3D MACB_CAPS_SG_DISABLED | MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config pc302gem_config =3D { .caps =3D MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE, .dma_burst_length =3D 16, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config sama5d2_config =3D { .caps =3D MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII | MACB_CAPS_JUMBO, .dma_burst_length =3D 16, .jumbo_max_len =3D 10240, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config sama5d29_config =3D { .caps =3D MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII | MACB_CAPS_GEM_HAS_PTP, .dma_burst_length =3D 16, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config sama5d3_config =3D { @@ -5545,21 +5551,25 @@ static const struct macb_config sama5d3_config =3D { MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII | MACB_CAPS_JUMBO, .dma_burst_length =3D 16, .jumbo_max_len =3D 10240, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config sama5d4_config =3D { .caps =3D MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII, .dma_burst_length =3D 4, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config emac_config =3D { .caps =3D MACB_CAPS_NEEDS_RSTONUBR | MACB_CAPS_MACB_IS_EMAC, .clk_init =3D at91ether_clk_init, .init =3D at91ether_init, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config np4_config =3D { .caps =3D MACB_CAPS_USRIO_DISABLED, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config zynqmp_config =3D { @@ -5569,12 +5579,14 @@ static const struct macb_config zynqmp_config =3D { .dma_burst_length =3D 16, .init =3D init_reset_optional, .jumbo_max_len =3D 10240, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config zynq_config =3D { .caps =3D MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_NO_GIGABIT_HALF | MACB_CAPS_NEEDS_RSTONUBR, .dma_burst_length =3D 16, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config mpfs_config =3D { @@ -5583,6 +5595,7 @@ static const struct macb_config mpfs_config =3D { MACB_CAPS_GEM_HAS_PTP, .dma_burst_length =3D 16, .init =3D init_reset_optional, + .usrio =3D &macb_default_usrio, .max_tx_length =3D 4040, /* Cadence Erratum 1686 */ .jumbo_max_len =3D 4040, }; @@ -5611,6 +5624,7 @@ static const struct macb_config versal_config =3D { .dma_burst_length =3D 16, .init =3D init_reset_optional, .jumbo_max_len =3D 10240, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config eyeq5_config =3D { @@ -5620,6 +5634,7 @@ static const struct macb_config eyeq5_config =3D { .dma_burst_length =3D 16, .init =3D eyeq5_init, .jumbo_max_len =3D 10240, + .usrio =3D &macb_default_usrio, }; =20 static const struct macb_config raspberrypi_rp1_config =3D { @@ -5628,6 +5643,7 @@ static const struct macb_config raspberrypi_rp1_confi= g =3D { MACB_CAPS_GEM_HAS_PTP | MACB_CAPS_EEE, .dma_burst_length =3D 16, + .usrio =3D &macb_default_usrio, .jumbo_max_len =3D 10240, }; =20 @@ -5675,6 +5691,7 @@ static const struct macb_config default_gem_config = =3D { MACB_CAPS_JUMBO | MACB_CAPS_GEM_HAS_PTP, .dma_burst_length =3D 16, + .usrio =3D &macb_default_usrio, .jumbo_max_len =3D 10240, }; =20 @@ -5761,7 +5778,7 @@ static int macb_probe(struct platform_device *pdev) bp->wol =3D 0; device_set_wakeup_capable(&pdev->dev, 1); =20 - bp->usrio =3D macb_config->usrio ? : &macb_default_usrio; + bp->usrio =3D macb_config->usrio; =20 /* By default we set to partial store and forward mode for zynqmp. * Disable if not set in devicetree. --=20 2.53.0