| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1494912127-12890-2-git-send-email-oza.oza@broadcom.com>
Date: Tue, 16 May 2017 10:52:05 +0530
From: Oza Pawandeep <oza.oza@...adcom.com>
To: Joerg Roedel <joro@...tes.org>, Robin Murphy <robin.murphy@....com>
Cc: iommu@...ts.linux-foundation.org, linux-pci@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
devicetree@...r.kernel.org, bcm-kernel-feedback-list@...adcom.com,
Oza Pawandeep <oza.pawandeep@...il.com>,
Oza Pawandeep <oza.oza@...adcom.com>
Subject: [PATCH v6 1/3] of/pci/dma: fix DMA configuration for PCI masters
current device framework and OF framework integration assumes
dma-ranges in a way where memory-mapped devices define their
dma-ranges. (child-bus-address, parent-bus-address, length).
of_dma_configure is specifically written to take care of memory
mapped devices. but no implementation exists for pci to take
care of pcie based memory ranges.
for e.g. iproc based SOCs and other SOCs(suc as rcar) have PCI
world dma-ranges.
dma-ranges = <0x43000000 0x00 0x00 0x00 0x00 0x80 0x00>;
this patch serves following:
1) exposes interface to the pci host driver for their
inbound memory ranges
2) provide an interface to callers such as of_dma_get_ranges.
so then the returned size get best possible (largest) dma_mask.
because PCI RC drivers do not call APIs such as
dma_set_coherent_mask() and hence rather it shows its addressing
capabilities based on dma-ranges.
for e.g.
dma-ranges = <0x43000000 0x00 0x00 0x00 0x00 0x80 0x00>;
we should get dev->coherent_dma_mask=0x7fffffffff.
3) this patch handles multiple inbound windows and dma-ranges.
it is left to the caller, how it wants to use them.
the new function returns the resources in a standard and unform way
4) this way the callers of for e.g. of_dma_get_ranges
does not need to change.
Signed-off-by: Oza Pawandeep <oza.oza@...adcom.com>
diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
index 0ee42c3..4005ed3 100644
--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@ -283,6 +283,101 @@ int of_pci_get_host_bridge_resources(struct device_node *dev,
return err;
}
EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources);
+
+/**
+ * of_pci_get_dma_ranges - Parse PCI host bridge inbound resources from DT
+ * @np: device node of the host bridge having the dma-ranges property
+ * @resources: list where the range of resources will be added after DT parsing
+ *
+ * It is the caller's job to free the @resources list.
+ *
+ * This function will parse the "dma-ranges" property of a
+ * PCI host bridge device node and setup the resource mapping based
+ * on its content.
+ *
+ * It returns zero if the range parsing has been successful or a standard error
+ * value if it failed.
+ */
+
+int of_pci_get_dma_ranges(struct device_node *dn, struct list_head *resources)
+{
+ struct device_node *node = of_node_get(dn);
+ int rlen;
+ int pna = of_n_addr_cells(node);
+ const int na = 3, ns = 2;
+ int np = pna + na + ns;
+ int ret = 0;
+ struct resource *res;
+ const u32 *dma_ranges;
+ struct of_pci_range range;
+
+ if (!node)
+ return -EINVAL;
+
+ while (1) {
+ dma_ranges = of_get_property(node, "dma-ranges", &rlen);
+
+ /* Ignore empty ranges, they imply no translation required. */
+ if (dma_ranges && rlen > 0)
+ break;
+
+ /* no dma-ranges, they imply no translation required. */
+ if (!dma_ranges)
+ break;
+
+ node = of_get_next_parent(node);
+
+ if (!node)
+ break;
+ }
+
+ if (!dma_ranges) {
+ pr_debug("pcie device has no dma-ranges defined for node(%s)\n",
+ dn->full_name);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ while ((rlen -= np * 4) >= 0) {
+ range.pci_space = dma_ranges[0];
+ range.pci_addr = of_read_number(dma_ranges + 1, ns);
+ range.cpu_addr = of_translate_dma_address(node,
+ dma_ranges + na);
+ range.size = of_read_number(dma_ranges + pna + na, ns);
+
+ dma_ranges += np;
+
+ /*
+ * If we failed translation or got a zero-sized region
+ * then skip this range.
+ */
+ if (range.cpu_addr == OF_BAD_ADDR || range.size == 0)
+ continue;
+
+ res = kzalloc(sizeof(struct resource), GFP_KERNEL);
+ if (!res) {
+ ret = -ENOMEM;
+ goto parse_failed;
+ }
+
+ ret = of_pci_range_to_resource(&range, dn, res);
+ if (ret) {
+ kfree(res);
+ continue;
+ }
+
+ pci_add_resource_offset(resources, res,
+ res->start - range.pci_addr);
+ }
+ return ret;
+
+parse_failed:
+ pci_free_resource_list(resources);
+out:
+ of_node_put(node);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(of_pci_get_dma_ranges);
#endif /* CONFIG_OF_ADDRESS */
#ifdef CONFIG_PCI_MSI
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h
index 0e0974e..617b90d 100644
--- a/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@ -76,6 +76,7 @@ static inline void of_pci_check_probe_only(void) { }
int of_pci_get_host_bridge_resources(struct device_node *dev,
unsigned char busno, unsigned char bus_max,
struct list_head *resources, resource_size_t *io_base);
+int of_pci_get_dma_ranges(struct device_node *np, struct list_head *resources);
#else
static inline int of_pci_get_host_bridge_resources(struct device_node *dev,
unsigned char busno, unsigned char bus_max,
@@ -83,6 +84,12 @@ static inline int of_pci_get_host_bridge_resources(struct device_node *dev,
{
return -EINVAL;
}
+
+static inline int of_pci_get_dma_ranges(struct device_node *np,
+ struct list_head *resources)
+{
+ return -EINVAL;
+}
#endif
#if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI)
--
1.9.1
Powered by blists - more mailing lists