From patchwork Tue Mar 28 06:50:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 9648213 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ED896601E9 for ; Tue, 28 Mar 2017 06:48:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDE512839B for ; Tue, 28 Mar 2017 06:48:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D11B9283C9; Tue, 28 Mar 2017 06:48:26 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 610B62839B for ; Tue, 28 Mar 2017 06:48:26 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=/E5bdiUKmIjt208d3nnAwSVQPYS2M0yibX/Baeeh++I=; b=IBU/XDVVUh3eMr3PHGoZcQ/do2 w+d/r35GZHm+u8lIaf1qW1xEkw39DAttgNuh+7WVsTtOoj4R9tMuKS2fFq74r3EbmWaoo9WggWMG6 0BqyyIhlv+1ExidC/T5W9pxImRH9RSbXpMKya82YJAkDSgIjyV7HBxWAGgL56ZUIdruymlVes8g+L IMnXDQnpBUHt51GQGSLRL1BKDCEQzfdx2uPXmxKm5kReckbuB9Zt3D1aK5ApqIctB+IlB31uxOeJv 7UVhbAbnUTSheqMlj1PvvL6Y2DbLHYaFrWVOhBH2HM1QnNfAhfBbZ2T+akwScYNCRZTSTSV9oNkQK 3ew7bO4w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cskva-0002Lk-4T; Tue, 28 Mar 2017 06:48:26 +0000 Received: from mail-pg0-x234.google.com ([2607:f8b0:400e:c05::234]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cskvW-0002K9-Ut for linux-arm-kernel@lists.infradead.org; Tue, 28 Mar 2017 06:48:24 +0000 Received: by mail-pg0-x234.google.com with SMTP id 81so49025415pgh.2 for ; Mon, 27 Mar 2017 23:48:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OprRgnNkDOn6oVDlOcVrJmd7k8MTpmuHv0Vm3Kqc5k4=; b=S+7WpFzzJLor5nNscRbsJ5kFwr11nKqyearKYrJ3DDk7iBuaESD/G/h+5dQxsytNBT n5j+3gDeyaj6o1+B6OqHU5oB43v1T2GJhhFbcJa5nsBvMSpXm9tqE8lY5hDLS2H0G9xz aoPkOHayvyQ7JUw1RpQ4dcNgRPHiC39lnn3kE= 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; bh=OprRgnNkDOn6oVDlOcVrJmd7k8MTpmuHv0Vm3Kqc5k4=; b=ekwzn6+S6p9Y/XLVQ7Z6VNSu4dmWH8ErdC1Vfs9RpPCT499c1Yq5zvxUt52KmxHdWv mlYdLmomJ1E8F6xejTQYDyQS66ChqjIqb+5cenocxv2KGVVK8aUWMckGHegIKpk35Rn5 kCoc8YGs2huPzjZekhGeNnScAq05Z8gcXBlIQTw5kmpjqb8pzCAK9/wOoDtgETfR/21O MlMke31hBEiVqh3KBz/ZxzwsAoAPZQNGEU/2h7dWGDcUytSM8rswPIOGDIXAFcfeb4zU sV0gJqUsO5zGJleiMJur5iCXDYQj2DIs0qtc5OKZIxFBlj7XB9J7G8O0/Niwocc5HoVI 6qFA== X-Gm-Message-State: AFeK/H3Soxrh7JPATB2s16LuP+01ZpQ/N8GObAJDw1dibv4QUlZ8gLK9SJVrQKDTfiNpuox2 X-Received: by 10.84.194.195 with SMTP id h61mr34712371pld.182.1490683682190; Mon, 27 Mar 2017 23:48:02 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id l28sm4984838pgc.11.2017.03.27.23.48.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2017 23:48:01 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, akpm@linux-foundation.org Subject: [PATCH v34 01/14] memblock: add memblock_clear_nomap() Date: Tue, 28 Mar 2017 15:50:32 +0900 Message-Id: <20170328065033.15966-1-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170328064831.15894-1-takahiro.akashi@linaro.org> References: <20170328064831.15894-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170327_234823_043632_40BD1D22 X-CRM114-Status: GOOD ( 11.84 ) 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: mark.rutland@arm.com, panand@redhat.com, ard.biesheuvel@linaro.org, geoff@infradead.org, dwmw2@infradead.org, AKASHI Takahiro , kexec@lists.infradead.org, linux-mm@kvack.org, james.morse@arm.com, bauerman@linux.vnet.ibm.com, sgoel@codeaurora.org, dyoung@redhat.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 This function, with a combination of memblock_mark_nomap(), will be used in a later kdump patch for arm64 when it temporarily isolates some range of memory from the other memory blocks in order to create a specific kernel mapping at boot time. Signed-off-by: AKASHI Takahiro Reviewed-by: Ard Biesheuvel --- include/linux/memblock.h | 1 + mm/memblock.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index bdfc65af4152..e82daffcfc44 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -93,6 +93,7 @@ int memblock_mark_hotplug(phys_addr_t base, phys_addr_t size); int memblock_clear_hotplug(phys_addr_t base, phys_addr_t size); int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); int memblock_mark_nomap(phys_addr_t base, phys_addr_t size); +int memblock_clear_nomap(phys_addr_t base, phys_addr_t size); ulong choose_memblock_flags(void); /* Low level functions */ diff --git a/mm/memblock.c b/mm/memblock.c index 696f06d17c4e..2f4ca8104ea4 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -805,6 +805,18 @@ int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size) } /** + * memblock_clear_nomap - Clear flag MEMBLOCK_NOMAP for a specified region. + * @base: the base phys addr of the region + * @size: the size of the region + * + * Return 0 on success, -errno on failure. + */ +int __init_memblock memblock_clear_nomap(phys_addr_t base, phys_addr_t size) +{ + return memblock_setclr_flag(base, size, 0, MEMBLOCK_NOMAP); +} + +/** * __next_reserved_mem_region - next function for for_each_reserved_region() * @idx: pointer to u64 loop variable * @out_start: ptr to phys_addr_t for start address of the region, can be %NULL