From patchwork Thu Apr 19 19:49:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 133843 Delivered-To: patch@linaro.org Received: by 10.46.66.142 with SMTP id h14csp1026080ljf; Thu, 19 Apr 2018 12:49:20 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+l9IUULxaeXlGqjMkQxT8tJ6eexhNPwFnU7IF4ku9JWQWr70xVdvDhIxPY0h5J3rtLlNN5 X-Received: by 10.98.27.13 with SMTP id b13mr6988072pfb.254.1524167360772; Thu, 19 Apr 2018 12:49:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524167360; cv=none; d=google.com; s=arc-20160816; b=nGrunckM6OtjWyPZHsOtxBFvbSuUx4yfOV8+fyceeHJlatpMlFiOnWal72AKsjSvkr FUsBotxSpfzMlbFnQwnTOSHGbAlmlk0ZjgGBtdtBAn0doxkhi39gpPMEpzc7HXKwX7kD +U4u35KzHLQqMtRg0o5tE5Bbym67ULyMVTLLl+s9qoTtgpvJ3VhZPCH84pn6x26zok8f BVoQgAVJrHdXYWNLhexIG6yICpPPE9B6EeOnMKl3/WTfs4So2uWnaTQHM0xiyxH0TPX3 uNLu65XTVYKIPh00pk0E9lNmOXSKzDAI31vAOuj2o1SGnwRYb7i5/reEAfJ755Xxj2UP my8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=yafnJLwXiOKsDs8etNEyDnnnH1si18z0Tw2rPy6kxjU=; b=yarw56GPJon/8TL3R8ruVb15ZcJa7CAW/vzV5r631n7GF9cMWinm5kIyWJQed9Xz00 RdsSXg6/q2lgxlPrOmg4qfb0Z8sbewv8ZKOiSVO2imFM/i87ivU2bNN5F93iHBf4IEX5 e9Cl2OQrBkuWPhKEqb/f3a2m7zfC5PnboO4NIWBS7ZbS00kvV92kGhuUsTtEfV7ogFz9 qqC7JjY7VqEBfj9Qglx6PKRvVjOfRsZ46iVLQvwwc8DN992t3BVsVBtC1Lqzihtibf9n NMlwzPkDgmylMWs3B/VFvdb06mWWjUYELaM/CcOsGtQmNdfUmVWa8JIvsbiNrjSGm9zV jVgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S9EZYSjj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9si3402604pgu.454.2018.04.19.12.49.20; Thu, 19 Apr 2018 12:49:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S9EZYSjj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753462AbeDSTtR (ORCPT + 29 others); Thu, 19 Apr 2018 15:49:17 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:34256 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752618AbeDSTtP (ORCPT ); Thu, 19 Apr 2018 15:49:15 -0400 Received: by mail-lf0-f65.google.com with SMTP id r7-v6so1901918lfr.1 for ; Thu, 19 Apr 2018 12:49:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=yafnJLwXiOKsDs8etNEyDnnnH1si18z0Tw2rPy6kxjU=; b=S9EZYSjjplKgGtKFpRcsp77LbfCsX7qHZCrTXkKdnGM01QPfXfV7ifAtlDwG1MNhHa ehJcMRwS3PRYDgD5aFKgdVemQxCWQYbdoUiOaUUf3HVh2YDhEZqqHOsBFPHaEB3G+ZXU 5NbEHOuzjFi+VdINyatEwzXaPcyfyzCQQkUp0= 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=yafnJLwXiOKsDs8etNEyDnnnH1si18z0Tw2rPy6kxjU=; b=aanQ4/vSZPZMvK5/qrDHZ99gOMOzVD/yfrxwSjonrJpLTAPLT/xzZJPi3Nct5BeA4A pSO102eVtYwS0AVYKvsO3YgpqqzGylnwlTTnOeYXedOfCb0HQ/dQkmuFV5KPu/MOvC1D /HCz6wbxZoHX/ld7hxU6/DjOrL87itsFZnO5IxCnovfyxgWHOU7omFfvSomHJEyuhY5R QlhSuioOFJSHZxetrHT5Au6GW+/yAOfY9Y2waSMpZk3B+kvJdvX42ZNyoMnwnyhxklJR XfoLesLnYffrMt3Vlh6eR1E7T8FetN3ZJ6xwkXP4WY1gbRPm1oUUbTOmJHnRC3ZF9Pf1 gk5A== X-Gm-Message-State: ALQs6tBywZglyNJQVTWAREz4U5SzD3lPUSKb3l38AnsuPMqQsZ1i0gGb WMBKY2GiZJC+FFJkhGA0b135dg== X-Received: by 10.46.64.130 with SMTP id r2mr5317139lje.48.1524167353767; Thu, 19 Apr 2018 12:49:13 -0700 (PDT) Received: from khorivan.synapse.com (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id j87-v6sm913411lfk.53.2018.04.19.12.49.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Apr 2018 12:49:12 -0700 (PDT) From: Ivan Khoronzhuk To: grygorii.strashko@ti.com Cc: davem@davemloft.net, linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [PATCH v2] net: ethernet: ti: cpsw: fix tx vlan priority mapping Date: Thu, 19 Apr 2018 22:49:09 +0300 Message-Id: <1524167349-11004-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The CPDMA_TX_PRIORITY_MAP in real is vlan pcp field priority mapping register and basically replaces vlan pcp field for tagged packets. So, set it to be 1:1 mapping. Otherwise, it will cause unexpected change of egress vlan tagged packets, like prio 2 -> prio 5. Fixes: e05107e6b747 ("net: ethernet: ti: cpsw: add multi queue support") Reviewed-by: Grygorii Strashko Signed-off-by: Ivan Khoronzhuk --- Based on net/master drivers/net/ethernet/ti/cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 3037127..74f8284 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -129,7 +129,7 @@ do { \ #define RX_PRIORITY_MAPPING 0x76543210 #define TX_PRIORITY_MAPPING 0x33221100 -#define CPDMA_TX_PRIORITY_MAP 0x01234567 +#define CPDMA_TX_PRIORITY_MAP 0x76543210 #define CPSW_VLAN_AWARE BIT(1) #define CPSW_RX_VLAN_ENCAP BIT(2)