From patchwork Wed Jul 4 13:18:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10506883 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 D88C3601D7 for ; Wed, 4 Jul 2018 13:18:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9A6428DA2 for ; Wed, 4 Jul 2018 13:18:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE30B28E27; Wed, 4 Jul 2018 13:18:37 +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=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CBF528DA2 for ; Wed, 4 Jul 2018 13:18:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 725D46B0274; Wed, 4 Jul 2018 09:18:34 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 683AE6B0275; Wed, 4 Jul 2018 09:18:34 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5001B6B0276; Wed, 4 Jul 2018 09:18:34 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f72.google.com (mail-wm0-f72.google.com [74.125.82.72]) by kanga.kvack.org (Postfix) with ESMTP id D41056B0274 for ; Wed, 4 Jul 2018 09:18:33 -0400 (EDT) Received: by mail-wm0-f72.google.com with SMTP id w145-v6so2090442wmw.1 for ; Wed, 04 Jul 2018 06:18:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:message-id; bh=I7lOvAGSHR+WUBeoUpdLvz7W+y8IkNxJeDB6XfW3R24=; b=R1z7WDW43Z/1pmL2V2fCEyY2hz0AqHSEh6dJrGGXsFPzg4KgZVXL8CPxv+bEdWY2cP A799BNsZaW8Y3nQhJrW5/7h/QqizytSXyouD3x8S7uy9fRAywJZ1Z6Y+SJie6a3HKhTU 8jE/yIquIYD+8JwDC1xsuHZ6N+H8RvchHpNyV/HeBL9mu4zF7IydkDU0ItqWr3Yhj5Tf oT0ko0KmfN1sAp/7J6N6zMH1Msuj0fpvaXWzl0LMMRWfE0d+5fBaeDtC39LY6W+ZvCSA TqJUPHIdcVvkKKRF13QkB6vchqHkj6mwmp1qU0pwXk8PV8+CNJtFpIka/3ze9aaYSKqH IUHg== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: APt69E03XM4oaXNqtwNtvq40U26FbjPx2e41Su/J2iIc8/8d79q9uYSC srCNNag7ETrygz9FONiLQ7e9jpguFFkIV/eF/wDgbfRtZOs0x2e3+oYyhYravpSdjgVqQGt0av7 OXAdUNIQgh9sHvY83SY5ywZ0Yj8uu6BzzqDPlHMcDNcqvnCL+rquYy/exiWT4Xek= X-Received: by 2002:adf:8877:: with SMTP id e52-v6mr1735210wre.30.1530710313365; Wed, 04 Jul 2018 06:18:33 -0700 (PDT) X-Google-Smtp-Source: AAOMgpchmog0kS5jtSLHC4dHry1XMJspNafnzfTGNv7/tJrSjjjg9vt8sQTcStKkw+dSHmQxSyvS X-Received: by 2002:adf:8877:: with SMTP id e52-v6mr1735172wre.30.1530710312633; Wed, 04 Jul 2018 06:18:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530710312; cv=none; d=google.com; s=arc-20160816; b=wStrDrHI9EexrHgAoKWio3pmZolM7i/y4Csf/67Zy+QPV208NcbVJrHA989kgL2WW+ UaqL+N4sYYEpcNAzmxzeR7wOIK0sUd35oPgidn2QtxpQ/JG4R8XMfpgWH0yqJyjjoJJl zB0fTJCcih5o2x0viOTklqESsZaHwOfMhFGu/FQN3YQ5yeMspXUp0wQyMGGteoeXv7Gk bgQQJFkCbWn+J3KI9Uh4gvok9dcRSNB8jNYbGgd9yxjl9eosJSBAfUMLqXy73Ip03J42 c8Nzfxl+vbVRF0r5ncjvSzFOGqAYXUJ9uLZ5C4/y6R1pI7IBhxSAU/PkAMFn5vp9q0pu wVfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:references:in-reply-to:date:subject:cc:to:from :arc-authentication-results; bh=I7lOvAGSHR+WUBeoUpdLvz7W+y8IkNxJeDB6XfW3R24=; b=XaGP7uZ6tNMTGlx8T0CeFZDT9hFA+GHz/YeoFQyjVTzJvcJu7VMbMPbictbb50n8j4 pHExREMaizl0r7W7LPSoDHI3kU1M22X535jUPuJ6NcO+5SY8S56VyyFdBjbPlC3bC/y0 Lcqve/1zlT9lW+YSTn+nErth0UQmyi2gVhxYsWbxIUTO4KvXMwtAgbL2GkBMUfqO5ljt RQ4QF0kQAf2MAI7w2V5+oEBDpuaLHsBI3a+BY+G+6VaQNNCG7ke9CD36+7zwic72aXGi MIdwz1mzrmv56SVEWpazT/4PzF5NFDzoAo5SYQ5egqt6h0ovNTNp/gBDkXQvkYQi3jMq FdOg== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com. [148.163.158.5]) by mx.google.com with ESMTPS id v1-v6si2766123wrs.310.2018.07.04.06.18.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jul 2018 06:18:32 -0700 (PDT) Received-SPF: neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) client-ip=148.163.158.5; Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w64D9qjo070514 for ; Wed, 4 Jul 2018 09:18:31 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2k0wbx4d1p-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 04 Jul 2018 09:18:30 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 4 Jul 2018 14:18:29 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 4 Jul 2018 14:18:26 +0100 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w64DIPgD42401936 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 4 Jul 2018 13:18:25 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5D3EBA4051; Wed, 4 Jul 2018 16:18:50 +0100 (BST) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BE12EA404D; Wed, 4 Jul 2018 16:18:48 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.8.160]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 4 Jul 2018 16:18:48 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Wed, 04 Jul 2018 16:18:23 +0300 From: Mike Rapoport To: Ley Foon Tan Cc: Rob Herring , Frank Rowand , Michal Hocko , nios2-dev@lists.rocketboards.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport Subject: [PATCH 3/3] nios2: switch to NO_BOOTMEM Date: Wed, 4 Jul 2018 16:18:15 +0300 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530710295-10774-1-git-send-email-rppt@linux.vnet.ibm.com> References: <1530710295-10774-1-git-send-email-rppt@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18070413-0012-0000-0000-00000286B2CB X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18070413-0013-0000-0000-000020B83605 Message-Id: <1530710295-10774-4-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-07-04_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=951 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807040152 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Remove bootmem bitmap initialization and replace reserve_bootmem() with memblock_reserve(). Signed-off-by: Mike Rapoport Acked-by: Ley Foon Tan --- arch/nios2/Kconfig | 2 ++ arch/nios2/kernel/prom.c | 7 ------- arch/nios2/kernel/setup.c | 37 +++++-------------------------------- 3 files changed, 7 insertions(+), 39 deletions(-) diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig index 5db8fa1..661f7f9 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -20,6 +20,8 @@ config NIOS2 select USB_ARCH_HAS_HCD if USB_SUPPORT select CPU_NO_EFFICIENT_FFS select HAVE_MEMBLOCK + select ARCH_DISCARD_MEMBLOCK + select NO_BOOTMEM config GENERIC_CSUM def_bool y diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c index ba96a49..a6d4f75 100644 --- a/arch/nios2/kernel/prom.c +++ b/arch/nios2/kernel/prom.c @@ -32,13 +32,6 @@ #include -int __init early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, - bool nomap) -{ - reserve_bootmem(base, size, BOOTMEM_DEFAULT); - return 0; -} - void __init early_init_devtree(void *params) { __be32 *dtb = (u32 *)__dtb_start; diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index 0946840..2d0011d 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c @@ -144,10 +144,11 @@ asmlinkage void __init nios2_boot_init(unsigned r4, unsigned r5, unsigned r6, void __init setup_arch(char **cmdline_p) { - int bootmap_size; + int dram_start; console_verbose(); + dram_start = memblock_start_of_DRAM(); memory_size = memblock_phys_mem_size(); memory_start = PAGE_ALIGN((unsigned long)__pa(_end)); memory_end = (unsigned long) CONFIG_NIOS2_MEM_BASE + memory_size; @@ -165,39 +166,11 @@ void __init setup_arch(char **cmdline_p) max_low_pfn = PFN_DOWN(memory_end); max_mapnr = max_low_pfn; - /* - * give all the memory to the bootmap allocator, tell it to put the - * boot mem_map at the start of memory - */ - pr_debug("init_bootmem_node(?,%#lx, %#x, %#lx)\n", - min_low_pfn, PFN_DOWN(PHYS_OFFSET), max_low_pfn); - bootmap_size = init_bootmem_node(NODE_DATA(0), - min_low_pfn, PFN_DOWN(PHYS_OFFSET), - max_low_pfn); - - /* - * free the usable memory, we have to make sure we do not free - * the bootmem bitmap so we then reserve it after freeing it :-) - */ - pr_debug("free_bootmem(%#lx, %#lx)\n", - memory_start, memory_end - memory_start); - free_bootmem(memory_start, memory_end - memory_start); - - /* - * Reserve the bootmem bitmap itself as well. We do this in two - * steps (first step was init_bootmem()) because this catches - * the (very unlikely) case of us accidentally initializing the - * bootmem allocator with an invalid RAM area. - * - * Arguments are start, size - */ - pr_debug("reserve_bootmem(%#lx, %#x)\n", memory_start, bootmap_size); - reserve_bootmem(memory_start, bootmap_size, BOOTMEM_DEFAULT); - + memblock_reserve(dram_start, memory_start - dram_start); #ifdef CONFIG_BLK_DEV_INITRD if (initrd_start) { - reserve_bootmem(virt_to_phys((void *)initrd_start), - initrd_end - initrd_start, BOOTMEM_DEFAULT); + memblock_reserve(virt_to_phys((void *)initrd_start), + initrd_end - initrd_start); } #endif /* CONFIG_BLK_DEV_INITRD */