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

powerpc/crypto: Remove users of virt_to_abs() and phys_to_abs() in nx crypto driver 

phys_to_abs() is a nop, don't use it.

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

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Michael Ellerman 2012-07-25 21:19:48 +00:00 committed by Benjamin Herrenschmidt
parent c6e565f2be
commit 7187dafc1e
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/crypto/nx/nx.c
View File

@ -34,7 +34,6 @@
#include <linux/device.h>
#include <linux/of.h>
#include <asm/pSeries_reconfig.h>
#include <asm/abs_addr.h>
#include <asm/hvcall.h>
#include <asm/vio.h>
@ -104,10 +103,10 @@ struct nx_sg *nx_build_sg_list(struct nx_sg *sg_head,
/* determine the start and end for this address range - slightly
* different if this is in VMALLOC_REGION */
if (is_vmalloc_addr(start_addr))
sg_addr = phys_to_abs(page_to_phys(vmalloc_to_page(start_addr)))
sg_addr = page_to_phys(vmalloc_to_page(start_addr))
+ offset_in_page(sg_addr);
else
sg_addr = virt_to_abs(sg_addr);
sg_addr = __pa(sg_addr);
end_addr = sg_addr + len;
@ -265,17 +264,17 @@ void nx_ctx_init(struct nx_crypto_ctx *nx_ctx, unsigned int function)
nx_ctx->csbcpb->csb.valid |= NX_CSB_VALID_BIT;
nx_ctx->op.flags = function;
nx_ctx->op.csbcpb = virt_to_abs(nx_ctx->csbcpb);
nx_ctx->op.in = virt_to_abs(nx_ctx->in_sg);
nx_ctx->op.out = virt_to_abs(nx_ctx->out_sg);
nx_ctx->op.csbcpb = __pa(nx_ctx->csbcpb);
nx_ctx->op.in = __pa(nx_ctx->in_sg);
nx_ctx->op.out = __pa(nx_ctx->out_sg);
if (nx_ctx->csbcpb_aead) {
nx_ctx->csbcpb_aead->csb.valid |= NX_CSB_VALID_BIT;
nx_ctx->op_aead.flags = function;
nx_ctx->op_aead.csbcpb = virt_to_abs(nx_ctx->csbcpb_aead);
nx_ctx->op_aead.in = virt_to_abs(nx_ctx->in_sg);
nx_ctx->op_aead.out = virt_to_abs(nx_ctx->out_sg);
nx_ctx->op_aead.csbcpb = __pa(nx_ctx->csbcpb_aead);
nx_ctx->op_aead.in = __pa(nx_ctx->in_sg);
nx_ctx->op_aead.out = __pa(nx_ctx->out_sg);
}
}