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.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 210C5C3A59D for ; Thu, 22 Aug 2019 10:17:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3392233FD for ; Thu, 22 Aug 2019 10:17:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566469079; bh=D5zRVu+USg1+RS1lEwQnNpD4UWyIvPicvP8SU5txo7M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=hqFKdTALHB4CADp0nnrSplLpT0dHlB7IJx7VvmWsGX4juR27Vvgjp3IDp/vEFdaIf UzXeTQ8vVwMUXiq4RXWnmTN9qtEi7RhZBwl0y6uIcdjvrOZDgMkE3hVEuPRQAarkDG HZ+8t20YWnM6KDiJMUufvW1K9JVXNrVsD/ZpEqv0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387517AbfHVKR6 (ORCPT ); Thu, 22 Aug 2019 06:17:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:57338 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731865AbfHVKR5 (ORCPT ); Thu, 22 Aug 2019 06:17:57 -0400 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 2EA0A206BB; Thu, 22 Aug 2019 10:17:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566469076; bh=D5zRVu+USg1+RS1lEwQnNpD4UWyIvPicvP8SU5txo7M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=U+kQlDk/quo+7he7VCs7KWCgcPH6jsj+XqyXsFL1nkatram4CncWOWeCdSKn/rY/g +iRxXCIDdDiMiWHQcq6VRQ1qG5uB7ctPdIy7P/MENCTB0Hu4QpP11xguJp+ZhYENWW 9LXMLpxz8xM/2PO8Erokk4mm7xsc+uOJrVaKRsdI= Date: Thu, 22 Aug 2019 11:17:50 +0100 From: Will Deacon To: Robin Murphy Cc: Yong Wu , 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 Subject: Re: [PATCH v10 09/23] iommu/io-pgtable-arm-v7s: Extend to support PA[33:32] for MediaTek Message-ID: <20190822101749.3kwzd5lb7zinsord@willie-the-truck> 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> <10d5122d-3375-161b-9356-2ddfc1c835bd@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <10d5122d-3375-161b-9356-2ddfc1c835bd@arm.com> User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 22, 2019 at 11:08:58AM +0100, Robin Murphy wrote: > 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) I wondered the same thing, but another place we'd want the check is in iopte_to_paddr() which probably needs the PHYS_ADDR_T check to avoid GCC warnings, although I didn't try it. So if we did: static bool cfg_mtk_ext_enabled(struct io_pgtable_cfg *cfg) { return IS_ENABLED(CONFIG_PHYS_ADDR_T_64BIT) && cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT; } Then I suppose we could do this in _alloc(): if (cfg->oas > cfg_mtk_ext_enabled(cfg) ? 34 : ARM_V7S_ADDR_BITS) return NULL; and then this in iopte_to_paddr(): [...] paddr = pte & mask; if (!cfg_mtk_ext_enabled(cfg)) return paddr; if (pte & ARM_V7S_ATTR_MTK_PA_BIT32) paddr |= ... [...] What do you reckon? 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.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 315A5C41514 for ; Thu, 22 Aug 2019 10:17:59 +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 EF5CC23400 for ; Thu, 22 Aug 2019 10:17:58 +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="U+kQlDk/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF5CC23400 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 B0EA8DBC; Thu, 22 Aug 2019 10:17:58 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 48116CAA for ; Thu, 22 Aug 2019 10:17:57 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 941B467F for ; Thu, 22 Aug 2019 10:17:56 +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 2EA0A206BB; Thu, 22 Aug 2019 10:17:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566469076; bh=D5zRVu+USg1+RS1lEwQnNpD4UWyIvPicvP8SU5txo7M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=U+kQlDk/quo+7he7VCs7KWCgcPH6jsj+XqyXsFL1nkatram4CncWOWeCdSKn/rY/g +iRxXCIDdDiMiWHQcq6VRQ1qG5uB7ctPdIy7P/MENCTB0Hu4QpP11xguJp+ZhYENWW 9LXMLpxz8xM/2PO8Erokk4mm7xsc+uOJrVaKRsdI= Date: Thu, 22 Aug 2019 11:17:50 +0100 From: Will Deacon To: Robin Murphy Subject: Re: [PATCH v10 09/23] iommu/io-pgtable-arm-v7s: Extend to support PA[33:32] for MediaTek Message-ID: <20190822101749.3kwzd5lb7zinsord@willie-the-truck> 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> <10d5122d-3375-161b-9356-2ddfc1c835bd@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <10d5122d-3375-161b-9356-2ddfc1c835bd@arm.com> User-Agent: NeoMutt/20170113 (1.7.2) 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, linux-arm-kernel@lists.infradead.org, Matthias Brugger , ming-fan.chen@mediatek.com, anan.sun@mediatek.com, Matthias Kaehlcke 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 Thu, Aug 22, 2019 at 11:08:58AM +0100, Robin Murphy wrote: > 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) I wondered the same thing, but another place we'd want the check is in iopte_to_paddr() which probably needs the PHYS_ADDR_T check to avoid GCC warnings, although I didn't try it. So if we did: static bool cfg_mtk_ext_enabled(struct io_pgtable_cfg *cfg) { return IS_ENABLED(CONFIG_PHYS_ADDR_T_64BIT) && cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT; } Then I suppose we could do this in _alloc(): if (cfg->oas > cfg_mtk_ext_enabled(cfg) ? 34 : ARM_V7S_ADDR_BITS) return NULL; and then this in iopte_to_paddr(): [...] paddr = pte & mask; if (!cfg_mtk_ext_enabled(cfg)) return paddr; if (pte & ARM_V7S_ATTR_MTK_PA_BIT32) paddr |= ... [...] What do you reckon? 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=-5.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,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 8437EC3A59D for ; Thu, 22 Aug 2019 10:18:06 +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 52CDF206BB for ; Thu, 22 Aug 2019 10:18:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Oy3ExfBN"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="U+kQlDk/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 52CDF206BB 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=9QOGyC+1nmOtbQofb/9pBRNilqenvs3D49LyZ2oMkVI=; b=Oy3ExfBNHIvQAJ 0pITendoslczTRbA23PLmFNrMJtz4ctTErKwUw/0lQUjxUT/IuA1980qeEcE1wlNAWWkqHvEd45zh TJTgLbRBCWDtLvMRdj7TK3NpX7JAoPaSwEWjsHCqcP/ZkPOAlsRfl8hkxoBfcJngRLjCDIsvnO9mu FFqgimb2As9C50pYhFYExo8R2qKpbXnH/XmpF8VMDUs3e/DByIfKDDMgXfEoKYlGkjrlGfpjxG627 ec8AhBG/5BIN0+xLkAZ21DVswKGOgG7ldAbHPON0JMQbo267lLyWnM3FfgKxwN0+qE55IWvyfolmR HNQspKiV4PP/bDQOyYdw==; 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 1i0kAJ-0004jg-NC; Thu, 22 Aug 2019 10:17:59 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i0kAG-0004jJ-Nc; Thu, 22 Aug 2019 10:17:58 +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 2EA0A206BB; Thu, 22 Aug 2019 10:17:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566469076; bh=D5zRVu+USg1+RS1lEwQnNpD4UWyIvPicvP8SU5txo7M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=U+kQlDk/quo+7he7VCs7KWCgcPH6jsj+XqyXsFL1nkatram4CncWOWeCdSKn/rY/g +iRxXCIDdDiMiWHQcq6VRQ1qG5uB7ctPdIy7P/MENCTB0Hu4QpP11xguJp+ZhYENWW 9LXMLpxz8xM/2PO8Erokk4mm7xsc+uOJrVaKRsdI= Date: Thu, 22 Aug 2019 11:17:50 +0100 From: Will Deacon To: Robin Murphy Subject: Re: [PATCH v10 09/23] iommu/io-pgtable-arm-v7s: Extend to support PA[33:32] for MediaTek Message-ID: <20190822101749.3kwzd5lb7zinsord@willie-the-truck> 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> <10d5122d-3375-161b-9356-2ddfc1c835bd@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <10d5122d-3375-161b-9356-2ddfc1c835bd@arm.com> User-Agent: NeoMutt/20170113 (1.7.2) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_031756_813769_46C45035 X-CRM114-Status: GOOD ( 23.03 ) 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, linux-arm-kernel@lists.infradead.org, Matthias Brugger , ming-fan.chen@mediatek.com, anan.sun@mediatek.com, Matthias Kaehlcke , Yong Wu 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 Thu, Aug 22, 2019 at 11:08:58AM +0100, Robin Murphy wrote: > 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) I wondered the same thing, but another place we'd want the check is in iopte_to_paddr() which probably needs the PHYS_ADDR_T check to avoid GCC warnings, although I didn't try it. So if we did: static bool cfg_mtk_ext_enabled(struct io_pgtable_cfg *cfg) { return IS_ENABLED(CONFIG_PHYS_ADDR_T_64BIT) && cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT; } Then I suppose we could do this in _alloc(): if (cfg->oas > cfg_mtk_ext_enabled(cfg) ? 34 : ARM_V7S_ADDR_BITS) return NULL; and then this in iopte_to_paddr(): [...] paddr = pte & mask; if (!cfg_mtk_ext_enabled(cfg)) return paddr; if (pte & ARM_V7S_ATTR_MTK_PA_BIT32) paddr |= ... [...] What do you reckon? Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel