From patchwork Fri Mar 1 13:29:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Romanov X-Patchwork-Id: 208832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp1077856dyb; Fri, 1 Mar 2024 05:32:03 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV1K8zQHz7fyuna1PzJZv+h6MQs/2adOu5lodkTdTIOJGqUzKUwS1mVxdV7XfbnV/I/0zXRE3s9jri+VCVSfvQ0Zsh0JA== X-Google-Smtp-Source: AGHT+IEib4ySmHZRUkub/4H9xULV3N7i+5dl0c7YfaarJjFF34SfSDtSgkw97tN8kAxPO9rBCr44 X-Received: by 2002:a05:622a:194:b0:42e:6783:a491 with SMTP id s20-20020a05622a019400b0042e6783a491mr7301242qtw.20.1709299923584; Fri, 01 Mar 2024 05:32:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709299923; cv=pass; d=google.com; s=arc-20160816; b=ikoQwXL7hW3XKihKkmW86QL9Aw7hbhTfAYTRj6EkMg5LWE3UFLUQSFX1IWa4r3PcyE /glE0FQrH5+jSZ3po91K7JAWyxSKZSCQZ5/NRFeYzA05hHoHxm9VTJF/TN9+QjCTXWMv b96Kekv+4RJmH9ti6KaKMXb/3KWNFbep5+d9OmBHyUKJ8UWtCJfr4KQOQijag7gRi8bK wo6LtoVKCBwZ5bs+MSGoqCQAY7ELot5u+YsdR0cWIO2WLJci2WJxMg12zeNzVUJoVGy1 ZOvcR3nLj7q6ahhvCtJ2ktOynzkjdwl22GKj1cDumTVMVOHfPj+9D9rhY9RU85+3QbKI 1pBw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature:dkim-filter; bh=9zIWsUydBL7tocbVzP03cEfRk3yKoN/Y4c2Hode3oFA=; fh=7+QqR+U+m0B5ryyywou1kgMZVOfT/GgVHz0ZH2Lvlxg=; b=s+0DcKmVmEnU4/Lj/kwM1i/u/fx7nsNq3NdmfxVmGaccMHNhWkwbWDzh6vJaZqjYwS oGyDk3zlm8qSxduui6EuRxid4pHd6H5VyJpHcDAehWyfMDCg34QLp8KYMbIzq38ymbUj Y0FReu7vG7a+u8OHGa15Yv0DfLr82PAr18AS81NoeqJyPC/ZbDCuQaw0coxc3Z5fwjVA qJ8YtXMDv59rVGIM7y6LoOvAGZO7FNX71q8ou8JlqigXcjsF4TsGiazdJpB7jjdzfkcI vhcFcq/ZnVrvq561q/HP7Dcs7HjM6HOvcPI6sJdeRg488LZ40iG3tzXQBjK6wWcuEm19 SNsA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=NckxPRrG; arc=pass (i=1 spf=pass spfdomain=salutedevices.com dkim=pass dkdomain=salutedevices.com dmarc=pass fromdomain=salutedevices.com); spf=pass (google.com: domain of linux-kernel+bounces-88469-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88469-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=salutedevices.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id j21-20020ac85c55000000b0042eb74abec7si3721516qtj.91.2024.03.01.05.32.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 05:32:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-88469-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=NckxPRrG; arc=pass (i=1 spf=pass spfdomain=salutedevices.com dkim=pass dkdomain=salutedevices.com dmarc=pass fromdomain=salutedevices.com); spf=pass (google.com: domain of linux-kernel+bounces-88469-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88469-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=salutedevices.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id DD4D21C232F2 for ; Fri, 1 Mar 2024 13:31:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5793670CCC; Fri, 1 Mar 2024 13:30:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="NckxPRrG" Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) (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 32C576D1A4; Fri, 1 Mar 2024 13:30:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.89.224.132 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709299813; cv=none; b=L8rYs/IeiNeOYt0lFu+l+GGAtZhzDL7WvVfdCHvjRE7hKCWsY3h93f5MgaktGeOquX7c3klP7eAhwS82+r5Cv+np0dh59XuxKdCbvFfUYQ8AqkaISkZEUKSb+v6kiQESoOvJPng64koHop5j6LwRLbQkZydnebuIBLXbJjxrXSs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709299813; c=relaxed/simple; bh=jLuAcRrYyDtgk/MaiQyfY0M8YWI+fEK9m6M9OffAH4A=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ETzHZSCtk+Tj7ah3KhAHYOfUDjH3e/zJCf62kbhRXakQLn1fnWt0zcyaHwGLBw000Z+BtAATRqWlTvIR17HOrZvxHtR+V6Sqll00arQPo1i5akAxQrJC5N2Wnhj4w6mrBrbiYrons1RQG0txTkToQx2VeCZKxWXa4khAvPqK5Ro= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com; spf=pass smtp.mailfrom=salutedevices.com; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b=NckxPRrG; arc=none smtp.client-ip=45.89.224.132 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=salutedevices.com Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 3B75A1200EB; Fri, 1 Mar 2024 16:30:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 3B75A1200EB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1709299809; bh=9zIWsUydBL7tocbVzP03cEfRk3yKoN/Y4c2Hode3oFA=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=NckxPRrGPwP7y0GJApuJtYb6cREtGcrpegEG6nwN73FTIhRYHNT1IjeEwuLrDwF9s P4GIsneagIhsnPaPu7V3JPTfWt8p8iYzALMIgplqr7xK5yl4vSHrdsWKzoKQ3xK94K +4l51wsIEqeurOeWJ+XwCBeHlX+3CVtwqIO38PK7dwP1Wk9iAut4MSDOb+X6bxG2iJ 4Qsm0pmEb3SjUushNFa3JCPlCdw4kggVA2WC9lDmOj2iia3cGWYxGXUEDrgynNrBXl cdNCFlgtfd44a3D7/Y4MyvqeisCnN60RAI1LSnHBq3jy9ejapiq3DATyfCcmL+80sw I77zv93Z2Wc/Q== Received: from smtp.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Fri, 1 Mar 2024 16:30:09 +0300 (MSK) Received: from user-A520M-DS3H.sigma.sbrf.ru (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Fri, 1 Mar 2024 16:30:07 +0300 From: Alexey Romanov To: , , , , , , , , , , CC: , , , , , , Alexey Romanov Subject: [PATCH v5 06/21] drivers: crypto: meson: drop status field from meson_flow Date: Fri, 1 Mar 2024 16:29:21 +0300 Message-ID: <20240301132936.621238-7-avromanov@salutedevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240301132936.621238-1-avromanov@salutedevices.com> References: <20240301132936.621238-1-avromanov@salutedevices.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 183875 [Feb 29 2024] X-KSMG-AntiSpam-Version: 6.1.0.3 X-KSMG-AntiSpam-Envelope-From: avromanov@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 7 0.3.7 6d6bf5bd8eea7373134f756a2fd73e9456bb7d1a, {Tracking_from_domain_doesnt_match_to}, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2024/02/29 19:21:00 #23899999 X-KSMG-AntiVirus-Status: Clean, skipped X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792330876933565401 X-GMAIL-MSGID: 1792330876933565401 This field is used only to check for timeout. But there is more convenient way to achive the same goal. Signed-off-by: Alexey Romanov Reviewed-by: Neil Armstrong --- drivers/crypto/amlogic/amlogic-gxl-cipher.c | 13 +++++++++---- drivers/crypto/amlogic/amlogic-gxl-core.c | 1 - drivers/crypto/amlogic/amlogic-gxl.h | 2 -- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c index 18e9e2d39b1f..dc0b100c5de2 100644 --- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c +++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c @@ -219,13 +219,18 @@ static int meson_cipher(struct skcipher_request *areq) } reinit_completion(&mc->chanlist[flow].complete); - mc->chanlist[flow].status = 0; meson_dma_start(mc, flow); - wait_for_completion_interruptible_timeout(&mc->chanlist[flow].complete, - msecs_to_jiffies(500)); - if (mc->chanlist[flow].status == 0) { + + err = wait_for_completion_interruptible_timeout(&mc->chanlist[flow].complete, + msecs_to_jiffies(500)); + if (err == 0) { dev_err(mc->dev, "DMA timeout for flow %d\n", flow); err = -EINVAL; + } else if (err < 0) { + dev_err(mc->dev, "Waiting for DMA completion is failed (%d)\n", err); + } else { + /* No error */ + err = 0; } dma_unmap_single(mc->dev, phykeyiv, keyivlen, DMA_TO_DEVICE); diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c index 467468a8a05e..882482438ba2 100644 --- a/drivers/crypto/amlogic/amlogic-gxl-core.c +++ b/drivers/crypto/amlogic/amlogic-gxl-core.c @@ -54,7 +54,6 @@ static irqreturn_t meson_irq_handler(int irq, void *data) for (flow = 0; flow < mc->flow_cnt; flow++) { if (mc->chanlist[flow].irq == irq) { if (meson_dma_ready(mc, flow)) { - mc->chanlist[flow].status = 1; complete(&mc->chanlist[flow].complete); return IRQ_HANDLED; } diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h index dc54bd533a2d..4d60a0cc2dca 100644 --- a/drivers/crypto/amlogic/amlogic-gxl.h +++ b/drivers/crypto/amlogic/amlogic-gxl.h @@ -59,7 +59,6 @@ struct meson_desc { * @engine: ptr to the crypto_engine for this flow * @keylen: keylen for this flow operation * @complete: completion for the current task on this flow - * @status: set to 1 by interrupt if task is done * @irq: IRQ number for amlogic-crypto * @t_phy: Physical address of task * @tl: pointer to the current ce_task for this flow @@ -68,7 +67,6 @@ struct meson_desc { struct meson_flow { struct crypto_engine *engine; struct completion complete; - int status; int irq; unsigned int keylen; dma_addr_t t_phy;