From patchwork Wed Mar 15 16:41:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Price X-Patchwork-Id: 70329 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp17839wrt; Wed, 15 Mar 2023 10:14:03 -0700 (PDT) X-Google-Smtp-Source: AK7set+Qaxp1ANH9QtwzBW9WjjPD9kKxXSVUiITaBobNtmHYOlJr/BA6+bO2gXcKoKr6otzTQwuu X-Received: by 2002:a62:19d5:0:b0:625:9055:3bc9 with SMTP id 204-20020a6219d5000000b0062590553bc9mr155064pfz.27.1678900442922; Wed, 15 Mar 2023 10:14:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678900442; cv=none; d=google.com; s=arc-20160816; b=rxygpiTHT8dfIBlFepqLJ4+C2rUtQH+YhXjopcA6TNRxJzRVyOynxMzmNQZuOELQT9 iW44xcRo6kvUH0/QE530WuG6V/hQ9WIlQ1dlSu1l6IzkN+OGjmv34mc8vmjjKOFvvgjx Y7HpBW5QSwxO1vXCtU/hhljqLdnTObM8oMSTn7EKt/5HKfTF+dM0icQuohrfusOru2nt sVhi9zzTo8fp80GlnMOfItFg5wHqXAs6NwcEdMKLcscrNyLwO2za7AH23hx9/eli8/Tm qMLY8R8pInYM0RfIdFttUGy+X0CvLFfItLvMmVFjFHCvekggFX+BFEgL/gmSDo+gdHB8 MRyg== 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 :message-id:date:subject:cc:to:from; bh=aFlHK723Gud1i700QtTJl7TVSKlTvgTLpT7wUoANNp0=; b=Eo3uveBOaqyZILoLIcBj0ejj4EFWnseWnYWJc82suyePCX22myt4EFdi3DnMHljyTI 5Dk4+4PIsh+21LFZIuTfeE/Hk32bet7VGaPVSOI9ujJxCLbaAcuoaIZOsMKrcyW3WiPE nNkc+P6Cu2Hhm0YjcSw4y2+TpkZdCEM497q8L+WCjEjRH+2ttcG52KVkZG6K+8Ox7mbz m4rHzq0VZpjxx4IEo+EprsHBWoE71spWtGdZxx2d8RZ7wC9p9RtT7WsEUZm71tpgotlz 48YwP0mtR1EwFnmVkQRUUNyQalZdYgPMnd/Db+/oghmDrvwbCv34ckLjQ9m6ekTRjO5T KPrw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 17-20020a630c51000000b00507249cdefesi5255882pgm.157.2023.03.15.10.13.47; Wed, 15 Mar 2023 10:14:02 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232190AbjCOQvq (ORCPT + 99 others); Wed, 15 Mar 2023 12:51:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231917AbjCOQve (ORCPT ); Wed, 15 Mar 2023 12:51:34 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 81DED1E5FC for ; Wed, 15 Mar 2023 09:51:29 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4DC514B3; Wed, 15 Mar 2023 09:42:47 -0700 (PDT) Received: from e122027.arm.com (unknown [10.57.53.168]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 22A1A3F67D; Wed, 15 Mar 2023 09:42:00 -0700 (PDT) From: Steven Price To: Heiko Stuebner , Joerg Roedel Cc: Will Deacon , Robin Murphy , iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Jason Gunthorpe , Lu Baolu , Steven Price Subject: [PATCH] iommu/rockchip: Add missing set_platform_dma_ops callback Date: Wed, 15 Mar 2023 16:41:52 +0000 Message-Id: <20230315164152.333251-1-steven.price@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE 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?1760454710760774050?= X-GMAIL-MSGID: =?utf-8?q?1760454710760774050?= Similar to exynos, we need a set_platform_dma_ops() callback for proper operation on ARM 32 bit after recent changes in the IOMMU framework (detach ops removal). Fixes: c1fe9119ee70 ("iommu: Add set_platform_dma_ops callbacks") Signed-off-by: Steven Price Reviewed-by: Jason Gunthorpe --- This fixes a splat I was seeing on a Firefly-RK3288, more details here: https://lore.kernel.org/all/26a5d1b8-40b3-b1e4-bc85-740409c26838@arm.com/ drivers/iommu/rockchip-iommu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index f30db22ea5d7..312a3df19904 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -1183,6 +1183,12 @@ static int rk_iommu_of_xlate(struct device *dev, return 0; } +static void rk_iommu_set_platform_dma(struct device *dev) +{ + struct iommu_domain *domain = iommu_get_domain_for_dev(dev); + rk_iommu_detach_device(domain, dev); +} + static const struct iommu_ops rk_iommu_ops = { .domain_alloc = rk_iommu_domain_alloc, .probe_device = rk_iommu_probe_device, @@ -1190,6 +1196,7 @@ static const struct iommu_ops rk_iommu_ops = { .device_group = rk_iommu_device_group, .pgsize_bitmap = RK_IOMMU_PGSIZE_BITMAP, .of_xlate = rk_iommu_of_xlate, + .set_platform_dma_ops = rk_iommu_set_platform_dma, .default_domain_ops = &(const struct iommu_domain_ops) { .attach_dev = rk_iommu_attach_device, .map = rk_iommu_map,