Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a287a49e authored by Vasily Gorbik's avatar Vasily Gorbik
Browse files

s390/protvirt: avoid memory sharing for diag 308 set/store 



This reverts commit db9492ce ("s390/protvirt: add memory sharing for
diag 308 set/store") which due to ultravisor implementation change is
not needed after all.

Fixes: db9492ce ("s390/protvirt: add memory sharing for diag 308 set/store")
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent e21a712a

arch/s390/boot/ipl_parm.c

+0 −2
Original line number Diff line number Diff line
@@ -48,9 +48,7 @@ void store_ipl_parmblock(void) 
{

	int rc;



	uv_set_shared(__pa(&ipl_block));

	rc = __diag308(DIAG308_STORE, &ipl_block);

	uv_remove_shared(__pa(&ipl_block));

	if (rc == DIAG308_RC_OK &&

	    ipl_block.hdr.version <= IPL_MAX_SUPPORTED_VERSION)

		ipl_block_valid = 1;

arch/s390/kernel/ipl.c

+0 −9
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <asm/os_info.h>

#include <asm/sections.h>

#include <asm/boot_data.h>

#include <asm/uv.h>

#include "entry.h"



#define IPL_PARM_BLOCK_VERSION 0
@@ -892,21 +891,15 @@ static void __reipl_run(void *unused) 
{

	switch (reipl_type) {

	case IPL_TYPE_CCW:

		uv_set_shared(__pa(reipl_block_ccw));

		diag308(DIAG308_SET, reipl_block_ccw);

		uv_remove_shared(__pa(reipl_block_ccw));

		diag308(DIAG308_LOAD_CLEAR, NULL);

		break;

	case IPL_TYPE_FCP:

		uv_set_shared(__pa(reipl_block_fcp));

		diag308(DIAG308_SET, reipl_block_fcp);

		uv_remove_shared(__pa(reipl_block_fcp));

		diag308(DIAG308_LOAD_CLEAR, NULL);

		break;

	case IPL_TYPE_NSS:

		uv_set_shared(__pa(reipl_block_nss));

		diag308(DIAG308_SET, reipl_block_nss);

		uv_remove_shared(__pa(reipl_block_nss));

		diag308(DIAG308_LOAD_CLEAR, NULL);

		break;

	case IPL_TYPE_UNKNOWN:
@@ -1176,9 +1169,7 @@ static struct kset *dump_kset; 


static void diag308_dump(void *dump_block)

{

	uv_set_shared(__pa(dump_block));

	diag308(DIAG308_SET, dump_block);

	uv_remove_shared(__pa(dump_block));

	while (1) {

		if (diag308(DIAG308_LOAD_NORMAL_DUMP, NULL) != 0x302)

			break;