Commit 5462ade6 authored Mar 30, 2023 by Kirill A. Shutemov Committed by Dave Hansen Apr 04, 2023

x86/boot: Centralize pa()/va() definitions

Replace multiple __pa()/__va() definitions with a single one in misc.h.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>
Reviewed-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20230330114956.20342-2-kirill.shutemov%40linux.intel.com

parent 89d7971e

arch/x86/boot/compressed/ident_map_64.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -8,14 +8,6 @@
		* Copyright (C) 2016 Kees Cook
		*/

		/*
		* Since we're dealing with identity mappings, physical and virtual
		* addresses are the same, so override these defines which are ultimately
		* used by the headers in misc.h.
		*/
		#define __pa(x) ((unsigned long)(x))
		#define __va(x) ((void *)((unsigned long)(x)))

		/* No PAGE_TABLE_ISOLATION support needed either: */
		#undef CONFIG_PAGE_TABLE_ISOLATION

arch/x86/boot/compressed/misc.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,15 @@
		/* cpu_feature_enabled() cannot be used this early */
		#define USE_EARLY_PGTABLE_L5

		/*
		* Boot stub deals with identity mappings, physical and virtual addresses are
		* the same, so override these defines.
		*
		* <asm/page.h> will not define them if they are already defined.
		*/
		#define __pa(x) ((unsigned long)(x))
		#define __va(x) ((void *)((unsigned long)(x)))

		#include <linux/linkage.h>
		#include <linux/screen_info.h>
		#include <linux/elf.h>

arch/x86/boot/compressed/sev.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -104,9 +104,7 @@ static enum es_result vc_read_mem(struct es_em_ctxt *ctxt,
		}

		#undef __init
		#undef __pa
		#define __init
		#define __pa(x) ((unsigned long)(x))

		#define __BOOT_COMPRESSED