* [PATCH] ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields" @ 2012-04-09 7:11 Archit Taneja 2012-04-09 23:02 ` Tony Lindgren 2012-04-18 8:06 ` Tomi Valkeinen 0 siblings, 2 replies; 6+ messages in thread From: Archit Taneja @ 2012-04-09 7:11 UTC (permalink / raw) To: tomi.valkeinen, linux Cc: tony, linux-omap, santosh.shilimkar, paul, b-cousson, Archit Taneja This reverts commit 46f8c3c7e95c0d30d95911e7975ddc4f93b3e237. The commit above swapped the DSI1_PPID and DSI2_PPID register fields in CONTROL_DSIPHY to be in sync with the newer public OMAP TRMs(after version V). With this commit, contention errors were reported on DSI lanes some OMAP4 SDPs. After probing the DSI lanes on OMAP4 SDP, it was seen that setting bits in the DSI2_PPID field was pulling up voltage on DSI1 lanes, and DSI1_PPID field was pulling up voltage on DSI2 lanes. This proves that the current version of OMAP4 TRM is incorrect, swap the position of register fields according to the older TRM versions as they were correct. Signed-off-by: Archit Taneja <archit@ti.com> --- .../include/mach/ctrl_module_pad_core_44xx.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h index 1e2d332..c88420d 100644 --- a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h +++ b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h @@ -941,10 +941,10 @@ #define OMAP4_DSI2_LANEENABLE_MASK (0x7 << 29) #define OMAP4_DSI1_LANEENABLE_SHIFT 24 #define OMAP4_DSI1_LANEENABLE_MASK (0x1f << 24) -#define OMAP4_DSI2_PIPD_SHIFT 19 -#define OMAP4_DSI2_PIPD_MASK (0x1f << 19) -#define OMAP4_DSI1_PIPD_SHIFT 14 -#define OMAP4_DSI1_PIPD_MASK (0x1f << 14) +#define OMAP4_DSI1_PIPD_SHIFT 19 +#define OMAP4_DSI1_PIPD_MASK (0x1f << 19) +#define OMAP4_DSI2_PIPD_SHIFT 14 +#define OMAP4_DSI2_PIPD_MASK (0x1f << 14) /* CONTROL_MCBSPLP */ #define OMAP4_ALBCTRLRX_FSX_SHIFT 31 -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields" 2012-04-09 7:11 [PATCH] ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields" Archit Taneja @ 2012-04-09 23:02 ` Tony Lindgren 2012-04-18 8:06 ` Tomi Valkeinen 1 sibling, 0 replies; 6+ messages in thread From: Tony Lindgren @ 2012-04-09 23:02 UTC (permalink / raw) To: Archit Taneja Cc: tomi.valkeinen, linux, linux-omap, santosh.shilimkar, paul, b-cousson * Archit Taneja <archit@ti.com> [120409 00:15]: > This reverts commit 46f8c3c7e95c0d30d95911e7975ddc4f93b3e237. > > The commit above swapped the DSI1_PPID and DSI2_PPID register fields in > CONTROL_DSIPHY to be in sync with the newer public OMAP TRMs(after version V). > > With this commit, contention errors were reported on DSI lanes some OMAP4 SDPs. > After probing the DSI lanes on OMAP4 SDP, it was seen that setting bits in the > DSI2_PPID field was pulling up voltage on DSI1 lanes, and DSI1_PPID field was > pulling up voltage on DSI2 lanes. > > This proves that the current version of OMAP4 TRM is incorrect, swap the > position of register fields according to the older TRM versions as they were > correct. > > Signed-off-by: Archit Taneja <archit@ti.com> Tomi, care to ack this one? Tony > --- > .../include/mach/ctrl_module_pad_core_44xx.h | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h > index 1e2d332..c88420d 100644 > --- a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h > +++ b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h > @@ -941,10 +941,10 @@ > #define OMAP4_DSI2_LANEENABLE_MASK (0x7 << 29) > #define OMAP4_DSI1_LANEENABLE_SHIFT 24 > #define OMAP4_DSI1_LANEENABLE_MASK (0x1f << 24) > -#define OMAP4_DSI2_PIPD_SHIFT 19 > -#define OMAP4_DSI2_PIPD_MASK (0x1f << 19) > -#define OMAP4_DSI1_PIPD_SHIFT 14 > -#define OMAP4_DSI1_PIPD_MASK (0x1f << 14) > +#define OMAP4_DSI1_PIPD_SHIFT 19 > +#define OMAP4_DSI1_PIPD_MASK (0x1f << 19) > +#define OMAP4_DSI2_PIPD_SHIFT 14 > +#define OMAP4_DSI2_PIPD_MASK (0x1f << 14) > > /* CONTROL_MCBSPLP */ > #define OMAP4_ALBCTRLRX_FSX_SHIFT 31 > -- > 1.7.5.4 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields" 2012-04-09 7:11 [PATCH] ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields" Archit Taneja 2012-04-09 23:02 ` Tony Lindgren @ 2012-04-18 8:06 ` Tomi Valkeinen 2012-04-18 8:13 ` Archit Taneja 1 sibling, 1 reply; 6+ messages in thread From: Tomi Valkeinen @ 2012-04-18 8:06 UTC (permalink / raw) To: Archit Taneja; +Cc: linux, tony, linux-omap, santosh.shilimkar, paul, b-cousson [-- Attachment #1: Type: text/plain, Size: 875 bytes --] Hi, On Mon, 2012-04-09 at 12:41 +0530, Archit Taneja wrote: > This reverts commit 46f8c3c7e95c0d30d95911e7975ddc4f93b3e237. > > The commit above swapped the DSI1_PPID and DSI2_PPID register fields in > CONTROL_DSIPHY to be in sync with the newer public OMAP TRMs(after version V). > > With this commit, contention errors were reported on DSI lanes some OMAP4 SDPs. > After probing the DSI lanes on OMAP4 SDP, it was seen that setting bits in the > DSI2_PPID field was pulling up voltage on DSI1 lanes, and DSI1_PPID field was > pulling up voltage on DSI2 lanes. > > This proves that the current version of OMAP4 TRM is incorrect, swap the > position of register fields according to the older TRM versions as they were > correct. Are we sure the bits are the same for all OMAP4 versions? I'm just wondering why the change was made to TRM... Tomi [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields" 2012-04-18 8:06 ` Tomi Valkeinen @ 2012-04-18 8:13 ` Archit Taneja 2012-04-19 9:31 ` Russell King - ARM Linux 0 siblings, 1 reply; 6+ messages in thread From: Archit Taneja @ 2012-04-18 8:13 UTC (permalink / raw) To: Tomi Valkeinen Cc: linux, tony, linux-omap, santosh.shilimkar, paul, b-cousson On Wednesday 18 April 2012 01:36 PM, Tomi Valkeinen wrote: > Hi, > > On Mon, 2012-04-09 at 12:41 +0530, Archit Taneja wrote: >> This reverts commit 46f8c3c7e95c0d30d95911e7975ddc4f93b3e237. >> >> The commit above swapped the DSI1_PPID and DSI2_PPID register fields in >> CONTROL_DSIPHY to be in sync with the newer public OMAP TRMs(after version V). >> >> With this commit, contention errors were reported on DSI lanes some OMAP4 SDPs. >> After probing the DSI lanes on OMAP4 SDP, it was seen that setting bits in the >> DSI2_PPID field was pulling up voltage on DSI1 lanes, and DSI1_PPID field was >> pulling up voltage on DSI2 lanes. >> >> This proves that the current version of OMAP4 TRM is incorrect, swap the >> position of register fields according to the older TRM versions as they were >> correct. > > Are we sure the bits are the same for all OMAP4 versions? I'm just > wondering why the change was made to TRM... I've tried on OMAP4430 ES2.1 and OMAP4460 ES1.1. I can try on a couple more revisions. As far as why the change was made in the TRM, it's a bit hard to find the right people, or get response from them :), I'll give that a try again. If we do conclude that this revert patch is needed, it might probably be a candidate for the 3.2 and 3.3 stable kernels, just wanted to point that out. Archit > > Tomi > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields" 2012-04-18 8:13 ` Archit Taneja @ 2012-04-19 9:31 ` Russell King - ARM Linux 2012-04-19 11:05 ` Tomi Valkeinen 0 siblings, 1 reply; 6+ messages in thread From: Russell King - ARM Linux @ 2012-04-19 9:31 UTC (permalink / raw) To: Archit Taneja Cc: Tomi Valkeinen, tony, linux-omap, santosh.shilimkar, paul, b-cousson On Wed, Apr 18, 2012 at 01:43:46PM +0530, Archit Taneja wrote: > On Wednesday 18 April 2012 01:36 PM, Tomi Valkeinen wrote: >> Hi, >> >> On Mon, 2012-04-09 at 12:41 +0530, Archit Taneja wrote: >>> This reverts commit 46f8c3c7e95c0d30d95911e7975ddc4f93b3e237. >>> >>> The commit above swapped the DSI1_PPID and DSI2_PPID register fields in >>> CONTROL_DSIPHY to be in sync with the newer public OMAP TRMs(after version V). >>> >>> With this commit, contention errors were reported on DSI lanes some OMAP4 SDPs. >>> After probing the DSI lanes on OMAP4 SDP, it was seen that setting bits in the >>> DSI2_PPID field was pulling up voltage on DSI1 lanes, and DSI1_PPID field was >>> pulling up voltage on DSI2 lanes. >>> >>> This proves that the current version of OMAP4 TRM is incorrect, swap the >>> position of register fields according to the older TRM versions as they were >>> correct. >> >> Are we sure the bits are the same for all OMAP4 versions? I'm just >> wondering why the change was made to TRM... > > I've tried on OMAP4430 ES2.1 and OMAP4460 ES1.1. I can try on a couple > more revisions. > > As far as why the change was made in the TRM, it's a bit hard to find > the right people, or get response from them :), I'll give that a try > again. > > If we do conclude that this revert patch is needed, it might probably be > a candidate for the 3.2 and 3.3 stable kernels, just wanted to point > that out. I was just going to ask about this, as I haven't noticed any improvement in mainline kernels since I reported the original failure... ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields" 2012-04-19 9:31 ` Russell King - ARM Linux @ 2012-04-19 11:05 ` Tomi Valkeinen 0 siblings, 0 replies; 6+ messages in thread From: Tomi Valkeinen @ 2012-04-19 11:05 UTC (permalink / raw) To: Russell King - ARM Linux, Archit Taneja Cc: tony, linux-omap, santosh.shilimkar, paul, b-cousson [-- Attachment #1: Type: text/plain, Size: 2102 bytes --] On Thu, 2012-04-19 at 10:31 +0100, Russell King - ARM Linux wrote: > On Wed, Apr 18, 2012 at 01:43:46PM +0530, Archit Taneja wrote: > > On Wednesday 18 April 2012 01:36 PM, Tomi Valkeinen wrote: > >> Hi, > >> > >> On Mon, 2012-04-09 at 12:41 +0530, Archit Taneja wrote: > >>> This reverts commit 46f8c3c7e95c0d30d95911e7975ddc4f93b3e237. > >>> > >>> The commit above swapped the DSI1_PPID and DSI2_PPID register fields in > >>> CONTROL_DSIPHY to be in sync with the newer public OMAP TRMs(after version V). > >>> > >>> With this commit, contention errors were reported on DSI lanes some OMAP4 SDPs. > >>> After probing the DSI lanes on OMAP4 SDP, it was seen that setting bits in the > >>> DSI2_PPID field was pulling up voltage on DSI1 lanes, and DSI1_PPID field was > >>> pulling up voltage on DSI2 lanes. > >>> > >>> This proves that the current version of OMAP4 TRM is incorrect, swap the > >>> position of register fields according to the older TRM versions as they were > >>> correct. > >> > >> Are we sure the bits are the same for all OMAP4 versions? I'm just > >> wondering why the change was made to TRM... > > > > I've tried on OMAP4430 ES2.1 and OMAP4460 ES1.1. I can try on a couple > > more revisions. > > > > As far as why the change was made in the TRM, it's a bit hard to find > > the right people, or get response from them :), I'll give that a try > > again. > > > > If we do conclude that this revert patch is needed, it might probably be > > a candidate for the 3.2 and 3.3 stable kernels, just wanted to point > > that out. > > I was just going to ask about this, as I haven't noticed any improvement > in mainline kernels since I reported the original failure... It seems to be very difficult to find out why the TRM change was done, and what the HW actually does. But as the boards out there are clearly fixed by reverting the original patch, I think it's best if we just apply the revert. Archit, can you resend the patch with my ack, and cc stable@vger.kernel.org (see Documentation/stable_kernel_rules.txt). Tomi [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-04-19 11:05 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-04-09 7:11 [PATCH] ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields" Archit Taneja 2012-04-09 23:02 ` Tony Lindgren 2012-04-18 8:06 ` Tomi Valkeinen 2012-04-18 8:13 ` Archit Taneja 2012-04-19 9:31 ` Russell King - ARM Linux 2012-04-19 11:05 ` Tomi Valkeinen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox