From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (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 D0BE148C8C5; Tue, 5 May 2026 17:53:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778003639; cv=none; b=jyWt9vlaqJgP/CyoUdWYEmQOQkkTQ116eF8eY2LkDRQhk/VRBlRvDUb4HV5kb/x5PdKvb6nt4KVdjuc2R/2WKt+SOA8WuG4HDehFvHiAJH2LBWFc9B1Hrf/LCexNcMsqy6Kq1thtmKsWwLiw/FiwkzCKJKsZCY4WxEo2nzIvZek= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778003639; c=relaxed/simple; bh=2HprfiJ0pisWR//NJMpSah5IqgwIGz1YNJLlOWkvG9M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jyQ/u6tv52rNOwqKgbsEhPnmFTyawNJisJyQJtsDnFgRDiHa61b7Z6uRidsWB1VJg8JtIm6MA1D1mBJjFxTcNadwQl+2r/s4SL0IVGsWVhgA7Dg5flMlVfN4UXTTyBdnTwuDdH2So2JJsZ4hbN0IwTRU3brbJHLv9C7kmCKx3xs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=j7mcfpQN; arc=none smtp.client-ip=185.171.202.116 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="j7mcfpQN" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 41366C5CD52; Tue, 5 May 2026 17:54:42 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 573F26053C; Tue, 5 May 2026 17:53:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 22BE811AD040F; Tue, 5 May 2026 19:53:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1778003634; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=FoC8tR9VPR8Ki1XrtOVKBVTKCTXbNjL0c7/3kI3kmHU=; b=j7mcfpQN7jZHrLFx98oEP4uvPoHlaVcyTxVKro8fIBlnD2yWSjHoykGJ9w1K4qaI2BOCbA 6Xa5QJXvMsnC8NeIyzwmy2+E6DkRy/JCJ84odm6KzFtjfgcYzveKIc7CDakyJe+MSYcw0G 6bJ5yFArVtJH+ewYR12n06XyjalO5oH61QR87cn0zCrvhV6YIskUDzb5g5OC/4e1ZZ86AY d9tiegsuJpTdS1WvRd0VhY0XhMiSlZslIOpNeRTmT/AwQTr4LYdvw+9mPllXJ2jxC18zdF /FV4dzIDNyTmVwhHu4QaCp0U+WXzNiWtw/i8furnU0hJAYOuC/RdzPtG9m8Hqw== From: Paul Louvel Date: Tue, 05 May 2026 19:53:05 +0200 Subject: [PATCH v2 04/12] crypto: talitos - move dma mapping code in talitos_submit() into a standalone dma_map_request() function Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260505-bootlin_test-7-1-rc1_sec_bugfix-v2-4-5818064bd190@bootlin.com> References: <20260505-bootlin_test-7-1-rc1_sec_bugfix-v2-0-5818064bd190@bootlin.com> In-Reply-To: <20260505-bootlin_test-7-1-rc1_sec_bugfix-v2-0-5818064bd190@bootlin.com> To: Herbert Xu , "David S. Miller" , Paolo Abeni , David Howells , Kim Phillips , Christophe Leroy Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Petazzoni , Herve Codina , Paul Louvel , stable@vger.kernel.org X-Mailer: b4 0.15.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1778003630; l=3486; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=2HprfiJ0pisWR//NJMpSah5IqgwIGz1YNJLlOWkvG9M=; b=29CIUBYQOQVX8MDt1numu7iV8eo+NfAQ71iNLQU0uuq+jrpS57+wumhSmgKX7I8LKvi/BHqeA 4WXDaxIQ+RPBzvvmz2e9iIW72LJwumd9oYJRtaqoUedDyN6b4NKMoS9 X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Previously added code to talitos_submit() in order to map an entire descriptor chain. Move that code into a standalone function to improve readability. Cc: stable@vger.kernel.org Signed-off-by: Paul Louvel --- drivers/crypto/talitos.c | 79 ++++++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index e26689bf7c9d..3b1d8e34e86e 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -256,6 +256,48 @@ static int init_device(struct device *dev) return 0; } +static void dma_map_request(struct device *dev, struct talitos_request *request, + struct talitos_desc *desc, bool is_sec1) +{ + struct talitos_edesc *edesc = + container_of(desc, struct talitos_edesc, desc); + dma_addr_t dma_desc, prev_dma_desc; + struct talitos_edesc *prev_edesc = NULL; + + if (is_sec1) { + request->desc_chain = edesc->node.prev; + + list_for_each_entry(edesc, request->desc_chain, node) { + edesc->desc.hdr1 = edesc->desc.hdr; + + dma_desc = dma_map_single(dev, &edesc->desc.hdr1, + TALITOS_DESC_SIZE, + DMA_BIDIRECTIONAL); + + if (!prev_edesc) { + request->dma_desc = dma_desc; + goto next; + } + + /* Chain in any previous descriptors. */ + + prev_edesc->desc.next_desc = cpu_to_be32(dma_desc); + + dma_sync_single_for_device(dev, prev_dma_desc, + TALITOS_DESC_SIZE, + DMA_TO_DEVICE); + +next: + prev_edesc = edesc; + prev_dma_desc = dma_desc; + } + } else { + request->dma_desc = dma_map_single(dev, desc, TALITOS_DESC_SIZE, + DMA_BIDIRECTIONAL); + request->desc_chain = NULL; + } +} + /** * talitos_submit - submits a descriptor to the device for processing * @dev: the SEC device to be used @@ -274,10 +316,7 @@ static int talitos_submit(struct device *dev, int ch, struct talitos_desc *desc, void *context, int error), void *context) { - struct talitos_edesc *edesc = container_of(desc, struct talitos_edesc, desc); struct talitos_private *priv = dev_get_drvdata(dev); - dma_addr_t dma_desc, prev_dma_desc; - struct talitos_edesc *prev_edesc = NULL; struct talitos_request *request; unsigned long flags; int head; @@ -295,39 +334,7 @@ static int talitos_submit(struct device *dev, int ch, struct talitos_desc *desc, request = &priv->chan[ch].fifo[head]; /* map descriptor and save caller data */ - if (is_sec1) { - request->desc_chain = edesc->node.prev; - - list_for_each_entry(edesc, request->desc_chain, node) { - edesc->desc.hdr1 = edesc->desc.hdr; - - dma_desc = dma_map_single(dev, &edesc->desc.hdr1, - TALITOS_DESC_SIZE, - DMA_BIDIRECTIONAL); - - if (!prev_edesc) { - request->dma_desc = dma_desc; - goto next; - } - - /* Chain in any previous descriptors. */ - - prev_edesc->desc.next_desc = cpu_to_be32(dma_desc); - - dma_sync_single_for_device(dev, prev_dma_desc, - TALITOS_DESC_SIZE, - DMA_TO_DEVICE); - -next: - prev_edesc = edesc; - prev_dma_desc = dma_desc; - } - } else { - request->dma_desc = dma_map_single(dev, desc, - TALITOS_DESC_SIZE, - DMA_BIDIRECTIONAL); - request->desc_chain = NULL; - } + dma_map_request(dev, request, desc, is_sec1); request->callback = callback; request->context = context; -- 2.53.0