From: Jiri Slaby <jslaby@suse.cz>
To: gregkh@linuxfoundation.org
Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiri Slaby <jslaby@suse.cz>
Subject: [PATCH 48/70] mxser: remove mxser_cardinfo
Date: Fri, 18 Jun 2021 08:14:54 +0200 [thread overview]
Message-ID: <20210618061516.662-49-jslaby@suse.cz> (raw)
In-Reply-To: <20210618061516.662-1-jslaby@suse.cz>
Now that mxser_cards array (of struct mxser_cardinfo) contains only port
count and a quirk, we can encode these two directly into
pci_device_id::driver_data. And we can remove this struct completely.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/tty/mxser.c | 113 ++++++++++++++++----------------------------
1 file changed, 41 insertions(+), 72 deletions(-)
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 04a39c1f13bb..bb4110d466cb 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -168,7 +168,8 @@
#define PCI_DEVICE_ID_CB134I 0x1341
#define PCI_DEVICE_ID_CP138U 0x1380
-#define MXSER_HIGHBAUD 1
+#define MXSER_NPORTS(ddata) ((ddata) & 0xffU)
+#define MXSER_HIGHBAUD 0x0100
enum mxser_must_hwid {
MOXA_OTHER_UART = 0x00,
@@ -189,69 +190,36 @@ static const struct {
};
#define UART_INFO_NUM ARRAY_SIZE(Gpci_uart_info)
-struct mxser_cardinfo {
- unsigned int nports;
- unsigned int flags;
-};
-
-static const struct mxser_cardinfo mxser_cards[] = {
-/* 0*/ { 8, },
- { 4, },
- { 2, },
- { 4, },
- { 4, },
-/* 5*/ { 2, MXSER_HIGHBAUD },
- { 4, },
- { 8, },
- { 2, },
- { 4, },
-/*10*/ { 4, },
- { 8, }, /* RC7000 */
- { 8, },
- { 2, },
- { 2, },
-/*15*/ { 8, },
- { 8, },
- { 4, },
- { 8, },
- { 4, },
-/*20*/ { 4, },
- { 8, },
- { 4, },
- { 4, },
- { 2, },
-/*25*/ { 2, },
-};
/* driver_data correspond to the lines in the structure above
see also ISA probe function before you change something */
static const struct pci_device_id mxser_pcibrds[] = {
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_C168), .driver_data = 0 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_C104), .driver_data = 1 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_C168), .driver_data = 8 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_C104), .driver_data = 4 },
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP132), .driver_data = 2 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP114), .driver_data = 3 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP114), .driver_data = 4 },
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CT114), .driver_data = 4 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102), .driver_data = 5 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104U), .driver_data = 6 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP168U), .driver_data = 7 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP132U), .driver_data = 8 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP134U), .driver_data = 9 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104JU),.driver_data = 10 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_RC7000), .driver_data = 11 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118U), .driver_data = 12 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102UL),.driver_data = 13 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102U), .driver_data = 14 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118EL),.driver_data = 15 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP168EL),.driver_data = 16 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104EL),.driver_data = 17 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB108), .driver_data = 18 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB114), .driver_data = 19 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB134I), .driver_data = 20 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP138U), .driver_data = 21 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_POS104UL), .driver_data = 22 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP114UL), .driver_data = 23 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP102UF), .driver_data = 24 },
- { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP112UL), .driver_data = 25 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102), .driver_data = 2 | MXSER_HIGHBAUD },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104U), .driver_data = 4 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP168U), .driver_data = 8 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP132U), .driver_data = 2 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP134U), .driver_data = 4 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104JU),.driver_data = 4 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_RC7000), .driver_data = 8 }, /* RC7000 */
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118U), .driver_data = 8 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102UL),.driver_data = 2 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102U), .driver_data = 2 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118EL),.driver_data = 8 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP168EL),.driver_data = 8 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104EL),.driver_data = 4 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB108), .driver_data = 8 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB114), .driver_data = 4 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB134I), .driver_data = 4 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP138U), .driver_data = 8 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_POS104UL), .driver_data = 4 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP114UL), .driver_data = 4 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP102UF), .driver_data = 2 },
+ { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP112UL), .driver_data = 2 },
{ }
};
MODULE_DEVICE_TABLE(pci, mxser_pcibrds);
@@ -300,8 +268,8 @@ struct mxser_port {
struct mxser_board {
unsigned int idx;
+ unsigned short nports;
int irq;
- const struct mxser_cardinfo *info;
unsigned long vector;
enum mxser_must_hwid must_hwid;
@@ -1816,7 +1784,7 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id)
struct mxser_board *brd = dev_id;
struct mxser_port *port;
unsigned int int_cnt, pass_counter = 0;
- unsigned int i, max = brd->info->nports;
+ unsigned int i, max = brd->nports;
int handled = IRQ_NONE;
u8 irqbits, bits, mask = BIT(max) - 1;
@@ -1882,7 +1850,7 @@ static const struct tty_port_operations mxser_port_ops = {
* The MOXA Smartio/Industio serial driver boot-time initialization code!
*/
-static void mxser_initbrd(struct mxser_board *brd)
+static void mxser_initbrd(struct mxser_board *brd, bool high_baud)
{
struct mxser_port *info;
unsigned int i;
@@ -1896,7 +1864,7 @@ static void mxser_initbrd(struct mxser_board *brd)
brd->max_baud = Gpci_uart_info[i].max_baud;
/* exception....CP-102 */
- if (brd->info->flags & MXSER_HIGHBAUD)
+ if (high_baud)
brd->max_baud = 921600;
break;
}
@@ -1908,7 +1876,7 @@ static void mxser_initbrd(struct mxser_board *brd)
outb(0, brd->vector + 0x0c);
}
- for (i = 0; i < brd->info->nports; i++) {
+ for (i = 0; i < brd->nports; i++) {
info = &brd->ports[i];
if (is_mu860) {
if (i < 4)
@@ -1945,11 +1913,12 @@ static int mxser_probe(struct pci_dev *pdev,
struct mxser_board *brd;
unsigned int i;
unsigned long ioaddress;
+ unsigned short nports = MXSER_NPORTS(ent->driver_data);
struct device *tty_dev;
int retval = -EINVAL;
for (i = 0; i < MXSER_BOARDS; i++)
- if (mxser_boards[i].info == NULL)
+ if (mxser_boards[i].nports == 0)
break;
if (i >= MXSER_BOARDS) {
@@ -1973,8 +1942,8 @@ static int mxser_probe(struct pci_dev *pdev,
if (retval)
goto err;
- brd->info = &mxser_cards[ent->driver_data];
- for (i = 0; i < brd->info->nports; i++)
+ brd->nports = nports;
+ for (i = 0; i < nports; i++)
brd->ports[i].ioaddr = ioaddress + 8 * i;
/* vector */
@@ -1987,7 +1956,7 @@ static int mxser_probe(struct pci_dev *pdev,
/* irq */
brd->irq = pdev->irq;
- mxser_initbrd(brd);
+ mxser_initbrd(brd, ent->driver_data & MXSER_HIGHBAUD);
retval = devm_request_irq(&pdev->dev, brd->irq, mxser_interrupt,
IRQF_SHARED, "mxser", brd);
@@ -1996,7 +1965,7 @@ static int mxser_probe(struct pci_dev *pdev,
goto err_relbrd;
}
- for (i = 0; i < brd->info->nports; i++) {
+ for (i = 0; i < nports; i++) {
tty_dev = tty_port_register_device(&brd->ports[i].port,
mxvar_sdriver, brd->idx + i, &pdev->dev);
if (IS_ERR(tty_dev)) {
@@ -2012,10 +1981,10 @@ static int mxser_probe(struct pci_dev *pdev,
return 0;
err_relbrd:
- for (i = 0; i < brd->info->nports; i++)
+ for (i = 0; i < nports; i++)
tty_port_destroy(&brd->ports[i].port);
err_zero:
- brd->info = NULL;
+ brd->nports = 0;
err:
return retval;
}
@@ -2025,12 +1994,12 @@ static void mxser_remove(struct pci_dev *pdev)
struct mxser_board *brd = pci_get_drvdata(pdev);
unsigned int i;
- for (i = 0; i < brd->info->nports; i++) {
+ for (i = 0; i < brd->nports; i++) {
tty_unregister_device(mxvar_sdriver, brd->idx + i);
tty_port_destroy(&brd->ports[i].port);
}
- brd->info = NULL;
+ brd->nports = 0;
}
static struct pci_driver mxser_driver = {
--
2.32.0
next prev parent reply other threads:[~2021-06-18 6:18 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-18 6:14 [PATCH 00/69] mxser: cleanup Jiri Slaby
2021-06-18 6:14 ` [PATCH 01/70] mxser: drop ISA support Jiri Slaby
2021-06-18 6:14 ` [PATCH 02/70] mxser: renumber mxser_cards Jiri Slaby
2021-06-18 6:14 ` [PATCH 03/70] mxser: remove info printout from init Jiri Slaby
2021-06-18 6:14 ` [PATCH 04/70] mxser: integrate mxser.h into .c Jiri Slaby
2021-06-18 6:14 ` [PATCH 05/70] mxser: cleanup Gpci_uart_info struct Jiri Slaby
2021-06-18 6:14 ` [PATCH 06/70] mxser: rename CheckIsMoxaMust to mxser_get_must_hwid Jiri Slaby
2021-06-18 6:14 ` [PATCH 07/70] mxser: rename mxser_board::chip_flag to must_hwid Jiri Slaby
2021-06-18 6:14 ` [PATCH 08/70] mxser: introduce enum mxser_must_hwid Jiri Slaby
2021-06-18 6:14 ` [PATCH 09/70] mxser: drop constant board::uart_type Jiri Slaby
2021-06-18 6:14 ` [PATCH 10/70] mxser: move max_baud from port to board Jiri Slaby
2021-06-18 6:14 ` [PATCH 11/70] mxser: remove nonsense from ISR Jiri Slaby
2021-06-18 6:14 ` [PATCH 12/70] mxser: cleanup LSR handling in mxser_receive_chars Jiri Slaby
2021-06-18 6:14 ` [PATCH 13/70] mxser: extract port ISR Jiri Slaby
2021-06-18 6:14 ` [PATCH 14/70] mxser: simplify mxser_interrupt and drop mxser_board::vector_mask Jiri Slaby
2021-06-18 6:14 ` [PATCH 15/70] mxser: extract mxser_receive_chars_new Jiri Slaby
2021-06-18 6:14 ` [PATCH 16/70] mxser: extract mxser_receive_chars_old Jiri Slaby
2021-06-18 6:14 ` [PATCH 17/70] mxser: remove else from LSR bits checks Jiri Slaby
2021-06-18 6:14 ` [PATCH 18/70] mxser: correct types for uart variables Jiri Slaby
2021-06-18 6:14 ` [PATCH 19/70] mxser: make xmit ring buffer variables unsigned Jiri Slaby
2021-06-18 6:14 ` [PATCH 20/70] mxser: drop UART_MCR_AFE and UART_LSR_SPECIAL defines Jiri Slaby
2021-06-18 6:14 ` [PATCH 21/70] mxser: drop unused MOXA_DIAGNOSE macro Jiri Slaby
2021-06-18 6:14 ` [PATCH 22/70] mxser: remove MOXA_GET_MAJOR deprecated ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 23/70] mxser: remove MOXA_SET_BAUD_METHOD ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 24/70] mxser: remove MOXA_ASPP_MON and friends Jiri Slaby
2021-06-18 6:14 ` [PATCH 25/70] mxser: remove MOXA_ASPP_LSTATUS ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 26/70] mxser: remove MOXA_CHKPORTENABLE ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 27/70] mxser: remove MOXA_GETDATACOUNT ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 28/70] mxser: remove MOXA_GETMSTATUS ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 29/70] mxser: remove MOXA_ASPP_OQUEUE ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 30/70] mxser: remove MOXA_HighSpeedOn ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 31/70] mxser: remove cnt from mxser_receive_chars Jiri Slaby
2021-06-18 6:14 ` [PATCH 32/70] mxser: don't allocate MXSER_PORTS + 1 Jiri Slaby
2021-06-18 6:14 ` [PATCH 33/70] mxser: drop unused mxser_port::normal_termios Jiri Slaby
2021-06-18 6:14 ` [PATCH 34/70] mxser: remove unused mxser_port::stop_rx Jiri Slaby
2021-06-18 6:14 ` [PATCH 35/70] mxser: drop mxser_port::baud_base Jiri Slaby
2021-06-18 6:14 ` [PATCH 36/70] mxser: drop mxser_port::custom_divisor Jiri Slaby
2021-06-18 6:14 ` [PATCH 37/70] mxser: cleanup mxser_change_speed Jiri Slaby
2021-06-18 6:14 ` [PATCH 38/70] mxser: extract mxser_ioctl_op_mode Jiri Slaby
2021-06-18 6:14 ` [PATCH 39/70] mxser: simplify mxser_ioctl_op_mode Jiri Slaby
2021-06-18 6:14 ` [PATCH 40/70] mxser: dedup mxser_must_set_enhance_mode Jiri Slaby
2021-06-18 6:14 ` [PATCH 41/70] mxser: introduce mxser_must_select_bank and use it Jiri Slaby
2021-06-18 6:14 ` [PATCH 42/70] mxser: clean up the rest of MUST helpers Jiri Slaby
2021-06-18 6:14 ` [PATCH 43/70] mxser: move board init into mxser_initbrd Jiri Slaby
2021-06-18 6:14 ` [PATCH 44/70] mxser: inline mxser_board_remove into mxser_remove Jiri Slaby
2021-06-18 6:14 ` [PATCH 45/70] mxser: pci, switch to managed resources Jiri Slaby
2021-06-18 6:14 ` [PATCH 46/70] mxser: move request irq to probe and switch to managed Jiri Slaby
2021-06-18 6:14 ` [PATCH 47/70] mxser: remove info message from probe Jiri Slaby
2021-06-18 6:14 ` Jiri Slaby [this message]
2021-06-18 6:14 ` [PATCH 49/70] mxser: cleanup mxser_process_txrx_fifo Jiri Slaby
2021-06-18 6:14 ` [PATCH 50/70] mxser: rework and simplify mxser_open Jiri Slaby
2021-06-18 6:14 ` [PATCH 51/70] mxser: make mxser_board::idx really an index Jiri Slaby
2021-06-18 6:14 ` [PATCH 52/70] mxser: alloc struct mxser_board dynamically Jiri Slaby
2021-06-18 6:14 ` [PATCH 53/70] mxser: alloc only needed # of ports Jiri Slaby
2021-06-18 6:15 ` [PATCH 54/70] mxser: remove pointless ioaddr checks Jiri Slaby
2021-06-18 6:15 ` [PATCH 55/70] mxser: cleanup mxser_rs_break Jiri Slaby
2021-06-18 6:15 ` [PATCH 56/70] mxser: cleanup mxser_dtr_rts Jiri Slaby
2021-06-18 6:15 ` [PATCH 57/70] mxser: don't start TX from tty_operations::put_char Jiri Slaby
2021-06-18 6:15 ` [PATCH 58/70] mxser: extract and dedup CTS handling Jiri Slaby
2021-06-18 6:15 ` [PATCH 59/70] mxser: introduce and use start/stop_tx helpers Jiri Slaby
2021-06-18 6:15 ` [PATCH 60/70] mxser: remove xmit_cnt < 0 tests Jiri Slaby
2021-06-18 6:15 ` [PATCH 61/70] mxser: decrypt FCR values Jiri Slaby
2021-06-18 6:15 ` [PATCH 62/70] mxser: fix typos around enhanced mode Jiri Slaby
2021-06-18 6:15 ` [PATCH 63/70] mxser: access info->MCR under info->slock Jiri Slaby
2021-06-18 6:15 ` [PATCH 64/70] mxser: use port variable in mxser_set_serial_info Jiri Slaby
2021-06-18 6:15 ` [PATCH 65/70] mxser: rename flags to old_speed " Jiri Slaby
2021-06-18 6:15 ` [PATCH 66/70] mxser: introduce mxser_16550A_or_MUST helper Jiri Slaby
2021-06-18 6:15 ` [PATCH 67/70] mxser: Documentation, remove traces of callout device Jiri Slaby
2021-06-18 6:15 ` [PATCH 68/70] mxser: Documentation, make the docs up-to-date Jiri Slaby
2021-06-18 6:15 ` [PATCH 69/70] mxser: Documentation, fix typos Jiri Slaby
2021-06-18 6:15 ` [PATCH 70/70] MAINTAINERS: add me back as mxser maintainer Jiri Slaby
2021-06-18 11:10 ` [PATCH 00/69] mxser: cleanup Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210618061516.662-49-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).