From patchwork Tue Aug 8 11:27:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Ghosh X-Patchwork-Id: 132801 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2358241vqr; Tue, 8 Aug 2023 12:49:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGn7/fKmxxV3FQoYVxQEGW1Jaj2LWE4NRj0v0YrTbKsXvlKJc/vCtq8d7YNs3R892AI11J3 X-Received: by 2002:a17:902:f547:b0:1bc:10cf:50d8 with SMTP id h7-20020a170902f54700b001bc10cf50d8mr600660plf.23.1691524193989; Tue, 08 Aug 2023 12:49:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691524193; cv=none; d=google.com; s=arc-20160816; b=mW6d45bT9W5Xp6NggPtQcy9cy7SynD1oGxw+ogesb+oK4iPYMUGNm82YDILBELOg0l WQ+Xg0Ed/0RTco8ANN7gr2zsMK/IloyFbzYS5kLlqq3FK+yMw6kw+Iwad1Y9Z7DxzXqB /BhW0lh6rfVzony47hPIWm1FujthzHZ93IJg7gLOa3ZHzsb5HohYLcwm6LQ0il2TQzLq 6R2ubLD9kl5QNURZkcynAiC0HpTUoFgO3JLirrgo6+eM0ylzPM4/CzT4kV7HF6vIzBfD wssF+pJdRIm9AXrpAbRpJ1XxdOtHolUJiUBLqDxYg9peZtwUHN4cerlo6DfMDc1/ENOS d7EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XByIP5J2zsR9geHAsK/CerIO4PGvyKW3M+zGye7jZX0=; fh=zaZMevJusfEyKCjkBAg52tAXDoBEUdsdtBKhQ6uTJKI=; b=FKoHOIt2mEJyMBwhGRymq4qkuAQzJosAY2aeMXTwaNdnDVd75VQEsIRI1PI0kA63JO QooI37dWkjWsQTET941QS8qLRKEvMt28MQQmKnlsbCySG/Bxho3gzAh0Ip4w9BOA0LL/ rk396T1nhTBufu+U68ya5TCPeO1j52v2pVm8bLqV6QwE2rCWihiZKWOKJdUL6Da8CvLe ZTq3aTaQ5XlLB40FOYg3RXCcTSRNVWF8SzSZVlJAqbanHZ8ZHY+QJ6BnFEmtybVsBmQ2 tNap2uyrYZuEA3+ymuX9t/axpPJG6NajqPCOIinRKeBtVyJl17NPhs8ZbDVZFG0FcHs7 naKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=b74fqsCc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w17-20020a170902d11100b001b8a56b989fsi7544664plw.303.2023.08.08.12.49.37; Tue, 08 Aug 2023 12:49:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=b74fqsCc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S235305AbjHHTNg (ORCPT + 99 others); Tue, 8 Aug 2023 15:13:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232012AbjHHTNS (ORCPT ); Tue, 8 Aug 2023 15:13:18 -0400 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E26C90B6; Tue, 8 Aug 2023 09:35:44 -0700 (PDT) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 378A7a2E025348; Tue, 8 Aug 2023 04:27:23 -0700 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-transfer-encoding : content-type; s=pfpt0220; bh=XByIP5J2zsR9geHAsK/CerIO4PGvyKW3M+zGye7jZX0=; b=b74fqsCcinabAizFq6litCed7y3LGuFuq0WjC8AlunabRKiTWk4D6O2wr4DEtURcUNYc K+TRXAw0oGd/lQEP6b4bh8OqoXFa/Vm698dvrMiR0jlmdGqZ4+ewyinEZvn/PRft8PUJ jFXEbvuQIoyW5C1+CO4go5Sx3WywQfIcHz4xGLLQZi3BKjnVn1gJZK7Y7F6fUX/vwkFQ HlpurUH5boGkjFZic8QMt4INX2CENHXtzNPRte1Awhhj+tW1n07lvtn5LxeOoa39KrJL KAz0LS+2OvarQX6OmcALO/D4w7/oPyh00SrnVpu5W8GmV2BYEMnZO5oZ6psU+6asl8mX QQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3sbkntg7m3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 08 Aug 2023 04:27:23 -0700 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.48; Tue, 8 Aug 2023 04:27:21 -0700 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.48 via Frontend Transport; Tue, 8 Aug 2023 04:27:21 -0700 Received: from localhost.localdomain (unknown [10.28.36.166]) by maili.marvell.com (Postfix) with ESMTP id E49255B6945; Tue, 8 Aug 2023 04:27:16 -0700 (PDT) From: Suman Ghosh To: , , , , , , , , , , , CC: Suman Ghosh Subject: [net PATCH 1/3] octeontx2-pf: Update PFC configuration Date: Tue, 8 Aug 2023 16:57:06 +0530 Message-ID: <20230808112708.3179218-2-sumang@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230808112708.3179218-1-sumang@marvell.com> References: <20230808112708.3179218-1-sumang@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: U_RTILSdDK6FK-52pNCIXQUTiIX5Mh88 X-Proofpoint-ORIG-GUID: U_RTILSdDK6FK-52pNCIXQUTiIX5Mh88 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-08_09,2023-08-08_01,2023-05-22_02 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773691673541536582 X-GMAIL-MSGID: 1773691673541536582 As of now we are creating/deleting Tx schedulers when user is setting PFC on/off. The problem is if we have a running traffic on the interface and as we are updating the sq->smq mapping on the fly, we might loose completion interrupt for some packets. As a result of that a watchdog reset is hit from BQL. This patch solves the issue by simply calling interface off/on APIs which will reconfigure all the queues. We might loss the running traffic momentarily but that should be fine. Fixes: 99c969a83d82 ("octeontx2-pf: Add egress PFC support") Signed-off-by: Suman Ghosh --- .../net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c index ccaf97bb1ce0..d54edfa8fcc9 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c @@ -406,6 +406,7 @@ static int otx2_dcbnl_ieee_getpfc(struct net_device *dev, struct ieee_pfc *pfc) static int otx2_dcbnl_ieee_setpfc(struct net_device *dev, struct ieee_pfc *pfc) { struct otx2_nic *pfvf = netdev_priv(dev); + bool if_up = netif_running(dev); int err; /* Save PFC configuration to interface */ @@ -426,14 +427,9 @@ static int otx2_dcbnl_ieee_setpfc(struct net_device *dev, struct ieee_pfc *pfc) if (err) return err; - /* Request Per channel Bpids */ - if (pfc->pfc_en) - otx2_nix_config_bp(pfvf, true); - - err = otx2_pfc_txschq_update(pfvf); - if (err) { - dev_err(pfvf->dev, "%s failed to update TX schedulers\n", __func__); - return err; + if (if_up) { + otx2_stop(dev); + otx2_open(dev); } return 0; From patchwork Tue Aug 8 11:27:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Ghosh X-Patchwork-Id: 132813 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2361983vqr; Tue, 8 Aug 2023 12:59:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFBX4IAjxFcslg+d/YLWtFAjo+B34UgaNP0J8u7nnP7w2toVCpFG8V2mOREar5kthIb7RWQ X-Received: by 2002:a05:6808:650:b0:3a7:5314:e55e with SMTP id z16-20020a056808065000b003a75314e55emr735492oih.24.1691524749031; Tue, 08 Aug 2023 12:59:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691524748; cv=none; d=google.com; s=arc-20160816; b=F2buaSz8o5xrcwBI5349uq6pqRhBRpW733s4M3HTwp/a3JTUfTpWcqR4HfbR6IZ6/N 900RZ7WWDmQjuXgCF7ckj0p0kvQYj2crEJUpsW3Fl86uB7fHFYk4KMgpxlrxNKAhtfzR vLPQZFRwgI8RPPG+hGLAkrNM3mC8cuPZIk3l49dRT41tKnRXx+GshXDZXZHNCxq2KvBO 3UoVhIgEQkDPPn5g+LGz1AK0n/KyAa6izcyoxYZWSHVEG4MPDVP2ndktpvrfWnNEsEji PMITY+P+VhgaCMJzEGxH8MFtcbRcwA25XHMUj8Df+6mX2TLzRZhAkIiVvc+d0sxlLSIn oIAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/KczjdWXBqcacQStwDVxBoq896dhu2pYE9pTKn9oB9U=; fh=zaZMevJusfEyKCjkBAg52tAXDoBEUdsdtBKhQ6uTJKI=; b=q281M8lB/TZt0P7w74oKEkNAnyKOf9NE2W3RT8D/QWpRQjHUgaWUO82d903EzzZLi/ c6AC5DtTSsTfW2SJRY44+UhhknrDXMg2E/BxGAgki0hGYpqlYLu+lKZXL6qpUgypk7wJ wIDdABqbIRLXxnenmvQuvWyW2dUHkz0NixPtvKf5SWvRRhfu3hGLOhB+Eau7PvX2UVX+ pEwjev8RtafEVXD3FDBUNWTRLrQdBgYeMH9TRLFx6htB/DXESIuW6zdyIfIAZ9U+N1xI cQYXmIP/ZptZYddmEIhhOv89ZgLLHPa9N6bIT7utcSZTgFmW6719Nn57e9XfruvFUHGZ tbOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=DY4gzrro; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kw4-20020a17090b220400b00262ea2f8539si11074956pjb.153.2023.08.08.12.58.56; Tue, 08 Aug 2023 12:59:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=DY4gzrro; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S235306AbjHHSIJ (ORCPT + 99 others); Tue, 8 Aug 2023 14:08:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235235AbjHHSH3 (ORCPT ); Tue, 8 Aug 2023 14:07:29 -0400 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E2F9A798; Tue, 8 Aug 2023 10:08:42 -0700 (PDT) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 378A8kv1028961; Tue, 8 Aug 2023 04:27:29 -0700 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-transfer-encoding : content-type; s=pfpt0220; bh=/KczjdWXBqcacQStwDVxBoq896dhu2pYE9pTKn9oB9U=; b=DY4gzrroDMnlyTsCoOg/Y7WFA3OC1YSRZbrUSqBKKMPtPfM4oRtGv2H7ZWa7L/M+CmdL 2DXOu+XDLqrdT/tKUQYkAMRmW/JsYtvq3fPOsTgdWc5C5YsBYep92BzOgCAyZfutG0X9 FHN46gm0Uo2IJz1yQleCSqprVQe1YnF5CXGU/Pj1ruR8bSLUa25hxOz4BTiNYGeahLOe hmSNG0BMFItvz3GHUOL2wlvGXfdUQ7DtYIxiy6qGADF1PoAgowE5zeyX9qeql79G+GhF BVx4DanRZ7udtUZa0XUDx66AC4YdSMKxqxz58GSqsKYc21DfNM9thQTFj/L6imoSrn+6 Hw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3sbkntg7mb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 08 Aug 2023 04:27:29 -0700 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.48; Tue, 8 Aug 2023 04:27:27 -0700 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.48 via Frontend Transport; Tue, 8 Aug 2023 04:27:27 -0700 Received: from localhost.localdomain (unknown [10.28.36.166]) by maili.marvell.com (Postfix) with ESMTP id 7B17A3F7045; Tue, 8 Aug 2023 04:27:22 -0700 (PDT) From: Suman Ghosh To: , , , , , , , , , , , CC: Suman Ghosh Subject: [net PATCH 2/3] octeontx2-pf: Fix PFC TX scheduler free Date: Tue, 8 Aug 2023 16:57:07 +0530 Message-ID: <20230808112708.3179218-3-sumang@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230808112708.3179218-1-sumang@marvell.com> References: <20230808112708.3179218-1-sumang@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: eS4NXuSJoSW2m5x_67yFXByO4XI6-D43 X-Proofpoint-ORIG-GUID: eS4NXuSJoSW2m5x_67yFXByO4XI6-D43 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-08_09,2023-08-08_01,2023-05-22_02 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773692255147739485 X-GMAIL-MSGID: 1773692255147739485 During PFC TX schedulers free, flag TXSCHQ_FREE_ALL was being set which caused free up all schedulers other than the PFC schedulers. This patch fixes that to free only the PFC Tx schedulers. Fixes: 99c969a83d82 ("octeontx2-pf: Add egress PFC support") Signed-off-by: Suman Ghosh --- .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c index d54edfa8fcc9..c75435bab411 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c @@ -125,19 +125,12 @@ int otx2_pfc_txschq_alloc(struct otx2_nic *pfvf) static int otx2_pfc_txschq_stop_one(struct otx2_nic *pfvf, u8 prio) { - struct nix_txsch_free_req *free_req; + int lvl; - mutex_lock(&pfvf->mbox.lock); /* free PFC TLx nodes */ - free_req = otx2_mbox_alloc_msg_nix_txsch_free(&pfvf->mbox); - if (!free_req) { - mutex_unlock(&pfvf->mbox.lock); - return -ENOMEM; - } - - free_req->flags = TXSCHQ_FREE_ALL; - otx2_sync_mbox_msg(&pfvf->mbox); - mutex_unlock(&pfvf->mbox.lock); + for (lvl = 0; lvl < pfvf->hw.txschq_link_cfg_lvl; lvl++) + otx2_txschq_free_one(pfvf, lvl, + pfvf->pfc_schq_list[lvl][prio]); pfvf->pfc_alloc_status[prio] = false; return 0; From patchwork Tue Aug 8 11:27:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Ghosh X-Patchwork-Id: 132809 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2360616vqr; Tue, 8 Aug 2023 12:55:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEIJ8e8JStT1toK2jCFQTVVTHa6BRW66EB7ZNgxgYb0eAdzZfBk+bAlY+AzQ+SQlQC5XVp0 X-Received: by 2002:a17:90a:2a8e:b0:263:4305:4e82 with SMTP id j14-20020a17090a2a8e00b0026343054e82mr484368pjd.6.1691524536629; Tue, 08 Aug 2023 12:55:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691524536; cv=none; d=google.com; s=arc-20160816; b=KJcxUofKqyaj7baJpm42vvK/gBYDNYdAxeXpiMuLTxKrt37ag/Qg9kBN3VXGJHDERZ rIFMgXCxyKDLPcx8Cs4lEoXGejVZz/E0Jz1XxIEJ21Ku6YCrIFS5gOKSh5WZ5PhVxFDV zRPNCtdabFJgC8Ns+KNWcvxMPu//e9oQmX3bD+OWEbz92an82eUWffi4In89iXihKHht UDKerVtUPUDChkdyguvros4ik69hJm0qicGFp+0bJjKeUiw3NpJZfKCc4ztKPZOnOauD h0N59tuYtJz2vW+EVp06MQttcCaB7zgXKeF6ezF7fGFWywIVj/C3Kws4JYB5H2wWVuPe przA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=XAlOl3DDRS02zzgLra0tknIopDmIwtdliZJfkBFdVgQ=; fh=t2PLUjhSR1vjQTYzwkknYqxLhyXBsl4BfPAHuyUGafI=; b=EAJ12ivC8Z1jNx4InkB6wx9z/VQP999jdutiJ0IniZll4Xcu34Qz4iKFtayvLbLkTY 8b1+EfGaJ58tWi2l0rjkDEauEDS9unR86uiDCuBfpYrFgABB1cV/4JUPGVGiTiAY89M7 vwz9hc6E5ur4XYvPqyaqHAIU+Nux/LnSXEIsluLK7srgOYDAemXFHwFx9tgiiLsdJzJq aloXxx3NzjQsZScdcTS22ToM3E3ydM04ytDCWIo9SMSljy9YyGDtMz7Q9H9dq8EC5CJw 1V3TWSPdW9kyYaxcknZLYTRCYlx07yp2XsWfurjLKOkANs9EM9dH0oD/JgEXoTxPiVkl sPVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=CFfgTKuA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e11-20020a17090a728b00b002694b5c3a6asi4426409pjg.190.2023.08.08.12.55.22; Tue, 08 Aug 2023 12:55:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=CFfgTKuA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S234375AbjHHRSr (ORCPT + 99 others); Tue, 8 Aug 2023 13:18:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234302AbjHHRSX (ORCPT ); Tue, 8 Aug 2023 13:18:23 -0400 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 669621E312; Tue, 8 Aug 2023 09:07:30 -0700 (PDT) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 378A8kv3028961; Tue, 8 Aug 2023 04:27:35 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=XAlOl3DDRS02zzgLra0tknIopDmIwtdliZJfkBFdVgQ=; b=CFfgTKuAdLKYJChLhCNGECFWt/E6QG/EbMxzXBE5V0U78OZhl7f7ty0eZdyzW+2lvtXf i4FqQObnGxqSIHe5T2UOKor5eP6haPlPVFaW5kSFB9GFW809glf7QrQBHZjb4i/PMtxD TequXOsoofBTQomX1ON+rYBlBzphp/4LI8RkF5nwhi7kMhCeJqjlT8pUY9pUSUbAZqf6 xvsne4eLUWGz75kGcKBjKMKozCoxKqC58hTyyHhcDAalGyeW7l/ayJ+YVW7Z2Zm1FL+g 8QrHenOkaXhmjxESa6+lHYJZxQ/mjfo+MVkm67uTLyIiG8q3eiImLzi9G1CU+IzGcYX5 iA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3sbkntg7mr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 08 Aug 2023 04:27:34 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Tue, 8 Aug 2023 04:27:33 -0700 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.48 via Frontend Transport; Tue, 8 Aug 2023 04:27:33 -0700 Received: from localhost.localdomain (unknown [10.28.36.166]) by maili.marvell.com (Postfix) with ESMTP id A7D113F7045; Tue, 8 Aug 2023 04:27:28 -0700 (PDT) From: Suman Ghosh To: , , , , , , , , , , , Subject: [net PATCH 3/3] octeontx2-af: CN10KB: fix PFC configuration Date: Tue, 8 Aug 2023 16:57:08 +0530 Message-ID: <20230808112708.3179218-4-sumang@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230808112708.3179218-1-sumang@marvell.com> References: <20230808112708.3179218-1-sumang@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: cNhGZ-HWFY0j-uZTSBniOwBV2CxkuOyf X-Proofpoint-ORIG-GUID: cNhGZ-HWFY0j-uZTSBniOwBV2CxkuOyf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-08_09,2023-08-08_01,2023-05-22_02 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773692032510166521 X-GMAIL-MSGID: 1773692032510166521 From: Hariprasad Kelam The previous patch which added new CN10KB RPM block support, has a bug due to which PFC is not getting configured properly. This patch fixes the same. Fixes: b9d0fedc6234 ("octeontx2-af: cn10kb: Add RPM_USX MAC support") Signed-off-by: Hariprasad Kelam --- drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 +++++++++-------- .../net/ethernet/marvell/octeontx2/af/rvu_reg.c | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rpm.c b/drivers/net/ethernet/marvell/octeontx2/af/rpm.c index b4fcb20c3f4f..af21e2030cff 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rpm.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rpm.c @@ -355,8 +355,8 @@ int rpm_lmac_enadis_pause_frm(void *rpmd, int lmac_id, u8 tx_pause, void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable) { + u64 cfg, pfc_class_mask_cfg; rpm_t *rpm = rpmd; - u64 cfg; /* ALL pause frames received are completely ignored */ cfg = rpm_read(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG); @@ -380,9 +380,11 @@ void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable) rpm_write(rpm, 0, RPMX_CMR_CHAN_MSK_OR, ~0ULL); /* Disable all PFC classes */ - cfg = rpm_read(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL); + pfc_class_mask_cfg = is_dev_rpm2(rpm) ? RPM2_CMRX_PRT_CBFC_CTL : + RPMX_CMRX_PRT_CBFC_CTL; + cfg = rpm_read(rpm, lmac_id, pfc_class_mask_cfg); cfg = FIELD_SET(RPM_PFC_CLASS_MASK, 0, cfg); - rpm_write(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL, cfg); + rpm_write(rpm, lmac_id, pfc_class_mask_cfg, cfg); } int rpm_get_rx_stats(void *rpmd, int lmac_id, int idx, u64 *rx_stat) @@ -605,8 +607,11 @@ int rpm_lmac_pfc_config(void *rpmd, int lmac_id, u8 tx_pause, u8 rx_pause, u16 p if (!is_lmac_valid(rpm, lmac_id)) return -ENODEV; + pfc_class_mask_cfg = is_dev_rpm2(rpm) ? RPM2_CMRX_PRT_CBFC_CTL : + RPMX_CMRX_PRT_CBFC_CTL; + cfg = rpm_read(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG); - class_en = rpm_read(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL); + class_en = rpm_read(rpm, lmac_id, pfc_class_mask_cfg); pfc_en |= FIELD_GET(RPM_PFC_CLASS_MASK, class_en); if (rx_pause) { @@ -635,10 +640,6 @@ int rpm_lmac_pfc_config(void *rpmd, int lmac_id, u8 tx_pause, u8 rx_pause, u16 p cfg |= RPMX_MTI_MAC100X_COMMAND_CONFIG_PFC_MODE; rpm_write(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG, cfg); - - pfc_class_mask_cfg = is_dev_rpm2(rpm) ? RPM2_CMRX_PRT_CBFC_CTL : - RPMX_CMRX_PRT_CBFC_CTL; - rpm_write(rpm, lmac_id, pfc_class_mask_cfg, class_en); return 0; diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.c index b3150f053291..d46ac29adb96 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.c @@ -31,8 +31,8 @@ static struct hw_reg_map txsch_reg_map[NIX_TXSCH_LVL_CNT] = { {NIX_TXSCH_LVL_TL4, 3, 0xFFFF, {{0x0B00, 0x0B08}, {0x0B10, 0x0B18}, {0x1200, 0x12E0} } }, {NIX_TXSCH_LVL_TL3, 4, 0xFFFF, {{0x1000, 0x10E0}, {0x1600, 0x1608}, - {0x1610, 0x1618}, {0x1700, 0x17B0} } }, - {NIX_TXSCH_LVL_TL2, 2, 0xFFFF, {{0x0E00, 0x0EE0}, {0x1700, 0x17B0} } }, + {0x1610, 0x1618}, {0x1700, 0x17C8} } }, + {NIX_TXSCH_LVL_TL2, 2, 0xFFFF, {{0x0E00, 0x0EE0}, {0x1700, 0x17C8} } }, {NIX_TXSCH_LVL_TL1, 1, 0xFFFF, {{0x0C00, 0x0D98} } }, };