Commit 525077ae authored by Baoquan He's avatar Baoquan He Committed by Borislav Petkov (AMD)
Browse files

x86/ioremap: Remove unused size parameter in remapping functions 



The size parameter of functions memremap_is_efi_data(),
memremap_is_setup_data() and early_memremap_is_setup_data() is not used.
Remove it.

  [ bp: Massage commit message. ]

Signed-off-by: default avatarBaoquan He <bhe@redhat.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20241123114221.149383-4-bhe@redhat.com
parent 095ac6fa

arch/x86/mm/ioremap.c

+7 −10
Original line number Diff line number Diff line
@@ -593,8 +593,7 @@ static bool memremap_should_map_decrypted(resource_size_t phys_addr, 
 * Examine the physical address to determine if it is EFI data. Check

 * it against the boot params structure and EFI tables and memory types.

 */

static bool memremap_is_efi_data(resource_size_t phys_addr,

				 unsigned long size)

static bool memremap_is_efi_data(resource_size_t phys_addr)

{

	u64 paddr;
@@ -705,14 +704,12 @@ static bool __ref __memremap_is_setup_data(resource_size_t phys_addr, bool early 
	return false;

}



static bool memremap_is_setup_data(resource_size_t phys_addr,

				   unsigned long size)

static bool memremap_is_setup_data(resource_size_t phys_addr)

{

	return __memremap_is_setup_data(phys_addr, false);

}



static bool __init early_memremap_is_setup_data(resource_size_t phys_addr,

						unsigned long size)

static bool __init early_memremap_is_setup_data(resource_size_t phys_addr)

{

	return __memremap_is_setup_data(phys_addr, true);

}
@@ -735,8 +732,8 @@ bool arch_memremap_can_ram_remap(resource_size_t phys_addr, unsigned long size, 
		return false;



	if (cc_platform_has(CC_ATTR_HOST_MEM_ENCRYPT)) {

		if (memremap_is_setup_data(phys_addr, size) ||

		    memremap_is_efi_data(phys_addr, size))

		if (memremap_is_setup_data(phys_addr) ||

		    memremap_is_efi_data(phys_addr))

			return false;

	}
@@ -761,8 +758,8 @@ pgprot_t __init early_memremap_pgprot_adjust(resource_size_t phys_addr, 
	encrypted_prot = true;



	if (cc_platform_has(CC_ATTR_HOST_MEM_ENCRYPT)) {

		if (early_memremap_is_setup_data(phys_addr, size) ||

		    memremap_is_efi_data(phys_addr, size))

		if (early_memremap_is_setup_data(phys_addr) ||

		    memremap_is_efi_data(phys_addr))

			encrypted_prot = false;

	}