From patchwork Thu Jan 13 09:29:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Taihsiang Ho (tai271828)" X-Patchwork-Id: 1579522 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=PCcSYTDj; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JZK011Pjgz9s1l for ; Thu, 13 Jan 2022 20:29:51 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1n7wQS-00079E-0G; Thu, 13 Jan 2022 09:29:44 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1n7wQP-00078S-7T for kernel-team@lists.ubuntu.com; Thu, 13 Jan 2022 09:29:41 +0000 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 1558E3F198 for ; Thu, 13 Jan 2022 09:29:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1642066181; bh=842YH629V6/5oSPajsvHgyiKmmvIfvkjPLrbQ0KJ6H4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PCcSYTDjisOpRfTX6Owle49/N6ZAxmSCreDqlzrnrNOP7zvCZGnnaJ/6unrpOkkzW p92TZUIaZYC3uqoQLmk1DEBjH+VCGlc3rkMiuM26bo5ijYwIOPTzdk213flzKOZaBD yoKlTB5C/ddTf9u9r1B2keGEschevo/3BS3KFY6pboyIO+dJ8hEP0ZEL5jdelugKdV Bd8frlUJlDZy0/DEMOs18nKTbznxV2Qz3ye7s98qKJJk2FS2oYottYpnkZr/OjHkr8 zpRgjLANvhywJ+j7/gWscZ8rTsZ3S7VR4qwi/mkfUulq3bPyg+5LKv5I2dAaKK7Bkb 3u11VkGb7qljA== Received: by mail-ed1-f71.google.com with SMTP id i9-20020a05640242c900b003fe97faab62so4783263edc.9 for ; Thu, 13 Jan 2022 01:29:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=842YH629V6/5oSPajsvHgyiKmmvIfvkjPLrbQ0KJ6H4=; b=6hueXClYKODTA6qt7e06wuJbRnLMVB5XcMMxqYbgp72fKg8jg04fERHRmhU0+UsorQ PfZT04dhZR/W77HkesjZpGdjkU6bw0wPnSUeL398CCuVKORzzM/SWWNwQhpDut7dsMPz iCFV0l0K9DdMrsesi8cVMV0dihm6gggmKMq+gBHHAeyi/Qw6+34voRerGMKuOv+gi+1j 9cxjCU8E6Yo/xJBvpb/ldazBsGlIheV6pGNoZbo4RB7AqO9ObmRi+YxS6DzCIq++YJaX LHB4ygha7JQllL8ly9aWvPZe5fGdfBvPPmjHczdQrft6/FyQ0MQTCTE5jQztIr2yuzRC nFSg== X-Gm-Message-State: AOAM532xJOdzt1VIW3XBQ49U9VWtc8cQX1jb9jFJ/DvPBgar9EmTpjdk vM0vgqd+VxxB+PkMl/196NfVb0/6e6rR6p+4AfLfZzV+kB1LLDcpHmb7kdbjmbe0qUqksOz+bs2 XN1/NXJvHTutxy9xJx/Wkh3TbraThdTXDKn9bzyytmQ== X-Received: by 2002:a17:906:649a:: with SMTP id e26mr2816431ejm.429.1642066180503; Thu, 13 Jan 2022 01:29:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJxKYyvgkOAyRCmqndC1BKg8TYHeVXKJ7y9h4Jcv+8PbLo5IpzXBxvFgmcYuihn8MbrG497vHA== X-Received: by 2002:a17:906:649a:: with SMTP id e26mr2816426ejm.429.1642066180331; Thu, 13 Jan 2022 01:29:40 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c540]) by smtp.gmail.com with ESMTPSA id qf18sm674808ejc.124.2022.01.13.01.29.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jan 2022 01:29:39 -0800 (PST) From: "Taihsiang Ho (tai271828)" To: kernel-team@lists.ubuntu.com Subject: [SRU][I][J][PATCH 1/1][V2] crypto: hisilicon/qm - modify the uacce mode check Date: Thu, 13 Jan 2022 10:29:29 +0100 Message-Id: <20220113092929.10920-2-taihsiang.ho@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113092929.10920-1-taihsiang.ho@canonical.com> References: <20220113092929.10920-1-taihsiang.ho@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Kai Ye BugLink: https://bugs.launchpad.net/bugs/1933301 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 Signed-off-by: Herbert Xu (cherry picked from commit 183b60e005975d3c84c22199ca64a9221e620fb6) Signed-off-by: Taihsiang Ho (tai271828) --- 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 ce439a0c66c9..5c750922fdb6 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -2358,7 +2358,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 */ @@ -2653,8 +2653,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); } @@ -4418,9 +4420,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) @@ -4435,8 +4439,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: