[PATCH linux-next] MIPS: ioctls: Add missing TIOC{S,G}RS485 definitions

Subsystems: mips, the rest

STALE4349d

7 messages, 3 authors, 2014-09-10 · open the first message on its own page

[PATCH linux-next] MIPS: ioctls: Add missing TIOC{S,G}RS485 definitions

From: Markos Chandras <hidden>
Date: 2014-09-09 11:53:10 

Commit e676253b19b2d269cccf67fdb1592120a0cd0676
(serial/8250: Add support for RS485 IOCTLs) added cases for the
TIOC{S,G}RS485 commands but this broke the build for MIPS:

drivers/tty/serial/8250/8250_core.c: In function 'serial8250_ioctl':
drivers/tty/serial/8250/8250_core.c:2874:7: error: 'TIOCSRS485' undeclared
(first use in this function)
drivers/tty/serial/8250/8250_core.c:2886:7: error: 'TIOCGRS485' undeclared
(first use in this function)

This patch adds these missing definitions

Cc: Ricardo Ribalda Delgado <redacted>
Cc: <redacted>
Cc: <redacted>
Cc: <redacted>
Signed-off-by: Markos Chandras <redacted>
---
 arch/mips/include/uapi/asm/ioctls.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/mips/include/uapi/asm/ioctls.h b/arch/mips/include/uapi/asm/ioctls.h
index b1e637757fe3..34050cb6b631 100644
--- a/arch/mips/include/uapi/asm/ioctls.h
+++ b/arch/mips/include/uapi/asm/ioctls.h
@@ -76,6 +76,8 @@
 
 #define TIOCSBRK	0x5427	/* BSD compatibility */
 #define TIOCCBRK	0x5428	/* BSD compatibility */
+#define TIOCGRS485	0x542E
+#define TIOCSRS485	0x542F
 #define TIOCGSID	0x7416	/* Return the session ID of FD */
 #define TCGETS2		_IOR('T', 0x2A, struct termios2)
 #define TCSETS2		_IOW('T', 0x2B, struct termios2)
-- 
2.1.0

Re: [PATCH linux-next] MIPS: ioctls: Add missing TIOC{S,G}RS485 definitions

From: Greg KH <hidden>
Date: 2014-09-09 19:17:40 

On Tue, Sep 09, 2014 at 12:52:55PM +0100, Markos Chandras wrote:
quoted hunk
Commit e676253b19b2d269cccf67fdb1592120a0cd0676
(serial/8250: Add support for RS485 IOCTLs) added cases for the
TIOC{S,G}RS485 commands but this broke the build for MIPS:

drivers/tty/serial/8250/8250_core.c: In function 'serial8250_ioctl':
drivers/tty/serial/8250/8250_core.c:2874:7: error: 'TIOCSRS485' undeclared
(first use in this function)
drivers/tty/serial/8250/8250_core.c:2886:7: error: 'TIOCGRS485' undeclared
(first use in this function)

This patch adds these missing definitions

Cc: Ricardo Ribalda Delgado <redacted>
Cc: <redacted>
Cc: <redacted>
Cc: <redacted>
Signed-off-by: Markos Chandras <redacted>
---
 arch/mips/include/uapi/asm/ioctls.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/mips/include/uapi/asm/ioctls.h b/arch/mips/include/uapi/asm/ioctls.h
index b1e637757fe3..34050cb6b631 100644
--- a/arch/mips/include/uapi/asm/ioctls.h
+++ b/arch/mips/include/uapi/asm/ioctls.h
@@ -76,6 +76,8 @@
 
 #define TIOCSBRK	0x5427	/* BSD compatibility */
 #define TIOCCBRK	0x5428	/* BSD compatibility */
+#define TIOCGRS485	0x542E
+#define TIOCSRS485	0x542F
Any reason you aren't using the _IOR() type macros here?

thanks,

greg k-h

Re: [PATCH linux-next] MIPS: ioctls: Add missing TIOC{S,G}RS485 definitions

From: Markos Chandras <hidden>
Date: 2014-09-10 08:25:16 

On 09/09/2014 08:17 PM, Greg KH wrote:
On Tue, Sep 09, 2014 at 12:52:55PM +0100, Markos Chandras wrote:
quoted
Commit e676253b19b2d269cccf67fdb1592120a0cd0676
(serial/8250: Add support for RS485 IOCTLs) added cases for the
TIOC{S,G}RS485 commands but this broke the build for MIPS:

drivers/tty/serial/8250/8250_core.c: In function 'serial8250_ioctl':
drivers/tty/serial/8250/8250_core.c:2874:7: error: 'TIOCSRS485' undeclared
(first use in this function)
drivers/tty/serial/8250/8250_core.c:2886:7: error: 'TIOCGRS485' undeclared
(first use in this function)

This patch adds these missing definitions

Cc: Ricardo Ribalda Delgado <redacted>
Cc: <redacted>
Cc: <redacted>
Cc: <redacted>
Signed-off-by: Markos Chandras <redacted>
---
 arch/mips/include/uapi/asm/ioctls.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/mips/include/uapi/asm/ioctls.h b/arch/mips/include/uapi/asm/ioctls.h
index b1e637757fe3..34050cb6b631 100644
--- a/arch/mips/include/uapi/asm/ioctls.h
+++ b/arch/mips/include/uapi/asm/ioctls.h
@@ -76,6 +76,8 @@
 
 #define TIOCSBRK	0x5427	/* BSD compatibility */
 #define TIOCCBRK	0x5428	/* BSD compatibility */
+#define TIOCGRS485	0x542E
+#define TIOCSRS485	0x542F
Any reason you aren't using the _IOR() type macros here?

thanks,

greg k-h
Hi Greg,

Not really. I am being consistent with what
include/uapi/asm-generic/ioctls.h is using, and with the xtensa patch
that was posted yesterday

https://lkml.org/lkml/2014/9/9/27

-- 
markos

Re: [PATCH linux-next] MIPS: ioctls: Add missing TIOC{S,G}RS485 definitions

From: Ricardo Ribalda Delgado <hidden>
Date: 2014-09-10 08:40:10 

Hello Greg

Sorry, Probably my bad :). I did resend a new patch using the _IO*
macros, that has been now merged to tty-next

Regards!

On Wed, Sep 10, 2014 at 10:25 AM, Markos Chandras
[off-list ref] wrote:
On 09/09/2014 08:17 PM, Greg KH wrote:
quoted
On Tue, Sep 09, 2014 at 12:52:55PM +0100, Markos Chandras wrote:
quoted
Commit e676253b19b2d269cccf67fdb1592120a0cd0676
(serial/8250: Add support for RS485 IOCTLs) added cases for the
TIOC{S,G}RS485 commands but this broke the build for MIPS:

drivers/tty/serial/8250/8250_core.c: In function 'serial8250_ioctl':
drivers/tty/serial/8250/8250_core.c:2874:7: error: 'TIOCSRS485' undeclared
(first use in this function)
drivers/tty/serial/8250/8250_core.c:2886:7: error: 'TIOCGRS485' undeclared
(first use in this function)

This patch adds these missing definitions

Cc: Ricardo Ribalda Delgado <redacted>
Cc: <redacted>
Cc: <redacted>
Cc: <redacted>
Signed-off-by: Markos Chandras <redacted>
---
 arch/mips/include/uapi/asm/ioctls.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/mips/include/uapi/asm/ioctls.h b/arch/mips/include/uapi/asm/ioctls.h
index b1e637757fe3..34050cb6b631 100644
--- a/arch/mips/include/uapi/asm/ioctls.h
+++ b/arch/mips/include/uapi/asm/ioctls.h
@@ -76,6 +76,8 @@

 #define TIOCSBRK    0x5427  /* BSD compatibility */
 #define TIOCCBRK    0x5428  /* BSD compatibility */
+#define TIOCGRS485  0x542E
+#define TIOCSRS485  0x542F
Any reason you aren't using the _IOR() type macros here?

thanks,

greg k-h
Hi Greg,

Not really. I am being consistent with what
include/uapi/asm-generic/ioctls.h is using, and with the xtensa patch
that was posted yesterday

https://lkml.org/lkml/2014/9/9/27

--
markos


-- 
Ricardo Ribalda

Re: [PATCH linux-next] MIPS: ioctls: Add missing TIOC{S,G}RS485 definitions

From: Markos Chandras <hidden>
Date: 2014-09-10 08:45:43 

On 09/10/2014 09:39 AM, Ricardo Ribalda Delgado wrote:
Hello Greg

Sorry, Probably my bad :). I did resend a new patch using the _IO*
macros, that has been now merged to tty-next

Regards!

On Wed, Sep 10, 2014 at 10:25 AM, Markos Chandras
[off-list ref] wrote:
quoted
On 09/09/2014 08:17 PM, Greg KH wrote:
quoted
On Tue, Sep 09, 2014 at 12:52:55PM +0100, Markos Chandras wrote:
quoted
Commit e676253b19b2d269cccf67fdb1592120a0cd0676
(serial/8250: Add support for RS485 IOCTLs) added cases for the
TIOC{S,G}RS485 commands but this broke the build for MIPS:

drivers/tty/serial/8250/8250_core.c: In function 'serial8250_ioctl':
drivers/tty/serial/8250/8250_core.c:2874:7: error: 'TIOCSRS485' undeclared
(first use in this function)
drivers/tty/serial/8250/8250_core.c:2886:7: error: 'TIOCGRS485' undeclared
(first use in this function)

This patch adds these missing definitions

Cc: Ricardo Ribalda Delgado <redacted>
Cc: <redacted>
Cc: <redacted>
Cc: <redacted>
Signed-off-by: Markos Chandras <redacted>
---
 arch/mips/include/uapi/asm/ioctls.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/mips/include/uapi/asm/ioctls.h b/arch/mips/include/uapi/asm/ioctls.h
index b1e637757fe3..34050cb6b631 100644
--- a/arch/mips/include/uapi/asm/ioctls.h
+++ b/arch/mips/include/uapi/asm/ioctls.h
@@ -76,6 +76,8 @@

 #define TIOCSBRK    0x5427  /* BSD compatibility */
 #define TIOCCBRK    0x5428  /* BSD compatibility */
+#define TIOCGRS485  0x542E
+#define TIOCSRS485  0x542F
Any reason you aren't using the _IOR() type macros here?

thanks,

greg k-h
Hi Greg,

Not really. I am being consistent with what
include/uapi/asm-generic/ioctls.h is using, and with the xtensa patch
that was posted yesterday

https://lkml.org/lkml/2014/9/9/27

--
markos
Hi Ricardo,

Since you are taking care of the same problem on the other
architectures, could you also make a similar patch for MIPS so they can
all get merged via the same tree? Because, right now, MIPS is still broken.

-- 
markos





  

    
Re: [PATCH linux-next] MIPS: ioctls: Add missing TIOC{S,G}RS485 definitions

    

      From: Ricardo Ribalda Delgado <hidden>

      Date: 2014-09-10 09:05:50 
    

  

  
Hello Markos

Sorry for the mess. I have already send a new patch for mips using the
_IO* macros

Just to put things a bit into context:

I did made the patch for serial and tested it only in x86. I wrongly
infer that the IOCTLS were defined for all the arches (sorry :S)

Then when the patch was applied on tty-next the build-bot throw some
errors for xtensa, that I fixed without using the IO_ macros

Then you came with your patch,

I realized that this could be wrong for mor arches, so I check the
rest and make patches for them.

Greg then pointed out that I should use _IO instead of numbers, so I
remade my patches using the _IO macros. I did not want to step into
your patch so I did not prepare a new one for mips

All the _IO patches (except mips) are now merged into tty-next.

Hopefully that one also get merged soon :)


Thanks for your help and sorry for any disturbance.


