From patchwork Tue Sep 19 02:19:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 815257 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gbYCS8w3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xx6FD2Dddz9s4s for ; Tue, 19 Sep 2017 12:26:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751370AbdISC0W (ORCPT ); Mon, 18 Sep 2017 22:26:22 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:37869 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750789AbdISC0V (ORCPT ); Mon, 18 Sep 2017 22:26:21 -0400 Received: by mail-wm0-f68.google.com with SMTP id f4so2491779wmh.4 for ; Mon, 18 Sep 2017 19:26:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yb9QPKJpYOzVP0H+HI4wkGrEk5L1nOYwPUiRYKN1A7g=; b=gbYCS8w3fGpPfWSKxusL6zlNZGrjgIVQ7ux3MDCneu1xmEB9RCA2hzGrhhnkTSkvn9 9WC3HGnS+jhpM1NmwEta7uhNtAHcCJZnUTx1pYBiagZCjzY413r+Me1XrDHWTgogmlj8 wruP65NGf+6xwuWg2N/b1nU19Yx4VBfAfEJasiHNK/hW8rvuq9X3kRc2EkK4qyiwIiXj Sd72j+Vy2ocvcXLKn9KGh3Vx8KIa4MxLgh5i6B2MvAdatrsvXyYnATVYqnaA8moi0JDX OSWYTzuRH2VTtbQdLRSdeOTuLVvuMCOWUAMGP857HiZsRymomWxI606KHFx0ILj/zHxm faDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yb9QPKJpYOzVP0H+HI4wkGrEk5L1nOYwPUiRYKN1A7g=; b=WaUPCY3N+6CxEwoRh3Xf49SbjciIGrgDbqZM8Tn2CntLCWkbCZNbwCv6zF9gTUrwRe TGVFG7bLG25j8k5bBNgnKQiqhH/5r0x/sEfOzFz4CyeJfANKJ/XjN20aeoxXsaKDHiAN vlzfr+9JVoZyiuL0VgUoYi3gm+PCMiO0NjnVOGQMSEBxaSFpCb5OIJqSF25hj60z56XU NH9tGwBKTN5rHCAmZE0ltw3Z4qcwsUrla6AD8n0xBX2+KMyKDYu75QnCwj58Rr+khzwo I10+FSa/kdXFXFSnYwhVfNlds+xOpxEe1zRo4nI20dLZOwNeWzgGgHCfSz22xg32H9If 6fSg== X-Gm-Message-State: AHPjjUgFAbXz5mUgPhIVeWAmtiFr8J/CBL1IItZGTTeybR2TG1QSs3rO DSh8x2NQD/T+J9qj1Rdz1raF0gz3 X-Google-Smtp-Source: AOwi7QBeMCqGLX9aiOmRdF0N7O9Zd6Li3+BlrhT+yhVy1eZ0C6jQ9NMnstIMiHyAvPp8ICosJ0j4/A== X-Received: by 10.28.150.195 with SMTP id y186mr125072wmd.52.1505787620840; Mon, 18 Sep 2017 19:20:20 -0700 (PDT) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id q19sm9332458wrb.17.2017.09.18.19.20.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Sep 2017 19:20:19 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, davem@davemloft.net, Florian Fainelli Subject: [PATCH net-next v2 11/12] net: dsa: bcm_sf2: Use SF2_NUM_EGRESS_QUEUES for CFP Date: Mon, 18 Sep 2017 19:19:46 -0700 Message-Id: <20170919021947.8971-12-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170919021947.8971-1-f.fainelli@gmail.com> References: <20170919021947.8971-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The magic number 8 in 3 locations in bcm_sf2_cfp.c actually designates the number of switch port egress queues, so use that define instead of open-coding it. Signed-off-by: Florian Fainelli Reviewed-by: Vivien Didelot --- drivers/net/dsa/bcm_sf2_cfp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c index 8a1da7e67707..94649e1481ec 100644 --- a/drivers/net/dsa/bcm_sf2_cfp.c +++ b/drivers/net/dsa/bcm_sf2_cfp.c @@ -144,7 +144,7 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port, * destination port is enabled and that we are within the * number of ports supported by the switch */ - port_num = fs->ring_cookie / 8; + port_num = fs->ring_cookie / SF2_NUM_EGRESS_QUEUES; if (fs->ring_cookie == RX_CLS_FLOW_DISC || !(BIT(port_num) & ds->enabled_port_mask) || @@ -280,7 +280,7 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port, * We have a small oddity where Port 6 just does not have a * valid bit here (so we subtract by one). */ - queue_num = fs->ring_cookie % 8; + queue_num = fs->ring_cookie % SF2_NUM_EGRESS_QUEUES; if (port_num >= 7) port_num -= 1; @@ -401,7 +401,7 @@ static int bcm_sf2_cfp_rule_get(struct bcm_sf2_priv *priv, int port, /* There is no Port 6, so we compensate for that here */ if (nfc->fs.ring_cookie >= 6) nfc->fs.ring_cookie++; - nfc->fs.ring_cookie *= 8; + nfc->fs.ring_cookie *= SF2_NUM_EGRESS_QUEUES; /* Extract the destination queue */ queue_num = (reg >> NEW_TC_SHIFT) & NEW_TC_MASK;