Skip to content

Commit dabf127

Browse files
torvaldstorvalds
committed
Merge tag 'tty-6.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull serial driver fixes from Greg KH: "Here are two serial driver fixes for reported issues for 6.18-rc8. These are: - fix for a much reported symbol build loop that broke the build for some kernel configurations - amba-pl011 driver bugfix for a reported issue Both have been in linux next (the last for weeks, the first for a shorter amount of time), with no reported issues" * tag 'tty-6.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: serial: 8250: Fix 8250_rsa symbol loop serial: amba-pl011: prefer dma_mapping_error() over explicit address checking
2 parents 5d324e5 + 2bf95a9 commit dabf127

5 files changed

Lines changed: 22 additions & 14 deletions

File tree

‎drivers/tty/serial/8250/8250.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,13 +322,13 @@ static inline void serial8250_pnp_exit(void) { }
322322
#endif
323323

324324
#ifdef CONFIG_SERIAL_8250_RSA
325-
void univ8250_rsa_support(struct uart_ops *ops);
325+
void univ8250_rsa_support(struct uart_ops *ops, const struct uart_ops *core_ops);
326326
void rsa_enable(struct uart_8250_port *up);
327327
void rsa_disable(struct uart_8250_port *up);
328328
void rsa_autoconfig(struct uart_8250_port *up);
329329
void rsa_reset(struct uart_8250_port *up);
330330
#else
331-
static inline void univ8250_rsa_support(struct uart_ops *ops) { }
331+
static inline void univ8250_rsa_support(struct uart_ops *ops, const struct uart_ops *core_ops) { }
332332
static inline void rsa_enable(struct uart_8250_port *up) {}
333333
static inline void rsa_disable(struct uart_8250_port *up) {}
334334
static inline void rsa_autoconfig(struct uart_8250_port *up) {}

‎drivers/tty/serial/8250/8250_platform.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static void __init __serial8250_isa_init_ports(void)
7575

7676
/* chain base port ops to support Remote Supervisor Adapter */
7777
univ8250_port_ops = *univ8250_port_base_ops;
78-
univ8250_rsa_support(&univ8250_port_ops);
78+
univ8250_rsa_support(&univ8250_port_ops, univ8250_port_base_ops);
7979

8080
if (share_irqs)
8181
irqflag = IRQF_SHARED;

‎drivers/tty/serial/8250/8250_rsa.c‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
static unsigned long probe_rsa[PORT_RSA_MAX];
1515
static unsigned int probe_rsa_count;
1616

17+
static const struct uart_ops *core_port_base_ops;
18+
1719
static int rsa8250_request_resource(struct uart_8250_port *up)
1820
{
1921
struct uart_port *port = &up->port;
@@ -67,7 +69,7 @@ static void univ8250_config_port(struct uart_port *port, int flags)
6769
}
6870
}
6971

70-
univ8250_port_base_ops->config_port(port, flags);
72+
core_port_base_ops->config_port(port, flags);
7173

7274
if (port->type != PORT_RSA && up->probe & UART_PROBE_RSA)
7375
rsa8250_release_resource(up);
@@ -78,11 +80,11 @@ static int univ8250_request_port(struct uart_port *port)
7880
struct uart_8250_port *up = up_to_u8250p(port);
7981
int ret;
8082

81-
ret = univ8250_port_base_ops->request_port(port);
83+
ret = core_port_base_ops->request_port(port);
8284
if (ret == 0 && port->type == PORT_RSA) {
8385
ret = rsa8250_request_resource(up);
8486
if (ret < 0)
85-
univ8250_port_base_ops->release_port(port);
87+
core_port_base_ops->release_port(port);
8688
}
8789

8890
return ret;
@@ -94,15 +96,25 @@ static void univ8250_release_port(struct uart_port *port)
9496

9597
if (port->type == PORT_RSA)
9698
rsa8250_release_resource(up);
97-
univ8250_port_base_ops->release_port(port);
99+
core_port_base_ops->release_port(port);
98100
}
99101

