Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/807989/?format=api
{ "id": 807989, "url": "http://patchwork.ozlabs.org/api/patches/807989/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/1504138732-65383-6-git-send-email-f.fainelli@gmail.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": "<1504138732-65383-6-git-send-email-f.fainelli@gmail.com>", "list_archive_url": null, "date": "2017-08-31T00:18:49", "name": "[RFC,net-next,5/8] net: dsa: bcm_sf2: Fix number of CFP entries for BCM7278", "commit_ref": null, "pull_url": null, "state": "rfc", "archived": true, "hash": "6938886a1fa2f874829accf9dac0263c2ec4b9e1", "submitter": { "id": 2800, "url": "http://patchwork.ozlabs.org/api/people/2800/?format=api", "name": "Florian Fainelli", "email": "f.fainelli@gmail.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/1504138732-65383-6-git-send-email-f.fainelli@gmail.com/mbox/", "series": [ { "id": 728, "url": "http://patchwork.ozlabs.org/api/series/728/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=728", "date": "2017-08-31T00:18:44", "name": "net: dsa: Multi-queue awareness", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/728/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/807989/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/807989/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>)", "ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"TSFyJPCZ\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xjNVM5Dl0z9s83\n\tfor <patchwork-incoming@ozlabs.org>;\n\tThu, 31 Aug 2017 10:27:07 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751372AbdHaA1F (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tWed, 30 Aug 2017 20:27:05 -0400", "from mail-wm0-f65.google.com ([74.125.82.65]:38198 \"EHLO\n\tmail-wm0-f65.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1750814AbdHaA1E (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Wed, 30 Aug 2017 20:27:04 -0400", "by mail-wm0-f65.google.com with SMTP id u26so3334877wma.5\n\tfor <netdev@vger.kernel.org>; Wed, 30 Aug 2017 17:27:03 -0700 (PDT)", "from stb-bld-04.irv.broadcom.com ([192.19.255.250])\n\tby smtp.gmail.com with ESMTPSA id\n\te74sm5296636wmg.39.2017.08.30.17.26.57\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 30 Aug 2017 17:27:02 -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=hz66pmYMFWcAOJNkYIrNVmV+7AaZD1a9VgpGvoDJcDk=;\n\tb=TSFyJPCZ0Uq48Voif5u777Bk4BpanmvsdnYMb21Bomt3Cos8O2AE5LdoRTsb5SpK7b\n\tYqiy1jVs14Zh6Ir+qenM4QlyKj6Tw3EVe84AFWtrACm0BSUvxhDzO1Eur9fm8jgt0rsO\n\tlP2BOOv4QX/qk4RClmBwahwA58S/6IkBy9792Meide/dFALbXfrZpXvzSapBRa/H1m7O\n\tOsUA34AX548Khy4p/DCmSiu6Vf+bpI3JmGRdKOrSmjatDlMh6J1tQSaRY3dAWT2lEh7/\n\th6uZlNp3qG4+hlkMzydYF/FclxY/ouuBS2nYsyXeWms/a9LB8CaLqHdi5npnBki4+k3w\n\twt7Q==", "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=hz66pmYMFWcAOJNkYIrNVmV+7AaZD1a9VgpGvoDJcDk=;\n\tb=eAPBEGEL7L1Nd9foM/lbgW/XoXttjh6agikQnQmNcpvafpQ/GHiqZZ1Y5dU4G75O7r\n\tuyd1UwdLcbRwBCUyVJIEmLWf3VIucq69KsQEBjYP2pgml1ovIAccxNMSVx40BIvi2T0E\n\tYWzH7GJf/huEg5sOHNcTrV4l4I6MJUIuUDOXtRGC4moRPEOxnFhif8hfkZVY1rpL8LVN\n\tiOgi2nU02mZKEwjjllzQ+pBN0GnVjqmdKUUAnVCZS64236EolVW6wkxl4o0YbU027kan\n\t/3mt//jElHaQRFQjEMxkGMuGNVS+YMRcRpyuunimf7TDFaj07VuhH2POY3IFvMR9EOO+\n\toLeQ==", "X-Gm-Message-State": "AHYfb5jPueMVamHl1NJX2H8jbNRmHKwMOn7WJC+4QIhlOwCr3eQIK7pi\n\ty21V61ZH2qhG/KvNoCs=", "X-Received": "by 10.28.227.215 with SMTP id a206mr2267021wmh.9.1504139223012; \n\tWed, 30 Aug 2017 17:27:03 -0700 (PDT)", "From": "Florian Fainelli <f.fainelli@gmail.com>", "To": "netdev@vger.kernel.org", "Cc": "jiri@resnulli.us, jhs@mojatatu.com, davem@davemloft.net,\n\txiyou.wangcong@gmail.com, andrew@lunn.ch,\n\tvivien.didelot@savoirfairelinux.com,\n\tFlorian Fainelli <f.fainelli@gmail.com>", "Subject": "[RFC net-next 5/8] net: dsa: bcm_sf2: Fix number of CFP entries for\n\tBCM7278", "Date": "Wed, 30 Aug 2017 17:18:49 -0700", "Message-Id": "<1504138732-65383-6-git-send-email-f.fainelli@gmail.com>", "X-Mailer": "git-send-email 1.9.1", "In-Reply-To": "<1504138732-65383-1-git-send-email-f.fainelli@gmail.com>", "References": "<1504138732-65383-1-git-send-email-f.fainelli@gmail.com>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "BCM7278 has only 128 entries while BCM7445 has the full 256 entries set,\nfix that.\n\nFixes: 7318166cacad (\"net: dsa: bcm_sf2: Add support for ethtool::rxnfc\")\nSigned-off-by: Florian Fainelli <f.fainelli@gmail.com>\n---\n drivers/net/dsa/bcm_sf2.c | 4 ++++\n drivers/net/dsa/bcm_sf2.h | 1 +\n drivers/net/dsa/bcm_sf2_cfp.c | 8 ++++----\n 3 files changed, 9 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c\nindex fc9f9f171e55..af299fe343cc 100644\n--- a/drivers/net/dsa/bcm_sf2.c\n+++ b/drivers/net/dsa/bcm_sf2.c\n@@ -1043,6 +1043,7 @@ struct bcm_sf2_of_data {\n \tu32 type;\n \tconst u16 *reg_offsets;\n \tunsigned int core_reg_align;\n+\tunsigned int num_cfp_rules;\n };\n \n /* Register offsets for the SWITCH_REG_* block */\n@@ -1066,6 +1067,7 @@ struct bcm_sf2_of_data {\n \t.type\t\t= BCM7445_DEVICE_ID,\n \t.core_reg_align\t= 0,\n \t.reg_offsets\t= bcm_sf2_7445_reg_offsets,\n+\t.num_cfp_rules\t= 256,\n };\n \n static const u16 bcm_sf2_7278_reg_offsets[] = {\n@@ -1088,6 +1090,7 @@ struct bcm_sf2_of_data {\n \t.type\t\t= BCM7278_DEVICE_ID,\n \t.core_reg_align\t= 1,\n \t.reg_offsets\t= bcm_sf2_7278_reg_offsets,\n+\t.num_cfp_rules\t= 128,\n };\n \n static const struct of_device_id bcm_sf2_of_match[] = {\n@@ -1144,6 +1147,7 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)\n \tpriv->type = data->type;\n \tpriv->reg_offsets = data->reg_offsets;\n \tpriv->core_reg_align = data->core_reg_align;\n+\tpriv->num_cfp_rules = data->num_cfp_rules;\n \n \t/* Auto-detection using standard registers will not work, so\n \t * provide an indication of what kind of device we are for\ndiff --git a/drivers/net/dsa/bcm_sf2.h b/drivers/net/dsa/bcm_sf2.h\nindex d9c96b281fc0..02c499f9c56b 100644\n--- a/drivers/net/dsa/bcm_sf2.h\n+++ b/drivers/net/dsa/bcm_sf2.h\n@@ -72,6 +72,7 @@ struct bcm_sf2_priv {\n \tu32 \t\t\t\ttype;\n \tconst u16\t\t\t*reg_offsets;\n \tunsigned int\t\t\tcore_reg_align;\n+\tunsigned int\t\t\tnum_cfp_rules;\n \n \t/* spinlock protecting access to the indirect registers */\n \tspinlock_t\t\t\tindir_lock;\ndiff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c\nindex 2fb32d67065f..8a1da7e67707 100644\n--- a/drivers/net/dsa/bcm_sf2_cfp.c\n+++ b/drivers/net/dsa/bcm_sf2_cfp.c\n@@ -98,7 +98,7 @@ static inline void bcm_sf2_cfp_rule_addr_set(struct bcm_sf2_priv *priv,\n {\n \tu32 reg;\n \n-\tWARN_ON(addr >= CFP_NUM_RULES);\n+\tWARN_ON(addr >= priv->num_cfp_rules);\n \n \treg = core_readl(priv, CORE_CFP_ACC);\n \treg &= ~(XCESS_ADDR_MASK << XCESS_ADDR_SHIFT);\n@@ -109,7 +109,7 @@ static inline void bcm_sf2_cfp_rule_addr_set(struct bcm_sf2_priv *priv,\n static inline unsigned int bcm_sf2_cfp_rule_size(struct bcm_sf2_priv *priv)\n {\n \t/* Entry #0 is reserved */\n-\treturn CFP_NUM_RULES - 1;\n+\treturn priv->num_cfp_rules - 1;\n }\n \n static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port,\n@@ -523,7 +523,7 @@ static int bcm_sf2_cfp_rule_get_all(struct bcm_sf2_priv *priv,\n \t\tif (!(reg & OP_STR_DONE))\n \t\t\tbreak;\n \n-\t} while (index < CFP_NUM_RULES);\n+\t} while (index < priv->num_cfp_rules);\n \n \t/* Put the TCAM size here */\n \tnfc->data = bcm_sf2_cfp_rule_size(priv);\n@@ -544,7 +544,7 @@ int bcm_sf2_get_rxnfc(struct dsa_switch *ds, int port,\n \tcase ETHTOOL_GRXCLSRLCNT:\n \t\t/* Subtract the default, unusable rule */\n \t\tnfc->rule_cnt = bitmap_weight(priv->cfp.used,\n-\t\t\t\t\t CFP_NUM_RULES) - 1;\n+\t\t\t\t\t priv->num_cfp_rules) - 1;\n \t\t/* We support specifying rule locations */\n \t\tnfc->data |= RX_CLS_LOC_SPECIAL;\n \t\tbreak;\n", "prefixes": [ "RFC", "net-next", "5/8" ] }