[linux-yocto] [PATCH][3.10] 8250_dw merge issue since v3.10.48.

2014-10-08 Thread Ong Boon Leong 
Bruce and Paul,

There is a build issue in 8250_dw.c since linux-yocto v3.10.48
merge point:

In dw850_handle_irq() the following line is required:

  struct dw8250_data *d = p-private_data;

because 'd' is referenced later at this line:

  (void)p-serial_in(p, d-usr_reg);

It was removed since linux-yocto v3.10.48 merge.

Thanks
Boon Leong

Ong Boon Leong (1):
  serial, 8250_dw: fix linux-yocto merge build issue since v3.10.48

 drivers/tty/serial/8250/8250_dw.c |1
 1 file changed, 1 insertion(+)

-- 
1.7.9.5

-- 
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto

Re: [linux-yocto] [PATCH] serial, 8250_dw: fix linux-yocto merge build issue since v3.10.48

2014-10-08 Thread Kamble, Nitin A 


On 10/7/14, 11:39 PM, Ong Boon Leong boon.leong@intel.com wrote:

There is an build issue in following merge-point:
Merge tag 'v3.10.48' into standard/base
  60a9d9fc565e4503dbb8705803e83d906afc4ad2

For 8250_dw.c: dw8250_handle_irq() requires the following line
to be restored in order to build successfully.

Signed-off-by: Ong Boon Leong boon.leong@intel.com

I have seen this issue, and I also came up with the exact same fix on my
end.

Acked-By: Nitin A Kamble nitin.a.kam...@intel.com


Nitin

---
 drivers/tty/serial/8250/8250_dw.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/tty/serial/8250/8250_dw.c
