From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx193.postini.com [74.125.245.193]) by kanga.kvack.org (Postfix) with SMTP id 1006D6B004A for ; Wed, 11 Apr 2012 10:36:54 -0400 (EDT) Received: from euspt2 (mailout1.w1.samsung.com [210.118.77.11]) by mailout1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTP id <0M2B00H9GKJSKI@mailout1.w1.samsung.com> for linux-mm@kvack.org; Wed, 11 Apr 2012 15:35:52 +0100 (BST) Received: from linux.samsung.com ([106.116.38.10]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0M2B008I9KLDFD@spt2.w1.samsung.com> for linux-mm@kvack.org; Wed, 11 Apr 2012 15:36:50 +0100 (BST) Date: Wed, 11 Apr 2012 16:36:43 +0200 From: Marek Szyprowski Subject: [PATCH/RFC] ARM: Exynos4: Integrate IOMMU aware DMA-mapping Message-id: <1334155004-5700-1-git-send-email-m.szyprowski@samsung.com> MIME-version: 1.0 Content-type: TEXT/PLAIN Content-transfer-encoding: 7BIT Sender: owner-linux-mm@kvack.org List-ID: To: linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, iommu@lists.linux-foundation.org Cc: Marek Szyprowski , Kyungmin Park , Arnd Bergmann , Joerg Roedel , Russell King - ARM Linux , Chunsang Jeong , Krishna Reddy , KyongHo Cho , Andrzej Pietrasiewicz , Benjamin Herrenschmidt , Konrad Rzeszutek Wilk , Hiroshi Doyu , Subash Patel Hi! This is an example of the IOMMU aware DMA-mapping implementation usage on a Samsung Exynos4 based NURI board. The ARM DMA-mapping IOMMU aware implementation is available in the [1] thread: This patch essentially registers DMA-mmaping/IOMMU support for FIMC and MFC devices and performs some tweaks in clocks hierarchy to get SYSMMU driver working correctly. The drivers have been tested with mainline V4L2 drivers for FIMC and MFC hardware. For easier testing I've created a separate kernel branch with all required prerequisite patches. It is based on lastest kgene/for-next branch and is available on my git repository: git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git 3.4-rc2-arm-dma-v8-samsung This patch requires the following items: 1. ARM DMA-mapping patches [1] 2. Exynos SYSMMU driver v12 [2] 3. Exynos SYSMMU driver runtime pm fixes 4. Exynos4 gen_pd power domain driver fixes Runtime pm and power domain patches are required on Samsung Nuri board, but might be optional on boards where bootloader doesn't disable all devices on boot. [1] http://www.spinics.net/lists/linux-arch/msg17331.html [2] https://lkml.org/lkml/2012/3/15/51 Best regards Marek Szyprowski Samsung Poland R&D Center Patch summary: Marek Szyprowski (1): ARM: Exynos4: integrate SYSMMU driver with DMA-mapping interface arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/clock-exynos4.c | 64 +++++++++++++++------------- arch/arm/mach-exynos/dev-sysmmu.c | 44 +++++++++++++++++++ arch/arm/mach-exynos/include/mach/sysmmu.h | 3 + drivers/iommu/Kconfig | 1 + 5 files changed, 84 insertions(+), 29 deletions(-) -- 1.7.1.569.g6f426 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx164.postini.com [74.125.245.164]) by kanga.kvack.org (Postfix) with SMTP id 814C16B004D for ; Wed, 11 Apr 2012 10:36:57 -0400 (EDT) Received: from euspt1 (mailout2.w1.samsung.com [210.118.77.12]) by mailout2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTP id <0M2B00H8VKLFGZ@mailout2.w1.samsung.com> for linux-mm@kvack.org; Wed, 11 Apr 2012 15:36:51 +0100 (BST) Received: from linux.samsung.com ([106.116.38.10]) by spt1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0M2B00EJFKLJ2Q@spt1.w1.samsung.com> for linux-mm@kvack.org; Wed, 11 Apr 2012 15:36:55 +0100 (BST) Date: Wed, 11 Apr 2012 16:36:44 +0200 From: Marek Szyprowski Subject: [PATCH] ARM: Exynos4: integrate SYSMMU driver with DMA-mapping interface In-reply-to: <1334155004-5700-1-git-send-email-m.szyprowski@samsung.com> Message-id: <1334155004-5700-2-git-send-email-m.szyprowski@samsung.com> MIME-version: 1.0 Content-type: TEXT/PLAIN Content-transfer-encoding: 7BIT References: <1334155004-5700-1-git-send-email-m.szyprowski@samsung.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, iommu@lists.linux-foundation.org Cc: Marek Szyprowski , Kyungmin Park , Arnd Bergmann , Joerg Roedel , Russell King - ARM Linux , Chunsang Jeong , Krishna Reddy , KyongHo Cho , Andrzej Pietrasiewicz , Benjamin Herrenschmidt , Konrad Rzeszutek Wilk , Hiroshi Doyu , Subash Patel This patch provides an provides setup code which assigns IOMMU controllers to FIMC and MFC devices and enables IOMMU aware DMA-mapping for them. It has been tested on Samsung Exynos4 platform, NURI board. Most of the work is done in the s5p_sysmmu_late_init() function, which first assigns SYSMMU controller to respective client device and then creates IO address space mapping structures. In this example 128 MiB of address space is created at 0x20000000 for most of the devices. IO address allocation precision is set to 2^4 pages, so all small allocations will be aligned to 64 pages. This reduces the size of the io address space bitmap to 4 KiB. To solve the clock dependency issues, parent clocks have been added to each SYSMMU controller bus clock. This models the true hardware behavior, because client's device bus clock also gates the respective sysmmu bus clock. Signed-off-by: Marek Szyprowski Acked-by: Kyungmin Park --- arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/clock-exynos4.c | 64 +++++++++++++++------------- arch/arm/mach-exynos/dev-sysmmu.c | 44 +++++++++++++++++++ arch/arm/mach-exynos/include/mach/sysmmu.h | 3 + drivers/iommu/Kconfig | 1 + 5 files changed, 84 insertions(+), 29 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 801c738..25b9ba5 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -288,6 +288,7 @@ config MACH_NURI select S5P_DEV_USB_EHCI select S5P_SETUP_MIPIPHY select EXYNOS4_DEV_DMA + select EXYNOS_DEV_SYSMMU select EXYNOS4_SETUP_FIMC select EXYNOS4_SETUP_FIMD0 select EXYNOS4_SETUP_I2C1 diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c index 29ae4df..fe459a3 100644 --- a/arch/arm/mach-exynos/clock-exynos4.c +++ b/arch/arm/mach-exynos/clock-exynos4.c @@ -497,29 +497,6 @@ static struct clk *exynos4_gate_clocks[] = { static struct clk exynos4_init_clocks_off[] = { { - .name = "timers", - .parent = &exynos4_clk_aclk_100.clk, - .enable = exynos4_clk_ip_peril_ctrl, - .ctrlbit = (1<<24), - }, { - .name = "csis", - .devname = "s5p-mipi-csis.0", - .enable = exynos4_clk_ip_cam_ctrl, - .ctrlbit = (1 << 4), - .parent = &exynos4_clk_gate_cam, - }, { - .name = "csis", - .devname = "s5p-mipi-csis.1", - .enable = exynos4_clk_ip_cam_ctrl, - .ctrlbit = (1 << 5), - .parent = &exynos4_clk_gate_cam, - }, { - .name = "jpeg", - .id = 0, - .enable = exynos4_clk_ip_cam_ctrl, - .ctrlbit = (1 << 6), - .parent = &exynos4_clk_gate_cam, - }, { .name = "fimc", .devname = "exynos4-fimc.0", .enable = exynos4_clk_ip_cam_ctrl, @@ -544,6 +521,35 @@ static struct clk exynos4_init_clocks_off[] = { .ctrlbit = (1 << 3), .parent = &exynos4_clk_gate_cam, }, { + .name = "mfc", + .devname = "s5p-mfc", + .enable = exynos4_clk_ip_mfc_ctrl, + .ctrlbit = (1 << 0), + .parent = &exynos4_clk_gate_mfc, + }, { + .name = "timers", + .parent = &exynos4_clk_aclk_100.clk, + .enable = exynos4_clk_ip_peril_ctrl, + .ctrlbit = (1<<24), + }, { + .name = "csis", + .devname = "s5p-mipi-csis.0", + .enable = exynos4_clk_ip_cam_ctrl, + .ctrlbit = (1 << 4), + .parent = &exynos4_clk_gate_cam, + }, { + .name = "csis", + .devname = "s5p-mipi-csis.1", + .enable = exynos4_clk_ip_cam_ctrl, + .ctrlbit = (1 << 5), + .parent = &exynos4_clk_gate_cam, + }, { + .name = "jpeg", + .id = 0, + .enable = exynos4_clk_ip_cam_ctrl, + .ctrlbit = (1 << 6), + .parent = &exynos4_clk_gate_cam, + }, { .name = "hsmmc", .devname = "exynos4-sdhci.0", .parent = &exynos4_clk_aclk_133.clk, @@ -674,12 +680,6 @@ static struct clk exynos4_init_clocks_off[] = { .ctrlbit = (1 << 0), .parent = &exynos4_clk_gate_lcd0, }, { - .name = "mfc", - .devname = "s5p-mfc", - .enable = exynos4_clk_ip_mfc_ctrl, - .ctrlbit = (1 << 0), - .parent = &exynos4_clk_gate_mfc, - }, { .name = "i2c", .devname = "s3c2440-i2c.0", .parent = &exynos4_clk_aclk_100.clk, @@ -738,11 +738,13 @@ static struct clk exynos4_init_clocks_off[] = { .devname = SYSMMU_CLOCK_DEVNAME(mfc_l, 0), .enable = exynos4_clk_ip_mfc_ctrl, .ctrlbit = (1 << 1), + .parent = &exynos4_init_clocks_off[4], }, { .name = SYSMMU_CLOCK_NAME, .devname = SYSMMU_CLOCK_DEVNAME(mfc_r, 1), .enable = exynos4_clk_ip_mfc_ctrl, .ctrlbit = (1 << 2), + .parent = &exynos4_init_clocks_off[4], }, { .name = SYSMMU_CLOCK_NAME, .devname = SYSMMU_CLOCK_DEVNAME(tv, 2), @@ -763,21 +765,25 @@ static struct clk exynos4_init_clocks_off[] = { .devname = SYSMMU_CLOCK_DEVNAME(fimc0, 5), .enable = exynos4_clk_ip_cam_ctrl, .ctrlbit = (1 << 7), + .parent = &exynos4_init_clocks_off[0], }, { .name = SYSMMU_CLOCK_NAME, .devname = SYSMMU_CLOCK_DEVNAME(fimc1, 6), .enable = exynos4_clk_ip_cam_ctrl, .ctrlbit = (1 << 8), + .parent = &exynos4_init_clocks_off[1], }, { .name = SYSMMU_CLOCK_NAME, .devname = SYSMMU_CLOCK_DEVNAME(fimc2, 7), .enable = exynos4_clk_ip_cam_ctrl, .ctrlbit = (1 << 9), + .parent = &exynos4_init_clocks_off[2], }, { .name = SYSMMU_CLOCK_NAME, .devname = SYSMMU_CLOCK_DEVNAME(fimc3, 8), .enable = exynos4_clk_ip_cam_ctrl, .ctrlbit = (1 << 10), + .parent = &exynos4_init_clocks_off[3], }, { .name = SYSMMU_CLOCK_NAME, .devname = SYSMMU_CLOCK_DEVNAME(fimd0, 10), diff --git a/arch/arm/mach-exynos/dev-sysmmu.c b/arch/arm/mach-exynos/dev-sysmmu.c index 3544638..31f2d6ca 100644 --- a/arch/arm/mach-exynos/dev-sysmmu.c +++ b/arch/arm/mach-exynos/dev-sysmmu.c @@ -12,12 +12,15 @@ #include #include +#include #include +#include #include #include #include +#include static u64 exynos_sysmmu_dma_mask = DMA_BIT_MASK(32); @@ -276,3 +279,44 @@ static int __init init_sysmmu_platform_device(void) * see pm_domain.c, which use arch_initcall() */ core_initcall(init_sysmmu_platform_device); +#ifdef CONFIG_ARM_DMA_USE_IOMMU +int __init s5p_create_iommu_mapping(struct device *client, dma_addr_t base, + unsigned int size, int order) +{ + struct dma_iommu_mapping *mapping; + if (!client) + return 0; + mapping = arm_iommu_create_mapping(&platform_bus_type, base, size, order); + if (!mapping) + return -ENOMEM; + client->dma_parms = kzalloc(sizeof(*client->dma_parms), GFP_KERNEL); + dma_set_max_seg_size(client, 0xffffffffu); + arm_iommu_attach_device(client, mapping); + return 0; +} + +/* + * s5p_sysmmu_late_init + * Create DMA-mapping IOMMU context for specified devices. This function must + * be called later, once SYSMMU driver gets registered and probed. + */ +static int __init s5p_sysmmu_late_init(void) +{ + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc0).dev, &s5p_device_fimc0.dev); + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc1).dev, &s5p_device_fimc1.dev); + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc2).dev, &s5p_device_fimc2.dev); + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc3).dev, &s5p_device_fimc3.dev); + platform_set_sysmmu(&SYSMMU_PLATDEV(mfc_l).dev, &s5p_device_mfc_l.dev); + platform_set_sysmmu(&SYSMMU_PLATDEV(mfc_r).dev, &s5p_device_mfc_r.dev); + + s5p_create_iommu_mapping(&s5p_device_fimc0.dev, 0x20000000, SZ_128M, 4); + s5p_create_iommu_mapping(&s5p_device_fimc1.dev, 0x20000000, SZ_128M, 4); + s5p_create_iommu_mapping(&s5p_device_fimc2.dev, 0x20000000, SZ_128M, 4); + s5p_create_iommu_mapping(&s5p_device_fimc3.dev, 0x20000000, SZ_128M, 4); + s5p_create_iommu_mapping(&s5p_device_mfc_l.dev, 0x20000000, SZ_128M, 4); + s5p_create_iommu_mapping(&s5p_device_mfc_r.dev, 0x40000000, SZ_128M, 4); + + return 0; +} +device_initcall(s5p_sysmmu_late_init); +#endif diff --git a/arch/arm/mach-exynos/include/mach/sysmmu.h b/arch/arm/mach-exynos/include/mach/sysmmu.h index 998daf2..07cae3a 100644 --- a/arch/arm/mach-exynos/include/mach/sysmmu.h +++ b/arch/arm/mach-exynos/include/mach/sysmmu.h @@ -57,6 +57,9 @@ static inline void platform_set_sysmmu( } #endif +int __init s5p_create_iommu_mapping(struct device *client, dma_addr_t base, + unsigned int size, int order); + #else /* !CONFIG_EXYNOS_DEV_SYSMMU */ #define platform_set_sysmmu(dev, sysmmu) do { } while (0) #endif diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 3b745bb..223e31e 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -166,6 +166,7 @@ config EXYNOS_IOMMU bool "Exynos IOMMU Support" depends on EXYNOS_DEV_SYSMMU select IOMMU_API + select ARM_DMA_USE_IOMMU help Support for the IOMMU(System MMU) of Samsung Exynos application processor family. This enables H/W multimedia accellerators to see -- 1.7.1.569.g6f426 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx106.postini.com [74.125.245.106]) by kanga.kvack.org (Postfix) with SMTP id 5090E6B004D for ; Thu, 12 Apr 2012 05:06:13 -0400 (EDT) Received: by pbcup15 with SMTP id up15so2731072pbc.14 for ; Thu, 12 Apr 2012 02:06:12 -0700 (PDT) Message-ID: <4F869AF4.3080402@gmail.com> Date: Thu, 12 Apr 2012 14:35:56 +0530 From: Subash Patel MIME-Version: 1.0 Subject: Re: [PATCH] ARM: Exynos4: integrate SYSMMU driver with DMA-mapping interface References: <1334155004-5700-1-git-send-email-m.szyprowski@samsung.com> <1334155004-5700-2-git-send-email-m.szyprowski@samsung.com> In-Reply-To: <1334155004-5700-2-git-send-email-m.szyprowski@samsung.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: Marek Szyprowski Cc: linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, iommu@lists.linux-foundation.org, Kyungmin Park , Arnd Bergmann , Joerg Roedel , Russell King - ARM Linux , Chunsang Jeong , Krishna Reddy , KyongHo Cho , Andrzej Pietrasiewicz , Benjamin Herrenschmidt , Konrad Rzeszutek Wilk , Hiroshi Doyu Hello Marek, On 04/11/2012 08:06 PM, Marek Szyprowski wrote: > This patch provides an provides setup code which assigns IOMMU controllers > to FIMC and MFC devices and enables IOMMU aware DMA-mapping for them. > It has been tested on Samsung Exynos4 platform, NURI board. > > Most of the work is done in the s5p_sysmmu_late_init() function, which > first assigns SYSMMU controller to respective client device and then > creates IO address space mapping structures. In this example 128 MiB of > address space is created at 0x20000000 for most of the devices. IO address > allocation precision is set to 2^4 pages, so all small allocations will be > aligned to 64 pages. This reduces the size of the io address space bitmap > to 4 KiB. > > To solve the clock dependency issues, parent clocks have been added to each > SYSMMU controller bus clock. This models the true hardware behavior, > because client's device bus clock also gates the respective sysmmu bus > clock. > > Signed-off-by: Marek Szyprowski > Acked-by: Kyungmin Park > --- > arch/arm/mach-exynos/Kconfig | 1 + > arch/arm/mach-exynos/clock-exynos4.c | 64 +++++++++++++++------------- > arch/arm/mach-exynos/dev-sysmmu.c | 44 +++++++++++++++++++ > arch/arm/mach-exynos/include/mach/sysmmu.h | 3 + > drivers/iommu/Kconfig | 1 + > 5 files changed, 84 insertions(+), 29 deletions(-) > > diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig > index 801c738..25b9ba5 100644 > --- a/arch/arm/mach-exynos/Kconfig > +++ b/arch/arm/mach-exynos/Kconfig > @@ -288,6 +288,7 @@ config MACH_NURI > select S5P_DEV_USB_EHCI > select S5P_SETUP_MIPIPHY > select EXYNOS4_DEV_DMA > + select EXYNOS_DEV_SYSMMU > select EXYNOS4_SETUP_FIMC > select EXYNOS4_SETUP_FIMD0 > select EXYNOS4_SETUP_I2C1 > diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c > index 29ae4df..fe459a3 100644 > --- a/arch/arm/mach-exynos/clock-exynos4.c > +++ b/arch/arm/mach-exynos/clock-exynos4.c > @@ -497,29 +497,6 @@ static struct clk *exynos4_gate_clocks[] = { > > static struct clk exynos4_init_clocks_off[] = { > { > - .name = "timers", > - .parent =&exynos4_clk_aclk_100.clk, > - .enable = exynos4_clk_ip_peril_ctrl, > - .ctrlbit = (1<<24), > - }, { > - .name = "csis", > - .devname = "s5p-mipi-csis.0", > - .enable = exynos4_clk_ip_cam_ctrl, > - .ctrlbit = (1<< 4), > - .parent =&exynos4_clk_gate_cam, > - }, { > - .name = "csis", > - .devname = "s5p-mipi-csis.1", > - .enable = exynos4_clk_ip_cam_ctrl, > - .ctrlbit = (1<< 5), > - .parent =&exynos4_clk_gate_cam, > - }, { > - .name = "jpeg", > - .id = 0, > - .enable = exynos4_clk_ip_cam_ctrl, > - .ctrlbit = (1<< 6), > - .parent =&exynos4_clk_gate_cam, > - }, { > .name = "fimc", > .devname = "exynos4-fimc.0", > .enable = exynos4_clk_ip_cam_ctrl, > @@ -544,6 +521,35 @@ static struct clk exynos4_init_clocks_off[] = { > .ctrlbit = (1<< 3), > .parent =&exynos4_clk_gate_cam, > }, { > + .name = "mfc", > + .devname = "s5p-mfc", > + .enable = exynos4_clk_ip_mfc_ctrl, > + .ctrlbit = (1<< 0), > + .parent =&exynos4_clk_gate_mfc, > + }, { > + .name = "timers", > + .parent =&exynos4_clk_aclk_100.clk, > + .enable = exynos4_clk_ip_peril_ctrl, > + .ctrlbit = (1<<24), > + }, { > + .name = "csis", > + .devname = "s5p-mipi-csis.0", > + .enable = exynos4_clk_ip_cam_ctrl, > + .ctrlbit = (1<< 4), > + .parent =&exynos4_clk_gate_cam, > + }, { > + .name = "csis", > + .devname = "s5p-mipi-csis.1", > + .enable = exynos4_clk_ip_cam_ctrl, > + .ctrlbit = (1<< 5), > + .parent =&exynos4_clk_gate_cam, > + }, { > + .name = "jpeg", > + .id = 0, > + .enable = exynos4_clk_ip_cam_ctrl, > + .ctrlbit = (1<< 6), > + .parent =&exynos4_clk_gate_cam, > + }, { > .name = "hsmmc", > .devname = "exynos4-sdhci.0", > .parent =&exynos4_clk_aclk_133.clk, > @@ -674,12 +680,6 @@ static struct clk exynos4_init_clocks_off[] = { > .ctrlbit = (1<< 0), > .parent =&exynos4_clk_gate_lcd0, > }, { > - .name = "mfc", > - .devname = "s5p-mfc", > - .enable = exynos4_clk_ip_mfc_ctrl, > - .ctrlbit = (1<< 0), > - .parent =&exynos4_clk_gate_mfc, > - }, { > .name = "i2c", > .devname = "s3c2440-i2c.0", > .parent =&exynos4_clk_aclk_100.clk, > @@ -738,11 +738,13 @@ static struct clk exynos4_init_clocks_off[] = { > .devname = SYSMMU_CLOCK_DEVNAME(mfc_l, 0), > .enable = exynos4_clk_ip_mfc_ctrl, > .ctrlbit = (1<< 1), > + .parent =&exynos4_init_clocks_off[4], > }, { > .name = SYSMMU_CLOCK_NAME, > .devname = SYSMMU_CLOCK_DEVNAME(mfc_r, 1), > .enable = exynos4_clk_ip_mfc_ctrl, > .ctrlbit = (1<< 2), > + .parent =&exynos4_init_clocks_off[4], > }, { > .name = SYSMMU_CLOCK_NAME, > .devname = SYSMMU_CLOCK_DEVNAME(tv, 2), > @@ -763,21 +765,25 @@ static struct clk exynos4_init_clocks_off[] = { > .devname = SYSMMU_CLOCK_DEVNAME(fimc0, 5), > .enable = exynos4_clk_ip_cam_ctrl, > .ctrlbit = (1<< 7), > + .parent =&exynos4_init_clocks_off[0], > }, { > .name = SYSMMU_CLOCK_NAME, > .devname = SYSMMU_CLOCK_DEVNAME(fimc1, 6), > .enable = exynos4_clk_ip_cam_ctrl, > .ctrlbit = (1<< 8), > + .parent =&exynos4_init_clocks_off[1], > }, { > .name = SYSMMU_CLOCK_NAME, > .devname = SYSMMU_CLOCK_DEVNAME(fimc2, 7), > .enable = exynos4_clk_ip_cam_ctrl, > .ctrlbit = (1<< 9), > + .parent =&exynos4_init_clocks_off[2], > }, { > .name = SYSMMU_CLOCK_NAME, > .devname = SYSMMU_CLOCK_DEVNAME(fimc3, 8), > .enable = exynos4_clk_ip_cam_ctrl, > .ctrlbit = (1<< 10), > + .parent =&exynos4_init_clocks_off[3], > }, { > .name = SYSMMU_CLOCK_NAME, > .devname = SYSMMU_CLOCK_DEVNAME(fimd0, 10), > diff --git a/arch/arm/mach-exynos/dev-sysmmu.c b/arch/arm/mach-exynos/dev-sysmmu.c > index 3544638..31f2d6ca 100644 > --- a/arch/arm/mach-exynos/dev-sysmmu.c > +++ b/arch/arm/mach-exynos/dev-sysmmu.c > @@ -12,12 +12,15 @@ > > #include > #include > +#include > > #include > +#include > > #include > #include > #include > +#include > > static u64 exynos_sysmmu_dma_mask = DMA_BIT_MASK(32); > > @@ -276,3 +279,44 @@ static int __init init_sysmmu_platform_device(void) > * see pm_domain.c, which use arch_initcall() > */ > core_initcall(init_sysmmu_platform_device); > +#ifdef CONFIG_ARM_DMA_USE_IOMMU > +int __init s5p_create_iommu_mapping(struct device *client, dma_addr_t base, > + unsigned int size, int order) > +{ > + struct dma_iommu_mapping *mapping; > + if (!client) > + return 0; > + mapping = arm_iommu_create_mapping(&platform_bus_type, base, size, order); > + if (!mapping) > + return -ENOMEM; > + client->dma_parms = kzalloc(sizeof(*client->dma_parms), GFP_KERNEL); > + dma_set_max_seg_size(client, 0xffffffffu); > + arm_iommu_attach_device(client, mapping); > + return 0; > +} > + > +/* > + * s5p_sysmmu_late_init > + * Create DMA-mapping IOMMU context for specified devices. This function must > + * be called later, once SYSMMU driver gets registered and probed. > + */ > +static int __init s5p_sysmmu_late_init(void) > +{ > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc0).dev,&s5p_device_fimc0.dev); > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc1).dev,&s5p_device_fimc1.dev); > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc2).dev,&s5p_device_fimc2.dev); > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc3).dev,&s5p_device_fimc3.dev); > + platform_set_sysmmu(&SYSMMU_PLATDEV(mfc_l).dev,&s5p_device_mfc_l.dev); > + platform_set_sysmmu(&SYSMMU_PLATDEV(mfc_r).dev,&s5p_device_mfc_r.dev); > + > + s5p_create_iommu_mapping(&s5p_device_fimc0.dev, 0x20000000, SZ_128M, 4); > + s5p_create_iommu_mapping(&s5p_device_fimc1.dev, 0x20000000, SZ_128M, 4); > + s5p_create_iommu_mapping(&s5p_device_fimc2.dev, 0x20000000, SZ_128M, 4); > + s5p_create_iommu_mapping(&s5p_device_fimc3.dev, 0x20000000, SZ_128M, 4); > + s5p_create_iommu_mapping(&s5p_device_mfc_l.dev, 0x20000000, SZ_128M, 4); > + s5p_create_iommu_mapping(&s5p_device_mfc_r.dev, 0x40000000, SZ_128M, 4); > + > + return 0; > +} > +device_initcall(s5p_sysmmu_late_init); Shouldn't these things be specific to a SoC? With this RFC, it happens that you will predefine the IOMMU attachment and mapping information for devices in common location (dev-sysmmu.c)? This may lead to problems because there are some IP's with SYSMMU support in exynos5, but not available in exynos4 (eg: GSC, FIMC-LITE, FIMC-ISP) Previously we used to do above declaration in individual machine file, which I think was more meaningful. > +#endif > diff --git a/arch/arm/mach-exynos/include/mach/sysmmu.h b/arch/arm/mach-exynos/include/mach/sysmmu.h > index 998daf2..07cae3a 100644 > --- a/arch/arm/mach-exynos/include/mach/sysmmu.h > +++ b/arch/arm/mach-exynos/include/mach/sysmmu.h > @@ -57,6 +57,9 @@ static inline void platform_set_sysmmu( > } > #endif > > +int __init s5p_create_iommu_mapping(struct device *client, dma_addr_t base, > + unsigned int size, int order); > + > #else /* !CONFIG_EXYNOS_DEV_SYSMMU */ > #define platform_set_sysmmu(dev, sysmmu) do { } while (0) > #endif > diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig > index 3b745bb..223e31e 100644 > --- a/drivers/iommu/Kconfig > +++ b/drivers/iommu/Kconfig > @@ -166,6 +166,7 @@ config EXYNOS_IOMMU > bool "Exynos IOMMU Support" > depends on EXYNOS_DEV_SYSMMU > select IOMMU_API > + select ARM_DMA_USE_IOMMU > help > Support for the IOMMU(System MMU) of Samsung Exynos application > processor family. This enables H/W multimedia accellerators to see Regards, Subash -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx102.postini.com [74.125.245.102]) by kanga.kvack.org (Postfix) with SMTP id 484C26B0092 for ; Thu, 12 Apr 2012 05:18:24 -0400 (EDT) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=us-ascii Received: from euspt2 ([210.118.77.14]) by mailout4.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0M2D0012X0ISTE70@mailout4.w1.samsung.com> for linux-mm@kvack.org; Thu, 12 Apr 2012 10:18:28 +0100 (BST) Received: from linux.samsung.com ([106.116.38.10]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0M2D00BG10IJI0@spt2.w1.samsung.com> for linux-mm@kvack.org; Thu, 12 Apr 2012 10:18:20 +0100 (BST) Date: Thu, 12 Apr 2012 11:18:17 +0200 From: Marek Szyprowski Subject: RE: [PATCH] ARM: Exynos4: integrate SYSMMU driver with DMA-mapping interface In-reply-to: <4F869AF4.3080402@gmail.com> Message-id: <026301cd188d$32613860$9723a920$%szyprowski@samsung.com> Content-language: pl References: <1334155004-5700-1-git-send-email-m.szyprowski@samsung.com> <1334155004-5700-2-git-send-email-m.szyprowski@samsung.com> <4F869AF4.3080402@gmail.com> Sender: owner-linux-mm@kvack.org List-ID: To: 'Subash Patel' Cc: linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, iommu@lists.linux-foundation.org, 'Kyungmin Park' , 'Arnd Bergmann' , 'Joerg Roedel' , 'Russell King - ARM Linux' , 'Chunsang Jeong' , 'Krishna Reddy' , 'KyongHo Cho' , Andrzej Pietrasiewicz , 'Benjamin Herrenschmidt' , 'Konrad Rzeszutek Wilk' , 'Hiroshi Doyu' Hi Subash, On Thursday, April 12, 2012 11:06 AM Subash Patel wrote: > On 04/11/2012 08:06 PM, Marek Szyprowski wrote: > > This patch provides an provides setup code which assigns IOMMU controllers > > to FIMC and MFC devices and enables IOMMU aware DMA-mapping for them. > > It has been tested on Samsung Exynos4 platform, NURI board. > > > > Most of the work is done in the s5p_sysmmu_late_init() function, which > > first assigns SYSMMU controller to respective client device and then > > creates IO address space mapping structures. In this example 128 MiB of > > address space is created at 0x20000000 for most of the devices. IO address > > allocation precision is set to 2^4 pages, so all small allocations will be > > aligned to 64 pages. This reduces the size of the io address space bitmap > > to 4 KiB. > > > > To solve the clock dependency issues, parent clocks have been added to each > > SYSMMU controller bus clock. This models the true hardware behavior, > > because client's device bus clock also gates the respective sysmmu bus > > clock. > > > > Signed-off-by: Marek Szyprowski > > Acked-by: Kyungmin Park > > --- > > arch/arm/mach-exynos/Kconfig | 1 + > > arch/arm/mach-exynos/clock-exynos4.c | 64 +++++++++++++++------------- > > arch/arm/mach-exynos/dev-sysmmu.c | 44 +++++++++++++++++++ > > arch/arm/mach-exynos/include/mach/sysmmu.h | 3 + > > drivers/iommu/Kconfig | 1 + > > 5 files changed, 84 insertions(+), 29 deletions(-) > > > > diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig > > index 801c738..25b9ba5 100644 > > --- a/arch/arm/mach-exynos/Kconfig > > +++ b/arch/arm/mach-exynos/Kconfig > > @@ -288,6 +288,7 @@ config MACH_NURI > > select S5P_DEV_USB_EHCI > > select S5P_SETUP_MIPIPHY > > select EXYNOS4_DEV_DMA > > + select EXYNOS_DEV_SYSMMU > > select EXYNOS4_SETUP_FIMC > > select EXYNOS4_SETUP_FIMD0 > > select EXYNOS4_SETUP_I2C1 > > diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c > > index 29ae4df..fe459a3 100644 > > --- a/arch/arm/mach-exynos/clock-exynos4.c > > +++ b/arch/arm/mach-exynos/clock-exynos4.c > > @@ -497,29 +497,6 @@ static struct clk *exynos4_gate_clocks[] = { > > > > static struct clk exynos4_init_clocks_off[] = { > > { > > - .name = "timers", > > - .parent =&exynos4_clk_aclk_100.clk, > > - .enable = exynos4_clk_ip_peril_ctrl, > > - .ctrlbit = (1<<24), > > - }, { > > - .name = "csis", > > - .devname = "s5p-mipi-csis.0", > > - .enable = exynos4_clk_ip_cam_ctrl, > > - .ctrlbit = (1<< 4), > > - .parent =&exynos4_clk_gate_cam, > > - }, { > > - .name = "csis", > > - .devname = "s5p-mipi-csis.1", > > - .enable = exynos4_clk_ip_cam_ctrl, > > - .ctrlbit = (1<< 5), > > - .parent =&exynos4_clk_gate_cam, > > - }, { > > - .name = "jpeg", > > - .id = 0, > > - .enable = exynos4_clk_ip_cam_ctrl, > > - .ctrlbit = (1<< 6), > > - .parent =&exynos4_clk_gate_cam, > > - }, { > > .name = "fimc", > > .devname = "exynos4-fimc.0", > > .enable = exynos4_clk_ip_cam_ctrl, > > @@ -544,6 +521,35 @@ static struct clk exynos4_init_clocks_off[] = { > > .ctrlbit = (1<< 3), > > .parent =&exynos4_clk_gate_cam, > > }, { > > + .name = "mfc", > > + .devname = "s5p-mfc", > > + .enable = exynos4_clk_ip_mfc_ctrl, > > + .ctrlbit = (1<< 0), > > + .parent =&exynos4_clk_gate_mfc, > > + }, { > > + .name = "timers", > > + .parent =&exynos4_clk_aclk_100.clk, > > + .enable = exynos4_clk_ip_peril_ctrl, > > + .ctrlbit = (1<<24), > > + }, { > > + .name = "csis", > > + .devname = "s5p-mipi-csis.0", > > + .enable = exynos4_clk_ip_cam_ctrl, > > + .ctrlbit = (1<< 4), > > + .parent =&exynos4_clk_gate_cam, > > + }, { > > + .name = "csis", > > + .devname = "s5p-mipi-csis.1", > > + .enable = exynos4_clk_ip_cam_ctrl, > > + .ctrlbit = (1<< 5), > > + .parent =&exynos4_clk_gate_cam, > > + }, { > > + .name = "jpeg", > > + .id = 0, > > + .enable = exynos4_clk_ip_cam_ctrl, > > + .ctrlbit = (1<< 6), > > + .parent =&exynos4_clk_gate_cam, > > + }, { > > .name = "hsmmc", > > .devname = "exynos4-sdhci.0", > > .parent =&exynos4_clk_aclk_133.clk, > > @@ -674,12 +680,6 @@ static struct clk exynos4_init_clocks_off[] = { > > .ctrlbit = (1<< 0), > > .parent =&exynos4_clk_gate_lcd0, > > }, { > > - .name = "mfc", > > - .devname = "s5p-mfc", > > - .enable = exynos4_clk_ip_mfc_ctrl, > > - .ctrlbit = (1<< 0), > > - .parent =&exynos4_clk_gate_mfc, > > - }, { > > .name = "i2c", > > .devname = "s3c2440-i2c.0", > > .parent =&exynos4_clk_aclk_100.clk, > > @@ -738,11 +738,13 @@ static struct clk exynos4_init_clocks_off[] = { > > .devname = SYSMMU_CLOCK_DEVNAME(mfc_l, 0), > > .enable = exynos4_clk_ip_mfc_ctrl, > > .ctrlbit = (1<< 1), > > + .parent =&exynos4_init_clocks_off[4], > > }, { > > .name = SYSMMU_CLOCK_NAME, > > .devname = SYSMMU_CLOCK_DEVNAME(mfc_r, 1), > > .enable = exynos4_clk_ip_mfc_ctrl, > > .ctrlbit = (1<< 2), > > + .parent =&exynos4_init_clocks_off[4], > > }, { > > .name = SYSMMU_CLOCK_NAME, > > .devname = SYSMMU_CLOCK_DEVNAME(tv, 2), > > @@ -763,21 +765,25 @@ static struct clk exynos4_init_clocks_off[] = { > > .devname = SYSMMU_CLOCK_DEVNAME(fimc0, 5), > > .enable = exynos4_clk_ip_cam_ctrl, > > .ctrlbit = (1<< 7), > > + .parent =&exynos4_init_clocks_off[0], > > }, { > > .name = SYSMMU_CLOCK_NAME, > > .devname = SYSMMU_CLOCK_DEVNAME(fimc1, 6), > > .enable = exynos4_clk_ip_cam_ctrl, > > .ctrlbit = (1<< 8), > > + .parent =&exynos4_init_clocks_off[1], > > }, { > > .name = SYSMMU_CLOCK_NAME, > > .devname = SYSMMU_CLOCK_DEVNAME(fimc2, 7), > > .enable = exynos4_clk_ip_cam_ctrl, > > .ctrlbit = (1<< 9), > > + .parent =&exynos4_init_clocks_off[2], > > }, { > > .name = SYSMMU_CLOCK_NAME, > > .devname = SYSMMU_CLOCK_DEVNAME(fimc3, 8), > > .enable = exynos4_clk_ip_cam_ctrl, > > .ctrlbit = (1<< 10), > > + .parent =&exynos4_init_clocks_off[3], > > }, { > > .name = SYSMMU_CLOCK_NAME, > > .devname = SYSMMU_CLOCK_DEVNAME(fimd0, 10), > > diff --git a/arch/arm/mach-exynos/dev-sysmmu.c b/arch/arm/mach-exynos/dev-sysmmu.c > > index 3544638..31f2d6ca 100644 > > --- a/arch/arm/mach-exynos/dev-sysmmu.c > > +++ b/arch/arm/mach-exynos/dev-sysmmu.c > > @@ -12,12 +12,15 @@ > > > > #include > > #include > > +#include > > > > #include > > +#include > > > > #include > > #include > > #include > > +#include > > > > static u64 exynos_sysmmu_dma_mask = DMA_BIT_MASK(32); > > > > @@ -276,3 +279,44 @@ static int __init init_sysmmu_platform_device(void) > > * see pm_domain.c, which use arch_initcall() > > */ > > core_initcall(init_sysmmu_platform_device); > > +#ifdef CONFIG_ARM_DMA_USE_IOMMU > > +int __init s5p_create_iommu_mapping(struct device *client, dma_addr_t base, > > + unsigned int size, int order) > > +{ > > + struct dma_iommu_mapping *mapping; > > + if (!client) > > + return 0; > > + mapping = arm_iommu_create_mapping(&platform_bus_type, base, size, order); > > + if (!mapping) > > + return -ENOMEM; > > + client->dma_parms = kzalloc(sizeof(*client->dma_parms), GFP_KERNEL); > > + dma_set_max_seg_size(client, 0xffffffffu); > > + arm_iommu_attach_device(client, mapping); > > + return 0; > > +} > > + > > +/* > > + * s5p_sysmmu_late_init > > + * Create DMA-mapping IOMMU context for specified devices. This function must > > + * be called later, once SYSMMU driver gets registered and probed. > > + */ > > +static int __init s5p_sysmmu_late_init(void) > > +{ > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc0).dev,&s5p_device_fimc0.dev); > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc1).dev,&s5p_device_fimc1.dev); > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc2).dev,&s5p_device_fimc2.dev); > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc3).dev,&s5p_device_fimc3.dev); > > + platform_set_sysmmu(&SYSMMU_PLATDEV(mfc_l).dev,&s5p_device_mfc_l.dev); > > + platform_set_sysmmu(&SYSMMU_PLATDEV(mfc_r).dev,&s5p_device_mfc_r.dev); > > + > > + s5p_create_iommu_mapping(&s5p_device_fimc0.dev, 0x20000000, SZ_128M, 4); > > + s5p_create_iommu_mapping(&s5p_device_fimc1.dev, 0x20000000, SZ_128M, 4); > > + s5p_create_iommu_mapping(&s5p_device_fimc2.dev, 0x20000000, SZ_128M, 4); > > + s5p_create_iommu_mapping(&s5p_device_fimc3.dev, 0x20000000, SZ_128M, 4); > > + s5p_create_iommu_mapping(&s5p_device_mfc_l.dev, 0x20000000, SZ_128M, 4); > > + s5p_create_iommu_mapping(&s5p_device_mfc_r.dev, 0x40000000, SZ_128M, 4); > > + > > + return 0; > > +} > > +device_initcall(s5p_sysmmu_late_init); > > Shouldn't these things be specific to a SoC? With this RFC, it happens > that you will predefine the IOMMU attachment and mapping information for > devices in common location (dev-sysmmu.c)? This may lead to problems > because there are some IP's with SYSMMU support in exynos5, but not > available in exynos4 (eg: GSC, FIMC-LITE, FIMC-ISP) Previously we used > to do above declaration in individual machine file, which I think was > more meaningful. Right, I simplified the code too much. Keeping these definitions inside machine files was a better idea. I completely forgot that Exynos sub-platform now covers both Exynos4 and Exynos5 SoC families. Best regards -- Marek Szyprowski Samsung Poland R&D Center -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx121.postini.com [74.125.245.121]) by kanga.kvack.org (Postfix) with SMTP id 5B4746B00F5 for ; Thu, 12 Apr 2012 07:09:32 -0400 (EDT) From: Arnd Bergmann Subject: Re: [PATCH] ARM: Exynos4: integrate SYSMMU driver with DMA-mapping interface Date: Thu, 12 Apr 2012 11:09:28 +0000 References: <1334155004-5700-1-git-send-email-m.szyprowski@samsung.com> <4F869AF4.3080402@gmail.com> <026301cd188d$32613860$9723a920$%szyprowski@samsung.com> In-Reply-To: <026301cd188d$32613860$9723a920$%szyprowski@samsung.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201204121109.28753.arnd@arndb.de> Sender: owner-linux-mm@kvack.org List-ID: To: Marek Szyprowski Cc: 'Subash Patel' , linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, iommu@lists.linux-foundation.org, 'Kyungmin Park' , 'Joerg Roedel' , 'Russell King - ARM Linux' , 'Chunsang Jeong' , 'Krishna Reddy' , 'KyongHo Cho' , Andrzej Pietrasiewicz , 'Benjamin Herrenschmidt' , 'Konrad Rzeszutek Wilk' , 'Hiroshi Doyu' On Thursday 12 April 2012, Marek Szyprowski wrote: > + > > > +/* > > > + * s5p_sysmmu_late_init > > > + * Create DMA-mapping IOMMU context for specified devices. This function must > > > + * be called later, once SYSMMU driver gets registered and probed. > > > + */ > > > +static int __init s5p_sysmmu_late_init(void) > > > +{ > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc0).dev,&s5p_device_fimc0.dev); > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc1).dev,&s5p_device_fimc1.dev); > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc2).dev,&s5p_device_fimc2.dev); > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc3).dev,&s5p_device_fimc3.dev); > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(mfc_l).dev,&s5p_device_mfc_l.dev); > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(mfc_r).dev,&s5p_device_mfc_r.dev); > > > + > > > + s5p_create_iommu_mapping(&s5p_device_fimc0.dev, 0x20000000, SZ_128M, 4); > > > + s5p_create_iommu_mapping(&s5p_device_fimc1.dev, 0x20000000, SZ_128M, 4); > > > + s5p_create_iommu_mapping(&s5p_device_fimc2.dev, 0x20000000, SZ_128M, 4); > > > + s5p_create_iommu_mapping(&s5p_device_fimc3.dev, 0x20000000, SZ_128M, 4); > > > + s5p_create_iommu_mapping(&s5p_device_mfc_l.dev, 0x20000000, SZ_128M, 4); > > > + s5p_create_iommu_mapping(&s5p_device_mfc_r.dev, 0x40000000, SZ_128M, 4); > > > + > > > + return 0; > > > +} > > > +device_initcall(s5p_sysmmu_late_init); > > > > Shouldn't these things be specific to a SoC? With this RFC, it happens > > that you will predefine the IOMMU attachment and mapping information for > > devices in common location (dev-sysmmu.c)? This may lead to problems > > because there are some IP's with SYSMMU support in exynos5, but not > > available in exynos4 (eg: GSC, FIMC-LITE, FIMC-ISP) Previously we used > > to do above declaration in individual machine file, which I think was > > more meaningful. > > Right, I simplified the code too much. Keeping these definitions inside machine > files was a better idea. I completely forgot that Exynos sub-platform now covers > both Exynos4 and Exynos5 SoC families. Ideally the information about iommu attachment should come from the device tree. We have the "dma-ranges" properties that define how a dma address space is mapped. I am not entirely sure how that works when you have multiple IOMMUs and if that requires defining addititional properties, but I think we should make it so that we don't have to hardcode specific devices in the source. Arnd -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx204.postini.com [74.125.245.204]) by kanga.kvack.org (Postfix) with SMTP id 8AE1D6B0107 for ; Thu, 12 Apr 2012 08:13:43 -0400 (EDT) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=us-ascii Received: from euspt2 ([210.118.77.13]) by mailout3.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0M2D00LGG8M7N100@mailout3.w1.samsung.com> for linux-mm@kvack.org; Thu, 12 Apr 2012 13:13:19 +0100 (BST) Received: from linux.samsung.com ([106.116.38.10]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0M2D00MKQ8MQDO@spt2.w1.samsung.com> for linux-mm@kvack.org; Thu, 12 Apr 2012 13:13:39 +0100 (BST) Date: Thu, 12 Apr 2012 14:13:37 +0200 From: Marek Szyprowski Subject: RE: [PATCH] ARM: Exynos4: integrate SYSMMU driver with DMA-mapping interface In-reply-to: <201204121109.28753.arnd@arndb.de> Message-id: <028f01cd18a5$b0721770$11564650$%szyprowski@samsung.com> Content-language: pl References: <1334155004-5700-1-git-send-email-m.szyprowski@samsung.com> <4F869AF4.3080402@gmail.com> <026301cd188d$32613860$9723a920$%szyprowski@samsung.com> <201204121109.28753.arnd@arndb.de> Sender: owner-linux-mm@kvack.org List-ID: To: 'Arnd Bergmann' Cc: 'Subash Patel' , linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, iommu@lists.linux-foundation.org, 'Kyungmin Park' , 'Joerg Roedel' , 'Russell King - ARM Linux' , 'Chunsang Jeong' , 'Krishna Reddy' , 'KyongHo Cho' , Andrzej Pietrasiewicz , 'Benjamin Herrenschmidt' , 'Konrad Rzeszutek Wilk' , 'Hiroshi Doyu' > -----Original Message----- > From: Arnd Bergmann [mailto:arnd@arndb.de] > Sent: Thursday, April 12, 2012 1:09 PM > To: Marek Szyprowski > Cc: 'Subash Patel'; linux-arm-kernel@lists.infradead.org; linaro-mm-sig@lists.linaro.org; > linux-mm@kvack.org; linux-arch@vger.kernel.org; iommu@lists.linux-foundation.org; 'Kyungmin > Park'; 'Joerg Roedel'; 'Russell King - ARM Linux'; 'Chunsang Jeong'; 'Krishna Reddy'; 'KyongHo > Cho'; Andrzej Pietrasiewicz; 'Benjamin Herrenschmidt'; 'Konrad Rzeszutek Wilk'; 'Hiroshi Doyu' > Subject: Re: [PATCH] ARM: Exynos4: integrate SYSMMU driver with DMA-mapping interface > > On Thursday 12 April 2012, Marek Szyprowski wrote: > > + > > > > +/* > > > > + * s5p_sysmmu_late_init > > > > + * Create DMA-mapping IOMMU context for specified devices. This function must > > > > + * be called later, once SYSMMU driver gets registered and probed. > > > > + */ > > > > +static int __init s5p_sysmmu_late_init(void) > > > > +{ > > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc0).dev,&s5p_device_fimc0.dev); > > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc1).dev,&s5p_device_fimc1.dev); > > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc2).dev,&s5p_device_fimc2.dev); > > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc3).dev,&s5p_device_fimc3.dev); > > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(mfc_l).dev,&s5p_device_mfc_l.dev); > > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(mfc_r).dev,&s5p_device_mfc_r.dev); > > > > + > > > > + s5p_create_iommu_mapping(&s5p_device_fimc0.dev, 0x20000000, SZ_128M, 4); > > > > + s5p_create_iommu_mapping(&s5p_device_fimc1.dev, 0x20000000, SZ_128M, 4); > > > > + s5p_create_iommu_mapping(&s5p_device_fimc2.dev, 0x20000000, SZ_128M, 4); > > > > + s5p_create_iommu_mapping(&s5p_device_fimc3.dev, 0x20000000, SZ_128M, 4); > > > > + s5p_create_iommu_mapping(&s5p_device_mfc_l.dev, 0x20000000, SZ_128M, 4); > > > > + s5p_create_iommu_mapping(&s5p_device_mfc_r.dev, 0x40000000, SZ_128M, 4); > > > > + > > > > + return 0; > > > > +} > > > > +device_initcall(s5p_sysmmu_late_init); > > > > > > Shouldn't these things be specific to a SoC? With this RFC, it happens > > > that you will predefine the IOMMU attachment and mapping information for > > > devices in common location (dev-sysmmu.c)? This may lead to problems > > > because there are some IP's with SYSMMU support in exynos5, but not > > > available in exynos4 (eg: GSC, FIMC-LITE, FIMC-ISP) Previously we used > > > to do above declaration in individual machine file, which I think was > > > more meaningful. > > > > Right, I simplified the code too much. Keeping these definitions inside machine > > files was a better idea. I completely forgot that Exynos sub-platform now covers > > both Exynos4 and Exynos5 SoC families. > > Ideally the information about iommu attachment should come from the > device tree. We have the "dma-ranges" properties that define how a dma > address space is mapped. I am not entirely sure how that works when you > have multiple IOMMUs and if that requires defining addititional properties, > but I think we should make it so that we don't have to hardcode specific > devices in the source. Right, until that time machine/board files are imho ok. Best regards -- Marek Szyprowski Samsung Poland R&D Center -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx190.postini.com [74.125.245.190]) by kanga.kvack.org (Postfix) with SMTP id 1088F6B0109 for ; Thu, 12 Apr 2012 08:39:46 -0400 (EDT) From: Hiroshi Doyu Date: Thu, 12 Apr 2012 14:38:40 +0200 Subject: Re: [PATCH] ARM: Exynos4: integrate SYSMMU driver with DMA-mapping interface Message-ID: <20120412.153840.505876550992316983.hdoyu@nvidia.com> References: <026301cd188d$32613860$9723a920$%szyprowski@samsung.com><201204121109.28753.arnd@arndb.de><028f01cd18a5$b0721770$11564650$%szyprowski@samsung.com> In-Reply-To: <028f01cd18a5$b0721770$11564650$%szyprowski@samsung.com> Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: owner-linux-mm@kvack.org List-ID: To: "arnd@arndb.de" , "m.szyprowski@samsung.com" , "linux-tegra@vger.kernel.org" Cc: "subashrp@gmail.com" , "linux-arm-kernel@lists.infradead.org" , "linaro-mm-sig@lists.linaro.org" , "linux-mm@kvack.org" , "linux-arch@vger.kernel.org" , "iommu@lists.linux-foundation.org" , "kyungmin.park@samsung.com" , "joro@8bytes.org" , "linux@arm.linux.org.uk" , "chunsang.jeong@linaro.org" , Krishna Reddy , "pullip.cho@samsung.com" , "andrzej.p@samsung.com" , "benh@kernel.crashing.org" , "konrad.wilk@oracle.com" From: Marek Szyprowski Subject: RE: [PATCH] ARM: Exynos4: integrate SYSMMU driver with DMA-mapping= interface Date: Thu, 12 Apr 2012 14:13:37 +0200 Message-ID: <028f01cd18a5$b0721770$11564650$%szyprowski@samsung.com> > > > > > > -----Original Message----- > > From: Arnd Bergmann [mailto:arnd@arndb.de] > > Sent: Thursday, April 12, 2012 1:09 PM > > To: Marek Szyprowski > > Cc: 'Subash Patel'; linux-arm-kernel@lists.infradead.org; linaro-mm-sig= @lists.linaro.org; > > linux-mm@kvack.org; linux-arch@vger.kernel.org; iommu@lists.linux-found= ation.org; 'Kyungmin > > Park'; 'Joerg Roedel'; 'Russell King - ARM Linux'; 'Chunsang Jeong'; 'K= rishna Reddy'; 'KyongHo > > Cho'; Andrzej Pietrasiewicz; 'Benjamin Herrenschmidt'; 'Konrad Rzeszute= k Wilk'; 'Hiroshi Doyu' > > Subject: Re: [PATCH] ARM: Exynos4: integrate SYSMMU driver with DMA-map= ping interface > > > > On Thursday 12 April 2012, Marek Szyprowski wrote: > > > + > > > > > +/* > > > > > + * s5p_sysmmu_late_init > > > > > + * Create DMA-mapping IOMMU context for specified devices. This = function must > > > > > + * be called later, once SYSMMU driver gets registered and probe= d. > > > > > + */ > > > > > +static int __init s5p_sysmmu_late_init(void) > > > > > +{ > > > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc0).dev,&s5p_device_fi= mc0.dev); > > > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc1).dev,&s5p_device_fi= mc1.dev); > > > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc2).dev,&s5p_device_fi= mc2.dev); > > > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(fimc3).dev,&s5p_device_fi= mc3.dev); > > > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(mfc_l).dev,&s5p_device_mf= c_l.dev); > > > > > + platform_set_sysmmu(&SYSMMU_PLATDEV(mfc_r).dev,&s5p_device_mf= c_r.dev); > > > > > + > > > > > + s5p_create_iommu_mapping(&s5p_device_fimc0.dev, 0x20000000, S= Z_128M, 4); > > > > > + s5p_create_iommu_mapping(&s5p_device_fimc1.dev, 0x20000000, S= Z_128M, 4); > > > > > + s5p_create_iommu_mapping(&s5p_device_fimc2.dev, 0x20000000, S= Z_128M, 4); > > > > > + s5p_create_iommu_mapping(&s5p_device_fimc3.dev, 0x20000000, S= Z_128M, 4); > > > > > + s5p_create_iommu_mapping(&s5p_device_mfc_l.dev, 0x20000000, S= Z_128M, 4); > > > > > + s5p_create_iommu_mapping(&s5p_device_mfc_r.dev, 0x40000000, S= Z_128M, 4); > > > > > + > > > > > + return 0; > > > > > +} > > > > > +device_initcall(s5p_sysmmu_late_init); > > > > > > > > Shouldn't these things be specific to a SoC? With this RFC, it happ= ens > > > > that you will predefine the IOMMU attachment and mapping informatio= n for > > > > devices in common location (dev-sysmmu.c)? This may lead to problem= s > > > > because there are some IP's with SYSMMU support in exynos5, but not > > > > available in exynos4 (eg: GSC, FIMC-LITE, FIMC-ISP) Previously we u= sed > > > > to do above declaration in individual machine file, which I think w= as > > > > more meaningful. > > > > > > Right, I simplified the code too much. Keeping these definitions insi= de machine > > > files was a better idea. I completely forgot that Exynos sub-platform= now covers > > > both Exynos4 and Exynos5 SoC families. > > > > Ideally the information about iommu attachment should come from the > > device tree. We have the "dma-ranges" properties that define how a dma > > address space is mapped. I am not entirely sure how that works when you > > have multiple IOMMUs and if that requires defining addititional propert= ies, > > but I think we should make it so that we don't have to hardcode specifi= c > > devices in the source. > > Right, until that time machine/board files are imho ok. In Tegra30, there are quite many IOMMU attachable (platform)devices, and it's quite nice for us to configure them (un)attached with address range and IOMMU device ID(ASID) in DT in advance rather than inserting the code to attach those devices here and there. Experimentally I added some hook in platform_device_add() as below, but apparently this won't be accepted.