dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

crypto: nx - Remove virt_to_abs() usage in nx-842.c 

virt_to_abs() is just a wrapper around __pa(), use __pa() directly.

We should be including <asm/page.h> to get __pa(). abs_addr.h will be
removed shortly so drop that.

We were getting of.h via abs_addr.h so we need to include that directly.

Having done all that, clean up the ordering of the includes.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Michael Ellerman 2012-08-03 12:23:15 +10:00 committed by Herbert Xu
parent 023af60825
commit 33b58b01ac
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/crypto/nx/nx-842.c
View File

@ -21,13 +21,15 @@
* Seth Jennings <sjenning@linux.vnet.ibm.com>
*/
#include <linux/module.h>
#include <asm/vio.h>
#include <asm/pSeries_reconfig.h>
#include <linux/slab.h>
#include <asm/abs_addr.h>
#include <linux/nx842.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/nx842.h>
#include <linux/of.h>
#include <linux/slab.h>
#include <asm/page.h>
#include <asm/pSeries_reconfig.h>
#include <asm/vio.h>
#include "nx_csbcpb.h" /* struct nx_csbcpb */
@ -140,7 +142,7 @@ static unsigned long nx842_get_desired_dma(struct vio_dev *viodev)
}
struct nx842_slentry {
unsigned long ptr; /* Absolute address (use virt_to_abs()) */
unsigned long ptr; /* Real address (use __pa()) */
unsigned long len;
};
@ -167,7 +169,7 @@ static int nx842_build_scatterlist(unsigned long buf, int len,
entry = sl->entries;
while (len) {
entry->ptr = virt_to_abs(buf);
entry->ptr = __pa(buf);
nextpage = ALIGN(buf + 1, NX842_HW_PAGE_SIZE);
if (nextpage < buf + len) {
/* we aren't at the end yet */
@ -369,8 +371,8 @@ int nx842_compress(const unsigned char *in, unsigned int inlen,
op.flags = NX842_OP_COMPRESS;
csbcpb = &workmem->csbcpb;
memset(csbcpb, 0, sizeof(*csbcpb));
op.csbcpb = virt_to_abs(csbcpb);
op.out = virt_to_abs(slout.entries);
op.csbcpb = __pa(csbcpb);
op.out = __pa(slout.entries);
for (i = 0; i < hdr->blocks_nr; i++) {
/*
@ -400,13 +402,13 @@ int nx842_compress(const unsigned char *in, unsigned int inlen,
*/
if (likely(max_sync_size == NX842_HW_PAGE_SIZE)) {
/* Create direct DDE */
op.in = virt_to_abs(inbuf);
op.in = __pa(inbuf);
op.inlen = max_sync_size;
} else {
/* Create indirect DDE (scatterlist) */
nx842_build_scatterlist(inbuf, max_sync_size, &slin);
op.in = virt_to_abs(slin.entries);
op.in = __pa(slin.entries);
op.inlen = -nx842_get_scatterlist_size(&slin);
}
@ -564,7 +566,7 @@ int nx842_decompress(const unsigned char *in, unsigned int inlen,
op.flags = NX842_OP_DECOMPRESS;
csbcpb = &workmem->csbcpb;
memset(csbcpb, 0, sizeof(*csbcpb));
op.csbcpb = virt_to_abs(csbcpb);
op.csbcpb = __pa(csbcpb);
/*
* max_sync_size may have changed since compression,
@ -596,12 +598,12 @@ int nx842_decompress(const unsigned char *in, unsigned int inlen,
if (likely((inbuf & NX842_HW_PAGE_MASK) ==
((inbuf + hdr->sizes[i] - 1) & NX842_HW_PAGE_MASK))) {
/* Create direct DDE */
op.in = virt_to_abs(inbuf);
op.in = __pa(inbuf);
op.inlen = hdr->sizes[i];
} else {
/* Create indirect DDE (scatterlist) */
nx842_build_scatterlist(inbuf, hdr->sizes[i] , &slin);
op.in = virt_to_abs(slin.entries);
op.in = __pa(slin.entries);
op.inlen = -nx842_get_scatterlist_size(&slin);
}
@ -612,12 +614,12 @@ int nx842_decompress(const unsigned char *in, unsigned int inlen,
*/
if (likely(max_sync_size == NX842_HW_PAGE_SIZE)) {
/* Create direct DDE */
op.out = virt_to_abs(outbuf);
op.out = __pa(outbuf);
op.outlen = max_sync_size;
} else {
/* Create indirect DDE (scatterlist) */
nx842_build_scatterlist(outbuf, max_sync_size, &slout);
op.out = virt_to_abs(slout.entries);
op.out = __pa(slout.entries);
op.outlen = -nx842_get_scatterlist_size(&slout);
}