Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1019292pxj; Fri, 21 May 2021 04:43:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvjIjldjUIYphN6tndEMWcgVxBHLtg/przlVCnaLG2ChATGwbAbskfFiRnR6geSlOA6q1z X-Received: by 2002:a17:907:abc:: with SMTP id bz28mr9745918ejc.262.1621597433950; Fri, 21 May 2021 04:43:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621597433; cv=none; d=google.com; s=arc-20160816; b=KJop8wV1K5lti/4s6lTSagsbeZ7PDYi3asRrMlmNmdU4HcZGip6TOc+VPc78T2H3oM M4iWrviC/Algx3ecfyvddQe+JfUdMJjbce+LEikV8HJTkyXniPXu25s7k3Bb0ctfn7Ro bYTTLo3G9Ia7aYNO/D7CZ7+8ULzOBkITgBEZ4ImBTdLBjbwgpGyLsUB0tfm8TynYETjO Dbx2y9MTflAWmBQCwb8YLezO7EN4REAFfExKNKkmKLynC+cZrTF9ddTUufxt/LZLEcFK IQjocehQd7n8fAEFlN/ozeWz80kmE2pfJ8aFJmVAh2E2WrXU/NwfB20ANDv7VfO2Thlk eIGA== 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=H5vuPQpn3WGRBslFrFjUXbyqnNNcK45d8J/Na7zr6Q4=; b=HTznR9VUygOObtFPCFDbXXZOZULpuwbqcKgzuwxNcJUhTDpBxUSuzcTUiyKzOq0XIw UOSXMEkPD+eP1fggbQEDz4+CXKVMyR4Y9QBLo4Shwf6pXnC3JH2HqB/6LjaE9qvBLTm7 Qr+fAlmCALCnnsUqvLtd2UzFZf47IwAzMVjb5kxO9fV1i7jvibH/KflQKiJZ3DPSuDvf WWqC54jSpNlvCbPDPMP3Ed8Luoetl6I/7C3CqqBqH5F9e9nBcSlhTXJRA9IncSQd0dvL ErOQSeMyHSic8Lk03Zatii9jpMDm+8DHQvjiF67F/BmGICSH5qwbgoysClJVPH6pkkiq nzPQ== 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 kl4si743263ejc.648.2021.05.21.04.43.29; Fri, 21 May 2021 04:43:53 -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 S231584AbhEUKCv (ORCPT + 99 others); Fri, 21 May 2021 06:02:51 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:3468 "EHLO szxga07-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232211AbhEUKCW (ORCPT ); Fri, 21 May 2021 06:02:22 -0400 Received: from dggems703-chm.china.huawei.com (unknown [172.30.72.59]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4Fmhr1622czCvSg; Fri, 21 May 2021 17:58:09 +0800 (CST) Received: from dggpeml500012.china.huawei.com (7.185.36.15) by dggems703-chm.china.huawei.com (10.3.19.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 21 May 2021 18:00:52 +0800 Received: from huawei.com (10.67.165.24) 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, 21 May 2021 18:00:52 +0800 From: Kai Ye To: CC: , , , Subject: [PATCH 2/2] crypto: hisilicon/qm - fix the process of VF's list adding Date: Fri, 21 May 2021 17:57:50 +0800 Message-ID: <1621591070-15652-3-git-send-email-yekai13@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1621591070-15652-1-git-send-email-yekai13@huawei.com> References: <1621591070-15652-1-git-send-email-yekai13@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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 If Kunpeng 920 enabled the sva mode, the "qm alg register" process will return directly. So the list of VF wasn't added to QM list. Signed-off-by: Kai Ye --- drivers/crypto/hisilicon/qm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index deb104e..c671f94 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -4256,17 +4256,17 @@ int hisi_qm_alg_register(struct hisi_qm *qm, struct hisi_qm_list *qm_list) int flag = 0; int ret = 0; - if (qm->ver <= QM_HW_V2 && qm->use_sva) { - dev_info(dev, "HW V2 not both use uacce sva mode and hardware crypto algs.\n"); - return 0; - } - mutex_lock(&qm_list->lock); if (list_empty(&qm_list->list)) flag = 1; list_add_tail(&qm->list, &qm_list->list); mutex_unlock(&qm_list->lock); + if (qm->ver <= QM_HW_V2 && qm->use_sva) { + dev_info(dev, "HW V2 not both use uacce sva mode and hardware crypto algs.\n"); + return 0; + } + if (flag) { ret = qm_list->register_to_crypto(qm); if (ret) { @@ -4291,13 +4291,13 @@ EXPORT_SYMBOL_GPL(hisi_qm_alg_register); */ void hisi_qm_alg_unregister(struct hisi_qm *qm, struct hisi_qm_list *qm_list) { - if (qm->ver <= QM_HW_V2 && qm->use_sva) - return; - mutex_lock(&qm_list->lock); list_del(&qm->list); mutex_unlock(&qm_list->lock); + if (qm->ver <= QM_HW_V2 && qm->use_sva) + return; + if (list_empty(&qm_list->list)) qm_list->unregister_from_crypto(qm); } -- 2.8.1