From: Michael Ellerman <michael@ellerman.id.au>
To: <linuxppc-dev@ozlabs.org>
Subject: [PATCH 11/18] powerpc/pseries: Remove uses of abs_to_virt() and virt_to_abs()
Date: Thu, 26 Jul 2012 17:19:57 +1000 [thread overview]
Message-ID: <1343287204-7700-11-git-send-email-michael@ellerman.id.au> (raw)
In-Reply-To: <1343287204-7700-1-git-send-email-michael@ellerman.id.au>
These days they are just __va() and __pa() respectively.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
arch/powerpc/platforms/pseries/iommu.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 2d311c0..7393118 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -41,7 +41,6 @@
#include <asm/iommu.h>
#include <asm/pci-bridge.h>
#include <asm/machdep.h>
-#include <asm/abs_addr.h>
#include <asm/pSeries_reconfig.h>
#include <asm/firmware.h>
#include <asm/tce.h>
@@ -99,7 +98,7 @@ static int tce_build_pSeries(struct iommu_table *tbl, long index,
while (npages--) {
/* can't move this out since we might cross MEMBLOCK boundary */
- rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT;
+ rpn = __pa(uaddr) >> TCE_SHIFT;
*tcep = proto_tce | (rpn & TCE_RPN_MASK) << TCE_RPN_SHIFT;
uaddr += TCE_PAGE_SIZE;
@@ -148,7 +147,7 @@ static int tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum,
int ret = 0;
long tcenum_start = tcenum, npages_start = npages;
- rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT;
+ rpn = __pa(uaddr) >> TCE_SHIFT;
proto_tce = TCE_PCI_READ;
if (direction != DMA_TO_DEVICE)
proto_tce |= TCE_PCI_WRITE;
@@ -213,7 +212,7 @@ static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
__get_cpu_var(tce_page) = tcep;
}
- rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT;
+ rpn = __pa(uaddr) >> TCE_SHIFT;
proto_tce = TCE_PCI_READ;
if (direction != DMA_TO_DEVICE)
proto_tce |= TCE_PCI_WRITE;
@@ -233,7 +232,7 @@ static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
rc = plpar_tce_put_indirect((u64)tbl->it_index,
(u64)tcenum << 12,
- (u64)virt_to_abs(tcep),
+ (u64)__pa(tcep),
limit);
npages -= limit;
@@ -435,7 +434,7 @@ static int tce_setrange_multi_pSeriesLP(unsigned long start_pfn,
rc = plpar_tce_put_indirect(liobn,
dma_offset,
- (u64)virt_to_abs(tcep),
+ (u64)__pa(tcep),
limit);
num_tce -= limit;
--
1.7.9.5
next prev parent reply other threads:[~2012-07-26 7:19 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-26 7:19 [PATCH 01/18] powerpc: Remove remaining iSeries chunks Michael Ellerman
2012-07-26 7:19 ` [PATCH 02/18] powerpc/crypto: Remove users of virt_to_abs() and phys_to_abs() in nx crypto driver Michael Ellerman
2012-07-26 7:19 ` [PATCH 03/18] IB/ehca: Don't use phys_to_abs(), it's a nop Michael Ellerman
2012-07-26 7:19 ` [PATCH 04/18] powerpc/mm: Replace abs_to_virt() with __va() Michael Ellerman
2012-07-26 7:19 ` [PATCH 05/18] powerpc/pasemi: Remove uses of virt_to_abs() and abs_to_virt() Michael Ellerman
2012-07-26 7:19 ` [PATCH 06/18] powerpc/dart: " Michael Ellerman
2012-07-26 7:19 ` [PATCH 07/18] IB/ehca: " Michael Ellerman
2012-07-26 7:19 ` [PATCH 08/18] drivers/macintosh/smu.c: Replace abs_to_virt() with __va() Michael Ellerman
2012-07-26 7:19 ` [PATCH 09/18] ehea: Remove uses of virt_to_abs() and abs_to_virt() Michael Ellerman
2012-07-26 7:19 ` [PATCH 10/18] powerpc/kernel: Remove uses of abs_to_virt() and virt_to_abs() Michael Ellerman
2012-07-26 7:19 ` Michael Ellerman [this message]
2012-07-26 7:19 ` [PATCH 12/18] powerpc/mm: " Michael Ellerman
2012-07-26 7:19 ` [PATCH 13/18] powerpc/ps3: Replace virt_to_abs() with __pa() Michael Ellerman
2012-07-26 7:20 ` [PATCH 14/18] powerpc: Remove phys_to_abs() now all users have been removed Michael Ellerman
2012-07-26 7:20 ` [PATCH 15/18] powerpc: Remove abs_to_virt() now all users have been fixed Michael Ellerman
2012-07-26 7:20 ` [PATCH 16/18] powerpc: Remove virt_to_abs() " Michael Ellerman
2012-07-26 7:20 ` [PATCH 17/18] powerpc: Remove all includes of <asm/abs_addr.h> Michael Ellerman
2012-07-26 7:20 ` [PATCH 18/18] powerpc: Remove <asm/abs_addr.h> Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343287204-7700-11-git-send-email-michael@ellerman.id.au \
--to=michael@ellerman.id.au \
--cc=linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).