On Wed, Sep 10, 2014 at 10:45 AM, Markos Chandras
[off-list ref] wrote:
On 09/10/2014 09:39 AM, Ricardo Ribalda Delgado wrote:
quoted
Hello Greg

Sorry, Probably my bad :). I did resend a new patch using the _IO*
macros, that has been now merged to tty-next

Regards!

On Wed, Sep 10, 2014 at 10:25 AM, Markos Chandras
[off-list ref] wrote:
quoted
On 09/09/2014 08:17 PM, Greg KH wrote:
quoted
On Tue, Sep 09, 2014 at 12:52:55PM +0100, Markos Chandras wrote:
quoted
Commit e676253b19b2d269cccf67fdb1592120a0cd0676
(serial/8250: Add support for RS485 IOCTLs) added cases for the
TIOC{S,G}RS485 commands but this broke the build for MIPS:

drivers/tty/serial/8250/8250_core.c: In function 'serial8250_ioctl':
drivers/tty/serial/8250/8250_core.c:2874:7: error: 'TIOCSRS485' undeclared
(first use in this function)
drivers/tty/serial/8250/8250_core.c:2886:7: error: 'TIOCGRS485' undeclared
(first use in this function)

This patch adds these missing definitions

Cc: Ricardo Ribalda Delgado <redacted>
Cc: <redacted>
Cc: <redacted>
Cc: <redacted>
Signed-off-by: Markos Chandras <redacted>
---
 arch/mips/include/uapi/asm/ioctls.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/mips/include/uapi/asm/ioctls.h b/arch/mips/include/uapi/asm/ioctls.h
index b1e637757fe3..34050cb6b631 100644
--- a/arch/mips/include/uapi/asm/ioctls.h
+++ b/arch/mips/include/uapi/asm/ioctls.h
@@ -76,6 +76,8 @@

 #define TIOCSBRK    0x5427  /* BSD compatibility */
 #define TIOCCBRK    0x5428  /* BSD compatibility */
+#define TIOCGRS485  0x542E
+#define TIOCSRS485  0x542F
Any reason you aren't using the _IOR() type macros here?

thanks,

greg k-h
Hi Greg,

Not really. I am being consistent with what
include/uapi/asm-generic/ioctls.h is using, and with the xtensa patch
that was posted yesterday

https://lkml.org/lkml/2014/9/9/27

--
markos
Hi Ricardo,

Since you are taking care of the same problem on the other
architectures, could you also make a similar patch for MIPS so they can
all get merged via the same tree? Because, right now, MIPS is still broken.

--
markos


-- 
Ricardo Ribalda





  

    
Re: [PATCH linux-next] MIPS: ioctls: Add missing TIOC{S,G}RS485 definitions

    

      From: Markos Chandras <hidden>

      Date: 2014-09-10 09:14:42 
    

  

  
On 09/10/2014 10:05 AM, Ricardo Ribalda Delgado wrote:
Hello Markos

Sorry for the mess. I have already send a new patch for mips using the
_IO* macros

Just to put things a bit into context:

I did made the patch for serial and tested it only in x86. I wrongly
infer that the IOCTLS were defined for all the arches (sorry :S)

Then when the patch was applied on tty-next the build-bot throw some
errors for xtensa, that I fixed without using the IO_ macros

Then you came with your patch,

I realized that this could be wrong for mor arches, so I check the
rest and make patches for them.

Greg then pointed out that I should use _IO instead of numbers, so I
remade my patches using the _IO macros. I did not want to step into
your patch so I did not prepare a new one for mips

All the _IO patches (except mips) are now merged into tty-next.

Hopefully that one also get merged soon :)


Thanks for your help and sorry for any disturbance.

Hi Ricardo,

No problem :) Thanks for taking care of that

-- 
markos




    
  

  
    

      

        Keyboard shortcuts
      

      

        
          
hback out one level

          
jnext message in thread

          
kprevious message in thread

          
ldrill in

          
Escclose help / fold thread tree

          
?toggle this help