From patchwork Mon Jul 16 07:43:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10525923 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 DE40460547 for ; Mon, 16 Jul 2018 07:43:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE94128623 for ; Mon, 16 Jul 2018 07:43:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE33928802; Mon, 16 Jul 2018 07:43:33 +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 3A62B2880B for ; Mon, 16 Jul 2018 07:43:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AE90C6B0003; Mon, 16 Jul 2018 03:43:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A99596B0006; Mon, 16 Jul 2018 03:43:31 -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 987B56B0007; Mon, 16 Jul 2018 03:43:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by kanga.kvack.org (Postfix) with ESMTP id 3AF2D6B0003 for ; Mon, 16 Jul 2018 03:43:31 -0400 (EDT) Received: by mail-ed1-f69.google.com with SMTP id x21-v6so10890763eds.2 for ; Mon, 16 Jul 2018 00:43:31 -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:message-id; bh=wCGNW+zsXmGEyZltEEnEMJidOJSJ6WBj3tywpGBmMFA=; b=fGTE1SEjXYLIsOcdWei3TeeyR84F/2+eWz9i7pVrAvQeDiXl5QLEUOG/7xVOUP5221 3jEcXEaydMEe8xxeQ5DIQy0H0R+I3gKoeon5n7x5Jxv0/hJl802Wkt9cDgwSPAyJbrgm mQFf0D0tuQY+Wbv+UxEtvYWdLaagpuAyLmeWVeWd1BqleN8Zmr7eAieE5TWP783EOdlI s1ZChkjiILasA0FcLOaYsECN105/DzqF95pHrJORYN32F6XUGxSy6SatWx7P7CaIHmjP mXvHQqKoA4dhUKAxPXPEkJJ17mQbaINNrWYiQ9elDuT3fdaOjHDa1c0RfuEGf5zmUhJu cppA== 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: AOUpUlHKGdl8LZZXSGohWDUq5uSYyL2XAyZK+zUAQ1835veUOP3LHZ+R +mcti82nV514l5Z5HX9oUJygQh0FWSuGmVxn3GbILGrsahxft6g+6x/h+9/TeLp8RuCqllJuC8A FApye6u3xiqNZh2/B4WSywMk6zG8htwA2TLvWY4RVFQXpa9TOmqYwaEjOrElVrJ0= X-Received: by 2002:a50:b37a:: with SMTP id r55-v6mr15726874edd.145.1531727010611; Mon, 16 Jul 2018 00:43:30 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeB9RBdz9a4tfkn9+JYN+V3qn3HRd8scogh+Mst2vBe8jmdjeRxdmVN8BfaX4a21WFQZTEb X-Received: by 2002:a50:b37a:: with SMTP id r55-v6mr15726820edd.145.1531727009300; Mon, 16 Jul 2018 00:43:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531727009; cv=none; d=google.com; s=arc-20160816; b=Is4hrcPjOH/uLU7a3m20OVqFUwB0gS7AMbcH7BzvFBXNYHPGCr/BCL2PghDHGAv5fj gqH+YUkbjUOogRtJs0nxGjYivkEc7wNiRtgq6ZJKQlqq5lkS7nq8EOC5W60fg59va2AY BynQHr9aaax16HUEOQtYYMJJ8/lDIDYdM9OO2Ylakq57077ofU10QLdTNwxYOKVfUquk Ph8cMn82GjR5hQ/C28qGv6I6P1MV0Z2bbrJfdYxXY03Y2uwftjMwvvpu5e44RR7S8Jka Mu8bdUrSTDIzQ8qeWO08QYSK8MaJ6xhKfKjvqmWxBEsQ0+NY6ygmD+qoc2/mDZ6CAKIc PZ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=wCGNW+zsXmGEyZltEEnEMJidOJSJ6WBj3tywpGBmMFA=; b=YBpePpELVdliJRQiwY2fXNTmYjEkP2Kd5TXF11aCn6EJgWFHVvq57okHCsAs1pk2re eE54mLC5hgYd2pbfQUBcDUAZU7AlTvYL+4iZMVFkOYPa4SEJS80gd66prxbYoXFU9U8s 3jA5PlBczHycr5IFrI/2XXHPCYpJcUEZfsDRxwxf1o37DnntKYfYmGW2bEMiKDKC76IQ IHa9nHziya7x8rY0XQqlBLzTYnClUXksRMJ9ucIHT4woxiFNp+pwbSwkRfOh36OxD8cN HvxnSQZ4mHJpoDkAqNQs1GAJCQEldVcRQhOAlH81Ng3ztim+s6vVfuh4SIULGrVA0jxT L1LQ== 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 d63-v6si579088edd.305.2018.07.16.00.43.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jul 2018 00:43:29 -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 (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w6G7dK63026180 for ; Mon, 16 Jul 2018 03:43:27 -0400 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0b-001b2d01.pphosted.com with ESMTP id 2k8gw048p1-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 16 Jul 2018 03:43:27 -0400 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 16 Jul 2018 08:43:26 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 16 Jul 2018 08:43:23 +0100 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w6G7hMgV32571544 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 16 Jul 2018 07:43:22 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C5F7142047; Mon, 16 Jul 2018 10:43:41 +0100 (BST) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5AEDB4204F; Mon, 16 Jul 2018 10:43:40 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.8.99]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Mon, 16 Jul 2018 10:43:40 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Mon, 16 Jul 2018 10:43:20 +0300 From: Mike Rapoport To: Richard Kuo Cc: Michal Hocko , linux-hexagon@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport Subject: [PATCH] hexagon: switch to NO_BOOTMEM Date: Mon, 16 Jul 2018 10:43:18 +0300 X-Mailer: git-send-email 2.7.4 X-TM-AS-GCONF: 00 x-cbid: 18071607-0016-0000-0000-000001E735D9 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18071607-0017-0000-0000-0000323BDD74 Message-Id: <1531726998-10971-1-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-07-16_02:, , 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=885 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807160092 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 This patch adds registration of the system memory with memblock, eliminates bootmem initialization and converts early memory reservations from bootmem to memblock. Signed-off-by: Mike Rapoport --- Build tested only. arch/hexagon/Kconfig | 3 +++ arch/hexagon/mm/init.c | 20 ++++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index 37adb20..66fb2d5 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@ -28,6 +28,9 @@ config HEXAGON select GENERIC_CLOCKEVENTS_BROADCAST select MODULES_USE_ELF_RELA select GENERIC_CPU_DEVICES + select HAVE_MEMBLOCK + select ARCH_DISCARD_MEMBLOCK + select NO_BOOTMEM ---help--- Qualcomm Hexagon is a processor architecture designed for high performance and low power across a wide variety of applications. diff --git a/arch/hexagon/mm/init.c b/arch/hexagon/mm/init.c index 1495d45..8d265bf 100644 --- a/arch/hexagon/mm/init.c +++ b/arch/hexagon/mm/init.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -176,7 +177,6 @@ size_t hexagon_coherent_pool_size = (size_t) (DMA_RESERVE << 22); void __init setup_arch_memory(void) { - int bootmap_size; /* XXX Todo: this probably should be cleaned up */ u32 *segtable = (u32 *) &swapper_pg_dir[0]; u32 *segtable_end; @@ -195,18 +195,22 @@ void __init setup_arch_memory(void) bootmem_lastpg = PFN_DOWN((bootmem_lastpg << PAGE_SHIFT) & ~((BIG_KERNEL_PAGE_SIZE) - 1)); + memblock_add(PHYS_OFFSET, + (bootmem_lastpg - ARCH_PFN_OFFSET) << PAGE_SHIFT); + + /* Reserve kernel text/data/bss */ + memblock_reserve(PHYS_OFFSET, + (bootmem_startpg - PHYS_OFFSET) << PAGE_SHIFT); /* * Reserve the top DMA_RESERVE bytes of RAM for DMA (uncached) * memory allocation */ - max_low_pfn = bootmem_lastpg - PFN_DOWN(DMA_RESERVED_BYTES); min_low_pfn = ARCH_PFN_OFFSET; - bootmap_size = init_bootmem_node(NODE_DATA(0), bootmem_startpg, min_low_pfn, max_low_pfn); + memblock_reserve(PFN_PHYS(max_low_pfn), DMA_RESERVED_BYTES); printk(KERN_INFO "bootmem_startpg: 0x%08lx\n", bootmem_startpg); printk(KERN_INFO "bootmem_lastpg: 0x%08lx\n", bootmem_lastpg); - printk(KERN_INFO "bootmap_size: %d\n", bootmap_size); printk(KERN_INFO "min_low_pfn: 0x%08lx\n", min_low_pfn); printk(KERN_INFO "max_low_pfn: 0x%08lx\n", max_low_pfn); @@ -257,14 +261,6 @@ void __init setup_arch_memory(void) #endif /* - * Free all the memory that wasn't taken up by the bootmap, the DMA - * reserve, or kernel itself. - */ - free_bootmem(PFN_PHYS(bootmem_startpg) + bootmap_size, - PFN_PHYS(bootmem_lastpg - bootmem_startpg) - bootmap_size - - DMA_RESERVED_BYTES); - - /* * The bootmem allocator seemingly just lives to feed memory * to the paging system */