From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Christophe Leroy <christophe.leroy@c-s.fr>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sasha Levin <sashal@kernel.org>,
linux-serial@vger.kernel.org
Subject: [PATCH AUTOSEL 4.4 05/35] tty: serial: cpm_uart - fix init when SMC is relocated
Date: Fri, 19 Jul 2019 00:13:53 -0400 [thread overview]
Message-ID: <20190719041423.19322-5-sashal@kernel.org> (raw)
In-Reply-To: <20190719041423.19322-1-sashal@kernel.org>
From: Christophe Leroy <christophe.leroy@c-s.fr>
[ Upstream commit 06aaa3d066db87e8478522d910285141d44b1e58 ]
SMC relocation can also be activated earlier by the bootloader,
so the driver's behaviour cannot rely on selected kernel config.
When the SMC is relocated, CPM_CR_INIT_TRX cannot be used.
But the only thing CPM_CR_INIT_TRX does is to clear the
rstate and tstate registers, so this can be done manually,
even when SMC is not relocated.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Fixes: 9ab921201444 ("cpm_uart: fix non-console port startup bug")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/tty/serial/cpm_uart/cpm_uart_core.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index 0040c29f651a..b9e137c03fe3 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -421,7 +421,16 @@ static int cpm_uart_startup(struct uart_port *port)
clrbits16(&pinfo->sccp->scc_sccm, UART_SCCM_RX);
}
cpm_uart_initbd(pinfo);
- cpm_line_cr_cmd(pinfo, CPM_CR_INIT_TRX);
+ if (IS_SMC(pinfo)) {
+ out_be32(&pinfo->smcup->smc_rstate, 0);
+ out_be32(&pinfo->smcup->smc_tstate, 0);
+ out_be16(&pinfo->smcup->smc_rbptr,
+ in_be16(&pinfo->smcup->smc_rbase));
+ out_be16(&pinfo->smcup->smc_tbptr,
+ in_be16(&pinfo->smcup->smc_tbase));
+ } else {
+ cpm_line_cr_cmd(pinfo, CPM_CR_INIT_TRX);
+ }
}
/* Install interrupt handler. */
retval = request_irq(port->irq, cpm_uart_int, 0, "cpm_uart", port);
@@ -875,16 +884,14 @@ static void cpm_uart_init_smc(struct uart_cpm_port *pinfo)
(u8 __iomem *)pinfo->tx_bd_base - DPRAM_BASE);
/*
- * In case SMC1 is being relocated...
+ * In case SMC is being relocated...
*/
-#if defined (CONFIG_I2C_SPI_SMC1_UCODE_PATCH)
out_be16(&up->smc_rbptr, in_be16(&pinfo->smcup->smc_rbase));
out_be16(&up->smc_tbptr, in_be16(&pinfo->smcup->smc_tbase));
out_be32(&up->smc_rstate, 0);
out_be32(&up->smc_tstate, 0);
out_be16(&up->smc_brkcr, 1); /* number of break chars */
out_be16(&up->smc_brkec, 0);
-#endif
/* Set up the uart parameters in the
* parameter ram.
@@ -898,8 +905,6 @@ static void cpm_uart_init_smc(struct uart_cpm_port *pinfo)
out_be16(&up->smc_brkec, 0);
out_be16(&up->smc_brkcr, 1);
- cpm_line_cr_cmd(pinfo, CPM_CR_INIT_TRX);
-
/* Set UART mode, 8 bit, no parity, one stop.
* Enable receive and transmit.
*/
--
2.20.1
next prev parent reply other threads:[~2019-07-19 4:17 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-19 4:13 [PATCH AUTOSEL 4.4 01/35] drm/panel: simple: Fix panel_simple_dsi_probe Sasha Levin
2019-07-19 4:13 ` [PATCH AUTOSEL 4.4 02/35] usb: core: hub: Disable hub-initiated U1/U2 Sasha Levin
2019-07-19 4:13 ` [PATCH AUTOSEL 4.4 03/35] tty: max310x: Fix invalid baudrate divisors calculator Sasha Levin
2019-07-19 4:13 ` [PATCH AUTOSEL 4.4 04/35] pinctrl: rockchip: fix leaked of_node references Sasha Levin
2019-07-19 4:13 ` Sasha Levin [this message]
2019-07-19 4:13 ` [PATCH AUTOSEL 4.4 06/35] drm/edid: Fix a missing-check bug in drm_load_edid_firmware() Sasha Levin
2019-07-19 4:13 ` [PATCH AUTOSEL 4.4 07/35] memstick: Fix error cleanup path of memstick_init Sasha Levin
2019-07-19 4:13 ` [PATCH AUTOSEL 4.4 08/35] tty/serial: digicolor: Fix digicolor-usart already registered warning Sasha Levin
2019-07-19 4:13 ` [PATCH AUTOSEL 4.4 09/35] tty: serial: msm_serial: avoid system lockup condition Sasha Levin
2019-07-19 4:13 ` [PATCH AUTOSEL 4.4 10/35] drm/virtio: Add memory barriers for capset cache Sasha Levin
2019-07-19 4:13 ` [PATCH AUTOSEL 4.4 11/35] phy: renesas: rcar-gen2: Fix memory leak at error paths Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 12/35] powerpc/pseries/mobility: prevent cpu hotplug during DT update Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 13/35] powerpc/pseries/mobility: rebuild cacheinfo hierarchy post-migration Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 14/35] usb: gadget: Zero ffs_io_data Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 15/35] powerpc/pci/of: Fix OF flags parsing for 64bit BARs Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 16/35] PCI: sysfs: Ignore lockdep for remove attribute Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 17/35] iio: st_accel: fix iio_triggered_buffer_{pre,post}enable positions Sasha Levin
2019-07-21 17:23 ` Jonathan Cameron
2019-07-22 6:47 ` Ardelean, Alexandru
2019-07-28 15:43 ` Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 18/35] iio: iio-utils: Fix possible incorrect mask calculation Sasha Levin
2019-07-21 17:27 ` Jonathan Cameron
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 19/35] recordmcount: Fix spurious mcount entries on powerpc Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 20/35] mfd: core: Set fwnode for created devices Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 21/35] mfd: arizona: Fix undefined behavior Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 22/35] um: Silence lockdep complaint about mmap_sem Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 23/35] powerpc/4xx/uic: clear pending interrupt after irq type/pol change Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 24/35] serial: sh-sci: Fix TX DMA buffer flushing and workqueue races Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 25/35] PCI: tegra: Enable Relaxed Ordering only for Tegra20 & Tegra30 Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 26/35] kallsyms: exclude kasan local symbols on s390 Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 27/35] perf test mmap-thread-lookup: Initialize variable to suppress memory sanitizer warning Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 28/35] f2fs: avoid out-of-range memory access Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 29/35] mailbox: handle failed named mailbox channel request Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 30/35] powerpc/eeh: Handle hugepages in ioremap space Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 31/35] sh: prevent warnings when using iounmap Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 32/35] mm/kmemleak.c: fix check for softirq context Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 33/35] 9p: pass the correct prototype to read_cache_page Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 34/35] mm/mmu_notifier: use hlist_add_head_rcu() Sasha Levin
2019-07-19 4:14 ` [PATCH AUTOSEL 4.4 35/35] locking/lockdep: Fix lock used or unused stats error Sasha Levin
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=20190719041423.19322-5-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=christophe.leroy@c-s.fr \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=stable@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).