Commit 00e9e664 authored by Martin Schwidefsky's avatar Martin Schwidefsky

s390/pfault: do not use stack buffers for hardware data

With CONFIG_VMAP_STACK=y the stack is allocated from the vmalloc space.
Data structures passed to a hardware or a hypervisor interface that
requires V=R can not be allocated on the stack anymore.

Make the init and fini pfault parameter blocks static variables.
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent c0f07ff9
...@@ -636,9 +636,7 @@ struct pfault_refbk { ...@@ -636,9 +636,7 @@ struct pfault_refbk {
u64 reserved; u64 reserved;
} __attribute__ ((packed, aligned(8))); } __attribute__ ((packed, aligned(8)));
int pfault_init(void) static struct pfault_refbk pfault_init_refbk = {
{
struct pfault_refbk refbk = {
.refdiagc = 0x258, .refdiagc = 0x258,
.reffcode = 0, .reffcode = 0,
.refdwlen = 5, .refdwlen = 5,
...@@ -646,7 +644,11 @@ int pfault_init(void) ...@@ -646,7 +644,11 @@ int pfault_init(void)
.refgaddr = __LC_LPP, .refgaddr = __LC_LPP,
.refselmk = 1ULL << 48, .refselmk = 1ULL << 48,
.refcmpmk = 1ULL << 48, .refcmpmk = 1ULL << 48,
.reserved = __PF_RES_FIELD }; .reserved = __PF_RES_FIELD
};
int pfault_init(void)
{
int rc; int rc;
if (pfault_disable) if (pfault_disable)
...@@ -658,18 +660,20 @@ int pfault_init(void) ...@@ -658,18 +660,20 @@ int pfault_init(void)
"1: la %0,8\n" "1: la %0,8\n"
"2:\n" "2:\n"
EX_TABLE(0b,1b) EX_TABLE(0b,1b)
: "=d" (rc) : "a" (&refbk), "m" (refbk) : "cc"); : "=d" (rc)
: "a" (&pfault_init_refbk), "m" (pfault_init_refbk) : "cc");
return rc; return rc;
} }
void pfault_fini(void) static struct pfault_refbk pfault_fini_refbk = {
{
struct pfault_refbk refbk = {
.refdiagc = 0x258, .refdiagc = 0x258,
.reffcode = 1, .reffcode = 1,
.refdwlen = 5, .refdwlen = 5,
.refversn = 2, .refversn = 2,
}; };
void pfault_fini(void)
{
if (pfault_disable) if (pfault_disable)
return; return;
...@@ -678,7 +682,7 @@ void pfault_fini(void) ...@@ -678,7 +682,7 @@ void pfault_fini(void)
" diag %0,0,0x258\n" " diag %0,0,0x258\n"
"0: nopr %%r7\n" "0: nopr %%r7\n"
EX_TABLE(0b,0b) EX_TABLE(0b,0b)
: : "a" (&refbk), "m" (refbk) : "cc"); : : "a" (&pfault_fini_refbk), "m" (pfault_fini_refbk) : "cc");
} }
static DEFINE_SPINLOCK(pfault_lock); static DEFINE_SPINLOCK(pfault_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment