[GIT PULL] omap iommu: for-next for 2.6.35-rc1

[GIT PULL] omap iommu: for-next for 2.6.35-rc1

[Hiroshi DOYU]

Hi Tony,

Patches for for-next for omap iommu module.

The following changes since commit 67a3e12b05e055c0415c556a315a3d3eb637e29e:

  Linux 2.6.35-rc1 (2010-05-30 13:21:02 -0700)

are available in the git repository at:
  git://gitorious.org/~doyu/lk/mainline.git v2.6.35-rc1-iommu

Hiroshi DOYU (3):
      omap iommu: Introduce iopgd_is_table MACRO
      omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr
      omap iommu: move iommu_disable at fault to the above layer

Kanigeri, Hari (2):
      omap iommu: update irq mask to be specific about twl and tlb
      omap iommu: add functionality to get TLB miss interrupt

 arch/arm/mach-omap2/iommu2.c            |   44 ++++++++++++++++++++++++------
 arch/arm/plat-omap/include/plat/iommu.h |    2 +
 arch/arm/plat-omap/iommu.c              |   27 ++++++++++++++++---
 arch/arm/plat-omap/iopgtable.h          |    8 +++--
 4 files changed, 65 insertions(+), 16 deletions(-)

Re: [GIT PULL] omap iommu: for-next for 2.6.35-rc1

[Felipe Balbi]

On Wed, Jun 02, 2010 at 09:50:54AM +0200, Doyu Hiroshi (Nokia-D/Helsinki) wrote:
>      omap iommu: Introduce iopgd_is_table MACRO
>      omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr

should these two be here or should they go to 2.6.36 merge window ? at 
least from the description it doesn't look like they are fixing any 
bugs.

>      omap iommu: add functionality to get TLB miss interrupt

for this "add functionality to get TLB miss interrupt"

the other two look suspicious looking only at the description.

-- 
balbi

DefectiveByDesign.org

Re: [GIT PULL] omap iommu: for-next for 2.6.35-rc1

[Hiroshi DOYU]

Hi Felipe,

From: "Balbi Felipe (Nokia-D/Helsinki)" <felipe.balbi@nokia.com>
Subject: Re: [GIT PULL] omap iommu: for-next for 2.6.35-rc1
Date: Wed, 2 Jun 2010 12:01:00 +0200

> On Wed, Jun 02, 2010 at 09:50:54AM +0200, Doyu Hiroshi (Nokia-D/Helsinki) wrote:
>>      omap iommu: Introduce iopgd_is_table MACRO
>>      omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr
> 
> should these two be here or should they go to 2.6.36 merge window ? at 
> least from the description it doesn't look like they are fixing any 
> bugs.
> 
>>      omap iommu: add functionality to get TLB miss interrupt
> 
> for this "add functionality to get TLB miss interrupt"
> 
> the other two look suspicious looking only at the description.

This subject might be misleading.

These patches are for for-next, which means for v2.6.36. "v2.6.35-rc1"
on subject implies the base TAG for these patches.

For fixes: http://marc.info/?l=linux-omap&m=127546506730794&w=2

Re: [GIT PULL] omap iommu: for-next for 2.6.35-rc1

[Felipe Balbi]

On Wed, Jun 02, 2010 at 01:06:44PM +0200, Doyu Hiroshi (Nokia-D/Helsinki) wrote:
>This subject might be misleading.
>
>These patches are for for-next, which means for v2.6.36. "v2.6.35-rc1"
>on subject implies the base TAG for these patches.

ok, sorry for that :-)

-- 
balbi

DefectiveByDesign.org

Re: [GIT PULL] omap iommu: for-next for 2.6.35-rc1

[Hiroshi DOYU]

Hi Tony,

From: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Subject: [GIT PULL] omap iommu: for-next for 2.6.35-rc1
Date: Wed, 02 Jun 2010 10:50:54 +0300 (EEST)

> Hi Tony,
> 
> Patches for for-next for omap iommu module.
> 
> The following changes since commit 67a3e12b05e055c0415c556a315a3d3eb637e29e:
> 
>   Linux 2.6.35-rc1 (2010-05-30 13:21:02 -0700)
> 
> are available in the git repository at:
>   git://gitorious.org/~doyu/lk/mainline.git v2.6.35-rc1-iommu
> 
> Hiroshi DOYU (3):
>       omap iommu: Introduce iopgd_is_table MACRO
>       omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr
>       omap iommu: move iommu_disable at fault to the above layer
> 
> Kanigeri, Hari (2):
>       omap iommu: update irq mask to be specific about twl and tlb
>       omap iommu: add functionality to get TLB miss interrupt
> 
>  arch/arm/mach-omap2/iommu2.c            |   44 ++++++++++++++++++++++++------
>  arch/arm/plat-omap/include/plat/iommu.h |    2 +
>  arch/arm/plat-omap/iommu.c              |   27 ++++++++++++++++---
>  arch/arm/plat-omap/iopgtable.h          |    8 +++--
>  4 files changed, 65 insertions(+), 16 deletions(-)

Any chance to merge?

I have added 2 patches which were dropped from omap iommu fix as
below. Please pull the following branch.

The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02:

  Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700)

are available in the git repository at:
  git://gitorious.org/~doyu/lk/mainline.git v2.6.35-rc3-iommu-for-next

Hiroshi DOYU (4):
      omap iommu: Introduce iopgd_is_table MACRO
      omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr
      omap iommu: move iommu_disable at fault to the above layer
      omap iommu: Make omap-iommu.o built-in

Kanigeri, Hari (3):
      omap iommu: update irq mask to be specific about twl and tlb
      omap iommu: add functionality to get TLB miss interrupt
      omap iommu: update ducati mmu irq define name

 arch/arm/mach-omap2/Makefile            |    5 +++-
 arch/arm/mach-omap2/iommu2.c            |   44 ++++++++++++++++++++++++------
 arch/arm/mach-omap2/omap-iommu.c        |    2 +-
 arch/arm/plat-omap/include/plat/iommu.h |    2 +
 arch/arm/plat-omap/iommu.c              |   27 ++++++++++++++++---
 arch/arm/plat-omap/iopgtable.h          |    8 +++--
 6 files changed, 70 insertions(+), 18 deletions(-)

Re: [GIT PULL] omap iommu: for-next for 2.6.35-rc1

[Hiroshi DOYU]

From: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Subject: Re: [GIT PULL] omap iommu: for-next for 2.6.35-rc1
Date: Tue, 29 Jun 2010 07:57:44 +0300 (EEST)

> Hi Tony,
> 
> From: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
> Subject: [GIT PULL] omap iommu: for-next for 2.6.35-rc1
> Date: Wed, 02 Jun 2010 10:50:54 +0300 (EEST)
> 
>> Hi Tony,
>> 
>> Patches for for-next for omap iommu module.
>> 
>> The following changes since commit 67a3e12b05e055c0415c556a315a3d3eb637e29e:
>> 
>>   Linux 2.6.35-rc1 (2010-05-30 13:21:02 -0700)
>> 
>> are available in the git repository at:
>>   git://gitorious.org/~doyu/lk/mainline.git v2.6.35-rc1-iommu
>> 
>> Hiroshi DOYU (3):
>>       omap iommu: Introduce iopgd_is_table MACRO
>>       omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr
>>       omap iommu: move iommu_disable at fault to the above layer
>> 
>> Kanigeri, Hari (2):
>>       omap iommu: update irq mask to be specific about twl and tlb
>>       omap iommu: add functionality to get TLB miss interrupt
>> 
>>  arch/arm/mach-omap2/iommu2.c            |   44 ++++++++++++++++++++++++------
>>  arch/arm/plat-omap/include/plat/iommu.h |    2 +
>>  arch/arm/plat-omap/iommu.c              |   27 ++++++++++++++++---
>>  arch/arm/plat-omap/iopgtable.h          |    8 +++--
>>  4 files changed, 65 insertions(+), 16 deletions(-)
> 
> Any chance to merge?
> 
> I have added 2 patches which were dropped from omap iommu fix as
> below. Please pull the following branch.

Hi Tony,

Do you have any plan for pulling for-next patches?

I have some "omap iommu" and "omap mailbox" patches for for-next. Now
the merge window seems so small and I don't want to miss it.

