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 0646DCCA47C for ; Tue, 12 Jul 2022 10:52:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 84A9B6B016B; Tue, 12 Jul 2022 06:52:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FA896B016C; Tue, 12 Jul 2022 06:52:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 64DFD6B016D; Tue, 12 Jul 2022 06:52:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 561356B016B for ; Tue, 12 Jul 2022 06:52:29 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 2E33F1206F8 for ; Tue, 12 Jul 2022 10:52:29 +0000 (UTC) X-FDA: 79678134018.26.831D048 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf15.hostedemail.com (Postfix) with ESMTP id B67A7A005E for ; Tue, 12 Jul 2022 10:52:28 +0000 (UTC) Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26CAhmfp013021; Tue, 12 Jul 2022 10:52:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=J2qnig8Gw6JMhiv1+zcuwBOemTwC4BF1Iyens8utySo=; b=VnJp5h9et4TVbW7kIhix1qquqVt5NIfT1HTYd1NRjTmuDucNWoAEEg1UQLB8tJQDcsrQ v8q1mHkqMaK0CAONolKoimJvVNvDYUJAxyS3zc4kNLPdPYalSyNbZUZC0AyfjDpguvn3 FoYQwFNc35z76rLM+1u2bGJtyr51sCU3eyFD53J6cqCj5+xqHUrCWTk3N9xl8xfiVavn tppxClaFa24JIDtr7B2z9hFGZ324iAAVfwAa7QvA6Tuw5vuRVFQ+vt7ZmZC5kTD/HII5 3eiNpmJkM5iel5fEWUoBXnD83DlaQvVep8uOqMDSm68Gtlx0/aqMlEH7Aq8LJIFl3wSI Kw== 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 3h96jysfsv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 12 Jul 2022 10:52:27 +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 26CAqPe5003414; Tue, 12 Jul 2022 10:52:25 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma06ams.nl.ibm.com with ESMTP id 3h70xhv2rp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 12 Jul 2022 10:52:25 +0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 26CAqMKZ25297306 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Jul 2022 10:52:22 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7D1C111C04A; Tue, 12 Jul 2022 10:52:22 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2445611C04C; Tue, 12 Jul 2022 10:52:22 +0000 (GMT) Received: from a46lp73.lnxne.boe (unknown [9.152.108.100]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 12 Jul 2022 10:52:22 +0000 (GMT) From: Steffen Eiden To: Heiko Carstens , Alexander Gordeev , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Vasily Gorbik , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: nrb@linux.ibm.com Subject: [PATCH 3/3] s390/uvdevice: autoload module based on CPU facility Date: Tue, 12 Jul 2022 12:52:20 +0200 Message-Id: <20220712105220.325010-4-seiden@linux.ibm.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220712105220.325010-1-seiden@linux.ibm.com> References: <20220712105220.325010-1-seiden@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: mdNDKtarlkAZ5t4gVuuQ1YCoMOv1elk9 X-Proofpoint-ORIG-GUID: mdNDKtarlkAZ5t4gVuuQ1YCoMOv1elk9 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-12_05,2022-07-12_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 suspectscore=0 bulkscore=0 impostorscore=0 spamscore=0 malwarescore=0 mlxscore=0 clxscore=1015 phishscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207120039 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657623148; a=rsa-sha256; cv=none; b=Dn8aMGTicNhPYDi1TK1bP/69k4QLcWiCiJ8ShRi87IiQTH7++alsy9+4DatSv+0F449nvQ Ab1UyC+LO6jg9OLXl6wd/az9pnkpC9ZvV7XTOXHjwfIRK6v/gfH0QpGm4G+QYP76YaNG/E S7bjUQerw9dFV8vyxrg4b7cYFlYsYiY= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=VnJp5h9e; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf15.hostedemail.com: domain of seiden@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=seiden@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657623148; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=J2qnig8Gw6JMhiv1+zcuwBOemTwC4BF1Iyens8utySo=; b=vUrJ/KUtEThPMC1Q+KRvFdootFdiOkCtPvD0JNASpYHi0zRHZxeVly6RehVu8skjaOEbBK nXVPkWyy3XmouT5sgDBzMPw3jTM3820Y8nKfrrQ2tBkIpRuqt5arDwsUT5KRIPIoGI1LbP GSMunfFMNG/Jo6M1jf9Tlz7ObgUXJGE= Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=VnJp5h9e; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf15.hostedemail.com: domain of seiden@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=seiden@linux.ibm.com X-Stat-Signature: wn9owjm1bjo9rsp1snh1ksww1hfe8mnu X-Rspamd-Queue-Id: B67A7A005E X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1657623148-273733 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: Make sure the uvdevice driver will be automatically loaded when facility 158 is available. Signed-off-by: Steffen Eiden --- arch/s390/include/asm/cpufeature.h | 1 + arch/s390/kernel/cpufeature.c | 1 + drivers/s390/char/uvdevice.c | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/s390/include/asm/cpufeature.h b/arch/s390/include/asm/cpufeature.h index aa8081dad411..4b17f876ab54 100644 --- a/arch/s390/include/asm/cpufeature.h +++ b/arch/s390/include/asm/cpufeature.h @@ -33,6 +33,7 @@ enum { S390_CPU_FEATURE_NNPA, S390_CPU_FEATURE_PCI_MIO, S390_CPU_FEATURE_SIE, + S390_CPU_FEATURE_UV, MAX_CPU_FEATURES }; diff --git a/arch/s390/kernel/cpufeature.c b/arch/s390/kernel/cpufeature.c index e70b29804db4..0b854d37edcb 100644 --- a/arch/s390/kernel/cpufeature.c +++ b/arch/s390/kernel/cpufeature.c @@ -42,6 +42,7 @@ static struct s390_cpu_feature s390_cpu_features[MAX_CPU_FEATURES] = { [S390_CPU_FEATURE_NNPA] = {.type = TYPE_HWCAP, .num = HWCAP_NR_NNPA}, [S390_CPU_FEATURE_PCI_MIO] = {.type = TYPE_HWCAP, .num = HWCAP_NR_PCI_MIO}, [S390_CPU_FEATURE_SIE] = {.type = TYPE_HWCAP, .num = HWCAP_NR_SIE}, + [S390_CPU_FEATURE_UV] = {.type = TYPE_FACILITY, .num = 158}, }; /* diff --git a/drivers/s390/char/uvdevice.c b/drivers/s390/char/uvdevice.c index 66505d7166a6..1d40457c7b10 100644 --- a/drivers/s390/char/uvdevice.c +++ b/drivers/s390/char/uvdevice.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -244,12 +245,10 @@ static void __exit uvio_dev_exit(void) static int __init uvio_dev_init(void) { - if (!test_facility(158)) - return -ENXIO; return misc_register(&uvio_dev_miscdev); } -module_init(uvio_dev_init); +module_cpu_feature_match(S390_CPU_FEATURE_UV, uvio_dev_init); module_exit(uvio_dev_exit); MODULE_AUTHOR("IBM Corporation"); -- 2.35.3