Received: by 2002:ab2:3141:0:b0:1ed:23cc:44d1 with SMTP id i1csp289400lqg; Fri, 1 Mar 2024 05:31:34 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUn1MIH4iZgdeAzxvojHr2S0J6rCPsYL0obiZ7i5Dajd6IuYco7+UHRa+I34NAV6iOnZPXqT8qBXytmuZesvy2O8USgVS2wVCN2X9SyRw== X-Google-Smtp-Source: AGHT+IFnTe0ZIK4fiT6i+WbwFksuBSfAqC5j1X+OR3S6Chux6XLGoQMSoCW8fS4xPcJhg316V63a X-Received: by 2002:a17:906:6d1:b0:a44:99ee:c443 with SMTP id v17-20020a17090606d100b00a4499eec443mr931817ejb.14.1709299893897; Fri, 01 Mar 2024 05:31:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709299893; cv=pass; d=google.com; s=arc-20160816; b=qb+b2qLdLwXs3/1FmGpHEFJzwfVVerXGEW5my4gvHC9oj3X+PDyB1G2hflidgTi7Lu q/4pQBsVgwtTYhGlP1/RG+00cQDGzTUpRn6oXGd5b7pRFOWrJwHFEbWqsGGakMaDD6hE CLKb0VY6YJaXsxpfqGOGgD0/OZ5j8WLfA2qYoxAuCjK5aNZF1pdsp19ZRopAkCxErDBf z+svqm11PNdSJv/z4p3lwb6sG0GR/CxJPwZlDisenx1lTHgDaJd5k1T1H0aTclOEOdet M2hcYrbjrh35GrqCxpz9Hmv0kPmzuMc+VXzvRF4OfxFJHDN48k2Ui3cv1gqlYmglo1Kz 7R5A== 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=vnLiTkGUt6ZVR81n0z24N9mJLxmAWvIfkLqmfb9IF4s=; fh=7+QqR+U+m0B5ryyywou1kgMZVOfT/GgVHz0ZH2Lvlxg=; b=AY6dQb/M97pf4NyNy+BIM2R4GPLtLT8QMcJNQP5ho5+8KhLMrB+Hd1rkN9X2Wak/i1 C8gkFehDUXslF/MTAV4HTg3/Ojr0IIHOC1n5c21oHxfbhLTPhUXU6VBtUt0V79Sqoz3V 09RG4Fm63p2Di5qxrkzQu1+/9waX1G0US9O7LAuQIY0AmAmO92Y/XKoJa9V+r6l3C+d+ DbXJZEJxJrLB9Dp9638yVV4OqcJEu50DNOIZolDf/nAn7IiuopfhdmJoTx1RMqFE2d2V 0amD65RXJq1fHFCcCZiBNpUI6e6y8v74zL3cUtEAuyfXSZE17GtAJXP4vhPe/yjFt/50 6DbA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=oWK3UAjE; 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-crypto+bounces-2433-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-crypto+bounces-2433-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=salutedevices.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id g25-20020a17090613d900b00a4425e2c2a5si1430928ejc.298.2024.03.01.05.31.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 05:31:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-crypto+bounces-2433-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=oWK3UAjE; 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-crypto+bounces-2433-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-crypto+bounces-2433-linux.lists.archive=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 am.mirrors.kernel.org (Postfix) with ESMTPS id 713581F23355 for ; Fri, 1 Mar 2024 13:31:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B14A570CA2; Fri, 1 Mar 2024 13:30:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="oWK3UAjE" X-Original-To: linux-crypto@vger.kernel.org Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) (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 8B1BF6EEF9; Fri, 1 Mar 2024 13:30:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=37.18.73.165 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709299815; cv=none; b=VZhrQswEiTVj4bWxPUS3zmRFzZJFDsdNeJEEcsdEszFkW1mz3cejQMQIwedXONNa0fx5cj6qdBxclZFlRPJMGs2hX69Gk1ACnkOR+ABZ4seweQ+wADzr9JztX0p47p9ZaIzXrnM5yvOv20j9apG1EjJDBx9nS7Bg5ucl8tEKXW8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709299815; c=relaxed/simple; bh=itW3zc1Au9gOrT+clWgE9czbBBJd8sNqwoxOtvPtCRo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tkne14w2qNLMcv56rfl93qZiC2+i/vHbBdb3eeC5xRmnDKpmfue0N3aTJ7wV2DEmOmSQJNCpelH6Wmcm0CNv3yWIt2vwET/EizS/u/N6PZRMsZsnO/nDLJRkH5462SA8HvS7RKjV67r9Ht3FeHnGOg/EtDqMS61Ub1+YJDJH0PE= 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=oWK3UAjE; arc=none smtp.client-ip=37.18.73.165 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-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id C478A1000E2; Fri, 1 Mar 2024 16:30:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru C478A1000E2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1709299805; bh=vnLiTkGUt6ZVR81n0z24N9mJLxmAWvIfkLqmfb9IF4s=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=oWK3UAjEsaPd18f3yPAy3wDnGwUcjkXRyBmZBlkYwTBjq1rQwmO7bsMcxC1eoP7U5 eUGvtCHARVT9UAtWnXcxNRLzE/BagT2q0UFdE4zqolPk5De3bNHka+CmSFGhE5R6aq 0xejryk4EFVfmd1pilBJ61L4kTF0pOpovStsNr1iJsxxoNnKZkoEe7x1IKgbSTVea+ kZKwabs+CAGVzfnJd+FpGu1sZFYitv+pQTz5lF8qlOyA5xGGAcjRqoKRZo8RG3dzYF Sa00PPdBiS/ofUKr9gDqcpIEHc8czx/CTHF8++E5V7cuGU6gtIb2fQg8+t67AdlmaR lMxEmww2vjw5g== 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:05 +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:05 +0300 From: Alexey Romanov To: , , , , , , , , , , CC: , , , , , , Alexey Romanov Subject: [PATCH v5 04/21] drivers: crypto: meson: add MMIO helpers Date: Fri, 1 Mar 2024 16:29:19 +0300 Message-ID: <20240301132936.621238-5-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-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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 Add MMIO access helpers: meson_dma_start() and meson_dma_ready(). Signed-off-by: Alexey Romanov Reviewed-by: Neil Armstrong --- drivers/crypto/amlogic/amlogic-gxl-cipher.c | 2 +- drivers/crypto/amlogic/amlogic-gxl-core.c | 24 ++++++++++++++++----- drivers/crypto/amlogic/amlogic-gxl.h | 2 ++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c index 7eff3ae7356f..1fe916b0a138 100644 --- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c +++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c @@ -225,7 +225,7 @@ static int meson_cipher(struct skcipher_request *areq) reinit_completion(&mc->chanlist[flow].complete); mc->chanlist[flow].status = 0; - writel(mc->chanlist[flow].t_phy | 2, mc->base + ((mc->pdata->descs_reg + flow) << 2)); + meson_dma_start(mc, flow); wait_for_completion_interruptible_timeout(&mc->chanlist[flow].complete, msecs_to_jiffies(500)); if (mc->chanlist[flow].status == 0) { diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c index a3a69a59f476..70c2433c56da 100644 --- a/drivers/crypto/amlogic/amlogic-gxl-core.c +++ b/drivers/crypto/amlogic/amlogic-gxl-core.c @@ -23,18 +23,32 @@ #include "amlogic-gxl.h" +void meson_dma_start(struct meson_dev *mc, int flow) +{ + u32 offset = (mc->pdata->descs_reg + flow) << 2; + + writel(mc->chanlist[flow].t_phy | 2, mc->base + offset); +} + +static bool meson_dma_ready(struct meson_dev *mc, int flow) +{ + u32 offset = (mc->pdata->status_reg + flow) << 2; + u32 data = readl(mc->base + offset); + + if (data) + writel_relaxed(0xF, mc->base + offset); + + return data; +} + static irqreturn_t meson_irq_handler(int irq, void *data) { struct meson_dev *mc = (struct meson_dev *)data; int flow; - u32 p; for (flow = 0; flow < mc->flow_cnt; flow++) { if (mc->chanlist[flow].irq == irq) { - p = readl(mc->base + ((mc->pdata->status_reg + flow) << 2)); - if (p) { - writel_relaxed(0xF, mc->base + - ((mc->pdata->status_reg + flow) << 2)); + 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 9ad75da214ff..8670f7ebcdda 100644 --- a/drivers/crypto/amlogic/amlogic-gxl.h +++ b/drivers/crypto/amlogic/amlogic-gxl.h @@ -161,6 +161,8 @@ struct meson_alg_template { #endif }; +void meson_dma_start(struct meson_dev *mc, int flow); + int meson_enqueue(struct crypto_async_request *areq, u32 type); int meson_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, -- 2.34.1