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

Commit 3d647e62 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 's390-4.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Martin writes:
  "s390 fixes for 4.19-rc8

   Four more patches for 4.19:
    - Fix resume after suspend-to-disk if resume-CPU != suspend-CPU
    - Fix vfio-ccw check for pinned pages
    - Two patches to avoid a usercopy-whitelist warning in vfio-ccw"

* tag 's390-4.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/cio: Fix how vfio-ccw checks pinned pages
  s390/cio: Refactor alloc of ccw_io_region
  s390/cio: Convert ccw_io_region to pointer
  s390/hibernate: fix error handling when suspend cpu != resume cpu
parents 701f2eb6 7c755449

arch/s390/include/asm/sclp.h

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ int sclp_early_get_core_info(struct sclp_core_info *info); 
void sclp_early_get_ipl_info(struct sclp_ipl_info *info);

void sclp_early_detect(void);

void sclp_early_printk(const char *s);

void __sclp_early_printk(const char *s, unsigned int len);

void sclp_early_printk_force(const char *s);

void __sclp_early_printk(const char *s, unsigned int len, unsigned int force);



int _sclp_get_core_info(struct sclp_core_info *info);

int sclp_core_configure(u8 core);

arch/s390/kernel/early_printk.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


static void sclp_early_write(struct console *con, const char *s, unsigned int len)

{

	__sclp_early_printk(s, len);

	__sclp_early_printk(s, len, 0);

}



static struct console sclp_early_console = {

arch/s390/kernel/swsusp.S

+3 −5
Original line number Diff line number Diff line
@@ -198,12 +198,10 @@ pgm_check_entry: 


	/* Suspend CPU not available -> panic */

	larl	%r15,init_thread_union

	ahi	%r15,1<<(PAGE_SHIFT+THREAD_SIZE_ORDER)

	aghi	%r15,1<<(PAGE_SHIFT+THREAD_SIZE_ORDER)

	aghi	%r15,-STACK_FRAME_OVERHEAD

	larl	%r2,.Lpanic_string

	lghi	%r1,0

	sam31

	sigp	%r1,%r0,SIGP_SET_ARCHITECTURE

	brasl	%r14,sclp_early_printk

	brasl	%r14,sclp_early_printk_force

	larl	%r3,.Ldisabled_wait_31

	lpsw	0(%r3)

4:

drivers/s390/char/sclp_early_core.c

+8 −3
Original line number Diff line number Diff line
@@ -210,11 +210,11 @@ static int sclp_early_setup(int disable, int *have_linemode, int *have_vt220) 
 * Output one or more lines of text on the SCLP console (VT220 and /

 * or line-mode).

 */

void __sclp_early_printk(const char *str, unsigned int len)

void __sclp_early_printk(const char *str, unsigned int len, unsigned int force)

{

	int have_linemode, have_vt220;



	if (sclp_init_state != sclp_init_state_uninitialized)

	if (!force && sclp_init_state != sclp_init_state_uninitialized)

		return;

	if (sclp_early_setup(0, &have_linemode, &have_vt220) != 0)

		return;
@@ -227,5 +227,10 @@ void __sclp_early_printk(const char *str, unsigned int len) 


void sclp_early_printk(const char *str)

{

	__sclp_early_printk(str, strlen(str));

	__sclp_early_printk(str, strlen(str), 0);

}



void sclp_early_printk_force(const char *str)

{

	__sclp_early_printk(str, strlen(str), 1);

}

drivers/s390/cio/vfio_ccw_cp.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static bool pfn_array_table_iova_pinned(struct pfn_array_table *pat, 


	for (i = 0; i < pat->pat_nr; i++, pa++)

		for (j = 0; j < pa->pa_nr; j++)

			if (pa->pa_iova_pfn[i] == iova_pfn)

			if (pa->pa_iova_pfn[j] == iova_pfn)

				return true;



	return false;