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

staging: unisys: visorchipset: Use ioremap direction rather than heavy visor_memregion 

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2015-05-05 18:36:26 -04:00 committed by Greg Kroah-Hartman
parent 712c03dcab
commit dd41275112
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/staging/unisys/visorbus/visorchipset.c
View File

@ -397,9 +397,7 @@ parser_init_guts(u64 addr, u32 bytes, bool local,
int allocbytes = sizeof(struct parser_context) + bytes;
struct parser_context *rc = NULL;
struct parser_context *ctx = NULL;
struct memregion *rgn = NULL;
struct spar_controlvm_parameters_header *phdr = NULL;
int cnt;
if (retry)
*retry = false;
@ -438,18 +436,21 @@ parser_init_guts(u64 addr, u32 bytes, bool local,
p = __va((unsigned long) (addr));
memcpy(ctx->data, p, bytes);
} else {
rgn = visor_memregion_create(addr, bytes);
if (!rgn) {
rc = NULL;
goto cleanup;
}
cnt = visor_memregion_read(rgn, 0, ctx->data, bytes);
visor_memregion_destroy(rgn);
void __iomem *mapping;
if (cnt < 0) {
if (!request_mem_region(addr, bytes, "visorchipset")) {
rc = NULL;
goto cleanup;
}
mapping = ioremap_cache(addr, bytes);
if (!mapping) {
release_mem_region(addr, bytes);
rc = NULL;
goto cleanup;
}
memcpy_fromio(ctx->data, mapping, bytes);
release_mem_region(addr, bytes);
}
if (!standard_payload_header) {
ctx->byte_stream = true;