> The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02:
> 
>   Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700)
> 
> are available in the git repository at:
>   git://gitorious.org/~doyu/lk/mainline.git v2.6.35-rc3-iommu-for-next
> 
> Hiroshi DOYU (4):
>       omap iommu: Introduce iopgd_is_table MACRO
>       omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr
>       omap iommu: move iommu_disable at fault to the above layer
>       omap iommu: Make omap-iommu.o built-in
> 
> Kanigeri, Hari (3):
>       omap iommu: update irq mask to be specific about twl and tlb
>       omap iommu: add functionality to get TLB miss interrupt
>       omap iommu: update ducati mmu irq define name
> 
>  arch/arm/mach-omap2/Makefile            |    5 +++-
>  arch/arm/mach-omap2/iommu2.c            |   44 ++++++++++++++++++++++++------
>  arch/arm/mach-omap2/omap-iommu.c        |    2 +-
>  arch/arm/plat-omap/include/plat/iommu.h |    2 +
>  arch/arm/plat-omap/iommu.c              |   27 ++++++++++++++++---
>  arch/arm/plat-omap/iopgtable.h          |    8 +++--
>  6 files changed, 70 insertions(+), 18 deletions(-)

Re: [GIT PULL] omap iommu: for-next for 2.6.35-rc1

[Tony Lindgren]

* Hiroshi DOYU <Hiroshi.DOYU@nokia.com> [100702 09:29]:
> 
> Do you have any plan for pulling for-next patches?
> 
> I have some "omap iommu" and "omap mailbox" patches for for-next. Now
> the merge window seems so small and I don't want to miss it.

Pulled now into omap-for-linus for the next merge window. Sorry
for the delay.

BTW, I did not add that Makefile fix into omap-fixes-for-linus,
I figured we should first make sure to get the pending fixes
in, and then maybe do another set of fixes.

But looks like that's in your for-next, so we might as well
keep it there. If there's urgent need to get that in as a fix,
let me know ASAP, I can still rebuild omap-for-linus as that's
the only set merged there.

Regards,

Tony
 
> > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02:
> > 
> >   Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700)
> > 
> > are available in the git repository at:
> >   git://gitorious.org/~doyu/lk/mainline.git v2.6.35-rc3-iommu-for-next
> > 
> > Hiroshi DOYU (4):
> >       omap iommu: Introduce iopgd_is_table MACRO
> >       omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr
> >       omap iommu: move iommu_disable at fault to the above layer
> >       omap iommu: Make omap-iommu.o built-in
> > 
> > Kanigeri, Hari (3):
> >       omap iommu: update irq mask to be specific about twl and tlb
> >       omap iommu: add functionality to get TLB miss interrupt
> >       omap iommu: update ducati mmu irq define name
> > 
> >  arch/arm/mach-omap2/Makefile            |    5 +++-
> >  arch/arm/mach-omap2/iommu2.c            |   44 ++++++++++++++++++++++++------
> >  arch/arm/mach-omap2/omap-iommu.c        |    2 +-
> >  arch/arm/plat-omap/include/plat/iommu.h |    2 +
> >  arch/arm/plat-omap/iommu.c              |   27 ++++++++++++++++---
> >  arch/arm/plat-omap/iopgtable.h          |    8 +++--
> >  6 files changed, 70 insertions(+), 18 deletions(-)

Re: [GIT PULL] omap iommu: for-next for 2.6.35-rc1

[Hiroshi DOYU]

From: ext Tony Lindgren <tony@atomide.com>
Subject: Re: [GIT PULL] omap iommu: for-next for 2.6.35-rc1
Date: Fri, 2 Jul 2010 11:04:11 +0200

> * Hiroshi DOYU <Hiroshi.DOYU@nokia.com> [100702 09:29]:
>> 
>> Do you have any plan for pulling for-next patches?
>> 
>> I have some "omap iommu" and "omap mailbox" patches for for-next. Now
>> the merge window seems so small and I don't want to miss it.
> 
> Pulled now into omap-for-linus for the next merge window. Sorry
> for the delay.
> 
> BTW, I did not add that Makefile fix into omap-fixes-for-linus,
> I figured we should first make sure to get the pending fixes
> in, and then maybe do another set of fixes.
> 
> But looks like that's in your for-next, so we might as well
> keep it there. If there's urgent need to get that in as a fix,
> let me know ASAP, I can still rebuild omap-for-linus as that's
> the only set merged there.

Ok, Thanks. I'll send another pull request for omap mailbox for-next.