Message ID | 5ae4c8ce4e83ee25a1ccfb54a1403c9371b52eca.1696253096.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:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1450748vqb; Mon, 2 Oct 2023 07:06:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFNkfLSE7u8MQmqI0mx/hq5Y/SDGg7/ghJul4Clcik30D8r4DIMBniB7Cw/hTQvJO0kuxAD X-Received: by 2002:a17:90b:1e05:b0:26d:416a:d9d2 with SMTP id pg5-20020a17090b1e0500b0026d416ad9d2mr11689010pjb.45.1696255579692; Mon, 02 Oct 2023 07:06:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696255579; cv=none; d=google.com; s=arc-20160816; b=JH3uVQETCcviIKjXyqcpsHZF62F9+GXOv5OSZ1/psAy1K4mbSOrcCWrPL2b++F5hxp HR8AVdSn141Fr7bqgSoLpP9MzeQHMCVxfAjpgbVC148M95cwho7wP64UTRbS9OlxYqqc 42i9gX3SYYIiGcLY8rnQB9LcK7nH09O7ltfjjmXaEIGcRRYtcqkJ07OEB/qYKKqKzurV 3V6dgtG9/G8NB8gf0XEK2d9PavH7E0KebIl9SZZ+Et+NU7jWJ+Q0IdVGd7R5R30Ce1nO EPcd+7BAO2rUwnN5IOduookr4Qf9by7JvPyEvpF/2Ypy4OsdwaGBK1qXS7JxWGg8/vRY Yb8Q== 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=3nQM0QufZPSZ94JO+WDmHkrFziuG1/NJr0OD1jy0Wvc=; b=icVPJJCJoEUScyl20f+CdlO/G/f4tfKtyYU+lNJqJGQv+KTAfMmMJELNPP1VCSsBVE DDmBr1947DstXz7GiJYiZZPhm3570d7xMmbvB2vbVEz57wQ9dbckSfgdPEKkGlys/k+g julo48DsXyUVW/uIITDmnFl9dm21VNdtRrMZ6vHKhyqzhvawraf5l1Dructrfa0spjH7 580b15gMSBr9sDU44WOX1w5Sf09mA+6Cdyhq4qAkC68zDoG5oBWt/1s5S2Kplh69uf/s 3dOgJWic0ZJ4EXzvFdJCOwcKn3xTVTiSjs5dRNZlYxygzhiUzJl/zQs+r6Y5Z7bRLjf6 l9JQ== 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 rm12-20020a17090b3ecc00b00252d84b7af0si8227488pjb.181.2023.10.02.07.06.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 07:06:19 -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 61F8C8029155; Mon, 2 Oct 2023 06:49:50 -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 S237497AbjJBNtk (ORCPT <rfc822;pusanteemu@gmail.com> + 18 others); Mon, 2 Oct 2023 09:49:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237534AbjJBNte (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 2 Oct 2023 09:49:34 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B9822B8 for <linux-kernel@vger.kernel.org>; Mon, 2 Oct 2023 06:49:27 -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 F0729DA7; Mon, 2 Oct 2023 06:50:05 -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 9DBDF3F762; Mon, 2 Oct 2023 06:49:26 -0700 (PDT) From: Robin Murphy <robin.murphy@arm.com> To: joro@8bytes.org, will@kernel.org Cc: iommu@lists.linux.dev, jgg@nvidia.com, baolu.lu@linux.intel.com, linux-kernel@vger.kernel.org Subject: [PATCH v4 5/7] iommu/arm-smmu: Don't register fwnode for legacy binding Date: Mon, 2 Oct 2023 14:49:13 +0100 Message-Id: <5ae4c8ce4e83ee25a1ccfb54a1403c9371b52eca.1696253096.git.robin.murphy@arm.com> X-Mailer: git-send-email 2.39.2.101.g768bb238c484.dirty In-Reply-To: <cover.1696253096.git.robin.murphy@arm.com> References: <cover.1696253096.git.robin.murphy@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,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]); Mon, 02 Oct 2023 06:49:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778652891112079270 X-GMAIL-MSGID: 1778652891112079270 |
Series |
iommu: Retire bus ops
|
|
Commit Message
Robin Murphy
Oct. 2, 2023, 1:49 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);