{"id":815189,"url":"http://patchwork.ozlabs.org/api/patches/815189/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170918214128.27896-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":"<20170918214128.27896-12-f.fainelli@gmail.com>","list_archive_url":null,"date":"2017-09-18T21:41:27","name":"[net-next,11/12] net: dsa: bcm_sf2: Use SF2_NUM_EGRESS_QUEUES for CFP","commit_ref":null,"pull_url":null,"state":"changes-requested","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/20170918214128.27896-12-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/815189/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815189/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=\"AtiPFQwh\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xwzxP0wpgz9ryv\n\tfor ;\n\tTue, 19 Sep 2017 07:42:17 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751628AbdIRVmO (ORCPT );\n\tMon, 18 Sep 2017 17:42:14 -0400","from mail-wr0-f193.google.com ([209.85.128.193]:38633 \"EHLO\n\tmail-wr0-f193.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751575AbdIRVmM (ORCPT\n\t); Mon, 18 Sep 2017 17:42:12 -0400","by mail-wr0-f193.google.com with SMTP id p37so1129996wrb.5\n\tfor ; Mon, 18 Sep 2017 14:42:11 -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.42.07\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 18 Sep 2017 14:42:09 -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=yb9QPKJpYOzVP0H+HI4wkGrEk5L1nOYwPUiRYKN1A7g=;\n\tb=AtiPFQwhQ5QnLdLoo6xP+Cv30Y2optWUf9b0tbgFJm8kNiI5E7z9u6z/IZXCAB7ZB9\n\thMGsMXGdBDRr5IQhYFfw30vS4pKpSJKKaNlIU1UIU4TLrmvRqjAbr+8sQ2NJl1+D+Z7E\n\t6C4Nt3rbOcnonDmW1dFFWH3ccXlYTJkv14uXnj+Bzh03msh4dSQz0Q+7te1QsyvUZrwj\n\tIcjFW8MOo/KApa9dOt3xkyxcWYEK19Vou5dLjuQ8rzjxBvmPl5NxwpD1TSNLeMNMfRAo\n\tmS06If4h/XGq3yRMhNQPo7OChmamln34xXGYv8bqC4BnNg6jRMd6Q6AhoUm7R7o1z/Xo\n\teoDQ==","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=yb9QPKJpYOzVP0H+HI4wkGrEk5L1nOYwPUiRYKN1A7g=;\n\tb=ZnrmlEmi/s8dM5Kfnv2XRjY1gSGfd7rI6gr153n0pI16nCQh0MhknBJusbE2x7vVGD\n\tbuViDNPv/0fSq9Sx9KoiCkGmk7tsMhZAKzeGfeD2JiJ9+y3sAgo1YWkv7grCXTjPLK34\n\tnenzyHdK7RiFl/rwicahuUc1HZsf7J9EHTaHr/3vL5Kcq+kgbGL44HFLwQnE8wstyU22\n\ty6qP7IlPLIZoV+bnT+AUlAvxvhoIf1xHMDp8fz2hudhNF9gnJ50UuD/xmP7erSuLyMlq\n\tPtroKon9SEvCEzhWgw8WmBt01Soq/VwDSR8v2RTYx0oGUHpxQH/zdi6PHgknbWDQVdqs\n\tPXrw==","X-Gm-Message-State":"AHPjjUiyfI5uJ6J1wEBJOlftxB+lovzStD2+vGADdArns/znhh4aF8ER\n\tvGhQJ7b/twxZIayNwC4=","X-Google-Smtp-Source":"ADKCNb7XE6cLDE/4DZHA8kocJdOdUwhV+WoMiqZYSQCY50KT+O9AWK7inCR0Hmbm6em6tE+TPfxdFw==","X-Received":"by 10.223.130.79 with SMTP id 73mr28340943wrb.241.1505770930742; \n\tMon, 18 Sep 2017 14:42:10 -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 11/12] net: dsa: bcm_sf2: Use SF2_NUM_EGRESS_QUEUES\n\tfor CFP","Date":"Mon, 18 Sep 2017 14:41:27 -0700","Message-Id":"<20170918214128.27896-12-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":"The magic number 8 in 3 locations in bcm_sf2_cfp.c actually designates the\nnumber of switch port egress queues, so use that define instead of open-coding\nit.\n\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","11/12"]}