Commit 0c9580ce authored by Heiko Carstens's avatar Heiko Carstens

s390/cio,idal: remove superfluous virt_to_phys() conversion

Only the last 12 bits of virtual / physical addresses are used when masking
with IDA_BLOCK_SIZE - 1. Given that the bits are the same regardless of
virtual or physical address, remove the virtual to physical address
conversion.
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 57bc3c22
...@@ -41,7 +41,7 @@ static inline unsigned int idal_nr_words(void *vaddr, unsigned int length) ...@@ -41,7 +41,7 @@ static inline unsigned int idal_nr_words(void *vaddr, unsigned int length)
{ {
unsigned int cidaw; unsigned int cidaw;
cidaw = __pa(vaddr) & (IDA_BLOCK_SIZE - 1); cidaw = (unsigned long)vaddr & (IDA_BLOCK_SIZE - 1);
cidaw += length + IDA_BLOCK_SIZE - 1; cidaw += length + IDA_BLOCK_SIZE - 1;
cidaw >>= IDA_SIZE_SHIFT; cidaw >>= IDA_SIZE_SHIFT;
return cidaw; return cidaw;
...@@ -54,7 +54,7 @@ static inline unsigned int idal_2k_nr_words(void *vaddr, unsigned int length) ...@@ -54,7 +54,7 @@ static inline unsigned int idal_2k_nr_words(void *vaddr, unsigned int length)
{ {
unsigned int cidaw; unsigned int cidaw;
cidaw = __pa(vaddr) & (IDA_2K_BLOCK_SIZE - 1); cidaw = (unsigned long)vaddr & (IDA_2K_BLOCK_SIZE - 1);
cidaw += length + IDA_2K_BLOCK_SIZE - 1; cidaw += length + IDA_2K_BLOCK_SIZE - 1;
cidaw >>= IDA_2K_SIZE_SHIFT; cidaw >>= IDA_2K_SIZE_SHIFT;
return cidaw; return cidaw;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment