* [PATCH/RFC] iommu/ipmmu-vmsa: IPMMU SYS-DMAC iova mapping workaround
@ 2016-09-20 11:54 Magnus Damm
2016-09-27 6:20 ` Niklas Söderlund
0 siblings, 1 reply; 4+ messages in thread
From: Magnus Damm @ 2016-09-20 11:54 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Magnus Damm
From: Magnus Damm <damm+renesas@opensource.se>
Here's some prototype code that works around the lack of software
support for mapping I/O devices to the SYS-DMAC hardware via the
DMA Engine framework when using IOMMU.
The code itself is one big layering violation that goes through
the DT and unconditionally maps I/O devices using DMACs via the
IPMMU device instance into iova space with a 1:1 mapping.
This very short term prototype will for instance automatically make
the SCIF serial port function with the IPMMU hardware in case the
SYS-DMAC is hooked up to the IPMMU device.
Not to be confused with the more long term solution to allow the
DMA Engine framework to map I/O device memory dynamically.
Not-Yet-Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
Applies on top of: renesas-drivers-2016-09-13-v4.8-rc6
drivers/iommu/ipmmu-vmsa.c | 75 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 75 insertions(+)
--- 0001/drivers/iommu/ipmmu-vmsa.c
+++ work/drivers/iommu/ipmmu-vmsa.c 2016-09-20 20:03:37.620607110 +0900
@@ -19,6 +19,7 @@
#include <linux/iommu.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/of_address.h>
#include <linux/of_iommu.h>
#include <linux/platform_device.h>
#include <linux/sizes.h>
@@ -625,6 +626,78 @@ static void ipmmu_domain_free(struct iom
kfree(domain);
}
+static void ipmmu_workaround_map(struct iommu_domain *io_domain,
+ struct device *dma_dev, struct resource *res)
+{
+ phys_addr_t phys_addr;
+
+ dev_info(dma_dev, "map %pr\n", res);
+
+ phys_addr = iommu_iova_to_phys(io_domain, res->start);
+ if (phys_addr)
+ return;
+
+ iommu_map(io_domain, res->start, res->start,
+ ALIGN(resource_size(res), SZ_4K),
+ IOMMU_READ | IOMMU_WRITE);
+}
+
+static void ipmmu_workaround_dt(struct iommu_domain *io_domain,
+ struct device *dev,
+ void (*match)(struct iommu_domain *io_domain,
+ struct device *dma_dev,
+ struct resource *res))
+{
+ struct device_node *np = NULL;
+ struct of_phandle_args dma_spec;
+ struct resource r;
+ int i, cnt;
+ bool found;
+
+ /* Locate I/O devices using the DMAC and map their registers */
+ while ((np = of_find_all_nodes(np))) {
+ if (!of_find_property(np, "dmas", NULL))
+ continue;
+
+ cnt = of_property_count_strings(np, "dma-names");
+ if (cnt < 0)
+ continue;
+
+ found = false;
+ for (i = 0; i < cnt; i++) {
+ if (of_parse_phandle_with_args(np, "dmas",
+ "#dma-cells", i,
+ &dma_spec))
+ continue;
+
+ if (dma_spec.np == dev->of_node)
+ found = true;
+
+ of_node_put(dma_spec.np);
+ }
+
+ if (!found)
+ continue;
+
+ i = 0;
+ while (!of_address_to_resource(np, i, &r)) {
+ match(io_domain, dev, &r);
+ i++;
+ }
+ }
+}
+
+static void ipmmu_workaround(struct iommu_domain *io_domain,
+ struct device *dev)
+{
+ /* only apply workaround for DMA controllers */
+ if (!strstr(dev_name(dev), "dma-controller"))
+ return;
+
+ dev_info(dev, "Adding iommu workaround to map I/O devices for DMACs\n");
+ ipmmu_workaround_dt(io_domain, dev, ipmmu_workaround_map);
+}
+
static int ipmmu_attach_device(struct iommu_domain *io_domain,
struct device *dev)
{
@@ -678,6 +751,8 @@ static int ipmmu_attach_device(struct io
if (ret < 0)
return ret;
+ ipmmu_workaround(io_domain, dev);
+
for (i = 0; i < archdata->num_utlbs; ++i)
ipmmu_utlb_enable(domain, archdata->utlbs[i]);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH/RFC] iommu/ipmmu-vmsa: IPMMU SYS-DMAC iova mapping workaround
2016-09-20 11:54 [PATCH/RFC] iommu/ipmmu-vmsa: IPMMU SYS-DMAC iova mapping workaround Magnus Damm
@ 2016-09-27 6:20 ` Niklas Söderlund
2016-09-27 6:43 ` Magnus Damm
0 siblings, 1 reply; 4+ messages in thread
From: Niklas Söderlund @ 2016-09-27 6:20 UTC (permalink / raw)
To: Magnus Damm; +Cc: linux-renesas-soc
Hi Magnus,
On 2016-09-20 20:54:33 +0900, Magnus Damm wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Here's some prototype code that works around the lack of software
> support for mapping I/O devices to the SYS-DMAC hardware via the
> DMA Engine framework when using IOMMU.
>
> The code itself is one big layering violation that goes through
> the DT and unconditionally maps I/O devices using DMACs via the
> IPMMU device instance into iova space with a 1:1 mapping.
>
> This very short term prototype will for instance automatically make
> the SCIF serial port function with the IPMMU hardware in case the
> SYS-DMAC is hooked up to the IPMMU device.
>
> Not to be confused with the more long term solution to allow the
> DMA Engine framework to map I/O device memory dynamically.
Good news, Vinod queued the dma_{map,unmap}_resource API and rcar-dmac
usage of it yesterday \o/.
>
> Not-Yet-Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> ---
>
> Applies on top of: renesas-drivers-2016-09-13-v4.8-rc6
>
> drivers/iommu/ipmmu-vmsa.c | 75 ++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 75 insertions(+)
>
> --- 0001/drivers/iommu/ipmmu-vmsa.c
> +++ work/drivers/iommu/ipmmu-vmsa.c 2016-09-20 20:03:37.620607110 +0900
> @@ -19,6 +19,7 @@
> #include <linux/iommu.h>
> #include <linux/module.h>
> #include <linux/of.h>
> +#include <linux/of_address.h>
> #include <linux/of_iommu.h>
> #include <linux/platform_device.h>
> #include <linux/sizes.h>
> @@ -625,6 +626,78 @@ static void ipmmu_domain_free(struct iom
> kfree(domain);
> }
>
> +static void ipmmu_workaround_map(struct iommu_domain *io_domain,
> + struct device *dma_dev, struct resource *res)
> +{
> + phys_addr_t phys_addr;
> +
> + dev_info(dma_dev, "map %pr\n", res);
> +
> + phys_addr = iommu_iova_to_phys(io_domain, res->start);
> + if (phys_addr)
> + return;
> +
> + iommu_map(io_domain, res->start, res->start,
> + ALIGN(resource_size(res), SZ_4K),
> + IOMMU_READ | IOMMU_WRITE);
> +}
> +
> +static void ipmmu_workaround_dt(struct iommu_domain *io_domain,
> + struct device *dev,
> + void (*match)(struct iommu_domain *io_domain,
> + struct device *dma_dev,
> + struct resource *res))
> +{
> + struct device_node *np = NULL;
> + struct of_phandle_args dma_spec;
> + struct resource r;
> + int i, cnt;
> + bool found;
> +
> + /* Locate I/O devices using the DMAC and map their registers */
> + while ((np = of_find_all_nodes(np))) {
> + if (!of_find_property(np, "dmas", NULL))
> + continue;
> +
> + cnt = of_property_count_strings(np, "dma-names");
> + if (cnt < 0)
> + continue;
> +
> + found = false;
> + for (i = 0; i < cnt; i++) {
> + if (of_parse_phandle_with_args(np, "dmas",
> + "#dma-cells", i,
> + &dma_spec))
> + continue;
> +
> + if (dma_spec.np == dev->of_node)
> + found = true;
> +
> + of_node_put(dma_spec.np);
> + }
> +
> + if (!found)
> + continue;
> +
> + i = 0;
> + while (!of_address_to_resource(np, i, &r)) {
> + match(io_domain, dev, &r);
> + i++;
> + }
> + }
> +}
> +
> +static void ipmmu_workaround(struct iommu_domain *io_domain,
> + struct device *dev)
> +{
> + /* only apply workaround for DMA controllers */
> + if (!strstr(dev_name(dev), "dma-controller"))
> + return;
> +
> + dev_info(dev, "Adding iommu workaround to map I/O devices for DMACs\n");
> + ipmmu_workaround_dt(io_domain, dev, ipmmu_workaround_map);
> +}
> +
> static int ipmmu_attach_device(struct iommu_domain *io_domain,
> struct device *dev)
> {
> @@ -678,6 +751,8 @@ static int ipmmu_attach_device(struct io
> if (ret < 0)
> return ret;
>
> + ipmmu_workaround(io_domain, dev);
> +
> for (i = 0; i < archdata->num_utlbs; ++i)
> ipmmu_utlb_enable(domain, archdata->utlbs[i]);
>
--
Regards,
Niklas S�derlund
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH/RFC] iommu/ipmmu-vmsa: IPMMU SYS-DMAC iova mapping workaround
2016-09-27 6:20 ` Niklas Söderlund
@ 2016-09-27 6:43 ` Magnus Damm
2016-09-27 10:11 ` Niklas Söderlund
0 siblings, 1 reply; 4+ messages in thread
From: Magnus Damm @ 2016-09-27 6:43 UTC (permalink / raw)
To: Niklas Söderlund; +Cc: Linux-Renesas
Hi Niklas,
On Tue, Sep 27, 2016 at 3:20 PM, Niklas Söderlund
<niklas.soderlund@ragnatech.se> wrote:
> Hi Magnus,
>
> On 2016-09-20 20:54:33 +0900, Magnus Damm wrote:
>> From: Magnus Damm <damm+renesas@opensource.se>
>>
>> Here's some prototype code that works around the lack of software
>> support for mapping I/O devices to the SYS-DMAC hardware via the
>> DMA Engine framework when using IOMMU.
>>
>> The code itself is one big layering violation that goes through
>> the DT and unconditionally maps I/O devices using DMACs via the
>> IPMMU device instance into iova space with a 1:1 mapping.
>>
>> This very short term prototype will for instance automatically make
>> the SCIF serial port function with the IPMMU hardware in case the
>> SYS-DMAC is hooked up to the IPMMU device.
>>
>> Not to be confused with the more long term solution to allow the
>> DMA Engine framework to map I/O device memory dynamically.
>
> Good news, Vinod queued the dma_{map,unmap}_resource API and rcar-dmac
> usage of it yesterday \o/.
Excellent. Are the DMA Engine slave devices supposed to work out of
the box with the IPMMU then, or is some other component missing?
Cheers,
/ magnus
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH/RFC] iommu/ipmmu-vmsa: IPMMU SYS-DMAC iova mapping workaround
2016-09-27 6:43 ` Magnus Damm
@ 2016-09-27 10:11 ` Niklas Söderlund
0 siblings, 0 replies; 4+ messages in thread
From: Niklas Söderlund @ 2016-09-27 10:11 UTC (permalink / raw)
To: Magnus Damm; +Cc: Linux-Renesas
Hi Magnus,
On 2016-09-27 15:43:30 +0900, Magnus Damm wrote:
> Hi Niklas,
>
> On Tue, Sep 27, 2016 at 3:20 PM, Niklas S�derlund
> <niklas.soderlund@ragnatech.se> wrote:
> > Hi Magnus,
> >
> > On 2016-09-20 20:54:33 +0900, Magnus Damm wrote:
> >> From: Magnus Damm <damm+renesas@opensource.se>
> >>
> >> Here's some prototype code that works around the lack of software
> >> support for mapping I/O devices to the SYS-DMAC hardware via the
> >> DMA Engine framework when using IOMMU.
> >>
> >> The code itself is one big layering violation that goes through
> >> the DT and unconditionally maps I/O devices using DMACs via the
> >> IPMMU device instance into iova space with a 1:1 mapping.
> >>
> >> This very short term prototype will for instance automatically make
> >> the SCIF serial port function with the IPMMU hardware in case the
> >> SYS-DMAC is hooked up to the IPMMU device.
> >>
> >> Not to be confused with the more long term solution to allow the
> >> DMA Engine framework to map I/O device memory dynamically.
> >
> > Good news, Vinod queued the dma_{map,unmap}_resource API and rcar-dmac
> > usage of it yesterday \o/.
>
> Excellent. Are the DMA Engine slave devices supposed to work out of
> the box with the IPMMU then, or is some other component missing?
The DT and shmobile_defconfig patches are missing. If you enable
CONFIG_IPMMU_VMSA and wire up DT (see bellow for Koelsch example) then
all devices I have tried works (MMC, I2C and serial consoles).
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 8f0086b..d19bffd 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -325,6 +325,21 @@
power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
#dma-cells = <1>;
dma-channels = <15>;
+ iommus = <&ipmmu_ds 0>,
+ <&ipmmu_ds 1>,
+ <&ipmmu_ds 2>,
+ <&ipmmu_ds 3>,
+ <&ipmmu_ds 4>,
+ <&ipmmu_ds 5>,
+ <&ipmmu_ds 6>,
+ <&ipmmu_ds 7>,
+ <&ipmmu_ds 8>,
+ <&ipmmu_ds 9>,
+ <&ipmmu_ds 10>,
+ <&ipmmu_ds 11>,
+ <&ipmmu_ds 12>,
+ <&ipmmu_ds 13>,
+ <&ipmmu_ds 14>;
};
dmac1: dma-controller@e6720000 {
@@ -356,6 +371,21 @@
power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
#dma-cells = <1>;
dma-channels = <15>;
+ iommus = <&ipmmu_ds 15>,
+ <&ipmmu_ds 16>,
+ <&ipmmu_ds 17>,
+ <&ipmmu_ds 18>,
+ <&ipmmu_ds 19>,
+ <&ipmmu_ds 20>,
+ <&ipmmu_ds 21>,
+ <&ipmmu_ds 22>,
+ <&ipmmu_ds 23>,
+ <&ipmmu_ds 24>,
+ <&ipmmu_ds 25>,
+ <&ipmmu_ds 26>,
+ <&ipmmu_ds 27>,
+ <&ipmmu_ds 28>,
+ <&ipmmu_ds 29>;
};
audma0: dma-controller@ec700000 {
@@ -1693,7 +1723,7 @@
interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
- status = "disabled";
+ status = "okay";
};
ipmmu_mp: mmu@ec680000 {
Also please note that I'm having problems with the next branch of
git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma.git and
the commit 761ed4a (tty: serial_core: convert uart_close to use
tty_port_close) together with a systemd init system. I have to revert to
commit in order for the system to boot, but I will comment on that in a
separate e-mail.
--
Regards,
Niklas S�derlund
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-27 10:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-20 11:54 [PATCH/RFC] iommu/ipmmu-vmsa: IPMMU SYS-DMAC iova mapping workaround Magnus Damm
2016-09-27 6:20 ` Niklas Söderlund
2016-09-27 6:43 ` Magnus Damm
2016-09-27 10:11 ` Niklas Söderlund
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.