From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A572C433ED for ; Wed, 5 May 2021 16:50:09 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 02C2C61423 for ; Wed, 5 May 2021 16:50:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 02C2C61423 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mzDWhG74m6GGqgOrsL0qH4fNAqY9HC4C8FDpnvlGENk=; b=Q4jGc57Zj11wwdJmko7tBMk6l /9ho2JTWhPX8suh58IAg6Utrazu9i79ZFTe9q1cq7ujO7+k/9u8Y59XNiW/nPUPMoZgSthsTDxYyP 7k903JgRPijBdpqAl8pHTGfZ7J58/VXRnU4jgyAH0A4NBZucM5N69N4Cof8UL1SGxHnrqRUAnZNFZ v+cyzzWlWACjk3V1Q3Kf0SSxRIfGaHMXN/SIe6s2TJBwK8LlPN0aodMdMLeaK9nR50YlajWq1cacw Atwt6HbgC/sWjx8sgH04I4SkW0gdEhWy5+EYEojNBnhC4yf5+txMiW3I43dkWuLI84kCLMb3HvtY5 THihACeXg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1leKhc-001ktO-6q; Wed, 05 May 2021 16:48:48 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leKVq-001g8e-IJ; Wed, 05 May 2021 16:36:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=6e+dK4ivWlUVjEbdFS0cvkGnXyp00JBbfmxhTYH+Ewc=; b=wMhI1g24kWSQvJbm/YO/yywcW8 pAB0B0StySV7r3fWzjNmGWofYovTkRVelmI6u4dyP0U4AOQ+hMJAr5tP4Bqi4UnZM7d0XbPzVcOKx jOBzW0mRZjc5VtdieeOzx9KgIeQFWtbGFjFM6Zk8dWGUAoKCO55GMjzMfEIwFBYBDYlr7A6XlPAKT iQkpnQLVY+ZK21KuQcwN3CuN+oFMsGpWezqmyMU+CtngYTxEex8ycE6B5kGODFhyICe4xAtY3MrhW 9S77cXE/X6zmwIZ4ziOCGqbM9GbGYNG9VPuHYQs4f9Ca82T1qyz1QvxjwZixwwWMqTGTLE4qqxoze /lGGOm3Q==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leKVl-004xJb-4s; Wed, 05 May 2021 16:36:37 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9911261944; Wed, 5 May 2021 16:36:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620232592; bh=zIWO+613aa93ZZ/vIAzAca28AJUUZ1Qux+x+xGm+ZvE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K8y57ETQMhrnQB7oxFLUm2bqkHGj/Xh+mkMAWAnCJ/6FIUhAVJj1DcM48Cr7GZcXg h6IVqwKLoXA4V7AzxPqgxhCVA8gEPk9azLBG2kt2+cZ5tPs7lmA6/FqlIuZLR+9gJx BJAgjXJDJsHX8A6p20KJJHM20o1ac3l3cLllt4AESZm6gStBRnM5AsVnt3j/XH4g99 91ZFbpaKiF+324BWTs/KeUQKgQCEB/r1dq3TOVtXoJnQJ4+ALiHqWN0GKka6C0WLjd pi3Ed+UCaWwJmNO1NQTzXjPrDV204Ie2KRNVzk/HVJLpzXLQCJoyr4c7BcKQkf+Gh7 mMTaEi1qSlQ4g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Felix Fietkau , Ilya Lipnitskiy , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 5.11 095/104] net: ethernet: mtk_eth_soc: fix RX VLAN offload Date: Wed, 5 May 2021 12:34:04 -0400 Message-Id: <20210505163413.3461611-95-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210505163413.3461611-1-sashal@kernel.org> References: <20210505163413.3461611-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210505_093633_239376_98FE4D5B X-CRM114-Status: GOOD ( 11.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Felix Fietkau [ Upstream commit 3f57d8c40fea9b20543cab4da12f4680d2ef182c ] The VLAN ID in the rx descriptor is only valid if the RX_DMA_VTAG bit is set. Fixes frames wrongly marked with VLAN tags. Signed-off-by: Felix Fietkau [Ilya: fix commit message] Signed-off-by: Ilya Lipnitskiy Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 6d2d60675ffd..d930fcda9c3b 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -1319,7 +1319,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, skb->protocol = eth_type_trans(skb, netdev); if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX && - RX_DMA_VID(trxd.rxd3)) + (trxd.rxd2 & RX_DMA_VTAG)) __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), RX_DMA_VID(trxd.rxd3)); skb_record_rx_queue(skb, 0); diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h index 454cfcd465fd..73ce1f0f307a 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -295,6 +295,7 @@ #define RX_DMA_LSO BIT(30) #define RX_DMA_PLEN0(_x) (((_x) & 0x3fff) << 16) #define RX_DMA_GET_PLEN0(_x) (((_x) >> 16) & 0x3fff) +#define RX_DMA_VTAG BIT(15) /* QDMA descriptor rxd3 */ #define RX_DMA_VID(_x) ((_x) & 0xfff) -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel