From nobody Sun May 19 13:14:41 2024 Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E78DF181BAA; Thu, 25 Apr 2024 22:07:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714082847; cv=none; b=RYe1jNPkZhr0V08cTvn0wzW9gUQtJGrcQBjo8Hu+qOwFpLHS+8ATNvOHazR3dzML72mx1B9jfr0ROhlu6deRj2xNtQUyYLMnM/r2kVdN8mIEWdPRPKmTtDoE0DNwV38XLYIVEoCPaMvVsuVhPqWSmHLvqRiuummHvkUOq3ur878= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714082847; c=relaxed/simple; bh=1SF70NTHCTRYZByoZHjPlVMIlx5+KlolbViI5fbMAFc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fcIzSJQVSlmSgG2HNU689oHVVFwTFWoIpR8nZqFC/SM/urlp+EKpR0ZdG4P6FLbABmurC8+61q5LYijq02MOIFHmr+QYCh7iRS2qvImzT2IurO5xHoyNGAlSyOVVkgIOs0iPAG4HNK1Y8+ltZHlEcAMuETfPM0q9pnRvzwdoeQo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=aWgAaHoe; arc=none smtp.client-ip=209.85.222.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aWgAaHoe" Received: by mail-qk1-f172.google.com with SMTP id af79cd13be357-78ebc7e1586so253708385a.1; Thu, 25 Apr 2024 15:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714082845; x=1714687645; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o13Arm3Rvf2gFBkSt1a4X4Ztws3UYrTbZey0ecJRfQk=; b=aWgAaHoebYKrJJtwJGNR8OseIiNKLeS8As7AO1O3ck7AT7D1PAA9pt/5sk+WPmHCeo T1np7nK6QfQCiyiWwNHWKqV2aTVtjEGch1vGnX9Vod1VZvaDFANPKCNSS84DAti3zPlk U524QNpeABWlNgFIGRd/BGvF86f6W4fXgLoQCh49IWeHzKRI8f0IbyX4vCpopGUNZ9SI a/f4BoXCCDkyNPuRtLL9Ly/cyStqM0ULqgyha7gHLxqG0Rz96iRPd6d+BVZyNKSeRCsy fzh8stSCcTClb0cD7/SD/93tI2kRsL+OoViU9X/3Q/QZRiP6n4SLaxw/mz86cvN/J55W HMjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714082845; x=1714687645; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o13Arm3Rvf2gFBkSt1a4X4Ztws3UYrTbZey0ecJRfQk=; b=V61uZ5kA0C5hvNHBPJEzg14LNEpm6/iUbg3eg0tRNzWPyUYhoTwlqXM6Y5qvkdVC5B uVtyc4CRWeUMI7j3ISmoyedSwZOtn8cihe+rZhW3qX+tdubomDzeLGyycSxNLfW1+3Dl ZgBkB3IRzzo6TsBwwr9RV5y9wZrsDfaUWxr3NBt2mKHXRj79RgWKlzEmexn++U8B0tOn Mmm3q95p7se9Lx9plSdDSZg8ddlzRQjAnCrswOFP140o8CLmW1VMnduIrOGkQENbdb2y sUSh/2z0UntGZtVQjTrorh/Rn/5kzX7B6f1TdEEgDlzibaE1GfO/RsC585L6clkzawro Hi6w== X-Forwarded-Encrypted: i=1; AJvYcCXlOHPEV4wGQOiEu+XYNASLgGiZmluYuFaHV1qPO2xwLM7EWxS58JLH7wE6rwe+PhsPm1oHb9/SpPOI6RgZerXOp0iU1+Ynea6NfF+2HmlxrQqxBaIeOTxbDxG5XsmQrOSpSxLI X-Gm-Message-State: AOJu0YxvypzBTAqMp6LtAnignvE2BwmZYaI8WT57dhjl2C/i/L4hbglT iOaw4/7cuIYijBaIpdKClL4LsTPZOWHTwjf4HagFp5ZKPbKCsN75 X-Google-Smtp-Source: AGHT+IEb3tH4zRjlqCsGO2g1hapDLeFj3TNbvP15N+hZRE3y0OUF1M5cOm0vomLmYYrjn/g4e+xsGg== X-Received: by 2002:a05:6214:250d:b0:69f:3c1d:201 with SMTP id gf13-20020a056214250d00b0069f3c1d0201mr7242034qvb.16.1714082844800; Thu, 25 Apr 2024 15:07:24 -0700 (PDT) Received: from stbirv-lnx-1.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id q2-20020a0c9a42000000b006a044503615sm4692891qvd.72.2024.04.25.15.07.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Apr 2024 15:07:23 -0700 (PDT) From: Doug Berger To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.or, linux-kernel@vger.kernel.org, Doug Berger , stable@vger.kernel.org Subject: [PATCH 1/3] net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access Date: Thu, 25 Apr 2024 15:06:48 -0700 Message-Id: <20240425220650.2138801-2-opendmb@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240425220650.2138801-1-opendmb@gmail.com> References: <20240425220650.2138801-1-opendmb@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The EXT_RGMII_OOB_CTRL register can be written from different contexts. It is predominantly written from the adjust_link handler which is synchronized by the phydev->lock, but can also be written from a different context when configuring the mii in bcmgenet_mii_config(). The chances of contention are quite low, but it is conceivable that adjust_link could occur during resume when WoL is enabled so use the phydev->lock synchronizer in bcmgenet_mii_config() to be sure. Fixes: afe3f907d20f ("net: bcmgenet: power on MII block for all MII modes") Cc: stable@vger.kernel.org Signed-off-by: Doug Berger --- drivers/net/ethernet/broadcom/genet/bcmmii.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/eth= ernet/broadcom/genet/bcmmii.c index 9ada89355747..86a4aa72b3d4 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -2,7 +2,7 @@ /* * Broadcom GENET MDIO routines * - * Copyright (c) 2014-2017 Broadcom + * Copyright (c) 2014-2024 Broadcom */ =20 #include @@ -275,6 +275,7 @@ int bcmgenet_mii_config(struct net_device *dev, bool in= it) * block for the interface to work, unconditionally clear the * Out-of-band disable since we do not need it. */ + mutex_lock(&phydev->lock); reg =3D bcmgenet_ext_readl(priv, EXT_RGMII_OOB_CTRL); reg &=3D ~OOB_DISABLE; if (priv->ext_phy) { @@ -286,6 +287,7 @@ int bcmgenet_mii_config(struct net_device *dev, bool in= it) reg |=3D RGMII_MODE_EN; } bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL); + mutex_unlock(&phydev->lock); =20 if (init) dev_info(kdev, "configuring instance for %s\n", phy_name); --=20 2.34.1 From nobody Sun May 19 13:14:41 2024 Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B83A181CEF; Thu, 25 Apr 2024 22:07:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714082853; cv=none; b=j+684D0IoAWlzljx3Jpjm8z86D5L9ETthto40gD6obxfi8od2yJVUQKMgQ4ec38545Ewt+PPS/amJ6Lvsb0Qf8uI5UUuoKDXSH2SQS54RwGSf41raeP40YucpPVNeVnAtbi2JK5FUSX2RRdMbSoChVVQU/W6zot4UyzY3IfmeSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714082853; c=relaxed/simple; bh=gK3IDBMN0QPgUq6nFSZArygjbcNekpXpG97aut6lPG8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mfk55rMqZLGYYtVcRyBRo0hU5Ko83agjYFFWuMCYeT7e0muSyWb1zlKtcs52Bv1bX2++PzzPTjvKhkbFZWGu0+6qzkhAvyNrpBT+Fn5rvIOMbdTzRgPmfSCEN7rO4Cjv/Y9ttiAYAKGpAkk0bvCCHtTZ/b8aKrATSVE9LBIMZVk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=K288Yhof; arc=none smtp.client-ip=209.85.222.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K288Yhof" Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-78f05afc8d6so101251985a.3; Thu, 25 Apr 2024 15:07:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714082851; x=1714687651; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qoVri07CqNZY64mEc3hs+qcgGhmd3HVXaDxx+6B0MGI=; b=K288YhofXM2+t6+np8Ryq9pKM8dldaRuc1qeBE/F54d/8wpKTdUphXgLU6eWlH+yjm l4EOR3bNQo7LQSR3RyK0hNTb9ZFtnsjP7k4f4w2MoyU797NOiAb38qeF/NED7Ukj+ubZ keyHf3jOGCrK408XEZfWlVhDnKpjzhOFu3Fp7UHIr2u+zGGZwjq6GSUcalNOJGfrkGBt gq7Vl1n+S4Qyfe7U3uhXiZG677sOkxsYrvjXxCD6NsCdg/a3UAl7Uq5EQcrFv3tFqDgH vm2iD3Au+BbB+fhymT0iMhovobx5B0d48PK0is88Uq5LQdtFY94+YHrD9U6df1dI1yof ri8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714082851; x=1714687651; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qoVri07CqNZY64mEc3hs+qcgGhmd3HVXaDxx+6B0MGI=; b=hQSc5XiRe7f++Ywlq3O8n7PAqo/1IrBnkj3AmzYLyGLu7qwUCwvvj3VNbdPRG94Sxz xmJRJYwttTr6HUV/tw3zHirQ7HO1p70e5YshXmU/J/7zrTfkbOduqvG/Hc1o87ZVgAlY 0D6Mxf+y1WkOmp02YLk5cgkHfM7EBOBqPw6v7RdE64aIcRbNqY9Ouz4Qx47W+Jwm5iOE othmShDlxjk37v7S+/FYjMJMc8FN7UxtwiTcbFraWQsI3EcmD+pUyj5BpKZm5id8hLiA zNNQdieiegXn+qzOARDj5KcXcQLZqRfxV+W+MjJTGA00k2/Ww6fm7+2vET2C0HWTAmD5 fPRA== X-Forwarded-Encrypted: i=1; AJvYcCWsqxCWvt7ECT34LlNr6uQ3qt3VosNOrXb2zKhkK5+xpCegmPDg4J4TnC/oW5cYvuk8kq3bEFEKwGYOtLGtETqCC9Y3oeDUt4zu60GEOpnUunPpcfTMWF7wwGkiiJ4CYxQ4X9nA X-Gm-Message-State: AOJu0Yx+2CnYcmr8TATEQ+S8dk3m+mAUNXC1/J6KvfFfaR5zp/yKOdBQ UQv0/8mCjhxjPwjLbj7D/2J1exBH1OQasznLNKEtLOog5AUfqAoq X-Google-Smtp-Source: AGHT+IEyjjnqgyez6sKBJ9k4l510KomxGmY/S4BuiPkm7YOmBOxW9iHlQN5he0WuFI8I0hLZzmetBw== X-Received: by 2002:ad4:5c6f:0:b0:6a0:932d:ce66 with SMTP id i15-20020ad45c6f000000b006a0932dce66mr1420070qvh.15.1714082851102; Thu, 25 Apr 2024 15:07:31 -0700 (PDT) Received: from stbirv-lnx-1.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id q2-20020a0c9a42000000b006a044503615sm4692891qvd.72.2024.04.25.15.07.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Apr 2024 15:07:30 -0700 (PDT) From: Doug Berger To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.or, linux-kernel@vger.kernel.org, Doug Berger , stable@vger.kernel.org Subject: [PATCH 2/3] net: bcmgenet: synchronize use of bcmgenet_set_rx_mode() Date: Thu, 25 Apr 2024 15:06:49 -0700 Message-Id: <20240425220650.2138801-3-opendmb@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240425220650.2138801-1-opendmb@gmail.com> References: <20240425220650.2138801-1-opendmb@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The ndo_set_rx_mode function is synchronized with the netif_addr_lock spinlock and BHs disabled. Since this function is also invoked directly from the driver the same synchronization should be applied. Fixes: 72f96347628e ("net: bcmgenet: set Rx mode before starting netif") Cc: stable@vger.kernel.org Signed-off-by: Doug Berger --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/e= thernet/broadcom/genet/bcmgenet.c index b1f84b37032a..5452b7dc6e6a 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2,7 +2,7 @@ /* * Broadcom GENET (Gigabit Ethernet) controller driver * - * Copyright (c) 2014-2020 Broadcom + * Copyright (c) 2014-2024 Broadcom */ =20 #define pr_fmt(fmt) "bcmgenet: " fmt @@ -3334,7 +3334,9 @@ static void bcmgenet_netif_start(struct net_device *d= ev) struct bcmgenet_priv *priv =3D netdev_priv(dev); =20 /* Start the network engine */ + netif_addr_lock_bh(dev); bcmgenet_set_rx_mode(dev); + netif_addr_unlock_bh(dev); bcmgenet_enable_rx_napi(priv); =20 umac_enable_set(priv, CMD_TX_EN | CMD_RX_EN, true); --=20 2.34.1 From nobody Sun May 19 13:14:41 2024 Received: from mail-oo1-f45.google.com (mail-oo1-f45.google.com [209.85.161.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9137181CFD; Thu, 25 Apr 2024 22:07:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714082857; cv=none; b=EQamzB10VeX8Ez2hU4+RJv/JSSddq4ZjRXN0kaSeUGNcPRSruVAHrIvQGM2MD1/d/l8DHXj0Zg3Gmw5nGJXvlqzanG5guNR3I1Dosqp4ykGbfqGqA87enjN/UfynQNzTuRkKX9RCPnNiyJKgV1eVesV0R+KyQH9vP8lAHc5TD5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714082857; c=relaxed/simple; bh=TIHi716ql6W7JkAg87hK+/NlxNNTNr3j5+ozLhVFT40=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ciVf+fipTpcTRCj/Eq54R7RdgHrqsneK5+LBff+I0PHozR3FmAfJLyNROd/FtslE7DJ3nZkq0AfohlLSt2+8KrV/CyRN3ndHcOHYIQs3CSkZagPXIHoVUQZ3SLuG9L0AHIGIBBmuOMOZpqqY2ke3/JDPy9C+JYRHlwM5/2ehIOs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=b+I2ecut; arc=none smtp.client-ip=209.85.161.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b+I2ecut" Received: by mail-oo1-f45.google.com with SMTP id 006d021491bc7-5ad2a15374eso955121eaf.3; Thu, 25 Apr 2024 15:07:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714082855; x=1714687655; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0OvkLf2eq0KdJa5mTu/U97lc17pEWUvnY93iweSl7Ps=; b=b+I2ecut4wdlaxfXPBY9ZousR1jFcXyGkHi9670HjpmNlFnATkiKkA9p5wgt5Yalyu H+T2N7zBmwKNoRb7/g/4eIZuOFldomAOPr8TVSozQ/EGci6Jd9LnjfA4bUBc5hSdbf7e xwqFTl118Qci59XQ3nyLD1kpDd4EnLyotJcjehWwgvdBzKzsToQzivLj3ox/4unBC3tV Hi6t3gpWi/AA4Gd/k7gLBiAKuz3Vg/moH9KY0g9bM3zanaXzdoqtH3rx+88NzDqG27Jm l4oTYMPwIn3xL1e6jtUg58uGSR85651guiuLly4+s6C+Z95iIdMxNFC4GhzXeMwWFXXr s/0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714082855; x=1714687655; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0OvkLf2eq0KdJa5mTu/U97lc17pEWUvnY93iweSl7Ps=; b=azeycAd0BQNLFm3We2qOGZqho+mXQVXn09OEo8MEUcP/uXMCFI/Fb/BuP5VeIMNwKw cpcTJAZSQTOrai00+0w3/MwaTQ4/dIc/sdjF1qjDf442KcpnvZFL3VWwT8OOrho4+vad ViUE44YfWibf3Xi9FubbndzwHmt8NhsJqcXaqBjTslsGI281ZYb3+62IdcLT/uhuKjzQ zYqbNcDvWYzwm7Jo44sfPmmX9DbBMphcgXD6wsBF8DzHx3KAu51VnF2two1m5O7og3ay AL61sdbD9schFyzVevn+HRYKSVDvxgQGArOecUmvFNNDwYssjU7q8jp9/jKzR3xXocsa ZllA== X-Forwarded-Encrypted: i=1; AJvYcCWZLA2mNfVrOZL6o0gLKSZTs16Z4yeUdh93kYlEmGMGfE99MWDkNxZnVuI6995xhGEyeitG6jasBYvwVEsDWrpjDcxi9HYkNRyzqQQrHXq0eGXiGaQa216GSycdjE4GoBa5IjgN X-Gm-Message-State: AOJu0YwpOZJheRI01QtCaEXVHNOFCkoK8cOPlXMgGWvxbFWT5M93LO1h B0xDyyNpC59DPBH/PdY9Hch5+zvAyKzz4+j4h9S9VvTcXd9M6PqL X-Google-Smtp-Source: AGHT+IGwtIYE1j2gkvCBnH9ulv88xgj/4SUdqGmkPBOUvYoQ9E4djFEQmXkk+R1I8hnxTGct03Jb4A== X-Received: by 2002:a05:6358:16c7:b0:189:8b22:b95 with SMTP id r7-20020a05635816c700b001898b220b95mr982210rwl.29.1714082854774; Thu, 25 Apr 2024 15:07:34 -0700 (PDT) Received: from stbirv-lnx-1.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id q2-20020a0c9a42000000b006a044503615sm4692891qvd.72.2024.04.25.15.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Apr 2024 15:07:34 -0700 (PDT) From: Doug Berger To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.or, linux-kernel@vger.kernel.org, Doug Berger , stable@vger.kernel.org Subject: [PATCH 3/3] net: bcmgenet: synchronize UMAC_CMD access Date: Thu, 25 Apr 2024 15:06:50 -0700 Message-Id: <20240425220650.2138801-4-opendmb@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240425220650.2138801-1-opendmb@gmail.com> References: <20240425220650.2138801-1-opendmb@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The UMAC_CMD register is written from different execution contexts and has insufficient synchronization protections to prevent possible corruption. Of particular concern are the acceses from the phy_device delayed work context used by the adjust_link call and the BH context that may be used by the ndo_set_rx_mode call. A spinlock is added to the driver to protect contended register accesses (i.e. reg_lock) and it is used to synchronize accesses to UMAC_CMD. Fixes: 1c1008c793fa ("net: bcmgenet: add main driver file") Cc: stable@vger.kernel.org Signed-off-by: Doug Berger --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 12 +++++++++++- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4 +++- drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8 +++++++- drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 ++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/e= thernet/broadcom/genet/bcmgenet.c index 5452b7dc6e6a..c7e7dac057a3 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2467,14 +2467,18 @@ static void umac_enable_set(struct bcmgenet_priv *p= riv, u32 mask, bool enable) { u32 reg; =20 + spin_lock_bh(&priv->reg_lock); reg =3D bcmgenet_umac_readl(priv, UMAC_CMD); - if (reg & CMD_SW_RESET) + if (reg & CMD_SW_RESET) { + spin_unlock_bh(&priv->reg_lock); return; + } if (enable) reg |=3D mask; else reg &=3D ~mask; bcmgenet_umac_writel(priv, reg, UMAC_CMD); + spin_unlock_bh(&priv->reg_lock); =20 /* UniMAC stops on a packet boundary, wait for a full-size packet * to be processed @@ -2490,8 +2494,10 @@ static void reset_umac(struct bcmgenet_priv *priv) udelay(10); =20 /* issue soft reset and disable MAC while updating its registers */ + spin_lock_bh(&priv->reg_lock); bcmgenet_umac_writel(priv, CMD_SW_RESET, UMAC_CMD); udelay(2); + spin_unlock_bh(&priv->reg_lock); } =20 static void bcmgenet_intr_disable(struct bcmgenet_priv *priv) @@ -3597,16 +3603,19 @@ static void bcmgenet_set_rx_mode(struct net_device = *dev) * 3. The number of filters needed exceeds the number filters * supported by the hardware. */ + spin_lock(&priv->reg_lock); reg =3D bcmgenet_umac_readl(priv, UMAC_CMD); if ((dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) || (nfilter > MAX_MDF_FILTER)) { reg |=3D CMD_PROMISC; bcmgenet_umac_writel(priv, reg, UMAC_CMD); + spin_unlock(&priv->reg_lock); bcmgenet_umac_writel(priv, 0, UMAC_MDF_CTRL); return; } else { reg &=3D ~CMD_PROMISC; bcmgenet_umac_writel(priv, reg, UMAC_CMD); + spin_unlock(&priv->reg_lock); } =20 /* update MDF filter */ @@ -4005,6 +4014,7 @@ static int bcmgenet_probe(struct platform_device *pde= v) goto err; } =20 + spin_lock_init(&priv->reg_lock); spin_lock_init(&priv->lock); =20 /* Set default pause parameters */ diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/e= thernet/broadcom/genet/bcmgenet.h index 7523b60b3c1c..43b923c48b14 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2014-2020 Broadcom + * Copyright (c) 2014-2024 Broadcom */ =20 #ifndef __BCMGENET_H__ @@ -573,6 +573,8 @@ struct bcmgenet_rxnfc_rule { /* device context */ struct bcmgenet_priv { void __iomem *base; + /* reg_lock: lock to serialize access to shared registers */ + spinlock_t reg_lock; enum bcmgenet_version version; struct net_device *dev; =20 diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c b/drivers/n= et/ethernet/broadcom/genet/bcmgenet_wol.c index 7a41cad5788f..1248792d7fd4 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c @@ -2,7 +2,7 @@ /* * Broadcom GENET (Gigabit Ethernet) Wake-on-LAN support * - * Copyright (c) 2014-2020 Broadcom + * Copyright (c) 2014-2024 Broadcom */ =20 #define pr_fmt(fmt) "bcmgenet_wol: " fmt @@ -151,6 +151,7 @@ int bcmgenet_wol_power_down_cfg(struct bcmgenet_priv *p= riv, } =20 /* Can't suspend with WoL if MAC is still in reset */ + spin_lock_bh(&priv->reg_lock); reg =3D bcmgenet_umac_readl(priv, UMAC_CMD); if (reg & CMD_SW_RESET) reg &=3D ~CMD_SW_RESET; @@ -158,6 +159,7 @@ int bcmgenet_wol_power_down_cfg(struct bcmgenet_priv *p= riv, /* disable RX */ reg &=3D ~CMD_RX_EN; bcmgenet_umac_writel(priv, reg, UMAC_CMD); + spin_unlock_bh(&priv->reg_lock); mdelay(10); =20 if (priv->wolopts & (WAKE_MAGIC | WAKE_MAGICSECURE)) { @@ -203,6 +205,7 @@ int bcmgenet_wol_power_down_cfg(struct bcmgenet_priv *p= riv, } =20 /* Enable CRC forward */ + spin_lock_bh(&priv->reg_lock); reg =3D bcmgenet_umac_readl(priv, UMAC_CMD); priv->crc_fwd_en =3D 1; reg |=3D CMD_CRC_FWD; @@ -210,6 +213,7 @@ int bcmgenet_wol_power_down_cfg(struct bcmgenet_priv *p= riv, /* Receiver must be enabled for WOL MP detection */ reg |=3D CMD_RX_EN; bcmgenet_umac_writel(priv, reg, UMAC_CMD); + spin_unlock_bh(&priv->reg_lock); =20 reg =3D UMAC_IRQ_MPD_R; if (hfb_enable) @@ -256,7 +260,9 @@ void bcmgenet_wol_power_up_cfg(struct bcmgenet_priv *pr= iv, } =20 /* Disable CRC Forward */ + spin_lock_bh(&priv->reg_lock); reg =3D bcmgenet_umac_readl(priv, UMAC_CMD); reg &=3D ~CMD_CRC_FWD; bcmgenet_umac_writel(priv, reg, UMAC_CMD); + spin_unlock_bh(&priv->reg_lock); } diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/eth= ernet/broadcom/genet/bcmmii.c index 86a4aa72b3d4..c4a3698cef66 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -76,6 +76,7 @@ static void bcmgenet_mac_config(struct net_device *dev) reg |=3D RGMII_LINK; bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL); =20 + spin_lock_bh(&priv->reg_lock); reg =3D bcmgenet_umac_readl(priv, UMAC_CMD); reg &=3D ~((CMD_SPEED_MASK << CMD_SPEED_SHIFT) | CMD_HD_EN | @@ -88,6 +89,7 @@ static void bcmgenet_mac_config(struct net_device *dev) reg |=3D CMD_TX_EN | CMD_RX_EN; } bcmgenet_umac_writel(priv, reg, UMAC_CMD); + spin_unlock_bh(&priv->reg_lock); =20 active =3D phy_init_eee(phydev, 0) >=3D 0; bcmgenet_eee_enable_set(dev, --=20 2.34.1