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=-11.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 E5BC0C433E7 for ; Wed, 14 Oct 2020 15:57:36 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 712EE2222C for ; Wed, 14 Oct 2020 15:57:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="th2CqwO2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 712EE2222C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NKjPqZhb3ZacgddjY8Fu0RsDLjJrzWQKnr4zzBfsARw=; b=th2CqwO2p2ltGP0xOTRiNwRUH XWV6Hj2Lx6d0XPghs7l8Gl4EikEp63CioNmvk/xZ+PFHAaOfpLzy38yQlPeEs6YAQZaoypI1C+7ET KexQ/4oQ1vV2o/WRA2xgXiIr9PAocJ67veTODWWfJKxsqsz6z7v6z7l4hv95MtgyV5SGKHBwUbemy FpMoGhvfBl5WbsU6QVA97jnqzhStrWKG3YIGkHPjF3vOdrj79HDMx6iLjM19zJ+7jJ6FBcIcVVX/C Vy96GV5ChQReVnHkiDsV14hPsvcFoZuQqflFlqrQq6qwNP9fnCUEYosW3ZGId0mBkzdxdQgYdA6li 0bJ/svmhA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSj8Z-00033M-KG; Wed, 14 Oct 2020 15:56:23 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSj8W-00032L-Jm for linux-arm-kernel@lists.infradead.org; Wed, 14 Oct 2020 15:56:21 +0000 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 B33FCD6E; Wed, 14 Oct 2020 08:56:19 -0700 (PDT) Received: from [10.57.48.76] (unknown [10.57.48.76]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8D09F3F71F; Wed, 14 Oct 2020 08:56:17 -0700 (PDT) Subject: Re: [PATCH 6/8] iommu/arm-smmu: Move stream mapping reset to separate function To: kholk11@gmail.com, will@kernel.org References: <20200926130004.13528-1-kholk11@gmail.com> <20200926130004.13528-7-kholk11@gmail.com> From: Robin Murphy Message-ID: <70da2261-df85-e982-7646-8b3b8988a9fc@arm.com> Date: Wed, 14 Oct 2020 16:56:15 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Thunderbird/78.3.2 MIME-Version: 1.0 In-Reply-To: <20200926130004.13528-7-kholk11@gmail.com> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201014_115620_702584_F5542233 X-CRM114-Status: GOOD ( 22.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, marijns95@gmail.com, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, joro@8bytes.org, konradybcio@gmail.com, bjorn.andersson@linaro.org, martin.botka1@gmail.com, phone-devel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 2020-09-26 14:00, kholk11@gmail.com wrote: > From: AngeloGioacchino Del Regno > > Move the stream mapping reset logic from arm_smmu_device_reset into > a separate arm_smmu_stream_mapping_reset function, in preparation > for implementing an implementation detail. > > This commit brings no functional changes. Please coordinate with Bjorn's series so you're not wasting time developing 'competing' implementations of the exact same thing. You don't need these last 3 patches, for reasons I've already explained over there. Robin. > Signed-off-by: AngeloGioacchino Del Regno > --- > drivers/iommu/arm/arm-smmu/arm-smmu.c | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) > > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c > index 446a78dde9cd..8c070c493315 100644 > --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c > +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c > @@ -1652,14 +1652,9 @@ static struct iommu_ops arm_smmu_ops = { > .pgsize_bitmap = -1UL, /* Restricted during device attach */ > }; > > -static void arm_smmu_device_reset(struct arm_smmu_device *smmu) > +static void arm_smmu_stream_mapping_reset(struct arm_smmu_device *smmu) > { > int i; > - u32 reg; > - > - /* clear global FSR */ > - reg = arm_smmu_gr0_read(smmu, ARM_SMMU_GR0_sGFSR); > - arm_smmu_gr0_write(smmu, ARM_SMMU_GR0_sGFSR, reg); > > /* > * Reset stream mapping groups: Initial values mark all SMRn as > @@ -1673,6 +1668,18 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu) > arm_smmu_write_context_bank(smmu, i); > arm_smmu_cb_write(smmu, i, ARM_SMMU_CB_FSR, ARM_SMMU_FSR_FAULT); > } > +} > + > +static void arm_smmu_device_reset(struct arm_smmu_device *smmu) > +{ > + u32 reg; > + > + /* clear global FSR */ > + reg = arm_smmu_gr0_read(smmu, ARM_SMMU_GR0_sGFSR); > + arm_smmu_gr0_write(smmu, ARM_SMMU_GR0_sGFSR, reg); > + > + /* Reset stream mapping */ > + arm_smmu_stream_mapping_reset(smmu); > > /* Invalidate the TLB, just in case */ > arm_smmu_gr0_write(smmu, ARM_SMMU_GR0_TLBIALLH, QCOM_DUMMY_VAL); > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel