openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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: Frank Munzert <munzert@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Frank Munzert 2009-03-26 15:24:45 +01:00 committed by Martin Schwidefsky
parent 866ba28418
commit 159d1ff8f6
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/s390/include/asm/system.h
View File

@ -458,22 +458,6 @@ static inline unsigned short stap(void)
return cpu_address; 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_restart)(char *command);
extern void (*_machine_halt)(void); extern void (*_machine_halt)(void);
extern void (*_machine_power_off)(void); extern void (*_machine_power_off)(void);

4
arch/s390/kernel/ipl.c
View File

@ -24,6 +24,7 @@
#include <asm/reset.h> #include <asm/reset.h>
#include <asm/sclp.h> #include <asm/sclp.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/checksum.h>
#define IPL_PARM_BLOCK_VERSION 0 #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)); "a" (&lowcore_ptr[smp_processor_id()]->ipib));
#endif #endif
asm volatile("stura %0,%1" 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)); "a" (&lowcore_ptr[smp_processor_id()]->ipib_checksum));
preempt_enable(); preempt_enable();
dump_run(trigger); dump_run(trigger);

4
drivers/s390/char/zcore.c
View File

@ -24,6 +24,7 @@
#include <asm/debug.h> #include <asm/debug.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/irqflags.h> #include <asm/irqflags.h>
#include <asm/checksum.h>
#include "sclp.h" #include "sclp.h"
#define TRACE(x...) debug_sprintf_event(zcore_dbf, 1, x) #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); free_page((unsigned long) ipl_block);
return rc; 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"); TRACE("Checksum does not match\n");
free_page((unsigned long) ipl_block); free_page((unsigned long) ipl_block);
ipl_block = NULL; ipl_block = NULL;