{"id":815758,"url":"http://patchwork.ozlabs.org/api/patches/815758/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170919174654.2122-12-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":"<20170919174654.2122-12-f.fainelli@gmail.com>","list_archive_url":null,"date":"2017-09-19T17:46:53","name":"[net-next,v3,11/12] net: dsa: bcm_sf2: Use SF2_NUM_EGRESS_QUEUES for CFP","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"b88d86936db49ee051f84983817f881a3e48afdc","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/20170919174654.2122-12-f.fainelli@gmail.com/mbox/","series":[{"id":3941,"url":"http://patchwork.ozlabs.org/api/series/3941/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3941","date":"2017-09-19T17:46:42","name":"net: dsa: b53/bcm_sf2 cleanups","version":3,"mbox":"http://patchwork.ozlabs.org/series/3941/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815758/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815758/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=\"X+VMtffq\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xxVhJ16pjz9sPk\n\tfor ;\n\tWed, 20 Sep 2017 03:47:44 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751635AbdISRrm (ORCPT );\n\tTue, 19 Sep 2017 13:47:42 -0400","from mail-wm0-f67.google.com ([74.125.82.67]:33549 \"EHLO\n\tmail-wm0-f67.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751549AbdISRrb (ORCPT\n\t); Tue, 19 Sep 2017 13:47:31 -0400","by mail-wm0-f67.google.com with SMTP id m127so325989wmm.0\n\tfor ; Tue, 19 Sep 2017 10:47:30 -0700 (PDT)","from fainelli-desktop.broadcom.com ([192.19.255.250])\n\tby smtp.gmail.com with ESMTPSA id\n\tq19sm11543124wrb.17.2017.09.19.10.47.27\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 19 Sep 2017 10:47:29 -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=PhmFRLbT6q86KY+w+4aX+M32B8mrlZ5dxsoQH9miVjM=;\n\tb=X+VMtffqlff4MsMj+LJh2d3RV9tj5WtzUIarj8MkAINPI1K6kJqenduKQmNMDf4m5Q\n\tOOo2uIv+56QPNTy2yppgYfGqN3uzeAMn/uSTTqmOEXyHTo5o5e4bLHAZvBPw8TB4Tj3f\n\tt/5nQOfsRCHVXv+dB7gzYRFyzs9fZpe7D3qEy9J5yE+DvsywaNUNBqe8ZzwL20M4C2Wp\n\tsHLvPsZDUn3f0aK2Znj/V2jKg/JoSiGiSQu9Cp0wOJuv+o6HwWSOPORCGa+r81aToFxQ\n\tDeWZbgqypQLbdbLjlomnCYmwDYTgg6SSlZYCOcJkqO2gR0PuQEyWhUY3DsKVAEVyhTE0\n\tJgdA==","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=PhmFRLbT6q86KY+w+4aX+M32B8mrlZ5dxsoQH9miVjM=;\n\tb=SgnEMmQ96XXD50AezKnp+mpPzdyfbis7sbb9RWFy0VkEn1epTv2ObzoETFziZXMDLM\n\tgRlqJvba1oEnmsMl7VZj4ixIQ5pBe8hOM9BI7iBMkuM11gI1zVjNftwzOGwps+twy+3l\n\tpOP3JdY71ndPDPEessjWwfrEHwp/MOULSNa7Al13Y/vvr7lHRdi+peXJxft8kZDCknj7\n\tZgNDVeld1V4Z9wqh3Ko5NiR4SIDb5cSHG/V5XkvQlqY0Ne20+SpoudZD3COl5tB/vL5p\n\tZwbzmPsLGKMwq9BPy3kv3LRy0CwDd57YAFW+OC/5fEeXbHTRhJWnIVyargJlVLCbIrdo\n\tACrg==","X-Gm-Message-State":"AHPjjUgb3t/JEwE6AJa1dyFZJi1ITDHRsQVyd84XmJIA0te0ftOWDPwp\n\tsgnlUYhSIMPmScz/KQQUm6nudlTO","X-Google-Smtp-Source":"AOwi7QCEFqkKIoAkbr2y4JhExM1O6QsIQlsQJEmahIoO2UHPRHlcr5L6x4cJlFtfIz78B8/mDQTCUg==","X-Received":"by 10.28.150.195 with SMTP id y186mr1799425wmd.52.1505843250003; \n\tTue, 19 Sep 2017 10:47:30 -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 v3 11/12] net: dsa: bcm_sf2: Use\n\tSF2_NUM_EGRESS_QUEUES for CFP","Date":"Tue, 19 Sep 2017 10:46:53 -0700","Message-Id":"<20170919174654.2122-12-f.fainelli@gmail.com>","X-Mailer":"git-send-email 2.9.3","In-Reply-To":"<20170919174654.2122-1-f.fainelli@gmail.com>","References":"<20170919174654.2122-1-f.fainelli@gmail.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"The magic number 8 in 3 locations in bcm_sf2_cfp.c actually designates\nthe number of switch port egress queues, so use that define instead of\nopen-coding it.\n\nReviewed-by: Vivien Didelot \nSigned-off-by: Florian Fainelli \n---\n drivers/net/dsa/bcm_sf2_cfp.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)","diff":"diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c\nindex 8a1da7e67707..94649e1481ec 100644\n--- a/drivers/net/dsa/bcm_sf2_cfp.c\n+++ b/drivers/net/dsa/bcm_sf2_cfp.c\n@@ -144,7 +144,7 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port,\n \t * destination port is enabled and that we are within the\n \t * number of ports supported by the switch\n \t */\n-\tport_num = fs->ring_cookie / 8;\n+\tport_num = fs->ring_cookie / SF2_NUM_EGRESS_QUEUES;\n \n \tif (fs->ring_cookie == RX_CLS_FLOW_DISC ||\n \t !(BIT(port_num) & ds->enabled_port_mask) ||\n@@ -280,7 +280,7 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port,\n \t * We have a small oddity where Port 6 just does not have a\n \t * valid bit here (so we subtract by one).\n \t */\n-\tqueue_num = fs->ring_cookie % 8;\n+\tqueue_num = fs->ring_cookie % SF2_NUM_EGRESS_QUEUES;\n \tif (port_num >= 7)\n \t\tport_num -= 1;\n \n@@ -401,7 +401,7 @@ static int bcm_sf2_cfp_rule_get(struct bcm_sf2_priv *priv, int port,\n \t/* There is no Port 6, so we compensate for that here */\n \tif (nfc->fs.ring_cookie >= 6)\n \t\tnfc->fs.ring_cookie++;\n-\tnfc->fs.ring_cookie *= 8;\n+\tnfc->fs.ring_cookie *= SF2_NUM_EGRESS_QUEUES;\n \n \t/* Extract the destination queue */\n \tqueue_num = (reg >> NEW_TC_SHIFT) & NEW_TC_MASK;\n","prefixes":["net-next","v3","11/12"]}