Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 70beaed22cbe12979e55d99b370e147e2e168562

Authored by Jiri Slaby
Committed by Linus Torvalds
1 parent 6e47e069eb
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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);

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 69 additions and 47 deletions Side-by-side Diff

include/linux/serial.h
Diff comments   View file @ 70beaed
... ... @@ -96,54 +96,76 @@
96 96  
97 97 /*
98 98 * Definitions for async_struct (and serial_struct) flags field
  99 + *
  100 + * Define ASYNCB_* for convenient use with {test,set,clear}_bit.
99 101 */
100   -#define ASYNC_HUP_NOTIFY 0x0001 /* Notify getty on hangups and closes
101   - on the callout port */
102   -#define ASYNC_FOURPORT 0x0002 /* Set OU1, OUT2 per AST Fourport settings */
103   -#define ASYNC_SAK 0x0004 /* Secure Attention Key (Orange book) */
104   -#define ASYNC_SPLIT_TERMIOS 0x0008 /* Separate termios for dialin/callout */
  102 +#define ASYNCB_HUP_NOTIFY 0 /* Notify getty on hangups and closes
  103 + * on the callout port */
  104 +#define ASYNCB_FOURPORT 1 /* Set OU1, OUT2 per AST Fourport settings */
  105 +#define ASYNCB_SAK 2 /* Secure Attention Key (Orange book) */
  106 +#define ASYNCB_SPLIT_TERMIOS 3 /* Separate termios for dialin/callout */
  107 +#define ASYNCB_SPD_HI 4 /* Use 56000 instead of 38400 bps */
  108 +#define ASYNCB_SPD_VHI 5 /* Use 115200 instead of 38400 bps */
  109 +#define ASYNCB_SKIP_TEST 6 /* Skip UART test during autoconfiguration */
  110 +#define ASYNCB_AUTO_IRQ 7 /* Do automatic IRQ during
  111 + * autoconfiguration */
  112 +#define ASYNCB_SESSION_LOCKOUT 8 /* Lock out cua opens based on session */
  113 +#define ASYNCB_PGRP_LOCKOUT 9 /* Lock out cua opens based on pgrp */
  114 +#define ASYNCB_CALLOUT_NOHUP 10 /* Don't do hangups for cua device */
  115 +#define ASYNCB_HARDPPS_CD 11 /* Call hardpps when CD goes high */
  116 +#define ASYNCB_SPD_SHI 12 /* Use 230400 instead of 38400 bps */
  117 +#define ASYNCB_LOW_LATENCY 13 /* Request low latency behaviour */
  118 +#define ASYNCB_BUGGY_UART 14 /* This is a buggy UART, skip some safety
  119 + * checks. Note: can be dangerous! */
  120 +#define ASYNCB_AUTOPROBE 15 /* Port was autoprobed by PCI or PNP code */
  121 +#define ASYNCB_LAST_USER 15
105 122  
106   -#define ASYNC_SPD_MASK 0x1030
107   -#define ASYNC_SPD_HI 0x0010 /* Use 56000 instead of 38400 bps */
  123 +/* Internal flags used only by kernel */
  124 +#define ASYNCB_INITIALIZED 31 /* Serial port was initialized */
  125 +#define ASYNCB_NORMAL_ACTIVE 29 /* Normal device is active */
  126 +#define ASYNCB_BOOT_AUTOCONF 28 /* Autoconfigure port on bootup */
  127 +#define ASYNCB_CLOSING 27 /* Serial port is closing */
  128 +#define ASYNCB_CTS_FLOW 26 /* Do CTS flow control */
  129 +#define ASYNCB_CHECK_CD 25 /* i.e., CLOCAL */
  130 +#define ASYNCB_SHARE_IRQ 24 /* for multifunction cards, no longer used */
  131 +#define ASYNCB_CONS_FLOW 23 /* flow control for console */
  132 +#define ASYNCB_BOOT_ONLYMCA 22 /* Probe only if MCA bus */
  133 +#define ASYNCB_FIRST_KERNEL 22
108 134  
109   -#define ASYNC_SPD_VHI 0x0020 /* Use 115200 instead of 38400 bps */
110   -#define ASYNC_SPD_CUST 0x0030 /* Use user-specified divisor */
  135 +#define ASYNC_HUP_NOTIFY (1U << ASYNCB_HUP_NOTIFY)
  136 +#define ASYNC_FOURPORT (1U << ASYNCB_FOURPORT)
  137 +#define ASYNC_SAK (1U << ASYNCB_SAK)
  138 +#define ASYNC_SPLIT_TERMIOS (1U << ASYNCB_SPLIT_TERMIOS)
  139 +#define ASYNC_SPD_HI (1U << ASYNCB_SPD_HI)
  140 +#define ASYNC_SPD_VHI (1U << ASYNCB_SPD_VHI)
  141 +#define ASYNC_SKIP_TEST (1U << ASYNCB_SKIP_TEST)
  142 +#define ASYNC_AUTO_IRQ (1U << ASYNCB_AUTO_IRQ)
  143 +#define ASYNC_SESSION_LOCKOUT (1U << ASYNCB_SESSION_LOCKOUT)
  144 +#define ASYNC_PGRP_LOCKOUT (1U << ASYNCB_PGRP_LOCKOUT)
  145 +#define ASYNC_CALLOUT_NOHUP (1U << ASYNCB_CALLOUT_NOHUP)
  146 +#define ASYNC_HARDPPS_CD (1U << ASYNCB_HARDPPS_CD)
  147 +#define ASYNC_SPD_SHI (1U << ASYNCB_SPD_SHI)
  148 +#define ASYNC_LOW_LATENCY (1U << ASYNCB_LOW_LATENCY)
  149 +#define ASYNC_BUGGY_UART (1U << ASYNCB_BUGGY_UART)
  150 +#define ASYNC_AUTOPROBE (1U << ASYNCB_AUTOPROBE)
