powerpc: Fix struct termio related ioctl macros
Madhavan Srinivasan
maintainerPATCH v2 1/1 powerpc: Fix struct termio related ioctl macros
Since termio interface is now obsolete, include/uapi/asm/ioctls.h has some constant macros referring to "struct termio", this caused build failure at userspace.
In file included from /usr/include/asm/ioctl.h:12,
from /usr/include/asm/ioctls.h:5,
from tst-ioctls.c:3:tst-ioctls.c: In function 'get_TCGETA':
tst-ioctls.c:12:10: error: invalid application of 'sizeof' to incomplete type 'struct termio'
12 | return TCGETA;
| ^~~~~~Even though termios.h provides "struct termio", trying to juggle definitions around to make it compile could introduce regressions. So better to open code it.
---
Changelog v1:
- mpe pointing out mistake in hardcoded values.
Fixed the same.
arch/powerpc/include/uapi/asm/ioctls.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/include/uapi/asm/ioctls.h +4 -4
@@ -23,10 +23,10 @@#define TCSETSW _IOW('t', 21, struct termios)#define TCSETSF _IOW('t', 22, struct termios) -#define TCGETA _IOR('t', 23, struct termio) -#define TCSETA _IOW('t', 24, struct termio) -#define TCSETAW _IOW('t', 25, struct termio) -#define TCSETAF _IOW('t', 28, struct termio) +#define TCGETA 0x40147417/* _IOR('t', 23, struct termio) */ +#define TCSETA 0x80147418/* _IOW('t', 24, struct termio) */ +#define TCSETAW 0x80147419/* _IOW('t', 25, struct termio) */ +#define TCSETAF 0x8014741c/* _IOW('t', 28, struct termio) */ #define TCSBRK _IO('t', 29)#define TCXONC _IO('t', 30)
Signature · 1 line
2.49.0
Quoted 33 lines · Madhavan Srinivasan
Since termio interface is now obsolete,
include/uapi/asm/ioctls.hhas some constant macros referring to "struct termio", this caused build failure at userspace.In file included from
/usr/include/asm/ioctl.h:12,
from/usr/include/asm/ioctls.h:5,
from tst-ioctls.c:3:tst-ioctls.c: In function 'get_TCGETA':
tst-ioctls.c:12:10: error: invalid application of 'sizeof' to incomplete type 'struct termio'12 | return TCGETA; | ^~~~~~Even though
termios.hprovides "struct termio", trying to juggle definitions around to make it compile could introduce regressions. So better to open code it.Reported-by Tulio Magno <[email protected]>Suggested-by Nicholas Piggin <[email protected]>Signed-off-by Madhavan Srinivasan <[email protected]>---
Changelog v1:
- mpe pointing out mistake in hardcoded values.
Fixed the same.arch/powerpc/include/uapi/asm/ioctls.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/powerpc/include/uapi/asm/ioctls.h +0
-0@@ -23,10 +23,10 @@#define TCSETSW _IOW('t', 21, struct termios)
arch/powerpc/include/uapi/asm/ioctls.h line 29
Quoted 10 lines
arch/powerpc/include/uapi/asm/ioctls.h +4
-4#define TCSETSF _IOW('t', 22, struct termios) -#define TCGETA _IOR('t', 23, struct termio) -#define TCSETA _IOW('t', 24, struct termio) -#define TCSETAW _IOW('t', 25, struct termio) -#define TCSETAF _IOW('t', 28, struct termio) +#define TCGETA 0x40147417/* _IOR('t', 23, struct termio) */ +#define TCSETA 0x80147418/* _IOW('t', 24, struct termio) */ +#define TCSETAW 0x80147419/* _IOW('t', 25, struct termio) */ +#define TCSETAF 0x8014741c/* _IOW('t', 28, struct termio) */
These values look right to me. And the values should never change, so hard-coding them is a reasonable solution.
cheers
Justin Forbes
Tested-byQuoted 48 lines · Michael Ellerman
Quoted 33 lines · Madhavan Srinivasan
Since termio interface is now obsolete,
include/uapi/asm/ioctls.hhas some constant macros referring to "struct termio", this caused build failure at userspace.In file included from
/usr/include/asm/ioctl.h:12,
from/usr/include/asm/ioctls.h:5,
from tst-ioctls.c:3:tst-ioctls.c: In function 'get_TCGETA':
tst-ioctls.c:12:10: error: invalid application of 'sizeof' to incomplete type 'struct termio'12 | return TCGETA; | ^~~~~~Even though
termios.hprovides "struct termio", trying to juggle definitions around to make it compile could introduce regressions. So better to open code it.Reported-by Tulio Magno <[email protected]>Suggested-by Nicholas Piggin <[email protected]>Signed-off-by Madhavan Srinivasan <[email protected]>---
Changelog v1:
- mpe pointing out mistake in hardcoded values.
Fixed the same.arch/powerpc/include/uapi/asm/ioctls.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/powerpc/include/uapi/asm/ioctls.h +0
-0@@ -23,10 +23,10 @@#define TCSETSW _IOW('t', 21, struct termios)arch/powerpc/include/uapi/asm/ioctls.h line 29
Quoted 10 lines
arch/powerpc/include/uapi/asm/ioctls.h +4
-4#define TCSETSF _IOW('t', 22, struct termios) -#define TCGETA _IOR('t', 23, struct termio) -#define TCSETA _IOW('t', 24, struct termio) -#define TCSETAW _IOW('t', 25, struct termio) -#define TCSETAF _IOW('t', 28, struct termio) +#define TCGETA 0x40147417/* _IOR('t', 23, struct termio) */ +#define TCSETA 0x80147418/* _IOW('t', 24, struct termio) */ +#define TCSETAW 0x80147419/* _IOW('t', 25, struct termio) */ +#define TCSETAF 0x8014741c/* _IOW('t', 28, struct termio) */ These values look right to me. And the values should never change, so hard-coding them is a reasonable solution.
Quoted 1 line
Reviewed-by Michael Ellerman <[email protected]>
Has this been forgotten? We are having to carry it for userspace to continue, and this should really be pushed to Linus.
Quoted 3 lines
cheers
Madhavan Srinivasan
maintainerQuoted 49 lines · Justin Forbes
Quoted 48 lines · Michael Ellerman
Quoted 33 lines · Madhavan Srinivasan
Since termio interface is now obsolete,
include/uapi/asm/ioctls.hhas some constant macros referring to "struct termio", this caused build failure at userspace.In file included from
/usr/include/asm/ioctl.h:12,
from/usr/include/asm/ioctls.h:5,
from tst-ioctls.c:3:tst-ioctls.c: In function 'get_TCGETA':
tst-ioctls.c:12:10: error: invalid application of 'sizeof' to incomplete type 'struct termio'12 | return TCGETA; | ^~~~~~Even though
termios.hprovides "struct termio", trying to juggle definitions around to make it compile could introduce regressions. So better to open code it.Reported-by Tulio Magno <[email protected]>Suggested-by Nicholas Piggin <[email protected]>Signed-off-by Madhavan Srinivasan <[email protected]>---
Changelog v1:
- mpe pointing out mistake in hardcoded values.
Fixed the same.arch/powerpc/include/uapi/asm/ioctls.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/powerpc/include/uapi/asm/ioctls.h +0
-0@@ -23,10 +23,10 @@#define TCSETSW _IOW('t', 21, struct termios)arch/powerpc/include/uapi/asm/ioctls.h line 29
Quoted 10 lines
arch/powerpc/include/uapi/asm/ioctls.h +4
-4#define TCSETSF _IOW('t', 22, struct termios) -#define TCGETA _IOR('t', 23, struct termio) -#define TCSETA _IOW('t', 24, struct termio) -#define TCSETAW _IOW('t', 25, struct termio) -#define TCSETAF _IOW('t', 28, struct termio) +#define TCGETA 0x40147417/* _IOR('t', 23, struct termio) */ +#define TCSETA 0x80147418/* _IOW('t', 24, struct termio) */ +#define TCSETAW 0x80147419/* _IOW('t', 25, struct termio) */ +#define TCSETAF 0x8014741c/* _IOW('t', 28, struct termio) */ These values look right to me. And the values should never change, so hard-coding them is a reasonable solution.
Quoted 7 lines
Quoted 1 line
Reviewed-by Michael Ellerman <[email protected]>Has this been forgotten? We are having to carry it for userspace to continue, and this should really be pushed to Linus.
Tested-by Justin M. Forbes <[email protected]>
My bad, I will add this to my fixes-test
and sent it as part of my next fixes PR
Maddy
Quoted 3 lines
Quoted 3 lines
cheers
Quoted 9 lines · Madhavan Srinivasan
Since termio interface is now obsolete,
include/uapi/asm/ioctls.hhas some constant macros referring to "struct termio", this caused build failure at userspace.In file included from
/usr/include/asm/ioctl.h:12,
from/usr/include/asm/ioctls.h:5,
from tst-ioctls.c:3:tst-ioctls.c: In function 'get_TCGETA':
tst-ioctls.c:12:10: error: invalid application of 'sizeof' to incomplete type 'struct termio'
Quoted 4 lines
12 | return TCGETA; | ^~~~~~[...]
Applied to powerpc/fixes.
[1/1] powerpc: Fix struct termio related ioctl macros
https://git.kernel.org/powerpc/c/ab107276607af90b13a5994997e19b7b9731e251
Thanks