Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1179941pxb; Wed, 10 Feb 2021 02:00:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJwqWVcUgGCa6QqNAXiTQLys//eai/J/OUp0vK7VD2oZkM6FwHNizF+UL9QKtlfKdwEBWWMz X-Received: by 2002:a17:906:fa98:: with SMTP id lt24mr2140132ejb.213.1612951224007; Wed, 10 Feb 2021 02:00:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612951224; cv=none; d=google.com; s=arc-20160816; b=Dd7eY03pYVX7k/uDpfPpi4jlTemHpeBfXZA0+9c/E3esJ2OCjg/S0nPreCN0O22TN6 frTI2AnVwqFy/JM9kIFvBu/WOyiVOGi7sjZ/XhX9WK9lVayPS79CbKX9Z7nv5OepBvZs ihnX6cqVUQcb1VlKJJfB6TKmy0L3xbFZ3+ThfIT+LL84+twjTfuDV1mKwnpPRc1h/+Z8 xeb7dtqnSzwGbwL93IhD8ck2U4VeWrf8mxxDBXALODXs+TNZhsR+nS9g6RnrPxWkqA+E 1FvFBS8bRnwLIrOQC5WuDWS8kViow8f4LDLdryAS1BFRGNndOSnapmmons/1O1vYKpEX nx9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=rMVp5A9RkiNRJapVB1pJEilQpMiiwxeoqchwvMdx1ig=; b=RlDNmy+eqUWqu49o1yiW+K2tU6TqpEInXDtGp2rKMNDHOG+qOWZIK3u63NjUcryN2C UmSRDIBKxBi4KVJYFU9A4rUVKsJiklIOWtfg6qv8WQc9qz6bZfAwP8dD5hKLpYszxIt+ CYz994C/uFqMEmXhgCKoxUwMxnCxvikWr0XFGIVeSi8FEiGqh3fbAjAH/ZhSg9siP2X0 DIzWBTuQbsLmkd5VeoZe9bBKwoy+qLbBzETnHhi4RB4MRrIihDkrFUhBLapwVdlNjfDQ EEzl8UbYSMQn5Dmrg3FtqKAI3JgGr5NFBSU4J3ccI1pk9KwuMKuKJ+VXmEN4Jo1SKp7E 2+tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=O3bCXOyj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n26si951490ejg.362.2021.02.10.01.59.59; Wed, 10 Feb 2021 02:00:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=O3bCXOyj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230217AbhBJJ6U (ORCPT + 99 others); Wed, 10 Feb 2021 04:58:20 -0500 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:11532 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230300AbhBJJzX (ORCPT ); Wed, 10 Feb 2021 04:55:23 -0500 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 11A9eE9C004728; Wed, 10 Feb 2021 01:54:31 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=rMVp5A9RkiNRJapVB1pJEilQpMiiwxeoqchwvMdx1ig=; b=O3bCXOyjLqtJ9KVSnfJ9KS93typjuGqgsT9MM1sREl4PTdGITaCRQR9N+YSQZUr7RYl/ uiRRD8UkQy4SdxRWdpA8tQpaUDr5l4JL41jBRzZyKyueYZB/yHfNjggecZjRWPYxxK3z vFLCEY4nkb67zXVmfyJMjpvt3FAxnS5E/tdF8PgWnfbdUJNipgDRBxryKeTCxs+zo7vw ZUPOHcJF2xPnwPg48UZR4O1qalCIxwYGiKGQ7cc7p9Nucht8xSlrqHICTQ4R+DElh/wv CrarRKqz43w/ori0K2wy94RIbWL/smAU6XOiPPnFfjgdf7TsnZsjqMYn74eJOAb3ihKF 1Q== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com with ESMTP id 36hsbrkgre-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 10 Feb 2021 01:54:31 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 10 Feb 2021 01:54:30 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 10 Feb 2021 01:54:30 -0800 Received: from stefan-pc.marvell.com (stefan-pc.marvell.com [10.5.25.21]) by maili.marvell.com (Postfix) with ESMTP id 76CF63F7043; Wed, 10 Feb 2021 01:54:26 -0800 (PST) From: To: CC: , , , , , , , , , , , , , , , , Subject: [PATCH v12 net-next 14/15] net: mvpp2: set 802.3x GoP Flow Control mode Date: Wed, 10 Feb 2021 11:48:19 +0200 Message-ID: <1612950500-9682-15-git-send-email-stefanc@marvell.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1612950500-9682-1-git-send-email-stefanc@marvell.com> References: <1612950500-9682-1-git-send-email-stefanc@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.737 definitions=2021-02-10_03:2021-02-09,2021-02-10 signatures=0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Chulski This patch fix GMAC TX flow control autoneg. Flow control autoneg wrongly were disabled with enabled TX flow control. Signed-off-by: Stefan Chulski Acked-by: Marcin Wojtas --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index a472125..4d0a398 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -6283,7 +6283,7 @@ static void mvpp2_gmac_config(struct mvpp2_port *port, unsigned int mode, old_ctrl4 = ctrl4 = readl(port->base + MVPP22_GMAC_CTRL_4_REG); ctrl0 &= ~MVPP2_GMAC_PORT_TYPE_MASK; - ctrl2 &= ~(MVPP2_GMAC_INBAND_AN_MASK | MVPP2_GMAC_PCS_ENABLE_MASK); + ctrl2 &= ~(MVPP2_GMAC_INBAND_AN_MASK | MVPP2_GMAC_PCS_ENABLE_MASK | MVPP2_GMAC_FLOW_CTRL_MASK); /* Configure port type */ if (phy_interface_mode_is_8023z(state->interface)) { -- 1.9.1