Commit 159d1ff8 authored by Frank Munzert's avatar Frank Munzert Committed by Martin Schwidefsky
Browse files

[S390] Use csum_partial in checksum.h 



The cksm function in system.h is duplicate to csum_partial in checksum.h.
Remove cksm and use csum_partial instead.

Signed-off-by: default avatarFrank Munzert <munzert@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 866ba284

arch/s390/include/asm/system.h

+0 −16
Original line number Diff line number Diff line
@@ -458,22 +458,6 @@ static inline unsigned short stap(void) 
	return cpu_address;

}



static inline u32 cksm(void *addr, unsigned long len)

{

	register unsigned long _addr asm("0") = (unsigned long) addr;

	register unsigned long _len asm("1") = len;

	unsigned long accu = 0;



	asm volatile(

		"0:\n"

		"	cksm	%0,%1\n"

		"	jnz	0b\n"

		: "+d" (accu), "+d" (_addr), "+d" (_len)

		:

		: "cc", "memory");

	return accu;

}



extern void (*_machine_restart)(char *command);

extern void (*_machine_halt)(void);

extern void (*_machine_power_off)(void);

arch/s390/kernel/ipl.c

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/reset.h>

#include <asm/sclp.h>

#include <asm/setup.h>

#include <asm/checksum.h>



#define IPL_PARM_BLOCK_VERSION 0
@@ -1359,7 +1360,8 @@ static void dump_reipl_run(struct shutdown_trigger *trigger) 
		"a" (&lowcore_ptr[smp_processor_id()]->ipib));

#endif

	asm volatile("stura %0,%1"

		:: "a" (cksm(reipl_block_actual, reipl_block_actual->hdr.len)),

		:: "a" (csum_partial(reipl_block_actual,

				     reipl_block_actual->hdr.len, 0)),

		"a" (&lowcore_ptr[smp_processor_id()]->ipib_checksum));

	preempt_enable();

	dump_run(trigger);

drivers/s390/char/zcore.c

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/debug.h>

#include <asm/processor.h>

#include <asm/irqflags.h>

#include <asm/checksum.h>

#include "sclp.h"



#define TRACE(x...) debug_sprintf_event(zcore_dbf, 1, x)
@@ -704,7 +705,8 @@ static int __init zcore_reipl_init(void) 
		free_page((unsigned long) ipl_block);

		return rc;

	}

	if (cksm(ipl_block, ipl_block->hdr.len) != ipib_info.checksum) {

	if (csum_partial(ipl_block, ipl_block->hdr.len, 0) !=

	    ipib_info.checksum) {

		TRACE("Checksum does not match\n");

		free_page((unsigned long) ipl_block);

		ipl_block = NULL;