From patchwork Thu Nov 2 23:08:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 833566 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="MMz8zKtb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ySglh3q0Xz9sRg for ; Fri, 3 Nov 2017 10:09:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934470AbdKBXJs (ORCPT ); Thu, 2 Nov 2017 19:09:48 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:47488 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932201AbdKBXJr (ORCPT ); Thu, 2 Nov 2017 19:09:47 -0400 Received: by mail-wr0-f196.google.com with SMTP id y39so1017683wrd.4 for ; Thu, 02 Nov 2017 16:09:46 -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; bh=+pLmkGeDjvqM0/w/2UPbYQWCCABmKHjJV/QZEHim26s=; b=MMz8zKtbxQBfOadrtotuMmgI4XU9SENp0WM2A+w/gvHyx+2ivbMpDQzOCwBr5ZgYsC jpZeLp52NwEH5V8NCwaIFXshRVM0SlMeoYPwz/YCwqt7PoeQeXldxBSNDiiiIA31Bmmg /B3QR7ktKGXPzMCq+vxtL8wJe+G7fUR76lz1v5XHTJt6ReemddEw7LrPkTJ+ZkZqsscV Ul/QSklXUskjE8m27ASwUNvQMjQb0KZq1p1sxwUWKltLaxCkPVGYKuASpcKi7BwEsgzC YnSc3xBxhbMkXsy462+PseKp0m4Y7WylsnTyCYJktz+UCLQNunHZIV74kxmhyxXQ29zA L+Xw== 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; bh=+pLmkGeDjvqM0/w/2UPbYQWCCABmKHjJV/QZEHim26s=; b=pmOA7j2xHM+wJ0Aty+uR2Gtchue75532UFZ07/o+t3uu5E5vFMbeCingx4cBYD5EI7 zozoGo/qtLAKYadxm2X2kETy9m5lflaRrrBEKrrGvOVmIlRnKXhIjEOKNQS5Vk9d1OoZ vaYaF/3726mTrY1noRQOyDnJcCvK9lydpEY17uIdpUZ8SG1wGjA7TQP0vNMR9MjglhMb Ox3i2/99lOrh4glSQ1kJT2kIOlCVbdlXdDDFDNblKzKVt8r/kcXTeQZpZTHdCXwULhdb hs2X3oDHWeRXIJ3vFrKeMshsUdkkTgFrKORUhrkSBTUOq2tSaJNPxMMaGBkOLtw9F6XL 26AA== X-Gm-Message-State: AMCzsaXZ+8fe2MfGniFLavhJfd8icgYJpmPVGSCLbjJyskgbnR9KGtHn P5Fhtk8hJDbREWCNqiz2++isjXeA X-Google-Smtp-Source: ABhQp+R2wfF9chb85gjdxpwBbxtoDYHexxTqPue+FV425Sh1DWLTHU7RmqZHnldHBZ4+zyvMWtr9Bw== X-Received: by 10.223.175.87 with SMTP id z81mr4196353wrc.12.1509664185436; Thu, 02 Nov 2017 16:09:45 -0700 (PDT) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id g75sm563250wme.23.2017.11.02.16.09.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Nov 2017 16:09:44 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, Florian Fainelli Subject: [PATCH net v2] net: systemport: Correct IPG length settings Date: Thu, 2 Nov 2017 16:08:40 -0700 Message-Id: <20171102230840.15890-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Due to a documentation mistake, the IPG length was set to 0x12 while it should have been 12 (decimal). This would affect short packet (64B typically) performance since the IPG was bigger than necessary. Fixes: 44a4524c54af ("net: systemport: Add support for SYSTEMPORT Lite") Signed-off-by: Florian Fainelli --- Changes in v2: - move the IPG length setting outside of netdev_uses_dsa() branch drivers/net/ethernet/broadcom/bcmsysport.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index 83eec9a8c275..eb441e5e2cd8 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -1809,15 +1809,17 @@ static inline void bcm_sysport_mask_all_intrs(struct bcm_sysport_priv *priv) static inline void gib_set_pad_extension(struct bcm_sysport_priv *priv) { - u32 __maybe_unused reg; + u32 reg; - /* Include Broadcom tag in pad extension */ + reg = gib_readl(priv, GIB_CONTROL); + /* Include Broadcom tag in pad extension and fix up IPG_LENGTH */ if (netdev_uses_dsa(priv->netdev)) { - reg = gib_readl(priv, GIB_CONTROL); reg &= ~(GIB_PAD_EXTENSION_MASK << GIB_PAD_EXTENSION_SHIFT); reg |= ENET_BRCM_TAG_LEN << GIB_PAD_EXTENSION_SHIFT; - gib_writel(priv, reg, GIB_CONTROL); } + reg &= ~(GIB_IPG_LEN_MASK << GIB_IPG_LEN_SHIFT); + reg |= 12 << GIB_IPG_LEN_SHIFT; + gib_writel(priv, reg, GIB_CONTROL); } static int bcm_sysport_open(struct net_device *dev)