Char/serial: refactor ASYNC_ flags
Subsystems (2)
PATCH 1/3 Char/serial: refactor ASYNC_ flags
Define ASYNCB_* flags which are bit numbers of the ASYNC_* flags. This is useful for {test,set,clear}_bit.
Also convert each ASYNC_% to be (1 << ASYNCB_%) and define masks with the macros, not constants.
Tested with:
#include "PATH_TO_KERNEL/include/linux/serial.h"
static struct {
unsigned int new, old;
} as[] = {
{ ASYNC_HUP_NOTIFY, 0x0001 },
{ ASYNC_FOURPORT, 0x0002 },
...
{ ASYNC_BOOT_ONLYMCA, 0x00400000 },
{ ASYNC_INTERNAL_FLAGS, 0xFFC00000 }
};
...
for (a = 0; a < ARRAY_SIZE(as); a++)
if (as[a].old != as[a].new)
printf("%.8x != %.8x\n", as[a].old, as[a].new);--- include/linux/serial.h | 116 ++++++++++++++++++++++++++++------------------- 1 files changed, 69 insertions(+), 47 deletions(-)
include/linux/serial.h +69 -47
@@ -96,54 +96,76 @@ struct serial_uart_config {/* * Definitions for async_struct (and serial_struct) flags field +* +* Define ASYNCB_* for convenient use with {test,set,clear}_bit. */ -#define ASYNC_HUP_NOTIFY 0x0001/* Notify getty on hangups and closes -on the callout port */ -#define ASYNC_FOURPORT 0x0002/* Set OU1, OUT2 per AST Fourport settings */ -#define ASYNC_SAK 0x0004/* Secure Attention Key (Orange book) */ -#define ASYNC_SPLIT_TERMIOS 0x0008/* Separate termios for dialin/callout */ - -#define ASYNC_SPD_MASK 0x1030 -#define ASYNC_SPD_HI 0x0010/* Use 56000 instead of 38400 bps */ - -#define ASYNC_SPD_VHI 0x0020/* Use 115200 instead of 38400 bps */ -#define ASYNC_SPD_CUST 0x0030/* Use user-specified divisor */ - -#define ASYNC_SKIP_TEST 0x0040/* Skip UART test during autoconfiguration */ -#define ASYNC_AUTO_IRQ 0x0080/* Do automatic IRQ during autoconfiguration */ -#define ASYNC_SESSION_LOCKOUT 0x0100/* Lock out cua opens based on session */ -#define ASYNC_PGRP_LOCKOUT 0x0200/* Lock out cua opens based on pgrp */ -#define ASYNC_CALLOUT_NOHUP 0x0400/* Don't do hangups for cua device */ - -#define ASYNC_HARDPPS_CD 0x0800/* Call hardpps when CD goes high */ - -#define ASYNC_SPD_SHI 0x1000/* Use 230400 instead of 38400 bps */ -#define ASYNC_SPD_WARP 0x1010/* Use 460800 instead of 38400 bps */ - -#define ASYNC_LOW_LATENCY 0x2000/* Request low latency behaviour */ - -#define ASYNC_BUGGY_UART 0x4000/* This is a buggy UART, skip some safety -* checks. Note: can be dangerous! */ - -#define ASYNC_AUTOPROBE 0x8000/* Port was autoprobed by PCI or PNP code */ - -#define ASYNC_FLAGS 0x7FFF/* Possible legal async flags */ -#define ASYNC_USR_MASK 0x3430/* Legal flags that non-privileged -* users can set or reset */ - -/* Internal flags used only by kernel/chr_drv/serial.c */ -#define ASYNC_INITIALIZED 0x80000000/* Serial port was initialized */ -#define ASYNC_NORMAL_ACTIVE 0x20000000/* Normal device is active */ -#define ASYNC_BOOT_AUTOCONF 0x10000000/* Autoconfigure port on bootup */ -#define ASYNC_CLOSING 0x08000000/* Serial port is closing */ -#define ASYNC_CTS_FLOW 0x04000000/* Do CTS flow control */ -#define ASYNC_CHECK_CD 0x02000000/* i.e., CLOCAL */ -#define ASYNC_SHARE_IRQ 0x01000000/* for multifunction cards ---- no longer used */ -#define ASYNC_CONS_FLOW 0x00800000/* flow control for console */ - -#define ASYNC_BOOT_ONLYMCA 0x00400000/* Probe only if MCA bus */ -#define ASYNC_INTERNAL_FLAGS 0xFFC00000/* Internal flags */ +#define ASYNCB_HUP_NOTIFY 0/* Notify getty on hangups and closes +* on the callout port */ +#define ASYNCB_FOURPORT 1/* Set OU1, OUT2 per AST Fourport settings */ +#define ASYNCB_SAK 2/* Secure Attention Key (Orange book) */ +#define ASYNCB_SPLIT_TERMIOS 3/* Separate termios for dialin/callout */ +#define ASYNCB_SPD_HI 4/* Use 56000 instead of 38400 bps */ +#define ASYNCB_SPD_VHI 5/* Use 115200 instead of 38400 bps */ +#define ASYNCB_SKIP_TEST 6/* Skip UART test during autoconfiguration */ +#define ASYNCB_AUTO_IRQ 7/* Do automatic IRQ during +* autoconfiguration */ +#define ASYNCB_SESSION_LOCKOUT 8/* Lock out cua opens based on session */ +#define ASYNCB_PGRP_LOCKOUT 9/* Lock out cua opens based on pgrp */ +#define ASYNCB_CALLOUT_NOHUP 10/* Don't do hangups for cua device */ +#define ASYNCB_HARDPPS_CD 11/* Call hardpps when CD goes high */ +#define ASYNCB_SPD_SHI 12/* Use 230400 instead of 38400 bps */ +#define ASYNCB_LOW_LATENCY 13/* Request low latency behaviour */ +#define ASYNCB_BUGGY_UART 14/* This is a buggy UART, skip some safety +* checks. Note: can be dangerous! */ +#define ASYNCB_AUTOPROBE 15/* Port was autoprobed by PCI or PNP code */ +#define ASYNCB_LAST_USER 15 + +/* Internal flags used only by kernel */ +#define ASYNCB_INITIALIZED 31/* Serial port was initialized */ +#define ASYNCB_NORMAL_ACTIVE 29/* Normal device is active */ +#define ASYNCB_BOOT_AUTOCONF 28/* Autoconfigure port on bootup */ +#define ASYNCB_CLOSING 27/* Serial port is closing */ +#define ASYNCB_CTS_FLOW 26/* Do CTS flow control */ +#define ASYNCB_CHECK_CD 25/* i.e., CLOCAL */ +#define ASYNCB_SHARE_IRQ 24/* for multifunction cards, no longer used */ +#define ASYNCB_CONS_FLOW 23/* flow control for console */ +#define ASYNCB_BOOT_ONLYMCA 22/* Probe only if MCA bus */ +#define ASYNCB_FIRST_KERNEL 22 + +#define ASYNC_HUP_NOTIFY (1U << ASYNCB_HUP_NOTIFY) +#define ASYNC_FOURPORT (1U << ASYNCB_FOURPORT) +#define ASYNC_SAK (1U << ASYNCB_SAK) +#define ASYNC_SPLIT_TERMIOS (1U << ASYNCB_SPLIT_TERMIOS) +#define ASYNC_SPD_HI (1U << ASYNCB_SPD_HI) +#define ASYNC_SPD_VHI (1U << ASYNCB_SPD_VHI) +#define ASYNC_SKIP_TEST (1U << ASYNCB_SKIP_TEST) +#define ASYNC_AUTO_IRQ (1U << ASYNCB_AUTO_IRQ) +#define ASYNC_SESSION_LOCKOUT (1U << ASYNCB_SESSION_LOCKOUT) +#define ASYNC_PGRP_LOCKOUT (1U << ASYNCB_PGRP_LOCKOUT) +#define ASYNC_CALLOUT_NOHUP (1U << ASYNCB_CALLOUT_NOHUP) +#define ASYNC_HARDPPS_CD (1U << ASYNCB_HARDPPS_CD) +#define ASYNC_SPD_SHI (1U << ASYNCB_SPD_SHI) +#define ASYNC_LOW_LATENCY (1U << ASYNCB_LOW_LATENCY) +#define ASYNC_BUGGY_UART (1U << ASYNCB_BUGGY_UART) +#define ASYNC_AUTOPROBE (1U << ASYNCB_AUTOPROBE) + +#define ASYNC_FLAGS ((1U << ASYNCB_LAST_USER) - 1) +#define ASYNC_USR_MASK (ASYNC_SPD_HI|ASYNC_SPD_VHI| \ + ASYNC_CALLOUT_NOHUP|ASYNC_SPD_SHI|ASYNC_LOW_LATENCY) +#define ASYNC_SPD_CUST (ASYNC_SPD_HI|ASYNC_SPD_VHI) +#define ASYNC_SPD_WARP (ASYNC_SPD_HI|ASYNC_SPD_SHI) +#define ASYNC_SPD_MASK (ASYNC_SPD_HI|ASYNC_SPD_VHI|ASYNC_SPD_SHI) + +#define ASYNC_INITIALIZED (1U << ASYNCB_INITIALIZED) +#define ASYNC_NORMAL_ACTIVE (1U << ASYNCB_NORMAL_ACTIVE) +#define ASYNC_BOOT_AUTOCONF (1U << ASYNCB_BOOT_AUTOCONF) +#define ASYNC_CLOSING (1U << ASYNCB_CLOSING) +#define ASYNC_CTS_FLOW (1U << ASYNCB_CTS_FLOW) +#define ASYNC_CHECK_CD (1U << ASYNCB_CHECK_CD) +#define ASYNC_SHARE_IRQ (1U << ASYNCB_SHARE_IRQ) +#define ASYNC_CONS_FLOW (1U << ASYNCB_CONS_FLOW) +#define ASYNC_BOOT_ONLYMCA (1U << ASYNCB_BOOT_ONLYMCA) +#define ASYNC_INTERNAL_FLAGS (~((1U << ASYNCB_FIRST_KERNEL) - 1))/* * Multiport serial configuration structure --- external structure
Signature · 1 line
1.6.3
PATCH 2/3 Char: rocket, fix test_bit parameters
Switch from ASYNC_* to ASYNCB_*, because {test,set}_bit expect bit number, not mask.
--- drivers/char/rocket.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/char/rocket.c +3 -3
@@ -939,7 +939,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)/* * Info->count is now 1; so it's safe to sleep now. */ -if (!test_bit (ASYNC_INITIALIZED , &port->flags)) { +if (!test_bit (ASYNCB_INITIALIZED , &port->flags)) { cp = &info->channel;sSetRxTrigger (cp,TRIG_1 );if (sGetChanStatus (cp) &CD_ACT )
@@ -963,7 +963,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)sEnRxFIFO (cp);sEnTransmit (cp); -set_bit (ASYNC_INITIALIZED , &info->port.flags); +set_bit (ASYNCB_INITIALIZED , &info->port.flags);/* * Set up the tty->alt_speed kludge
@@ -1646,7 +1646,7 @@ static int rp_write(struct tty_struct *tty,/* Write remaining data into the port's xmit_buf */ while (1 ) {/* Hung up ? */ -if (!test_bit (ASYNC_NORMAL_ACTIVE , &info->port.flags)) +if (!test_bit (ASYNCB_NORMAL_ACTIVE , &info->port.flags)) goto end; c =min (count,XMIT_BUF_SIZE - info->xmit_cnt -1 ); c =min (c,XMIT_BUF_SIZE - info->xmit_head);
Signature · 1 line
1.6.3
PATCH 3/3 Char: epca, fix test_bit parameters
Switch from ASYNC_* to ASYNCB_*, because test_bit expects bit number, not mask.
--- drivers/char/epca.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
drivers/char/epca.c +5 -4
@@ -1518,7 +1518,7 @@ static void doevent(int crd)if (event &MODEMCHG_IND ) {/* A modem signal change has been indicated */ ch->imodem = mstat; -if (test_bit (ASYNC_CHECK_CD , &ch->port.flags)) { +if (test_bit (ASYNCB_CHECK_CD , &ch->port.flags)) {/* We are now receiving dcd */ if (mstat & ch->dcd)wake_up_interruptible (&ch->port.open_wait);
@@ -1765,9 +1765,9 @@ static void epcaparam(struct tty_struct *tty, struct channel *ch)* that the driver will wait on carrier detect. */ if (ts->c_cflag &CLOCAL ) -clear_bit (ASYNC_CHECK_CD , &ch->port.flags); +clear_bit (ASYNCB_CHECK_CD , &ch->port.flags);else -set_bit (ASYNC_CHECK_CD , &ch->port.flags); +set_bit (ASYNCB_CHECK_CD , &ch->port.flags); mval = ch->m_dtr | ch->m_rts; }/* End CBAUD not detected */ iflag =termios2digi_i (ch, ts->c_iflag);
@@ -2244,7 +2244,8 @@ static void do_softint(struct work_struct *work)if (test_and_clear_bit (EPCA_EVENT_HANGUP , &ch->event)) {tty_hangup (tty);wake_up_interruptible (&ch->port.open_wait); -clear_bit (ASYNC_NORMAL_ACTIVE , &ch->port.flags); +clear_bit (ASYNCB_NORMAL_ACTIVE , + &ch->port.flags); } }tty_kref_put (tty);
Signature · 1 line
1.6.3
Quoted 5 lines · On Mon, 11 May 2009 15:50:58 +0200 Jiri Slaby <[email protected]> wrote:
Define ASYNCB_* flags which are bit numbers of the ASYNC_* flags. This is useful for {test,set,clear}_bit.
Also convert each ASYNC_% to be (1 << ASYNCB_%) and define masks with the macros, not constants.
Series all applied
Quoted 1 line · Alan Cox
Series all applied
Thanks.
Ferenc, could you apply patches 1 and 2 and confirm that it fixes your problem?
Quoted 8 lines · Jiri Slaby
Quoted 1 line · Alan Cox
Series all applied
Thanks.
Ferenc, could you apply patches 1 and 2 and confirm that it fixes your problem?
Yes, adding these two patches to 2.6.30-rc5 fixes my problem. Thank you very much!
Signature · 2 lines
Regards, Feri.