From: Nishanth Aravamudan <nacc@us.ibm.com>
To: nacc@us.ibm.com
Cc: devicetree-discuss@lists.ozlabs.org,
Milton Miller <miltonm@bga.com>,
Paul Mackerras <paulus@samba.org>,
Anton Blanchard <anton@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 13/15] ppc/pseries: iommu cleanup
Date: Wed, 15 Sep 2010 11:05:56 -0700 [thread overview]
Message-ID: <1284573958-8397-14-git-send-email-nacc@us.ibm.com> (raw)
In-Reply-To: <1284573958-8397-1-git-send-email-nacc@us.ibm.com>
No need to initialize per-cpu pointer to NULL, it is the default.
Direct dma ops and no setup are the defaults, no need to set for
iommu-off.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
---
arch/powerpc/platforms/pseries/iommu.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index a77bcae..9184db3 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -140,7 +140,7 @@ static int tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum,
return ret;
}
-static DEFINE_PER_CPU(u64 *, tce_page) = NULL;
+static DEFINE_PER_CPU(u64 *, tce_page);
static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
long npages, unsigned long uaddr,
@@ -589,13 +589,8 @@ static struct notifier_block iommu_reconfig_nb = {
/* These are called very early. */
void iommu_init_early_pSeries(void)
{
- if (of_chosen && of_get_property(of_chosen, "linux,iommu-off", NULL)) {
- /* Direct I/O, IOMMU off */
- ppc_md.pci_dma_dev_setup = NULL;
- ppc_md.pci_dma_bus_setup = NULL;
- set_pci_dma_ops(&dma_direct_ops);
+ if (of_chosen && of_get_property(of_chosen, "linux,iommu-off", NULL))
return;
- }
if (firmware_has_feature(FW_FEATURE_LPAR)) {
if (firmware_has_feature(FW_FEATURE_MULTITCE)) {
--
1.7.0.4
next prev parent reply other threads:[~2010-09-15 18:05 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1284573958-8397-1-git-send-email-nacc@us.ibm.com>
2010-09-15 18:05 ` [PATCH 02/15] ppc64: fix dma_iommu_dma_supported compare Nishanth Aravamudan
2010-09-15 18:05 ` [PATCH 03/15] ppc64 iommu: fix check for direct DMA support Nishanth Aravamudan
2010-09-15 18:05 ` [PATCH 04/15] vio: put device on device_register failure Nishanth Aravamudan
2010-09-15 18:29 ` Grant Likely
2010-09-15 18:05 ` [PATCH 05/15] viobus: free TCE table on device release Nishanth Aravamudan
2010-09-15 18:05 ` [PATCH 06/15] pseries/dlpar: use kmemdup Nishanth Aravamudan
2010-09-15 18:05 ` [PATCH 07/15] ppc: pci-common cleanup Nishanth Aravamudan
2010-09-15 18:30 ` Grant Likely
2010-09-15 18:05 ` [PATCH 09/15] ppc/vio: use dma ops helpers Nishanth Aravamudan
2010-09-15 18:33 ` Grant Likely
2010-10-13 4:56 ` Benjamin Herrenschmidt
2010-10-13 17:43 ` Nishanth Aravamudan
2010-09-15 18:05 ` [PATCH 10/15] ppc/pasemi: clean up pasemi iommu table initializations Nishanth Aravamudan
2010-09-15 18:29 ` Olof Johansson
2010-09-15 18:05 ` [PATCH 11/15] ppc/cell: beat dma ops cleanup Nishanth Aravamudan
2010-09-16 11:23 ` Arnd Bergmann
2010-09-15 18:05 ` [PATCH 12/15] ppc/dart: iommu table cleanup Nishanth Aravamudan
2010-09-15 18:05 ` Nishanth Aravamudan [this message]
2010-09-15 18:34 ` [PATCH 13/15] ppc/pseries: iommu cleanup Grant Likely
2010-09-15 18:05 ` [PATCH 14/15] ppc64 iommu: use coherent_dma_mask for alloc_coherent Nishanth Aravamudan
2010-11-29 0:58 ` Benjamin Herrenschmidt
2010-12-01 0:31 ` Nishanth Aravamudan
2010-09-15 18:05 ` [PATCH 15/15] ppc/vio: ensure dma_coherent_mask is set Nishanth Aravamudan
2010-09-15 18:37 ` Grant Likely
2010-09-15 18:44 ` Nishanth Aravamudan
2010-09-15 18:49 ` Grant Likely
2010-11-29 1:02 ` Benjamin Herrenschmidt
2010-11-29 19:46 ` Nishanth Aravamudan
2010-11-29 20:25 ` Benjamin Herrenschmidt
2010-09-15 18:13 ` [PATCH 01/15] ppc: fix return type of BUID_{HI,LO} macros Nishanth Aravamudan
2010-09-16 22:54 ` Linas Vepstas
2010-09-16 23:04 ` Scott Wood
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=1284573958-8397-14-git-send-email-nacc@us.ibm.com \
--to=nacc@us.ibm.com \
--cc=anton@samba.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=miltonm@bga.com \
--cc=paulus@samba.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).