Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 816354,
    "url": "http://patchwork.ozlabs.org/api/patches/816354/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170920162805.29503-1-vivien.didelot@savoirfairelinux.com/",
    "project": {
        "id": 7,
        "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api",
        "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": "<20170920162805.29503-1-vivien.didelot@savoirfairelinux.com>",
    "list_archive_url": null,
    "date": "2017-09-20T16:28:05",
    "name": "[net-next] net: dsa: use dedicated CPU port",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "9f4437ccfe70b8111e00b30d03e6a08ec87ce621",
    "submitter": {
        "id": 15889,
        "url": "http://patchwork.ozlabs.org/api/people/15889/?format=api",
        "name": "Vivien Didelot",
        "email": "vivien.didelot@savoirfairelinux.com"
    },
    "delegate": {
        "id": 34,
        "url": "http://patchwork.ozlabs.org/api/users/34/?format=api",
        "username": "davem",
        "first_name": "David",
        "last_name": "Miller",
        "email": "davem@davemloft.net"
    },
    "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20170920162805.29503-1-vivien.didelot@savoirfairelinux.com/mbox/",
    "series": [
        {
            "id": 4172,
            "url": "http://patchwork.ozlabs.org/api/series/4172/?format=api",
            "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=4172",
            "date": "2017-09-20T16:28:05",
            "name": "[net-next] net: dsa: use dedicated CPU port",
            "version": 1,
            "mbox": "http://patchwork.ozlabs.org/series/4172/mbox/"
        }
    ],
    "comments": "http://patchwork.ozlabs.org/api/patches/816354/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/816354/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<netdev-owner@vger.kernel.org>",
        "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=<UNKNOWN>)",
        "Received": [
            "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xy4ym0w9Tz9t2Q\n\tfor <patchwork-incoming@ozlabs.org>;\n\tThu, 21 Sep 2017 02:32:16 +1000 (AEST)",
            "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752054AbdITQbt (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tWed, 20 Sep 2017 12:31:49 -0400",
            "from mail.savoirfairelinux.com ([208.88.110.44]:59604 \"EHLO\n\tmail.savoirfairelinux.com\" rhost-flags-OK-OK-OK-OK) by\n\tvger.kernel.org with ESMTP id S1751378AbdITQbr (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Wed, 20 Sep 2017 12:31:47 -0400",
            "from localhost (localhost [127.0.0.1])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTP id 729199C285D;\n\tWed, 20 Sep 2017 12:31:46 -0400 (EDT)",
            "from mail.savoirfairelinux.com ([127.0.0.1])\n\tby localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new,\n\tport 10032)\n\twith ESMTP id XTTZGdVFbtqE; Wed, 20 Sep 2017 12:31:45 -0400 (EDT)",
            "from localhost (localhost [127.0.0.1])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTP id DC3749C2A8B;\n\tWed, 20 Sep 2017 12:31:45 -0400 (EDT)",
            "from mail.savoirfairelinux.com ([127.0.0.1])\n\tby localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new,\n\tport 10026)\n\twith ESMTP id W_s_aWuLpEtW; Wed, 20 Sep 2017 12:31:45 -0400 (EDT)",
            "from weeman.lan (modemcable249.105-163-184.mc.videotron.ca\n\t[184.163.105.249])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTPSA id 94CB99C285D;\n\tWed, 20 Sep 2017 12:31:45 -0400 (EDT)"
        ],
        "X-Virus-Scanned": "amavisd-new at mail.savoirfairelinux.com",
        "From": "Vivien Didelot <vivien.didelot@savoirfairelinux.com>",
        "To": "netdev@vger.kernel.org",
        "Cc": "linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com,\n\t\"David S. Miller\" <davem@davemloft.net>,\n\tFlorian Fainelli <f.fainelli@gmail.com>, Andrew Lunn <andrew@lunn.ch>,\n\tVivien Didelot <vivien.didelot@savoirfairelinux.com>",
        "Subject": "[PATCH net-next] net: dsa: use dedicated CPU port",
        "Date": "Wed, 20 Sep 2017 12:28:05 -0400",
        "Message-Id": "<20170920162805.29503-1-vivien.didelot@savoirfairelinux.com>",
        "X-Mailer": "git-send-email 2.14.1",
        "Sender": "netdev-owner@vger.kernel.org",
        "Precedence": "bulk",
        "List-ID": "<netdev.vger.kernel.org>",
        "X-Mailing-List": "netdev@vger.kernel.org"
    },
    "content": "Each port in DSA has its own dedicated CPU port currently available in\nits parent switch's ds->ports[port].cpu_dp. Use it instead of getting\nthe unique tree CPU port, which will be deprecated soon.\n\nSigned-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>\n---\n drivers/net/dsa/b53/b53_common.c | 4 ++--\n drivers/net/dsa/bcm_sf2.c        | 6 +++---\n drivers/net/dsa/mt7530.c         | 4 ++--\n drivers/net/dsa/mv88e6060.c      | 2 +-\n drivers/net/dsa/qca8k.c          | 2 +-\n 5 files changed, 9 insertions(+), 9 deletions(-)",
    "diff": "diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c\nindex a9f2a5b55a5e..d4ce092def83 100644\n--- a/drivers/net/dsa/b53/b53_common.c\n+++ b/drivers/net/dsa/b53/b53_common.c\n@@ -1336,7 +1336,7 @@ EXPORT_SYMBOL(b53_fdb_dump);\n int b53_br_join(struct dsa_switch *ds, int port, struct net_device *br)\n {\n \tstruct b53_device *dev = ds->priv;\n-\ts8 cpu_port = ds->dst->cpu_dp->index;\n+\ts8 cpu_port = ds->ports[port].cpu_dp->index;\n \tu16 pvlan, reg;\n \tunsigned int i;\n \n@@ -1382,7 +1382,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *br)\n {\n \tstruct b53_device *dev = ds->priv;\n \tstruct b53_vlan *vl = &dev->vlans[0];\n-\ts8 cpu_port = ds->dst->cpu_dp->index;\n+\ts8 cpu_port = ds->ports[port].cpu_dp->index;\n \tunsigned int i;\n \tu16 pvlan, reg, pvid;\n \ndiff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c\nindex 0072a959db5b..898d5642b516 100644\n--- a/drivers/net/dsa/bcm_sf2.c\n+++ b/drivers/net/dsa/bcm_sf2.c\n@@ -661,7 +661,7 @@ static int bcm_sf2_sw_resume(struct dsa_switch *ds)\n static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port,\n \t\t\t       struct ethtool_wolinfo *wol)\n {\n-\tstruct net_device *p = ds->dst->cpu_dp->netdev;\n+\tstruct net_device *p = ds->ports[port].cpu_dp->netdev;\n \tstruct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);\n \tstruct ethtool_wolinfo pwol;\n \n@@ -684,9 +684,9 @@ static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port,\n static int bcm_sf2_sw_set_wol(struct dsa_switch *ds, int port,\n \t\t\t      struct ethtool_wolinfo *wol)\n {\n-\tstruct net_device *p = ds->dst->cpu_dp->netdev;\n+\tstruct net_device *p = ds->ports[port].cpu_dp->netdev;\n \tstruct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);\n-\ts8 cpu_port = ds->dst->cpu_dp->index;\n+\ts8 cpu_port = ds->ports[port].cpu_dp->index;\n \tstruct ethtool_wolinfo pwol;\n \n \tp->ethtool_ops->get_wol(p, &pwol);\ndiff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c\nindex c142b97add2c..faa3b88d2206 100644\n--- a/drivers/net/dsa/mt7530.c\n+++ b/drivers/net/dsa/mt7530.c\n@@ -928,11 +928,11 @@ mt7530_setup(struct dsa_switch *ds)\n \tstruct device_node *dn;\n \tstruct mt7530_dummy_poll p;\n \n-\t/* The parent node of cpu_dp->netdev which holds the common system\n+\t/* The parent node of master netdev which holds the common system\n \t * controller also is the container for two GMACs nodes representing\n \t * as two netdev instances.\n \t */\n-\tdn = ds->dst->cpu_dp->netdev->dev.of_node->parent;\n+\tdn = ds->ports[MT7530_CPU_PORT].netdev->dev.of_node->parent;\n \tpriv->ethernet = syscon_node_to_regmap(dn);\n \tif (IS_ERR(priv->ethernet))\n \t\treturn PTR_ERR(priv->ethernet);\ndiff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c\nindex dce7fa57eb55..621cdc46ad81 100644\n--- a/drivers/net/dsa/mv88e6060.c\n+++ b/drivers/net/dsa/mv88e6060.c\n@@ -176,7 +176,7 @@ static int mv88e6060_setup_port(struct dsa_switch *ds, int p)\n \t\t  ((p & 0xf) << PORT_VLAN_MAP_DBNUM_SHIFT) |\n \t\t   (dsa_is_cpu_port(ds, p) ?\n \t\t\tds->enabled_port_mask :\n-\t\t\tBIT(ds->dst->cpu_dp->index)));\n+\t\t\tBIT(ds->ports[p].cpu_dp->index)));\n \n \t/* Port Association Vector: when learning source addresses\n \t * of packets, add the address to the address database using\ndiff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c\nindex 5ada7a41449c..82f09711ac1a 100644\n--- a/drivers/net/dsa/qca8k.c\n+++ b/drivers/net/dsa/qca8k.c\n@@ -506,7 +506,7 @@ qca8k_setup(struct dsa_switch *ds)\n \t\tpr_warn(\"regmap initialization failed\");\n \n \t/* Initialize CPU port pad mode (xMII type, delays...) */\n-\tphy_mode = of_get_phy_mode(ds->dst->cpu_dp->dn);\n+\tphy_mode = of_get_phy_mode(ds->ports[QCA8K_CPU_PORT].dn);\n \tif (phy_mode < 0) {\n \t\tpr_err(\"Can't find phy-mode for master device\\n\");\n \t\treturn phy_mode;\n",
    "prefixes": [
        "net-next"
    ]
}