From nobody Tue Apr 7 01:05:08 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 900C33E1D00 for ; Tue, 17 Mar 2026 14:03:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756190; cv=none; b=LqHVZeimAqOloFVnufEkccDLovO2X1rDG2OK7pWVvas9+aUj3rN1D3te2+chZ+NCfa2EvpYqayFpzy4+fUk3PFSEFUGHEDIj7YIISxBNc84RwkwzuHYnb9Ia1/sdwyWvCaQl/F+hKB8OAaGfmUGeuZe38Rlk/RnJx/3eVTxG2Eo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756190; c=relaxed/simple; bh=J6JQaK92XNV2IsiAsrkn8st/ERqfkA6XUnyKQOIn/eg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=f2XvCt8Y00xaCPtB2s5/9BSP40fJPaIlhdtloiCURQOW3Uk6czy9lekRkD9Tq+8M/rujLM0Qe7MVy0pHrNVi95TKJKXtrwrJk8VagXaHAnw8vQTiiPhG9jDm4q6XjxoPAYb/D4WvHUoJLSdC6WnxZk+BxgXSHPHGsSomGjJpYeo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Ha3JoDWJ; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Su6Ak+KB; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Ha3JoDWJ"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Su6Ak+KB" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62H7o2AH1533932 for ; Tue, 17 Mar 2026 14:03:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= iL0DqmcolfEx1Yxj+LLfsMTXg/CLsi8xOZKAt5M4Zk0=; b=Ha3JoDWJSc/fM0co DeLwoDzc0rcvXJl5HYBavH4PYikRb99kWvTqn/dQeMstDTKOGYyXgO9wpglU7kpn Cm2sYTqMQe3sKNe77astv7L08PC7XJHQfN8GQnIepAXfokZFJs7sYvVwGLTzTomS GdUcU/NyTJdJlRw6yjlKaWaMr1o4hGnf5IeBH7tCZNwFGH4Xz7pwNJMVfI11GcCr /6U2Qg4mmB1xx83EHRR6BASrgi/u9FUYlpJkFRuzMO1Fvosq6EmDkrkqVGe063lM xhhQna79rMVqHoqCu23CxWfa62xxAYAvBcl8kISK6AOjxz9IzTebkwklkcHU9Zj3 e/LIFw== Received: from mail-vs1-f69.google.com (mail-vs1-f69.google.com [209.85.217.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cxm5k4bna-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 17 Mar 2026 14:03:07 +0000 (GMT) Received: by mail-vs1-f69.google.com with SMTP id ada2fe7eead31-5ffc6cb5980so7660468137.0 for ; Tue, 17 Mar 2026 07:03:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773756186; x=1774360986; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=iL0DqmcolfEx1Yxj+LLfsMTXg/CLsi8xOZKAt5M4Zk0=; b=Su6Ak+KBTCURlRamQ+cIPuj+00Pb5PPCx+wyTsjuwFxjz2gtqPQSnTCgcg0+h03br+ c9m14Q9YS/i4i8KEvdIhkM2WjmBclswOMwEDB6fbFWI1bRivV6LW+mu5S9d0JfBi7n0r dAXYSJOS57wY0LmV2dmsxtu33/3FJSW0kIvUpYit4wUcFPiGVmhunR5iom2C5DsTtiFX vs1X4OUwPsHxIOC9k9VbBIV/TNCU2lNJdIMA+4Pxa689x7wkVWueJTp6F0i3X7cMhpix wjtFE5TqFFSlnDH/sVV2hiEig8hNk+wvuJhwXNojFtSXtm1GdToMQ9YNjEupUFXIaOKM by2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773756186; x=1774360986; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=iL0DqmcolfEx1Yxj+LLfsMTXg/CLsi8xOZKAt5M4Zk0=; b=nK76EbcoJj8QWEJhCdFEx19kwoNV/MUPJLkZbK4WPtGUJ9DzCq6/GTH8tj3MEne51p b9zu2c1pF6YPSxqghkew+43Y3j5BkQIRo46rBZrGZQSK6v4COlD+6OiIc+Kt8YwXMH8+ REF8RHWKjr2jgzeq/BWXMWqsa6znalfHj90rajkhjzOYR5DcmlDARLE3xxrq8Mkl9dmh RVgoN0U1oax6YB4WULQnieiAVUKrS7W5Yt9R+liwxq2kIpCFsTrJU2eAhMRSnGivpPTj bUbRMtE08JndxdeMvjt09/NQVzpzDW7CT0B7Wd420lebbK9AekQQ0arXs5VeMv56+7s+ Pgvg== X-Forwarded-Encrypted: i=1; AJvYcCX0KgkAYsX8tndudlGG1Q9i5ztU8suBmhgN2Be5Nt5bHFiyfbIndnM5VdsxlFkD3VjlyAPZtW2L7UehtF4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz45YM7+29iNAXMVNOnrTR41UX5pYm0rBfOIvcj5upqck1uTQdz PD541exlXWPTRx9gt99pUieRkvozKw91OFTMcg8XmO8N4gyoHtkVMYnXqYKLsU4hF3JMMDcGQf9 caC9kk1gG+j96CG8vJRgk902FSdNqFh71ltqQfdhvwa3CLEsYDTUfCnKAjypWcM+vpNA= X-Gm-Gg: ATEYQzzWgBgMEVJWZ+nbGb+KLmkmj+YBVZ6J1C8gAyPEg+M1btVzkLBAg4uXL83Vgbb N6s/RRrEO4i1coNgbq0h327DJ868kiN71p/x9OlKpAQ03qeCwdKztaPeWH8vkUJy5SwRsZTTPL0 0TuDR5NKWPurCw23UEntOBTM+3+rbwC2LJc+x/lBmd1+UWUQFtyWFuATXsqaNkguRl5C9MPG8G5 zXYSOXWtYvz4N05apBYPDF2x0ceRkdyrxRqMSPj9NsYmetPbMzCiL0eg2fHDpLCI1NItsrD2xSb UhobpD0bDCC7cQjp0rx2jXhc3mBm+6/dj/LgkZULE1OEvKP8/uVAwUK/RxMrKIm+uWRedursbda am8r9yzu3bX5dNvUuDkLybaJ37XdjYZ/99VY+LZQ9xE3akpE7Cyp9 X-Received: by 2002:a05:6102:b14:b0:5ff:ea07:c7a6 with SMTP id ada2fe7eead31-6020e52d525mr6738356137.26.1773756186050; Tue, 17 Mar 2026 07:03:06 -0700 (PDT) X-Received: by 2002:a05:6102:b14:b0:5ff:ea07:c7a6 with SMTP id ada2fe7eead31-6020e52d525mr6738271137.26.1773756185497; Tue, 17 Mar 2026 07:03:05 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:6aa2:dd35:4d6d:8eec]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b4938854csm9359709f8f.34.2026.03.17.07.03.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2026 07:03:03 -0700 (PDT) From: Bartosz Golaszewski Date: Tue, 17 Mar 2026 15:02:18 +0100 Subject: [PATCH v13 11/12] crypto: qce - Add BAM DMA support for crypto register I/O 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: quoted-printable Message-Id: <20260317-qcom-qce-cmd-descr-v13-11-0968eb4f8c40@oss.qualcomm.com> References: <20260317-qcom-qce-cmd-descr-v13-0-0968eb4f8c40@oss.qualcomm.com> In-Reply-To: <20260317-qcom-qce-cmd-descr-v13-0-0968eb4f8c40@oss.qualcomm.com> To: Vinod Koul , Jonathan Corbet , Thara Gopinath , Herbert Xu , "David S. Miller" , Udit Tiwari , Md Sadre Alam , Dmitry Baryshkov , Manivannan Sadhasivam , Stephan Gerhold , Bjorn Andersson , Peter Ujfalusi , Michal Simek , Frank Li Cc: dmaengine@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, brgl@kernel.org, Bartosz Golaszewski , Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=11908; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=JXlCbp8LMrKa8gZGoF4/x1EM2L/52sBlLm6zQExbX3s=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBpuV76rG6Dr4+kXvS8A/s9NxoRIQY3a5FR1Ok9x KXhw/kYRh6JAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCable+gAKCRAFnS7L/zaE w8RRD/9WWP1Dk4m6HF7GkT6xx+03DfcTSLkiIKEoJgeYfZH6I5hLDIMU84+WzV3mYgCQvbJNRwV IpnXiP7WIT0d5gwRUDuK5uXA109VIAlOJoctVyvH1YKUUDGmRHoNN0yHjQN1/QDzKggOu/BG4aV e2Whlttg/ojC6YcTpRP2uVkm4xVh0zJIsnIT7S1vqzQGFZ8bvIdyBDpvHNxWOX1h270YHH3WJao tq55R3GyNwaTKYYWBnDR0hNqi38p1rgV3QI2X42t+xWB8SJcrhaTHeKzuVshp7ilTozb28Vk1o4 24jAXsL2byW6gr/6Cf34a2n8Fveo5/LbcihgqoJ8PLLFzy3LJSUYAOHSJUMMsiyE3a/NMwyT7dq qPp3E1CpdqFU43xuZSbosmyPtoLfpBkku4HAzFufizNvjXCbCkUsGcLHaTGo6VmRxXBsb5aHO1/ xio078hejluWGLHlpg+M5AebcxgrBBr+pcRMErt/9BdvffAW2AKHAqGlq9WjIiY/J+OrQMMyaXL IRKeHnjzGuUNp+W1HTDLpSOOzlvQLijAATWHWVfBY2P1oWoNYy8TOIVnJlq0k7L2uBt71yMzk/B BVVWJygJqm+jmuYCvYZQVE0C1RbbME7P5BmaRdlZznundRnBWj/PPBGhkWFvBDnHNg/yRcnd88k 4mrWuMe5kRNUiNg== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Authority-Analysis: v=2.4 cv=fJ00HJae c=1 sm=1 tr=0 ts=69b95f1b cx=c_pps a=5HAIKLe1ejAbszaTRHs9Ug==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=9HZbPfoxh1Yo69-LKtAA:9 a=QEXdDO2ut3YA:10 a=gYDTvv6II1OnSo0itH1n:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE3MDEyNCBTYWx0ZWRfX2ZsFc4cxlXmm bBrigfT4A3uiL51dl6vMFSqMXRjl0R+pTrj67MibNdxbU0l4LgEcPsGYvisiFaBhwompTSmvpbq nMKkFyt2ttdFpmYF1v2GOMppKONtXxpL8va7456eSf8r+QcTkNXd1+6/BXfsuuNxVqYg9FJPSJx x/8Cd7ClaaT9Gk2WXDdU74OuVytLPc2/n3iYeJLxFiUGTMc4FJhmAyg49HU6yh/rv9Vxg7TfNut J/2iwKA8Dv2uuqqGOYibcupWYLGf28qShATOTPreIycn5uj7yJcQHQSkftyKbxF0QRAjhd2uEzU FFCrU9cfGXneRzd8Gwvg2eJ/NPolDhx22HUh/C+AQUW7yKmsO2F4aOaqFlY1P/Lj2GT0EmAQuFD V69aUh4Q4l38SpTQMUIhgIgD0IUQVwlg3Ht8IzcPhHA/9UcshgRRzY4x8Prm4+rFh8n4ChsUiL2 UWB1wmACJ10NOy04zPw== X-Proofpoint-GUID: ZlltcvcdGeFkXkKfppcY10cLMqZV445- X-Proofpoint-ORIG-GUID: ZlltcvcdGeFkXkKfppcY10cLMqZV445- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-17_01,2026-03-17_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 malwarescore=0 suspectscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603170124 From: Bartosz Golaszewski Implement the infrastructure for performing register I/O over BAM DMA, not CPU. Signed-off-by: Bartosz Golaszewski Signed-off-by: Bartosz Golaszewski --- drivers/crypto/qce/aead.c | 8 +-- drivers/crypto/qce/common.c | 20 ++++---- drivers/crypto/qce/core.h | 4 ++ drivers/crypto/qce/dma.c | 114 ++++++++++++++++++++++++++++++++++++++= ++-- drivers/crypto/qce/dma.h | 5 ++ drivers/crypto/qce/sha.c | 8 +-- drivers/crypto/qce/skcipher.c | 8 +-- 7 files changed, 141 insertions(+), 26 deletions(-) diff --git a/drivers/crypto/qce/aead.c b/drivers/crypto/qce/aead.c index abb438d2f8888d313d134161fda97dcc9d82d6d9..0cfea1cbfb0f927e0b8bcd57c47= 004cbe41175a0 100644 --- a/drivers/crypto/qce/aead.c +++ b/drivers/crypto/qce/aead.c @@ -468,6 +468,10 @@ qce_aead_async_req_handle(struct crypto_async_request = *async_req) src_nents =3D dst_nents - 1; } =20 + ret =3D qce_start(async_req, tmpl->crypto_alg_type); + if (ret) + goto error_terminate; + ret =3D qce_dma_prep_sgs(&qce->dma, rctx->src_sg, src_nents, rctx->dst_sg= , dst_nents, qce_aead_done, async_req); if (ret) @@ -475,10 +479,6 @@ qce_aead_async_req_handle(struct crypto_async_request = *async_req) =20 qce_dma_issue_pending(&qce->dma); =20 - ret =3D qce_start(async_req, tmpl->crypto_alg_type); - if (ret) - goto error_terminate; - return 0; =20 error_terminate: diff --git a/drivers/crypto/qce/common.c b/drivers/crypto/qce/common.c index 04253a8d33409a2a51db527435d09ae85a7880af..b2b0e751a06517ac06e7a468599= bd18666210e0c 100644 --- a/drivers/crypto/qce/common.c +++ b/drivers/crypto/qce/common.c @@ -25,7 +25,7 @@ static inline u32 qce_read(struct qce_device *qce, u32 of= fset) =20 static inline void qce_write(struct qce_device *qce, u32 offset, u32 val) { - writel(val, qce->base + offset); + qce_write_dma(qce, offset, val); } =20 static inline void qce_write_array(struct qce_device *qce, u32 offset, @@ -82,6 +82,8 @@ static void qce_setup_config(struct qce_device *qce) { u32 config; =20 + qce_clear_bam_transaction(qce); + /* get big endianness */ config =3D qce_config_reg(qce, 0); =20 @@ -90,12 +92,14 @@ static void qce_setup_config(struct qce_device *qce) qce_write(qce, REG_CONFIG, config); } =20 -static inline void qce_crypto_go(struct qce_device *qce, bool result_dump) +static inline int qce_crypto_go(struct qce_device *qce, bool result_dump) { if (result_dump) qce_write(qce, REG_GOPROC, BIT(GO_SHIFT) | BIT(RESULTS_DUMP_SHIFT)); else qce_write(qce, REG_GOPROC, BIT(GO_SHIFT)); + + return qce_submit_cmd_desc(qce); } =20 #if defined(CONFIG_CRYPTO_DEV_QCE_SHA) || defined(CONFIG_CRYPTO_DEV_QCE_AE= AD) @@ -223,9 +227,7 @@ static int qce_setup_regs_ahash(struct crypto_async_req= uest *async_req) config =3D qce_config_reg(qce, 1); qce_write(qce, REG_CONFIG, config); =20 - qce_crypto_go(qce, true); - - return 0; + return qce_crypto_go(qce, true); } #endif =20 @@ -386,9 +388,7 @@ static int qce_setup_regs_skcipher(struct crypto_async_= request *async_req) config =3D qce_config_reg(qce, 1); qce_write(qce, REG_CONFIG, config); =20 - qce_crypto_go(qce, true); - - return 0; + return qce_crypto_go(qce, true); } #endif =20 @@ -535,9 +535,7 @@ static int qce_setup_regs_aead(struct crypto_async_requ= est *async_req) qce_write(qce, REG_CONFIG, config); =20 /* Start the process */ - qce_crypto_go(qce, !IS_CCM(flags)); - - return 0; + return qce_crypto_go(qce, !IS_CCM(flags)); } #endif =20 diff --git a/drivers/crypto/qce/core.h b/drivers/crypto/qce/core.h index a80e12eac6c87e5321cce16c56a4bf5003474ef0..d238097f834e4605f3825f23d03= 16d4196439116 100644 --- a/drivers/crypto/qce/core.h +++ b/drivers/crypto/qce/core.h @@ -30,6 +30,8 @@ * @base_dma: base DMA address * @base_phys: base physical address * @dma_size: size of memory mapped for DMA + * @read_buf: Buffer for DMA to write back to + * @read_buf_dma: Mapped address of the read buffer * @async_req_enqueue: invoked by every algorithm to enqueue a request * @async_req_done: invoked by every algorithm to finish its request */ @@ -49,6 +51,8 @@ struct qce_device { dma_addr_t base_dma; phys_addr_t base_phys; size_t dma_size; + __le32 *read_buf; + dma_addr_t read_buf_dma; int (*async_req_enqueue)(struct qce_device *qce, struct crypto_async_request *req); void (*async_req_done)(struct qce_device *qce, int ret); diff --git a/drivers/crypto/qce/dma.c b/drivers/crypto/qce/dma.c index a46264735bb895b6199969e83391383ccbbacc5f..5c42fc7ddf01e11a6562d272ba7= c90c906e0e312 100644 --- a/drivers/crypto/qce/dma.c +++ b/drivers/crypto/qce/dma.c @@ -4,6 +4,8 @@ */ =20 #include +#include +#include #include #include =20 @@ -11,6 +13,96 @@ #include "dma.h" =20 #define QCE_IGNORE_BUF_SZ (2 * QCE_BAM_BURST_SIZE) +#define QCE_BAM_CMD_SGL_SIZE 128 +#define QCE_BAM_CMD_ELEMENT_SIZE 128 +#define QCE_MAX_REG_READ 8 + +struct qce_desc_info { + struct dma_async_tx_descriptor *dma_desc; + enum dma_data_direction dir; +}; + +struct qce_bam_transaction { + struct bam_cmd_element bam_ce[QCE_BAM_CMD_ELEMENT_SIZE]; + struct scatterlist wr_sgl[QCE_BAM_CMD_SGL_SIZE]; + struct qce_desc_info *desc; + u32 bam_ce_idx; + u32 pre_bam_ce_idx; + u32 wr_sgl_cnt; +}; + +void qce_clear_bam_transaction(struct qce_device *qce) +{ + struct qce_bam_transaction *bam_txn =3D qce->dma.bam_txn; + + bam_txn->bam_ce_idx =3D 0; + bam_txn->wr_sgl_cnt =3D 0; + bam_txn->bam_ce_idx =3D 0; + bam_txn->pre_bam_ce_idx =3D 0; +} + +int qce_submit_cmd_desc(struct qce_device *qce) +{ + struct qce_desc_info *qce_desc =3D qce->dma.bam_txn->desc; + struct qce_bam_transaction *bam_txn =3D qce->dma.bam_txn; + struct dma_async_tx_descriptor *dma_desc; + struct dma_chan *chan =3D qce->dma.rxchan; + unsigned long attrs =3D DMA_PREP_CMD; + dma_cookie_t cookie; + unsigned int mapped; + int ret; + + mapped =3D dma_map_sg_attrs(qce->dev, bam_txn->wr_sgl, bam_txn->wr_sgl_cn= t, + DMA_TO_DEVICE, attrs); + if (!mapped) + return -ENOMEM; + + dma_desc =3D dmaengine_prep_slave_sg(chan, bam_txn->wr_sgl, bam_txn->wr_s= gl_cnt, + DMA_MEM_TO_DEV, attrs); + if (!dma_desc) { + dma_unmap_sg(qce->dev, bam_txn->wr_sgl, bam_txn->wr_sgl_cnt, DMA_TO_DEVI= CE); + return -ENOMEM; + } + + qce_desc->dma_desc =3D dma_desc; + cookie =3D dmaengine_submit(qce_desc->dma_desc); + + ret =3D dma_submit_error(cookie); + if (ret) + return ret; + + return 0; +} + +static void qce_prep_dma_cmd_desc(struct qce_device *qce, struct qce_dma_d= ata *dma, + unsigned int addr, void *buf) +{ + struct qce_bam_transaction *bam_txn =3D dma->bam_txn; + struct bam_cmd_element *bam_ce_buf; + int bam_ce_size, cnt, idx; + + idx =3D bam_txn->bam_ce_idx; + bam_ce_buf =3D &bam_txn->bam_ce[idx]; + bam_prep_ce_le32(bam_ce_buf, addr, BAM_WRITE_COMMAND, *((__le32 *)buf)); + + bam_ce_buf =3D &bam_txn->bam_ce[bam_txn->pre_bam_ce_idx]; + bam_txn->bam_ce_idx++; + bam_ce_size =3D (bam_txn->bam_ce_idx - bam_txn->pre_bam_ce_idx) * sizeof(= *bam_ce_buf); + + cnt =3D bam_txn->wr_sgl_cnt; + + sg_set_buf(&bam_txn->wr_sgl[cnt], bam_ce_buf, bam_ce_size); + + ++bam_txn->wr_sgl_cnt; + bam_txn->pre_bam_ce_idx =3D bam_txn->bam_ce_idx; +} + +void qce_write_dma(struct qce_device *qce, unsigned int offset, u32 val) +{ + unsigned int reg_addr =3D ((unsigned int)(qce->base_phys) + offset); + + qce_prep_dma_cmd_desc(qce, &qce->dma, reg_addr, &val); +} =20 int devm_qce_dma_request(struct qce_device *qce) { @@ -31,6 +123,21 @@ int devm_qce_dma_request(struct qce_device *qce) if (!dma->result_buf) return -ENOMEM; =20 + dma->bam_txn =3D devm_kzalloc(dev, sizeof(*dma->bam_txn), GFP_KERNEL); + if (!dma->bam_txn) + return -ENOMEM; + + dma->bam_txn->desc =3D devm_kzalloc(dev, sizeof(*dma->bam_txn->desc), GFP= _KERNEL); + if (!dma->bam_txn->desc) + return -ENOMEM; + + sg_init_table(dma->bam_txn->wr_sgl, QCE_BAM_CMD_SGL_SIZE); + + qce->read_buf =3D dmam_alloc_coherent(qce->dev, QCE_MAX_REG_READ * sizeof= (*qce->read_buf), + &qce->read_buf_dma, GFP_KERNEL); + if (!qce->read_buf) + return -ENOMEM; + return 0; } =20 @@ -90,15 +197,16 @@ int qce_dma_prep_sgs(struct qce_dma_data *dma, struct = scatterlist *rx_sg, { struct dma_chan *rxchan =3D dma->rxchan; struct dma_chan *txchan =3D dma->txchan; - unsigned long flags =3D DMA_PREP_INTERRUPT | DMA_CTRL_ACK; + unsigned long txflags =3D DMA_PREP_INTERRUPT | DMA_CTRL_ACK; + unsigned long rxflags =3D txflags | DMA_PREP_FENCE; int ret; =20 - ret =3D qce_dma_prep_sg(rxchan, rx_sg, rx_nents, flags, DMA_MEM_TO_DEV, + ret =3D qce_dma_prep_sg(rxchan, rx_sg, rx_nents, rxflags, DMA_MEM_TO_DEV, NULL, NULL); if (ret) return ret; =20 - return qce_dma_prep_sg(txchan, tx_sg, tx_nents, flags, DMA_DEV_TO_MEM, + return qce_dma_prep_sg(txchan, tx_sg, tx_nents, txflags, DMA_DEV_TO_MEM, cb, cb_param); } =20 diff --git a/drivers/crypto/qce/dma.h b/drivers/crypto/qce/dma.h index 483789d9fa98e79d1283de8297bf2fc2a773f3a7..f05dfa9e6b25bd60e32f45079a8= bc7e6a4cf81f9 100644 --- a/drivers/crypto/qce/dma.h +++ b/drivers/crypto/qce/dma.h @@ -8,6 +8,7 @@ =20 #include =20 +struct qce_bam_transaction; struct qce_device; =20 /* maximum data transfer block size between BAM and CE */ @@ -32,6 +33,7 @@ struct qce_dma_data { struct dma_chan *txchan; struct dma_chan *rxchan; struct qce_result_dump *result_buf; + struct qce_bam_transaction *bam_txn; }; =20 int devm_qce_dma_request(struct qce_device *qce); @@ -43,5 +45,8 @@ int qce_dma_terminate_all(struct qce_dma_data *dma); struct scatterlist * qce_sgtable_add(struct sg_table *sgt, struct scatterlist *sg_add, unsigned int max_len); +void qce_write_dma(struct qce_device *qce, unsigned int offset, u32 val); +int qce_submit_cmd_desc(struct qce_device *qce); +void qce_clear_bam_transaction(struct qce_device *qce); =20 #endif /* _DMA_H_ */ diff --git a/drivers/crypto/qce/sha.c b/drivers/crypto/qce/sha.c index d7b6d042fb44f4856a6b4f9c901376dd7531454d..f7e1f49b11b9344a5c45a9caddd= 485d3dac91046 100644 --- a/drivers/crypto/qce/sha.c +++ b/drivers/crypto/qce/sha.c @@ -108,6 +108,10 @@ static int qce_ahash_async_req_handle(struct crypto_as= ync_request *async_req) goto error_unmap_src; } =20 + ret =3D qce_start(async_req, tmpl->crypto_alg_type); + if (ret) + goto error_terminate; + ret =3D qce_dma_prep_sgs(&qce->dma, req->src, rctx->src_nents, &rctx->result_sg, 1, qce_ahash_done, async_req); if (ret) @@ -115,10 +119,6 @@ static int qce_ahash_async_req_handle(struct crypto_as= ync_request *async_req) =20 qce_dma_issue_pending(&qce->dma); =20 - ret =3D qce_start(async_req, tmpl->crypto_alg_type); - if (ret) - goto error_terminate; - return 0; =20 error_terminate: diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c index 872b65318233ed21e3559853f6bbdad030a1b81f..a386b407cfb1b1b8d72ff9c2d25= 5476c6327a3c2 100644 --- a/drivers/crypto/qce/skcipher.c +++ b/drivers/crypto/qce/skcipher.c @@ -141,6 +141,10 @@ qce_skcipher_async_req_handle(struct crypto_async_requ= est *async_req) src_nents =3D dst_nents - 1; } =20 + ret =3D qce_start(async_req, tmpl->crypto_alg_type); + if (ret) + goto error_terminate; + ret =3D qce_dma_prep_sgs(&qce->dma, rctx->src_sg, src_nents, rctx->dst_sg, dst_nents, qce_skcipher_done, async_req); @@ -149,10 +153,6 @@ qce_skcipher_async_req_handle(struct crypto_async_requ= est *async_req) =20 qce_dma_issue_pending(&qce->dma); =20 - ret =3D qce_start(async_req, tmpl->crypto_alg_type); - if (ret) - goto error_terminate; - return 0; =20 error_terminate: --=20 2.47.3