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;