From patchwork Fri Mar 24 11:11:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Price X-Patchwork-Id: 74489 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp554560vqo; Fri, 24 Mar 2023 04:36:54 -0700 (PDT) X-Google-Smtp-Source: AKy350aHDA49sO4VcwgVNWrVaCCEO4bdaST7TkbLqc0M96AI8Kmj5m7Rt4M0fE4U32mOhVmBrkgZ X-Received: by 2002:a05:6402:5178:b0:4fa:57bf:141a with SMTP id d24-20020a056402517800b004fa57bf141amr3383000ede.32.1679657814210; Fri, 24 Mar 2023 04:36:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679657814; cv=none; d=google.com; s=arc-20160816; b=pbzWcANOsDgTsg1F9VECDMmlscIBwMdYre6r9RdGoI1ZQ6naagAwaVPx0XuhL5cKLq HvjyeSa/iXkzsnbZripRZYxvOrc2Wi+7TvcYKahu5RelFpms4I0WfVmvZfdXoaYkrQtp aDqoHmAo0FeD+au8e44lp0AZ5WxqqaLRWyjyS7EDqyAXCA1lU6gdTrFt5wwK9iNeq6Mf EuHon/X65EdVpmI+9e68UPW8+ZB1hd6E5mDaH7dTizsdnU4Rh0hEDR6/miLD82d0D19q 86l8EqQXDupdklVpVLjgW0YXZG+Zz+dSe3B9U9pcwwVU7pzaNrj9QdtE37K6WBP356Wh EIJw== 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=g44opJO2j+9fkITm9oQEFkblsck/zEWcOV24R2SdxNs=; b=T0QlIlP98K7hvqA8stYyjj79eutlPgDBmVMazCvA+GgBRiz8GkHZG/1Ag08Kn6Sl30 vFKsqOD2lGVRrMQhu6nv+4dw1U8PfH52+ZNdw3VYm6dsd/d6HJewf6ZNWUs2skTHhhXq F+IEYB+ddOcUgTt1cH8LZVQG+VzSihakWgcodr4KjjECKErcfwYxufFQ9leRMNe738Ah xDJfxDJ7FAks8/fpoPEohi0v1Pyq7DnoAkZk+fK0UNzCCXcRymgQjnVBs9Ws8D6KHjcr G9cUtye2jLTRgs9a3Y4UAMs4pNFRC/RswyJnYT9t5QRFoje3cjMUroN/4RyGU2n/P8tu WAwQ== 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 f3-20020a05640214c300b004af7e6911e7si21172955edx.528.2023.03.24.04.36.30; Fri, 24 Mar 2023 04:36:54 -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 S231721AbjCXLLk (ORCPT + 99 others); Fri, 24 Mar 2023 07:11:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231516AbjCXLLg (ORCPT ); Fri, 24 Mar 2023 07:11:36 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 01F6919127 for ; Fri, 24 Mar 2023 04:11:34 -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 BC58E11FB; Fri, 24 Mar 2023 04:12:18 -0700 (PDT) Received: from e112269-lin.cambridge.arm.com (e112269-lin.cambridge.arm.com [10.1.194.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5D5AD3F6C4; Fri, 24 Mar 2023 04:11:33 -0700 (PDT) From: Steven Price To: Heiko Stuebner , Joerg Roedel , Jason Gunthorpe Cc: Steven Price , Will Deacon , Robin Murphy , iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH v2] iommu/rockchip: Add missing set_platform_dma_ops callback Date: Fri, 24 Mar 2023 11:11:27 +0000 Message-Id: <20230324111127.221640-1-steven.price@arm.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761248872135683260?= 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). But also the use of a NULL domain is confusing. Rework the code to have a singleton rk_identity_domain which is assigned to domain when using an identity mapping rather than "detaching". This makes the code easier to reason about. Signed-off-by: Steven Price Reviewed-by: Jason Gunthorpe --- Changes since v1[1]: * Reworked the code to avoid a NULL domain, instead a singleton rk_identity_domain is used instead. The 'detach' language is no longer used. [1] https://lore.kernel.org/r/20230315164152.333251-1-steven.price%40arm.com drivers/iommu/rockchip-iommu.c | 50 ++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index f30db22ea5d7..437541004994 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -124,6 +124,7 @@ struct rk_iommudata { static struct device *dma_dev; static const struct rk_iommu_ops *rk_ops; +static struct iommu_domain rk_identity_domain; static inline void rk_table_flush(struct rk_iommu_domain *dom, dma_addr_t dma, unsigned int count) @@ -980,26 +981,27 @@ static int rk_iommu_enable(struct rk_iommu *iommu) return ret; } -static void rk_iommu_detach_device(struct iommu_domain *domain, - struct device *dev) +static int rk_iommu_identity_attach(struct iommu_domain *identity_domain, + struct device *dev) { struct rk_iommu *iommu; - struct rk_iommu_domain *rk_domain = to_rk_domain(domain); + struct rk_iommu_domain *rk_domain; unsigned long flags; int ret; /* Allow 'virtual devices' (eg drm) to detach from domain */ iommu = rk_iommu_from_dev(dev); if (!iommu) - return; + return -ENODEV; + + rk_domain = to_rk_domain(iommu->domain); dev_dbg(dev, "Detaching from iommu domain\n"); - /* iommu already detached */ - if (iommu->domain != domain) - return; + if (iommu->domain == identity_domain) + return 0; - iommu->domain = NULL; + iommu->domain = identity_domain; spin_lock_irqsave(&rk_domain->iommus_lock, flags); list_del_init(&iommu->node); @@ -1011,7 +1013,25 @@ static void rk_iommu_detach_device(struct iommu_domain *domain, rk_iommu_disable(iommu); pm_runtime_put(iommu->dev); } + + return 0; +} + +static struct iommu_domain_ops rk_identity_ops = { + .attach_dev = rk_iommu_identity_attach, +}; + +static struct iommu_domain rk_identity_domain = { + .type = IOMMU_DOMAIN_IDENTITY, + .ops = &rk_identity_ops, +}; + +#ifdef CONFIG_ARM +static void rk_iommu_set_platform_dma(struct device *dev) +{ + WARN_ON(rk_iommu_identity_attach(&rk_identity_domain, dev)); } +#endif static int rk_iommu_attach_device(struct iommu_domain *domain, struct device *dev) @@ -1035,8 +1055,9 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, if (iommu->domain == domain) return 0; - if (iommu->domain) - rk_iommu_detach_device(iommu->domain, dev); + ret = rk_iommu_identity_attach(&rk_identity_domain, dev); + if (ret) + return ret; iommu->domain = domain; @@ -1050,7 +1071,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, ret = rk_iommu_enable(iommu); if (ret) - rk_iommu_detach_device(iommu->domain, dev); + WARN_ON(rk_iommu_identity_attach(&rk_identity_domain, dev)); pm_runtime_put(iommu->dev); @@ -1061,6 +1082,9 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) { struct rk_iommu_domain *rk_domain; + if (type == IOMMU_DOMAIN_IDENTITY) + return &rk_identity_domain; + if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_DMA) return NULL; @@ -1176,6 +1200,7 @@ static int rk_iommu_of_xlate(struct device *dev, iommu_dev = of_find_device_by_node(args->np); data->iommu = platform_get_drvdata(iommu_dev); + data->iommu->domain = &rk_identity_domain; dev_iommu_priv_set(dev, data); platform_device_put(iommu_dev); @@ -1188,6 +1213,9 @@ static const struct iommu_ops rk_iommu_ops = { .probe_device = rk_iommu_probe_device, .release_device = rk_iommu_release_device, .device_group = rk_iommu_device_group, +#ifdef CONFIG_ARM + .set_platform_dma_ops = rk_iommu_set_platform_dma, +#endif .pgsize_bitmap = RK_IOMMU_PGSIZE_BITMAP, .of_xlate = rk_iommu_of_xlate, .default_domain_ops = &(const struct iommu_domain_ops) {