From patchwork Tue Mar 5 16:46:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 13582724 Received: from out-176.mta1.migadu.com (out-176.mta1.migadu.com [95.215.58.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBF86D268 for ; Tue, 5 Mar 2024 16:47:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709657228; cv=none; b=FwOOFfduYqkWvVF0zvtLZdThScYHg39U/Tyqc+bB4H+2HFFchRNFnWvwSPHn50lKgL6f9iC/HVX1rVC8Y1Hm0+cSptEGrLuLhdEwU7uVy2KJIRNdOKOkgNF81uVSK5fG5Wl5FIbA6lPGXDyuLFPZfvvq/T0411ejziKKq4lZEqE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709657228; c=relaxed/simple; bh=h6O3seZiA9b8+3PlXp4vhDu0pZ/VP4dGBA1KJ8NykTM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=EghM1Pwuh+cgnYGSUnSiSlVlS74Tm2TgImUD0wJXtN5PyB7jsy42UfPbxRpdDW1Lq1qBS88vtQLae7TKHiDQbLaLJqI3ow3L0TVSX3M8simjl38Ssh85GPbf6vK2lYE9gAF5I8XeZYsMeBUTV2E1f6ur9gPhPs9zoQNG8xijEec= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=lgEcWn07; arc=none smtp.client-ip=95.215.58.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="lgEcWn07" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1709657225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BwLFefKq+oA9hZOQVmfzE0aV7cVOxT8zoDlTx543JRg=; b=lgEcWn07uME9WllqvL1VzgxqsFqZ07Rxnz+gHLLsqsLA7morooWt/pnX7rqTjLdMioXcOP 7gQrSBCxVzZMBvKD3PAZb9kyz4NlHw/3JB9DarGPukGNYWhjbZPXR/0wqrtjJmtn3THKed hYPGESL6HBJKKXbCt87EM6BSxkRAQi4= From: Andrew Jones To: kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: alexandru.elisei@arm.com, eric.auger@redhat.com, nikos.nikoleris@arm.com, shahuang@redhat.com, pbonzini@redhat.com, thuth@redhat.com Subject: [kvm-unit-tests PATCH v3 12/18] arm/arm64: Factor out allocator init from mem_init Date: Tue, 5 Mar 2024 17:46:36 +0100 Message-ID: <20240305164623.379149-32-andrew.jones@linux.dev> In-Reply-To: <20240305164623.379149-20-andrew.jones@linux.dev> References: <20240305164623.379149-20-andrew.jones@linux.dev> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-type: text/plain X-Migadu-Flow: FLOW_OUT The allocator init is identical for mem_init() and efi_mem_init(). Share it. Reviewed-by: Nikos Nikoleris Signed-off-by: Andrew Jones --- lib/arm/setup.c | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/lib/arm/setup.c b/lib/arm/setup.c index 80f952377cf9..7f2043907634 100644 --- a/lib/arm/setup.c +++ b/lib/arm/setup.c @@ -136,9 +136,28 @@ static void arm_memregions_add_assumed(void) #endif } -static void mem_init(phys_addr_t freemem_start) +static void mem_allocator_init(phys_addr_t freemem_start, phys_addr_t freemem_end) { phys_addr_t base, top; + + freemem_start = PAGE_ALIGN(freemem_start); + freemem_end &= PAGE_MASK; + + phys_alloc_init(freemem_start, freemem_end - freemem_start); + phys_alloc_set_minimum_alignment(SMP_CACHE_BYTES); + + phys_alloc_get_unused(&base, &top); + base = PAGE_ALIGN(base); + top &= PAGE_MASK; + assert(sizeof(long) == 8 || !(base >> 32)); + if (sizeof(long) != 8 && (top >> 32) != 0) + top = ((uint64_t)1 << 32); + page_alloc_init_area(0, base >> PAGE_SHIFT, top >> PAGE_SHIFT); + page_alloc_ops_enable(); +} + +static void mem_init(phys_addr_t freemem_start) +{ struct mem_region *freemem, *r, mem = { .start = (phys_addr_t)-1, }; @@ -169,17 +188,7 @@ static void mem_init(phys_addr_t freemem_start) __phys_offset = mem.start; /* PHYS_OFFSET */ __phys_end = mem.end; /* PHYS_END */ - phys_alloc_init(freemem_start, freemem->end - freemem_start); - phys_alloc_set_minimum_alignment(SMP_CACHE_BYTES); - - phys_alloc_get_unused(&base, &top); - base = PAGE_ALIGN(base); - top = top & PAGE_MASK; - assert(sizeof(long) == 8 || !(base >> 32)); - if (sizeof(long) != 8 && (top >> 32) != 0) - top = ((uint64_t)1 << 32); - page_alloc_init_area(0, base >> PAGE_SHIFT, top >> PAGE_SHIFT); - page_alloc_ops_enable(); + mem_allocator_init(freemem_start, freemem->end); } static void freemem_push_fdt(void **freemem, const void *fdt) @@ -292,7 +301,6 @@ static efi_status_t efi_mem_init(efi_bootinfo_t *efi_bootinfo) struct efi_boot_memmap *map = &(efi_bootinfo->mem_map); efi_memory_desc_t *buffer = *map->map; efi_memory_desc_t *d = NULL; - phys_addr_t base, top; struct mem_region r; uintptr_t text = (uintptr_t)&_text, etext = ALIGN((uintptr_t)&_etext, 4096); uintptr_t data = (uintptr_t)&_data, edata = ALIGN((uintptr_t)&_edata, 4096); @@ -380,17 +388,7 @@ static efi_status_t efi_mem_init(efi_bootinfo_t *efi_bootinfo) assert(sizeof(long) == 8 || free_mem_start < (3ul << 30)); - phys_alloc_init(free_mem_start, free_mem_pages << EFI_PAGE_SHIFT); - phys_alloc_set_minimum_alignment(SMP_CACHE_BYTES); - - phys_alloc_get_unused(&base, &top); - base = PAGE_ALIGN(base); - top = top & PAGE_MASK; - assert(sizeof(long) == 8 || !(base >> 32)); - if (sizeof(long) != 8 && (top >> 32) != 0) - top = ((uint64_t)1 << 32); - page_alloc_init_area(0, base >> PAGE_SHIFT, top >> PAGE_SHIFT); - page_alloc_ops_enable(); + mem_allocator_init(free_mem_start, free_mem_start + (free_mem_pages << EFI_PAGE_SHIFT)); return EFI_SUCCESS; }