From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2EE6CC001B0 for ; Mon, 14 Aug 2023 06:45:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:To:Subject:Cc: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oWUTlL8rk2OdtlPqYjduKUvYeqvjJ7PQ8YYulIj3AE0=; b=uxVySY+g4cS4VG wwy8QhvcpUUixb325WqIL1u5aCpUr2ehfuxfQ+4kmep/sB9QeAJrmRfIMsDu3Jb04G5nv3uAM5j8Y PnTI6rYrftJh5xlq0C850UysBkun/Db1b4iLBY6dlXSrRsfek7mJN/OeqCeWwZeoMpWKeY2AD6Vmy p+s9HbyDJfuWnmgsXpbnXPMjoNOHqEPHlX9P6RnWWAvpabyPmDsmRngvVYoWPOOrQ8FhOkbzwB5Ac 2VvkUJ21J5W1ObQf+DTb1+SwzF3jh0ElR9mcIWr5Im1gvWvrwdKgeAE7NnVYfGrTDAeYyfB3oCUF0 d+5yHRQxTgw9l5XgXWZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qVRKO-00GIRv-0o; Mon, 14 Aug 2023 06:45:24 +0000 Received: from mgamail.intel.com ([192.55.52.93]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qVRKK-00GIQI-2V; Mon, 14 Aug 2023 06:45:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691995520; x=1723531520; h=message-id:date:mime-version:cc:subject:to:references: from:in-reply-to:content-transfer-encoding; bh=s7w4QvLN+a+X+nJOo1ALAurEypsMjxpw55DQNKza1DY=; b=C1L/5BHvDnAYWVB/SZA1rzYtr58gor3Oi5Vh06sP1uKAUqyD3jtWA76K 4eRjeDNC3SXqkPmys6GR48QCYD/GYJPuD/JGYzgNtZH7tZVEpAexTOaic DOPP9QY9Hy1ya0m1lbFnBtqBqxwPz+b5muC1JAlfSJl6UJyreBUEeqrjp W9aVlLwgaghOpAWq5SxxyYaZE3kj9gIrwbXHOJTTgf8C8aEd30qeMZQGM PSRgxbWF6roV3QX4V8yQFJM9g1WWHfjVQmMfKkjCUx+hTmVBfc9jvBM59 OAHgtRwg3bPdW4oyBAY/2xprL+iXrGNH1gzpTxtQ/zMLqjIpcxV3TX2Xn A==; X-IronPort-AV: E=McAfee;i="6600,9927,10801"; a="369445396" X-IronPort-AV: E=Sophos;i="6.01,171,1684825200"; d="scan'208";a="369445396" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2023 23:45:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10801"; a="856979583" X-IronPort-AV: E=Sophos;i="6.01,171,1684825200"; d="scan'208";a="856979583" Received: from blu2-mobl.ccr.corp.intel.com (HELO [10.254.215.205]) ([10.254.215.205]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2023 23:44:52 -0700 Message-ID: Date: Mon, 14 Aug 2023 14:44:50 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Cc: baolu.lu@linux.intel.com, Dmitry Osipenko , Marek Szyprowski , Nicolin Chen , Niklas Schnelle , Steven Price , Thierry Reding Subject: Re: [PATCH v6 20/25] iommu/sun50i: Add an IOMMU_IDENTITIY_DOMAIN Content-Language: en-US To: Jason Gunthorpe , Andy Gross , Alim Akhtar , Bjorn Andersson , AngeloGioacchino Del Regno , Baolin Wang , Christophe Leroy , Gerald Schaefer , Heiko Stuebner , iommu@lists.linux.dev, Jernej Skrabec , Jonathan Hunter , Joerg Roedel , Kevin Tian , Konrad Dybcio , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-s390@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, Russell King , linuxppc-dev@lists.ozlabs.org, Matthias Brugger , Matthew Rosato , Michael Ellerman , Nicholas Piggin , Orson Zhai , Rob Clark , Robin Murphy , Samuel Holland , Thierry Reding , Krishna Reddy , Chen-Yu Tsai , Will Deacon , Yong Wu , Chunyan Zhang References: <20-v6-e8114faedade+425-iommu_all_defdom_jgg@nvidia.com> From: Baolu Lu In-Reply-To: <20-v6-e8114faedade+425-iommu_all_defdom_jgg@nvidia.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230813_234520_839785_A32BD063 X-CRM114-Status: GOOD ( 19.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2023/8/3 8:08, Jason Gunthorpe wrote: > Prior to commit 1b932ceddd19 ("iommu: Remove detach_dev callbacks") the > sun50i_iommu_detach_device() function was being called by > ops->detach_dev(). > > This is an IDENTITY domain so convert sun50i_iommu_detach_device() into > sun50i_iommu_identity_attach() and a full IDENTITY domain and thus hook it > back up the same was as the old ops->detach_dev(). > > Signed-off-by: Jason Gunthorpe > --- > drivers/iommu/sun50i-iommu.c | 26 +++++++++++++++++++------- > 1 file changed, 19 insertions(+), 7 deletions(-) > > diff --git a/drivers/iommu/sun50i-iommu.c b/drivers/iommu/sun50i-iommu.c > index 74c5cb93e90027..0bf08b120cf105 100644 > --- a/drivers/iommu/sun50i-iommu.c > +++ b/drivers/iommu/sun50i-iommu.c > @@ -757,21 +757,32 @@ static void sun50i_iommu_detach_domain(struct sun50i_iommu *iommu, > iommu->domain = NULL; > } > > -static void sun50i_iommu_detach_device(struct iommu_domain *domain, > - struct device *dev) > +static int sun50i_iommu_identity_attach(struct iommu_domain *identity_domain, > + struct device *dev) > { > - struct sun50i_iommu_domain *sun50i_domain = to_sun50i_domain(domain); > struct sun50i_iommu *iommu = dev_iommu_priv_get(dev); > + struct sun50i_iommu_domain *sun50i_domain; > > dev_dbg(dev, "Detaching from IOMMU domain\n"); > > - if (iommu->domain != domain) > - return; > + if (iommu->domain == identity_domain) > + return 0; > > + sun50i_domain = to_sun50i_domain(iommu->domain); > if (refcount_dec_and_test(&sun50i_domain->refcnt)) > sun50i_iommu_detach_domain(iommu, sun50i_domain); > + return 0; > } Does iommu->domain need to be set to identity_domain before returning? Best regards, baolu _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel