From patchwork Tue Sep 1 21:43:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1355407 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=iYk3UcD1; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bh0vQ1WNNz9sTK for ; Wed, 2 Sep 2020 07:44:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727778AbgIAVn7 (ORCPT ); Tue, 1 Sep 2020 17:43:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727918AbgIAVnz (ORCPT ); Tue, 1 Sep 2020 17:43:55 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97EFEC061245; Tue, 1 Sep 2020 14:43:54 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id s10so770048plp.1; Tue, 01 Sep 2020 14:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AyKMQ8WKejiUbQ0uoIq3ttpVPmq3IB07qohgDLCsLRM=; b=iYk3UcD1MRyTugIBSur90bL7s2ttFeEfAlYOfb9ezgpcRS8uU0w9JsNsAFKqXZk+LV Y+VCsuf6/hyA0h1lNvC1scXpdPYYAyqk3RU0VsgGINcituOdlLBEK9ewKhxtjFnCktgr 59eYUvwTyZI3P/qXO8uQZwCPHQQPRrmOXiX+Bs6Q9obAbjJcguuY+d/1cmBwBx9LIHQz QOBjrJerAPTy4UujMsojfVRK5Xv6eOj0pfOLVcZ0rfjJ39d/UC/NNIn+PjUgXgktE+gs gxqqZD8ejKwpgNrSL2JKHhLDY65MhZVpJQSV7iOCNu2yhs9rMTy0P5LRRtmlEt58Kcj/ kXxg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=AyKMQ8WKejiUbQ0uoIq3ttpVPmq3IB07qohgDLCsLRM=; b=ZJxoJUoMtO9A+vRYop8C97Q0IoNWt2rxEz0lx6U/FCXKnk2WW3wXGZrDNvXxpm6voD 3OFbYBSjjIeWwWOx1ZmVSrfb/S8H/H5lxOCGkUdBAMTt+JaCoCTGyvk63l6XJCOMUw6g W/bPITSU3ujOvWLB0DNNK/bW3oO+NH3B63iAbux/PsXp3qXPnRes5zhjAFeAzXw9hwwF G9MILdy8Xz3T5DifFnm56ih6Tgw6Vcqp6988nsnGo+TH/+BxpY6HNL4p3FCJ37e0+9Nk jPr6Kp52gv1uFecb6M0yAzcqvuSNQOq1TeZpWJGlsx8LKEgO+83KlOlTcwJHymCknzGA qWmw== X-Gm-Message-State: AOAM531iPRmGoY4b+43on2xiAW1zr0qCABaFpk0B9i5aAHPc5xtmCoNz +xKefuiqN92FsOcOe21ElZ1OnBfjXtE= X-Google-Smtp-Source: ABdhPJy7WjLjS4YhujBCm9ZAknj1AcuJdwvIuC4GttjemzaULadTZxoB1GkEvfiv7gZOFlyuK4WyWw== X-Received: by 2002:a17:902:7e82:b029:cf:85aa:69f6 with SMTP id z2-20020a1709027e82b02900cf85aa69f6mr782949pla.3.1598996633483; Tue, 01 Sep 2020 14:43:53 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id 131sm128663pfy.5.2020.09.01.14.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 14:43:52 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , "David S. Miller" , Jakub Kicinski , Rob Herring , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), bcm-kernel-feedback-list@broadcom.com (open list:BROADCOM SYSTEMPORT ETHERNET DRIVER) Subject: [PATCH net-next 1/3] dt-bindings: net: Document Broadcom SYSTEMPORT clocks Date: Tue, 1 Sep 2020 14:43:46 -0700 Message-Id: <20200901214348.1523403-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200901214348.1523403-1-f.fainelli@gmail.com> References: <20200901214348.1523403-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The Broadcom SYSTEMPORT adapters require the use of two clocks for normal operations and during Wake-on-LAN, document those in the binding document. Signed-off-by: Florian Fainelli --- Documentation/devicetree/bindings/net/brcm,systemport.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/net/brcm,systemport.txt b/Documentation/devicetree/bindings/net/brcm,systemport.txt index 83f29e0e11ba..745bb1776572 100644 --- a/Documentation/devicetree/bindings/net/brcm,systemport.txt +++ b/Documentation/devicetree/bindings/net/brcm,systemport.txt @@ -20,6 +20,11 @@ Optional properties: - systemport,num-tier1-arb: number of tier 1 arbiters, an integer - systemport,num-txq: number of HW transmit queues, an integer - systemport,num-rxq: number of HW receive queues, an integer +- clocks: When provided, must be two phandles to the functional clocks nodes of + the SYSTEMPORT block. The first phandle is the main SYSTEMPORT clock used + during normal operation, while the second phandle is the Wake-on-LAN clock. +- clock-names: When provided, names of the functional clock phandles, first + name should be "sw_sysport" and second should be "sw_sysportwol". Example: ethernet@f04a0000 { From patchwork Tue Sep 1 21:43:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1355410 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=Dhr0OXSw; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bh0vr23bRz9sTK for ; Wed, 2 Sep 2020 07:44:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729780AbgIAVoU (ORCPT ); Tue, 1 Sep 2020 17:44:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728254AbgIAVn4 (ORCPT ); Tue, 1 Sep 2020 17:43:56 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E879FC061246; Tue, 1 Sep 2020 14:43:55 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id o20so1598270pfp.11; Tue, 01 Sep 2020 14:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d5EYoQdI5GiOhLcTx7JrnzA5XeLUDDs4+6VUPTSerPA=; b=Dhr0OXSwMkG0bRpkTfycNq261oGM88ld3HaGT3E/qiZGe/CdlJ41K8bw+aCIUes69H 0dd805tI8SzDwAaFs18ppQNN0JdU9mgi51MUyl3ckHbRrE3eq4NHSL6b6QUu69qVR5ph zULkGeHqp6O2+QyGozxijvqnTMvjQnd3tT3m97lBpGzfoqxRZ/Fxq8RC7J7NGwMD5jqj vBK84i3k3UJJb4ammM98wvJUYeq/B1XXvpspB7FCRCweLA+NABS2W+qqrKDq+ZSNvfcr q5EgjxGIarGgNaUU4l6smACAWRRS46lqpu85wpXO8BKW8bExl7wcMGbOiIrpidbvPsDi bU8A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=d5EYoQdI5GiOhLcTx7JrnzA5XeLUDDs4+6VUPTSerPA=; b=TWTKq5oiDKnG3nLPftW+RhWqB7APS3iGTrbgHIeuqORjpOXWD8es7H7HckwZwT/OsK ECfzByLW5F1XjZeFTc+DaWZa6oWeUDLRbR3y0PMwSbvCYzspFBecJCZ9nN857PmFUomt W6HJs+Nw8yktOLKTAZEc8POnarE2r8GzsFPMgYhw9GrOeXEe4BhlBlQsu9Wfbbpm4tQl YK/CNQMGKdYvEgefNYCrfjr62WO41kCl6ECZPQ/A68RBm+HMNr94yQ9cpeN+X1J99TB6 388uQCdBpBIed6Lu6qCDiPRZDRZllp5KZxToljhRkulS9M1AE3WWjSeay9wPKqyzFdSP 1KEw== X-Gm-Message-State: AOAM530IcMcDtP3PN3ipLsEAhw2W5r+OMx5jx6gxrvRn8sSAhGHRpA31 Ra5iKG/1MKgdaVG2T9cBH3IFFAw85sg= X-Google-Smtp-Source: ABdhPJwCkzLE4JLcy+xP6c4nIhaJCg/VHIRjnnKb01VhjmdOkUx+uCtA6k7TaOvhj7O3wXxtQU8Isw== X-Received: by 2002:a62:7d51:: with SMTP id y78mr200417pfc.182.1598996635003; Tue, 01 Sep 2020 14:43:55 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id 131sm128663pfy.5.2020.09.01.14.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 14:43:54 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , "David S. Miller" , Jakub Kicinski , Rob Herring , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), bcm-kernel-feedback-list@broadcom.com (open list:BROADCOM SYSTEMPORT ETHERNET DRIVER) Subject: [PATCH net-next 2/3] net: systemport: fetch and use clock resources Date: Tue, 1 Sep 2020 14:43:47 -0700 Message-Id: <20200901214348.1523403-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200901214348.1523403-1-f.fainelli@gmail.com> References: <20200901214348.1523403-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We disable clocks shortly after probing the device to save as much power as possible in case the interface is never used. When bcm_sysport_open() is invoked, clocks are enabled, and disabled in bcm_sysport_stop(). A similar scheme is applied to the suspend/resume functions. Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/bcmsysport.c | 30 +++++++++++++++++++++- drivers/net/ethernet/broadcom/bcmsysport.h | 1 + 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index dfed9ade6950..91eadba5540c 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -186,6 +187,11 @@ static int bcm_sysport_set_features(struct net_device *dev, netdev_features_t features) { struct bcm_sysport_priv *priv = netdev_priv(dev); + int ret; + + ret = clk_prepare_enable(priv->clk); + if (ret) + return ret; /* Read CRC forward */ if (!priv->is_lite) @@ -197,6 +203,8 @@ static int bcm_sysport_set_features(struct net_device *dev, bcm_sysport_set_rx_csum(dev, features); bcm_sysport_set_tx_csum(dev, features); + clk_disable_unprepare(priv->clk); + return 0; } @@ -1940,6 +1948,8 @@ static int bcm_sysport_open(struct net_device *dev) unsigned int i; int ret; + clk_prepare_enable(priv->clk); + /* Reset UniMAC */ umac_reset(priv); @@ -1970,7 +1980,8 @@ static int bcm_sysport_open(struct net_device *dev) 0, priv->phy_interface); if (!phydev) { netdev_err(dev, "could not attach to PHY\n"); - return -ENODEV; + ret = -ENODEV; + goto out_clk_disable; } /* Reset house keeping link status */ @@ -2048,6 +2059,8 @@ static int bcm_sysport_open(struct net_device *dev) free_irq(priv->irq0, dev); out_phy_disconnect: phy_disconnect(phydev); +out_clk_disable: + clk_disable_unprepare(priv->clk); return ret; } @@ -2106,6 +2119,8 @@ static int bcm_sysport_stop(struct net_device *dev) /* Disconnect from PHY */ phy_disconnect(dev->phydev); + clk_disable_unprepare(priv->clk); + return 0; } @@ -2487,6 +2502,10 @@ static int bcm_sysport_probe(struct platform_device *pdev) /* Initialize private members */ priv = netdev_priv(dev); + priv->clk = devm_clk_get_optional(&pdev->dev, "sw_sysport"); + if (IS_ERR(priv->clk)) + return PTR_ERR(priv->clk); + /* Allocate number of TX rings */ priv->tx_rings = devm_kcalloc(&pdev->dev, txq, sizeof(struct bcm_sysport_tx_ring), @@ -2588,6 +2607,8 @@ static int bcm_sysport_probe(struct platform_device *pdev) goto err_deregister_notifier; } + clk_prepare_enable(priv->clk); + priv->rev = topctrl_readl(priv, REV_CNTL) & REV_MASK; dev_info(&pdev->dev, "Broadcom SYSTEMPORT%s " REV_FMT @@ -2596,6 +2617,8 @@ static int bcm_sysport_probe(struct platform_device *pdev) (priv->rev >> 8) & 0xff, priv->rev & 0xff, priv->irq0, priv->irq1, txq, rxq); + clk_disable_unprepare(priv->clk); + return 0; err_deregister_notifier: @@ -2752,6 +2775,8 @@ static int __maybe_unused bcm_sysport_suspend(struct device *d) if (device_may_wakeup(d) && priv->wolopts) ret = bcm_sysport_suspend_to_wol(priv); + clk_disable_unprepare(priv->clk); + return ret; } @@ -2765,6 +2790,8 @@ static int __maybe_unused bcm_sysport_resume(struct device *d) if (!netif_running(dev)) return 0; + clk_prepare_enable(priv->clk); + umac_reset(priv); /* Disable the UniMAC RX/TX */ @@ -2844,6 +2871,7 @@ static int __maybe_unused bcm_sysport_resume(struct device *d) out_free_tx_rings: for (i = 0; i < dev->num_tx_queues; i++) bcm_sysport_fini_tx_ring(priv, i); + clk_disable_unprepare(priv->clk); return ret; } diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h index 6d80735fbc7f..51800053e88c 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.h +++ b/drivers/net/ethernet/broadcom/bcmsysport.h @@ -770,6 +770,7 @@ struct bcm_sysport_priv { u32 wolopts; u8 sopass[SOPASS_MAX]; unsigned int wol_irq_disabled:1; + struct clk *clk; /* MIB related fields */ struct bcm_sysport_mib mib; From patchwork Tue Sep 1 21:43:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1355409 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=vMze48wK; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bh0vj5xwRz9sTK for ; Wed, 2 Sep 2020 07:44:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729710AbgIAVoO (ORCPT ); Tue, 1 Sep 2020 17:44:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728677AbgIAVn6 (ORCPT ); Tue, 1 Sep 2020 17:43:58 -0400 Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87325C061244; Tue, 1 Sep 2020 14:43:57 -0700 (PDT) Received: by mail-pf1-x442.google.com with SMTP id o68so1616168pfg.2; Tue, 01 Sep 2020 14:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wxoDaZ8UHHEQlvfwUILqE66J22AZX7CBjGhbO9+lAP8=; b=vMze48wKQwuyKYU1aG6dAoBZ3pChYbJqqV8YZQK7QYyAHpBWIfiVRC8xJnWTsWhn/I /G+WHvFyNHr7CKGs6vI3ZZVK1TjNwZ/3QXNgzF0rW6da8QLD7VvIXmb+pin9EWAULLGB eE5VkYESLpu5sNfb66v027v5UWMGZL9ZmhjYACmjQ4pOpOPkDKRz5u/RQtTvzUZYHd25 8wQlF5XgR/KMD7anSJ86Adm7eRzOiZyMu6abV19eknVj5wWJiTmytQSxkjWHBR5b3N8G munKz0Tr0YYLCj2SpYIKyHZdLIpnJg0lLP63Lw6pFNDAur1Yx1ObNsW2XpLmwPp4OjW2 nN0w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=wxoDaZ8UHHEQlvfwUILqE66J22AZX7CBjGhbO9+lAP8=; b=MrK0O8BekDgovXdtd4QbcIAAwboM4K6KsBjKJgU7SexS0R1ZvaBp0NNkilb0XaNOg/ 8X4YchBN0vEnsntdWTedM/xl9CUXyVWgHSw0dqN4WS5WZba5E0hx9/KZRaO5XIgpVy7D Dt9yPkthMFf5kANzq59aErBX4ZaGDkUHAM2yfNnwvybgTpj+mp0oz7FPiBzIDhiIyURy UFgwbfI8sWcMEn7Gcr7LZqWrx70ZiJ/TOoRG6XhqQgdxh4G0wHArEXyDRWH4PxrzIA4r IvP6xhub7akQYFvVhj/wUxrZEfg6d1/oPB4ZKqY1dx+RZMNGLrj09xnAllwnTO2zNIZ8 BieA== X-Gm-Message-State: AOAM533OAqYWDtmol5+tabCKzZgK4hiNmVavzB0hWv2398krwosNloXi qA3ViaSCmgvfLdg3yVanvFBq8XSa0+c= X-Google-Smtp-Source: ABdhPJxNwuniEyTkzzYubwMHYOvUnazz975bfaZP0Z1jnZQtFQ9mWKuXNldMHS6Hknm7dxuvcbmc1w== X-Received: by 2002:a62:7a97:: with SMTP id v145mr182279pfc.19.1598996636655; Tue, 01 Sep 2020 14:43:56 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id 131sm128663pfy.5.2020.09.01.14.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 14:43:55 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Blair Prescott , "David S. Miller" , Jakub Kicinski , Rob Herring , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), bcm-kernel-feedback-list@broadcom.com (open list:BROADCOM SYSTEMPORT ETHERNET DRIVER) Subject: [PATCH net-next 3/3] net: systemport: Manage Wake-on-LAN clock Date: Tue, 1 Sep 2020 14:43:48 -0700 Message-Id: <20200901214348.1523403-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200901214348.1523403-1-f.fainelli@gmail.com> References: <20200901214348.1523403-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It is necessary to manage the Wake-on-LAN clock to turn on the appropriate blocks for MPD or CFP-based packet matching to work otherwise we will not be able to reliably match packets during suspend. Reported-by: Blair Prescott Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/bcmsysport.c | 10 +++++++++- drivers/net/ethernet/broadcom/bcmsysport.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index 91eadba5540c..b25c70b74c92 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -2583,6 +2583,10 @@ static int bcm_sysport_probe(struct platform_device *pdev) if (!ret) device_set_wakeup_capable(&pdev->dev, 1); + priv->wol_clk = devm_clk_get_optional(&pdev->dev, "sw_sysportwol"); + if (IS_ERR(priv->wol_clk)) + return PTR_ERR(priv->wol_clk); + /* Set the needed headroom once and for all */ BUILD_BUG_ON(sizeof(struct bcm_tsb) != 8); dev->needed_headroom += sizeof(struct bcm_tsb); @@ -2772,8 +2776,10 @@ static int __maybe_unused bcm_sysport_suspend(struct device *d) bcm_sysport_fini_rx_ring(priv); /* Get prepared for Wake-on-LAN */ - if (device_may_wakeup(d) && priv->wolopts) + if (device_may_wakeup(d) && priv->wolopts) { + clk_prepare_enable(priv->wol_clk); ret = bcm_sysport_suspend_to_wol(priv); + } clk_disable_unprepare(priv->clk); @@ -2791,6 +2797,8 @@ static int __maybe_unused bcm_sysport_resume(struct device *d) return 0; clk_prepare_enable(priv->clk); + if (priv->wolopts) + clk_disable_unprepare(priv->wol_clk); umac_reset(priv); diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h index 51800053e88c..3a5cb6f128f5 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.h +++ b/drivers/net/ethernet/broadcom/bcmsysport.h @@ -771,6 +771,7 @@ struct bcm_sysport_priv { u8 sopass[SOPASS_MAX]; unsigned int wol_irq_disabled:1; struct clk *clk; + struct clk *wol_clk; /* MIB related fields */ struct bcm_sysport_mib mib;