100-
void univ8250_rsa_support(struct uart_ops *ops)
102+
/*
103+
* It is not allowed to directly reference any symbols from 8250.ko here as
104+
* that would result in a dependency loop between the 8250.ko and
105+
* 8250_base.ko modules. This function is called from 8250.ko and is used to
106+
* break the symbolic dependency cycle. Anything that is needed from 8250.ko
107+
* has to be passed as pointers to this function which then can adjust those
108+
* variables on 8250.ko side or store them locally as needed.
109+
*/
110+
void univ8250_rsa_support(struct uart_ops *ops, const struct uart_ops *core_ops)
101111
{
112+
core_port_base_ops = core_ops;
102113
ops->config_port = univ8250_config_port;
103114
ops->request_port = univ8250_request_port;
104115
ops->release_port = univ8250_release_port;
105116
}
117+
EXPORT_SYMBOL_FOR_MODULES(univ8250_rsa_support, "8250");
106118

107119
module_param_hw_array(probe_rsa, ulong, ioport, &probe_rsa_count, 0444);
108120
MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA");
@@ -146,7 +158,6 @@ void rsa_enable(struct uart_8250_port *up)
146158
if (up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16)
147159
serial_out(up, UART_RSA_FRR, 0);
148160
}
149-
EXPORT_SYMBOL_FOR_MODULES(rsa_enable, "8250_base");
150161

151162
/*
152163
* Attempts to turn off the RSA FIFO and resets the RSA board back to 115kbps compat mode. It is
@@ -178,7 +189,6 @@ void rsa_disable(struct uart_8250_port *up)
178189
if (result)
179190
up->port.uartclk = SERIAL_RSA_BAUD_BASE_LO * 16;
180191
}
181-
EXPORT_SYMBOL_FOR_MODULES(rsa_disable, "8250_base");
182192

183193
void rsa_autoconfig(struct uart_8250_port *up)
184194
{
@@ -191,7 +201,6 @@ void rsa_autoconfig(struct uart_8250_port *up)
191201
if (__rsa_enable(up))
192202
up->port.type = PORT_RSA;
193203
}
194-
EXPORT_SYMBOL_FOR_MODULES(rsa_autoconfig, "8250_base");
195204

196205
void rsa_reset(struct uart_8250_port *up)
197206
{
@@ -200,7 +209,6 @@ void rsa_reset(struct uart_8250_port *up)
200209

201210
serial_out(up, UART_RSA_FRR, 0);
202211
}
203-
EXPORT_SYMBOL_FOR_MODULES(rsa_reset, "8250_base");
204212

205213
#ifdef CONFIG_SERIAL_8250_DEPRECATED_OPTIONS
206214
#ifndef MODULE

‎drivers/tty/serial/8250/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ obj-$(CONFIG_SERIAL_8250) += 8250.o
77
8250-y := 8250_core.o
88
8250-y += 8250_platform.o
99
8250-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o
10-
8250-$(CONFIG_SERIAL_8250_RSA) += 8250_rsa.o
1110

1211
obj-$(CONFIG_SERIAL_8250) += 8250_base.o
1312
8250_base-y := 8250_port.o
1413
8250_base-$(CONFIG_SERIAL_8250_DMA) += 8250_dma.o
1514
8250_base-$(CONFIG_SERIAL_8250_DWLIB) += 8250_dwlib.o
1615
8250_base-$(CONFIG_SERIAL_8250_FINTEK) += 8250_fintek.o
1716
8250_base-$(CONFIG_SERIAL_8250_PCILIB) += 8250_pcilib.o
17+
8250_base-$(CONFIG_SERIAL_8250_RSA) += 8250_rsa.o
1818

1919
obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o
2020

‎drivers/tty/serial/amba-pl011.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ static int pl011_dma_tx_refill(struct uart_amba_port *uap)
628628
dmatx->len = count;
629629
dmatx->dma = dma_map_single(dma_dev->dev, dmatx->buf, count,
630630
DMA_TO_DEVICE);
631-
if (dmatx->dma == DMA_MAPPING_ERROR) {
631+
if (dma_mapping_error(dma_dev->dev, dmatx->dma)) {
632632
uap->dmatx.queued = false;
633633
dev_dbg(uap->port.dev, "unable to map TX DMA\n");
634634
return -EBUSY;

0 commit comments

Comments
 (0)