* Re: [PATCH V3] ASoC: fsl_esai: Add pm runtime function
From: Mark Brown @ 2019-04-27 17:17 UTC (permalink / raw)
To: S.j. Wang
Cc: alsa-devel@alsa-project.org, timur@kernel.org,
Xiubo.Lee@gmail.com, festevam@gmail.com,
linux-kernel@vger.kernel.org, nicoleotsuka@gmail.com,
linuxppc-dev@lists.ozlabs.org
In-Reply-To: <VE1PR04MB64797233B0BFE833550094C3E33E0@VE1PR04MB6479.eurprd04.prod.outlook.com>
[-- Attachment #1: Type: text/plain, Size: 721 bytes --]
On Fri, Apr 26, 2019 at 10:51:15AM +0000, S.j. Wang wrote:
> > On Mon, Apr 22, 2019 at 02:31:55AM +0000, S.j. Wang wrote:
> > > Add pm runtime support and move clock handling there.
> > > Close the clocks at suspend to reduce the power consumption.
> > > fsl_esai_suspend is replaced by pm_runtime_force_suspend.
> > > fsl_esai_resume is replaced by pm_runtime_force_resume.
> > This doesn't apply against current code, please check and resend.
> Which branch are you using? I tried for-next and for-linus, both
> Are successful applied.
I'm applying against for-5.2, though if it depends on a patch queued for
5.1 that's fine, I can just merge that up - please just resend. I think
I did try merging 5.1 though...
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* Re: [PATCH v2 9/9] dpaa_eth: fix SG frame cleanup
From: Joakim Tjernlund @ 2019-04-27 17:10 UTC (permalink / raw)
To: netdev@vger.kernel.org, madalin.bucur@nxp.com, leoyang.li@nxp.com,
laurentiu.tudor@nxp.com, roy.pledge@nxp.com,
camelia.groza@nxp.com
Cc: iommu@lists.linux-foundation.org, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, davem@davemloft.net
In-Reply-To: <20190427071031.6563-10-laurentiu.tudor@nxp.com>
On Sat, 2019-04-27 at 10:10 +0300, laurentiu.tudor@nxp.com wrote:
> From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
>
> Fix issue with the entry indexing in the sg frame cleanup code being
> off-by-1. This problem showed up when doing some basic iperf tests and
> manifested in traffic coming to a halt.
>
> Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
> Acked-by: Madalin Bucur <madalin.bucur@nxp.com>
Wasn't this a stable candidate too?
> ---
> drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> index daede7272768..40420edc9ce6 100644
> --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> @@ -1663,7 +1663,7 @@ static struct sk_buff *dpaa_cleanup_tx_fd(const struct dpaa_priv *priv,
> qm_sg_entry_get_len(&sgt[0]), dma_dir);
>
> /* remaining pages were mapped with skb_frag_dma_map() */
> - for (i = 1; i < nr_frags; i++) {
> + for (i = 1; i <= nr_frags; i++) {
> WARN_ON(qm_sg_entry_is_ext(&sgt[i]));
>
> dma_unmap_page(dev, qm_sg_addr(&sgt[i]),
> --
> 2.17.1
>
^ permalink raw reply
* Re: [PATCH 2/4] dt-bindings: doc: Reflect new NVMEM of_get_mac_address behaviour
From: Florian Fainelli @ 2019-04-27 16:56 UTC (permalink / raw)
To: Petr Štetiar, netdev, devicetree, linux-kernel,
David S. Miller, Rob Herring, Mark Rutland, Andrew Lunn,
Vivien Didelot, Heiko Stuebner, Fugang Duan, Claudiu Manoil,
Yisen Zhuang, Salil Mehta, Woojung Huh,
Microchip Linux Driver Support, Neil Armstrong, Kunihiko Hayashi,
Masahiro Yamada, Jassi Brar, Maxime Coquelin, Alexandre Torgue,
Kalle Valo, Matthias Brugger, Li Yang
Cc: Maxime Ripard, linuxppc-dev, linux-wireless, linux-rockchip,
linux-mediatek, Srinivas Kandagatla, Alban Bedel, linux-oxnas,
Frank Rowand, linux-stm32, linux-arm-kernel, Heiner Kallweit
In-Reply-To: <1556320002-26213-3-git-send-email-ynezz@true.cz>
On 4/26/2019 4:06 PM, Petr Štetiar wrote:
> As of_get_mac_address now supports NVMEM under the hood, we should
> update the bindings documentation with the new nvmem-cell* properties.
> While at it, fix also other missing properties supported by
> of_get_mac_address.
>
> Signed-off-by: Petr Štetiar <ynezz@true.cz>
While I appreciate your effort in making the bindings up to date and
consistent, this does really scale well and is an error prone exercise,
how about consolidating all MAC address related properties into the
ethernet.txt document like you just did and update all bindings to
indicate something along the lines of:
For all other standard Ethernet related properties, please refer to
ethernet.txt or something like that?
--
Florian
^ permalink raw reply
* Re: [PATCH 2/4] dt-bindings: doc: Reflect new NVMEM of_get_mac_address behaviour
From: Andrew Lunn @ 2019-04-27 16:31 UTC (permalink / raw)
To: Petr Štetiar
Cc: Mark Rutland, Heiko Stuebner, Kunihiko Hayashi, Neil Armstrong,
Maxime Ripard, Masahiro Yamada, Srinivas Kandagatla, Li Yang,
Frank Rowand, linux-stm32, Florian Fainelli, linux-rockchip,
linux-arm-kernel, Yisen Zhuang, Vivien Didelot, Woojung Huh,
devicetree, Alexandre Torgue, Jassi Brar, Claudiu Manoil,
Rob Herring, linux-mediatek, Matthias Brugger, Kalle Valo,
Salil Mehta, Fugang Duan, netdev, linux-wireless, linux-kernel,
Microchip Linux Driver Support, Maxime Coquelin, Alban Bedel,
linux-oxnas, linuxppc-dev, David S. Miller, Heiner Kallweit
In-Reply-To: <1556320002-26213-3-git-send-email-ynezz@true.cz>
> diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt
> index 2974e63..1e2bc9a 100644
> --- a/Documentation/devicetree/bindings/net/ethernet.txt
> +++ b/Documentation/devicetree/bindings/net/ethernet.txt
> @@ -10,6 +10,8 @@ Documentation/devicetree/bindings/phy/phy-bindings.txt.
> the boot program; should be used in cases where the MAC address assigned to
> the device by the boot program is different from the "local-mac-address"
> property;
> +- nvmem-cells: phandle, reference to an nvmem node for the MAC address
> +- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used
You put the new values after local-mac-address and mac-address. That
suggests they are of lower priority. That conflicts with the current
patch. If you think NVMEM should take priority, please put the
properties first.
Andrew
^ permalink raw reply
* Re: [PATCH v2 7/9] dpaa_eth: fix iova handling for contiguous frames
From: Christoph Hellwig @ 2019-04-27 16:46 UTC (permalink / raw)
To: laurentiu.tudor
Cc: madalin.bucur, netdev, roy.pledge, linux-kernel, leoyang.li,
iommu, camelia.groza, linuxppc-dev, davem, linux-arm-kernel
In-Reply-To: <20190427071031.6563-8-laurentiu.tudor@nxp.com>
On Sat, Apr 27, 2019 at 10:10:29AM +0300, laurentiu.tudor@nxp.com wrote:
> From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
>
> The driver relies on the no longer valid assumption that dma addresses
> (iovas) are identical to physical addressees and uses phys_to_virt() to
> make iova -> vaddr conversions. Fix this by adding a function that does
> proper iova -> phys conversions using the iommu api and update the code
> to use it.
> Also, a dma_unmap_single() call had to be moved further down the code
> because iova -> vaddr conversions were required before the unmap.
> For now only the contiguous frame case is handled and the SG case is
> split in a following patch.
> While at it, clean-up a redundant dpaa_bpid2pool() and pass the bp
> as parameter.
Err, this is broken. A driver using the DMA API has no business
call IOMMU APIs. Just save the _virtual_ address used for the mapping
away and use that again. We should not go through crazy gymnastics
like this.
^ permalink raw reply
* Re: [PATCH 2/4] dt-bindings: doc: Reflect new NVMEM of_get_mac_address behaviour
From: Andrew Lunn @ 2019-04-27 16:39 UTC (permalink / raw)
To: Petr Štetiar
Cc: Mark Rutland, Heiko Stuebner, Kunihiko Hayashi, Neil Armstrong,
Maxime Ripard, Masahiro Yamada, Srinivas Kandagatla, Li Yang,
Frank Rowand, linux-stm32, Florian Fainelli, linux-rockchip,
linux-arm-kernel, Yisen Zhuang, Vivien Didelot, Woojung Huh,
devicetree, Alexandre Torgue, Jassi Brar, Claudiu Manoil,
Rob Herring, linux-mediatek, Matthias Brugger, Kalle Valo,
Salil Mehta, Fugang Duan, netdev, linux-wireless, linux-kernel,
Microchip Linux Driver Support, Maxime Coquelin, Alban Bedel,
linux-oxnas, linuxppc-dev, David S. Miller, Heiner Kallweit
In-Reply-To: <1556320002-26213-3-git-send-email-ynezz@true.cz>
> diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
> index 8b80515..92c5642 100644
> --- a/Documentation/devicetree/bindings/net/macb.txt
> +++ b/Documentation/devicetree/bindings/net/macb.txt
> @@ -26,15 +26,15 @@ Required properties:
> Optional elements: 'tsu_clk'
> - clocks: Phandles to input clocks.
>
> -Optional properties:
> -- nvmem-cells: phandle, reference to an nvmem node for the MAC address
> -- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used
> -
> Optional properties for PHY child node:
> - reset-gpios : Should specify the gpio for phy reset
> - magic-packet : If present, indicates that the hardware supports waking
> up via magic packet.
> - phy-handle : see ethernet.txt file in the same directory
> +- mac-address: See ethernet.txt in the same directory.
> +- local-mac-address: See ethernet.txt in the same directory.
> +- nvmem-cells: See ethernet.txt in the same directory.
> +- nvmem-cell-names: See ethernet.txt in the same directory.
This looks wrong. The MAC address is not a PHY property, so should not
be inside the PHY child node.
phy-handle is in the wrong place, but that is a separate problem.
Andrew
^ permalink raw reply
* Re: [PATCH v2 3/9] fsl/fman: backup and restore ICID registers
From: David Miller @ 2019-04-27 16:18 UTC (permalink / raw)
To: laurentiu.tudor
Cc: madalin.bucur, netdev, roy.pledge, linux-kernel, leoyang.li,
iommu, camelia.groza, linuxppc-dev, linux-arm-kernel
In-Reply-To: <20190427071031.6563-4-laurentiu.tudor@nxp.com>
From: laurentiu.tudor@nxp.com
Date: Sat, 27 Apr 2019 10:10:25 +0300
> @@ -1914,7 +1936,10 @@ static int fman_reset(struct fman *fman)
> static int fman_init(struct fman *fman)
> {
> struct fman_cfg *cfg = NULL;
> - int err = 0, i, count;
> + int err = 0, count;
> +#ifdef CONFIG_PPC
> + int i;
> +#endif
>
> if (is_init_done(fman->cfg))
> return -EINVAL;
> @@ -1934,6 +1959,7 @@ static int fman_init(struct fman *fman)
> memset_io((void __iomem *)(fman->base_addr + CGP_OFFSET), 0,
> fman->state->fm_port_num_of_cg);
>
> +#ifdef CONFIG_PPC
> /* Save LIODN info before FMan reset
> * Skipping non-existent port 0 (i = 1)
> */
Sorry, I'm not OK with littering a networking driver with arch ifdefs
all over the place.
Please create a proper abstraction and set of interfaces.
Thank you.
^ permalink raw reply
* Re: [PATCH 10/41] drivers: tty: serial: sb1250-duart: fix missing parentheses
From: Greg KH @ 2019-04-27 13:32 UTC (permalink / raw)
To: Enrico Weigelt, metux IT consult
Cc: linux-ia64, lorenzo.pieralisi, linux-mips, linux-serial, andrew,
khilman, sudeep.holla, liviu.dudau, linux-kernel, vz, linux,
sparclinux, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-11-git-send-email-info@metux.net>
On Sat, Apr 27, 2019 at 02:51:51PM +0200, Enrico Weigelt, metux IT consult wrote:
> Fix checkpatch warning:
>
> ERROR: Macros with complex values should be enclosed in parentheses
> #911: FILE: drivers/tty/serial/sb1250-duart.c:911:
> +#define SERIAL_SB1250_DUART_CONSOLE &sbd_console
>
> Signed-off-by: Enrico Weigelt <info@metux.net>
> ---
> drivers/tty/serial/sb1250-duart.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c
> index 1184226..ec74f09 100644
> --- a/drivers/tty/serial/sb1250-duart.c
> +++ b/drivers/tty/serial/sb1250-duart.c
> @@ -908,7 +908,7 @@ static int __init sbd_serial_console_init(void)
>
> console_initcall(sbd_serial_console_init);
>
> -#define SERIAL_SB1250_DUART_CONSOLE &sbd_console
> +#define SERIAL_SB1250_DUART_CONSOLE (&sbd_console)
No, that's foolish.
checkpatch is a hint, it's not always right.
Also, checkpatch cleanups for really old drivers is not generally a good
idea, especially if you do not have the hardware for them. Please don't
cause unneeded churn for this type of thing in this subsystem, unless
you have the hardware.
thanks,
greg k-h
^ permalink raw reply
* Re: [PATCH 01/41] drivers: tty: serial: dz: use dev_err() instead of printk()
From: Greg KH @ 2019-04-27 13:31 UTC (permalink / raw)
To: Enrico Weigelt, metux IT consult
Cc: linux-ia64, lorenzo.pieralisi, linux-mips, linux-serial, andrew,
khilman, sudeep.holla, liviu.dudau, linux-kernel, vz, linux,
sparclinux, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-2-git-send-email-info@metux.net>
On Sat, Apr 27, 2019 at 02:51:42PM +0200, Enrico Weigelt, metux IT consult wrote:
> Using dev_err() instead of printk() for more consistent output.
> (prints device name, etc).
>
> Signed-off-by: Enrico Weigelt <info@metux.net>
> ---
> drivers/tty/serial/dz.c | 8 ++++----
Do you have this hardware to test any of these changes with?
thanks,
greg k-h
^ permalink raw reply
* Re: [PATCH 05/41] drivers: tty: serial: dz: use pr_info() instead of incomplete printk()
From: Greg KH @ 2019-04-27 13:30 UTC (permalink / raw)
To: Enrico Weigelt, metux IT consult
Cc: linux-ia64, lorenzo.pieralisi, linux-mips, linux-serial, andrew,
khilman, sudeep.holla, liviu.dudau, linux-kernel, vz, linux,
sparclinux, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-6-git-send-email-info@metux.net>
On Sat, Apr 27, 2019 at 02:51:46PM +0200, Enrico Weigelt, metux IT consult wrote:
> Fix the checkpatch warning:
>
> WARNING: printk() should include KERN_<LEVEL> facility level
> #934: FILE: dz.c:934:
> + printk("%s%s\n", dz_name, dz_version);
>
> Signed-off-by: Enrico Weigelt <info@metux.net>
> ---
> drivers/tty/serial/dz.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c
> index 559d076..e2670c4 100644
> --- a/drivers/tty/serial/dz.c
> +++ b/drivers/tty/serial/dz.c
> @@ -931,7 +931,7 @@ static int __init dz_init(void)
> if (IOASIC)
> return -ENXIO;
>
> - printk("%s%s\n", dz_name, dz_version);
> + pr_info("%s%s\n", dz_name, dz_version);
Just drop this line, it's not needed and generally just noise.
thanks,
greg k-h
^ permalink raw reply
* Re: [PATCH 01/41] drivers: tty: serial: dz: use dev_err() instead of printk()
From: Greg KH @ 2019-04-27 13:29 UTC (permalink / raw)
To: Enrico Weigelt, metux IT consult
Cc: linux-ia64, lorenzo.pieralisi, linux-mips, linux-serial, andrew,
khilman, sudeep.holla, liviu.dudau, linux-kernel, vz, linux,
sparclinux, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-2-git-send-email-info@metux.net>
On Sat, Apr 27, 2019 at 02:51:42PM +0200, Enrico Weigelt, metux IT consult wrote:
> Using dev_err() instead of printk() for more consistent output.
> (prints device name, etc).
>
> Signed-off-by: Enrico Weigelt <info@metux.net>
Your "From:" line does not match the signed-off-by line, so I can't take
any of these if I wanted to :(
Please fix up.
thanks,
greg k-h
^ permalink raw reply
* Re: [PATCH 37/41] drivers: tty: serial: 8250: simplify io resource size computation
From: John Paul Adrian Glaubitz @ 2019-04-27 13:03 UTC (permalink / raw)
To: Enrico Weigelt, metux IT consult, linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-38-git-send-email-info@metux.net>
On 4/27/19 2:52 PM, Enrico Weigelt, metux IT consult wrote:
> Simpily io resource size computation by setting mapsize field.
^^^^
Here's a typo
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaubitz@debian.org
`. `' Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
^ permalink raw reply
* [PATCH 40/41] drivers: tty: serial: helper for setting mmio range
From: Enrico Weigelt, metux IT consult @ 2019-04-27 12:52 UTC (permalink / raw)
To: linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-1-git-send-email-info@metux.net>
Introduce a little helpers for settings the mmio range from an
struct resource or start/len parameters with less code.
(also setting iotype to UPIO_MEM)
Also converting drivers to use these new helpers as well as
fetching mapsize field instead of using hardcoded values.
(the runtime overhead of that should be negligible)
The idea is moving to a consistent scheme, so later common
calls like request+ioremap combination can be done by generic
helpers.
Signed-off-by: Enrico Weigelt <info@metux.net>
---
drivers/tty/serial/8250/8250_acorn.c | 5 ++--
drivers/tty/serial/8250/8250_aspeed_vuart.c | 4 +--
drivers/tty/serial/8250/8250_dw.c | 3 +--
drivers/tty/serial/8250/8250_em.c | 2 +-
drivers/tty/serial/8250/8250_exar.c | 6 +++--
drivers/tty/serial/8250/8250_hp300.c | 11 +++++---
drivers/tty/serial/8250/8250_of.c | 9 ++-----
drivers/tty/serial/meson_uart.c | 5 ++--
drivers/tty/serial/mps2-uart.c | 5 ++--
drivers/tty/serial/pmac_zilog.c | 8 ++----
drivers/tty/serial/vt8500_serial.c | 4 +--
drivers/tty/serial/xilinx_uartps.c | 3 +--
drivers/tty/serial/zs.c | 10 +++++---
include/linux/serial_core.h | 40 +++++++++++++++++++++++++++++
14 files changed, 76 insertions(+), 39 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c
index 758c4aa..359171b 100644
--- a/drivers/tty/serial/8250/8250_acorn.c
+++ b/drivers/tty/serial/8250/8250_acorn.c
@@ -63,14 +63,15 @@ struct serial_card_info {
uart.port.irq = ec->irq;
uart.port.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
uart.port.uartclk = type->uartclk;
- uart.port.iotype = UPIO_MEM;
uart.port.regshift = 2;
uart.port.dev = &ec->dev;
for (i = 0; i < info->num_ports; i++) {
uart.port.membase = info->vaddr + type->offset[i];
- uart.port.mapbase = bus_addr + type->offset[i];
+ /* mapsize is computed by serial8250_register_8250_port() */
+ uart_memres_set_start_len(&uart.port,
+ bus_addr + type->offset[i], 0);
info->ports[i] = serial8250_register_8250_port(&uart);
}
diff --git a/drivers/tty/serial/8250/8250_aspeed_vuart.c b/drivers/tty/serial/8250/8250_aspeed_vuart.c
index 0438d9a..0e06391 100644
--- a/drivers/tty/serial/8250/8250_aspeed_vuart.c
+++ b/drivers/tty/serial/8250/8250_aspeed_vuart.c
@@ -328,8 +328,6 @@ static int aspeed_vuart_probe(struct platform_device *pdev)
memset(&port, 0, sizeof(port));
port.port.private_data = vuart;
port.port.membase = vuart->regs;
- port.port.mapbase = res->start;
- port.port.mapsize = resource_size(res);
port.port.startup = aspeed_vuart_startup;
port.port.shutdown = aspeed_vuart_shutdown;
port.port.throttle = aspeed_vuart_throttle;
@@ -337,6 +335,8 @@ static int aspeed_vuart_probe(struct platform_device *pdev)
port.port.status = UPSTAT_SYNC_FIFO;
port.port.dev = &pdev->dev;
+ uart_memres_set_res(&port.port, res);
+
rc = sysfs_create_group(&vuart->dev->kobj, &aspeed_vuart_attr_group);
if (rc < 0)
return rc;
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index d31b975..cb65256 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -513,18 +513,17 @@ static int dw8250_probe(struct platform_device *pdev)
}
spin_lock_init(&p->lock);
- p->mapbase = regs->start;
p->irq = irq;
p->handle_irq = dw8250_handle_irq;
p->pm = dw8250_do_pm;
p->type = PORT_8250;
p->flags = UPF_SHARE_IRQ | UPF_FIXED_PORT;
p->dev = dev;
- p->iotype = UPIO_MEM;
p->serial_in = dw8250_serial_in;
p->serial_out = dw8250_serial_out;
p->set_ldisc = dw8250_set_ldisc;
p->set_termios = dw8250_set_termios;
+ uart_memres_set_res(p, regs);
p->membase = devm_ioremap(dev, regs->start, resource_size(regs));
if (!p->membase)
diff --git a/drivers/tty/serial/8250/8250_em.c b/drivers/tty/serial/8250/8250_em.c
index 2a76e22..7610441 100644
--- a/drivers/tty/serial/8250/8250_em.c
+++ b/drivers/tty/serial/8250/8250_em.c
@@ -100,12 +100,12 @@ static int serial8250_em_probe(struct platform_device *pdev)
}
memset(&up, 0, sizeof(up));
- up.port.mapbase = regs->start;
up.port.irq = irq->start;
up.port.type = PORT_UNKNOWN;
up.port.flags = UPF_BOOT_AUTOCONF | UPF_FIXED_PORT | UPF_IOREMAP;
up.port.dev = &pdev->dev;
up.port.private_data = priv;
+ uart_memres_set_res(&up.port, res);
clk_prepare_enable(priv->sclk);
up.port.uartclk = clk_get_rate(priv->sclk);
diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
index 0089aa3..f4c1289 100644
--- a/drivers/tty/serial/8250/8250_exar.c
+++ b/drivers/tty/serial/8250/8250_exar.c
@@ -134,8 +134,10 @@ static int default_setup(struct exar8250 *priv, struct pci_dev *pcidev,
const struct exar8250_board *board = priv->board;
unsigned int bar = 0;
- port->port.iotype = UPIO_MEM;
- port->port.mapbase = pci_resource_start(pcidev, bar) + offset;
+ uart_memres_set_start_len(&port->port,
+ pci_resource_start(pcidev, bar) + offset,
+ pci_resource_len(pcidev, bar));
+
port->port.membase = priv->virt + offset;
port->port.regshift = board->reg_shift;
diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c
index 3012ea0..09f9dd3 100644
--- a/drivers/tty/serial/8250/8250_hp300.c
+++ b/drivers/tty/serial/8250/8250_hp300.c
@@ -114,7 +114,9 @@ int __init hp300_setup_serial_console(void)
pr_info("Serial console is HP APCI 1\n");
port.uartclk = HPAPCI_BAUD_BASE * 16;
- port.mapbase = (FRODO_BASE + FRODO_APCI_OFFSET(1));
+ uart_memres_set_start_len(
+ &port,
+ FRODO_BASE + FRODO_APCI_OFFSET(1), 0);
port.membase = (char *)(port.mapbase + DIO_VIRADDRBASE);
port.regshift = 2;
add_preferred_console("ttyS", port.line, "9600n8");
@@ -131,7 +133,8 @@ int __init hp300_setup_serial_console(void)
pr_info("Serial console is HP DCA at select code %d\n", scode);
port.uartclk = HPDCA_BAUD_BASE * 16;
- port.mapbase = (pa + UART_OFFSET);
+
+ uart_memres_set_start_len(&port, (pa + UART_OFFSET));
port.membase = (char *)(port.mapbase + DIO_VIRADDRBASE);
port.regshift = 1;
port.irq = DIO_IPL(pa + DIO_VIRADDRBASE);
@@ -173,7 +176,9 @@ static int hpdca_init_one(struct dio_dev *d,
uart.port.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF;
uart.port.irq = d->ipl;
uart.port.uartclk = HPDCA_BAUD_BASE * 16;
- uart.port.mapbase = (d->resource.start + UART_OFFSET);
+ uart_memres_set_start_len(&uart.port,
+ (d->resource.start + UART_OFFSET),
+ resource_size(&d->resource));
uart.port.membase = (char *)(uart.port.mapbase + DIO_VIRADDRBASE);
uart.port.regshift = 1;
uart.port.dev = &d->dev;
diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c
index 08157a1..1c5896c 100644
--- a/drivers/tty/serial/8250/8250_of.c
+++ b/drivers/tty/serial/8250/8250_of.c
@@ -96,18 +96,13 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
UPF_FIXED_TYPE;
spin_lock_init(&port->lock);
- if (resource_type(&resource) == IORESOURCE_IO) {
- port->iotype = UPIO_PORT;
- port->iobase = resource.start;
- } else {
- port->mapbase = resource.start;
- port->mapsize = resource_size(&resource);
+ uart_memres_set_res(port, &resource);
+ if (resource_type(&resource) == IORESOURCE_MEM) {
/* Check for shifted address mapping */
if (of_property_read_u32(np, "reg-offset", &prop) == 0)
port->mapbase += prop;
- port->iotype = UPIO_MEM;
if (of_property_read_u32(np, "reg-io-width", &prop) == 0) {
switch (prop) {
case 1:
diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
index fbc5bc0..bfcaa2f 100644
--- a/drivers/tty/serial/meson_uart.c
+++ b/drivers/tty/serial/meson_uart.c
@@ -698,9 +698,8 @@ static int meson_uart_probe(struct platform_device *pdev)
if (ret)
return ret;
- port->iotype = UPIO_MEM;
- port->mapbase = res_mem->start;
- port->mapsize = resource_size(res_mem);
+ uart_memset_set_res(port, res_mem);
+
port->irq = res_irq->start;
port->flags = UPF_BOOT_AUTOCONF | UPF_LOW_LATENCY;
port->dev = &pdev->dev;
diff --git a/drivers/tty/serial/mps2-uart.c b/drivers/tty/serial/mps2-uart.c
index 587b42f..a4fd1de 100644
--- a/drivers/tty/serial/mps2-uart.c
+++ b/drivers/tty/serial/mps2-uart.c
@@ -562,9 +562,8 @@ static int mps2_init_port(struct platform_device *pdev,
if (IS_ERR(mps_port->port.membase))
return PTR_ERR(mps_port->port.membase);
- mps_port->port.mapbase = res->start;
- mps_port->port.mapsize = resource_size(res);
- mps_port->port.iotype = UPIO_MEM;
+ uart_memres_set_res(&mps_port->port, res);
+
mps_port->port.flags = UPF_BOOT_AUTOCONF;
mps_port->port.fifosize = 1;
mps_port->port.ops = &mps2_uart_pops;
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 1fef014..7017dd2 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1412,8 +1412,7 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)
*/
if (of_address_to_resource(np, 0, &r_ports))
return -ENODEV;
- uap->port.mapbase = r_ports.start;
- uap->port.mapsize = PMZ_MAPSIZE;
+ uart_memres_set_start_len(&uap->port, r_ports.start, PMZ_MAPSIZE);
uap->port.membase = ioremap(uap->port.mapbase, uap->port.mapsize);
uap->control_reg = uap->port.membase;
@@ -1493,7 +1492,6 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)
/*
* Init remaining bits of "port" structure
*/
- uap->port.iotype = UPIO_MEM;
uap->port.irq = irq_of_parse_and_map(np, 0);
uap->port.uartclk = ZS_CLOCK;
uap->port.fifosize = 1;
@@ -1711,10 +1709,8 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)
if (!r_ports || irq <= 0)
return -ENODEV;
- uap->port.mapbase = r_ports->start;
- uap->port.mapsize = PMZ_MAPSIZE;
+ uart_memres_set_start_len(&uap->port, r_ports->start, PMZ_MAPSIZE);
uap->port.membase = (unsigned char __iomem *) r_ports->start;
- uap->port.iotype = UPIO_MEM;
uap->port.irq = irq;
uap->port.uartclk = ZS_CLOCK;
uap->port.fifosize = 1;
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 3d58e9b..b303de4 100644
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -695,8 +695,6 @@ static int vt8500_serial_probe(struct platform_device *pdev)
VT8500_RECOMMENDED_CLK
);
vt8500_port->uart.type = PORT_VT8500;
- vt8500_port->uart.iotype = UPIO_MEM;
- vt8500_port->uart.mapbase = mmres->start;
vt8500_port->uart.irq = irqres->start;
vt8500_port->uart.fifosize = 16;
vt8500_port->uart.ops = &vt8500_uart_pops;
@@ -704,6 +702,8 @@ static int vt8500_serial_probe(struct platform_device *pdev)
vt8500_port->uart.dev = &pdev->dev;
vt8500_port->uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;
+ uart_memres_set_res(&vt8500_port->uart, mmres);
+
/* Serial core uses the magic "16" everywhere - adjust for it */
vt8500_port->uart.uartclk = 16 * clk_get_rate(vt8500_port->clk) /
vt8500_port->clk_predivisor /
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index cf8ca66..895c90c 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -1626,8 +1626,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
* This function also registers this device with the tty layer
* and triggers invocation of the config_port() entry point.
*/
- port->mapbase = res->start;
- port->mapsize = CDNS_UART_REGISTER_SPACE;
+ uart_memres_set_start_len(res->start, CDNS_UART_REGISTER_SPACE);
port->irq = irq;
port->dev = &pdev->dev;
port->uartclk = clk_get_rate(cdns_uart_data->uartclk);
diff --git a/drivers/tty/serial/zs.c b/drivers/tty/serial/zs.c
index ab432ba..87990b1 100644
--- a/drivers/tty/serial/zs.c
+++ b/drivers/tty/serial/zs.c
@@ -1113,10 +1113,12 @@ static int __init zs_probe_sccs(void)
uport->flags = UPF_BOOT_AUTOCONF;
uport->ops = &zs_ops;
uport->line = chip * ZS_NUM_CHAN + side;
- uport->mapsize = ZS_CHAN_IO_SIZE;
- uport->mapbase = dec_kn_slot_base +
- zs_parms.scc[chip] +
- (side ^ ZS_CHAN_B) * ZS_CHAN_IO_SIZE;
+
+ uart_memres_set_start_len(dec_kn_slot_base +
+ zs_parms.scc[chip] +
+ (side ^ ZS_CHAN_B) *
+ ZS_CHAN_IO_SIZE,
+ ZS_CHAN_IO_SIZE);
for (i = 0; i < ZS_NUM_REGS; i++)
zport->regs[i] = zs_init_regs[i];
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 5fe2b03..d891c8d 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -427,6 +427,46 @@ void uart_console_write(struct uart_port *port, const char *s,
int uart_match_port(struct uart_port *port1, struct uart_port *port2);
/*
+ * set physical io range from struct resource
+ * if resource is NULL, clear the fields
+ * also set the iotype to UPIO_MEM
+ */
+static inline void uart_memres_set_res(struct uart_port *port,
+ struct resource *res)
+{
+ if (!res) {
+ port->mapsize = 0;
+ port->mapbase = 0;
+ port->iobase = 0;
+ return;
+ }
+
+ if (resource_type(res) == IORESOURCE_IO) {
+ port->iotype = UPIO_PORT;
+ port->iobase = resource->start;
+ return;
+ }
+
+ uart->mapbase = res->start;
+ uart->mapsize = resource_size(res);
+ uart->iotype = UPIO_MEM;
+}
+
+/*
+ * set physical io range by start address and length
+ * if resource is NULL, clear the fields
+ * also set the iotype to UPIO_MEM
+ */
+static inline void uart_memres_set_start_len(struct uart_driver *uart,
+ resource_size_t start,
+ resource_size_t len)
+{
+ uart->mapbase = start;
+ uart->mapsize = len;
+ uart->iotype = UPIO_MEM;
+}
+
+/*
* Power Management
*/
int uart_suspend_port(struct uart_driver *reg, struct uart_port *port);
--
1.9.1
^ permalink raw reply related
* [PATCH 24/41] drivers: tty: serial: timbuart: use dev_err() instead of printk()
From: Enrico Weigelt, metux IT consult @ 2019-04-27 12:52 UTC (permalink / raw)
To: linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-1-git-send-email-info@metux.net>
Using dev_err() instead of printk() for more consistent output.
(prints device name, etc).
Signed-off-by: Enrico Weigelt <info@metux.net>
---
drivers/tty/serial/timbuart.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/tty/serial/timbuart.c b/drivers/tty/serial/timbuart.c
index 19d38b5..dcce936 100644
--- a/drivers/tty/serial/timbuart.c
+++ b/drivers/tty/serial/timbuart.c
@@ -470,8 +470,7 @@ static int timbuart_probe(struct platform_device *dev)
err_register:
kfree(uart);
err_mem:
- printk(KERN_ERR "timberdale: Failed to register Timberdale UART: %d\n",
- err);
+ dev_err(&dev->dev, "Failed to register Timberdale UART: %d\n", err);
return err;
}
--
1.9.1
^ permalink raw reply related
* [PATCH 27/41] drivers: tty: serial: sunzilog: fix formatting issues
From: Enrico Weigelt, metux IT consult @ 2019-04-27 12:52 UTC (permalink / raw)
To: linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-1-git-send-email-info@metux.net>
Fix checkpatch warnings:
WARNING: Use #include <linux/io.h> instead of <asm/io.h>
#38: FILE: drivers/tty/serial/sunzilog.c:38:
+#include <asm/io.h>
WARNING: line over 80 characters
#109: FILE: drivers/tty/serial/sunzilog.c:109:
+#define ZILOG_CHANNEL_FROM_PORT(PORT) ((struct zilog_channel __iomem *)((PORT)->membase))
WARNING: line over 80 characters
#116: FILE: drivers/tty/serial/sunzilog.c:116:
+#define ZS_WANTS_MODEM_STATUS(UP) ((UP)->flags & SUNZILOG_FLAG_MODEM_STATUS)
WARNING: line over 80 characters
#179: FILE: drivers/tty/serial/sunzilog.c:179:
+static int __load_zsregs(struct zilog_channel __iomem *channel, unsigned char *regs)
WARNING: Missing a blank line after declarations
#188: FILE: drivers/tty/serial/sunzilog.c:188:
+ unsigned char stat = read_zsreg(channel, R1);
+ if (stat & ALL_SNT)
ERROR: trailing whitespace
#231: FILE: drivers/tty/serial/sunzilog.c:231:
+^I$
WARNING: braces {} are not necessary for any arm of this statement
#276: FILE: drivers/tty/serial/sunzilog.c:276:
+ if (ZS_TX_ACTIVE(up)) {
[...]
+ } else {
[...]
ERROR: else should follow close brace '}'
#378: FILE: drivers/tty/serial/sunzilog.c:378:
+ }
+ else if (r1 & PAR_ERR)
ERROR: code indent should use tabs where possible
#397: FILE: drivers/tty/serial/sunzilog.c:397:
+^I^I ^Itty_insert_flip_char(port, ch, flag);$
WARNING: please, no space before tabs
#397: FILE: drivers/tty/serial/sunzilog.c:397:
+^I^I ^Itty_insert_flip_char(port, ch, flag);$
WARNING: line over 80 characters
#440: FILE: drivers/tty/serial/sunzilog.c:440:
+ /* The Zilog just gives us an interrupt when DCD/CTS/etc. change.
WARNING: line over 80 characters
#441: FILE: drivers/tty/serial/sunzilog.c:441:
+ * But it does not tell us which bit has changed, we have to keep
WARNING: Missing a blank line after declarations
#464: FILE: drivers/tty/serial/sunzilog.c:464:
+ unsigned char status = readb(&channel->control);
+ ZSDELAY();
WARNING: line over 80 characters
#468: FILE: drivers/tty/serial/sunzilog.c:468:
+ * It can occur because of how we do serial console writes. It would
WARNING: line over 80 characters
#469: FILE: drivers/tty/serial/sunzilog.c:469:
+ * be nice to transmit console writes just like we normally would for
WARNING: line over 80 characters
#470: FILE: drivers/tty/serial/sunzilog.c:470:
+ * a TTY line. (ie. buffered and TX interrupt driven). That is not
WARNING: line over 80 characters
#471: FILE: drivers/tty/serial/sunzilog.c:471:
+ * easy because console writes cannot sleep. One solution might be
WARNING: line over 80 characters
#593: FILE: drivers/tty/serial/sunzilog.c:593:
+static __inline__ unsigned char sunzilog_read_channel_status(struct uart_port *port)
WARNING: plain inline is preferred over __inline__
#593: FILE: drivers/tty/serial/sunzilog.c:593:
+static __inline__ unsigned char sunzilog_read_channel_status(struct uart_port *port)
ERROR: trailing whitespace
#664: FILE: drivers/tty/serial/sunzilog.c:664:
+^I/* NOTE: Not subject to 'transmitter active' rule. */ $
ERROR: trailing whitespace
#752: FILE: drivers/tty/serial/sunzilog.c:752:
+^I^I/* NOTE: Not subject to 'transmitter active' rule. */ $
ERROR: trailing whitespace
#779: FILE: drivers/tty/serial/sunzilog.c:779:
+^I^I/* NOTE: Not subject to 'transmitter active' rule. */ $
WARNING: line over 80 characters
#999: FILE: drivers/tty/serial/sunzilog.c:999:
+static int sunzilog_verify_port(struct uart_port *port, struct serial_struct *ser)
WARNING: Missing a blank line after declarations
#1142: FILE: drivers/tty/serial/sunzilog.c:1142:
+ unsigned char val = readb(&channel->control);
+ if (val & Tx_BUF_EMP) {
WARNING: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ...
#1230: FILE: drivers/tty/serial/sunzilog.c:1230:
+ printk(KERN_INFO "Console: ttyS%d (SunZilog zs%d)\n",
WARNING: braces {} are not necessary for single statement blocks
#1383: FILE: drivers/tty/serial/sunzilog.c:1383:
+ if (__load_zsregs(channel, up->curregs)) {
+ up->flags |= SUNZILOG_FLAG_ESCC;
+ }
WARNING: quoted string split across lines
#1493: FILE: drivers/tty/serial/sunzilog.c:1493:
+ dev_info(&op->dev, "Keyboard at MMIO 0x%llx (irq = %d) "
+ "is a %s\n",
WARNING: quoted string split across lines
#1497: FILE: drivers/tty/serial/sunzilog.c:1497:
+ dev_info(&op->dev, "Mouse at MMIO 0x%llx (irq = %d) "
+ "is a %s\n",
WARNING: Missing a blank line after declarations
#1581: FILE: drivers/tty/serial/sunzilog.c:1581:
+ struct uart_sunzilog_port *up = sunzilog_irq_chain;
+ err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED,
WARNING: line over 80 characters
#1590: FILE: drivers/tty/serial/sunzilog.c:1590:
+ /* printk (KERN_INFO "Enable IRQ for ZILOG Hardware %p\n", up); */
WARNING: line over 80 characters
#1627: FILE: drivers/tty/serial/sunzilog.c:1627:
+ /* printk (KERN_INFO "Disable IRQ for ZILOG Hardware %p\n", up); */
ERROR: trailing statements should be on next line
#1248: FILE: drivers/tty/serial/sunzilog.c:1248:
+ case B150: baud = 150; break;
ERROR: trailing statements should be on next line
#1249: FILE: drivers/tty/serial/sunzilog.c:1249:
+ case B300: baud = 300; break;
ERROR: trailing statements should be on next line
#1250: FILE: drivers/tty/serial/sunzilog.c:1250:
+ case B600: baud = 600; break;
ERROR: trailing statements should be on next line
#1251: FILE: drivers/tty/serial/sunzilog.c:1251:
+ case B1200: baud = 1200; break;
ERROR: trailing statements should be on next line
#1252: FILE: drivers/tty/serial/sunzilog.c:1252:
+ case B2400: baud = 2400; break;
ERROR: trailing statements should be on next line
#1253: FILE: drivers/tty/serial/sunzilog.c:1253:
+ case B4800: baud = 4800; break;
ERROR: trailing statements should be on next line
#1254: FILE: drivers/tty/serial/sunzilog.c:1254:
+ default: case B9600: baud = 9600; break;
ERROR: trailing statements should be on next line
#1255: FILE: drivers/tty/serial/sunzilog.c:1255:
+ case B19200: baud = 19200; break;
ERROR: trailing statements should be on next line
#1256: FILE: drivers/tty/serial/sunzilog.c:1256:
+ case B38400: baud = 38400; break;
Signed-off-by: Enrico Weigelt <info@metux.net>
---
drivers/tty/serial/sunzilog.c | 118 +++++++++++++++++++++++++++---------------
1 file changed, 76 insertions(+), 42 deletions(-)
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index 6285bba..17b0520 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -106,14 +106,17 @@ struct uart_sunzilog_port {
static void sunzilog_putchar(struct uart_port *port, int ch);
-#define ZILOG_CHANNEL_FROM_PORT(PORT) ((struct zilog_channel __iomem *)((PORT)->membase))
-#define UART_ZILOG(PORT) ((struct uart_sunzilog_port *)(PORT))
+#define ZILOG_CHANNEL_FROM_PORT(PORT) \
+ ((struct zilog_channel __iomem *)((PORT)->membase))
+#define UART_ZILOG(PORT) \
+ ((struct uart_sunzilog_port *)(PORT))
#define ZS_IS_KEYB(UP) ((UP)->flags & SUNZILOG_FLAG_CONS_KEYB)
#define ZS_IS_MOUSE(UP) ((UP)->flags & SUNZILOG_FLAG_CONS_MOUSE)
#define ZS_IS_CONS(UP) ((UP)->flags & SUNZILOG_FLAG_IS_CONS)
#define ZS_IS_KGDB(UP) ((UP)->flags & SUNZILOG_FLAG_IS_KGDB)
-#define ZS_WANTS_MODEM_STATUS(UP) ((UP)->flags & SUNZILOG_FLAG_MODEM_STATUS)
+#define ZS_WANTS_MODEM_STATUS(UP) \
+ ((UP)->flags & SUNZILOG_FLAG_MODEM_STATUS)
#define ZS_IS_CHANNEL_A(UP) ((UP)->flags & SUNZILOG_FLAG_IS_CHANNEL_A)
#define ZS_REGS_HELD(UP) ((UP)->flags & SUNZILOG_FLAG_REGS_HELD)
#define ZS_TX_STOPPED(UP) ((UP)->flags & SUNZILOG_FLAG_TX_STOPPED)
@@ -176,7 +179,8 @@ static void sunzilog_clear_fifo(struct zilog_channel __iomem *channel)
/* This function must only be called when the TX is not busy. The UART
* port lock must be held and local interrupts disabled.
*/
-static int __load_zsregs(struct zilog_channel __iomem *channel, unsigned char *regs)
+static int __load_zsregs(struct zilog_channel __iomem *channel,
+ unsigned char *regs)
{
int i;
int escc;
@@ -185,6 +189,7 @@ static int __load_zsregs(struct zilog_channel __iomem *channel, unsigned char *r
/* Let pending transmits finish. */
for (i = 0; i < 1000; i++) {
unsigned char stat = read_zsreg(channel, R1);
+
if (stat & ALL_SNT)
break;
udelay(100);
@@ -228,7 +233,7 @@ static int __load_zsregs(struct zilog_channel __iomem *channel, unsigned char *r
/* Lower and upper byte of baud rate generator divisor. */
write_zsreg(channel, R12, regs[R12]);
write_zsreg(channel, R13, regs[R13]);
-
+
/* Now rewrite R14, with BRENAB (if set). */
write_zsreg(channel, R14, regs[R14]);
@@ -273,11 +278,10 @@ static void sunzilog_maybe_update_regs(struct uart_sunzilog_port *up,
struct zilog_channel __iomem *channel)
{
if (!ZS_REGS_HELD(up)) {
- if (ZS_TX_ACTIVE(up)) {
+ if (ZS_TX_ACTIVE(up))
up->flags |= SUNZILOG_FLAG_REGS_HELD;
- } else {
+ else
__load_zsregs(channel, up->curregs);
- }
}
}
@@ -374,8 +378,7 @@ static void sunzilog_kbdms_receive_chars(struct uart_sunzilog_port *up,
up->port.icount.brk++;
if (uart_handle_break(&up->port))
continue;
- }
- else if (r1 & PAR_ERR)
+ } else if (r1 & PAR_ERR)
up->port.icount.parity++;
else if (r1 & CRC_ERR)
up->port.icount.frame++;
@@ -394,7 +397,7 @@ static void sunzilog_kbdms_receive_chars(struct uart_sunzilog_port *up,
if (up->port.ignore_status_mask == 0xff ||
(r1 & up->port.ignore_status_mask) == 0) {
- tty_insert_flip_char(port, ch, flag);
+ tty_insert_flip_char(port, ch, flag);
}
if (r1 & Rx_OVR)
tty_insert_flip_char(port, 0, TTY_OVERRUN);
@@ -437,9 +440,9 @@ static void sunzilog_status_handle(struct uart_sunzilog_port *up,
if (status & SYNC)
up->port.icount.dsr++;
- /* The Zilog just gives us an interrupt when DCD/CTS/etc. change.
- * But it does not tell us which bit has changed, we have to keep
- * track of this ourselves.
+ /* The Zilog just gives us an interrupt when DCD/CTS/etc.
+ * change.But it does not tell us which bit has changed,
+ * we have to keep track of this ourselves.
*/
if ((status ^ up->prev_status) ^ DCD)
uart_handle_dcd_change(&up->port,
@@ -461,15 +464,17 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
if (ZS_IS_CONS(up)) {
unsigned char status = readb(&channel->control);
+
ZSDELAY();
/* TX still busy? Just wait for the next TX done interrupt.
*
- * It can occur because of how we do serial console writes. It would
- * be nice to transmit console writes just like we normally would for
- * a TTY line. (ie. buffered and TX interrupt driven). That is not
- * easy because console writes cannot sleep. One solution might be
- * to poll on enough port->xmit space becoming free. -DaveM
+ * It can occur because of how we do serial console writes.
+ * It would be nice to transmit console writes just like we
+ * normally would for a TTY line. (ie. buffered and TX
+ * interrupt driven). That is not easy because console
+ * writes cannot sleep. One solution might be to poll on
+ * enough port->xmit space becoming free. -DaveM
*/
if (!(status & Tx_BUF_EMP))
return;
@@ -590,7 +595,8 @@ static irqreturn_t sunzilog_interrupt(int irq, void *dev_id)
/* A convenient way to quickly get R0 status. The caller must _not_ hold the
* port lock, it is acquired here.
*/
-static __inline__ unsigned char sunzilog_read_channel_status(struct uart_port *port)
+static inline unsigned char
+sunzilog_read_channel_status(struct uart_port *port)
{
struct zilog_channel __iomem *channel;
unsigned char status;
@@ -661,13 +667,13 @@ static void sunzilog_set_mctrl(struct uart_port *port, unsigned int mctrl)
else
clear_bits |= DTR;
- /* NOTE: Not subject to 'transmitter active' rule. */
+ /* NOTE: Not subject to 'transmitter active' rule. */
up->curregs[R5] |= set_bits;
up->curregs[R5] &= ~clear_bits;
write_zsreg(channel, R5, up->curregs[R5]);
}
-/* The port lock is held and interrupts are disabled. */
+/* The port lock is held and interrupts are disabled. */
static void sunzilog_stop_tx(struct uart_port *port)
{
struct uart_sunzilog_port *up =
@@ -749,7 +755,7 @@ static void sunzilog_enable_ms(struct uart_port *port)
if (new_reg != up->curregs[R15]) {
up->curregs[R15] = new_reg;
- /* NOTE: Not subject to 'transmitter active' rule. */
+ /* NOTE: Not subject to 'transmitter active' rule. */
write_zsreg(channel, R15, up->curregs[R15] & ~WR7pEN);
}
}
@@ -776,7 +782,7 @@ static void sunzilog_break_ctl(struct uart_port *port, int break_state)
if (new_reg != up->curregs[R5]) {
up->curregs[R5] = new_reg;
- /* NOTE: Not subject to 'transmitter active' rule. */
+ /* NOTE: Not subject to 'transmitter active' rule. */
write_zsreg(channel, R5, up->curregs[R5]);
}
@@ -996,7 +1002,8 @@ static void sunzilog_config_port(struct uart_port *port, int flags)
}
/* We do not support letting the user mess with the divisor, IRQ, etc. */
-static int sunzilog_verify_port(struct uart_port *port, struct serial_struct *ser)
+static int sunzilog_verify_port(struct uart_port *port,
+ struct serial_struct *ser)
{
return -EINVAL;
}
@@ -1139,6 +1146,7 @@ static void sunzilog_putchar(struct uart_port *port, int ch)
*/
do {
unsigned char val = readb(&channel->control);
+
if (val & Tx_BUF_EMP) {
ZSDELAY();
break;
@@ -1237,15 +1245,34 @@ static int __init sunzilog_console_setup(struct console *con, char *options)
* this hackish cflag thing is OK.
*/
switch (con->cflag & CBAUD) {
- case B150: baud = 150; break;
- case B300: baud = 300; break;
- case B600: baud = 600; break;
- case B1200: baud = 1200; break;
- case B2400: baud = 2400; break;
- case B4800: baud = 4800; break;
- default: case B9600: baud = 9600; break;
- case B19200: baud = 19200; break;
- case B38400: baud = 38400; break;
+ case B150:
+ baud = 150;
+ break;
+ case B300:
+ baud = 300;
+ break;
+ case B600:
+ baud = 600;
+ break;
+ case B1200:
+ baud = 1200;
+ break;
+ case B2400:
+ baud = 2400;
+ break;
+ case B4800:
+ baud = 4800;
+ break;
+ default:
+ case B9600:
+ baud = 9600;
+ break;
+ case B19200:
+ baud = 19200;
+ break;
+ case B38400:
+ baud = 38400;
+ break;
}
brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
@@ -1380,9 +1407,9 @@ static void sunzilog_init_hw(struct uart_sunzilog_port *up)
up->curregs[R14] = BRSRC | BRENAB;
up->curregs[R15] = FIFOEN; /* Use FIFO if on ESCC */
up->curregs[R7p] = TxFIFO_LVL | RxFIFO_LVL;
- if (__load_zsregs(channel, up->curregs)) {
+ if (__load_zsregs(channel, up->curregs))
up->flags |= SUNZILOG_FLAG_ESCC;
- }
+
/* Only enable interrupts if an ISR handler available */
if (up->flags & SUNZILOG_FLAG_ISR_HANDLER)
up->curregs[R9] |= MIE;
@@ -1489,12 +1516,12 @@ static int zs_probe(struct platform_device *op)
}
uart_inst++;
} else {
- dev_info(&op->dev, "Keyboard at MMIO 0x%llx (irq = %d) "
- "is a %s\n",
+ dev_info(&op->dev,
+ "Keyboard at MMIO 0x%llx (irq = %d) is a %s\n",
(unsigned long long) up[0].port.mapbase,
op->archdata.irqs[0], sunzilog_type(&up[0].port));
- dev_info(&op->dev, "Mouse at MMIO 0x%llx (irq = %d) "
- "is a %s\n",
+ dev_info(&op->dev,
+ "Mouse at MMIO 0x%llx (irq = %d) is a %s\n",
(unsigned long long) up[1].port.mapbase,
op->archdata.irqs[0], sunzilog_type(&up[1].port));
kbm_inst++;
@@ -1578,6 +1605,7 @@ static int __init sunzilog_init(void)
if (zilog_irq) {
struct uart_sunzilog_port *up = sunzilog_irq_chain;
+
err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED,
"zs", sunzilog_irq_chain);
if (err)
@@ -1587,7 +1615,10 @@ static int __init sunzilog_init(void)
while (up) {
struct zilog_channel __iomem *channel;
- /* printk (KERN_INFO "Enable IRQ for ZILOG Hardware %p\n", up); */
+ /* printk(KERN_INFO
+ * "Enable IRQ for ZILOG Hardware %p\n",
+ * up);
+ */
channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
up->flags |= SUNZILOG_FLAG_ISR_HANDLER;
up->curregs[R9] |= MIE;
@@ -1624,7 +1655,10 @@ static void __exit sunzilog_exit(void)
while (up) {
struct zilog_channel __iomem *channel;
- /* printk (KERN_INFO "Disable IRQ for ZILOG Hardware %p\n", up); */
+ /* printk(KERN_INFO
+ * "Disable IRQ for ZILOG Hardware %p\n",
+ * up);
+ */
channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
up->flags &= ~SUNZILOG_FLAG_ISR_HANDLER;
up->curregs[R9] &= ~MIE;
--
1.9.1
^ permalink raw reply related
* [PATCH 35/41] drivers: tty: serial: 8250: add mapsize to platform data
From: Enrico Weigelt, metux IT consult @ 2019-04-27 12:52 UTC (permalink / raw)
To: linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-1-git-send-email-info@metux.net>
Adding a mapsize field for the 8250 port platform data struct,
so we can now set the resource size (eg. *1) and don't need
funny runtime detections like serial8250_port_size() anymore.
For now, serial8250_port_size() is called everytime we need
the io resource size. That function checks which chip we
actually have and returns the appropriate size. This approach
is a bit clumpsy and not entirely easy to understand, and
it's a violation of layers :p
Obviously, that information cannot change after the driver init,
so we can safely do that probing once on driver init and just
use the stored value later.
*1) arch/mips/alchemy/common/platform.c
Signed-off-by: Enrico Weigelt <info@metux.net>
---
drivers/tty/serial/8250/8250_core.c | 1 +
include/linux/serial_8250.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index e441221..71a398b 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -814,6 +814,7 @@ static int serial8250_probe(struct platform_device *dev)
uart.port.iotype = p->iotype;
uart.port.flags = p->flags;
uart.port.mapbase = p->mapbase;
+ uart.port.mapsize = p->mapsize;
uart.port.hub6 = p->hub6;
uart.port.private_data = p->private_data;
uart.port.type = p->type;
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 5a655ba..8b8183a 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -22,6 +22,7 @@ struct plat_serial8250_port {
unsigned long iobase; /* io base address */
void __iomem *membase; /* ioremap cookie or NULL */
resource_size_t mapbase; /* resource base */
+ resource_size_t mapsize; /* resource size */
unsigned int irq; /* interrupt number */
unsigned long irqflags; /* request_irq flags */
unsigned int uartclk; /* UART clock rate */
--
1.9.1
^ permalink raw reply related
* [PATCH 41/41] drivers: tty: serial: lpc32xx_hs: fill mapsize and use it
From: Enrico Weigelt, metux IT consult @ 2019-04-27 12:52 UTC (permalink / raw)
To: linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-1-git-send-email-info@metux.net>
Fill the struct uart_port->mapsize field and use it, insteaf of
hardcoded values in many places. This makes the code layout a bit
more consistent and easily allows using generic helpers for the
io memory handling.
Candidates for such helpers could be eg. the request+ioremap and
iounmap+release combinations.
Signed-off-by: Enrico Weigelt <info@metux.net>
---
drivers/tty/serial/lpc32xx_hs.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c
index f4e27d0..d1f09aa 100644
--- a/drivers/tty/serial/lpc32xx_hs.c
+++ b/drivers/tty/serial/lpc32xx_hs.c
@@ -579,7 +579,7 @@ static void serial_lpc32xx_release_port(struct uart_port *port)
port->membase = NULL;
}
- release_mem_region(port->mapbase, SZ_4K);
+ release_mem_region(port->mapbase, port->mapsize);
}
}
@@ -590,12 +590,15 @@ static int serial_lpc32xx_request_port(struct uart_port *port)
if ((port->iotype == UPIO_MEM32) && (port->mapbase)) {
ret = 0;
- if (!request_mem_region(port->mapbase, SZ_4K, MODNAME))
+ if (!request_mem_region(port->mapbase,
+ port->mapsize, MODNAME))
ret = -EBUSY;
else if (port->flags & UPF_IOREMAP) {
- port->membase = ioremap(port->mapbase, SZ_4K);
+ port->membase = ioremap(port->mapbase,
+ port->mapsize);
if (!port->membase) {
- release_mem_region(port->mapbase, SZ_4K);
+ release_mem_region(port->mapbase,
+ port->mapsize);
ret = -ENOMEM;
}
}
@@ -684,6 +687,7 @@ static int serial_hs_lpc32xx_probe(struct platform_device *pdev)
return -ENXIO;
}
p->port.mapbase = res->start;
+ p->port.mapsize = SZ_4K;
p->port.membase = NULL;
ret = platform_get_irq(pdev, 0);
--
1.9.1
^ permalink raw reply related
* [PATCH 36/41] drivers: tty: serial: 8250: store mmio resource size in port struct
From: Enrico Weigelt, metux IT consult @ 2019-04-27 12:52 UTC (permalink / raw)
To: linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-1-git-send-email-info@metux.net>
The io resource size is currently recomputed when it's needed but this
actually needs to be done once (or drivers could specify fixed values)
Simplify that by doing this computation only once and storing the result
into the mapsize field. serial8250_register_8250_port() is now called
only once on driver init, the previous call sites now just fetch the
value from the mapsize field.
Signed-off-by: Enrico Weigelt <info@metux.net>
---
drivers/tty/serial/8250/8250.h | 2 ++
drivers/tty/serial/8250/8250_core.c | 3 +++
drivers/tty/serial/8250/8250_port.c | 33 +++++++++++++++------------------
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
index ebfb0bd..89e3f09 100644
--- a/drivers/tty/serial/8250/8250.h
+++ b/drivers/tty/serial/8250/8250.h
@@ -255,3 +255,5 @@ static inline int serial_index(struct uart_port *port)
{
return port->minor - 64;
}
+
+unsigned int serial8250_port_size(struct uart_8250_port *pt);
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 71a398b..a9d4ba1 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -979,6 +979,9 @@ int serial8250_register_8250_port(struct uart_8250_port *up)
if (up->port.uartclk == 0)
return -EINVAL;
+ /* compute the mapsize in case the driver didn't specify one */
+ up->mapsize = serial8250_port_size(up);
+
mutex_lock(&serial_mutex);
uart = serial8250_find_match_or_unused(&up->port);
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index d2f3310..d09af4c 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -2829,7 +2829,7 @@ void serial8250_do_pm(struct uart_port *port, unsigned int state,
serial8250_do_pm(port, state, oldstate);
}
-static unsigned int serial8250_port_size(struct uart_8250_port *pt)
+unsigned int serial8250_port_size(struct uart_8250_port *pt)
{
if (pt->port.mapsize)
return pt->port.mapsize;
@@ -2849,9 +2849,7 @@ static unsigned int serial8250_port_size(struct uart_8250_port *pt)
*/
static int serial8250_request_std_resource(struct uart_8250_port *up)
{
- unsigned int size = serial8250_port_size(up);
struct uart_port *port = &up->port;
- int ret = 0;
switch (port->iotype) {
case UPIO_AU:
@@ -2863,32 +2861,31 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
if (!port->mapbase)
break;
- if (!request_mem_region(port->mapbase, size, "serial")) {
- ret = -EBUSY;
- break;
- }
+ if (!request_mem_region(port->mapbase,
+ port->mapsize, "serial"))
+ return -EBUSY;
if (port->flags & UPF_IOREMAP) {
- port->membase = ioremap_nocache(port->mapbase, size);
- if (!port->membase) {
- release_mem_region(port->mapbase, size);
- ret = -ENOMEM;
- }
+ port->membase = ioremap_nocache(port->mapbase,
+ port->mapsize);
+ if (!port->membase)
+ release_mem_region(port->mapbase,
+ port->mapsize);
+ return -ENOMEM;
}
break;
case UPIO_HUB6:
case UPIO_PORT:
- if (!request_region(port->iobase, size, "serial"))
- ret = -EBUSY;
+ if (!request_region(port->iobase, port->mapsize, "serial"))
+ return -EBUSY;
break;
}
- return ret;
+ return 0;
}
static void serial8250_release_std_resource(struct uart_8250_port *up)
{
- unsigned int size = serial8250_port_size(up);
struct uart_port *port = &up->port;
switch (port->iotype) {
@@ -2906,12 +2903,12 @@ static void serial8250_release_std_resource(struct uart_8250_port *up)
port->membase = NULL;
}
- release_mem_region(port->mapbase, size);
+ release_mem_region(port->mapbase, port->mapsize);
break;
case UPIO_HUB6:
case UPIO_PORT:
- release_region(port->iobase, size);
+ release_region(port->iobase, port->mapsize);
break;
}
}
--
1.9.1
^ permalink raw reply related
* [PATCH 34/41] drivers: tty: serial: zs: fill mapsize and use it
From: Enrico Weigelt, metux IT consult @ 2019-04-27 12:52 UTC (permalink / raw)
To: linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-1-git-send-email-info@metux.net>
Fill the struct uart_port->mapsize field and use it, insteaf of
hardcoded values in many places. This makes the code layout a bit
more consistent and easily allows using generic helpers for the
io memory handling.
Candidates for such helpers could be eg. the request+ioremap and
iounmap+release combinations.
Signed-off-by: Enrico Weigelt <info@metux.net>
---
drivers/tty/serial/zs.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/zs.c b/drivers/tty/serial/zs.c
index adbfe79..ab432ba 100644
--- a/drivers/tty/serial/zs.c
+++ b/drivers/tty/serial/zs.c
@@ -986,14 +986,14 @@ static void zs_release_port(struct uart_port *uport)
{
iounmap(uport->membase);
uport->membase = 0;
- release_mem_region(uport->mapbase, ZS_CHAN_IO_SIZE);
+ release_mem_region(uport->mapbase, uport->mapsize);
}
static int zs_map_port(struct uart_port *uport)
{
if (!uport->membase)
uport->membase = ioremap_nocache(uport->mapbase,
- ZS_CHAN_IO_SIZE);
+ uport->mapsize);
if (!uport->membase) {
dev_err(port->dev, "zs: Cannot map MMIO\n");
return -ENOMEM;
@@ -1005,13 +1005,13 @@ static int zs_request_port(struct uart_port *uport)
{
int ret;
- if (!request_mem_region(uport->mapbase, ZS_CHAN_IO_SIZE, "scc")) {
+ if (!request_mem_region(uport->mapbase, uport->mapsize, "scc")) {
dev_err(uport->dev, "zs: Unable to reserve MMIO resource\n");
return -EBUSY;
}
ret = zs_map_port(uport);
if (ret) {
- release_mem_region(uport->mapbase, ZS_CHAN_IO_SIZE);
+ release_mem_region(uport->mapbase, uport->mapsize);
return ret;
}
return 0;
@@ -1113,6 +1113,7 @@ static int __init zs_probe_sccs(void)
uport->flags = UPF_BOOT_AUTOCONF;
uport->ops = &zs_ops;
uport->line = chip * ZS_NUM_CHAN + side;
+ uport->mapsize = ZS_CHAN_IO_SIZE;
uport->mapbase = dec_kn_slot_base +
zs_parms.scc[chip] +
(side ^ ZS_CHAN_B) * ZS_CHAN_IO_SIZE;
--
1.9.1
^ permalink raw reply related
* [PATCH 33/41] drivers: tty: serial: zs: use dev_err() instead of printk()
From: Enrico Weigelt, metux IT consult @ 2019-04-27 12:52 UTC (permalink / raw)
To: linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-1-git-send-email-info@metux.net>
Using dev_err() instead of printk() for more consistent output.
(prints device name, etc).
Signed-off-by: Enrico Weigelt <info@metux.net>
---
drivers/tty/serial/zs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/zs.c b/drivers/tty/serial/zs.c
index b03d3e4..adbfe79 100644
--- a/drivers/tty/serial/zs.c
+++ b/drivers/tty/serial/zs.c
@@ -767,7 +767,7 @@ static int zs_startup(struct uart_port *uport)
IRQF_SHARED, "scc", scc);
if (ret) {
atomic_add(-1, &scc->irq_guard);
- printk(KERN_ERR "zs: can't get irq %d\n",
+ dev_err(uport->dev, "zs: can't get irq %d\n",
zport->port.irq);
return ret;
}
@@ -995,7 +995,7 @@ static int zs_map_port(struct uart_port *uport)
uport->membase = ioremap_nocache(uport->mapbase,
ZS_CHAN_IO_SIZE);
if (!uport->membase) {
- printk(KERN_ERR "zs: Cannot map MMIO\n");
+ dev_err(port->dev, "zs: Cannot map MMIO\n");
return -ENOMEM;
}
return 0;
@@ -1006,7 +1006,7 @@ static int zs_request_port(struct uart_port *uport)
int ret;
if (!request_mem_region(uport->mapbase, ZS_CHAN_IO_SIZE, "scc")) {
- printk(KERN_ERR "zs: Unable to reserve MMIO resource\n");
+ dev_err(uport->dev, "zs: Unable to reserve MMIO resource\n");
return -EBUSY;
}
ret = zs_map_port(uport);
--
1.9.1
^ permalink raw reply related
* [PATCH 30/41] drivers: tty: serial: ioc4_serial: use dev_warn() instead of printk()
From: Enrico Weigelt, metux IT consult @ 2019-04-27 12:52 UTC (permalink / raw)
To: linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-1-git-send-email-info@metux.net>
Using dev_warn() instead of printk() for more consistent output.
(prints device name, etc).
Signed-off-by: Enrico Weigelt <info@metux.net>
---
drivers/tty/serial/ioc4_serial.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
index db5b979..21c1b8f 100644
--- a/drivers/tty/serial/ioc4_serial.c
+++ b/drivers/tty/serial/ioc4_serial.c
@@ -2752,7 +2752,7 @@ static int ioc4_serial_remove_one(struct ioc4_driver_data *idd)
the_port->dev = &pdev->dev;
spin_lock_init(&the_port->lock);
if (uart_add_one_port(u_driver, the_port) < 0) {
- printk(KERN_WARNING
+ dev_warn(&pdev->dev,
"%s: unable to add port %d bus %d\n",
__func__, the_port->line, pdev->bus->number);
} else {
--
1.9.1
^ permalink raw reply related
* [PATCH 06/41] drivers: tty: serial: sb1250-duart: use dev_err() instead of printk()
From: Enrico Weigelt, metux IT consult @ 2019-04-27 12:51 UTC (permalink / raw)
To: linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-1-git-send-email-info@metux.net>
Using dev_err() instead of printk() for more consistent output.
(prints device name, etc).
Signed-off-by: Enrico Weigelt <info@metux.net>
---
drivers/tty/serial/sb1250-duart.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c
index 329aced..655961c 100644
--- a/drivers/tty/serial/sb1250-duart.c
+++ b/drivers/tty/serial/sb1250-duart.c
@@ -663,7 +663,6 @@ static void sbd_release_port(struct uart_port *uport)
static int sbd_map_port(struct uart_port *uport)
{
- const char *err = KERN_ERR "sbd: Cannot map MMIO\n";
struct sbd_port *sport = to_sport(uport);
struct sbd_duart *duart = sport->duart;
@@ -671,7 +670,7 @@ static int sbd_map_port(struct uart_port *uport)
uport->membase = ioremap_nocache(uport->mapbase,
DUART_CHANREG_SPACING);
if (!uport->membase) {
- printk(err);
+ dev_err(uport->dev, "Cannot map MMIO (base)\n");
return -ENOMEM;
}
@@ -679,7 +678,7 @@ static int sbd_map_port(struct uart_port *uport)
sport->memctrl = ioremap_nocache(duart->mapctrl,
DUART_CHANREG_SPACING);
if (!sport->memctrl) {
- printk(err);
+ dev_err(uport->dev, "Cannot map MMIO (ctrl)\n");
iounmap(uport->membase);
uport->membase = NULL;
return -ENOMEM;
--
1.9.1
^ permalink raw reply related
* [PATCH 01/41] drivers: tty: serial: dz: use dev_err() instead of printk()
From: Enrico Weigelt, metux IT consult @ 2019-04-27 12:51 UTC (permalink / raw)
To: linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-1-git-send-email-info@metux.net>
Using dev_err() instead of printk() for more consistent output.
(prints device name, etc).
Signed-off-by: Enrico Weigelt <info@metux.net>
---
drivers/tty/serial/dz.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c
index 7b57e84..96e35af 100644
--- a/drivers/tty/serial/dz.c
+++ b/drivers/tty/serial/dz.c
@@ -416,7 +416,7 @@ static int dz_startup(struct uart_port *uport)
IRQF_SHARED, "dz", mux);
if (ret) {
atomic_add(-1, &mux->irq_guard);
- printk(KERN_ERR "dz: Cannot get IRQ %d!\n", dport->port.irq);
+ dev_err(uport->dev, "Cannot get IRQ %d!\n", dport->port.irq);
return ret;
}
@@ -680,7 +680,7 @@ static int dz_map_port(struct uart_port *uport)
uport->membase = ioremap_nocache(uport->mapbase,
dec_kn_slot_size);
if (!uport->membase) {
- printk(KERN_ERR "dz: Cannot map MMIO\n");
+ dev_err(uport->dev, "Cannot map MMIO\n");
return -ENOMEM;
}
return 0;
@@ -697,8 +697,8 @@ static int dz_request_port(struct uart_port *uport)
if (!request_mem_region(uport->mapbase, dec_kn_slot_size,
"dz")) {
atomic_add(-1, &mux->map_guard);
- printk(KERN_ERR
- "dz: Unable to reserve MMIO resource\n");
+ dev_err(uport->dev,
+ "Unable to reserve MMIO resource\n");
return -EBUSY;
}
}
--
1.9.1
^ permalink raw reply related
* [PATCH 25/41] drivers: tty: serial: timbuart: fix formatting issues
From: Enrico Weigelt, metux IT consult @ 2019-04-27 12:52 UTC (permalink / raw)
To: linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-1-git-send-email-info@metux.net>
Fix checkpatch warnings:
WARNING: Missing a blank line after declarations
#43: FILE: drivers/tty/serial/timbuart.c:43:
+ u32 ier = ioread32(port->membase + TIMBUART_IER) & ~RXFLAGS;
+ iowrite32(ier, port->membase + TIMBUART_IER);
WARNING: Missing a blank line after declarations
#50: FILE: drivers/tty/serial/timbuart.c:50:
+ u32 ier = ioread32(port->membase + TIMBUART_IER) & ~TXBAE;
+ iowrite32(ier, port->membase + TIMBUART_IER);
WARNING: Missing a blank line after declarations
#86: FILE: drivers/tty/serial/timbuart.c:86:
+ u8 ch = ioread8(port->membase + TIMBUART_RXFIFO);
+ port->icount.rx++;
WARNING: Missing a blank line after declarations
#202: FILE: drivers/tty/serial/timbuart.c:202:
+ u8 cts = ioread8(port->membase + TIMBUART_CTRL);
+ dev_dbg(port->dev, "%s - cts %x\n", __func__, cts);
WARNING: Block comments use * on subsequent lines
#296: FILE: drivers/tty/serial/timbuart.c:296:
+ /* The serial layer calls into this once with old = NULL when setting
+ up initially */
WARNING: Block comments use a trailing */ on a separate line
#296: FILE: drivers/tty/serial/timbuart.c:296:
Signed-off-by: Enrico Weigelt <info@metux.net>
---
drivers/tty/serial/timbuart.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/timbuart.c b/drivers/tty/serial/timbuart.c
index dcce936..d80c332 100644
--- a/drivers/tty/serial/timbuart.c
+++ b/drivers/tty/serial/timbuart.c
@@ -40,6 +40,7 @@ static void timbuart_stop_rx(struct uart_port *port)
{
/* spin lock held by upper layer, disable all RX interrupts */
u32 ier = ioread32(port->membase + TIMBUART_IER) & ~RXFLAGS;
+
iowrite32(ier, port->membase + TIMBUART_IER);
}
@@ -47,6 +48,7 @@ static void timbuart_stop_tx(struct uart_port *port)
{
/* spinlock held by upper layer, disable TX interrupt */
u32 ier = ioread32(port->membase + TIMBUART_IER) & ~TXBAE;
+
iowrite32(ier, port->membase + TIMBUART_IER);
}
@@ -83,6 +85,7 @@ static void timbuart_rx_chars(struct uart_port *port)
while (ioread32(port->membase + TIMBUART_ISR) & RXDP) {
u8 ch = ioread8(port->membase + TIMBUART_RXFIFO);
+
port->icount.rx++;
tty_insert_flip_char(tport, ch, TTY_NORMAL);
}
@@ -199,6 +202,7 @@ static void timbuart_tasklet(unsigned long arg)
static unsigned int timbuart_get_mctrl(struct uart_port *port)
{
u8 cts = ioread8(port->membase + TIMBUART_CTRL);
+
dev_dbg(port->dev, "%s - cts %x\n", __func__, cts);
if (cts & TIMBUART_CTRL_CTS)
@@ -293,7 +297,8 @@ static void timbuart_set_termios(struct uart_port *port,
baud = baudrates[bindex];
/* The serial layer calls into this once with old = NULL when setting
- up initially */
+ * up initially
+ */
if (old)
tty_termios_copy_hw(termios, old);
tty_termios_encode_baud_rate(termios, baud, baud);
@@ -500,4 +505,3 @@ static int timbuart_remove(struct platform_device *dev)
MODULE_DESCRIPTION("Timberdale UART driver");
MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:timb-uart");
-
--
1.9.1
^ permalink raw reply related
* [PATCH 07/41] drivers: tty: serial: sb1250-duart: include <linux/io.h> instead of <asm/io.h>
From: Enrico Weigelt, metux IT consult @ 2019-04-27 12:51 UTC (permalink / raw)
To: linux-kernel
Cc: lorenzo.pieralisi, linux-ia64, linux-serial, andrew, gregkh,
sudeep.holla, liviu.dudau, linux-mips, vz, linux, sparclinux,
khilman, macro, slemieux.tyco, matthias.bgg, jacmet,
linux-amlogic, andriy.shevchenko, linuxppc-dev, davem
In-Reply-To: <1556369542-13247-1-git-send-email-info@metux.net>
Fix checkpatch warning:
WARNING: Use #include <linux/io.h> instead of <asm/io.h>
#41: FILE: drivers/tty/serial/sb1250-duart.c:41:
+#include <asm/io.h>
Signed-off-by: Enrico Weigelt <info@metux.net>
---
drivers/tty/serial/sb1250-duart.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c
index 655961c..b4342c8 100644
--- a/drivers/tty/serial/sb1250-duart.c
+++ b/drivers/tty/serial/sb1250-duart.c
@@ -38,7 +38,7 @@
#include <linux/types.h>
#include <linux/refcount.h>
-#include <asm/io.h>
+#include <linux/io.h>
#include <asm/war.h>
#include <asm/sibyte/sb1250.h>
--
1.9.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox