From patchwork Wed Jun 7 13:59:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 104471 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp307773rwl; Wed, 7 Jun 2023 05:16:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5GpKQQUp+GTTgTtOQbk3heu4uYZFrEKxWp23VH9YDG81mbGm96vI8VCNRphiJRKntbdbo/ X-Received: by 2002:a05:6a20:914b:b0:117:c3f8:2f40 with SMTP id x11-20020a056a20914b00b00117c3f82f40mr1291614pzc.13.1686140168519; Wed, 07 Jun 2023 05:16:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686140168; cv=none; d=google.com; s=arc-20160816; b=qu/Lt+SGWjKlFpJDRjb6tizH51zCT4kmuEpY5p22sIqQyT+gyvrfCv0UdSTKhZk+2d kmZyCp7AEMZ9cT1L4qo99v45pBymZaXqPvuJb6SqUBX6uW1tMCU4h1MMEMDXRipklQKf 22uXC2uYmQhoMiJDMMSrxSbB8haPeN1OkPo9qO87zBP6s0zFdgfnrYWROwcUrrrDkt5J O8IPYI5Ymnmh7ezK/C2vuCI1U7mzXjSdK+ssfAxelPaBfwHL1pMbutWm7dV2STBBWsnb ge+CpQRrWBtgq5MzgCp3gyxw0h/RPhRPBRyUWLGe7B8ZKD7bBJdhO1PVbDgRbOMqFqPf uwTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6WgS2itewXgwIqmxjlbCVju713PZbtSt5czOzpTuXBA=; b=RFGcfedOPypScALXgiSq1xpSeW6/z0ffjeTIFKzzOix+liyEAEgs16UsFJvBFMX0Cq lL9DV37t1pqcVKv2S3OGXGVVk+4AanBuSF1OKZgbL853SOZkBvnGr+sFsGoSOMmawIOO cyKvcllEWsGJBFFxerFOrNDagWgyMyjeX1aGD5szUnwMDsOGrQUuVxzgoodLxrkD5B9o a4B5hp+AX4ggVksYDUe+fFvxTi8nwEjl4eUT7jCI0kvEsfXuOmcITaK9TWaiC1ZRLJ7i UiMjP7rK2Jdj+SogQSxWbSP/it1qNGMHcXNkvhJ1OtIu9QTvrg8O26ugLuGTtw3ibz6N AtAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=INw8V+2U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a23-20020aa79717000000b0065cb0204891si4305347pfg.82.2023.06.07.05.15.52; Wed, 07 Jun 2023 05:16:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=INw8V+2U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240012AbjFGMIW (ORCPT + 99 others); Wed, 7 Jun 2023 08:08:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239526AbjFGMIV (ORCPT ); Wed, 7 Jun 2023 08:08:21 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::224]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF3F51BD4; Wed, 7 Jun 2023 05:08:19 -0700 (PDT) X-GND-Sasl: maxime.chevallier@bootlin.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1686139698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6WgS2itewXgwIqmxjlbCVju713PZbtSt5czOzpTuXBA=; b=INw8V+2UyFA/SPRFanuth0K/BngfjNL1jgchzheesyHYptmp5GvGnc+eRJ3pkV5Gs1jTRf u000j3TuffrZhH+D4bfp2tGaxRae2v5NO547fXC+VWipEBuHWo1969nY0W7t6xUtCWbJGo 9lPidmLHPTrqJxsOs0RFWaFWlI45okDOx6QBUJTYWugXu4nEN2ohE5cMINXi+rMJRRF6ua jn0ivkiOYqYr8+Dors43NrstoqhZbrv8fAgd+F4GTPi9pQpuVDtQIDTIrX8SMb0ofGrr97 26hwkPgxT8FC8tdyYIP4qg6TNqjAmUlJkobM+Bcz/EUrW9m6mfi1D5M8TQaDRQ== X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id EAB9DE000D; Wed, 7 Jun 2023 12:08:15 +0000 (UTC) From: Maxime Chevallier To: davem@davemloft.net Cc: Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, alexis.lothore@bootlin.com, thomas.petazzoni@bootlin.com, Andrew Lunn , Jakub Kicinski , Eric Dumazet , Paolo Abeni , Florian Fainelli , Heiner Kallweit , Russell King , Vladimir Oltean , Ioana Ciornei , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Maxime Coquelin , Jose Abreu , Alexandre Torgue , Giuseppe Cavallaro , Simon Horman , Maciej Fijalkowski , Feiyang Chen Subject: [PATCH net-next v4 1/5] net: altera-tse: Initialize local structs before using it Date: Wed, 7 Jun 2023 15:59:37 +0200 Message-Id: <20230607135941.407054-2-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230607135941.407054-1-maxime.chevallier@bootlin.com> References: <20230607135941.407054-1-maxime.chevallier@bootlin.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768046113221501616?= X-GMAIL-MSGID: =?utf-8?q?1768046113221501616?= The regmap_config and mdio_regmap_config objects needs to be zeroed before using them. This will cause spurious errors at probe time as config->pad_bits is containing random uninitialized data. Fixes: db48abbaa18e ("net: ethernet: altera-tse: Convert to mdio-regmap and use PCS Lynx") Signed-off-by: Maxime Chevallier --- V3->V4 : Also zero "mrc" from Maciej's review V2->V3 : No changes V1->V2 : No changes drivers/net/ethernet/altera/altera_tse_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c index d866c0f1b503..215f9fb89c5b 100644 --- a/drivers/net/ethernet/altera/altera_tse_main.c +++ b/drivers/net/ethernet/altera/altera_tse_main.c @@ -1255,6 +1255,8 @@ static int altera_tse_probe(struct platform_device *pdev) if (ret) goto err_free_netdev; + memset(&pcs_regmap_cfg, 0, sizeof(pcs_regmap_cfg)); + memset(&mrc, 0, sizeof(mrc)); /* SGMII PCS address space. The location can vary depending on how the * IP is integrated. We can have a resource dedicated to it at a specific * address space, but if it's not the case, we fallback to the mdiophy0 From patchwork Wed Jun 7 13:59:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 104478 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp320922rwl; Wed, 7 Jun 2023 05:35:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4HI6/kP3mi/fHnvtE4zoBvlDaFnOMSy0QZa8/nJtF6eizRL+c1144xw1H2pVxEEZpDX0bH X-Received: by 2002:a05:6a20:6a0d:b0:10b:f590:5a1f with SMTP id p13-20020a056a206a0d00b0010bf5905a1fmr1338093pzk.0.1686141316533; Wed, 07 Jun 2023 05:35:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686141316; cv=none; d=google.com; s=arc-20160816; b=VFbBC6rFcTSr/FWJe/dS32q1yZWvWYZCpQK0B/ZAVXC+i/FThiKJjzlEvMHLzluMGH LtDf9HEtyR/bqBujQDfDS9biYzQ+G1YAExXS0eEfbYK/yFFnssZFcqstMNcn8hXDPlIE BMvgymd7NHNBkbHLsbEtMkRRTb6H3/tokyjetU5kAm51bvQAqvLSyr40NYUnsaR+Zdhj vwFCST4YhjQXcGbMMfZ3IUuS11wkZZOqd4Od1ASvpMRHxPEMreoHndhj6HvgykbfUVZS Bmr1455AE2B0NvcZiYER1nfTUGkybW0hvK6C3+yZoPIz5aFTKmL4OklIY7Si6t2FxjIl ZvSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=At0AjpP7baWbSDLanUe9mFxHCTEVmm+qTfAUCvB7Gp8=; b=K61ZUuI9d/c0wcQ3HYmXpC3wZgQzzB6WqBE8DXDWHI4aYKDIlQqL6WlTS9mkKW/73E DC0fLJs92z1abt4XcM3nvG7xWWVPKFFiZm5rwNGPnf1xhV/Z11TKsHwdQw6tMg6njlSD jPniLFwKsV+RD/Niztt1/BDZFU/BY1/fDLS5XkE/btCe2u7GUO6zc2n84bp5aFGKDPjx TdPJpwXe5l+mJD+aC5ENJwRk51iUjkH32ZFFwOSaBO1PvUKbKpdX7k0gEd2N1PgDtD+y UVe8pHZTpaxqqEfeIf7X0rQyLq6UeJq0VEWhGHtLXKzuJAowK00xL59TdlzlFQH8uVIi Njsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=dQMSXiIW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c20-20020a624e14000000b0064e5f4ef6d9si8111806pfb.250.2023.06.07.05.35.01; Wed, 07 Jun 2023 05:35:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=dQMSXiIW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240479AbjFGMI5 (ORCPT + 99 others); Wed, 7 Jun 2023 08:08:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240227AbjFGMIX (ORCPT ); Wed, 7 Jun 2023 08:08:23 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A95B1BD6; Wed, 7 Jun 2023 05:08:21 -0700 (PDT) X-GND-Sasl: maxime.chevallier@bootlin.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1686139700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=At0AjpP7baWbSDLanUe9mFxHCTEVmm+qTfAUCvB7Gp8=; b=dQMSXiIW3ZWK0uFu2pu1VSHFpPXVLAHgvFKT8zjRVURaM47m9LfzUQygnPD5QLsZKNeUSf 0s/oLjaS8mTjTAOxjUGxDcL/x1TSZ5qfyyfF2klC7b9vQ58bVNdQpMxXpOlIQTW2+kbarU 1AwqItuhADOeUwOl8WnaP4Pg1g1EbsuzCPsyVzD/NCqmmm0zokKFqLjF+jz5+C5s05AU0k rRPbTJFlZsseWdPft8CGQ0BC+BPaTIStpdlZ7ymUm3xeAgMA8K+pCwqfr8fK8rsAphqBkT Os652C7hkCVRjY2e4lxZPPR12yRLj+b4lVCIFVFc0nXmwjenOuvF5upae5axKw== X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id AA75FE0011; Wed, 7 Jun 2023 12:08:18 +0000 (UTC) From: Maxime Chevallier To: davem@davemloft.net Cc: Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, alexis.lothore@bootlin.com, thomas.petazzoni@bootlin.com, Andrew Lunn , Jakub Kicinski , Eric Dumazet , Paolo Abeni , Florian Fainelli , Heiner Kallweit , Russell King , Vladimir Oltean , Ioana Ciornei , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Maxime Coquelin , Jose Abreu , Alexandre Torgue , Giuseppe Cavallaro , Simon Horman , Maciej Fijalkowski , Feiyang Chen Subject: [PATCH net-next v4 2/5] net: altera_tse: Use the correct Kconfig option for the PCS_LYNX dependency Date: Wed, 7 Jun 2023 15:59:38 +0200 Message-Id: <20230607135941.407054-3-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230607135941.407054-1-maxime.chevallier@bootlin.com> References: <20230607135941.407054-1-maxime.chevallier@bootlin.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768047316949419544?= X-GMAIL-MSGID: =?utf-8?q?1768047316949419544?= Use the correct Kconfig dependency for altera_tse as PCS_ALTERA_TSE was replaced by PCS_LYNX. Fixes: db48abbaa18e ("net: ethernet: altera-tse: Convert to mdio-regmap and use PCS Lynx") Signed-off-by: Maxime Chevallier --- V3->V4 : No changes V2->V3 : Fix a typo in the commit title V1->V2 : New patch drivers/net/ethernet/altera/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/altera/Kconfig b/drivers/net/ethernet/altera/Kconfig index 93533ba03429..17985319088c 100644 --- a/drivers/net/ethernet/altera/Kconfig +++ b/drivers/net/ethernet/altera/Kconfig @@ -4,7 +4,7 @@ config ALTERA_TSE depends on HAS_DMA select PHYLIB select PHYLINK - select PCS_ALTERA_TSE + select PCS_LYNX select MDIO_REGMAP select REGMAP_MMIO help From patchwork Wed Jun 7 13:59:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 104473 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp316419rwl; Wed, 7 Jun 2023 05:28:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4F4sfQDA3vSFpaKIyaLLx2VxCb26ojjjFQ19VYRTbEJ9wnDZYp1E0Bufybb2drFiNyEbtk X-Received: by 2002:a05:6a00:238c:b0:658:cbf1:d05a with SMTP id f12-20020a056a00238c00b00658cbf1d05amr2709287pfc.3.1686140935681; Wed, 07 Jun 2023 05:28:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686140935; cv=none; d=google.com; s=arc-20160816; b=O7xmD2zacs1ueWDRVLWdiscpkeRidyr5O99P2XEp5ahnfwkn9gwLFlGz0wyuidcTPx 86u69l2crRNutEKAtZpK3SmVypSuVYA2GxlQV5k4gCisVWF3nDR7f33N1MdpuzS0KglP KVS3kPN/VFOQHdjEZ3Sq20V2iG0z6BNDWi3WNWOagctDh4DE4/HnnuTtz/i2us45Lw5h fNU2rzlfmti6uvX37N9Y5NO03ccq0DReveMoo3/e2w2up8OPcZQLH01BCVVaedlFGoSv qsOBoPzE2XxeQyUn5xkmO7BE8As8o3ltC3ma5SVDwv7nD9F/1j+km6VToFAkHz3gGK+r YUvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JAZzarZqhM2iVjfpFiTJa4PhaSPy8dShUtf29Ng6/6c=; b=UEu8o86DgPBUcPh2zbsqtaztjigZaZtU0Bb/NaNO/Y+G+IwQik/nxNdKAxhxFxGw8J sC+8H8SWMTs+Jd/Gy/hZ/RpHkNEu6/+DUn3h7o26QWtCTYy+EfJnMNw7gh9p9R43cNT7 FZSviRS6NQnQm9t0F0JIxKd/X2LFf7vfBgzdD8lB+/sDZjdLYpTALN1EGHJojVK9kAg1 dHmiaiy1gT0A+sgsRTC6i2TOPcsp8q6FiwYt28Ff57lcXQDBBvykJqN4ZTLvYSPXT0q8 oDrVrhrDUDnbtLOor9D/xtzZLDChUEw1XRzZkw+48ObQjdPbIGgTM9d7qk/iabdfJK9r HZYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=YxldgSAc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v123-20020a626181000000b0063b85b18764si8627663pfb.219.2023.06.07.05.28.41; Wed, 07 Jun 2023 05:28:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=YxldgSAc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240519AbjFGMJB (ORCPT + 99 others); Wed, 7 Jun 2023 08:09:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240495AbjFGMI0 (ORCPT ); Wed, 7 Jun 2023 08:08:26 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63F591BDA; Wed, 7 Jun 2023 05:08:24 -0700 (PDT) X-GND-Sasl: maxime.chevallier@bootlin.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1686139703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JAZzarZqhM2iVjfpFiTJa4PhaSPy8dShUtf29Ng6/6c=; b=YxldgSAcYSesTyWKUeEpxssivRO2lMjbEBJ77yE0epqggeY6sbg/z8rajFXfHTPIfYDxVn xAYbLzj5wlB7whJ1PQLOhAilmC/Vlo/ZcmyGZSnsQX4INlswuMvHygawRRQY0soXE2Mjog saE6hlbl+wJoVkxrgECrIETaMuYVhxV3V2bSOVQc6SpMhAp/aJBSa+7jwLwo7fbeXatvOU A4r1AFQ07ul9QDae+xDRZlOXdX87a4TTSJB97ccP82vZHiicGWITB/2TZqgnmCf3OiPWQB uHOUkhgFHu0rdG0qnSybOzpx5jeoChUcdrCyaZO+Q3me7uBLGcM0lfhwyWtn7A== X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id E559CE0012; Wed, 7 Jun 2023 12:08:20 +0000 (UTC) From: Maxime Chevallier To: davem@davemloft.net Cc: Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, alexis.lothore@bootlin.com, thomas.petazzoni@bootlin.com, Andrew Lunn , Jakub Kicinski , Eric Dumazet , Paolo Abeni , Florian Fainelli , Heiner Kallweit , Russell King , Vladimir Oltean , Ioana Ciornei , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Maxime Coquelin , Jose Abreu , Alexandre Torgue , Giuseppe Cavallaro , Simon Horman , Maciej Fijalkowski , Feiyang Chen , Russell King Subject: [PATCH net-next v4 3/5] net: stmmac: make the pcs_lynx cleanup sequence specific to dwmac_socfpga Date: Wed, 7 Jun 2023 15:59:39 +0200 Message-Id: <20230607135941.407054-4-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230607135941.407054-1-maxime.chevallier@bootlin.com> References: <20230607135941.407054-1-maxime.chevallier@bootlin.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768046917565482614?= X-GMAIL-MSGID: =?utf-8?q?1768046917565482614?= So far, only the dwmac_socfpga variant of stmmac uses PCS Lynx. Use a dedicated cleanup sequence for dwmac_socfpga instead of using the generic stmmac one. Fixes: 5d1f3fe7d2d5 ("net: stmmac: dwmac-sogfpga: use the lynx pcs driver") Suggested-by: Russell King (Oracle) Signed-off-by: Maxime Chevallier --- V3->V4 : No changes V2->V3 : Removed extra whiteline V1->V2 : New patch drivers/net/ethernet/stmicro/stmmac/common.h | 1 - .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 14 +++++++++++++- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 3 --- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h index 52c5ec553276..16e67c18b6f7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #if IS_ENABLED(CONFIG_VLAN_8021Q) #define STMMAC_VLAN_TAG_USED diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c index e399fccbafe5..1fb808be843b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -494,6 +495,17 @@ static int socfpga_dwmac_probe(struct platform_device *pdev) return ret; } +static void socfpga_dwmac_remove(struct platform_device *pdev) +{ + struct net_device *ndev = platform_get_drvdata(pdev); + struct stmmac_priv *priv = netdev_priv(ndev); + struct phylink_pcs *pcs = priv->hw->lynx_pcs; + + stmmac_pltfr_remove(pdev); + + lynx_pcs_destroy(pcs); +} + #ifdef CONFIG_PM_SLEEP static int socfpga_dwmac_resume(struct device *dev) { @@ -565,7 +577,7 @@ MODULE_DEVICE_TABLE(of, socfpga_dwmac_match); static struct platform_driver socfpga_dwmac_driver = { .probe = socfpga_dwmac_probe, - .remove_new = stmmac_pltfr_remove, + .remove_new = socfpga_dwmac_remove, .driver = { .name = "socfpga-dwmac", .pm = &socfpga_dwmac_pm_ops, diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c index c784a6731f08..3db1cb0fd160 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c @@ -665,9 +665,6 @@ int stmmac_mdio_unregister(struct net_device *ndev) if (priv->hw->xpcs) xpcs_destroy(priv->hw->xpcs); - if (priv->hw->lynx_pcs) - lynx_pcs_destroy(priv->hw->lynx_pcs); - mdiobus_unregister(priv->mii); priv->mii->priv = NULL; mdiobus_free(priv->mii); From patchwork Wed Jun 7 13:59:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 104475 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp319054rwl; Wed, 7 Jun 2023 05:32:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ70EwaoOlCP09xe4Yb3HUFPhWADByhVh548GbUnkkRQbLwXHWkG2tsUFF/P1tqsgN+BQusK X-Received: by 2002:a17:902:a585:b0:1ae:4562:14f1 with SMTP id az5-20020a170902a58500b001ae456214f1mr3024577plb.9.1686141152717; Wed, 07 Jun 2023 05:32:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686141152; cv=none; d=google.com; s=arc-20160816; b=nFZZj1mL0KlOII2PnTZAS4+b2ACIP/CglYogccwmLgUpphOIMCYctxRq/hgGXquq5/ n910TbybFdhA/tw4pgp24VIpb6qBZUF2pE0AGM4ScpvBl4FDQwgaszd1czSvNSeQGF7/ tqNeUlQWDAZKLkUBXQ60TT6UObladwmG1Pd888uRPb+FhrgTddPHHZ3Y/WiJCROl3zDm vyCvthH0hLEWQAeQ4mn2uGbOWs26YWjrtmwJ7kzQYA/MNfeogUr1YEevuMmtBrrD7Yb5 14slxMP3szKUmU6xI90thvDsgjJz692Q8HAzXHsP/QkFqn3y6wQFVIGBrW6Fr9yHbV6I y3kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uyF72a3yG09hh6hXJngvth5hjG1EY+SZikMQwCrSeCE=; b=h5C5e8+xUE8HIetgVr2ACUiJtFvtgS8tmBX2bKW6iK32jKG4RicpKD6GOr1gCwrzrw adGzdO5+JQl7pQjVogzHkhkGiziVhGpmwmLIovdzJOKwyuTVpL2zOlSfKGsn0HL//3ex 1u0CAi4d/CtvkmVmGCItFFmeEyMzi3Yb1Y00wSQJLTwJQ9kmbn9iijS/3G4ZkNa9iFnH WEaGzTEjXslKjWyt+43mkoYCSS5mMA8cxA2/fljxEQVGzPs75Bj+qj3h9JvtWl15JbqN Vdg3sAzEPwqAJFfytVRc9koGUrOJedN8gLq87iGgNsILN7a7ZdK5BqfXuKjFqcZ6Wwq/ 67yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=huXraDsy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h14-20020a170902f7ce00b001b178baf356si8771496plw.95.2023.06.07.05.32.15; Wed, 07 Jun 2023 05:32:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=huXraDsy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240518AbjFGMJE (ORCPT + 99 others); Wed, 7 Jun 2023 08:09:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240525AbjFGMI3 (ORCPT ); Wed, 7 Jun 2023 08:08:29 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::224]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB6631BEC; Wed, 7 Jun 2023 05:08:26 -0700 (PDT) X-GND-Sasl: maxime.chevallier@bootlin.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1686139705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uyF72a3yG09hh6hXJngvth5hjG1EY+SZikMQwCrSeCE=; b=huXraDsyHY5vwwdJ758i946FKjTZly9LWnpqdFKWI59jRDcb4XV+YLW4DqNnMHVC9j6Eu1 oLrDJxgO4yNM+6oVAGE3SqrBHk9auWZ0AiTtAW73Zn9zhFUVajpRC/X+r3GOp3EZ9TlKUu 2SI+f7nhE/mG770tZPrjx9aQXY0PJni611+6fCNXhjaN01DKEpP3aYhMNZU1I5TIvb7Fbr Cp1D8ySobPvwcGzAwxfZ2hys9wct9oheuA6pTGi2/LiLWaKUvjo8y3kONxOyPZolkshpsA FfylY6p2SBQ/JnekYg+HYknX9PaVm8vcztBsKFOzCX0qymn9U4SvN9I2xk21rQ== X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id 52693E000F; Wed, 7 Jun 2023 12:08:23 +0000 (UTC) From: Maxime Chevallier To: davem@davemloft.net Cc: Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, alexis.lothore@bootlin.com, thomas.petazzoni@bootlin.com, Andrew Lunn , Jakub Kicinski , Eric Dumazet , Paolo Abeni , Florian Fainelli , Heiner Kallweit , Russell King , Vladimir Oltean , Ioana Ciornei , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Maxime Coquelin , Jose Abreu , Alexandre Torgue , Giuseppe Cavallaro , Simon Horman , Maciej Fijalkowski , Feiyang Chen , Russell King Subject: [PATCH net-next v4 4/5] net: altera_tse: explicitly disable autoscan on the regmap-mdio bus Date: Wed, 7 Jun 2023 15:59:40 +0200 Message-Id: <20230607135941.407054-5-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230607135941.407054-1-maxime.chevallier@bootlin.com> References: <20230607135941.407054-1-maxime.chevallier@bootlin.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768047145285457251?= X-GMAIL-MSGID: =?utf-8?q?1768047145285457251?= Set the .autoscan flag to false on the regmap-mdio bus, to avoid using a random uninitialized value. We don't want autoscan in this case as the mdio device is a PCS and not a PHY. Fixes: db48abbaa18e ("net: ethernet: altera-tse: Convert to mdio-regmap and use PCS Lynx") Suggested-by: Russell King (Oracle) Signed-off-by: Maxime Chevallier --- V3->V4 : No changes V2->V3 : New patch drivers/net/ethernet/altera/altera_tse_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c index 215f9fb89c5b..2e15800e5310 100644 --- a/drivers/net/ethernet/altera/altera_tse_main.c +++ b/drivers/net/ethernet/altera/altera_tse_main.c @@ -1288,6 +1288,7 @@ static int altera_tse_probe(struct platform_device *pdev) mrc.regmap = pcs_regmap; mrc.parent = &pdev->dev; mrc.valid_addr = 0x0; + mrc.autoscan = false; /* Rx IRQ */ priv->rx_irq = platform_get_irq_byname(pdev, "rx_irq"); From patchwork Wed Jun 7 13:59:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 104480 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp321557rwl; Wed, 7 Jun 2023 05:36:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Qr2oGv01jP8uvUjSas7U6/J0zBvuzMKaHAbJAUYTMmJIKo6jcPykzJlgbNtcFazMgMzN4 X-Received: by 2002:a05:6358:e95:b0:129:c344:99c2 with SMTP id 21-20020a0563580e9500b00129c34499c2mr1264961rwg.14.1686141374562; Wed, 07 Jun 2023 05:36:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686141374; cv=none; d=google.com; s=arc-20160816; b=DKIKo07q/kURRnY19ezZ48TZjZSIlXqOSw6j6Md8Rvf6BYmjQ5B5/E8prc1wOep4HH 94yhVr1N7Pl9M5JUVtEbUhi+l5NA+72g9ELRDAkFW/u/RKrbBN2RG/uuL3Bw6YzVD5Cb rT4B+ag37+yAXnogmeLC3Y0MdhtD9mM+Q6wWgSvoG4tjVDZPrKkCVMdAMU2TZvdmipNc 5lWn9HTOE/NYZJNhcmaL/AbWEpH1tZyKYMGppqcWmrmERJoqqnT7OV7sxNW/2ajsPJT9 YYu2+LdziY1wxiDXoT4tb5XPe5f3iVuBXG2WQQ9ZsmUHfCBBjZyqoB6wl3ZfqifJgMvM TeXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GrgFo3H2q3uXB3KxPepXLazZqm3F9wUP/Ceq11kw4Q8=; b=pRRHQhMBBFnU2FG52O+9n2nr6Oq/v2c/rL4s50lswjQjCmdRaIRshcXVdQdFLQkoja uIePHTHmA7TBp/z9G26jWCMVggMf377FUZ6O4PYfxSpsqwqh9qYwBEkS3m/1w/sqbTyY a2fCHXztHXv0PTOVwSBaze+z5DGHONkc9W9bveW0Mn42dk2JnaypTD099xXFleufmUk8 2D75kBFjbkaFXM10g0odRqEVaqOvk8ev9SMcZV0IHdXnjedANQqFaYWtCuGDa/dtiffk Fwf5FkysLOwj6gFE5k3SqY8S0xdRL8iVG0Q67f6KZqe99Te8Y/z4Q8qKdlnocG6iOv7N 9yZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=nm3p9FV5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x11-20020a63b34b000000b0053fb39d8e81si9106669pgt.584.2023.06.07.05.36.00; Wed, 07 Jun 2023 05:36:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=nm3p9FV5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240162AbjFGMJK (ORCPT + 99 others); Wed, 7 Jun 2023 08:09:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240544AbjFGMIc (ORCPT ); Wed, 7 Jun 2023 08:08:32 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::224]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 603191BE6; Wed, 7 Jun 2023 05:08:29 -0700 (PDT) X-GND-Sasl: maxime.chevallier@bootlin.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1686139708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GrgFo3H2q3uXB3KxPepXLazZqm3F9wUP/Ceq11kw4Q8=; b=nm3p9FV59L0k4MrGfuiIlocHxtlxOZzyPfwuLhO6PHUtoWG0jIeVTzi63C4dLmHlIzmhWP HC4I3WsB1dkwCA37y5K9fl2xlurC93+5OeM7N9Hc9mamvRkgaElDfx846Rbhu39HgBoPnN eoU+89Wdvfu06pVv6cDMjU9DtJQ6vMpPDlIdOjhi+WuMfGwGQxRtKljK+tMB7YExKjjmKf IZg0cjpAgq8eazVFhPUh3vHZy1fsravHOhrgVo6zhIA7Zl6oauZcN7bf8T0X3+ymndnRHO 6/BN+g5frqE7XVHKTSlsbV7ggCya8VnZlWSs2CoA/OL6ZcWWBRuMYFOtprcezA== X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id 94C32E0007; Wed, 7 Jun 2023 12:08:25 +0000 (UTC) From: Maxime Chevallier To: davem@davemloft.net Cc: Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, alexis.lothore@bootlin.com, thomas.petazzoni@bootlin.com, Andrew Lunn , Jakub Kicinski , Eric Dumazet , Paolo Abeni , Florian Fainelli , Heiner Kallweit , Russell King , Vladimir Oltean , Ioana Ciornei , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Maxime Coquelin , Jose Abreu , Alexandre Torgue , Giuseppe Cavallaro , Simon Horman , Maciej Fijalkowski , Feiyang Chen , Russell King Subject: [PATCH net-next v4 5/5] net: dwmac_socfpga: initialize local data for mdio regmap configuration Date: Wed, 7 Jun 2023 15:59:41 +0200 Message-Id: <20230607135941.407054-6-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230607135941.407054-1-maxime.chevallier@bootlin.com> References: <20230607135941.407054-1-maxime.chevallier@bootlin.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768047377870156217?= X-GMAIL-MSGID: =?utf-8?q?1768047377870156217?= Explicitely zero-ize the local mdio_regmap_config data, and explicitely set the .autoscan parameter, as we only have a PCS on this bus. Fixes: 5d1f3fe7d2d5 ("net: stmmac: dwmac-sogfpga: use the lynx pcs driver") Suggested-by: Russell King (Oracle) Suggested-by: Maciej Fijalkowski Signed-off-by: Maxime Chevallier --- V3->V4 : Move pcs_regmap_cfg into a more local block, and zeroize mrc V2->V3 : New patch .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c index 1fb808be843b..6267bcb60206 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c @@ -389,7 +389,6 @@ static int socfpga_dwmac_probe(struct platform_device *pdev) struct net_device *ndev; struct stmmac_priv *stpriv; const struct socfpga_dwmac_ops *ops; - struct regmap_config pcs_regmap_cfg; ops = device_get_match_data(&pdev->dev); if (!ops) { @@ -447,19 +446,22 @@ static int socfpga_dwmac_probe(struct platform_device *pdev) if (ret) goto err_dvr_remove; - memset(&pcs_regmap_cfg, 0, sizeof(pcs_regmap_cfg)); - pcs_regmap_cfg.reg_bits = 16; - pcs_regmap_cfg.val_bits = 16; - pcs_regmap_cfg.reg_shift = REGMAP_UPSHIFT(1); - /* Create a regmap for the PCS so that it can be used by the PCS driver, * if we have such a PCS */ if (dwmac->tse_pcs_base) { + struct regmap_config pcs_regmap_cfg; struct mdio_regmap_config mrc; struct regmap *pcs_regmap; struct mii_bus *pcs_bus; + memset(&pcs_regmap_cfg, 0, sizeof(pcs_regmap_cfg)); + memset(&mrc, 0, sizeof(mrc)); + + pcs_regmap_cfg.reg_bits = 16; + pcs_regmap_cfg.val_bits = 16; + pcs_regmap_cfg.reg_shift = REGMAP_UPSHIFT(1); + pcs_regmap = devm_regmap_init_mmio(&pdev->dev, dwmac->tse_pcs_base, &pcs_regmap_cfg); if (IS_ERR(pcs_regmap)) { @@ -470,6 +472,7 @@ static int socfpga_dwmac_probe(struct platform_device *pdev) mrc.regmap = pcs_regmap; mrc.parent = &pdev->dev; mrc.valid_addr = 0x0; + mrc.autoscan = false; snprintf(mrc.name, MII_BUS_ID_SIZE, "%s-pcs-mii", ndev->name); pcs_bus = devm_mdio_regmap_register(&pdev->dev, &mrc);