From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Hildenbrand Subject: [PATCH kvm-unit-tests v3 07/11] s390x: initialize the physical allocator Date: Tue, 13 Feb 2018 17:23:17 +0100 Message-ID: <20180213162321.20522-8-david@redhat.com> References: <20180213162321.20522-1-david@redhat.com> Cc: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Thomas Huth , Cornelia Huck , Christian Borntraeger , David Hildenbrand To: kvm@vger.kernel.org Return-path: Received: from mx3-rdu2.redhat.com ([66.187.233.73]:60388 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934766AbeBMQXf (ORCPT ); Tue, 13 Feb 2018 11:23:35 -0500 In-Reply-To: <20180213162321.20522-1-david@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: We now have the range of free memory, let's initialize the physical allocator. It is now possible to use use malloc and memalign, based on the early-ops. alloc_pages() cannot be used yet (as it has to be initialized via free_pages() - e.g. via setup_vm() - first) Signed-off-by: David Hildenbrand --- lib/s390x/sclp.c | 12 ++++++++++++ s390x/Makefile | 3 +++ 2 files changed, 15 insertions(+) diff --git a/lib/s390x/sclp.c b/lib/s390x/sclp.c index 199405c..c7471b1 100644 --- a/lib/s390x/sclp.c +++ b/lib/s390x/sclp.c @@ -15,11 +15,21 @@ #include #include #include "sclp.h" +#include + +extern unsigned long stacktop; static uint64_t storage_increment_size; static uint64_t max_ram_size; static uint64_t ram_size; +static void mem_init(phys_addr_t mem_end) +{ + phys_addr_t freemem_start = (phys_addr_t)&stacktop & PAGE_MASK; + + phys_alloc_init(freemem_start, mem_end - freemem_start); +} + void sclp_memory_setup(void) { ReadInfo *ri = (void *)_sccb; @@ -55,4 +65,6 @@ void sclp_memory_setup(void) break; ram_size += storage_increment_size; } + + mem_init(ram_size); } diff --git a/s390x/Makefile b/s390x/Makefile index ce63dd1..4198fdc 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -21,6 +21,9 @@ asm-offsets = lib/$(ARCH)/asm-offsets.h include $(SRCDIR)/scripts/asm-offsets.mak cflatobjs += lib/util.o +cflatobjs += lib/alloc.o +cflatobjs += lib/alloc_phys.o +cflatobjs += lib/alloc_page.o cflatobjs += lib/alloc_phys.o cflatobjs += lib/s390x/io.o cflatobjs += lib/s390x/stack.o -- 2.14.3