Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2410291pxj; Mon, 10 May 2021 02:10:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztrXZE56DSxci5W/gWbMDg7B6ywlhEccHPSACE7mP8KVQSbXFm97GH1QE9r2c0WQOR5k1d X-Received: by 2002:a02:bb98:: with SMTP id g24mr20389482jan.19.1620637829937; Mon, 10 May 2021 02:10:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620637829; cv=none; d=google.com; s=arc-20160816; b=SWTyOaA/S5IXxZ+28cWhqEOa5KW63GVBeMFO+vQUDpUfWTDqn0V4tb5xDA0//byH91 WVf4Csp0peX7vbN0amYWntC8Jcc2gxBj+6YhYOtjYvRRJh/7G4v+dYGaaaKWfaWX1m32 bNBVYLTf+FGoS9tdPvdTKE2p9yG28B2uWKsWzY+yfddheVLQLXP4hktyP8VpwY2ukIHP uW34Iml5tQhHGOjFUS/Y/MpFxdGTCUT7/scw8+FluWkzbpwkCdGKzK/hiHeWT2S3pHe8 oFxNGCTHbHxR3nT4BZ7+H2XjSjAR/n6K5R0cESNohXJpNdEK7W/4E4B6PXEnITWOPo0b o9OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=cQKA0Bh7GmSCSjIpdz383/uxbR6PlTggelo2HgcgQLc=; b=ixX0mSGpX/sWEaYjRNVqNh4tWbkqBuEk3VzVELsNGymvPq1OSdMZmoTin+j1MrIYWE 5SLVCBCCdwosqWurau85slUCCtrJFpVcGJlIn9+W1epmN6Y0BCgQi9nd8c8hcAe5THWN LdDppGWWwFlnHx2s+7MkXMakKZE2Z55cbX1jCMuqzKwP9fyz027i7nVz77syyB41EDCz qqMfv4IqYXsdrLL3NypiM4KVxk0dPTySx1UnryKoi60ewFg1s9+S8ZJD5VfWYcZb5Sfq 4eR8OBQIeGuk8fTAklmbxYBvupjgLWIOBTixdrExLZWuXmXNdJVML94mLEX8ahOobLZt LESQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a14si15233646iol.90.2021.05.10.02.10.16; Mon, 10 May 2021 02:10:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230245AbhEJJLE (ORCPT + 99 others); Mon, 10 May 2021 05:11:04 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:2746 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230216AbhEJJLC (ORCPT ); Mon, 10 May 2021 05:11:02 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4FdwCZ5ZHzzqV1W; Mon, 10 May 2021 17:06:34 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.498.0; Mon, 10 May 2021 17:09:48 +0800 From: Hui Tang To: , CC: , , , Subject: [PATCH 6/8] crypto: hisilicon/hpre - use 'GENMASK' to generate mask value Date: Mon, 10 May 2021 17:06:49 +0800 Message-ID: <1620637611-41643-7-git-send-email-tanghui20@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1620637611-41643-1-git-send-email-tanghui20@huawei.com> References: <1620637611-41643-1-git-send-email-tanghui20@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.165.24] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Use 'GENMASK' to generate mask value, just make the code clearer. Signed-off-by: Hui Tang --- drivers/crypto/hisilicon/hpre/hpre_crypto.c | 6 +++--- drivers/crypto/hisilicon/hpre/hpre_main.c | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/hisilicon/hpre/hpre_crypto.c b/drivers/crypto/hisilicon/hpre/hpre_crypto.c index 3a3af82..fb8e9c0 100644 --- a/drivers/crypto/hisilicon/hpre/hpre_crypto.c +++ b/drivers/crypto/hisilicon/hpre/hpre_crypto.c @@ -326,9 +326,9 @@ static int hpre_alg_res_post_hf(struct hpre_ctx *ctx, struct hpre_sqe *sqe, #define HPRE_NO_HW_ERR 0 #define HPRE_HW_TASK_DONE 3 -#define HREE_HW_ERR_MASK 0x7ff -#define HREE_SQE_DONE_MASK 0x3 -#define HREE_ALG_TYPE_MASK 0x1f +#define HREE_HW_ERR_MASK GENMASK(10, 0) +#define HREE_SQE_DONE_MASK GENMASK(1, 0) +#define HREE_ALG_TYPE_MASK GENMASK(4, 0) id = (int)le16_to_cpu(sqe->tag); req = ctx->req_list[id]; hpre_rm_req_from_ctx(req); diff --git a/drivers/crypto/hisilicon/hpre/hpre_main.c b/drivers/crypto/hisilicon/hpre/hpre_main.c index 1e7d1fb..b94185a 100644 --- a/drivers/crypto/hisilicon/hpre/hpre_main.c +++ b/drivers/crypto/hisilicon/hpre/hpre_main.c @@ -36,7 +36,7 @@ #define HPRE_INT_MASK 0x301400 #define HPRE_INT_STATUS 0x301800 #define HPRE_CORE_INT_ENABLE 0 -#define HPRE_CORE_INT_DISABLE 0x003fffff +#define HPRE_CORE_INT_DISABLE GENMASK(21, 0) #define HPRE_RDCHN_INI_ST 0x301a00 #define HPRE_CLSTR_BASE 0x302000 #define HPRE_CORE_EN_OFFSET 0x04 @@ -75,6 +75,12 @@ #define HPRE_BD_USR_MASK 0x3 #define HPRE_CLUSTER_CORE_MASK_V2 0xf #define HPRE_CLUSTER_CORE_MASK_V3 0xff +#define HPRE_QM_USR_CFG_MASK GENMASK(31, 1) +#define HPRE_QM_AXI_CFG_MASK GENMASK(15, 0) +#define HPRE_QM_VFG_AX_MASK GENMASK(7, 0) +#define HPRE_BD_USR_MASK GENMASK(1, 0) +#define HPRE_CLUSTER_CORE_MASK_V2 GENMASK(3, 0) +#define HPRE_CLUSTER_CORE_MASK_V3 GENMASK(7, 0) #define HPRE_AM_OOO_SHUTDOWN_ENB 0x301044 #define HPRE_AM_OOO_SHUTDOWN_ENABLE BIT(0) -- 2.8.1