Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1018190iob; Wed, 4 May 2022 12:48:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwlSAPJNPTg2KSx6ydH+eNJeuvqGTLiEHBG5uSwtLmgnTXD4wBdsS8MuP+BktH7JT91mmnx X-Received: by 2002:a05:6402:d4c:b0:410:a415:fd95 with SMTP id ec12-20020a0564020d4c00b00410a415fd95mr24673263edb.288.1651693737321; Wed, 04 May 2022 12:48:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651693737; cv=none; d=google.com; s=arc-20160816; b=biSCfXp9HDwj+175ywLIQcJvk1LM3aYyVUUB8a/6Tdybm+ZpgOatLzmsXCwMS1KEbt wlkJ+x7PDl+w3/T3bma0efZ7qlCBlboTMeqjKqCKf3cS/sTCcJ/sr2q8oGTi8c5Gc2Yi czi29WFyxR5VDaSeIANElIwU3iDLtN2yEEMX2rLWPQDbNUZzL5LQJOrXH75AAsonB/qK mpzPG3CAYKgEYDiGj0D3XvHsyn4aghErZbKqcNfPgmV0hD29cUfGQlQ8F3ImSFjgD9tC Ex0/flPtOfRvzXizVRVTT0X+yjA0WoV6+vd0gdQydYXlSzXVIMNjdMRX5UlvIQUins8U yj5g== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=aoW3q2twViwYm9GT4wPZf0TqwodKJSaAXgGHMTYWEVk=; b=Up8nsb4WLdi0vDsctOnn28RkPiepi79RPKOB3gZc4StguCNvO3JD5UFKa2MdgPUCRY +HWrOumsVptf18fTWaBud0x5rXdDhAN4SIwtWE+L/OWL3inUU3gUQMH3cQ27xBb+pG4d jX5btJa1IhJXoy8Lp3P9mclV+0hw0kxdkmQ+wmQOpD1BSRNm0+8D49oUC46oarz25HS2 1uT3havxyt/RFLprmfU2FWJXWIaGfJkNeo3qUjKhGfBRAyqSVyzM3+FyelOIBrtC1ob0 9nDDo2Uw/ZIuFBkrFxtN91h8OrlTO5dRs7wmIg+xVeynSqmuw3LUkA8GKSWkgmkXpOcZ 5XIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=u4HK4mKb; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k10-20020a1709062a4a00b006f3b5469ea0si16785456eje.96.2022.05.04.12.48.32; Wed, 04 May 2022 12:48:57 -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=@linuxfoundation.org header.s=korg header.b=u4HK4mKb; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376285AbiEDRuQ (ORCPT + 99 others); Wed, 4 May 2022 13:50:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357973AbiEDRPe (ORCPT ); Wed, 4 May 2022 13:15:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A88E856236; Wed, 4 May 2022 09:59:12 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6D9F261794; Wed, 4 May 2022 16:58:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2C9AC385AA; Wed, 4 May 2022 16:58:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683530; bh=puxZb8keBI0MxGWFKEJg7XUlq5HvNRAXuB4e6S/Tg5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u4HK4mKbn0GHX8jqyjifLG3CKnF5HaJnYOlsDCYJeJxTSEljZQR+1pKLeOvbQg4W7 ehnDXIzsiuYAbVS6NIGKnxAc8cewpGfF/i9acY+iqeJcbWPiLqdp0obCUgHE5KyE98 lEf/ltLYK/42wdSYoNyRZ7uZnkujVWVtLdqg6tDI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dinh Nguyen , Jakub Kicinski Subject: [PATCH 5.17 188/225] net: ethernet: stmmac: fix write to sgmii_adapter_base Date: Wed, 4 May 2022 18:47:06 +0200 Message-Id: <20220504153127.096740333@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 From: Dinh Nguyen commit 5fd1fe4807f91ea0cca043114d929faa11bd4190 upstream. I made a mistake with the commit a6aaa0032424 ("net: ethernet: stmmac: fix altr_tse_pcs function when using a fixed-link"). I should have tested against both scenario of having a SGMII interface and one without. Without the SGMII PCS TSE adpater, the sgmii_adapter_base address is NULL, thus a write to this address will fail. Cc: stable@vger.kernel.org Fixes: a6aaa0032424 ("net: ethernet: stmmac: fix altr_tse_pcs function when using a fixed-link") Signed-off-by: Dinh Nguyen Link: https://lore.kernel.org/r/20220420152345.27415-1-dinguyen@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c @@ -65,8 +65,9 @@ static void socfpga_dwmac_fix_mac_speed( struct phy_device *phy_dev = ndev->phydev; u32 val; - writew(SGMII_ADAPTER_DISABLE, - sgmii_adapter_base + SGMII_ADAPTER_CTRL_REG); + if (sgmii_adapter_base) + writew(SGMII_ADAPTER_DISABLE, + sgmii_adapter_base + SGMII_ADAPTER_CTRL_REG); if (splitter_base) { val = readl(splitter_base + EMAC_SPLITTER_CTRL_REG); @@ -88,10 +89,11 @@ static void socfpga_dwmac_fix_mac_speed( writel(val, splitter_base + EMAC_SPLITTER_CTRL_REG); } - writew(SGMII_ADAPTER_ENABLE, - sgmii_adapter_base + SGMII_ADAPTER_CTRL_REG); - if (phy_dev) + if (phy_dev && sgmii_adapter_base) { + writew(SGMII_ADAPTER_ENABLE, + sgmii_adapter_base + SGMII_ADAPTER_CTRL_REG); tse_pcs_fix_mac_speed(&dwmac->pcs, phy_dev, speed); + } } static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device *dev)