From patchwork Thu Jan 19 19:18:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Murphy X-Patchwork-Id: 45944 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp503081wrn; Thu, 19 Jan 2023 11:21:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXvfFLQDNuCgM6QxtZ/+Hr3R/ULbhsKe6wkUPsT4v4F5XC51L7Ygu4g/TFJUCu2ppr51fD4T X-Received: by 2002:a62:19cb:0:b0:58d:b2eb:86ef with SMTP id 194-20020a6219cb000000b0058db2eb86efmr11454321pfz.9.1674156119669; Thu, 19 Jan 2023 11:21:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674156119; cv=none; d=google.com; s=arc-20160816; b=dkaX6zKoETBQ0l+RqnsdSOKXBLvG+kS1s+atSAY9QMgAGMr6nAn8GREMyxQvypr7n4 KbIbBAgnLhVrIcoIwrM6+tb3KOQe8RVSoa2ENucilqPiD5f58L/l7+aeWGodUBRNVfhE VExuMC4wy13N21Ctji2q+vo+NaC3HP45L9p486wT0Ifz5J/DpW4zROwoaegejB1YVnju huVx6e40Tgiua3atrMekaHNwFG5Npj1yXvFtBp9/fz16n3KmWHZQdHB0iZM+qjkAr3hB dXet2Axkd8Uc7pJaeblvmc+HlECqI+GKyFyc8XMCd4LdBMmmcnAU/WQPync+R3z4lYP0 4u/Q== 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=QIGRBOEtobpEgcEjBeJGkmb4fV2/3LulrINwdgJB4bw=; b=HVFbXTVuB813qLsjnbgkw4mvqJMp09HOS2+aIjK6Xz+8Xkuio9G3zfZ/SUrkLAiBnx OYC3cX3XHItwl9sDjSBcqNIXSlQYdgPflpcCt7G4gM6el6J3eeTf1PN8/Hw2734D/6Rx PEGenkrWN8BIILpETjj3jL7jJswwLWv9dc7U82y0CcvwDzny1Ft0dDKp6pzmCoHIg7lM EsLg7m87+4ubiG+bErQZYxVGob0mM3X4cgOAZqDlEZl97o8XCRWI+f/H/gWAppfGtmkw m7OSdWzcLA4t/lzOxrL2fy5F8YdRETFD8VK0aNwi0kENTj2FXn+Aqk4VeADGIJ2rZUdz 1QBw== 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 u70-20020a627949000000b00588c119c016si32600151pfc.135.2023.01.19.11.21.47; Thu, 19 Jan 2023 11:21:59 -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; 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 S231436AbjASTU5 (ORCPT + 99 others); Thu, 19 Jan 2023 14:20:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231447AbjASTUd (ORCPT ); Thu, 19 Jan 2023 14:20:33 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CEC6446726 for ; Thu, 19 Jan 2023 11:19:44 -0800 (PST) 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 E02CC106F; Thu, 19 Jan 2023 11:19:27 -0800 (PST) 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 71A913F67D; Thu, 19 Jan 2023 11:18:45 -0800 (PST) From: Robin Murphy To: joro@8bytes.org, will@kernel.org Cc: hch@lst.de, jgg@nvidia.com, iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/8] iommu/arm-smmu: Don't register fwnode for legacy binding Date: Thu, 19 Jan 2023 19:18:23 +0000 Message-Id: <01c68ef4d924d3671016690fa946eab306a1de07.1673978700.git.robin.murphy@arm.com> X-Mailer: git-send-email 2.36.1.dirty In-Reply-To: References: 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?1755479927709875863?= X-GMAIL-MSGID: =?utf-8?q?1755479927709875863?= 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. Signed-off-by: Robin Murphy --- 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 719fbca1fe52..607f06af01b6 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -2156,7 +2156,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);