Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3028760ybt; Mon, 29 Jun 2020 13:19:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw26nhHL9VfcOI/q3RogiwB+v5IWa7AlFw5Px8SU7stAD308VnWho/3oslr+hLPfiIqFVt4 X-Received: by 2002:a17:906:924d:: with SMTP id c13mr9464061ejx.518.1593461953384; Mon, 29 Jun 2020 13:19:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593461953; cv=none; d=google.com; s=arc-20160816; b=QpzvrIVikN1Z1F723IsLK6Y5LI5qb0mtFOLstIhepc6KbLVWoyX8Dwkdf+cFu4tWBY OikdQyd95LE4IyB5FnJpCDxY2Z7WYQVZCMVfoSPZhb/Cq843eaIrw1EdZFGPqcmzm52i Lp8279HjkUJrXMmCz9ZE63bZk1MQSWlNk8wvXmN4gZa6cRm+zl0/tgEA99mnc/9puUsQ P1v99upDUahBMWShKPhrhxWDrXRbTagolwFcbwymiW/Qu62A2jmE2sgImTak+lMJ2Mpj RdJh4NqtskId6skyYjE7ZZbmvl47bb4dmBxE8sVNWg1PuEtarGrBFRhfWbr9yqCMY9XI nU3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=knnXPT2LSF7TWIeKBXTBaLvTxNRiaFJOMdjfci7GaDU=; b=hR3eeyr5tYd38E/A0xsS5Y5Yd4TJL+7C0yrjqLVzWRiozYw0gwCRGpmkzSCdLBY49N 7/Mgp4xGJ1+EmBPfiEYQfGvvnVfqTCXD7YoWczrpFI9puFH4vK5e2+zIpTlcw/+vnsK+ 487giNJvPRkLIYRhOqkthRMWdJx/ZZQhz+SCSq9Jl194nUlOelZFsEdInajE6DfXHnHC nLWjWUUmYcwBgH15DwGGbRHRr716ZiT5/MXg6lHcKpUmcAj33Qj2a0J1tmaSec3pzrgP exbVwTMILHQGDcblEnoeYUwbsL+SxarTfbti8KqOWL8llc9GVbbT3kIjksmgnpcmt7nL qZsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zDatoSSa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m4si413118ejn.10.2020.06.29.13.18.50; Mon, 29 Jun 2020 13:19:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zDatoSSa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732274AbgF2UPV (ORCPT + 99 others); Mon, 29 Jun 2020 16:15:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:40564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732820AbgF2TaR (ORCPT ); Mon, 29 Jun 2020 15:30:17 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 10EAE251EC; Mon, 29 Jun 2020 15:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444909; bh=GT2VB5Iqd6Zk1iaUTAJN6eBdprg2RUo19uhmtJmufp0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zDatoSSaIU5rMUil7BBYc7jvGSo1As0zTyXTmGF5ZVr4n6Pf7nFZ1xiRzR2WNU3Dg vk2ZupmapWbSh9MBk5gmbZOqZ0XonC+MeAY6iL2Wm/+XDJLV29tx9jxWSaEm8nQFA6 rxbUfEbiJ3/CtxHBBL8FuZzKsogncfabwB9ozlKA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Doug Berger , "David S . Miller" , Sasha Levin Subject: [PATCH 4.19 005/131] net: bcmgenet: remove HFB_CTRL access Date: Mon, 29 Jun 2020 11:32:56 -0400 Message-Id: <20200629153502.2494656-6-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629153502.2494656-1-sashal@kernel.org> References: <20200629153502.2494656-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.131-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.19.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.19.131-rc1 X-KernelTest-Deadline: 2020-07-01T15:34+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Doug Berger [ Upstream commit 24d476db6dfb0f85130e348ca1bbd14afb73a8be ] Commit c5a54bbcecec ("net: bcmgenet: abort suspend on error") mistakenly introduced register accesses that should not occur in bcmgenet_wol_power_up_cfg(). Fixes: c5a54bbcecec ("net: bcmgenet: abort suspend on error") Signed-off-by: Doug Berger Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c b/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c index b3596e0ee47ba..57582efa362df 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c @@ -191,10 +191,6 @@ void bcmgenet_wol_power_up_cfg(struct bcmgenet_priv *priv, reg &= ~MPD_EN; bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL); - reg = bcmgenet_hfb_reg_readl(priv, HFB_CTRL); - reg &= ~(RBUF_HFB_EN | RBUF_ACPI_EN); - bcmgenet_hfb_reg_writel(priv, reg, HFB_CTRL); - /* Disable CRC Forward */ reg = bcmgenet_umac_readl(priv, UMAC_CMD); reg &= ~CMD_CRC_FWD; -- 2.25.1