Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp3743931pxb; Mon, 27 Sep 2021 01:19:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVtNHOM3cGXde6m0e/CfOwIYnmDm7YXtBvUziA81/T0w8JKf9HLOGEHIrnON1dcOlytm3B X-Received: by 2002:aa7:d78e:: with SMTP id s14mr21264651edq.171.1632730743530; Mon, 27 Sep 2021 01:19:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632730743; cv=none; d=google.com; s=arc-20160816; b=KBCdc3uRrO/1u/FPhvSxSajLe1SDByoZMdIKMv1jA2kDyHMyO0yNU5GFyh4UeMbYQv VQ+izKN1LI1UtWi7qo8qnhB2Q5EBc5inF/nkpUddSnYSFMs6rpY0QPKIFkMb7MQcxOjn 5Q3E+gWPu4ssQL7Z6hpnB9g1CCQq6+ZKarOpxM1shipqQxzO9Q0t02yywrd02d0lDI6t fs+rq1vtZXhl0VFAJ6jfJcf3olxCHm+rrWe7Mw6YPx7JZEbmZMdgIiKLVO++vTwUuQ6w cblzA0ZFgUQ4Dq4Vo49u/kdlpv+Ij+C9Nz292pagupm1oXKkFDtPsQvfl23RRqbnJ2oG yjsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=3Rc0ac8qFtjTyz+Ixd5JqwgTWnTaq9W7jhcqAXs1FH4=; b=a4UKV/dY9wt7dhpaivf5ydYXKpKxjQg/1lPLk5taKhJ7q5Q1R4Da06+935wBa0pdKX 9TgD00XSWuJSb2vnuzVp7UnbS+CV/ewY/8IaeTrC0CfgAReREholUuz/+SiTLOiYcjyY JBI94UjEMK4EePFtwiEACcTrSlpPVzejSdnxN4YCBOo2+z260ytl+ONflO3xaZZha9tw V7sf1nQN28Xmu00ioxOENPSgNhl1M52xosw2n2FZglU/+zK5drlsnemCBX76r/L6VbNE R6tZZRhWKF4Yyjhlc9PqGGY/Sa99ppI1VUUBaYIw4KbD5uZ/7l0T4hlzHdhQofVouAUt bdAQ== 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 z9si16926197edp.633.2021.09.27.01.18.35; Mon, 27 Sep 2021 01:19:03 -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 S233433AbhI0IUI (ORCPT + 99 others); Mon, 27 Sep 2021 04:20:08 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:25922 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233449AbhI0IUH (ORCPT ); Mon, 27 Sep 2021 04:20:07 -0400 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4HHwQY29r7zbmqQ; Mon, 27 Sep 2021 16:14:13 +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.2308.8; Mon, 27 Sep 2021 16:18:28 +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.2308.8; Mon, 27 Sep 2021 16:18:28 +0800 From: Kai Ye To: CC: , , , Subject: [PATCH] crypto: hisilicon/qm - modify the uacce mode check Date: Mon, 27 Sep 2021 16:16:55 +0800 Message-ID: <20210927081655.14242-1-yekai13@huawei.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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 As qm should register to uacce in UACCE_DEV_SVA mode, this patch modifies to checks uacce mode before doing uacce registration. Signed-off-by: Kai Ye --- drivers/crypto/hisilicon/qm.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index 9f97042efefc..b288c0b57615 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -3045,7 +3045,7 @@ static int qm_alloc_uacce(struct hisi_qm *qm) if (IS_ERR(uacce)) return PTR_ERR(uacce); - if (uacce->flags & UACCE_DEV_SVA && qm->mode == UACCE_MODE_SVA) { + if (uacce->flags & UACCE_DEV_SVA) { qm->use_sva = true; } else { /* only consider sva case */ @@ -3316,8 +3316,10 @@ void hisi_qm_uninit(struct hisi_qm *qm) qm_irq_unregister(qm); hisi_qm_pci_uninit(qm); - uacce_remove(qm->uacce); - qm->uacce = NULL; + if (qm->use_sva) { + uacce_remove(qm->uacce); + qm->uacce = NULL; + } up_write(&qm->qps_lock); } @@ -5701,9 +5703,11 @@ int hisi_qm_init(struct hisi_qm *qm) goto err_irq_register; } - ret = qm_alloc_uacce(qm); - if (ret < 0) - dev_warn(dev, "fail to alloc uacce (%d)\n", ret); + if (qm->mode == UACCE_MODE_SVA) { + ret = qm_alloc_uacce(qm); + if (ret < 0) + dev_warn(dev, "fail to alloc uacce (%d)\n", ret); + } ret = hisi_qm_memory_init(qm); if (ret) @@ -5716,8 +5720,10 @@ int hisi_qm_init(struct hisi_qm *qm) return 0; err_alloc_uacce: - uacce_remove(qm->uacce); - qm->uacce = NULL; + if (qm->use_sva) { + uacce_remove(qm->uacce); + qm->uacce = NULL; + } err_irq_register: qm_irq_unregister(qm); err_pci_init: -- 2.33.0