From patchwork Fri Feb 1 21:23:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1035190 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="iE0NKwUr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rqpp3DwNz9sCh for ; Sat, 2 Feb 2019 08:23:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726082AbfBAVXp (ORCPT ); Fri, 1 Feb 2019 16:23:45 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:38653 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725797AbfBAVXo (ORCPT ); Fri, 1 Feb 2019 16:23:44 -0500 Received: by mail-pg1-f195.google.com with SMTP id g189so3518162pgc.5 for ; Fri, 01 Feb 2019 13:23:44 -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=2NHEQ7iYptIfE96nJmBZTNGuzID4riW8ahHcEZfFiEI=; b=iE0NKwUr3hVtprS5rVn69atv5Ke7qXIYBB0rTICyLxVDvzoM547Fc8N/XYDYfIy8oi z6prEC4rFrWx116iFK5wTUyRKag9tfgRwp16NDotyPxbURpOtxXLSa6MdLw7D71fQi9S KxizhvfObZPXQaMYCyzxvdBiYuDIHBw3Dm2uM5tS2rUPk+pen0ygjpG8llqhQpfFjEZ3 qJ1ZH1NBU/jUJAGVo0uqrgzuFIp7tSo7u0HAuvEh2hMyWOzydr2tfP07gRLtx2eyhtaO R8hlvPk3MYdC8Lvd8jfN4C8y1U2uzs9+Dvh30srMQaNpeIyCILCtsXceRvGwgGm/zXEz HLtA== 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=2NHEQ7iYptIfE96nJmBZTNGuzID4riW8ahHcEZfFiEI=; b=ETg8PbxD7Lt1f59t3aod7nXJEnwCBH7xghzjyBckvK5pezdd4YgeIA50chYoOMvcRg LCAuvs8SaGj8jP/g6tXeSLBHh94X58NiSPop7a4dWiLQAg2uzkVx+jn8lgpCwunRLL2Q DOTdeRKaRd7hxD4+/4zsEdb8/wJ09ttGHy46vNLiZxLZ2VQk7/UmifdWqUuaxvH01Bwc VzYTcI1NGcCvp69cr7k+oKTEDNP8wobwntKYQGY2FIonCG1+LxXyuvGdUF7sCijRG0O5 o/STw5Q3b2F4EQBeqpNc+r7etOcODVJcIo8AK7iQNzdu1+9m9xHqmsvzYtU8wvzymRQQ 5pqQ== X-Gm-Message-State: AJcUukdg5GZxG+UvQqO5ZpT5s8ag+9hg9oD/RDi43sngFu+nFAps3wy9 NtmYXhFDe8MmUlHT2qmFMznqjNYf X-Google-Smtp-Source: ALg8bN7RiyqunMpjDe6L4Vli/vf/FElTmGzQJhl8B+gehe8GYeD+GRwLgrTeCQDaW7mvNTtTuIIJhA== X-Received: by 2002:a62:5b83:: with SMTP id p125mr41301636pfb.116.1549056223457; Fri, 01 Feb 2019 13:23:43 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id i62sm9494756pge.44.2019.02.01.13.23.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Feb 2019 13:23:42 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, Florian Fainelli Subject: [PATCH net] net: systemport: Fix WoL with password after deep sleep Date: Fri, 1 Feb 2019 13:23:38 -0800 Message-Id: <20190201212338.4449-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Broadcom STB chips support a deep sleep mode where all register contents are lost. Because we were stashing the MagicPacket password into some of these registers a suspend into that deep sleep then a resumption would not lead to being able to wake-up from MagicPacket with password again. Fix this by keeping a software copy of the password and program it during suspend. Fixes: 83e82f4c706b ("net: systemport: add Wake-on-LAN support") Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/bcmsysport.c | 25 +++++++++------------- drivers/net/ethernet/broadcom/bcmsysport.h | 2 ++ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index f9521d0274b7..28c9b0bdf2f6 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -520,7 +520,6 @@ static void bcm_sysport_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) { struct bcm_sysport_priv *priv = netdev_priv(dev); - u32 reg; wol->supported = WAKE_MAGIC | WAKE_MAGICSECURE | WAKE_FILTER; wol->wolopts = priv->wolopts; @@ -528,11 +527,7 @@ static void bcm_sysport_get_wol(struct net_device *dev, if (!(priv->wolopts & WAKE_MAGICSECURE)) return; - /* Return the programmed SecureOn password */ - reg = umac_readl(priv, UMAC_PSW_MS); - put_unaligned_be16(reg, &wol->sopass[0]); - reg = umac_readl(priv, UMAC_PSW_LS); - put_unaligned_be32(reg, &wol->sopass[2]); + memcpy(wol->sopass, priv->sopass, sizeof(priv->sopass)); } static int bcm_sysport_set_wol(struct net_device *dev, @@ -548,13 +543,8 @@ static int bcm_sysport_set_wol(struct net_device *dev, if (wol->wolopts & ~supported) return -EINVAL; - /* Program the SecureOn password */ - if (wol->wolopts & WAKE_MAGICSECURE) { - umac_writel(priv, get_unaligned_be16(&wol->sopass[0]), - UMAC_PSW_MS); - umac_writel(priv, get_unaligned_be32(&wol->sopass[2]), - UMAC_PSW_LS); - } + if (wol->wolopts & WAKE_MAGICSECURE) + memcpy(priv->sopass, wol->sopass, sizeof(priv->sopass)); /* Flag the device and relevant IRQ as wakeup capable */ if (wol->wolopts) { @@ -2649,13 +2639,18 @@ static int bcm_sysport_suspend_to_wol(struct bcm_sysport_priv *priv) unsigned int index, i = 0; u32 reg; - /* Password has already been programmed */ reg = umac_readl(priv, UMAC_MPD_CTRL); if (priv->wolopts & (WAKE_MAGIC | WAKE_MAGICSECURE)) reg |= MPD_EN; reg &= ~PSW_EN; - if (priv->wolopts & WAKE_MAGICSECURE) + if (priv->wolopts & WAKE_MAGICSECURE) { + /* Program the SecureOn password */ + umac_writel(priv, get_unaligned_be16(&priv->sopass[0]), + UMAC_PSW_MS); + umac_writel(priv, get_unaligned_be32(&priv->sopass[2]), + UMAC_PSW_LS); reg |= PSW_EN; + } umac_writel(priv, reg, UMAC_MPD_CTRL); if (priv->wolopts & WAKE_FILTER) { diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h index 0887e6356649..0b192fea9c5d 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.h +++ b/drivers/net/ethernet/broadcom/bcmsysport.h @@ -12,6 +12,7 @@ #define __BCM_SYSPORT_H #include +#include #include #include @@ -778,6 +779,7 @@ struct bcm_sysport_priv { unsigned int crc_fwd:1; u16 rev; u32 wolopts; + u8 sopass[SOPASS_MAX]; unsigned int wol_irq_disabled:1; /* MIB related fields */