Message ID | 59a39f152a344cdfd26ca9f802562fc14a449d38.1694693889.git.robin.murphy@arm.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1334445vqi; Fri, 15 Sep 2023 14:39:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAPp6wJ3hbtAQrA7QRvAv0J48nGQLm1YQZ9GasiZ2kQbUhIwOPJvi5byhBfyryT2a6K/WQ X-Received: by 2002:a05:6a20:1584:b0:14d:29f6:18c3 with SMTP id h4-20020a056a20158400b0014d29f618c3mr3514858pzj.20.1694813958134; Fri, 15 Sep 2023 14:39:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694813958; cv=none; d=google.com; s=arc-20160816; b=MoGSWGXGI5YGgfrs26F+fHPg5rCwLNnEDy45Bmvo00gVZ+NiW8cFpmg+urdMTdB0+Z pDS/0x2Y4z69xsVpWI9Kr0FLLchBWjk4yr/ATKXvXrJRPiqZCWO2n6nxmNEA3/vKukXo 8Iuf8WV0j/A34ryR64WSvINkWrUnaq/aA1x9nS9khnd4VLg+b86f3uiFtyaNVubHq/yN I+4aUSAgujHLkEvXdY50YVWPq+ky9nt+g4De4XUoHDFhiM9PlGQfPRpWi0tkwvAJRgkP nKe84XIgRbfnKJ+5LwFqZzbjRZtGsbhWs13axlFQBluR+rXTzjP39q/Vo5aR4NWmIaFS blMw== 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; bh=nS4yDMN0W5VvuizcUtsFQDfU4sNJ9NvWyTXVZxft1rk=; fh=3SO4sBNpOFNxfB4XNpCUWqe4lDXSOQ4O5f1XEPxUZRQ=; b=h5scbYNz361327Ur4wng4lX7FLImwD+fwIJBgQoZcNhLdqxeK8s/lfQgahlUdPw+Oz 3Gh0LPL8+UQpeVXelcGfNTe1cK4D90Eol3MOUS7+6QOUJRegfbzmTqeojnAH+DpmHRAd b7tLcDdUefAx104+DpWzlh5c/DKapYtquRpbCi9fPqFSpNEqTJMx20wFRi+FAWuNAb1e kPOLCsmLeOhZY+mxPvNIyUd7Ept6zaVlydmcQHMWz4EtHpWEaDYMSUdYz7hULx3zWHSc g8OKtvR1SHZmlWFkpC/ycSmb2/aEQCABcPWSbtdKj3piiU7qqoGSjGvwpEyfc5Zr/bT/ AMHA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id u12-20020a170902e5cc00b001bbae3ae2bcsi4325086plf.413.2023.09.15.14.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 14:39:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 67E2A834E759; Fri, 15 Sep 2023 09:59:23 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235250AbjIOQ6q (ORCPT <rfc822;ruipengqi7@gmail.com> + 30 others); Fri, 15 Sep 2023 12:58:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234696AbjIOQ6g (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 15 Sep 2023 12:58:36 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 26757211E for <linux-kernel@vger.kernel.org>; Fri, 15 Sep 2023 09:58:32 -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 2A72CC15; Fri, 15 Sep 2023 09:59:09 -0700 (PDT) Received: from e121345-lin.cambridge.arm.com (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C535E3F5A1; Fri, 15 Sep 2023 09:58:30 -0700 (PDT) From: Robin Murphy <robin.murphy@arm.com> To: joro@8bytes.org, will@kernel.org Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, jgg@nvidia.com, baolu.lu@linux.intel.com Subject: [PATCH v3 5/7] iommu/arm-smmu: Don't register fwnode for legacy binding Date: Fri, 15 Sep 2023 17:58:09 +0100 Message-Id: <59a39f152a344cdfd26ca9f802562fc14a449d38.1694693889.git.robin.murphy@arm.com> X-Mailer: git-send-email 2.39.2.101.g768bb238c484.dirty In-Reply-To: <cover.1694693889.git.robin.murphy@arm.com> References: <cover.1694693889.git.robin.murphy@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 15 Sep 2023 09:59:23 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777141240449271938 X-GMAIL-MSGID: 1777141240449271938 |
Series |
Iommu: Retire bus ops
|
|
Commit Message
Robin Murphy
Sept. 15, 2023, 4:58 p.m. UTC
When using the legacy binding we bypass the of_xlate mechanism, so avoid registering the instance fwnodes which act as keys for that. This will help __iommu_probe_device() to retrieve the registered ops the same way as for x86 etc. when no fwspec has previously been set up by of_xlate. Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- drivers/iommu/arm/arm-smmu/arm-smmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c index d6d1a2a55cc0..4b83a3adacd6 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -2161,7 +2161,8 @@ static int arm_smmu_device_probe(struct platform_device *pdev) return err; } - err = iommu_device_register(&smmu->iommu, &arm_smmu_ops, dev); + err = iommu_device_register(&smmu->iommu, &arm_smmu_ops, + using_legacy_binding ? NULL : dev); if (err) { dev_err(dev, "Failed to register iommu\n"); iommu_device_sysfs_remove(&smmu->iommu);