From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: Re: [RESEND PATCH v17 2/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device Date: Fri, 23 Nov 2018 18:36:01 +0000 Message-ID: <20181123183555.GE21183@arm.com> References: <20181116112430.31248-1-vivek.gautam@codeaurora.org> <20181116112430.31248-3-vivek.gautam@codeaurora.org> <20181121173757.GA9801@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Vivek Gautam Cc: Mark Rutland , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Linux PM , sboyd-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-arm-msm , "Rafael J. Wysocki" , open list , "list-Y9sIeH5OGRo@public.gmane.org:IOMMU DRIVERS , Joerg Roedel , " , alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, robh+dt , freedreno , Robin Murphy List-Id: linux-arm-msm@vger.kernel.org On Thu, Nov 22, 2018 at 05:32:24PM +0530, Vivek Gautam wrote: > Hi Will, > > On Wed, Nov 21, 2018 at 11:09 PM Will Deacon wrote: > > > > On Fri, Nov 16, 2018 at 04:54:27PM +0530, Vivek Gautam wrote: > > > From: Sricharan R > > > > > > The smmu device probe/remove and add/remove master device callbacks > > > gets called when the smmu is not linked to its master, that is without > > > the context of the master device. So calling runtime apis in those places > > > separately. > > > Global locks are also initialized before enabling runtime pm as the > > > runtime_resume() calls device_reset() which does tlb_sync_global() > > > that ultimately requires locks to be initialized. > > > > > > Signed-off-by: Sricharan R > > > [vivek: Cleanup pm runtime calls] > > > Signed-off-by: Vivek Gautam > > > Reviewed-by: Tomasz Figa > > > Tested-by: Srinivas Kandagatla > > > Reviewed-by: Robin Murphy > > > --- > > > drivers/iommu/arm-smmu.c | 101 ++++++++++++++++++++++++++++++++++++++++++----- > > > 1 file changed, 91 insertions(+), 10 deletions(-) > > > > Given that you're doing the get/put in the TLBI ops unconditionally: > > > > > static void arm_smmu_flush_iotlb_all(struct iommu_domain *domain) > > > { > > > struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); > > > + struct arm_smmu_device *smmu = smmu_domain->smmu; > > > > > > - if (smmu_domain->tlb_ops) > > > + if (smmu_domain->tlb_ops) { > > > + arm_smmu_rpm_get(smmu); > > > smmu_domain->tlb_ops->tlb_flush_all(smmu_domain); > > > + arm_smmu_rpm_put(smmu); > > > + } > > > } > > > > > > static void arm_smmu_iotlb_sync(struct iommu_domain *domain) > > > { > > > struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); > > > + struct arm_smmu_device *smmu = smmu_domain->smmu; > > > > > > - if (smmu_domain->tlb_ops) > > > + if (smmu_domain->tlb_ops) { > > > + arm_smmu_rpm_get(smmu); > > > smmu_domain->tlb_ops->tlb_sync(smmu_domain); > > > + arm_smmu_rpm_put(smmu); > > > + } > > > > Why do you need them around the map/unmap calls as well? > > We still have .tlb_add_flush path? Ok, so we could add the ops around that as well. Right now, we've got the runtime pm hooks crossing two parts of the API. Will 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 X-Spam-Level: X-Spam-Status: No, score=-5.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6395C43441 for ; Fri, 23 Nov 2018 18:35:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D94520824 for ; Fri, 23 Nov 2018 18:35:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D94520824 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437225AbeKXFVL (ORCPT ); Sat, 24 Nov 2018 00:21:11 -0500 Received: from foss.arm.com ([217.140.101.70]:51074 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731181AbeKXFVK (ORCPT ); Sat, 24 Nov 2018 00:21:10 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 90B8B3620; Fri, 23 Nov 2018 10:35:45 -0800 (PST) Received: from edgewater-inn.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 60E413F5CF; Fri, 23 Nov 2018 10:35:45 -0800 (PST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id D144B1AE1019; Fri, 23 Nov 2018 18:36:01 +0000 (GMT) Date: Fri, 23 Nov 2018 18:36:01 +0000 From: Will Deacon To: Vivek Gautam Cc: Mark Rutland , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , alex.williamson@redhat.com, Linux PM , sboyd@kernel.org, freedreno , "Rafael J. Wysocki" , open list , "list@263.net:IOMMU DRIVERS , Joerg Roedel ," , robh+dt , linux-arm-msm , Robin Murphy Subject: Re: [RESEND PATCH v17 2/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device Message-ID: <20181123183555.GE21183@arm.com> References: <20181116112430.31248-1-vivek.gautam@codeaurora.org> <20181116112430.31248-3-vivek.gautam@codeaurora.org> <20181121173757.GA9801@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 22, 2018 at 05:32:24PM +0530, Vivek Gautam wrote: > Hi Will, > > On Wed, Nov 21, 2018 at 11:09 PM Will Deacon wrote: > > > > On Fri, Nov 16, 2018 at 04:54:27PM +0530, Vivek Gautam wrote: > > > From: Sricharan R > > > > > > The smmu device probe/remove and add/remove master device callbacks > > > gets called when the smmu is not linked to its master, that is without > > > the context of the master device. So calling runtime apis in those places > > > separately. > > > Global locks are also initialized before enabling runtime pm as the > > > runtime_resume() calls device_reset() which does tlb_sync_global() > > > that ultimately requires locks to be initialized. > > > > > > Signed-off-by: Sricharan R > > > [vivek: Cleanup pm runtime calls] > > > Signed-off-by: Vivek Gautam > > > Reviewed-by: Tomasz Figa > > > Tested-by: Srinivas Kandagatla > > > Reviewed-by: Robin Murphy > > > --- > > > drivers/iommu/arm-smmu.c | 101 ++++++++++++++++++++++++++++++++++++++++++----- > > > 1 file changed, 91 insertions(+), 10 deletions(-) > > > > Given that you're doing the get/put in the TLBI ops unconditionally: > > > > > static void arm_smmu_flush_iotlb_all(struct iommu_domain *domain) > > > { > > > struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); > > > + struct arm_smmu_device *smmu = smmu_domain->smmu; > > > > > > - if (smmu_domain->tlb_ops) > > > + if (smmu_domain->tlb_ops) { > > > + arm_smmu_rpm_get(smmu); > > > smmu_domain->tlb_ops->tlb_flush_all(smmu_domain); > > > + arm_smmu_rpm_put(smmu); > > > + } > > > } > > > > > > static void arm_smmu_iotlb_sync(struct iommu_domain *domain) > > > { > > > struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); > > > + struct arm_smmu_device *smmu = smmu_domain->smmu; > > > > > > - if (smmu_domain->tlb_ops) > > > + if (smmu_domain->tlb_ops) { > > > + arm_smmu_rpm_get(smmu); > > > smmu_domain->tlb_ops->tlb_sync(smmu_domain); > > > + arm_smmu_rpm_put(smmu); > > > + } > > > > Why do you need them around the map/unmap calls as well? > > We still have .tlb_add_flush path? Ok, so we could add the ops around that as well. Right now, we've got the runtime pm hooks crossing two parts of the API. Will