From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3A8F4C07E98 for ; Tue, 28 Nov 2023 10:31:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wwYAfGV3TCAaq63I7fsPhjymwok6tQOc1sxU/HavsD0=; b=ik4zHwaf1c/x/i lUy0gzDGSh1Qd2WHwvg5hCw1SlSKLhwsX3/u5ysE1SqzKSlRmlbmdrS3zkuly7IYHuOIP/PctxB2C V07aTBw1bAHSVEk/CZawyavIJ9ZKyPXQ21wqz59bD7/CGhtPlKOcAyA0wKNWg8UYPRUsEDqZIdAi2 3dZREm0YVyotpwEZcHC/qKjA8q519JK6x86MavTavPH4DfRd5PcmpZz0IIAeSos7Nd1IgyIccnStk xJeA2YMCHdp2qC5RjGjQNFtas+VwYC+ZUA/dQ54jwuA6QnMJSB4WCXW//vB/09pmBV4bycAtU4wfg fYgX0BqypL1nSnMxoSdQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r7vMl-004vjw-16; Tue, 28 Nov 2023 10:30:55 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r7uF3-004im0-1A for linux-arm-kernel@bombadil.infradead.org; Tue, 28 Nov 2023 09:18:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:Content-Type :MIME-Version:References:In-Reply-To:Message-ID:Subject:Cc:To:From:Date: Sender:Reply-To:Content-ID:Content-Description; bh=RNvRwnmWbMcsSfw4MtpQ8A6yvzjLtDp5XU7GJHCHcNg=; b=ham+a5bWr5CEwDXePrvrYe2ZKn 4DlxIGk/+8sO7Q7U26JrV+g+r0a7fRq3pPGrOsDs0X2TrufDzeFpSharmwakZXqhOgozmMSEDly/+ 9wmojM+ECyjZ4r9cgKZkjSoAExf1SdbGnH7X53eNOAbEZPJPs9P0WezJbFscqEQMypeKEzfRaS+c7 HKgjGm5DQhiMXN59zCe50LXS2pCcCwHZ9wGvIDKw3scxbelg1O0JvilsVSbpVerGpimvFwUNcRRjM XUA3TjyHkeOfpTthZF1QyNcXEudPsdt3pVPeZhfuh8xqUye/j/aq6vajqRzdzGjO/3/2f7VasaFTt cA0SuRyw==; Received: from relay5-d.mail.gandi.net ([2001:4b98:dc4:8::225]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r7uEy-00GZJn-1l for linux-arm-kernel@lists.infradead.org; Tue, 28 Nov 2023 09:18:51 +0000 Received: by mail.gandi.net (Postfix) with ESMTPSA id 4EE001C000D; Tue, 28 Nov 2023 09:18:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1701163123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RNvRwnmWbMcsSfw4MtpQ8A6yvzjLtDp5XU7GJHCHcNg=; b=cGP/JFSwx72kYNQBXmTul4ItDEpXcm2qsZemcZUUfdQ62v0J+1ZmCtGtsukPTgd9m3/Cx8 SAv+jPBPn1349+noY/O6WWXBhVCuacr4Ja/Ug8c2cl/eMEsbML5lwJtw4o6hjjXelYmc/4 OWObjLP8VDosTxpJuVvUAcfJE3EY8Pw/a4hvsFUaGcV7mDE/P4/6izHG0fQN09wrerBpM4 77Mvw3E/+gaEVNvkg8U10TNasMlECQVIcMN0THLlqGP6vQgjrt6IKfvAsKwUTKtMN5NBRN JNYEOnHm88RD2yhmn2xj781DKV8QYS6O5NnAjM+jmNZWCLWtvOahHBnZ7kCWCw== Date: Tue, 28 Nov 2023 10:18:41 +0100 From: Thomas Petazzoni To: Maxime Chevallier Cc: davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jakub Kicinski , Eric Dumazet , Paolo Abeni , linux-arm-kernel@lists.infradead.org, Alexandre Torgue , Jose Abreu , Maxime Coquelin , Simon Horman , linux-stm32@st-md-mailman.stormreply.com, alexis.lothore@bootlin.com Subject: Re: [PATCH net] net: stmmac: dwmac-socfpga: Don't access SGMII adapter when not available Message-ID: <20231128101841.627fc97e@windsurf> In-Reply-To: <20231128094538.228039-1-maxime.chevallier@bootlin.com> References: <20231128094538.228039-1-maxime.chevallier@bootlin.com> Organization: Bootlin X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-GND-Sasl: thomas.petazzoni@bootlin.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231128_091848_759417_A088FBE9 X-CRM114-Status: GOOD ( 19.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, 28 Nov 2023 10:45:37 +0100 Maxime Chevallier wrote: > The SGMII adapter isn't present on all dwmac-socfpga implementations. > Make sure we don't try to configure it if we don't have this adapter. > > Fixes: 5d1f3fe7d2d5 ("net: stmmac: dwmac-sogfpga: use the lynx pcs driver") > Signed-off-by: Maxime Chevallier > --- > drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c > index ba2ce776bd4d..ae120792e1b6 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c > @@ -243,7 +243,8 @@ static void socfpga_sgmii_config(struct socfpga_dwmac *dwmac, bool enable) > { > u16 val = enable ? SGMII_ADAPTER_ENABLE : SGMII_ADAPTER_DISABLE; > > - writew(val, dwmac->sgmii_adapter_base + SGMII_ADAPTER_CTRL_REG); > + if (dwmac->sgmii_adapter_base) > + writew(val, dwmac->sgmii_adapter_base + SGMII_ADAPTER_CTRL_REG); > } > > static int socfpga_set_phy_mode_common(int phymode, u32 *val) Reviewed-by: Thomas Petazzoni As a follow-up improvement, there's an open-coded version of socfpga_sgmii_config() in socfpga_dwmac_fix_mac_speed(), which could be rewritten as such: socfpga_sgmii_config(dwmac, false); if (splitter_base) { val = readl(splitter_base + EMAC_SPLITTER_CTRL_REG); val &= ~EMAC_SPLITTER_CTRL_SPEED_MASK; switch (speed) { case 1000: val |= EMAC_SPLITTER_CTRL_SPEED_1000; break; case 100: val |= EMAC_SPLITTER_CTRL_SPEED_100; break; case 10: val |= EMAC_SPLITTER_CTRL_SPEED_10; break; default: return; } writel(val, splitter_base + EMAC_SPLITTER_CTRL_REG); } if (phy_dev) socfpga_sgmii_config(dwmac, true); But of course, that's not a fix so it should be a separate improvement. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel