From patchwork Fri Nov 9 08:24:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10675515 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 94FA114D6 for ; Fri, 9 Nov 2018 08:25:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 859E028FBA for ; Fri, 9 Nov 2018 08:25:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7883B2E2F2; Fri, 9 Nov 2018 08:25:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 19FF928FBA for ; Fri, 9 Nov 2018 08:25:55 +0000 (UTC) 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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Y8VBHoaBT0i/akrIP9dwzhjQ9SSfQwWGMnYmwFz3E1I=; b=JB5HWJoLEp3b/D uYaoyx7NzxfoLryc4mx1mu3fR8s43eYeoESLPhk35XiZAmxQ0XwPW371gggVQzZU9sZeNwf67BT9x ocT9RaqGqm+sXNP0hpVxPmUDnooucq6WiojlKfZB1W6/S5UxgDe2Vt42qZ/4lBBxQhJE+nruZUSc5 RKfEMf75+RTRW22ko0L3BWFTd4lUBMAwEpFDWgnx6l2kBBgvO36dZOQ4hAGGnXaFreQL6hmDsNIjp 6TmQlwN5rCYFRESQJObi24ZWisAfYQ5VRgP6E2X7e9v0mJXzsT8jp5ouyvMIV6bYntlg+rl1g3Y/d qur9OLeuoPIeF74gDKeg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gL26s-00083M-Ik; Fri, 09 Nov 2018 08:25:46 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gL26T-0007MR-6w for linux-arm-kernel@lists.infradead.org; Fri, 09 Nov 2018 08:25:22 +0000 Received: by mail-pf1-x442.google.com with SMTP id n11-v6so604836pfb.6 for ; Fri, 09 Nov 2018 00:25:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yRFndY2zWJb5bN9k8QGyB+00poAzGsSVjzJBS2+e7OE=; b=Iur53HJyqMem/YVgQlfnZkpmkDpU75IDHa1psWcirqFy2J7OUTJYecd2nH/Tm1VU4Y wHD0Wj4ikT4n1v9ophkIXv8eHbTkqamS77yub3whxQJ3ALJ5ShBRCmalyGimLeM0OTKZ KD55YMwDGgVT3dwjemx/XmpVCxgR0pphrkUVY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yRFndY2zWJb5bN9k8QGyB+00poAzGsSVjzJBS2+e7OE=; b=OOJlgafF9lgJEBt8A/P2WmPrV3Y+IqxiFB0EM0ch5LTjCD784wuEOle8TW0bsCrUax 9wnLVeEo7w6SCA3pyUCseSLpAqxk4KPeCwtEMYEe2cMve//PcHO3XbuWFF6+3F6O/q0S 11wgfe9SJm32gGYl96zow+gYrIhaQnjnnces0/+mg/zT+wNYFO1c0J/OiR8Pf3kOS0a6 jFjmgF3V6tr8q/5IOSU7E+4FrCqttqIkxndnT854h1PqDclEOkD2KBppnFCqlzQzEodY 0AVGVTdtqWn9mjvMKWZ5vK7YWeipdbZwvcIeyRoCRlmqvdMnV94sy1t4E+vgit1zofWS B5LQ== X-Gm-Message-State: AGRZ1gJjs/rsJ9ch8HHAlhXYm2vfMn9upta94+YXu4CD4FVwoPa7JozK nVKKIhMRWoFAgRKMlPol/SyWgopmh5t/3WUd X-Google-Smtp-Source: AJdET5dCO8mv60sae7fHIDtGCVEJeKFEfFmKIeaExlKA/10SNZoPYXI7O9H3owoxai+S1I+fmnLhmg== X-Received: by 2002:a63:6984:: with SMTP id e126mr6756085pgc.143.1541751910462; Fri, 09 Nov 2018 00:25:10 -0800 (PST) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:f659:7f17:ea11:4e8e]) by smtp.gmail.com with ESMTPSA id u2-v6sm6415667pfn.50.2018.11.09.00.25.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Nov 2018 00:25:09 -0800 (PST) From: Nicolas Boichat To: Robin Murphy Subject: [PATCH RFC 3/3] iommu/io-pgtable-arm-v7s: Request DMA32 memory, and improve debugging Date: Fri, 9 Nov 2018 16:24:48 +0800 Message-Id: <20181109082448.150302-4-drinkcat@chromium.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog In-Reply-To: <20181109082448.150302-1-drinkcat@chromium.org> References: <20181109082448.150302-1-drinkcat@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181109_002521_263957_6461A91F X-CRM114-Status: GOOD ( 16.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Hocko , Andrew Morton , Huaisheng Ye , Tomasz Figa , Joerg Roedel , Will Deacon , linux-kernel@vger.kernel.org, Levin Alexander , Pekka Enberg , linux-mm@kvack.org, iommu@lists.linux-foundation.org, Mike Rapoport , linux-arm-kernel@lists.infradead.org, David Rientjes , Matthias Brugger , yingjoe.chen@mediatek.com, Joonsoo Kim , Yong Wu , Mel Gorman , Christoph Lameter , Vlastimil Babka Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP For level 1 pages, use __get_dma32_pages to make sure physical memory address is 32-bit. For level 2 pages, kmem_cache_zalloc with GFP_DMA has been modified in a previous patch to be allocated in DMA32 zone. Also, print an error when the physical address does not fit in 32-bit, to make debugging easier in the future. Fixes: ad67f5a6545f ("arm64: replace ZONE_DMA with ZONE_DMA32") Signed-off-by: Nicolas Boichat --- drivers/iommu/io-pgtable-arm-v7s.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index 445c3bde04800c..862fd404de84d8 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -198,13 +198,15 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, void *table = NULL; if (lvl == 1) - table = (void *)__get_dma_pages(__GFP_ZERO, get_order(size)); + table = (void *)__get_dma32_pages(__GFP_ZERO, get_order(size)); else if (lvl == 2) table = kmem_cache_zalloc(data->l2_tables, gfp | GFP_DMA); phys = virt_to_phys(table); - if (phys != (arm_v7s_iopte)phys) + if (phys != (arm_v7s_iopte)phys) { /* Doesn't fit in PTE */ + dev_err(dev, "Page table does not fit: %pa", &phys); goto out_free; + } if (table && !(cfg->quirks & IO_PGTABLE_QUIRK_NO_DMA)) { dma = dma_map_single(dev, table, size, DMA_TO_DEVICE); if (dma_mapping_error(dev, dma))