Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp409432pxj; Fri, 11 Jun 2021 02:08:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxp7fr2tvRk0PNPv0uv/W6mUUnH+KIetBO9196vA3V2NoXMR46+hpdj6M1BGNPeMkfVB0iM X-Received: by 2002:aa7:ce03:: with SMTP id d3mr2599739edv.360.1623402491206; Fri, 11 Jun 2021 02:08:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623402491; cv=none; d=google.com; s=arc-20160816; b=PfeDV5K26RSIyPBXbQwVueQznTZgKGJIRseDSNM7nWDy6DBBTSQIhEM3I8zdJOFOx2 9wDNew2Ju8OCxDpFQByUNpL0Q/Am8ppnUqnZFVGIpXagK8Buju5+zdXW32t/FIxruARz 60ypGl1w279JPeJp0ngS+tEs2AlNj69+qLuvAhjUmbncJ7FhMHTVbQ6l2EH/QRUmF40f HDf7saOC/zwPND/+M/g+uAy36VNxcq01853qbwvWD8oUhAbpQNxe9f5RvfRt1L/RVMqO bo1tlaDcjjj2LQaaHZyq7KJc1ZuYZ83OSmxwCgmcdCIkFgFwf2Fz4On/eOJASsaHA/CJ sT6A== 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=BEErJnrGOY0Zf0JQwcO21MIxUadCWJTWteWuY1kMOCs=; b=wPGl4v0ndwjxGRKRTtW7MWmfj7gxse24XfY9wFI5Bjvpt8WmiUZHYWY9feOl+fwTxs wrYiGPceOOdq5ylwmNO2m0MMn9NmbiWxOucC8JJG7YK66q7L172wG2G79VxcnGpEzeqa jQ7ySEYGf30wgr9271rrHGJonadZn6zmakVkLdPMalZIw4g4Pl2zmQosNCU230a7KHqX KhKfSiGdysFEisYK8qec6dxuppG5Eou189Nvb03FOOJiyjjDj1aUST13Ce4XrKGSqjLr DK0xijq/Tph3pGadw0qmZJaAl//Ml0XTEWmubOU1fkY2H1alWLwpjMJZG/9x6O7u8K6T VMDA== 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 f7si4880739edd.502.2021.06.11.02.07.38; Fri, 11 Jun 2021 02:08:11 -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 S231496AbhFKJJR (ORCPT + 99 others); Fri, 11 Jun 2021 05:09:17 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:4034 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231492AbhFKJJI (ORCPT ); Fri, 11 Jun 2021 05:09:08 -0400 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4G1Zbq2QQNzWspr; Fri, 11 Jun 2021 17:02:15 +0800 (CST) Received: from dggpeml500012.china.huawei.com (7.185.36.15) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 11 Jun 2021 17:07:09 +0800 Received: from huawei.com (10.69.192.56) by dggpeml500012.china.huawei.com (7.185.36.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 11 Jun 2021 17:07:09 +0800 From: Kai Ye To: CC: , , , Subject: [PATCH 3/8] crypto: hisilicon/qm - merges the work initialization process into a single function Date: Fri, 11 Jun 2021 17:06:45 +0800 Message-ID: <1623402410-63906-4-git-send-email-yekai13@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1623402410-63906-1-git-send-email-yekai13@huawei.com> References: <1623402410-63906-1-git-send-email-yekai13@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml500012.china.huawei.com (7.185.36.15) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Merges the work initialization process into a single function from qm initialization. Signed-off-by: Kai Ye --- drivers/crypto/hisilicon/qm.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index 171ddbb..9b8e09e 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -5337,6 +5337,16 @@ static int hisi_qm_pci_init(struct hisi_qm *qm) return ret; } +static void hisi_qm_init_work(struct hisi_qm *qm) +{ + INIT_WORK(&qm->work, qm_work_process); + if (qm->fun_type == QM_HW_PF) + INIT_WORK(&qm->rst_work, hisi_qm_controller_reset); + + if (qm->ver > QM_HW_V2) + INIT_WORK(&qm->cmd_process, qm_cmd_process); +} + static int hisi_qp_alloc_memory(struct hisi_qm *qm) { struct device *dev = &qm->pdev->dev; @@ -5452,13 +5462,7 @@ int hisi_qm_init(struct hisi_qm *qm) if (ret) goto err_alloc_uacce; - INIT_WORK(&qm->work, qm_work_process); - if (qm->fun_type == QM_HW_PF) - INIT_WORK(&qm->rst_work, hisi_qm_controller_reset); - - if (qm->ver >= QM_HW_V3) - INIT_WORK(&qm->cmd_process, qm_cmd_process); - + hisi_qm_init_work(qm); qm_cmd_init(qm); atomic_set(&qm->status.flags, QM_INIT); -- 2.7.4