From patchwork Fri Mar 21 21:08:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 3876401 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2FB1D9F334 for ; Fri, 21 Mar 2014 21:11:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BB7720203 for ; Fri, 21 Mar 2014 21:11:09 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 87B6F2028D for ; Fri, 21 Mar 2014 21:11:08 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WR6i0-0004Pb-3i; Fri, 21 Mar 2014 21:10:32 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WR6hp-000241-TU; Fri, 21 Mar 2014 21:10:21 +0000 Received: from mail-ob0-x22f.google.com ([2607:f8b0:4003:c01::22f]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WR6hY-000201-2H for linux-arm-kernel@lists.infradead.org; Fri, 21 Mar 2014 21:10:05 +0000 Received: by mail-ob0-f175.google.com with SMTP id uy5so3106767obc.20 for ; Fri, 21 Mar 2014 14:09:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=p2EabVGzhfaladC9ZAGGRTpYdnELKjF2ENVmtd1zBhY=; b=JgjaK1LGxFP6Ul1UpIHPmkYLzNkjO6x2Fn9hrn3qZBPKnnUlKCtQ+A1eI/ctE61NbT gcJ6yewOs7j4iojMuMbOyaPros9xwSv7Burrib9rnd+ek8t5V/hTnnXLn19dgSpj5tR6 vnC+9XOhfzKooTIT4c/o55VHedvyrrIOzE0hsWNu7RbraPKFlsi09eJHsPUazclY90YW 4Q6DLK+mJU29MHm4jZxS3JXPpSImbVlJSNA1guT11bMumxNoJ6H5QSMAc7YNo9/qqs7U PoYvy3dyIHooy6a5KMaxMfrm4hijcwzblPKL0WjXqGLFuuDQ+NbP4vzDlr2pe6QEQDDe Z2Cw== X-Received: by 10.182.40.37 with SMTP id u5mr14535258obk.41.1395436181842; Fri, 21 Mar 2014 14:09:41 -0700 (PDT) Received: from localhost.localdomain (72-48-77-163.dyn.grandenetworks.net. [72.48.77.163]) by mx.google.com with ESMTPSA id tz6sm9859086obc.10.2014.03.21.14.09.40 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 14:09:41 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH 2/8] arm64: add FIXMAP_PAGE_NOCACHE definition Date: Fri, 21 Mar 2014 16:08:42 -0500 Message-Id: <1395436128-11244-3-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395436128-11244-1-git-send-email-robherring2@gmail.com> References: <1395436128-11244-1-git-send-email-robherring2@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140321_171004_248652_AAFB878B X-CRM114-Status: UNSURE ( 8.92 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.8 (-) Cc: Rob Herring , Russell King , Arnd Bergmann , Greg Kroah-Hartman , x86@kernel.org, Will Deacon , Catalin Marinas , Jiri Slaby X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rob Herring Similar to ioremap and ioremap_nocache, we want the same definition for both using PROT_DEVICE_nGnRE. Signed-off-by: Rob Herring Cc: Catalin Marinas Cc: Will Deacon Acked-by: Catalin Marinas --- arch/arm64/include/asm/fixmap.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h index 5f7bfe6..68eab3c 100644 --- a/arch/arm64/include/asm/fixmap.h +++ b/arch/arm64/include/asm/fixmap.h @@ -54,7 +54,8 @@ enum fixed_addresses { #define FIXADDR_SIZE (__end_of_permanent_fixed_addresses << PAGE_SHIFT) #define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) -#define FIXMAP_PAGE_IO __pgprot(PROT_DEVICE_nGnRE) +#define FIXMAP_PAGE_IO __pgprot(PROT_DEVICE_nGnRE) +#define FIXMAP_PAGE_NOCACHE __pgprot(PROT_DEVICE_nGnRE) extern void __early_set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags);