From: Stuart Yoder <stuart.yoder@nxp.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 7/7 v2] pci/layerscape: set LUT and msi-map for discovered PCI devices
Date: Thu, 25 Feb 2016 17:06:23 -0600 [thread overview]
Message-ID: <1456441583-20932-8-git-send-email-stuart.yoder@nxp.com> (raw)
In-Reply-To: <1456441583-20932-1-git-send-email-stuart.yoder@nxp.com>
From: Stuart Yoder <stuart.yoder@nxp.com>
for all PCI devices discovered in a system:
-allocate a LUT (look-up-table) entry in that PCI controller
-allocate a stream ID for the device
-program and enable a LUT entry (maps PCI requester id to stream ID)
-set the msi-map property on the controller reflecting the
LUT mapping
basic bus scanning loop/logic was taken from drivers/pci/pci.c
pci_hose_scan_bus().
Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
---
-v2
-removed skip of host bridge when scanning the bus
drivers/pci/pcie_layerscape.c | 64 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c
index dfafaf2..3470210 100644
--- a/drivers/pci/pcie_layerscape.c
+++ b/drivers/pci/pcie_layerscape.c
@@ -569,6 +569,66 @@ static void fdt_pcie_set_msi_map_entry(void *blob, struct ls_pcie *pcie,
fdt_appendprop_u32(blob, nodeoffset, "msi-map", 1);
}
+static void fdt_fixup_pcie(void *blob)
+{
+ unsigned int found_multi = 0;
+ unsigned char header_type;
+ int index;
+ u32 streamid;
+ pci_dev_t dev;
+ int bus;
+ unsigned short id;
+ struct pci_controller *hose;
+ struct ls_pcie *pcie;
+ int i;
+
+ for (i = 0, hose = pci_get_hose_head(); hose; hose = hose->next, i++) {
+ pcie = hose->priv_data;
+ for (bus = hose->first_busno; bus <= hose->last_busno; bus++) {
+
+ for (dev = PCI_BDF(bus, 0, 0);
+ dev < PCI_BDF(bus, PCI_MAX_PCI_DEVICES - 1,
+ PCI_MAX_PCI_FUNCTIONS - 1);
+ dev += PCI_BDF(0, 0, 1)) {
+
+ if (PCI_FUNC(dev) && !found_multi)
+ continue;
+
+ pci_read_config_word(dev, PCI_VENDOR_ID, &id);
+
+ pci_read_config_byte(dev, PCI_HEADER_TYPE,
+ &header_type);
+
+ if ((id == 0xFFFF) || (id == 0x0000))
+ continue;
+
+ if (!PCI_FUNC(dev))
+ found_multi = header_type & 0x80;
+
+ streamid = ls_pcie_next_streamid();
+ if (streamid < 0) {
+ printf("ERROR: no stream ids free\n");
+ continue;
+ }
+
+ index = ls_pcie_next_lut_index(pcie);
+ if (index < 0) {
+ printf("ERROR: no LUT indexes free\n");
+ continue;
+ }
+
+ /* map PCI b.d.f to streamID in LUT */
+ ls_pcie_lut_set_mapping(pcie, index, dev >> 8,
+ streamid);
+
+ /* update msi-map in device tree */
+ fdt_pcie_set_msi_map_entry(blob, pcie, dev >> 8,
+ streamid);
+ }
+ }
+ }
+}
+
int ls_pcie_init_ctrl(int busno, enum srds_prtcl dev, struct ls_pcie_info *info)
{
struct ls_pcie *pcie;
@@ -745,6 +805,10 @@ void ft_pci_setup(void *blob, bd_t *bd)
#ifdef CONFIG_PCIE4
ft_pcie_ls_setup(blob, FSL_PCIE_COMPAT, CONFIG_SYS_PCIE4_ADDR, PCIE4);
#endif
+
+ #if defined(CONFIG_LS2080A) || defined(CONFIG_LS2085A)
+ fdt_fixup_pcie(blob);
+ #endif
}
#else
--
1.7.9.5
next prev parent reply other threads:[~2016-02-25 23:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 23:06 [U-Boot] [PATCH 0/7 v2] support mapping PCI device ids to stream ids for MSIs Stuart Yoder
2016-02-25 23:06 ` [U-Boot] [PATCH 1/7 v2] armv8: ls2080a: remove obsolete stream ID partitioning support Stuart Yoder
2016-02-25 23:06 ` [U-Boot] [PATCH 3/7 v2] pci: make pci_get_hose_head() available to external users Stuart Yoder
2016-02-25 23:06 ` [U-Boot] [PATCH 4/7 v2] pci/layerscape: add support for LUT Stuart Yoder
2016-02-26 5:56 ` Minghuan Lian
2016-02-26 15:43 ` Stuart Yoder
2016-02-25 23:06 ` [U-Boot] [PATCH 5/7 v2] pci/layerscape: add stream ID allocator Stuart Yoder
2016-02-25 23:06 ` [U-Boot] [PATCH 6/7 v2] pci/layerscape: fdt: function to set msi-map entries Stuart Yoder
2016-02-25 23:06 ` Stuart Yoder [this message]
2016-02-26 5:55 ` [U-Boot] [PATCH 7/7 v2] pci/layerscape: set LUT and msi-map for discovered PCI devices Minghuan Lian
2016-02-26 15:10 ` Stuart Yoder
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=1456441583-20932-8-git-send-email-stuart.yoder@nxp.com \
--to=stuart.yoder@nxp.com \
--cc=u-boot@lists.denx.de \
/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