[tip: x86/sev] x86/sev: Fix address space sparse warning

From: tip-bot2 for Borislav Petkov
Date: Mon May 02 2022 - 11:52:13 EST


The following commit has been merged into the x86/sev branch of tip:

Commit-ID: ab65f49253ff706723ecbf87af74e9383b5e4582
Gitweb: https://git.kernel.org/tip/ab65f49253ff706723ecbf87af74e9383b5e4582
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Mon, 02 May 2022 17:33:40 +02:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Mon, 02 May 2022 17:34:29 +02:00

x86/sev: Fix address space sparse warning

Fix:

arch/x86/kernel/sev.c:605:16: warning: incorrect type in assignment (different address spaces)
arch/x86/kernel/sev.c:605:16: expected struct snp_secrets_page_layout *layout
arch/x86/kernel/sev.c:605:16: got void [noderef] __iomem *[assigned] mem

Reported-by: kernel test robot <lkp@xxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lore.kernel.org/r/202205022233.XgNDR7WR-lkp@xxxxxxxxx
---
arch/x86/kernel/sev.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c
index 1663750..c05f012 100644
--- a/arch/x86/kernel/sev.c
+++ b/arch/x86/kernel/sev.c
@@ -589,20 +589,23 @@ static u64 __init get_secrets_page(void)
static u64 __init get_snp_jump_table_addr(void)
{
struct snp_secrets_page_layout *layout;
+ void __iomem *mem;
u64 pa, addr;

pa = get_secrets_page();
if (!pa)
return 0;

- layout = (__force void *)ioremap_encrypted(pa, PAGE_SIZE);
- if (!layout) {
+ mem = ioremap_encrypted(pa, PAGE_SIZE);
+ if (!mem) {
pr_err("Unable to locate AP jump table address: failed to map the SNP secrets page.\n");
return 0;
}

+ layout = (__force struct snp_secrets_page_layout *)mem;
+
addr = layout->os_area.ap_jump_table_pa;
- iounmap(layout);
+ iounmap(mem);

return addr;
}