From: Sasha Levin Date: Thu, 2 Jan 2020 02:23:52 +0000 (-0500) Subject: fixes for 4.4 X-Git-Tag: v4.4.208~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9204b1102b56834270f4e7023517f4ffda6de7c;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 4.4 Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/mmc-sdhci-update-the-tuning-failed-messages-to-pr_de.patch b/queue-4.4/mmc-sdhci-update-the-tuning-failed-messages-to-pr_de.patch new file mode 100644 index 00000000000..3cdd4041b2e --- /dev/null +++ b/queue-4.4/mmc-sdhci-update-the-tuning-failed-messages-to-pr_de.patch @@ -0,0 +1,45 @@ +From c53ea7ada7ae4cbe076ae2de9125efdfb1cc9d45 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 6 Dec 2019 17:13:26 +0530 +Subject: mmc: sdhci: Update the tuning failed messages to pr_debug level + +From: Faiz Abbas + +[ Upstream commit 2c92dd20304f505b6ef43d206fff21bda8f1f0ae ] + +Tuning support in DDR50 speed mode was added in SD Specifications Part1 +Physical Layer Specification v3.01. Its not possible to distinguish +between v3.00 and v3.01 from the SCR and that is why since +commit 4324f6de6d2e ("mmc: core: enable CMD19 tuning for DDR50 mode") +tuning failures are ignored in DDR50 speed mode. + +Cards compatible with v3.00 don't respond to CMD19 in DDR50 and this +error gets printed during enumeration and also if retune is triggered at +any time during operation. Update the printk level to pr_debug so that +these errors don't lead to false error reports. + +Signed-off-by: Faiz Abbas +Cc: stable@vger.kernel.org # v4.4+ +Link: https://lore.kernel.org/r/20191206114326.15856-1-faiz_abbas@ti.com +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/sdhci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c +index 62d37d2ac557..2bae0214528b 100644 +--- a/drivers/mmc/host/sdhci.c ++++ b/drivers/mmc/host/sdhci.c +@@ -2033,7 +2033,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) + spin_lock_irqsave(&host->lock, flags); + + if (!host->tuning_done) { +- pr_info(DRIVER_NAME ": Timeout waiting for " ++ pr_debug(DRIVER_NAME ": Timeout waiting for " + "Buffer Read Ready interrupt during tuning " + "procedure, falling back to fixed sampling " + "clock\n"); +-- +2.20.1 + diff --git a/queue-4.4/serial-sprd-use-readable-macros-instead-of-magic-num.patch b/queue-4.4/serial-sprd-use-readable-macros-instead-of-magic-num.patch new file mode 100644 index 00000000000..cda14c962cd --- /dev/null +++ b/queue-4.4/serial-sprd-use-readable-macros-instead-of-magic-num.patch @@ -0,0 +1,36 @@ +From e16a9434dc4940d8ade1dbb42ac1c6b452308ed8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 Dec 2019 20:00:07 +0800 +Subject: serial: sprd: Use readable macros instead of magic number + +From: Yonghan Ye + +[ Upstream commit 2b5a997386b0594e671a32c7e429cf59ac8fc54c ] + +Define readable macros instead of magic number to make code more readable. + +Signed-off-by: Baolin Wang +Acked-by: Chunyan Zhang +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/sprd_serial.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c +index 82e00ac6f7e3..06980857d9e2 100644 +--- a/drivers/tty/serial/sprd_serial.c ++++ b/drivers/tty/serial/sprd_serial.c +@@ -302,6 +302,9 @@ static irqreturn_t sprd_handle_irq(int irq, void *dev_id) + if (ims & SPRD_IMSR_TIMEOUT) + serial_out(port, SPRD_ICLR, SPRD_ICLR_TIMEOUT); + ++ if (ims & SPRD_IMSR_BREAK_DETECT) ++ serial_out(port, SPRD_ICLR, SPRD_IMSR_BREAK_DETECT); ++ + if (ims & (SPRD_IMSR_RX_FIFO_FULL | + SPRD_IMSR_BREAK_DETECT | SPRD_IMSR_TIMEOUT)) + sprd_rx(port); +-- +2.20.1 + diff --git a/queue-4.4/series b/queue-4.4/series index 8fcc5f6e2af..21872dc01b6 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -133,3 +133,5 @@ netfilter-ebtables-compat-reject-all-padding-in-matches-watchers.patch netfilter-bridge-make-sure-to-pull-arp-header-in-br_nf_forward_arp.patch net-icmp-fix-data-race-in-cmp_global_allow.patch hrtimer-annotate-lockless-access-to-timer-state.patch +serial-sprd-use-readable-macros-instead-of-magic-num.patch +mmc-sdhci-update-the-tuning-failed-messages-to-pr_de.patch