From patchwork Fri Nov 9 08:24:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10675513 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 AE8225A4 for ; Fri, 9 Nov 2018 08:25:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C4D42DC42 for ; Fri, 9 Nov 2018 08:25:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E9DD2E664; Fri, 9 Nov 2018 08:25:42 +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 090232E661 for ; Fri, 9 Nov 2018 08:25:42 +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=2CPrh5p77dnOttIYQTB2Gb2QYoaSo3AuK4iL0G1MKh4=; b=A02OjB1WIFupbB Ylb2mG8EO7zbsZI/agyFCDh+6c+149lOs5cJX5etaMJZBsQBec/gHn6C+PcsrHHEsHbm8D4uTCpxY zMdaIDNuOJipqtEB2+oLbCHVcG44G+xGrRK3ffXqw/cuFjVdpEFWAq+lZyIVnGM1ueiMDVd2yxXiB YRI6ozCDczPngHsK0gR9m1nmGxKDYYc5F1Wq3V2aGK3KOhQ0h8VddYOogPZEys6tFisl2peK4Jfj0 YYvemwo0Fy+U0s5b7MQiSvY32QEQzhEPQ1vBJyHEnYzVUnlZREdv7fWiygA0fDZdKjcxYFSALC67o MaVXEvj+46KUzlZCOtvQ==; 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 1gL26e-0007mF-Tq; Fri, 09 Nov 2018 08:25:32 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gL26P-0006zs-JF for linux-arm-kernel@lists.infradead.org; Fri, 09 Nov 2018 08:25:18 +0000 Received: by mail-pf1-x441.google.com with SMTP id e22-v6so601471pfn.8 for ; Fri, 09 Nov 2018 00:25:07 -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=LemySw+6VGiamWvqm4d+lqoRj+4VmarF9XYWRMSCiY0=; b=kXRqBVeNEZdfgT3ytQbgbNo0uRTe3Xsc6d3oPkkEZhjcWlI18sIckVu6vbliNO90tc olUj5T/CnTthMuYB9ChqlAk12gsPARZ7DmsTtDZXCLYlzQAffFO20/PQnFgJJl2kYV6j 5FpNkBRpuQUMncbBrRoIectbjBfuwZzMPWSr8= 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=LemySw+6VGiamWvqm4d+lqoRj+4VmarF9XYWRMSCiY0=; b=F3QgYkY7TkulZoj1ddOvNRWeu0c2ImsqKtTEhjpLSp+oV6QdqGXFgjh31uA0dX5MaC 2S59ZPsf0jXIXQzIo1c9qYnY2nDIAdcsS/gwpJD6i9V3qus/wXjRT6OH5eoWdjwS/oPH Q1pnwhjsda0yi0a+a19teKcMic89nE0GedIoszWp5Vl9cI2CU73eGRiHFmud80mLahSI RBCreG4vLxf/s/WdHB+eVymEI7luSDx245XkGwQGfgOJumAKMf8ZgF0RcVicB3W+O9Kx tcmzfwopajufm79eLB6G0MIiNKCVWvO5nKH1a0q9QBDB1hU3OY0JbDsXlJLKaytYidIH FbXA== X-Gm-Message-State: AGRZ1gJxEyPTbrS6yeLGr0tGIVogNMueB/7vzJT5kxTGxk96x2TL5jKn Ei2hgu1vGS24P4WOIHWbeAUwfQ== X-Google-Smtp-Source: AJdET5eNDtelDWete20VE7bb/tq+ntm0saZaFjUUpOGpXNsrDwjhGsWR0JG3+RHsaoUhprmNgBhOCQ== X-Received: by 2002:a62:7514:: with SMTP id q20-v6mr8165586pfc.8.1541751906702; Fri, 09 Nov 2018 00:25:06 -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.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Nov 2018 00:25:06 -0800 (PST) From: Nicolas Boichat To: Robin Murphy Subject: [PATCH RFC 2/3] include/linux/gfp.h: Add __get_dma32_pages macro Date: Fri, 9 Nov 2018 16:24:47 +0800 Message-Id: <20181109082448.150302-3-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_002517_641435_76654804 X-CRM114-Status: GOOD ( 11.73 ) 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 Some callers (e.g. iommu/io-pgtable-arm-v7s) require DMA32 memory when calling __get_dma_pages. Add a new macro for that purpose. Fixes: ad67f5a6545f ("arm64: replace ZONE_DMA with ZONE_DMA32") Signed-off-by: Nicolas Boichat --- include/linux/gfp.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 76f8db0b0e715c..50e04896b78017 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -535,6 +535,8 @@ void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask); #define __get_dma_pages(gfp_mask, order) \ __get_free_pages((gfp_mask) | GFP_DMA, (order)) +#define __get_dma32_pages(gfp_mask, order) \ + __get_free_pages((gfp_mask) | GFP_DMA32, (order)) extern void __free_pages(struct page *page, unsigned int order); extern void free_pages(unsigned long addr, unsigned int order);