From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A4CE32144D; Mon, 18 Aug 2025 13:35:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755524155; cv=none; b=W2qOlPkuw4GQIV5Hk5sXwxGLZ3gE9jH44z7nHC9+ICmgdNDGbmxWvLWutSJoSB5Hc5vH9xlFwx6NP/yKxGEeLAESKiLXR3OJFgL0Z9XfgJOeAeAsXQsOy6W+mcos+MYb0p2TvwSn5xg9qVbAkcGfIbW7dVORw8F2qzOWEKOIWZQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755524155; c=relaxed/simple; bh=upsZmpj0lkQ5v2zH0qnNo/zgwC2+CFRv7NT1iH75YUU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t6JpNL65uKoGPStH5yG6vPn+mlo5tjcWkkvTgLeFgwDGAKhHeUoDU9IyauQs7EyYGKtj4baj3QWCGXd/jICLJYmqEVmAAez2HRhOEjvgS4t5NbjBAJkdWvzQhm3Ur/Llamlu/MB+i/Hdmqih5i4MNef+m7pxMKbgZjwtMM1LrRI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zdMsr9k6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zdMsr9k6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFB3FC2BCAF; Mon, 18 Aug 2025 13:35:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755524155; bh=upsZmpj0lkQ5v2zH0qnNo/zgwC2+CFRv7NT1iH75YUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zdMsr9k6PR8e/QRhaA4CM6QN1BXastX/r/oaT8FciC5fXb7W7e/ZmBxkn0BrJcn2f IOxV5IgQcI4UmLVF3BGGnAq2MqTk0qpScWvXgk1HAGkWXEWJkcdMzu+sj4So6FkWwb 11HzEDRkwgVMVuEy5z55OMnLt3z1BilTNsAObKmo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Srujana Challa , Bharat Bhushan , Herbert Xu , Sasha Levin Subject: [PATCH 6.15 384/515] crypto: octeontx2 - add timeout for load_fvc completion poll Date: Mon, 18 Aug 2025 14:46:10 +0200 Message-ID: <20250818124513.200317163@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124458.334548733@linuxfoundation.org> References: <20250818124458.334548733@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bharat Bhushan [ Upstream commit 2157e50f65d2030f07ea27ef7ac4cfba772e98ac ] Adds timeout to exit from possible infinite loop, which polls on CPT instruction(load_fvc) completion. Signed-off-by: Srujana Challa Signed-off-by: Bharat Bhushan Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c index 42c5484ce66a..3a818ac89295 100644 --- a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +++ b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c @@ -1494,6 +1494,7 @@ int otx2_cpt_discover_eng_capabilities(struct otx2_cptpf_dev *cptpf) dma_addr_t rptr_baddr; struct pci_dev *pdev; u32 len, compl_rlen; + int timeout = 10000; int ret, etype; void *rptr; @@ -1556,16 +1557,27 @@ int otx2_cpt_discover_eng_capabilities(struct otx2_cptpf_dev *cptpf) etype); otx2_cpt_fill_inst(&inst, &iq_cmd, rptr_baddr); lfs->ops->send_cmd(&inst, 1, &cptpf->lfs.lf[0]); + timeout = 10000; while (lfs->ops->cpt_get_compcode(result) == - OTX2_CPT_COMPLETION_CODE_INIT) + OTX2_CPT_COMPLETION_CODE_INIT) { cpu_relax(); + udelay(1); + timeout--; + if (!timeout) { + ret = -ENODEV; + cptpf->is_eng_caps_discovered = false; + dev_warn(&pdev->dev, "Timeout on CPT load_fvc completion poll\n"); + goto error_no_response; + } + } cptpf->eng_caps[etype].u = be64_to_cpup(rptr); } - dma_unmap_single(&pdev->dev, rptr_baddr, len, DMA_BIDIRECTIONAL); cptpf->is_eng_caps_discovered = true; +error_no_response: + dma_unmap_single(&pdev->dev, rptr_baddr, len, DMA_BIDIRECTIONAL); free_result: kfree(result); lf_cleanup: -- 2.39.5