| 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
| ||
|
Date: Wed, 19 Sep 2012 16:20:10 -0500
From: "Cousson, Benoit" <b-cousson@...com>
To: Omar Ramirez Luna <omar.luna@...aro.org>
CC: Tony Lindgren <tony@...mide.com>, Ohad Ben-Cohen <ohad@...ery.com>,
Joerg Roedel <joerg.roedel@....com>,
Russell King <linux@....linux.org.uk>,
Rajendra Nayak <rnayak@...com>,
Peter Ujfalusi <peter.ujfalusi@...com>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
<devicetree-discuss@...ts.ozlabs.org>, <linux-doc@...r.kernel.org>,
<linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-omap@...r.kernel.org>, Paul Walmsley <paul@...an.com>
Subject: Re: [PATCH v2 3/9] ARM: OMAP4: hwmod data: add mmu hwmod for ipu
and dsp
+ Paul
On 9/12/2012 2:45 PM, Omar Ramirez Luna wrote:
> Add mmu hwmod data for ipu and dsp.
>
> Cc: Benoit Cousson <b-cousson@...com>
> Signed-off-by: Omar Ramirez Luna <omar.luna@...aro.org>
Acked-by: Benoit Cousson <b-cousson@...com>
Thanks Paul for taking care of that patch.
Regards,
Benoit
> ---
> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 136 +++++++++++++++++++++++++++-
> 1 file changed, 134 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> index 242aee4..c2cf25a 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> @@ -31,6 +31,7 @@
> #include <plat/mmc.h>
> #include <plat/dmtimer.h>
> #include <plat/common.h>
> +#include <plat/iommu.h>
>
> #include "omap_hwmod_common_data.h"
> #include "cm1_44xx.h"
> @@ -612,7 +613,6 @@ static struct omap_hwmod_irq_info omap44xx_dsp_irqs[] = {
>
> static struct omap_hwmod_rst_info omap44xx_dsp_resets[] = {
> { .name = "dsp", .rst_shift = 0 },
> - { .name = "mmu_cache", .rst_shift = 1 },
> };
>
> static struct omap_hwmod omap44xx_dsp_hwmod = {
> @@ -1632,7 +1632,6 @@ static struct omap_hwmod_irq_info omap44xx_ipu_irqs[] = {
> static struct omap_hwmod_rst_info omap44xx_ipu_resets[] = {
> { .name = "cpu0", .rst_shift = 0 },
> { .name = "cpu1", .rst_shift = 1 },
> - { .name = "mmu_cache", .rst_shift = 2 },
> };
>
> static struct omap_hwmod omap44xx_ipu_hwmod = {
> @@ -2439,6 +2438,137 @@ static struct omap_hwmod omap44xx_mmc5_hwmod = {
> };
>
> /*
> + * 'mmu' class
> + * The memory management unit performs virtual to physical address translation
> + * for its requestors.
> + */
> +
> +static struct omap_hwmod_class_sysconfig mmu_sysc = {
> + .rev_offs = 0x000,
> + .sysc_offs = 0x010,
> + .syss_offs = 0x014,
> + .sysc_flags = (SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_SIDLEMODE |
> + SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE),
> + .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
> + .sysc_fields = &omap_hwmod_sysc_type1,
> +};
> +
> +static struct omap_hwmod_class omap44xx_mmu_hwmod_class = {
> + .name = "mmu",
> + .sysc = &mmu_sysc,
> +};
> +
> +/* mmu ipu */
> +
> +static struct omap_mmu_dev_attr mmu_ipu_dev_attr = {
> + .da_start = 0x0,
> + .da_end = 0xfffff000,
> + .nr_tlb_entries = 32,
> +};
> +
> +static struct omap_hwmod omap44xx_mmu_ipu_hwmod;
> +static struct omap_hwmod_irq_info omap44xx_mmu_ipu_irqs[] = {
> + { .irq = 100 + OMAP44XX_IRQ_GIC_START, },
> + { .irq = -1 }
> +};
> +
> +static struct omap_hwmod_rst_info omap44xx_mmu_ipu_resets[] = {
> + { .name = "mmu_cache", .rst_shift = 2 },
> +};
> +
> +static struct omap_hwmod_addr_space omap44xx_mmu_ipu_addrs[] = {
> + {
> + .pa_start = 0x55082000,
> + .pa_end = 0x550820ff,
> + .flags = ADDR_TYPE_RT,
> + },
> + { }
> +};
> +
> +/* l3_main_2 -> mmu_ipu */
> +static struct omap_hwmod_ocp_if omap44xx_l3_main_2__mmu_ipu = {
> + .master = &omap44xx_l3_main_2_hwmod,
> + .slave = &omap44xx_mmu_ipu_hwmod,
> + .clk = "l3_div_ck",
> + .addr = omap44xx_mmu_ipu_addrs,
> + .user = OCP_USER_MPU | OCP_USER_SDMA,
> +};
> +
> +static struct omap_hwmod omap44xx_mmu_ipu_hwmod = {
> + .name = "mmu_ipu",
> + .class = &omap44xx_mmu_hwmod_class,
> + .clkdm_name = "ducati_clkdm",
> + .mpu_irqs = omap44xx_mmu_ipu_irqs,
> + .rst_lines = omap44xx_mmu_ipu_resets,
> + .rst_lines_cnt = ARRAY_SIZE(omap44xx_mmu_ipu_resets),
> + .main_clk = "ducati_clk_mux_ck",
> + .prcm = {
> + .omap4 = {
> + .clkctrl_offs = OMAP4_CM_DUCATI_DUCATI_CLKCTRL_OFFSET,
> + .rstctrl_offs = OMAP4_RM_DUCATI_RSTCTRL_OFFSET,
> + .context_offs = OMAP4_RM_DUCATI_DUCATI_CONTEXT_OFFSET,
> + .modulemode = MODULEMODE_HWCTRL,
> + },
> + },
> + .dev_attr = &mmu_ipu_dev_attr,
> +};
> +
> +/* mmu dsp */
> +
> +static struct omap_mmu_dev_attr mmu_dsp_dev_attr = {
> + .da_start = 0x0,
> + .da_end = 0xfffff000,
> + .nr_tlb_entries = 32,
> +};
> +
> +static struct omap_hwmod omap44xx_mmu_dsp_hwmod;
> +static struct omap_hwmod_irq_info omap44xx_mmu_dsp_irqs[] = {
> + { .irq = 28 + OMAP44XX_IRQ_GIC_START },
> + { .irq = -1 }
> +};
> +
> +static struct omap_hwmod_rst_info omap44xx_mmu_dsp_resets[] = {
> + { .name = "mmu_cache", .rst_shift = 1 },
> +};
> +
> +static struct omap_hwmod_addr_space omap44xx_mmu_dsp_addrs[] = {
> + {
> + .pa_start = 0x4a066000,
> + .pa_end = 0x4a0660ff,
> + .flags = ADDR_TYPE_RT,
> + },
> + { }
> +};
> +
> +/* l4_cfg -> dsp */
> +static struct omap_hwmod_ocp_if omap44xx_l4_cfg__mmu_dsp = {
> + .master = &omap44xx_l4_cfg_hwmod,
> + .slave = &omap44xx_mmu_dsp_hwmod,
> + .clk = "l4_div_ck",
> + .addr = omap44xx_mmu_dsp_addrs,
> + .user = OCP_USER_MPU | OCP_USER_SDMA,
> +};
> +
> +static struct omap_hwmod omap44xx_mmu_dsp_hwmod = {
> + .name = "mmu_dsp",
> + .class = &omap44xx_mmu_hwmod_class,
> + .clkdm_name = "tesla_clkdm",
> + .mpu_irqs = omap44xx_mmu_dsp_irqs,
> + .rst_lines = omap44xx_mmu_dsp_resets,
> + .rst_lines_cnt = ARRAY_SIZE(omap44xx_mmu_dsp_resets),
> + .main_clk = "dpll_iva_m4x2_ck",
> + .prcm = {
> + .omap4 = {
> + .clkctrl_offs = OMAP4_CM_TESLA_TESLA_CLKCTRL_OFFSET,
> + .rstctrl_offs = OMAP4_RM_TESLA_RSTCTRL_OFFSET,
> + .context_offs = OMAP4_RM_TESLA_TESLA_CONTEXT_OFFSET,
> + .modulemode = MODULEMODE_HWCTRL,
> + },
> + },
> + .dev_attr = &mmu_dsp_dev_attr,
> +};
> +
> +/*
> * 'mpu' class
> * mpu sub-system
> */
> @@ -6092,6 +6222,8 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
> &omap44xx_l4_per__mmc3,
> &omap44xx_l4_per__mmc4,
> &omap44xx_l4_per__mmc5,
> + &omap44xx_l3_main_2__mmu_ipu,
> + &omap44xx_l4_cfg__mmu_dsp,
> &omap44xx_l3_main_2__ocmc_ram,
> &omap44xx_l4_cfg__ocp2scp_usb_phy,
> &omap44xx_mpu_private__prcm_mpu,
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists