Prev: linux-next: Tree for July 2
Next: interrupt problem with multiport serial card
From: Hiroshi DOYU on 2 Jul 2010 02:40
Hi Fernando,

From: ext Fernando Guzman Lugo <x0095840(a)ti.com>
Subject: [PATCH 1/9] dspbridge: replace iommu custom for opensource implementation
Date: Thu, 1 Jul 2010 02:20:52 +0200

> This patch replace the call to custom dsp mmu implemenation
> for the once on iommu module.
>
> Signed-off-by: Fernando Guzman Lugo <x0095840(a)ti.com>
> ---
> drivers/dsp/bridge/core/_tiomap.h | 16 +
> drivers/dsp/bridge/core/io_sm.c | 114 ++------
> drivers/dsp/bridge/core/tiomap3430.c | 501 +++++-----------------------------
> drivers/dsp/bridge/core/ue_deh.c | 10 -
> 4 files changed, 118 insertions(+), 523 deletions(-)
>
> diff --git a/drivers/dsp/bridge/core/_tiomap.h b/drivers/dsp/bridge/core/_tiomap.h
> index bf0164e..d13677a 100644
> --- a/drivers/dsp/bridge/core/_tiomap.h
> +++ b/drivers/dsp/bridge/core/_tiomap.h
> @@ -23,6 +23,8 @@
> #include <plat/clockdomain.h>
> #include <mach-omap2/prm-regbits-34xx.h>
> #include <mach-omap2/cm-regbits-34xx.h>
> +#include <plat/iommu.h>
> +#include <plat/iovmm.h>
> #include <dspbridge/devdefs.h>
> #include <hw_defs.h>
> #include <dspbridge/dspioctl.h> /* for bridge_ioctl_extproc defn */
> @@ -330,6 +332,7 @@ struct bridge_dev_context {
> u32 dw_internal_size; /* Internal memory size */
>
> struct omap_mbox *mbox; /* Mail box handle */
> + struct iommu *dsp_mmu; /* iommu for iva2 handler */
>
> struct cfg_hostres *resources; /* Host Resources */
>
> @@ -374,4 +377,17 @@ extern s32 dsp_debug;
> */
> int sm_interrupt_dsp(struct bridge_dev_context *dev_context, u16 mb_val);
>
> +static inline void dsp_iotlb_init(struct iotlb_entry *e, u32 da, u32 pa,
> + u32 pgsz)
> +{
> + e->da = da;
> + e->pa = pa;
> + e->valid = 1;
> + e->prsvd = 1;
> + e->pgsz = pgsz & MMU_CAM_PGSZ_MASK;
> + e->endian = MMU_RAM_ENDIAN_LITTLE;
> + e->elsz = MMU_RAM_ELSZ_32;
> + e->mixed = 0;
> +}
> +
> #endif /* _TIOMAP_ */
> diff --git a/drivers/dsp/bridge/core/io_sm.c b/drivers/dsp/bridge/core/io_sm.c
> index 7fb840d..1f47f8b 100644
> --- a/drivers/dsp/bridge/core/io_sm.c
> +++ b/drivers/dsp/bridge/core/io_sm.c
> @@ -290,6 +290,8 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
> struct cod_manager *cod_man;
> struct chnl_mgr *hchnl_mgr;
> struct msg_mgr *hmsg_mgr;
> + struct iommu *mmu;
> + struct iotlb_entry e;
> u32 ul_shm_base;
> u32 ul_shm_base_offset;
> u32 ul_shm_limit;
> @@ -312,7 +314,6 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
> struct bridge_ioctl_extproc ae_proc[BRDIOCTL_NUMOFMMUTLB];
> struct cfg_hostres *host_res;
> struct bridge_dev_context *pbridge_context;
> - u32 map_attrs;
> u32 shm0_end;
> u32 ul_dyn_ext_base;
> u32 ul_seg1_size = 0;
> @@ -336,6 +337,21 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
> status = -EFAULT;
> goto func_end;
> }
> +
> + mmu = pbridge_context->dsp_mmu;
> +
> + if (mmu)
> + iommu_put(mmu);
> + mmu = iommu_get("iva2");

+ mmu = iommu_get("iva2", mmu_fault_isr);

I'm considering that it might be better to pass a mmu fault callback
at this iommu_get.

What do you think?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Guzman Lugo, Fernando on 2 Jul 2010 12:50


> -----Original Message-----
> From: Hiroshi DOYU [mailto:Hiroshi.DOYU(a)nokia.com]
> Sent: Friday, July 02, 2010 1:32 AM
> To: Guzman Lugo, Fernando
> Cc: linux-omap(a)vger.kernel.org; linux-kernel(a)vger.kernel.org;
> ohad(a)wizery.com; ameya.palande(a)nokia.com; felipe.contreras(a)nokia.com
> Subject: Re: [PATCH 1/9] dspbridge: replace iommu custom for opensource
> implementation
>
> Hi Fernando,
>
> From: ext Fernando Guzman Lugo <x0095840(a)ti.com>
> Subject: [PATCH 1/9] dspbridge: replace iommu custom for opensource
> implementation
> Date: Thu, 1 Jul 2010 02:20:52 +0200
>
> > This patch replace the call to custom dsp mmu implemenation
> > for the once on iommu module.
> >
> > Signed-off-by: Fernando Guzman Lugo <x0095840(a)ti.com>
> > ---
> > drivers/dsp/bridge/core/_tiomap.h | 16 +
> > drivers/dsp/bridge/core/io_sm.c | 114 ++------
> > drivers/dsp/bridge/core/tiomap3430.c | 501 +++++----------------------
> -------
> > drivers/dsp/bridge/core/ue_deh.c | 10 -
> > 4 files changed, 118 insertions(+), 523 deletions(-)
> >
> > diff --git a/drivers/dsp/bridge/core/_tiomap.h
> b/drivers/dsp/bridge/core/_tiomap.h
> > index bf0164e..d13677a 100644
> > --- a/drivers/dsp/bridge/core/_tiomap.h
> > +++ b/drivers/dsp/bridge/core/_tiomap.h
> > @@ -23,6 +23,8 @@
> > #include <plat/clockdomain.h>
> > #include <mach-omap2/prm-regbits-34xx.h>
> > #include <mach-omap2/cm-regbits-34xx.h>
> > +#include <plat/iommu.h>
> > +#include <plat/iovmm.h>
> > #include <dspbridge/devdefs.h>
> > #include <hw_defs.h>
> > #include <dspbridge/dspioctl.h> /* for bridge_ioctl_extproc defn
> */
> > @@ -330,6 +332,7 @@ struct bridge_dev_context {
> > u32 dw_internal_size; /* Internal memory size */
> >
> > struct omap_mbox *mbox; /* Mail box handle */
> > + struct iommu *dsp_mmu; /* iommu for iva2 handler */
> >
> > struct cfg_hostres *resources; /* Host Resources */
> >
> > @@ -374,4 +377,17 @@ extern s32 dsp_debug;
> > */
> > int sm_interrupt_dsp(struct bridge_dev_context *dev_context, u16
> mb_val);
> >
> > +static inline void dsp_iotlb_init(struct iotlb_entry *e, u32 da, u32
> pa,
> > + u32 pgsz)
> > +{
> > + e->da = da;
> > + e->pa = pa;
> > + e->valid = 1;
> > + e->prsvd = 1;
> > + e->pgsz = pgsz & MMU_CAM_PGSZ_MASK;
> > + e->endian = MMU_RAM_ENDIAN_LITTLE;
> > + e->elsz = MMU_RAM_ELSZ_32;
> > + e->mixed = 0;
> > +}
> > +
> > #endif /* _TIOMAP_ */
> > diff --git a/drivers/dsp/bridge/core/io_sm.c
> b/drivers/dsp/bridge/core/io_sm.c
> > index 7fb840d..1f47f8b 100644
> > --- a/drivers/dsp/bridge/core/io_sm.c
> > +++ b/drivers/dsp/bridge/core/io_sm.c
> > @@ -290,6 +290,8 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
> > struct cod_manager *cod_man;
> > struct chnl_mgr *hchnl_mgr;
> > struct msg_mgr *hmsg_mgr;
> > + struct iommu *mmu;
> > + struct iotlb_entry e;
> > u32 ul_shm_base;
> > u32 ul_shm_base_offset;
> > u32 ul_shm_limit;
> > @@ -312,7 +314,6 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
> > struct bridge_ioctl_extproc ae_proc[BRDIOCTL_NUMOFMMUTLB];
> > struct cfg_hostres *host_res;
> > struct bridge_dev_context *pbridge_context;
> > - u32 map_attrs;
> > u32 shm0_end;
> > u32 ul_dyn_ext_base;
> > u32 ul_seg1_size = 0;
> > @@ -336,6 +337,21 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
> > status = -EFAULT;
> > goto func_end;
> > }
> > +
> > + mmu = pbridge_context->dsp_mmu;
> > +
> > + if (mmu)
> > + iommu_put(mmu);
> > + mmu = iommu_get("iva2");
>
> + mmu = iommu_get("iva2", mmu_fault_isr);
>
> I'm considering that it might be better to pass a mmu fault callback
> at this iommu_get.
>
> What do you think?

That sounds good.

Thanks and regards,
Fernando.


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: linux-next: Tree for July 2
Next: interrupt problem with multiport serial card