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=-8.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 A28BFCA9EB5 for ; Mon, 4 Nov 2019 18:20:36 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (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 78E6220869 for ; Mon, 4 Nov 2019 18:20:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="io6APnwa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 78E6220869 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 6418CE39; Mon, 4 Nov 2019 18:20:36 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 7CFB8B3E for ; Mon, 4 Nov 2019 18:20:34 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 23A2BA9 for ; Mon, 4 Nov 2019 18:20:34 +0000 (UTC) Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 23D7020578; Mon, 4 Nov 2019 18:20:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572891634; bh=1wytFv5Iw8uWVzJ3s5vXpqXK/zV2wyAIZTSZnZaZKpo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=io6APnwaPmm8zsNTcIXkmu0b62EI7JARNIW9QcJsF7VvFlAaMsn1nGvHxVNDXk4sA C9vytYZUPGlril/b8Th+ErOwOc9OC36jK4hOlRZnZGkL/ZXnCeAMIE4FBrVHevLL9g UXe6eAPQF7a7e57S6TnLgrty+B/Twl82z6DQJ8F0= Date: Mon, 4 Nov 2019 18:20:30 +0000 From: Will Deacon To: Robin Murphy Subject: Re: [PATCH v2 07/10] iommu/io-pgtable-arm: Rationalise MAIR handling Message-ID: <20191104182029.GG24909@willie-the-truck> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Cc: iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org On Fri, Oct 25, 2019 at 07:08:36PM +0100, Robin Murphy wrote: > Between VMSAv8-64 and the various 32-bit formats, there is either one > 64-bit MAIR or a pair of 32-bit MAIR0/MAIR1 or NMRR/PMRR registers. > As such, keeping two 64-bit values in io_pgtable_cfg has always been > overkill. > > Signed-off-by: Robin Murphy > --- > drivers/iommu/arm-smmu-v3.c | 2 +- > drivers/iommu/arm-smmu.c | 4 ++-- > drivers/iommu/io-pgtable-arm.c | 3 +-- > drivers/iommu/ipmmu-vmsa.c | 2 +- > drivers/iommu/qcom_iommu.c | 4 ++-- > include/linux/io-pgtable.h | 2 +- > 6 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c > index 8da93e730d6f..3f20e548f1ec 100644 > --- a/drivers/iommu/arm-smmu-v3.c > +++ b/drivers/iommu/arm-smmu-v3.c > @@ -2172,7 +2172,7 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain, > cfg->cd.asid = (u16)asid; > cfg->cd.ttbr = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[0]; > cfg->cd.tcr = pgtbl_cfg->arm_lpae_s1_cfg.tcr; > - cfg->cd.mair = pgtbl_cfg->arm_lpae_s1_cfg.mair[0]; > + cfg->cd.mair = pgtbl_cfg->arm_lpae_s1_cfg.mair; > return 0; > > out_free_asid: > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index 080af0326816..2bc3e93b11e6 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -552,8 +552,8 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, > cb->mair[0] = pgtbl_cfg->arm_v7s_cfg.prrr; > cb->mair[1] = pgtbl_cfg->arm_v7s_cfg.nmrr; > } else { > - cb->mair[0] = pgtbl_cfg->arm_lpae_s1_cfg.mair[0]; > - cb->mair[1] = pgtbl_cfg->arm_lpae_s1_cfg.mair[1]; > + cb->mair[0] = pgtbl_cfg->arm_lpae_s1_cfg.mair; > + cb->mair[1] = pgtbl_cfg->arm_lpae_s1_cfg.mair >> 32; Does this work correctly for big-endian? Will _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu 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=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 72D99CA9ED3 for ; Mon, 4 Nov 2019 18:20:37 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 48BAA20578 for ; Mon, 4 Nov 2019 18:20:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pdE1A6B4"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="io6APnwa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 48BAA20578 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5vJSarQdMioL+DI3/+YTzIJGRJemHHmzoRL7KB+HgKg=; b=pdE1A6B4S5GXgX lA9iGqwhytXQSobZWLVRXZhnkjFs8/ztO7Kyh0fEFsRVCyIbpOmIw7VPc/PlSlSEyy08Q490pnIdo olqu/Q8tg5qqedg17Pp7Ua8mVz1bQ77IESMztUSHWyF1kOLICnznu/SpUxsovPkb3xSCnrCb0i3UV mRsi2BxQtCVm8c0/b+tNnZDB77fvPzsV2taSAwxNJ7LvN5aoKA2bNgJEc50lqMXH0Nqk0J7YmYAem r1iMtO4WtLjswT+rTvnH8EQJdOeaxrbtfxCT8qlBGRu6nSr2E4MQAGEACuADGk2wBRU7iiYcAyzkb rfUbwVKWpyezlpRa/tJg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iRgxw-0006T2-Fw; Mon, 04 Nov 2019 18:20:36 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iRgxu-0006Sd-9y for linux-arm-kernel@lists.infradead.org; Mon, 04 Nov 2019 18:20:35 +0000 Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 23D7020578; Mon, 4 Nov 2019 18:20:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572891634; bh=1wytFv5Iw8uWVzJ3s5vXpqXK/zV2wyAIZTSZnZaZKpo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=io6APnwaPmm8zsNTcIXkmu0b62EI7JARNIW9QcJsF7VvFlAaMsn1nGvHxVNDXk4sA C9vytYZUPGlril/b8Th+ErOwOc9OC36jK4hOlRZnZGkL/ZXnCeAMIE4FBrVHevLL9g UXe6eAPQF7a7e57S6TnLgrty+B/Twl82z6DQJ8F0= Date: Mon, 4 Nov 2019 18:20:30 +0000 From: Will Deacon To: Robin Murphy Subject: Re: [PATCH v2 07/10] iommu/io-pgtable-arm: Rationalise MAIR handling Message-ID: <20191104182029.GG24909@willie-the-truck> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191104_102034_369327_2E2F8CE4 X-CRM114-Status: GOOD ( 16.69 ) 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: iommu@lists.linux-foundation.org, jcrouse@codeaurora.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Oct 25, 2019 at 07:08:36PM +0100, Robin Murphy wrote: > Between VMSAv8-64 and the various 32-bit formats, there is either one > 64-bit MAIR or a pair of 32-bit MAIR0/MAIR1 or NMRR/PMRR registers. > As such, keeping two 64-bit values in io_pgtable_cfg has always been > overkill. > > Signed-off-by: Robin Murphy > --- > drivers/iommu/arm-smmu-v3.c | 2 +- > drivers/iommu/arm-smmu.c | 4 ++-- > drivers/iommu/io-pgtable-arm.c | 3 +-- > drivers/iommu/ipmmu-vmsa.c | 2 +- > drivers/iommu/qcom_iommu.c | 4 ++-- > include/linux/io-pgtable.h | 2 +- > 6 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c > index 8da93e730d6f..3f20e548f1ec 100644 > --- a/drivers/iommu/arm-smmu-v3.c > +++ b/drivers/iommu/arm-smmu-v3.c > @@ -2172,7 +2172,7 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain, > cfg->cd.asid = (u16)asid; > cfg->cd.ttbr = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[0]; > cfg->cd.tcr = pgtbl_cfg->arm_lpae_s1_cfg.tcr; > - cfg->cd.mair = pgtbl_cfg->arm_lpae_s1_cfg.mair[0]; > + cfg->cd.mair = pgtbl_cfg->arm_lpae_s1_cfg.mair; > return 0; > > out_free_asid: > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index 080af0326816..2bc3e93b11e6 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -552,8 +552,8 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, > cb->mair[0] = pgtbl_cfg->arm_v7s_cfg.prrr; > cb->mair[1] = pgtbl_cfg->arm_v7s_cfg.nmrr; > } else { > - cb->mair[0] = pgtbl_cfg->arm_lpae_s1_cfg.mair[0]; > - cb->mair[1] = pgtbl_cfg->arm_lpae_s1_cfg.mair[1]; > + cb->mair[0] = pgtbl_cfg->arm_lpae_s1_cfg.mair; > + cb->mair[1] = pgtbl_cfg->arm_lpae_s1_cfg.mair >> 32; Does this work correctly for big-endian? Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel