From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EB9AC43334 for ; Wed, 13 Jul 2022 13:50:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7BEE4940135; Wed, 13 Jul 2022 09:50:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7488B940134; Wed, 13 Jul 2022 09:50:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C0A5940135; Wed, 13 Jul 2022 09:50:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 47209940134 for ; Wed, 13 Jul 2022 09:50:43 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 14FE7120E2E for ; Wed, 13 Jul 2022 13:50:43 +0000 (UTC) X-FDA: 79682211966.22.DFCC47C Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf24.hostedemail.com (Postfix) with ESMTP id 87947180088 for ; Wed, 13 Jul 2022 13:50:42 +0000 (UTC) Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26DDdcbi013886; Wed, 13 Jul 2022 13:50:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=pp1; bh=lx9XFobL3Rx2ZxSx5JjD1Okol1DdGc/qGH3WJ0hxLBc=; b=rSNNsOKixwka3NwsSpEKuX9CPKPTaiMk1Zq9s8IMizHuTPeFjV2uVRN7m3W95IH3kCEH rMk1CUmsbY5mXdqOmvsnJnt/KA5QvUPYyXtN1NBDQkHZe7lZqDCqNum2C9j069wDIKZo TzN1laZ0b41E637HGbsbMBafPJAX4822TpoGMgoQE1HXpF4KFP4djn7M/xtdd0dUGPWW yKi3ApQV/7AIsvl36jp5DlWd5enxqcsN/53QwQ5NpSQm99HPAQE8wybgH1wkaxZFUDed 2NqiUQT9o9zTTa6yQ8vt5u4q6UXEdm1xxOfhJVPt5OffE78gkdDlbUaSY11pQnB0CBJb nQ== Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3h9y4p0e5e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Jul 2022 13:50:41 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 26DDmIGW022636; Wed, 13 Jul 2022 13:50:39 GMT Received: from b06avi18626390.portsmouth.uk.ibm.com (b06avi18626390.portsmouth.uk.ibm.com [9.149.26.192]) by ppma06ams.nl.ibm.com with ESMTP id 3h70xhwrv0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Jul 2022 13:50:39 +0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 26DDn5B322544890 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Jul 2022 13:49:05 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 37FDFA404D; Wed, 13 Jul 2022 13:50:36 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AC2B3A4040; Wed, 13 Jul 2022 13:50:35 +0000 (GMT) Received: from p-imbrenda (unknown [9.145.0.75]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 13 Jul 2022 13:50:35 +0000 (GMT) Date: Wed, 13 Jul 2022 15:50:33 +0200 From: Claudio Imbrenda To: Steffen Eiden Cc: Heiko Carstens , Alexander Gordeev , Christian Borntraeger , Janosch Frank , Vasily Gorbik , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, nrb@linux.ibm.com Subject: Re: [PATCH v2 1/3] s390/cpufeature: rework to allow more than only hwcap bits Message-ID: <20220713155033.46259c35@p-imbrenda> In-Reply-To: <20220713125644.16121-2-seiden@linux.ibm.com> References: <20220713125644.16121-1-seiden@linux.ibm.com> <20220713125644.16121-2-seiden@linux.ibm.com> Organization: IBM X-Mailer: Claws Mail 4.1.0 (GTK 3.24.34; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: _JviYa28RHmgl7Zi2VQO44GMeAu61XTv X-Proofpoint-ORIG-GUID: _JviYa28RHmgl7Zi2VQO44GMeAu61XTv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-13_03,2022-07-13_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 adultscore=0 priorityscore=1501 bulkscore=0 mlxlogscore=999 lowpriorityscore=0 suspectscore=0 clxscore=1015 mlxscore=0 impostorscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207130055 ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=rSNNsOKi; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf24.hostedemail.com: domain of imbrenda@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=imbrenda@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657720242; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lx9XFobL3Rx2ZxSx5JjD1Okol1DdGc/qGH3WJ0hxLBc=; b=R8a3slUuVfTWVU1cNf7S1hRA4FsXjP94HVGi84kBl7/QNC2AnKm5ih9QjkqVPlM/sllReT iz14Odls0q/TVGjLY3POGpSk2x2J6ELEXrxDJfkIGvrGsK5fDHsBn6Uv8L4P2iWSubDePb O4cabwwB/nI4ZEDNTAcKCEFlIJ4vvfQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657720242; a=rsa-sha256; cv=none; b=VJpIMR21AblM7kyULfIn7HDuNQP4Kd+Lo6MIDjLXuIHHWcpLPMJek7ROK4QstWxhT/AbZF Cv9KIfIuT7msBC3cVzmImTpkoGPsWEWcu1lKJkchX8IetCDAJ4KeV+KWfVubGHHjrfJjNn kP0jMVqGbX1gwRVOvT88kkxl08D6voM= X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 87947180088 X-Stat-Signature: swz95idsyur6wwgwa8nue53gf33q1pbu Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=rSNNsOKi; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf24.hostedemail.com: domain of imbrenda@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=imbrenda@linux.ibm.com X-Rspam-User: X-HE-Tag: 1657720242-815946 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, 13 Jul 2022 14:56:42 +0200 Steffen Eiden wrote: > From: Heiko Carstens > > Rework cpufeature implementation to allow for various cpu feature > indications, which is not only limited to hwcap bits. This is achieved > by adding a sequential list of cpu feature numbers, where each of them > is mapped to an entry which indicates what this number is about. > > Each entry contains a type member, which indicates what feature > name space to look into (e.g. hwcap, or cpu facility). If wanted this > allows also to automatically load modules only in e.g. z/VM > configurations. > > Signed-off-by: Heiko Carstens > Signed-off-by: Steffen Eiden Reviewed-by: Claudio Imbrenda > --- > arch/s390/crypto/aes_s390.c | 2 +- > arch/s390/crypto/chacha-glue.c | 2 +- > arch/s390/crypto/crc32-vx.c | 2 +- > arch/s390/crypto/des_s390.c | 2 +- > arch/s390/crypto/ghash_s390.c | 2 +- > arch/s390/crypto/prng.c | 2 +- > arch/s390/crypto/sha1_s390.c | 2 +- > arch/s390/crypto/sha256_s390.c | 2 +- > arch/s390/crypto/sha3_256_s390.c | 2 +- > arch/s390/crypto/sha3_512_s390.c | 2 +- > arch/s390/crypto/sha512_s390.c | 2 +- > arch/s390/include/asm/cpufeature.h | 22 +++++----------- > arch/s390/kernel/Makefile | 2 +- > arch/s390/kernel/cpufeature.c | 42 ++++++++++++++++++++++++++++++ > arch/s390/kernel/processor.c | 10 ------- > drivers/char/hw_random/s390-trng.c | 2 +- > drivers/s390/crypto/pkey_api.c | 2 +- > 17 files changed, 63 insertions(+), 39 deletions(-) > create mode 100644 arch/s390/kernel/cpufeature.c > > diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c > index 1023e9d43d44..526c3f40f6a2 100644 > --- a/arch/s390/crypto/aes_s390.c > +++ b/arch/s390/crypto/aes_s390.c > @@ -1049,7 +1049,7 @@ static int __init aes_s390_init(void) > return ret; > } > > -module_cpu_feature_match(MSA, aes_s390_init); > +module_cpu_feature_match(S390_CPU_FEATURE_MSA, aes_s390_init); > module_exit(aes_s390_fini); > > MODULE_ALIAS_CRYPTO("aes-all"); > diff --git a/arch/s390/crypto/chacha-glue.c b/arch/s390/crypto/chacha-glue.c > index 2ec51f339cec..7752bd314558 100644 > --- a/arch/s390/crypto/chacha-glue.c > +++ b/arch/s390/crypto/chacha-glue.c > @@ -121,7 +121,7 @@ static void __exit chacha_mod_fini(void) > crypto_unregister_skciphers(chacha_algs, ARRAY_SIZE(chacha_algs)); > } > > -module_cpu_feature_match(VXRS, chacha_mod_init); > +module_cpu_feature_match(S390_CPU_FEATURE_VXRS, chacha_mod_init); > module_exit(chacha_mod_fini); > > MODULE_DESCRIPTION("ChaCha20 stream cipher"); > diff --git a/arch/s390/crypto/crc32-vx.c b/arch/s390/crypto/crc32-vx.c > index fafecad20752..017143e9cef7 100644 > --- a/arch/s390/crypto/crc32-vx.c > +++ b/arch/s390/crypto/crc32-vx.c > @@ -298,7 +298,7 @@ static void __exit crc_vx_mod_exit(void) > crypto_unregister_shashes(crc32_vx_algs, ARRAY_SIZE(crc32_vx_algs)); > } > > -module_cpu_feature_match(VXRS, crc_vx_mod_init); > +module_cpu_feature_match(S390_CPU_FEATURE_VXRS, crc_vx_mod_init); > module_exit(crc_vx_mod_exit); > > MODULE_AUTHOR("Hendrik Brueckner "); > diff --git a/arch/s390/crypto/des_s390.c b/arch/s390/crypto/des_s390.c > index e013088b5115..8e75b83a5ddc 100644 > --- a/arch/s390/crypto/des_s390.c > +++ b/arch/s390/crypto/des_s390.c > @@ -492,7 +492,7 @@ static int __init des_s390_init(void) > return ret; > } > > -module_cpu_feature_match(MSA, des_s390_init); > +module_cpu_feature_match(S390_CPU_FEATURE_MSA, des_s390_init); > module_exit(des_s390_exit); > > MODULE_ALIAS_CRYPTO("des"); > diff --git a/arch/s390/crypto/ghash_s390.c b/arch/s390/crypto/ghash_s390.c > index 6b07a2f1ce8a..0800a2a5799f 100644 > --- a/arch/s390/crypto/ghash_s390.c > +++ b/arch/s390/crypto/ghash_s390.c > @@ -145,7 +145,7 @@ static void __exit ghash_mod_exit(void) > crypto_unregister_shash(&ghash_alg); > } > > -module_cpu_feature_match(MSA, ghash_mod_init); > +module_cpu_feature_match(S390_CPU_FEATURE_MSA, ghash_mod_init); > module_exit(ghash_mod_exit); > > MODULE_ALIAS_CRYPTO("ghash"); > diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c > index ae382bafc772..a077087bc6cc 100644 > --- a/arch/s390/crypto/prng.c > +++ b/arch/s390/crypto/prng.c > @@ -907,5 +907,5 @@ static void __exit prng_exit(void) > } > } > > -module_cpu_feature_match(MSA, prng_init); > +module_cpu_feature_match(S390_CPU_FEATURE_MSA, prng_init); > module_exit(prng_exit); > diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c > index a3fabf310a38..bc3a22704e09 100644 > --- a/arch/s390/crypto/sha1_s390.c > +++ b/arch/s390/crypto/sha1_s390.c > @@ -95,7 +95,7 @@ static void __exit sha1_s390_fini(void) > crypto_unregister_shash(&alg); > } > > -module_cpu_feature_match(MSA, sha1_s390_init); > +module_cpu_feature_match(S390_CPU_FEATURE_MSA, sha1_s390_init); > module_exit(sha1_s390_fini); > > MODULE_ALIAS_CRYPTO("sha1"); > diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c > index 24983f175676..6f1ccdf93d3e 100644 > --- a/arch/s390/crypto/sha256_s390.c > +++ b/arch/s390/crypto/sha256_s390.c > @@ -134,7 +134,7 @@ static void __exit sha256_s390_fini(void) > crypto_unregister_shash(&sha256_alg); > } > > -module_cpu_feature_match(MSA, sha256_s390_init); > +module_cpu_feature_match(S390_CPU_FEATURE_MSA, sha256_s390_init); > module_exit(sha256_s390_fini); > > MODULE_ALIAS_CRYPTO("sha256"); > diff --git a/arch/s390/crypto/sha3_256_s390.c b/arch/s390/crypto/sha3_256_s390.c > index 30ac49b635bf..e1350e033a32 100644 > --- a/arch/s390/crypto/sha3_256_s390.c > +++ b/arch/s390/crypto/sha3_256_s390.c > @@ -137,7 +137,7 @@ static void __exit sha3_256_s390_fini(void) > crypto_unregister_shash(&sha3_256_alg); > } > > -module_cpu_feature_match(MSA, sha3_256_s390_init); > +module_cpu_feature_match(S390_CPU_FEATURE_MSA, sha3_256_s390_init); > module_exit(sha3_256_s390_fini); > > MODULE_ALIAS_CRYPTO("sha3-256"); > diff --git a/arch/s390/crypto/sha3_512_s390.c b/arch/s390/crypto/sha3_512_s390.c > index e70d50f7620f..06c142ed9bb1 100644 > --- a/arch/s390/crypto/sha3_512_s390.c > +++ b/arch/s390/crypto/sha3_512_s390.c > @@ -147,7 +147,7 @@ static void __exit fini(void) > crypto_unregister_shash(&sha3_384_alg); > } > > -module_cpu_feature_match(MSA, init); > +module_cpu_feature_match(S390_CPU_FEATURE_MSA, init); > module_exit(fini); > > MODULE_LICENSE("GPL"); > diff --git a/arch/s390/crypto/sha512_s390.c b/arch/s390/crypto/sha512_s390.c > index 43ce4956df73..04f11c407763 100644 > --- a/arch/s390/crypto/sha512_s390.c > +++ b/arch/s390/crypto/sha512_s390.c > @@ -142,7 +142,7 @@ static void __exit fini(void) > crypto_unregister_shash(&sha384_alg); > } > > -module_cpu_feature_match(MSA, init); > +module_cpu_feature_match(S390_CPU_FEATURE_MSA, init); > module_exit(fini); > > MODULE_LICENSE("GPL"); > diff --git a/arch/s390/include/asm/cpufeature.h b/arch/s390/include/asm/cpufeature.h > index 14cfd48d598e..771caf5281e5 100644 > --- a/arch/s390/include/asm/cpufeature.h > +++ b/arch/s390/include/asm/cpufeature.h > @@ -2,28 +2,20 @@ > /* > * Module interface for CPU features > * > - * Copyright IBM Corp. 2015 > + * Copyright IBM Corp. 2015, 2022 > * Author(s): Hendrik Brueckner > */ > > #ifndef __ASM_S390_CPUFEATURE_H > #define __ASM_S390_CPUFEATURE_H > > -#include > +enum { > + S390_CPU_FEATURE_MSA, > + S390_CPU_FEATURE_VXRS, > + MAX_CPU_FEATURES > +}; > > -/* Hardware features on Linux on z Systems are indicated by facility bits that > - * are mapped to the so-called machine flags. Particular machine flags are > - * then used to define ELF hardware capabilities; most notably hardware flags > - * that are essential for user space / glibc. > - * > - * Restrict the set of exposed CPU features to ELF hardware capabilities for > - * now. Additional machine flags can be indicated by values larger than > - * MAX_ELF_HWCAP_FEATURES. > - */ > -#define MAX_ELF_HWCAP_FEATURES (8 * sizeof(elf_hwcap)) > -#define MAX_CPU_FEATURES MAX_ELF_HWCAP_FEATURES > - > -#define cpu_feature(feat) ilog2(HWCAP_ ## feat) > +#define cpu_feature(feature) (feature) > > int cpu_have_feature(unsigned int nr); > > diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile > index 27d6b3c7aa06..3cbfa9fddd9a 100644 > --- a/arch/s390/kernel/Makefile > +++ b/arch/s390/kernel/Makefile > @@ -35,7 +35,7 @@ CFLAGS_unwind_bc.o += -fno-optimize-sibling-calls > > obj-y := traps.o time.o process.o earlypgm.o early.o setup.o idle.o vtime.o > obj-y += processor.o syscall.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o > -obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o > +obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o cpufeature.o > obj-y += sysinfo.o lgr.o os_info.o machine_kexec.o > obj-y += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o > obj-y += entry.o reipl.o relocate_kernel.o kdebugfs.o alternative.o > diff --git a/arch/s390/kernel/cpufeature.c b/arch/s390/kernel/cpufeature.c > new file mode 100644 > index 000000000000..9044c75d8b38 > --- /dev/null > +++ b/arch/s390/kernel/cpufeature.c > @@ -0,0 +1,42 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright IBM Corp. 2022 > + */ > +#include > +#include > +#include > + > +enum { > + TYPE_HWCAP, > +}; > + > +struct s390_cpu_feature { > + unsigned int type : 4; > + unsigned int num : 28; > +}; > + > +static struct s390_cpu_feature s390_cpu_features[MAX_CPU_FEATURES] = { > + [S390_CPU_FEATURE_MSA] = {.type = TYPE_HWCAP, .num = HWCAP_NR_MSA}, > + [S390_CPU_FEATURE_VXRS] = {.type = TYPE_HWCAP, .num = HWCAP_NR_VXRS}, > +}; > + > +/* > + * cpu_have_feature - Test CPU features on module initialization > + */ > +int cpu_have_feature(unsigned int num) > +{ > + struct s390_cpu_feature *feature; > + > + if (WARN_ON_ONCE(num >= MAX_CPU_FEATURES)) > + return 0; > + > + feature = &s390_cpu_features[num]; > + switch (feature->type) { > + case TYPE_HWCAP: > + return !!(elf_hwcap & BIT(feature->num)); > + default: > + WARN_ON_ONCE(1); > + return 0; > + } > +} > +EXPORT_SYMBOL(cpu_have_feature); > diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c > index aa0e0e7fc773..a194611ba88c 100644 > --- a/arch/s390/kernel/processor.c > +++ b/arch/s390/kernel/processor.c > @@ -8,7 +8,6 @@ > #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt > > #include > -#include > #include > #include > #include > @@ -96,15 +95,6 @@ void cpu_init(void) > enter_lazy_tlb(&init_mm, current); > } > > -/* > - * cpu_have_feature - Test CPU features on module initialization > - */ > -int cpu_have_feature(unsigned int num) > -{ > - return elf_hwcap & (1UL << num); > -} > -EXPORT_SYMBOL(cpu_have_feature); > - > static void show_facilities(struct seq_file *m) > { > unsigned int bit; > diff --git a/drivers/char/hw_random/s390-trng.c b/drivers/char/hw_random/s390-trng.c > index 2beaa35c0d74..12fbac0ed8ca 100644 > --- a/drivers/char/hw_random/s390-trng.c > +++ b/drivers/char/hw_random/s390-trng.c > @@ -261,5 +261,5 @@ static void __exit trng_exit(void) > trng_debug_exit(); > } > > -module_cpu_feature_match(MSA, trng_init); > +module_cpu_feature_match(S390_CPU_FEATURE_MSA, trng_init); > module_exit(trng_exit); > diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c > index 7329caa7d467..5a05d1cdfec2 100644 > --- a/drivers/s390/crypto/pkey_api.c > +++ b/drivers/s390/crypto/pkey_api.c > @@ -2115,5 +2115,5 @@ static void __exit pkey_exit(void) > pkey_debug_exit(); > } > > -module_cpu_feature_match(MSA, pkey_init); > +module_cpu_feature_match(S390_CPU_FEATURE_MSA, pkey_init); > module_exit(pkey_exit);