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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 E678CC31E4B for ; Fri, 14 Jun 2019 20:34:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B378E217F9 for ; Fri, 14 Jun 2019 20:34:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544486; bh=vuw+uJ5WwLvUR/WCwd5/tNkzmFWQiBSGoSYrf9EzZ7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2XD8bZ+3veuDgl3/RxKy/3OB8Jgnef3uFYqhttUSoaL8mDAOdt8dBd/5R9VgWf2Mo tobvFl4DQdCBSoyrSHACNSclR1FbVWLQnHd7ongQSnoSC3zftJohNITLZ0Hpinic3N MEQ9mrefRMSf4IZsXOrpLhDQA7tL8HGYjU55a5jM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727428AbfFNUaQ (ORCPT ); Fri, 14 Jun 2019 16:30:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:53068 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727423AbfFNUaQ (ORCPT ); Fri, 14 Jun 2019 16:30:16 -0400 Received: from sasha-vm.mshome.net (unknown [131.107.159.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A645021874; Fri, 14 Jun 2019 20:30:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544215; bh=vuw+uJ5WwLvUR/WCwd5/tNkzmFWQiBSGoSYrf9EzZ7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sZdXb9RxgQwPQ6ny89IRZi7pNA+aVdUOqic6n4ZWKn+jhNtJ7r202TQbaFEMkopHf QOSbxSFlWqLT62FkS80+boU4m7fNlTnnqNuPsOcKu1jfi/zbjY2ggYct1uqZuj/pdH yOtckGxuUNOKpplLEJA0oQ7IToa0OGNQNN/bTZ/g= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sean Wang , Mark Lee , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 26/39] net: ethernet: mediatek: Use NET_IP_ALIGN to judge if HW RX_2BYTE_OFFSET is enabled Date: Fri, 14 Jun 2019 16:29:31 -0400 Message-Id: <20190614202946.27385-26-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614202946.27385-1-sashal@kernel.org> References: <20190614202946.27385-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sean Wang [ Upstream commit 880c2d4b2fdfd580ebcd6bb7240a8027a1d34751 ] Should only enable HW RX_2BYTE_OFFSET function in the case NET_IP_ALIGN equals to 2. Signed-off-by: Mark Lee Signed-off-by: Sean Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 ++- 1 file 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 0c70fb345f83..1d55f014725e 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -1784,6 +1784,7 @@ static void mtk_poll_controller(struct net_device *dev) static int mtk_start_dma(struct mtk_eth *eth) { + u32 rx_2b_offset = (NET_IP_ALIGN == 2) ? MTK_RX_2B_OFFSET : 0; int err; err = mtk_dma_init(eth); @@ -1800,7 +1801,7 @@ static int mtk_start_dma(struct mtk_eth *eth) MTK_QDMA_GLO_CFG); mtk_w32(eth, - MTK_RX_DMA_EN | MTK_RX_2B_OFFSET | + MTK_RX_DMA_EN | rx_2b_offset | MTK_RX_BT_32DWORDS | MTK_MULTI_EN, MTK_PDMA_GLO_CFG); -- 2.20.1