111 151  
112   -#define ASYNC_SKIP_TEST 0x0040 /* Skip UART test during autoconfiguration */
113   -#define ASYNC_AUTO_IRQ 0x0080 /* Do automatic IRQ during autoconfiguration */
114   -#define ASYNC_SESSION_LOCKOUT 0x0100 /* Lock out cua opens based on session */
115   -#define ASYNC_PGRP_LOCKOUT 0x0200 /* Lock out cua opens based on pgrp */
116   -#define ASYNC_CALLOUT_NOHUP 0x0400 /* Don't do hangups for cua device */
  152 +#define ASYNC_FLAGS ((1U << ASYNCB_LAST_USER) - 1)
  153 +#define ASYNC_USR_MASK (ASYNC_SPD_HI|ASYNC_SPD_VHI| \
  154 + ASYNC_CALLOUT_NOHUP|ASYNC_SPD_SHI|ASYNC_LOW_LATENCY)
  155 +#define ASYNC_SPD_CUST (ASYNC_SPD_HI|ASYNC_SPD_VHI)
  156 +#define ASYNC_SPD_WARP (ASYNC_SPD_HI|ASYNC_SPD_SHI)
  157 +#define ASYNC_SPD_MASK (ASYNC_SPD_HI|ASYNC_SPD_VHI|ASYNC_SPD_SHI)
117 158  
118   -#define ASYNC_HARDPPS_CD 0x0800 /* Call hardpps when CD goes high */
119   -
120   -#define ASYNC_SPD_SHI 0x1000 /* Use 230400 instead of 38400 bps */
121   -#define ASYNC_SPD_WARP 0x1010 /* Use 460800 instead of 38400 bps */
122   -
123   -#define ASYNC_LOW_LATENCY 0x2000 /* Request low latency behaviour */
124   -
125   -#define ASYNC_BUGGY_UART 0x4000 /* This is a buggy UART, skip some safety
126   - * checks. Note: can be dangerous! */
127   -
128   -#define ASYNC_AUTOPROBE 0x8000 /* Port was autoprobed by PCI or PNP code */
129   -
130   -#define ASYNC_FLAGS 0x7FFF /* Possible legal async flags */
131   -#define ASYNC_USR_MASK 0x3430 /* Legal flags that non-privileged
132   - * users can set or reset */
133   -
134   -/* Internal flags used only by kernel/chr_drv/serial.c */
135   -#define ASYNC_INITIALIZED 0x80000000 /* Serial port was initialized */
136   -#define ASYNC_NORMAL_ACTIVE 0x20000000 /* Normal device is active */
137   -#define ASYNC_BOOT_AUTOCONF 0x10000000 /* Autoconfigure port on bootup */
138   -#define ASYNC_CLOSING 0x08000000 /* Serial port is closing */
139   -#define ASYNC_CTS_FLOW 0x04000000 /* Do CTS flow control */
140   -#define ASYNC_CHECK_CD 0x02000000 /* i.e., CLOCAL */
141   -#define ASYNC_SHARE_IRQ 0x01000000 /* for multifunction cards
142   - --- no longer used */
143   -#define ASYNC_CONS_FLOW 0x00800000 /* flow control for console */
144   -
145   -#define ASYNC_BOOT_ONLYMCA 0x00400000 /* Probe only if MCA bus */
146   -#define ASYNC_INTERNAL_FLAGS 0xFFC00000 /* Internal flags */
  159 +#define ASYNC_INITIALIZED (1U << ASYNCB_INITIALIZED)
  160 +#define ASYNC_NORMAL_ACTIVE (1U << ASYNCB_NORMAL_ACTIVE)
  161 +#define ASYNC_BOOT_AUTOCONF (1U << ASYNCB_BOOT_AUTOCONF)
  162 +#define ASYNC_CLOSING (1U << ASYNCB_CLOSING)
  163 +#define ASYNC_CTS_FLOW (1U << ASYNCB_CTS_FLOW)
  164 +#define ASYNC_CHECK_CD (1U << ASYNCB_CHECK_CD)
  165 +#define ASYNC_SHARE_IRQ (1U << ASYNCB_SHARE_IRQ)
  166 +#define ASYNC_CONS_FLOW (1U << ASYNCB_CONS_FLOW)
  167 +#define ASYNC_BOOT_ONLYMCA (1U << ASYNCB_BOOT_ONLYMCA)
  168 +#define ASYNC_INTERNAL_FLAGS (~((1U << ASYNCB_FIRST_KERNEL) - 1))
147 169  
148 170 /*
149 171 * Multiport serial configuration structure --- external structure