From mboxrd@z Thu Jan 1 00:00:00 1970 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 92251399011; Mon, 30 Mar 2026 09:02:41 +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=1774861361; cv=none; b=KjEwpHnEQEUljA0xkVFrFjXMvVpXojITGMy/491L/ewr9/1Ox/jweadif42+Xr//zYtPoME+Vfdp/JiShPlmyXj9qdUwKLfiNU5hkf5mP7V1F4EQm5ZBKP+jIL5wkNbtt2qlg9Dx3QwJxIHX7eWStMyeVW8gUt6BjQfT9lv7c6U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774861361; c=relaxed/simple; bh=qRDiLQ7/Xx7OWinJo708eydLzcr8WmKcb0zRtIsdSO8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=AEgMZLE3t4o6o7Lbrrtbqmm2NSqnNEJrY2ZqVbyep4suWuxRiUuUeIdBicE+S6QgIymEBWC0ZaZolNbbOoF1KN2gUpRxzzhV9jy9ushGqp4A3CzSJEYTJ3bhDpebxiiVzFycD552qzQFfKLzCJTSX42OHJAYDrLCVbU4teC/67M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hHXjhEmZ; 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="hHXjhEmZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F7CBC2BCF5; Mon, 30 Mar 2026 09:02:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774861361; bh=qRDiLQ7/Xx7OWinJo708eydLzcr8WmKcb0zRtIsdSO8=; h=From:To:Cc:Subject:Date:From; b=hHXjhEmZZxDEryQivP7+OwcpVMgA5oBn8cpG9Bk9N/iLWFqC8zyStSkdTZlsQ2vCn IxAj6WpNay1JuUaYnqoFTx0Y1YmO7Ua83XblC+OekvpKYGNJ1OAWLXJMeOeZu4+Tic 4xZcS4VgIttR4bxu6P0NboTqUUSc1QDXis720VsDg/XMJWm+ha69coHzaxhvmpuJjl BzVJgMZtVvq2EcsJyokY9ejZ5CHZniuEqaZEeYII/D9v5ERHFw8GrSSB23jc+7fQx4 t/qFv0qPFG2Yu+V0ybZoYwTQxZLVy4JkDZolzC2cepGKGLa4Z9GPaJJU58fMc4hUti LOGv6tSOyhEaQ== From: Conor Dooley To: netdev@vger.kernel.org Cc: conor@kernel.org, Conor Dooley , kernel test robot , Jiawen Wu , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Nicolas Ferre , Claudiu Beznea , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH net-next v1] net: macb: fix use of at91_default_usrio without CONFIG_OF Date: Mon, 30 Mar 2026 10:02:00 +0100 Message-ID: <20260330-overture-cactus-c8eb7b9cbecc@spud> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3605; i=conor.dooley@microchip.com; h=from:subject:message-id; bh=A1BubFgGNTU8Lrl5NTMqEeZD7ZkkVzsO+2Mw4LraCwo=; b=owGbwMvMwCVWscWwfUFT0iXG02pJDJmnbLheGWkVLNMQ2R+3+ewm89UXxPTfW7DuWbrdcmX3F 57IqzrLOkpZGMS4GGTFFFkSb/e1SK3/47LDuectzBxWJpAhDFycAjCRU7sZ/udrS7FEZQZeS9Hv PHfuk+fWm+ez5/xsuLnms3Ze3O4NTD8Z/sf1HliytJTxU16fzcXye71ax980ddhvuTbzSmrY3LX 22jwA X-Developer-Key: i=conor.dooley@microchip.com; a=openpgp; fpr=F9ECA03CF54F12CD01F1655722E2C55B37CF380C Content-Transfer-Encoding: 8bit From: Conor Dooley If CONFIG_OF is not enabled, at91_default_usrio is used undeclared in gem_default_config. Rather than move the struct around, take the opportunity to rename gem_default_config, as the only compatible it is ever used for is "cdns,macb" - not "cdns,gem" at all! With that done, remove the use of default_gem_config as a fallback in probe, as every device has a specific set of match data. It pains me a little to leave at91_default_usrio in match data used by "cdns,macb", but this is probably required to avoid regressing anyone. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202603280028.wQjUrIvv-lkp@intel.com/ Reported-by: Jiawen Wu Closes: https://lore.kernel.org/all/06a701dcc014$86def5b0$949ce110$@trustnetic.com/ Fixes: a17871778ee28 ("net: macb: rename macb_default_usrio to at91_default_usrio as not all platforms have mii mode control in usrio") Signed-off-by: Conor Dooley --- lkp also reported this over the weekend, but against the dev copy in my tree. I had thought that CONFIG_OF was standard off on x86, but I guess it isn't, given lkp didn't catch it until randconfigs. CC: Andrew Lunn CC: David S. Miller CC: Eric Dumazet CC: Jakub Kicinski CC: Paolo Abeni CC: Nicolas Ferre CC: Claudiu Beznea CC: netdev@vger.kernel.org CC: devicetree@vger.kernel.org CC: linux-kernel@vger.kernel.org CC: linux-riscv@lists.infradead.org --- drivers/net/ethernet/cadence/macb_main.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 12e2b2f4aaf88..4f70e4fcf4606 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -5716,9 +5716,18 @@ static const struct macb_config pic64hpsc_config = { .jumbo_max_len = 16383, }; +static const struct macb_config macb_macb_config = { + .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | + MACB_CAPS_JUMBO | + MACB_CAPS_GEM_HAS_PTP, + .dma_burst_length = 16, + .usrio = &at91_default_usrio, + .jumbo_max_len = 10240, +}; + static const struct of_device_id macb_dt_ids[] = { { .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config }, - { .compatible = "cdns,macb" }, + { .compatible = "cdns,macb", .data = &macb_macb_config}, { .compatible = "cdns,np4-macb", .data = &np4_config }, { .compatible = "cdns,pc302-gem", .data = &pc302gem_config }, { .compatible = "cdns,gem", .data = &pc302gem_config }, @@ -5747,15 +5756,6 @@ static const struct of_device_id macb_dt_ids[] = { MODULE_DEVICE_TABLE(of, macb_dt_ids); #endif /* CONFIG_OF */ -static const struct macb_config default_gem_config = { - .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | - MACB_CAPS_JUMBO | - MACB_CAPS_GEM_HAS_PTP, - .dma_burst_length = 16, - .usrio = &at91_default_usrio, - .jumbo_max_len = 10240, -}; - static int macb_probe(struct platform_device *pdev) { struct clk *pclk, *hclk = NULL, *tx_clk = NULL, *rx_clk = NULL; @@ -5778,7 +5778,7 @@ static int macb_probe(struct platform_device *pdev) macb_config = of_device_get_match_data(&pdev->dev); if (!macb_config) - macb_config = &default_gem_config; + return -EINVAL; err = macb_clk_init(pdev, &pclk, &hclk, &tx_clk, &rx_clk, &tsu_clk, macb_config); -- 2.53.0