[PATCH 8/8] OMAP4: Fix the emif and dmm virtual mapping

[Shilimkar, Santosh]

On Wed, Sep 21, 2011 at 11:01 PM, Kevin Hilman <khilman at ti.com> wrote:
> Santosh Shilimkar <santosh.shilimkar at ti.com> writes:
>
>> On Tuesday 20 September 2011 08:31 PM, Santosh Shilimkar wrote:
>>> On Friday 16 September 2011 11:26 PM, Kevin Hilman wrote:
>>>> Santosh Shilimkar <santosh.shilimkar at ti.com> writes:
>>>>
>>
>> [...]
>>
>>>
>>>>>  #define OMAP44XX_EMIF2_SIZE       SZ_1M
>>>>>
>>>>>  #define OMAP44XX_DMM_PHYS OMAP44XX_DMM_BASE
>>>>>                                            /* 0x4e000000 --> 0xfd300000 */
>>>>> -#define OMAP44XX_DMM_VIRT (OMAP44XX_DMM_PHYS + OMAP4_L3_PER_IO_OFFSET)
>>>>> +#define OMAP44XX_DMM_VIRT (OMAP44XX_EMIF2_VIRT + SZ_1M)
>>>>
>>>> and '+ OMAP44XX_EMIF2_SIZE' here.
>>>>
>>> Will add OMAP44XX_EMIF_SIZE since 2 EMIFs instaces are and
>>> suppose to be identical.Almost missed this email in other traffic.
>>
>> OPPs. It was already there. Dumb of me not using it. Below
>> is the update what I will do.
>>
>> diff --git a/arch/arm/plat-omap/include/plat/io.h
>> b/arch/arm/plat-omap/include/plat/io.h
>> index d72ec85..db36292 100644
>> --- a/arch/arm/plat-omap/include/plat/io.h
>> +++ b/arch/arm/plat-omap/include/plat/io.h
>> @@ -228,13 +228,13 @@
>>
>>  #define OMAP44XX_EMIF2_PHYS  OMAP44XX_EMIF2_BASE
>>                                               /* 0x4d000000 --> 0xfd200000 */
>> -#define OMAP44XX_EMIF2_VIRT  (OMAP44XX_EMIF2_PHYS + OMAP4_L3_PER_IO_OFFSET)
>>  #define OMAP44XX_EMIF2_SIZE  SZ_1M
>> +#define OMAP44XX_EMIF2_VIRT  (OMAP44XX_EMIF1_VIRT + OMAP44XX_EMIF2_SIZE)
>
> This doesn't look right either.
>
> This #define is for the *start* of EMIF2 virtual address space, so
> assuming the start address of EMIF2 is immediatly after EMIF1, it should
> be EMIF1_VIRT + EMIF1_SIZE (not EMIF2_SIZE.)
>
>>  #define OMAP44XX_DMM_PHYS    OMAP44XX_DMM_BASE
>>                                               /* 0x4e000000 --> 0xfd300000 */
>> -#define OMAP44XX_DMM_VIRT    (OMAP44XX_DMM_PHYS + OMAP4_L3_PER_IO_OFFSET)
>>  #define OMAP44XX_DMM_SIZE    SZ_1M
>> +#define OMAP44XX_DMM_VIRT    (OMAP44XX_EMIF2_VIRT + OMAP44XX_DMM_SIZE)
>
> And here, assuming DMM range is immediately after EMIF2, this should be
> EMIF2_VIRT + EMFI2_SIZE)
>
I agree.

Regards
Santosh