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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 5F971C432C0 for ; Tue, 3 Dec 2019 22:44:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 249A8207DD for ; Tue, 3 Dec 2019 22:44:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413085; bh=BiAWvKfoHGAKRlj5CSh0QhwnBtGaHcGsgpYFPZmmYSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iJym9SOg66StrDfr+7BHcxxOMs2ufzsX+UG1s9j0T9SW3vdE/ypRHkzloirsnET1J RrxqHI1SC73tS40uBm3NMn0FrpXchdePEQberDfAUkWkOdwooUqx8VSjjZP0C94+ny sAI9Chd2lPkzr2rSXmHIFO31GOVyVMxkA7GPXax8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728959AbfLCWon (ORCPT ); Tue, 3 Dec 2019 17:44:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:60778 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728823AbfLCWoj (ORCPT ); Tue, 3 Dec 2019 17:44:39 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7117B207DD; Tue, 3 Dec 2019 22:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413078; bh=BiAWvKfoHGAKRlj5CSh0QhwnBtGaHcGsgpYFPZmmYSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SZFeNq1fxz/WdFgghlFgON2aSh3cmfz+AkGRDD5/ylo+t+kAAHfOSxR433Hu7473m kmidOMGa2iiPrvGpaQYkBVuG/9Xzwqy3/6ugBS0VbZi55o56Wxv6XolImUmhXIXkVo 5jxFqoJ3woqto2vb14DeNaVwJNdzfJt1lxh2TlhQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jose Abreu , "David S. Miller" , Sasha Levin Subject: [PATCH 5.3 086/135] net: stmmac: xgmac: Fix TSA selection Date: Tue, 3 Dec 2019 23:35:26 +0100 Message-Id: <20191203213034.476395405@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203213005.828543156@linuxfoundation.org> References: <20191203213005.828543156@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jose Abreu [ Upstream commit 97add93fbcfa566735d6a4b96684110d356ebd35 ] When we change between Transmission Scheduling Algorithms, we need to clear previous values so that the new chosen algorithm is correctly selected. Fixes: ec6ea8e3eee9 ("net: stmmac: Add CBS support in XGMAC2") Signed-off-by: Jose Abreu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c index 91d7dec2540a1..341c7a70fc71a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c @@ -196,6 +196,7 @@ static void dwxgmac2_config_cbs(struct mac_device_info *hw, writel(low_credit, ioaddr + XGMAC_MTL_TCx_LOCREDIT(queue)); value = readl(ioaddr + XGMAC_MTL_TCx_ETS_CONTROL(queue)); + value &= ~XGMAC_TSA; value |= XGMAC_CC | XGMAC_CBS; writel(value, ioaddr + XGMAC_MTL_TCx_ETS_CONTROL(queue)); } -- 2.20.1