Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp1183311pxf; Fri, 19 Mar 2021 00:34:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDHO07pzCq3XfHpo4wqACCk3El0sDQQxYNMTYSs3Ae1U7xMudz44bTQW1PMhxZz/N3WDpm X-Received: by 2002:a17:906:68c5:: with SMTP id y5mr2853145ejr.371.1616139255575; Fri, 19 Mar 2021 00:34:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616139255; cv=none; d=google.com; s=arc-20160816; b=Gj2tcUCCbkj05/8NDg/0v02COxsl055M6NBBR8XPcXjvaMg5Uw3s/zOOc++mbwzKb9 5jxnduqp/e/pFeY4LT+t8D585iV4yqcwbvfkQPxzzXxWAMAMtX5lYD06ILACRFJCh94K mueHpEnQmoATzk3NXku/o7XX42zkbWtoWm7tw9xMCqduQDZDvK8WYnQNRg+Qo2m5v6cy K7EjcOa8HaMSWUYYg9snFnu5idF80j88fB7Qf3yPn/7v+IuSSGi/Foba9D7aoOQH+QzV 7oRil8dFD2NuPyES627fB8gMvCLyP7lGw4f6OuqF1ml260hjzYVhv7/DEOfehub6MqEg ys5g== 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=B+EHXsfgD0i+Z0tfz9Ve0HC/DEhkOb5GamFqHbre1BE=; b=Ql3cU43jGaM1bQtdgWWUvSZSdWxmBFMuoS4a9jtdODIZjQqp65aefbfbZYulx6vJsx 22O7LuLeWNpBV2DbVkjc7Qfw6UCHNtT02ag32gwg2sYrLqbLZyODuuby+Pe1wrmjhshc ZLC71GBIS1gfs4bSmFIhnzrU4TehaVDx8L9sHNd5ZP7Nzkm9Uby5k/uYNH0zI7qwvdUo 6h8UMPEJQls+oiJkfDzIhyC68pUaWKK4s94hkXCWWWaQJ58vH8Yu+oC4hN5GPwGoVVmu e7842CSGIgZJKJ/tMZt5SkKA5VquojfrVAbxytJtpmVc/8zj68zVZUXZcYTJRPqIZfFT rz9g== 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 h18si3679320eje.178.2021.03.19.00.33.42; Fri, 19 Mar 2021 00:34:15 -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 S234018AbhCSHdJ (ORCPT + 99 others); Fri, 19 Mar 2021 03:33:09 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:13995 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234076AbhCSHcw (ORCPT ); Fri, 19 Mar 2021 03:32:52 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4F1wY96XCTzrYJk; Fri, 19 Mar 2021 15:30:53 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.498.0; Fri, 19 Mar 2021 15:32:39 +0800 From: Yang Shen To: , CC: , , Subject: [PATCH 2/4] crypto: hisilicon/zip - add comments for 'hisi_zip_sqe' Date: Fri, 19 Mar 2021 15:33:05 +0800 Message-ID: <1616139187-63425-3-git-send-email-shenyang39@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1616139187-63425-1-git-send-email-shenyang39@huawei.com> References: <1616139187-63425-1-git-send-email-shenyang39@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.69.192.56] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Some fields of 'hisi_zip_sqe' are unused, and some fields have misc utilities. So add comments for used fields and make others unnamed. Signed-off-by: Yang Shen --- drivers/crypto/hisilicon/zip/zip.h | 45 ++++++++++++++++++++++--------- drivers/crypto/hisilicon/zip/zip_crypto.c | 4 +-- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/drivers/crypto/hisilicon/zip/zip.h b/drivers/crypto/hisilicon/zip/zip.h index 9ed7461..b4d3e03 100644 --- a/drivers/crypto/hisilicon/zip/zip.h +++ b/drivers/crypto/hisilicon/zip/zip.h @@ -33,31 +33,50 @@ struct hisi_zip_sqe { u32 consumed; u32 produced; u32 comp_data_length; + /* + * status: 0~7 bits + * rsvd: 8~31 bits + */ u32 dw3; u32 input_data_length; - u32 lba_l; - u32 lba_h; + u32 dw5; + u32 dw6; + /* + * in_sge_data_offset: 0~23 bits + * rsvd: 24~27 bits + * sqe_type: 29~31 bits + */ u32 dw7; + /* + * out_sge_data_offset: 0~23 bits + * rsvd: 24~31 bits + */ u32 dw8; + /* + * request_type: 0~7 bits + * buffer_type: 8~11 bits + * rsvd: 13~31 bits + */ u32 dw9; u32 dw10; - u32 priv_info; + u32 dw11; u32 dw12; - u32 tag; + /* tag: in sqe type 0 */ + u32 dw13; u32 dest_avail_out; - u32 rsvd0; - u32 comp_head_addr_l; - u32 comp_head_addr_h; + u32 dw15; + u32 dw16; + u32 dw17; u32 source_addr_l; u32 source_addr_h; u32 dest_addr_l; u32 dest_addr_h; - u32 stream_ctx_addr_l; - u32 stream_ctx_addr_h; - u32 cipher_key1_addr_l; - u32 cipher_key1_addr_h; - u32 cipher_key2_addr_l; - u32 cipher_key2_addr_h; + u32 dw22; + u32 dw23; + u32 dw24; + u32 dw25; + u32 dw26; + u32 dw27; u32 rsvd1[4]; }; diff --git a/drivers/crypto/hisilicon/zip/zip_crypto.c b/drivers/crypto/hisilicon/zip/zip_crypto.c index 989b273..3bc2148 100644 --- a/drivers/crypto/hisilicon/zip/zip_crypto.c +++ b/drivers/crypto/hisilicon/zip/zip_crypto.c @@ -253,7 +253,7 @@ static void hisi_zip_config_buf_type(struct hisi_zip_sqe *sqe, u8 buf_type) static void hisi_zip_config_tag(struct hisi_zip_sqe *sqe, u32 tag) { - sqe->tag = tag; + sqe->dw13 = tag; } static void hisi_zip_fill_sqe(struct hisi_zip_sqe *sqe, u8 req_type, @@ -339,7 +339,7 @@ static void hisi_zip_acomp_cb(struct hisi_qp *qp, void *data) struct hisi_zip_req_q *req_q = &qp_ctx->req_q; struct device *dev = &qp->qm->pdev->dev; struct hisi_zip_sqe *sqe = data; - struct hisi_zip_req *req = req_q->q + sqe->tag; + struct hisi_zip_req *req = req_q->q + sqe->dw13; struct acomp_req *acomp_req = req->req; u32 status, dlen, head_size; int err = 0; -- 2.7.4