b/drivers/tty/serial/8250/8250_dw.c
index 36fe9d9..5caf10e 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -217,6 +217,7 @@ static unsigned int dw8250_serial_in32(struct
uart_port *p, int offset)
 
 static int dw8250_handle_irq(struct uart_port *p)
 {
+  struct dw8250_data *d = p-private_data;
   unsigned int iir = p-serial_in(p, UART_IIR);
 
   if (serial8250_handle_irq(p, iir)) {
-- 
1.7.9.5

-- 
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto

-- 
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto

Re: [linux-yocto] [PATCH] serial, 8250_dw: fix linux-yocto merge build issue since v3.10.48

2014-10-08 Thread Paul Gortmaker 
On 14-10-08 02:39 AM, Ong Boon Leong wrote:
 There is an build issue in following merge-point:
 Merge tag 'v3.10.48' into standard/base
   60a9d9fc565e4503dbb8705803e83d906afc4ad2
 
 For 8250_dw.c: dw8250_handle_irq() requires the following line
 to be restored in order to build successfully.

Correct, it actually happens because stable brought in:

-
commit 6d5e79331417886196cb3a733bdb6645ba85bc42
Author: Tim Kryger tim.kry...@linaro.org
Date:   Tue Oct 1 10:18:08 2013 -0700

serial: 8250_dw: Improve unwritable LCR workaround

commit c49436b657d0a56a6ad90d14a7c3041add7cf64d upstream.

[...]

[wangnan: backport to 3.10.43:
  - adjust context
  - remove unneeded local var]
Signed-off-by: Wang Nan wangn...@huawei.com
Signed-off-by: Greg Kroah-Hartman gre...@linuxfoundation.org


...which deletes the p-private_data declaration since it became
unused at that point, however in Yocto, we also have this:

---
commit 0e02b050c3cafbcbf9952125089a27e02d6ecea9
Author: David Daney david.da...@cavium.com
Date:   Wed Jun 19 20:37:27 2013 +

tty/8250_dw: Add support for OCTEON UARTS.

[...]

Signed-off-by: Ralf Baechle r...@linux-mips.org
(cherry picked from commit d5f1af7ece96cf52e0b110c72210ac15c2f65438)
Signed-off-by: Darren Hart dvh...@linux.intel.com
---

...which _adds_ another user of the p-private_data.

I'll update the commit log with the above information and
pass it along to Bruce to be merged.

Thanks,
Paul.
--


 
 Signed-off-by: Ong Boon Leong boon.leong@intel.com
 ---
  drivers/tty/serial/8250/8250_dw.c |1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/tty/serial/8250/8250_dw.c 
 b/drivers/tty/serial/8250/8250_dw.c
 index 36fe9d9..5caf10e 100644
 --- a/drivers/tty/serial/8250/8250_dw.c
 +++ b/drivers/tty/serial/8250/8250_dw.c
 @@ -217,6 +217,7 @@ static unsigned int dw8250_serial_in32(struct uart_port 
 *p, int offset)
  
  static int dw8250_handle_irq(struct uart_port *p)
  {
 + struct dw8250_data *d = p-private_data;
   unsigned int iir = p-serial_in(p, UART_IIR);
  
   if (serial8250_handle_irq(p, iir)) {
 
-- 
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto

[linux-yocto] [PATCH] 8250/8250_dw: fix compile failure due to stable/Yocto conflict

2014-10-08 Thread Paul Gortmaker 
From: Ong Boon Leong boon.leong@intel.com

As of merge 60a9d9fc565e4503dbb8705803e83d906afc4ad2, Merge
tag 'v3.10.48' into standard/base the 8250_dw.c fails to
compile due to an undeclared variable.

This happens because stable brought in:

 -
 commit 6d5e79331417886196cb3a733bdb6645ba85bc42
 Author: Tim Kryger tim.kry...@linaro.org
 Date:   Tue Oct 1 10:18:08 2013 -0700

serial: 8250_dw: Improve unwritable LCR workaround

commit c49436b657d0a56a6ad90d14a7c3041add7cf64d upstream.

 [...]

[wangnan: backport to 3.10.43:
  - adjust context
  - remove unneeded local var]
Signed-off-by: Wang Nan wangn...@huawei.com
Signed-off-by: Greg Kroah-Hartman gre...@linuxfoundation.org
 

...which deletes the p-private_data declaration since it became
unused at that point, however in Yocto, we also have this:

 ---
 commit 0e02b050c3cafbcbf9952125089a27e02d6ecea9
 Author: David Daney david.da...@cavium.com
 Date:   Wed Jun 19 20:37:27 2013 +

tty/8250_dw: Add support for OCTEON UARTS.

 [...]

Signed-off-by: Ralf Baechle r...@linux-mips.org
(cherry picked from commit d5f1af7ece96cf52e0b110c72210ac15c2f65438)
Signed-off-by: Darren Hart dvh...@linux.intel.com
 ---

...which _adds_ another user of the p-private_data.

Here we restore the declaration in order that 8250_dw compiles.

Signed-off-by: Ong Boon Leong boon.leong@intel.com
[PG: add root cause info to commit log.]
Signed-off-by: Paul Gortmaker paul.gortma...@windriver.com

diff --git a/drivers/tty/serial/8250/8250_dw.c 
b/drivers/tty/serial/8250/8250_dw.c
index 36fe9d9262c0..5caf10ee14b1 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -217,6 +217,7 @@ static unsigned int dw8250_serial_in32(struct uart_port *p, 
int offset)
 
 static int dw8250_handle_irq(struct uart_port *p)
 {
+   struct dw8250_data *d = p-private_data;
unsigned int iir = p-serial_in(p, UART_IIR);
 
if (serial8250_handle_irq(p, iir)) {
-- 
2.1.0

-- 
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto

Re: [linux-yocto] [PATCH] 8250/8250_dw: fix compile failure due to stable/Yocto conflict

2014-10-08 Thread Bruce Ashfield 
On Wed, Oct 8, 2014 at 12:04 PM, Paul Gortmaker
paul.gortma...@windriver.com wrote:
 From: Ong Boon Leong boon.leong@intel.com

 As of merge 60a9d9fc565e4503dbb8705803e83d906afc4ad2, Merge
 tag 'v3.10.48' into standard/base the 8250_dw.c fails to
 compile due to an undeclared variable.

 This happens because stable brought in:

  -
  commit 6d5e79331417886196cb3a733bdb6645ba85bc42
  Author: Tim Kryger tim.kry...@linaro.org
  Date:   Tue Oct 1 10:18:08 2013 -0700

 serial: 8250_dw: Improve unwritable LCR workaround

 commit c49436b657d0a56a6ad90d14a7c3041add7cf64d upstream.

  [...]

 [wangnan: backport to 3.10.43:
   - adjust context
   - remove unneeded local var]
 Signed-off-by: Wang Nan wangn...@huawei.com
 Signed-off-by: Greg Kroah-Hartman gre...@linuxfoundation.org
  

 ...which deletes the p-private_data declaration since it became
 unused at that point, however in Yocto, we also have this:

  ---
  commit 0e02b050c3cafbcbf9952125089a27e02d6ecea9
  Author: David Daney david.da...@cavium.com
  Date:   Wed Jun 19 20:37:27 2013 +

 tty/8250_dw: Add support for OCTEON UARTS.

  [...]

 Signed-off-by: Ralf Baechle r...@linux-mips.org
 (cherry picked from commit d5f1af7ece96cf52e0b110c72210ac15c2f65438)
 Signed-off-by: Darren Hart dvh...@linux.intel.com
  ---

 ...which _adds_ another user of the p-private_data.

 Here we restore the declaration in order that 8250_dw compiles.

 Signed-off-by: Ong Boon Leong boon.leong@intel.com
 [PG: add root cause info to commit log.]


Looks good. I'll merge this tomorrow night, when i'm finally back in front of
a real computer.

Cheers,

Bruce

 Signed-off-by: Paul Gortmaker paul.gortma...@windriver.com

 diff --git a/drivers/tty/serial/8250/8250_dw.c 
 b/drivers/tty/serial/8250/8250_dw.c
 index 36fe9d9262c0..5caf10ee14b1 100644
 --- a/drivers/tty/serial/8250/8250_dw.c
 +++ b/drivers/tty/serial/8250/8250_dw.c
 @@ -217,6 +217,7 @@ static unsigned int dw8250_serial_in32(struct uart_port 
 *p, int offset)

  static int dw8250_handle_irq(struct uart_port *p)
  {
 +   struct dw8250_data *d = p-private_data;
 unsigned int iir = p-serial_in(p, UART_IIR);

 if (serial8250_handle_irq(p, iir)) {
 --
 2.1.0

 --
 ___
 linux-yocto mailing list
 linux-yocto@yoctoproject.org
 https://lists.yoctoproject.org/listinfo/linux-yocto



-- 
Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
-- 
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto