Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp369033rwb; Tue, 4 Oct 2022 05:20:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7/j2pBsyS/CQjmHb5fYHma6/aVRlsSil4ap89k7H9X7PdqrhOesFq+mROl8kxk8+o/GCHM X-Received: by 2002:a05:6402:35c1:b0:451:e1aa:e66e with SMTP id z1-20020a05640235c100b00451e1aae66emr22279357edc.275.1664886034575; Tue, 04 Oct 2022 05:20:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664886034; cv=none; d=google.com; s=arc-20160816; b=E8WmA4Yx0PGg8mUvYsu2c7h51+YNtxKL+SbtT+pvgn18+aFfAHX0Uu0//N9BEl9AB+ QXI54dOd1NkiHZ6Ie+u1BSNa7XOt54jWWvBoQ5JEw8ImJNZq0IM54LM+rZF0oSWNXmtq iBwIeuHd9p5abnZXGAPaOA+zGJbz7RlApVDbhJIGlqDhsb1VB9XD2BAA6zIT/20puQlD H8zihaLTude0gsbwHasgBq6BhHC6KyCRYGPnZpY3rEVqXpD//hHDeqVTUhD1ehUfx3zW q5BYWC+Yk2+OO4IcavV/caId02PUpGdsKrBEzvmhe7RBp8Z6YYPCUWQhofih9zTIQCah bSGQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5OC8lvTvoo2iwAo+ZwRfACuL03r8Qp84FI8VIM9EfdY=; b=yl1zP1Vttf0Ivt8W+rpz6M5R+Gz1OFtN32ZmE5xfGQ+1ZfWP+AD9Ut+elJid+zMxy1 B1nrnk/fe334gPCo4IMOHMDJmUIHobNsWCB+GMXwslNhSrOKaUk9EptQ9ENpBwMhajBw CQrfDTG8/uNFge562dugR+KaF/Pt+UMSg+AnPmOMbooFJny+pUGUG7lUJSvwwG9wn+64 LvJuiVnpVpdhczf2jWVBtdnUzO8Z9M39ZtRJamE9wjTtLzS1kMzGCbA30HWHvKXQC1+n KzfholD5ODGkw8EpFLVIA+jF9BTJbEPmRvwQJw8xOSsGXbWo+d7BD+QwJtGbWz0aRl8s qwtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b="clf3/lyX"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a1-20020aa7d901000000b00457f9c97f13si9937885edr.581.2022.10.04.05.20.07; Tue, 04 Oct 2022 05:20:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b="clf3/lyX"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230106AbiJDMIB (ORCPT + 99 others); Tue, 4 Oct 2022 08:08:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230063AbiJDMHl (ORCPT ); Tue, 4 Oct 2022 08:07:41 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83A0553027; Tue, 4 Oct 2022 05:07:30 -0700 (PDT) Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 294B9t9S032558; Tue, 4 Oct 2022 12:07:20 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=5OC8lvTvoo2iwAo+ZwRfACuL03r8Qp84FI8VIM9EfdY=; b=clf3/lyX88s5ycf0REbb3eueQ14VhwwjrhDF50Ord6gm3qB6u4m6s113Y2ZoLWwmimcm 15qkD53I+kZneNP5UbiuOSIH2LF9K0IptpUAzAp465dN7s7snY0HES14eI6cDb+SbnAc i2+nholx/sD1AZEKs6s8HW+27hjCKqpx4Jrf46OgZh4F2MaBfkcp9C/Wqt7qobdTnXxX BevtC9uTexbhK0IhRXhglc7yCjpbBwFDshHFkUC8rhSDJIoIblozB7D6i4NR5HLyggXR V1NH3MUgWK9Drci8HDe3Ryvn2zKFFMZuwi/THl6NVvuheXjWSAA4C97HrhbLj15zU2gI WQ== 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 3k0hka51by-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 04 Oct 2022 12:07:14 +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 294C60NM017396; Tue, 4 Oct 2022 12:07:12 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 3jxctj43qg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 04 Oct 2022 12:07:12 +0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 294C79bK30146992 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 4 Oct 2022 12:07:09 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6B006A4053; Tue, 4 Oct 2022 12:07:09 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F2415A404D; Tue, 4 Oct 2022 12:07:08 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 4 Oct 2022 12:07:08 +0000 (GMT) From: Niklas Schnelle To: Matthew Rosato , Pierre Morel , iommu@lists.linux.dev Cc: linux-s390@vger.kernel.org, borntraeger@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, gerald.schaefer@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, jgg@nvidia.com, linux-kernel@vger.kernel.org Subject: [PATCH v4 5/5] iommu/s390: Fix incorrect pgsize_bitmap Date: Tue, 4 Oct 2022 14:07:06 +0200 Message-Id: <20221004120706.2957492-6-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221004120706.2957492-1-schnelle@linux.ibm.com> References: <20221004120706.2957492-1-schnelle@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: -l_tMkyEPtr1Uhq48NcgAAAA2CsaqICv X-Proofpoint-GUID: -l_tMkyEPtr1Uhq48NcgAAAA2CsaqICv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-10-04_04,2022-09-29_03,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxlogscore=999 lowpriorityscore=0 mlxscore=0 spamscore=0 adultscore=0 suspectscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210040078 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The .pgsize_bitmap property of struct iommu_ops is not a page mask but rather has a bit set for each size of pages the IOMMU supports. As the comment correctly pointed out at this moment the code only support 4K pages so simply use SZ_4K here. Reviewed-by: Jason Gunthorpe Signed-off-by: Niklas Schnelle --- drivers/iommu/s390-iommu.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c index 94c444b909bd..6bf23e7830a2 100644 --- a/drivers/iommu/s390-iommu.c +++ b/drivers/iommu/s390-iommu.c @@ -12,13 +12,6 @@ #include #include -/* - * Physically contiguous memory regions can be mapped with 4 KiB alignment, - * we allow all page sizes that are an order of 4KiB (no special large page - * support so far). - */ -#define S390_IOMMU_PGSIZES (~0xFFFUL) - static const struct iommu_ops s390_iommu_ops; struct s390_domain { @@ -350,7 +343,7 @@ static const struct iommu_ops s390_iommu_ops = { .probe_device = s390_iommu_probe_device, .release_device = s390_iommu_release_device, .device_group = generic_device_group, - .pgsize_bitmap = S390_IOMMU_PGSIZES, + .pgsize_bitmap = SZ_4K, .get_resv_regions = s390_iommu_get_resv_regions, .default_domain_ops = &(const struct iommu_domain_ops) { .attach_dev = s390_iommu_attach_device, -- 2.34.1