From: Stepan Moskovchenko <stepanm@codeaurora.org> To: dwalker@codeaurora.org Cc: davidb@codeaurora.org, bryanh@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stepan Moskovchenko <stepanm@codeaurora.org> Subject: [PATCH 06/14] msm: iommu: Support for the 2nd GFX core's IOMMU Date: Fri, 12 Nov 2010 19:29:52 -0800 [thread overview] Message-ID: <1289619000-13167-7-git-send-email-stepanm@codeaurora.org> (raw) In-Reply-To: <1289619000-13167-1-git-send-email-stepanm@codeaurora.org> Add the platform data and resources needed for the second 2D graphics core's IOMMU. Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org> --- arch/arm/mach-msm/devices-msm8x60-iommu.c | 54 +++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-msm/devices-msm8x60-iommu.c b/arch/arm/mach-msm/devices-msm8x60-iommu.c index 8cccb26..a6ecd39 100644 --- a/arch/arm/mach-msm/devices-msm8x60-iommu.c +++ b/arch/arm/mach-msm/devices-msm8x60-iommu.c @@ -254,6 +254,27 @@ static struct resource msm_iommu_gfx2d0_resources[] = { }, }; +static struct resource msm_iommu_gfx2d1_resources[] = { + { + .start = MSM_IOMMU_GFX2D1_PHYS, + .end = MSM_IOMMU_GFX2D1_PHYS + MSM_IOMMU_GFX2D1_SIZE - 1, + .name = "physbase", + .flags = IORESOURCE_MEM, + }, + { + .name = "nonsecure_irq", + .start = SMMU_GFX2D1_CB_SC_NON_SECURE_IRQ, + .end = SMMU_GFX2D1_CB_SC_NON_SECURE_IRQ, + .flags = IORESOURCE_IRQ, + }, + { + .name = "secure_irq", + .start = SMMU_GFX2D1_CB_SC_SECURE_IRQ, + .end = SMMU_GFX2D1_CB_SC_SECURE_IRQ, + .flags = IORESOURCE_IRQ, + }, +}; + static struct platform_device msm_root_iommu_dev = { .name = "msm_iommu", .id = -1, @@ -307,6 +328,11 @@ static struct msm_iommu_dev gfx2d0_iommu = { .clk_rate = 27000000 }; +static struct msm_iommu_dev gfx2d1_iommu = { + .name = "gfx2d1", + .clk_rate = 27000000 +}; + static struct platform_device msm_device_iommu_jpegd = { .name = "msm_iommu", .id = 0, @@ -417,6 +443,16 @@ static struct platform_device msm_device_iommu_gfx2d0 = { .resource = msm_iommu_gfx2d0_resources, }; +struct platform_device msm_device_iommu_gfx2d1 = { + .name = "msm_iommu", + .id = 11, + .dev = { + .parent = &msm_root_iommu_dev.dev, + }, + .num_resources = ARRAY_SIZE(msm_iommu_gfx2d1_resources), + .resource = msm_iommu_gfx2d1_resources, +}; + static struct msm_iommu_ctx_dev jpegd_src_ctx = { .name = "jpegd_src", .num = 0, @@ -538,6 +574,12 @@ static struct msm_iommu_ctx_dev gfx2d0_2d0_ctx = { .mids = {0, 1, 2, 3, 4, 5, 6, 7, -1} }; +static struct msm_iommu_ctx_dev gfx2d1_2d1_ctx = { + .name = "gfx2d1_2d1", + .num = 0, + .mids = {0, 1, 2, 3, 4, 5, 6, 7, -1} +}; + static struct platform_device msm_device_jpegd_src_ctx = { .name = "msm_iommu_ctx", .id = 0, @@ -698,6 +740,14 @@ static struct platform_device msm_device_gfx2d0_2d0_ctx = { }, }; +static struct platform_device msm_device_gfx2d1_2d1_ctx = { + .name = "msm_iommu_ctx", + .id = 20, + .dev = { + .parent = &msm_device_iommu_gfx2d1.dev, + }, +}; + static struct platform_device *msm_iommu_devs[] = { &msm_device_iommu_jpegd, &msm_device_iommu_vpe, @@ -710,6 +760,7 @@ static struct platform_device *msm_iommu_devs[] = { &msm_device_iommu_vcodec_b, &msm_device_iommu_gfx3d, &msm_device_iommu_gfx2d0, + &msm_device_iommu_gfx2d1, }; static struct msm_iommu_dev *msm_iommu_data[] = { @@ -724,6 +775,7 @@ static struct msm_iommu_dev *msm_iommu_data[] = { &vcodec_b_iommu, &gfx3d_iommu, &gfx2d0_iommu, + &gfx2d1_iommu, }; static struct platform_device *msm_iommu_ctx_devs[] = { @@ -747,6 +799,7 @@ static struct platform_device *msm_iommu_ctx_devs[] = { &msm_device_gfx3d_user_ctx, &msm_device_gfx3d_priv_ctx, &msm_device_gfx2d0_2d0_ctx, + &msm_device_gfx2d1_2d1_ctx, }; static struct msm_iommu_ctx_dev *msm_iommu_ctx_data[] = { @@ -770,6 +823,7 @@ static struct msm_iommu_ctx_dev *msm_iommu_ctx_data[] = { &gfx3d_user_ctx, &gfx3d_priv_ctx, &gfx2d0_2d0_ctx, + &gfx2d1_2d1_ctx, }; static int msm8x60_iommu_init(void) -- 1.7.0.2 Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
WARNING: multiple messages have this Message-ID (diff)
From: stepanm@codeaurora.org (Stepan Moskovchenko) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 06/14] msm: iommu: Support for the 2nd GFX core's IOMMU Date: Fri, 12 Nov 2010 19:29:52 -0800 [thread overview] Message-ID: <1289619000-13167-7-git-send-email-stepanm@codeaurora.org> (raw) In-Reply-To: <1289619000-13167-1-git-send-email-stepanm@codeaurora.org> Add the platform data and resources needed for the second 2D graphics core's IOMMU. Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org> --- arch/arm/mach-msm/devices-msm8x60-iommu.c | 54 +++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-msm/devices-msm8x60-iommu.c b/arch/arm/mach-msm/devices-msm8x60-iommu.c index 8cccb26..a6ecd39 100644 --- a/arch/arm/mach-msm/devices-msm8x60-iommu.c +++ b/arch/arm/mach-msm/devices-msm8x60-iommu.c @@ -254,6 +254,27 @@ static struct resource msm_iommu_gfx2d0_resources[] = { }, }; +static struct resource msm_iommu_gfx2d1_resources[] = { + { + .start = MSM_IOMMU_GFX2D1_PHYS, + .end = MSM_IOMMU_GFX2D1_PHYS + MSM_IOMMU_GFX2D1_SIZE - 1, + .name = "physbase", + .flags = IORESOURCE_MEM, + }, + { + .name = "nonsecure_irq", + .start = SMMU_GFX2D1_CB_SC_NON_SECURE_IRQ, + .end = SMMU_GFX2D1_CB_SC_NON_SECURE_IRQ, + .flags = IORESOURCE_IRQ, + }, + { + .name = "secure_irq", + .start = SMMU_GFX2D1_CB_SC_SECURE_IRQ, + .end = SMMU_GFX2D1_CB_SC_SECURE_IRQ, + .flags = IORESOURCE_IRQ, + }, +}; + static struct platform_device msm_root_iommu_dev = { .name = "msm_iommu", .id = -1, @@ -307,6 +328,11 @@ static struct msm_iommu_dev gfx2d0_iommu = { .clk_rate = 27000000 }; +static struct msm_iommu_dev gfx2d1_iommu = { + .name = "gfx2d1", + .clk_rate = 27000000 +}; + static struct platform_device msm_device_iommu_jpegd = { .name = "msm_iommu", .id = 0, @@ -417,6 +443,16 @@ static struct platform_device msm_device_iommu_gfx2d0 = { .resource = msm_iommu_gfx2d0_resources, }; +struct platform_device msm_device_iommu_gfx2d1 = { + .name = "msm_iommu", + .id = 11, + .dev = { + .parent = &msm_root_iommu_dev.dev, + }, + .num_resources = ARRAY_SIZE(msm_iommu_gfx2d1_resources), + .resource = msm_iommu_gfx2d1_resources, +}; + static struct msm_iommu_ctx_dev jpegd_src_ctx = { .name = "jpegd_src", .num = 0, @@ -538,6 +574,12 @@ static struct msm_iommu_ctx_dev gfx2d0_2d0_ctx = { .mids = {0, 1, 2, 3, 4, 5, 6, 7, -1} }; +static struct msm_iommu_ctx_dev gfx2d1_2d1_ctx = { + .name = "gfx2d1_2d1", + .num = 0, + .mids = {0, 1, 2, 3, 4, 5, 6, 7, -1} +}; + static struct platform_device msm_device_jpegd_src_ctx = { .name = "msm_iommu_ctx", .id = 0, @@ -698,6 +740,14 @@ static struct platform_device msm_device_gfx2d0_2d0_ctx = { }, }; +static struct platform_device msm_device_gfx2d1_2d1_ctx = { + .name = "msm_iommu_ctx", + .id = 20, + .dev = { + .parent = &msm_device_iommu_gfx2d1.dev, + }, +}; + static struct platform_device *msm_iommu_devs[] = { &msm_device_iommu_jpegd, &msm_device_iommu_vpe, @@ -710,6 +760,7 @@ static struct platform_device *msm_iommu_devs[] = { &msm_device_iommu_vcodec_b, &msm_device_iommu_gfx3d, &msm_device_iommu_gfx2d0, + &msm_device_iommu_gfx2d1, }; static struct msm_iommu_dev *msm_iommu_data[] = { @@ -724,6 +775,7 @@ static struct msm_iommu_dev *msm_iommu_data[] = { &vcodec_b_iommu, &gfx3d_iommu, &gfx2d0_iommu, + &gfx2d1_iommu, }; static struct platform_device *msm_iommu_ctx_devs[] = { @@ -747,6 +799,7 @@ static struct platform_device *msm_iommu_ctx_devs[] = { &msm_device_gfx3d_user_ctx, &msm_device_gfx3d_priv_ctx, &msm_device_gfx2d0_2d0_ctx, + &msm_device_gfx2d1_2d1_ctx, }; static struct msm_iommu_ctx_dev *msm_iommu_ctx_data[] = { @@ -770,6 +823,7 @@ static struct msm_iommu_ctx_dev *msm_iommu_ctx_data[] = { &gfx3d_user_ctx, &gfx3d_priv_ctx, &gfx2d0_2d0_ctx, + &gfx2d1_2d1_ctx, }; static int msm8x60_iommu_init(void) -- 1.7.0.2 Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
next prev parent reply other threads:[~2010-11-13 3:30 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-11-13 3:29 [PATCH 00/14] Improvements to the MSM IOMMU driver Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko 2010-11-13 3:29 ` [PATCH 01/14] msm: iommu: Increase maximum MID size to 5 bits Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko 2010-11-13 3:29 ` [PATCH 02/14] msm: iomap: Addresses and IRQs for 2nd GFX core IOMMU Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko 2010-11-13 3:29 ` [PATCH 03/14] msm: iommu: Use more consistent naming in platform data Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko 2010-11-13 3:29 ` [PATCH 04/14] msm: iommu: Revise GFX3D IOMMU contexts and M2V mappings Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko 2010-11-13 3:29 ` [PATCH 05/14] msm: iommu: Revise GFX2D0 " Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko [this message] 2010-11-13 3:29 ` [PATCH 06/14] msm: iommu: Support for the 2nd GFX core's IOMMU Stepan Moskovchenko 2010-11-13 3:29 ` [PATCH 07/14] msm: iommu: Mark functions with the right section names Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko 2010-11-13 3:29 ` [PATCH 08/14] msm: iommu: Don't flush page tables if no devices attached Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko 2010-11-13 3:29 ` [PATCH 09/14] msm: iommu: Kconfig option for cacheable page tables Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko 2010-11-14 20:17 ` Daniel Walker 2010-11-14 20:17 ` Daniel Walker 2010-11-15 2:56 ` Stepan Moskovchenko 2010-11-15 2:56 ` Stepan Moskovchenko 2010-11-15 2:56 ` Stepan Moskovchenko 2010-11-15 18:20 ` Daniel Walker 2010-11-15 18:20 ` Daniel Walker 2010-11-15 18:20 ` Daniel Walker 2010-11-16 1:47 ` Stepan Moskovchenko 2010-11-16 1:47 ` Stepan Moskovchenko 2010-11-16 1:47 ` Stepan Moskovchenko 2010-11-16 1:46 ` [PATCH 09/14 v2] msm: iommu: Kconfig item " Stepan Moskovchenko 2010-11-16 1:46 ` Stepan Moskovchenko 2010-11-13 3:29 ` [PATCH 10/14] msm: iommu: Check if device is already attached Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko 2010-11-13 3:29 ` [PATCH 11/14] msm: iommu: Kconfig dependency for the IOMMU API Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko 2010-11-13 3:29 ` [PATCH 12/14] msm: iommu: Definitions for extended memory attributes Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko 2010-11-16 2:19 ` [PATCH 12/14 v2] " Stepan Moskovchenko 2010-11-16 2:19 ` Stepan Moskovchenko 2010-11-13 3:29 ` [PATCH 13/14] msm: iommu: Support cache-coherent memory access Stepan Moskovchenko 2010-11-13 3:29 ` Stepan Moskovchenko 2010-11-16 2:20 ` [PATCH 13/14 v2] " Stepan Moskovchenko 2010-11-16 2:20 ` Stepan Moskovchenko 2010-11-13 3:30 ` [PATCH 14/14] msm: iommu: Miscellaneous code cleanup Stepan Moskovchenko 2010-11-13 3:30 ` Stepan Moskovchenko 2010-11-16 0:25 ` Daniel Walker 2010-11-16 0:25 ` Daniel Walker 2010-11-16 1:16 ` Stepan Moskovchenko 2010-11-16 1:16 ` Stepan Moskovchenko 2010-11-16 20:45 ` Daniel Walker 2010-11-16 20:45 ` Daniel Walker
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=1289619000-13167-7-git-send-email-stepanm@codeaurora.org \ --to=stepanm@codeaurora.org \ --cc=bryanh@codeaurora.org \ --cc=davidb@codeaurora.org \ --cc=dwalker@codeaurora.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.