From patchwork Wed Feb 15 12:03:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Schnelle X-Patchwork-Id: 57507 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp153727wrn; Wed, 15 Feb 2023 04:09:58 -0800 (PST) X-Google-Smtp-Source: AK7set+wotkYAvv/EVu+B1xfekPAU8FPlv0P+EF8CGh68IlWoSDPIl1GYsNt+pEsaLfaaoHl1frE X-Received: by 2002:a05:6a20:9e46:b0:bf:58d1:ce97 with SMTP id mt6-20020a056a209e4600b000bf58d1ce97mr3015604pzb.22.1676462997782; Wed, 15 Feb 2023 04:09:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676462997; cv=none; d=google.com; s=arc-20160816; b=wQ6JeZhbJryM4kkykwprtfoTTcDtSIWqwZA4RB/wk1zQtaPmz4fLDP/1tAsFahIMS1 NBMstXqQoE8MfN2MC2HRBj3VocGrz7SlkK3GBXYsqj8it66M9PJrchQy1+vTcbOLLPUe EQQWnC8e9DsDouMhYNV14SLXDJccGBB/4ylm0S3wSwe/h4H8iPLcRk3MYmbZZaXpsqpq /m3wKuwSisuAUJ6cgNlTjXOKv1L7Wm7yoNeyGFtJq8b/FHrQgaLqgxA7byVpV7lJSVYc /a7Cp487WavcMs99bfCxm8SwX4UjvSAUka6KeZS0YrVSHxqbj9NV6kP+ugWfPSP0+Yu5 TK+g== 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=JyS/DaEvjYz3Yy6r5m4p+hsTqT6eqxTIuVtmSoHg8Qg=; b=pJ1TgbmSCkx5VNpCL/lKB1vDZlRpome5AZlMIbKpWIcEOdack2+m1dabQRBif9Eug1 ks3PBVFF137VZqj+gx0RsTvwN5qHU8pY2oxyJxoiQAvitVfwfoRMpiKtDAN+1EjWF6A1 pxTi/BRoS0UY9VxGQo9c4n16YlyEjFfQEfndafRsZobaIS2rIK3NxoSDpucW8TmjGRa3 DhoZOhEwMA31QcVDKA7Gq/sGIW7ygFUkorpLrFmMAlSdqgCpNQqaQP9V4z2tzBb0GaKK p3VcDnfF067PoVna/oGPkzVBWSaTI4ci/ufeb7LlY4KMHxv6hn4c0KsSCOGpsvTU/jpk l8Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=sJk4u0Kz; 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=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bc22-20020a656d96000000b004d82885a5b4si17905472pgb.32.2023.02.15.04.09.44; Wed, 15 Feb 2023 04:09:57 -0800 (PST) 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=sJk4u0Kz; 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=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233813AbjBOMEA (ORCPT + 99 others); Wed, 15 Feb 2023 07:04:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231318AbjBOMD6 (ORCPT ); Wed, 15 Feb 2023 07:03:58 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF7B227D5B; Wed, 15 Feb 2023 04:03:56 -0800 (PST) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31FABxtw029599; Wed, 15 Feb 2023 12:03:34 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=JyS/DaEvjYz3Yy6r5m4p+hsTqT6eqxTIuVtmSoHg8Qg=; b=sJk4u0KzZVb6Y4LrY36fLlLhJXszq/8cOn9gaPNQhaIP/ie9pW5FGNPA8Z9HZ9gBjeXS BcGagTqdoId+z5O5rYHaUUUxiopFnYYYdpGVp9HVcpf1WcijYVw7wGfFfx/vkcA+sSW/ NrVCjbDm4UltA4Pv2DOMXODVCp9w1gNDfTXmhU9DIAaRNAhgQdhKdumxPopq68zT5o62 Go+Um+PvG4aCjLjLvx3oihSzaukVxYjZCUEF0uYxoo8rlUoLmoljtp1xrnIkOtSXpwdB jBnv+VUp3SWM0njHeODf+QFBVjcIAmEBv8P4ATg+N/gNlH0A44aHzUMxD/y1iuCRa8gU Qg== Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3nrwe32nkt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Feb 2023 12:03:34 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 31EKtIPL018185; Wed, 15 Feb 2023 12:03:32 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma03ams.nl.ibm.com (PPS) with ESMTPS id 3np2n6nacq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Feb 2023 12:03:32 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 31FC3SoP24773354 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Feb 2023 12:03:28 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BBB1320040; Wed, 15 Feb 2023 12:03:28 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5E4872004B; Wed, 15 Feb 2023 12:03:28 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 15 Feb 2023 12:03:28 +0000 (GMT) From: Niklas Schnelle To: Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Wenjia Zhang Cc: Matthew Rosato , Gerd Bayer , Pierre Morel , iommu@lists.linux.dev, 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, linux-kernel@vger.kernel.org, Julian Ruess Subject: [PATCH v6 1/6] s390/ism: Set DMA coherent mask Date: Wed, 15 Feb 2023 13:03:22 +0100 Message-Id: <20230215120327.947336-2-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230215120327.947336-1-schnelle@linux.ibm.com> References: <20230215120327.947336-1-schnelle@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 31MuNRERGY5e1anxjzSCh24sJ3Gg7wYr X-Proofpoint-ORIG-GUID: 31MuNRERGY5e1anxjzSCh24sJ3Gg7wYr X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-15_06,2023-02-15_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 mlxlogscore=999 malwarescore=0 phishscore=0 adultscore=0 suspectscore=0 priorityscore=1501 bulkscore=0 spamscore=0 impostorscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302150109 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757898864552376429?= X-GMAIL-MSGID: =?utf-8?q?1757898864552376429?= A future change will convert the DMA API implementation from the architecture specific arch/s390/pci/pci_dma.c to using the common code drivers/iommu/dma-iommu.c which the utilizes the same IOMMU hardware through the s390-iommu driver. Unlike the s390 specific DMA API this requires devices to correctly call set the coherent mask to be allowed to use IOVAs >2^32 in dma_alloc_coherent(). This was however not done for ISM devices. ISM requires such addresses since currently the DMA aperture for PCI devices starts at 2^32 and all calls to dma_alloc_coherent() would thus fail. Reviewed-by: Alexandra Winter Reviewed-by: Matthew Rosato Signed-off-by: Niklas Schnelle --- drivers/s390/net/ism_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c index dfd401d9e362..aba03b613296 100644 --- a/drivers/s390/net/ism_drv.c +++ b/drivers/s390/net/ism_drv.c @@ -557,7 +557,7 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (ret) goto err_disable; - ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); if (ret) goto err_resource;