| Message ID | 1468953304-19996-1-git-send-email-m-karicheri2@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
On 07/19/2016 02:35 PM, Murali Karicheri wrote: > commit 1f807a9f32aa ("ARM: keystone2: Refactor MSMC macros to avoid > left under a macro KS2_MSMC_SEGMENT_QM_PDSP which is no longer valid. > This, in effect disabled DMA coherency for QM PDSP. > > Given that msmc_k2hkle_common_setup is valid for all K2H/K/L/E SoCs, > the #ifdef should been removed in the first place. Do the same. > > Fixes: 1f807a9f32aa ("ARM: keystone2: Refactor MSMC macros to avoid #ifdeffery") > Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> > Acked-by: Nishanth Menon <nm@ti.com> > Reviewed-by: Tom Rini <trini@konsulko.com> > --- > - v2 - fixed the prefix > - v1 - adding Fixes per comments and added Reviewed-by from Tom Rini > arch/arm/mach-keystone/init.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c > index 3b6d5ef..6e5a1e1 100644 > --- a/arch/arm/mach-keystone/init.c > +++ b/arch/arm/mach-keystone/init.c > @@ -101,9 +101,7 @@ static void msmc_k2hkle_common_setup(void) > msmc_share_all_segments(KS2_MSMC_SEGMENT_C6X_0); > msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_ARM); > msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_NETCP); > -#ifdef KS2_MSMC_SEGMENT_QM_PDSP > msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_QM_PDSP); > -#endif > msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_PCIE0); > msmc_share_all_segments(KS2_MSMC_SEGMENT_DEBUG); > } > Please ignore. Will send v3 for merge. Sorry for flooding the list.
diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c index 3b6d5ef..6e5a1e1 100644 --- a/arch/arm/mach-keystone/init.c +++ b/arch/arm/mach-keystone/init.c @@ -101,9 +101,7 @@ static void msmc_k2hkle_common_setup(void) msmc_share_all_segments(KS2_MSMC_SEGMENT_C6X_0); msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_ARM); msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_NETCP); -#ifdef KS2_MSMC_SEGMENT_QM_PDSP msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_QM_PDSP); -#endif msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_PCIE0); msmc_share_all_segments(KS2_MSMC_SEGMENT_DEBUG); }
commit 1f807a9f32aa ("ARM: keystone2: Refactor MSMC macros to avoid left under a macro KS2_MSMC_SEGMENT_QM_PDSP which is no longer valid. This, in effect disabled DMA coherency for QM PDSP. Given that msmc_k2hkle_common_setup is valid for all K2H/K/L/E SoCs, the #ifdef should been removed in the first place. Do the same. Fixes: 1f807a9f32aa ("ARM: keystone2: Refactor MSMC macros to avoid #ifdeffery") Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Acked-by: Nishanth Menon <nm@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com> --- - v2 - fixed the prefix - v1 - adding Fixes per comments and added Reviewed-by from Tom Rini arch/arm/mach-keystone/init.c | 2 -- 1 file changed, 2 deletions(-)