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.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,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 0D340C3A5A1 for ; Thu, 22 Aug 2019 10:09:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E26C7233FC for ; Thu, 22 Aug 2019 10:09:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733309AbfHVKJJ (ORCPT ); Thu, 22 Aug 2019 06:09:09 -0400 Received: from foss.arm.com ([217.140.110.172]:42950 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731583AbfHVKJH (ORCPT ); Thu, 22 Aug 2019 06:09:07 -0400 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 3587F15A2; Thu, 22 Aug 2019 03:09:07 -0700 (PDT) Received: from [192.168.1.123] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E13E43F246; Thu, 22 Aug 2019 03:09:02 -0700 (PDT) Subject: Re: [PATCH v10 09/23] iommu/io-pgtable-arm-v7s: Extend to support PA[33:32] for MediaTek To: Yong Wu , Will Deacon Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org, Nicolas Boichat , cui.zhang@mediatek.com, srv_heupstream@mediatek.com, chao.hao@mediatek.com, Joerg Roedel , linux-kernel@vger.kernel.org, Evan Green , Tomasz Figa , iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Matthias Brugger , ming-fan.chen@mediatek.com, anan.sun@mediatek.com, Matthias Kaehlcke , linux-arm-kernel@lists.infradead.org References: <1566395606-7975-1-git-send-email-yong.wu@mediatek.com> <1566395606-7975-10-git-send-email-yong.wu@mediatek.com> <20190821152448.qmoqjh5zznfpdi6n@willie-the-truck> <1566464186.11621.7.camel@mhfsdcap03> From: Robin Murphy Message-ID: <10d5122d-3375-161b-9356-2ddfc1c835bd@arm.com> Date: Thu, 22 Aug 2019 11:08:58 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <1566464186.11621.7.camel@mhfsdcap03> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2019-08-22 9:56 am, Yong Wu wrote: > On Wed, 2019-08-21 at 16:24 +0100, Will Deacon wrote: >> On Wed, Aug 21, 2019 at 09:53:12PM +0800, Yong Wu wrote: >>> MediaTek extend the arm v7s descriptor to support up to 34 bits PA where >>> the bit32 and bit33 are encoded in the bit9 and bit4 of the PTE >>> respectively. Meanwhile the iova still is 32bits. >>> >>> Regarding whether the pagetable address could be over 4GB, the mt8183 >>> support it while the previous mt8173 don't, thus keep it as is. >>> >>> Signed-off-by: Yong Wu >>> --- >>> drivers/iommu/io-pgtable-arm-v7s.c | 32 +++++++++++++++++++++++++------- >>> include/linux/io-pgtable.h | 7 +++---- >>> 2 files changed, 28 insertions(+), 11 deletions(-) >> >> [...] >> >>> @@ -731,7 +747,9 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, >>> { >>> struct arm_v7s_io_pgtable *data; >>> >>> - if (cfg->ias > ARM_V7S_ADDR_BITS || cfg->oas > ARM_V7S_ADDR_BITS) >>> + if (cfg->ias > ARM_V7S_ADDR_BITS || >>> + (cfg->oas > ARM_V7S_ADDR_BITS && >>> + !(cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT))) >> >> Please can you instead change arm_v7s_alloc_pgtable() so that it allows an >> ias of up to 34 when the IO_PGTABLE_QUIRK_ARM_MTK_EXT is set? > > Here I only simply skip the oas checking for our case. then which way do > your prefer? something like you commented before:? > > > if (cfg->ias > ARM_V7S_ADDR_BITS) > return NULL; > > if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT) { > if (!IS_ENABLED(CONFIG_PHYS_ADDR_T_64BIT)) > cfg->oas = min(cfg->oas, ARM_V7S_ADDR_BITS); > else if (cfg->oas > 34) > return NULL; > } else if (cfg->oas > ARM_V7S_ADDR_BITS) { > return NULL; > } All it should take is something like: if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT) max_oas = 34; else max_oas = 32; if (cfg->oas > max_oas) return NULL; or even just: if (cfg->oas > 32 || (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT && cfg->oas > 34)) return NULL; (and if we prefer the latter style, perhaps we could introduce some kind of "is_mtk_4gb()" helper to save on verbosity) We shouldn't need to care about the size of phys_addr_t either way - the fact is that the MTK format can still encode up to 34 bits of PA regardless of whether callers can actually pass addresses that large. Robin. 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.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, 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 D61C1C3A59D for ; Thu, 22 Aug 2019 10:09:09 +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 B4307233FC for ; Thu, 22 Aug 2019 10:09:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B4307233FC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com 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 9376CC5D; Thu, 22 Aug 2019 10:09:09 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 1235FC11 for ; Thu, 22 Aug 2019 10:09:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 8EFFB822 for ; Thu, 22 Aug 2019 10:09:07 +0000 (UTC) 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 3587F15A2; Thu, 22 Aug 2019 03:09:07 -0700 (PDT) Received: from [192.168.1.123] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E13E43F246; Thu, 22 Aug 2019 03:09:02 -0700 (PDT) Subject: Re: [PATCH v10 09/23] iommu/io-pgtable-arm-v7s: Extend to support PA[33:32] for MediaTek To: Yong Wu , Will Deacon References: <1566395606-7975-1-git-send-email-yong.wu@mediatek.com> <1566395606-7975-10-git-send-email-yong.wu@mediatek.com> <20190821152448.qmoqjh5zznfpdi6n@willie-the-truck> <1566464186.11621.7.camel@mhfsdcap03> From: Robin Murphy Message-ID: <10d5122d-3375-161b-9356-2ddfc1c835bd@arm.com> Date: Thu, 22 Aug 2019 11:08:58 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <1566464186.11621.7.camel@mhfsdcap03> Content-Language: en-GB Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org, Nicolas Boichat , cui.zhang@mediatek.com, srv_heupstream@mediatek.com, Tomasz Figa , linux-kernel@vger.kernel.org, Evan Green , chao.hao@mediatek.com, iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Matthias Brugger , ming-fan.chen@mediatek.com, anan.sun@mediatek.com, Matthias Kaehlcke , 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org On 2019-08-22 9:56 am, Yong Wu wrote: > On Wed, 2019-08-21 at 16:24 +0100, Will Deacon wrote: >> On Wed, Aug 21, 2019 at 09:53:12PM +0800, Yong Wu wrote: >>> MediaTek extend the arm v7s descriptor to support up to 34 bits PA where >>> the bit32 and bit33 are encoded in the bit9 and bit4 of the PTE >>> respectively. Meanwhile the iova still is 32bits. >>> >>> Regarding whether the pagetable address could be over 4GB, the mt8183 >>> support it while the previous mt8173 don't, thus keep it as is. >>> >>> Signed-off-by: Yong Wu >>> --- >>> drivers/iommu/io-pgtable-arm-v7s.c | 32 +++++++++++++++++++++++++------- >>> include/linux/io-pgtable.h | 7 +++---- >>> 2 files changed, 28 insertions(+), 11 deletions(-) >> >> [...] >> >>> @@ -731,7 +747,9 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, >>> { >>> struct arm_v7s_io_pgtable *data; >>> >>> - if (cfg->ias > ARM_V7S_ADDR_BITS || cfg->oas > ARM_V7S_ADDR_BITS) >>> + if (cfg->ias > ARM_V7S_ADDR_BITS || >>> + (cfg->oas > ARM_V7S_ADDR_BITS && >>> + !(cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT))) >> >> Please can you instead change arm_v7s_alloc_pgtable() so that it allows an >> ias of up to 34 when the IO_PGTABLE_QUIRK_ARM_MTK_EXT is set? > > Here I only simply skip the oas checking for our case. then which way do > your prefer? something like you commented before:? > > > if (cfg->ias > ARM_V7S_ADDR_BITS) > return NULL; > > if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT) { > if (!IS_ENABLED(CONFIG_PHYS_ADDR_T_64BIT)) > cfg->oas = min(cfg->oas, ARM_V7S_ADDR_BITS); > else if (cfg->oas > 34) > return NULL; > } else if (cfg->oas > ARM_V7S_ADDR_BITS) { > return NULL; > } All it should take is something like: if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT) max_oas = 34; else max_oas = 32; if (cfg->oas > max_oas) return NULL; or even just: if (cfg->oas > 32 || (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT && cfg->oas > 34)) return NULL; (and if we prefer the latter style, perhaps we could introduce some kind of "is_mtk_4gb()" helper to save on verbosity) We shouldn't need to care about the size of phys_addr_t either way - the fact is that the MTK format can still encode up to 34 bits of PA regardless of whether callers can actually pass addresses that large. Robin. _______________________________________________ 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=-5.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,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 218B8C3A59D for ; Thu, 22 Aug 2019 10:09:19 +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 E4174233FC for ; Thu, 22 Aug 2019 10:09:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="X6ehRzt0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E4174233FC 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-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-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=L3TJQn391Xo0DlgTagPCYLc6NmkSERfeAPzow7X7EeI=; b=X6ehRzt0iOIb8ThSxNZBAe3GF YF480HjZF6T64yle2wNi9cPFs5SWaZ/8CnY9Bc46283mPqav7FJxTJ8iMnnCUBzlplO9kEz3RNm1Z b48njH/0BVYE13Uc9hAxz2JPjNSDkQ48dYqrjFaY6+83bOxAmAT1YBXkQlyfX79Ib5taxt3WZulbC 7RJDJYCq1PzTCNZNALa7r26VeKRhgvoTAvWT8vLplX+0x7KBW+NyTVqXsnnYEOtNBzCAZlF1pQFei rOsts0kkBf7COtiXH2rW7SviwZFBu+X1dV5Tk6xMBjgClscPPeyIbQm1uHpLxpK1qiyjoLKoOfHuf +wAdXAhPQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i0k1o-0000ZB-Eo; Thu, 22 Aug 2019 10:09:12 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i0k1k-0000Y8-37; Thu, 22 Aug 2019 10:09:09 +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 3587F15A2; Thu, 22 Aug 2019 03:09:07 -0700 (PDT) Received: from [192.168.1.123] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E13E43F246; Thu, 22 Aug 2019 03:09:02 -0700 (PDT) Subject: Re: [PATCH v10 09/23] iommu/io-pgtable-arm-v7s: Extend to support PA[33:32] for MediaTek To: Yong Wu , Will Deacon References: <1566395606-7975-1-git-send-email-yong.wu@mediatek.com> <1566395606-7975-10-git-send-email-yong.wu@mediatek.com> <20190821152448.qmoqjh5zznfpdi6n@willie-the-truck> <1566464186.11621.7.camel@mhfsdcap03> From: Robin Murphy Message-ID: <10d5122d-3375-161b-9356-2ddfc1c835bd@arm.com> Date: Thu, 22 Aug 2019 11:08:58 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <1566464186.11621.7.camel@mhfsdcap03> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_030908_223261_56CB337E X-CRM114-Status: GOOD ( 20.29 ) 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: youlin.pei@mediatek.com, devicetree@vger.kernel.org, Nicolas Boichat , cui.zhang@mediatek.com, srv_heupstream@mediatek.com, Tomasz Figa , Joerg Roedel , linux-kernel@vger.kernel.org, Evan Green , chao.hao@mediatek.com, iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Matthias Brugger , ming-fan.chen@mediatek.com, anan.sun@mediatek.com, Matthias Kaehlcke , 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+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2019-08-22 9:56 am, Yong Wu wrote: > On Wed, 2019-08-21 at 16:24 +0100, Will Deacon wrote: >> On Wed, Aug 21, 2019 at 09:53:12PM +0800, Yong Wu wrote: >>> MediaTek extend the arm v7s descriptor to support up to 34 bits PA where >>> the bit32 and bit33 are encoded in the bit9 and bit4 of the PTE >>> respectively. Meanwhile the iova still is 32bits. >>> >>> Regarding whether the pagetable address could be over 4GB, the mt8183 >>> support it while the previous mt8173 don't, thus keep it as is. >>> >>> Signed-off-by: Yong Wu >>> --- >>> drivers/iommu/io-pgtable-arm-v7s.c | 32 +++++++++++++++++++++++++------- >>> include/linux/io-pgtable.h | 7 +++---- >>> 2 files changed, 28 insertions(+), 11 deletions(-) >> >> [...] >> >>> @@ -731,7 +747,9 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, >>> { >>> struct arm_v7s_io_pgtable *data; >>> >>> - if (cfg->ias > ARM_V7S_ADDR_BITS || cfg->oas > ARM_V7S_ADDR_BITS) >>> + if (cfg->ias > ARM_V7S_ADDR_BITS || >>> + (cfg->oas > ARM_V7S_ADDR_BITS && >>> + !(cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT))) >> >> Please can you instead change arm_v7s_alloc_pgtable() so that it allows an >> ias of up to 34 when the IO_PGTABLE_QUIRK_ARM_MTK_EXT is set? > > Here I only simply skip the oas checking for our case. then which way do > your prefer? something like you commented before:? > > > if (cfg->ias > ARM_V7S_ADDR_BITS) > return NULL; > > if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT) { > if (!IS_ENABLED(CONFIG_PHYS_ADDR_T_64BIT)) > cfg->oas = min(cfg->oas, ARM_V7S_ADDR_BITS); > else if (cfg->oas > 34) > return NULL; > } else if (cfg->oas > ARM_V7S_ADDR_BITS) { > return NULL; > } All it should take is something like: if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT) max_oas = 34; else max_oas = 32; if (cfg->oas > max_oas) return NULL; or even just: if (cfg->oas > 32 || (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT && cfg->oas > 34)) return NULL; (and if we prefer the latter style, perhaps we could introduce some kind of "is_mtk_4gb()" helper to save on verbosity) We shouldn't need to care about the size of phys_addr_t either way - the fact is that the MTK format can still encode up to 34 bits of PA regardless of whether callers can actually pass addresses that large. Robin. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel