From patchwork Tue Nov 20 23:17:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Berger X-Patchwork-Id: 1000782 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bfxsOGLt"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4301pZ3nlCz9s8r for ; Wed, 21 Nov 2018 10:18:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726035AbeKUJts (ORCPT ); Wed, 21 Nov 2018 04:49:48 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:37015 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725903AbeKUJts (ORCPT ); Wed, 21 Nov 2018 04:49:48 -0500 Received: by mail-pl1-f195.google.com with SMTP id b5so2527008plr.4; Tue, 20 Nov 2018 15:18:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=7RS3UCahL7eL5cCrFYDkdJ6sasQ4tBi9a6j/NQiDfFk=; b=bfxsOGLtsusFytPEqpe97mIwvSDh3nkmzxhbHRr6Dg6IJjvf2tac+Gywzx1PumoU6v JVM0fNbll/YyejWNhoeyCLiEZ1QUugAMvtKgTacsIUylHWIswjOpUZonlEi39FN+llHK xgDpJq7+KiZ0H9vRpInwknIivVCIzSg/GowxEqV2R0tuN31t/vVijkQwigeH8ND/uM+x 6ssVwNFdM7sW4xhvO69ldiIuXcubrlycBgT3m6W7vZSNBwBTyd9bAusjMn45UvNYWTee hvIhapLGVJvDagdAsMR6wGssRLNnMRZ8sFK7J+TWMQCYtIFhEfu/cY7Wv1pMRG+5Uwsn DvGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7RS3UCahL7eL5cCrFYDkdJ6sasQ4tBi9a6j/NQiDfFk=; b=RH/c+4y3KsKe4adR8MF9P8POu1tbrAUsJyNSD0fdsStvOLNvyLU0Z8cerg4vMWC6Xa yNAbuAEEIDjAcDF8BpMT3Rn3CyT9SyWk/WNINuKnQf3rOAK9P7H5rUferYua3eCaIuoN AkNRCf5vT/lGfxInLj4hZOr1X+gPZpWFoghPZ27A8xlgthjF6sK4RFFjSl207F1UEo5M ntiaZeZKgg7veB9bpDdEMdAjGMmVaKPN68Rj169dSYT4gLlK2FMaeSTXgSUqyJhDbly3 3LA9f/Lv48A1u15UCmrC2cMcRLqBtsUcsvYxGvOAZ7EP4+UAcE9+MB+mMFEkx4BPk9N3 42Aw== X-Gm-Message-State: AA+aEWZCA07RWF3sribTAnnoj0oCHK3GGIX6YXlnYjyckMrqbpXbX0mu PRPPwcc2IHm1645vIqO+zF8= X-Google-Smtp-Source: AFSGD/V29hZeUImnJRgiKE64yCkurHOptJn1j4Vey0yn5vnUiO6vHlwuhoLIBrZW2nodnnFSDl6duw== X-Received: by 2002:a17:902:7882:: with SMTP id q2mr4370183pll.305.1542755888069; Tue, 20 Nov 2018 15:18:08 -0800 (PST) Received: from stbirv-lnx-3.igp.broadcom.net (igp-prod-emp-gw.vpn.broadcom.com. [192.19.223.250]) by smtp.gmail.com with ESMTPSA id u127-v6sm52049933pfb.47.2018.11.20.15.18.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Nov 2018 15:18:07 -0800 (PST) From: Doug Berger To: "David S. Miller" Cc: Florian Fainelli , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Doug Berger Subject: [PATCH net-next] net: bcmgenet: remove HFB_CTRL access Date: Tue, 20 Nov 2018 15:17:01 -0800 Message-Id: <1542755821-21554-1-git-send-email-opendmb@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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 b3596e0ee47b..57582efa362d 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;