From: Varun Sethi <Varun.Sethi@freescale.com>
To: <iommu@lists.linux-foundation.org>,
<linuxppc-dev@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>,
<scottwood@freescale.com>, <joro@8bytes.org>,
<stuart.yoder@freescale.com>
Cc: Varun Sethi <Varun.Sethi@freescale.com>
Subject: [PATCH 2/6] powerpc/fsl_pci: Store the platform device information corresponding to the pci controller.
Date: Mon, 18 Feb 2013 18:22:15 +0530 [thread overview]
Message-ID: <1361191939-21260-3-git-send-email-Varun.Sethi@freescale.com> (raw)
In-Reply-To: <1361191939-21260-1-git-send-email-Varun.Sethi@freescale.com>
The pci controller structure has a provision to store the device strcuture
pointer of the corresponding platform device. Currently this information is
not stored during fsl pci controller initialization. This information is
required while dealing with iommu groups for pci devices connected to the fsl
pci controller. For the case where the pci devices can't be paritioned, they
would fall under the same device group as the pci controller.
This patch stores the platform device information in the pci controller
structure during initialization.
Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>
---
arch/powerpc/sysdev/fsl_pci.c | 9 +++++++--
arch/powerpc/sysdev/fsl_pci.h | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 92a5915..b393ae7 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -421,13 +421,16 @@ void fsl_pcibios_fixup_bus(struct pci_bus *bus)
}
}
-int __init fsl_add_bridge(struct device_node *dev, int is_primary)
+int __init fsl_add_bridge(struct platform_device *pdev, int is_primary)
{
int len;
struct pci_controller *hose;
struct resource rsrc;
const int *bus_range;
u8 hdr_type, progif;
+ struct device_node *dev;
+
+ dev = pdev->dev.of_node;
if (!of_device_is_available(dev)) {
pr_warning("%s: disabled\n", dev->full_name);
@@ -453,6 +456,8 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary)
if (!hose)
return -ENOMEM;
+ /* set platform device as the parent */
+ hose->parent = &pdev->dev;
hose->first_busno = bus_range ? bus_range[0] : 0x0;
hose->last_busno = bus_range ? bus_range[1] : 0xff;
@@ -880,7 +885,7 @@ static int fsl_pci_probe(struct platform_device *pdev)
#endif
node = pdev->dev.of_node;
- ret = fsl_add_bridge(node, fsl_pci_primary == node);
+ ret = fsl_add_bridge(pdev, fsl_pci_primary == node);
#ifdef CONFIG_SWIOTLB
if (ret == 0) {
diff --git a/arch/powerpc/sysdev/fsl_pci.h b/arch/powerpc/sysdev/fsl_pci.h
index d078537..c495c00 100644
--- a/arch/powerpc/sysdev/fsl_pci.h
+++ b/arch/powerpc/sysdev/fsl_pci.h
@@ -91,7 +91,7 @@ struct ccsr_pci {
__be32 pex_err_cap_r3; /* 0x.e34 - PCIE error capture register 0 */
};
-extern int fsl_add_bridge(struct device_node *dev, int is_primary);
+extern int fsl_add_bridge(struct platform_device *pdev, int is_primary);
extern void fsl_pcibios_fixup_bus(struct pci_bus *bus);
extern int mpc83xx_add_bridge(struct device_node *dev);
u64 fsl_pci_immrbar_base(struct pci_controller *hose);
--
1.7.4.1
next prev parent reply other threads:[~2013-02-18 13:01 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-18 12:52 [PATCH 0/6 v8] iommu/fsl: Freescale PAMU driver and IOMMU API implementation Varun Sethi
2013-02-18 12:52 ` [PATCH 1/6 v8] iommu/fsl: Store iommu domain information pointer in archdata Varun Sethi
2013-02-27 11:30 ` Joerg Roedel
2013-02-27 12:04 ` Sethi Varun-B16395
2013-02-28 15:51 ` Kumar Gala
2013-03-01 1:24 ` Alexey Kardashevskiy
2013-03-01 8:55 ` Sethi Varun-B16395
2013-03-01 10:07 ` Alexey Kardashevskiy
2013-03-01 16:21 ` Yoder Stuart-B08248
2013-03-04 6:35 ` Sethi Varun-B16395
2013-02-18 12:52 ` Varun Sethi [this message]
2013-02-26 0:09 ` [PATCH 2/6] powerpc/fsl_pci: Store the platform device information corresponding to the pci controller Stuart Yoder
2013-02-26 6:16 ` Sethi Varun-B16395
2013-02-27 10:45 ` Joerg Roedel
2013-02-27 10:56 ` Sethi Varun-B16395
2013-02-28 15:45 ` Kumar Gala
2013-03-07 9:14 ` Sethi Varun-B16395
2013-03-07 10:37 ` Joerg Roedel
2013-02-18 12:52 ` [PATCH 3/6] powerpc/fsl_pci: Added defines for the FSL PCI controller BRR1 register Varun Sethi
2013-02-27 11:33 ` Joerg Roedel
2013-02-28 15:46 ` Kumar Gala
2013-02-18 12:52 ` [PATCH 4/6] iommu/fsl: Add window permission flags for iommu_domain_window_enable API Varun Sethi
2013-02-18 12:52 ` [PATCH 5/6 v8] iommu/fsl: Add addtional attributes specific to the PAMU driver Varun Sethi
2013-02-27 11:38 ` Joerg Roedel
2013-02-18 12:52 ` [PATCH 6/6 v8] iommu/fsl: Freescale PAMU driver and IOMMU API implementation Varun Sethi
2013-02-19 10:04 ` Diana Craciun
2013-02-19 10:27 ` Sethi Varun-B16395
2013-02-19 15:59 ` Diana Craciun
2013-02-20 9:41 ` Sethi Varun-B16395
2013-02-26 22:33 ` Stuart Yoder
2013-02-27 11:56 ` Sethi Varun-B16395
2013-02-28 0:03 ` Stuart Yoder
2013-03-01 23:27 ` Stuart Yoder
2013-03-04 11:31 ` Sethi Varun-B16395
2013-03-04 16:55 ` Yoder Stuart-B08248
2013-02-25 10:15 ` [PATCH 0/6 " Sethi Varun-B16395
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=1361191939-21260-3-git-send-email-Varun.Sethi@freescale.com \
--to=varun.sethi@freescale.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=scottwood@freescale.com \
--cc=stuart.yoder@freescale.com \
/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).