{"id":815187,"url":"http://patchwork.ozlabs.org/api/patches/815187/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170918214128.27896-9-f.fainelli@gmail.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170918214128.27896-9-f.fainelli@gmail.com>","list_archive_url":null,"date":"2017-09-18T21:41:24","name":"[net-next,08/12] net: dsa: b53: Move EEE functions to b53","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"5ac2bf581d46a0e4c0668c6d9e9cfe60a7676aea","submitter":{"id":2800,"url":"http://patchwork.ozlabs.org/api/people/2800/?format=json","name":"Florian Fainelli","email":"f.fainelli@gmail.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170918214128.27896-9-f.fainelli@gmail.com/mbox/","series":[{"id":3739,"url":"http://patchwork.ozlabs.org/api/series/3739/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3739","date":"2017-09-18T21:41:16","name":"net: dsa: b53/bcm_sf2 cleanups","version":1,"mbox":"http://patchwork.ozlabs.org/series/3739/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815187/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815187/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"b3G+FZx3\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xwzxD6zMvz9ryv\n\tfor ;\n\tTue, 19 Sep 2017 07:42:08 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751600AbdIRVmF (ORCPT );\n\tMon, 18 Sep 2017 17:42:05 -0400","from mail-wm0-f67.google.com ([74.125.82.67]:37671 \"EHLO\n\tmail-wm0-f67.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751576AbdIRVmC (ORCPT\n\t); Mon, 18 Sep 2017 17:42:02 -0400","by mail-wm0-f67.google.com with SMTP id f4so2120867wmh.4\n\tfor ; Mon, 18 Sep 2017 14:42:01 -0700 (PDT)","from fainelli-desktop.broadcom.com ([192.19.255.250])\n\tby smtp.gmail.com with ESMTPSA id\n\te34sm9242761wre.15.2017.09.18.14.41.58\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 18 Sep 2017 14:41:59 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=Axe3sK6VJVaEvbVP9A20iycIfYdeAtu+ZaUpsx9ih6g=;\n\tb=b3G+FZx3QSvOJYryNBHhrkdkQCwoXtQrYTX+oadO07SUeux1zMzUT6p51wRnbJzU/J\n\tFz7lf2rHFyUXdC52oaauOlR62Hoc3JpBmeC7eXlKs/8sFxSM6K6dX1OH9X7jShrbOG9j\n\tLio/u62IfosupLIf66QmMfxobWvkOsjZgcDPHDv2J4pXbu+3j1qs5NiOyqh90+bpIOB3\n\tQ0bEX9R6XlQZa/vbZRZUQG003/Qhf1XlRlUro7q/3b9nCa4dKXicZrR3hfaShIDizfOY\n\tYVfk9Ly9sHWwLhZI5UiU4synJqFWA2hPwGOz0HERFNO/sR87PuP/OfVg62dsUnVQlCov\n\tnTig==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=Axe3sK6VJVaEvbVP9A20iycIfYdeAtu+ZaUpsx9ih6g=;\n\tb=P80HYcOl/A+N6jzRIYFfNncFbnDE9yz9UFpRiwJ3e27Q4B/4PIus7WHBsK9zYrT5Jz\n\t/NFvfqwtLpKAcfjBzvTkkceROTaBboOdpETMW7+MV8prEqJOsR93koBadBipkIeC6lD9\n\t4blhOzpPF46IrNNRJj+eTAYDnIp64N9FPDqsYK7ty/NYKlXs1wPF8OUBI8PPMPjVuwFS\n\tMP0MY2yoY8BopWHcW8BHwVVVVbldYv5qlxlMI92qIG4+pkCL6LKKAUgft8mvmS9bV7gT\n\tr5PDXzEznU8f0hvnRrf47drGWEVi3JKS4AEqjxWY5pYd3AsypbTCsyB/DyWfuc7uKORo\n\tispQ==","X-Gm-Message-State":"AHPjjUgE3l0/MHAQNFZQYzUeKxG66QkxwEI/Xo/achFLyOtI4nlXqgW3\n\tZPCu0O2G62HjRaSzNIU=","X-Google-Smtp-Source":"AOwi7QBRJQBPFIlxqpoETbKmZHCHNsWqKpXj8+5SNn0B5UgfWMWFEg0tRXXy3ZoA/tqYBKDZ1eU9lA==","X-Received":"by 10.28.72.135 with SMTP id v129mr10506358wma.102.1505770920961;\n\tMon, 18 Sep 2017 14:42:00 -0700 (PDT)","From":"Florian Fainelli ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com,\n\tFlorian Fainelli ","Subject":"[PATCH net-next 08/12] net: dsa: b53: Move EEE functions to b53","Date":"Mon, 18 Sep 2017 14:41:24 -0700","Message-Id":"<20170918214128.27896-9-f.fainelli@gmail.com>","X-Mailer":"git-send-email 2.9.3","In-Reply-To":"<20170918214128.27896-1-f.fainelli@gmail.com>","References":"<20170918214128.27896-1-f.fainelli@gmail.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Move the bcm_sf2 EEE-related functions to the b53 driver because this is shared\ncode amongst Gigabit capable switch, only 5325 and 5365 are too old to support\nthat.\n\nSigned-off-by: Florian Fainelli \n---\n drivers/net/dsa/b53/b53_common.c | 62 +++++++++++++++++++++++++++++++++++++\n drivers/net/dsa/b53/b53_priv.h | 5 +++\n drivers/net/dsa/bcm_sf2.c | 66 ++++------------------------------------\n drivers/net/dsa/bcm_sf2.h | 2 --\n drivers/net/dsa/bcm_sf2_regs.h | 3 --\n 5 files changed, 73 insertions(+), 65 deletions(-)","diff":"diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c\nindex aa2187c71ea5..172f66f0d83e 100644\n--- a/drivers/net/dsa/b53/b53_common.c\n+++ b/drivers/net/dsa/b53/b53_common.c\n@@ -1531,6 +1531,68 @@ void b53_mirror_del(struct dsa_switch *ds, int port,\n }\n EXPORT_SYMBOL(b53_mirror_del);\n \n+void b53_eee_enable_set(struct dsa_switch *ds, int port, bool enable)\n+{\n+\tstruct b53_device *dev = ds->priv;\n+\tu16 reg;\n+\n+\tb53_read16(dev, B53_EEE_PAGE, B53_EEE_EN_CTRL, ®);\n+\tif (enable)\n+\t\treg |= BIT(port);\n+\telse\n+\t\treg &= ~BIT(port);\n+\tb53_write16(dev, B53_EEE_PAGE, B53_EEE_EN_CTRL, reg);\n+}\n+EXPORT_SYMBOL(b53_eee_enable_set);\n+\n+\n+/* Returns 0 if EEE was not enabled, or 1 otherwise\n+ */\n+int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy)\n+{\n+\tint ret;\n+\n+\tret = phy_init_eee(phy, 0);\n+\tif (ret)\n+\t\treturn 0;\n+\n+\tb53_eee_enable_set(ds, port, true);\n+\n+\treturn 1;\n+}\n+EXPORT_SYMBOL(b53_eee_init);\n+\n+int b53_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *e)\n+{\n+\tstruct b53_device *dev = ds->priv;\n+\tstruct ethtool_eee *p = &dev->ports[port].eee;\n+\tu16 reg;\n+\n+\tif (is5325(dev) || is5365(dev))\n+\t\treturn -EOPNOTSUPP;\n+\n+\tb53_read16(dev, B53_EEE_PAGE, B53_EEE_LPI_INDICATE, ®);\n+\te->eee_enabled = p->eee_enabled;\n+\te->eee_active = !!(reg & BIT(port));\n+\n+\treturn 0;\n+}\n+EXPORT_SYMBOL(b53_get_mac_eee);\n+\n+int b53_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *e)\n+{\n+\tstruct b53_device *dev = ds->priv;\n+\tstruct ethtool_eee *p = &dev->ports[port].eee;\n+\n+\tif (is5325(dev) || is5365(dev))\n+\t\treturn -EOPNOTSUPP;\n+\n+\tp->eee_enabled = e->eee_enabled;\n+\tb53_eee_enable_set(ds, port, e->eee_enabled);\n+\n+\treturn 0;\n+}\n+\n static const struct dsa_switch_ops b53_switch_ops = {\n \t.get_tag_protocol\t= b53_get_tag_protocol,\n \t.setup\t\t\t= b53_setup,\ndiff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h\nindex 44297b7c3795..0ed59672ef07 100644\n--- a/drivers/net/dsa/b53/b53_priv.h\n+++ b/drivers/net/dsa/b53/b53_priv.h\n@@ -70,6 +70,7 @@ enum {\n \n struct b53_port {\n \tu16\t\tvlan_ctl_mask;\n+\tstruct ethtool_eee eee;\n };\n \n struct b53_vlan {\n@@ -310,5 +311,9 @@ int b53_mirror_add(struct dsa_switch *ds, int port,\n void b53_mirror_del(struct dsa_switch *ds, int port,\n \t\t struct dsa_mall_mirror_tc_entry *mirror);\n void b53_brcm_hdr_setup(struct dsa_switch *ds, int port);\n+void b53_eee_enable_set(struct dsa_switch *ds, int port, bool enable);\n+int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy);\n+int b53_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *e);\n+int b53_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *e);\n \n #endif\ndiff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c\nindex 49cb51223f70..4e8ef4c07eab 100644\n--- a/drivers/net/dsa/bcm_sf2.c\n+++ b/drivers/net/dsa/bcm_sf2.c\n@@ -107,19 +107,6 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)\n \tcore_writel(priv, reg, offset);\n }\n \n-static void bcm_sf2_eee_enable_set(struct dsa_switch *ds, int port, bool enable)\n-{\n-\tstruct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);\n-\tu32 reg;\n-\n-\treg = core_readl(priv, CORE_EEE_EN_CTRL);\n-\tif (enable)\n-\t\treg |= 1 << port;\n-\telse\n-\t\treg &= ~(1 << port);\n-\tcore_writel(priv, reg, CORE_EEE_EN_CTRL);\n-}\n-\n static void bcm_sf2_gphy_enable_set(struct dsa_switch *ds, bool enable)\n {\n \tstruct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);\n@@ -256,8 +243,8 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,\n \tbcm_sf2_imp_vlan_setup(ds, cpu_port);\n \n \t/* If EEE was enabled, restore it */\n-\tif (priv->port_sts[port].eee.eee_enabled)\n-\t\tbcm_sf2_eee_enable_set(ds, port, true);\n+\tif (priv->dev->ports[port].eee.eee_enabled)\n+\t\tb53_eee_enable_set(ds, port, true);\n \n \treturn 0;\n }\n@@ -292,47 +279,6 @@ static void bcm_sf2_port_disable(struct dsa_switch *ds, int port,\n \tcore_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL);\n }\n \n-/* Returns 0 if EEE was not enabled, or 1 otherwise\n- */\n-static int bcm_sf2_eee_init(struct dsa_switch *ds, int port,\n-\t\t\t struct phy_device *phy)\n-{\n-\tint ret;\n-\n-\tret = phy_init_eee(phy, 0);\n-\tif (ret)\n-\t\treturn 0;\n-\n-\tbcm_sf2_eee_enable_set(ds, port, true);\n-\n-\treturn 1;\n-}\n-\n-static int bcm_sf2_sw_get_mac_eee(struct dsa_switch *ds, int port,\n-\t\t\t\t struct ethtool_eee *e)\n-{\n-\tstruct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);\n-\tstruct ethtool_eee *p = &priv->port_sts[port].eee;\n-\tu32 reg;\n-\n-\treg = core_readl(priv, CORE_EEE_LPI_INDICATE);\n-\te->eee_enabled = p->eee_enabled;\n-\te->eee_active = !!(reg & (1 << port));\n-\n-\treturn 0;\n-}\n-\n-static int bcm_sf2_sw_set_mac_eee(struct dsa_switch *ds, int port,\n-\t\t\t\t struct ethtool_eee *e)\n-{\n-\tstruct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);\n-\tstruct ethtool_eee *p = &priv->port_sts[port].eee;\n-\n-\tp->eee_enabled = e->eee_enabled;\n-\tbcm_sf2_eee_enable_set(ds, port, e->eee_enabled);\n-\n-\treturn 0;\n-}\n \n static int bcm_sf2_sw_indir_rw(struct bcm_sf2_priv *priv, int op, int addr,\n \t\t\t int regnum, u16 val)\n@@ -567,7 +513,7 @@ static void bcm_sf2_sw_adjust_link(struct dsa_switch *ds, int port,\n \t\t\t\t struct phy_device *phydev)\n {\n \tstruct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);\n-\tstruct ethtool_eee *p = &priv->port_sts[port].eee;\n+\tstruct ethtool_eee *p = &priv->dev->ports[port].eee;\n \tu32 id_mode_dis = 0, port_mode;\n \tconst char *str = NULL;\n \tu32 reg, offset;\n@@ -649,7 +595,7 @@ static void bcm_sf2_sw_adjust_link(struct dsa_switch *ds, int port,\n \tcore_writel(priv, reg, offset);\n \n \tif (!phydev->is_pseudo_fixed_link)\n-\t\tp->eee_enabled = bcm_sf2_eee_init(ds, port, phydev);\n+\t\tp->eee_enabled = b53_eee_init(ds, port, phydev);\n }\n \n static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port,\n@@ -978,8 +924,8 @@ static const struct dsa_switch_ops bcm_sf2_ops = {\n \t.set_wol\t\t= bcm_sf2_sw_set_wol,\n \t.port_enable\t\t= bcm_sf2_port_setup,\n \t.port_disable\t\t= bcm_sf2_port_disable,\n-\t.get_mac_eee\t\t= bcm_sf2_sw_get_mac_eee,\n-\t.set_mac_eee\t\t= bcm_sf2_sw_set_mac_eee,\n+\t.get_mac_eee\t\t= b53_get_mac_eee,\n+\t.set_mac_eee\t\t= b53_set_mac_eee,\n \t.port_bridge_join\t= b53_br_join,\n \t.port_bridge_leave\t= b53_br_leave,\n \t.port_stp_state_set\t= b53_br_set_stp_state,\ndiff --git a/drivers/net/dsa/bcm_sf2.h b/drivers/net/dsa/bcm_sf2.h\nindex 02c499f9c56b..1922e027ff59 100644\n--- a/drivers/net/dsa/bcm_sf2.h\n+++ b/drivers/net/dsa/bcm_sf2.h\n@@ -48,8 +48,6 @@ struct bcm_sf2_hw_params {\n \n struct bcm_sf2_port_status {\n \tunsigned int link;\n-\n-\tstruct ethtool_eee eee;\n };\n \n struct bcm_sf2_cfp_priv {\ndiff --git a/drivers/net/dsa/bcm_sf2_regs.h b/drivers/net/dsa/bcm_sf2_regs.h\nindex 788361ad68a0..d8b8074a47b9 100644\n--- a/drivers/net/dsa/bcm_sf2_regs.h\n+++ b/drivers/net/dsa/bcm_sf2_regs.h\n@@ -244,9 +244,6 @@ enum bcm_sf2_reg_offs {\n \n #define CORE_JOIN_ALL_VLAN_EN\t\t0xd140\n \n-#define CORE_EEE_EN_CTRL\t\t0x24800\n-#define CORE_EEE_LPI_INDICATE\t\t0x24810\n-\n #define CORE_CFP_ACC\t\t\t0x28000\n #define OP_STR_DONE\t\t\t(1 << 0)\n #define OP_SEL_SHIFT\t\t\t1\n","prefixes":["net-next","08/12"]}