Received: by 2002:ab2:3350:0:b0:1f4:6588:b3a7 with SMTP id o16csp735075lqe; Sun, 7 Apr 2024 01:05:35 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVx2edTeyeEO57kvNKc5ObprK8I/N5yiXTTO2p7wkBxSsSuQlKj+kuticw4mO53XvJWvk8SPau4ydZwhkbwULxd3fvq92u9ATfCExO8fw== X-Google-Smtp-Source: AGHT+IGXthULpqDMU8r1sRw1BzQTh00KkFiEtvCh7nEszxRjCFiNJFQ6QbpnCyTbpHwLWqzR/yk4 X-Received: by 2002:ac8:7f42:0:b0:432:ed26:f47d with SMTP id g2-20020ac87f42000000b00432ed26f47dmr7513923qtk.44.1712477134966; Sun, 07 Apr 2024 01:05:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712477134; cv=pass; d=google.com; s=arc-20160816; b=GKll+xd+V46ggdN3GF4tNsTzbT0LFqagN1gwJjIt1RMP5FwoHpgI4gF5+q+cCNnUcn LpZUXHNncLgJVTSGmeKBIVn9e5M/J3o7d2p6mP5o9/Y7VfWO+kGm6cWIOGtaVv5XeOxA oTQtu+kszkbd0aaEaulJuBu35gOSaWjUgzWBjO8wsKF9w0F5wqUhvAAoSeOiow+5MA2A /S5JZOAsu+qGPtiCFc/fwFXtZEY3Fgyyh9BHHqO/mN4huCciVPsGMc/wm9FkBzfgoQUG 3alsPnLR6Ck6EhCrfWv+1+jn4F4OGvsKj7IIRckVhifWaOdOWKJhhNTeaZbIIegGclVx AB3A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=IfjCaKY/wckd4ZtbqeONfA7LbY0JtT1IfmR+x5wNH58=; fh=VzMToBYo5MUfLaQO74C2Chjt/otG4r80qnd7ynZ/RBQ=; b=x1JaLtrG+j13TpU8y/GhG0YjS1+HOAHwSpQMXr30LW6xledUBasSGng+aUk5/RHrcJ aLEGIqDLhhCaNobkkUP+Bf+m040gNqTDSNRw8nZadr24MYit0ZqdWhilRR4qP9Smjvpi lZ157gX725p/vZK0WLcNhlksMoGXegpOcTw0muSWhrJ2VASO2afmXNZ6jZXbLZY/xBHA VI/26mIdnMjkhpr3Cfd4yhFeqFoGL7gnnZyyP+0RtxHXnz3J98+r2k7atgGkOGZGPGnN bl1JHUGYopdxKmddyEqrg4Din5xBWKG/pAQ5/WLC3mhvA9/EBVNLUT/DNSw/ATZ5+m9w 4tJw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-crypto+bounces-3386-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-crypto+bounces-3386-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id m11-20020a05622a118b00b00434672ab078si4494933qtk.251.2024.04.07.01.05.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 01:05:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto+bounces-3386-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-crypto+bounces-3386-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-crypto+bounces-3386-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id A9FEB1C211AB for ; Sun, 7 Apr 2024 08:05:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0F6BB1DFCB; Sun, 7 Apr 2024 08:04:37 +0000 (UTC) X-Original-To: linux-crypto@vger.kernel.org Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4873F1096F; Sun, 7 Apr 2024 08:04:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.191 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712477076; cv=none; b=ktmYXWgXSLMzw/LXclmTWpRDciJtJ6KAA2HutGNPRwEB4lmzH/2hCmMH/Aal+nV7EqSnGVanXJdFUMRKU1q0ELbIgkv7fu0U92tungo7NX7ZtIOSWRkhxAnKU1xInVtWgZC2yeQlEeRykIsqk/1G2HygkkWLK96X1/K9+sdkElQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712477076; c=relaxed/simple; bh=INGEGqdsSMSW8P5U9FPTJWpgdgTcifxfTvht2tN20+A=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=L6DcqjpT8awZ4VRW6XEK4ZwrIZ1i7Y0h3iJ8zljNv+0dh1DJKz0IFMZ7I/XRMeUZGUJ9NW1YuateX7AM492EfFWoCcHZ9Bcvz8xcydHJepaS6u7pPXxhtcxBFMNz90yH9UFELxXnxSxp4HiP9oAP9DvVsXOuAYwj1N5uedjH94E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.191 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4VC4VV6wX0z1GG9P; Sun, 7 Apr 2024 16:03:46 +0800 (CST) Received: from kwepemi500025.china.huawei.com (unknown [7.221.188.170]) by mail.maildlp.com (Postfix) with ESMTPS id 3F0C7140416; Sun, 7 Apr 2024 16:04:29 +0800 (CST) Received: from localhost.localdomain (10.67.165.2) by kwepemi500025.china.huawei.com (7.221.188.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Sun, 7 Apr 2024 16:04:28 +0800 From: Chenghai Huang To: , CC: , , , , , , , , , , , Subject: [PATCH v2 1/9] crypto: hisilicon/sec - Add the condition for configuring the sriov function Date: Sun, 7 Apr 2024 15:59:52 +0800 Message-ID: <20240407080000.673435-2-huangchenghai2@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240407080000.673435-1-huangchenghai2@huawei.com> References: <20240407080000.673435-1-huangchenghai2@huawei.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500025.china.huawei.com (7.221.188.170) When CONFIG_PCI_IOV is disabled, the SRIOV configuration function is not required. An error occurs if this function is incorrectly called. Consistent with other modules, add the condition for configuring the sriov function of sec_pci_driver. Signed-off-by: Chenghai Huang --- drivers/crypto/hisilicon/sec2/sec_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/hisilicon/sec2/sec_main.c b/drivers/crypto/hisilicon/sec2/sec_main.c index c290d8937b19..f4e10741610f 100644 --- a/drivers/crypto/hisilicon/sec2/sec_main.c +++ b/drivers/crypto/hisilicon/sec2/sec_main.c @@ -1324,7 +1324,8 @@ static struct pci_driver sec_pci_driver = { .probe = sec_probe, .remove = sec_remove, .err_handler = &sec_err_handler, - .sriov_configure = hisi_qm_sriov_configure, + .sriov_configure = IS_ENABLED(CONFIG_PCI_IOV) ? + hisi_qm_sriov_configure : NULL, .shutdown = hisi_qm_dev_shutdown, .driver.pm = &sec_pm_ops, }; -- 2.30.0