aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-06 17:19:11 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-12 10:15:01 +0100
commit6589de9af79f58175e4af22a98122e62896aba8a (patch)
tree40e8b738f55403142982fb6680835cf284526f5d /target/linux/brcm2708
parentecfe552f9915eb6bf10fce473b4a4ea9e6c07840 (diff)
downloadupstream-6589de9af79f58175e4af22a98122e62896aba8a.tar.gz
upstream-6589de9af79f58175e4af22a98122e62896aba8a.tar.bz2
upstream-6589de9af79f58175e4af22a98122e62896aba8a.zip
kernel: bump 4.19 to 4.19.82
Refreshed all patches. Remove upstreamed: - 950-0295-sc16is7xx-Fix-for-Unexpected-interrupt-8.patch Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708')
-rw-r--r--target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch2
-rw-r--r--target/linux/brcm2708/patches-4.19/950-0100-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch2
-rw-r--r--target/linux/brcm2708/patches-4.19/950-0149-sc16is7xx-Don-t-spin-if-no-data-received.patch2
-rw-r--r--target/linux/brcm2708/patches-4.19/950-0181-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch4
-rw-r--r--target/linux/brcm2708/patches-4.19/950-0295-sc16is7xx-Fix-for-Unexpected-interrupt-8.patch110
-rw-r--r--target/linux/brcm2708/patches-4.19/950-0730-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch2
6 files changed, 6 insertions, 116 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch
index d5d9867d90..fe8f9fb66b 100644
--- a/target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch
+++ b/target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch
@@ -917,7 +917,7 @@ Fixes https://github.com/raspberrypi/linux/issues/2408
}
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -5214,7 +5214,7 @@ static void port_event(struct usb_hub *h
+@@ -5221,7 +5221,7 @@ static void port_event(struct usb_hub *h
u16 status = 0, unused;
port_dev->over_current_count++;
diff --git a/target/linux/brcm2708/patches-4.19/950-0100-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch b/target/linux/brcm2708/patches-4.19/950-0100-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
index ee60dfe62c..912ab3fc09 100644
--- a/target/linux/brcm2708/patches-4.19/950-0100-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
+++ b/target/linux/brcm2708/patches-4.19/950-0100-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 100/806] ARM64: Force hardware emulation of deprecated
--- a/arch/arm64/kernel/armv8_deprecated.c
+++ b/arch/arm64/kernel/armv8_deprecated.c
-@@ -182,10 +182,15 @@ static void __init register_insn_emulati
+@@ -185,10 +185,15 @@ static void __init register_insn_emulati
switch (ops->status) {
case INSN_DEPRECATED:
diff --git a/target/linux/brcm2708/patches-4.19/950-0149-sc16is7xx-Don-t-spin-if-no-data-received.patch b/target/linux/brcm2708/patches-4.19/950-0149-sc16is7xx-Don-t-spin-if-no-data-received.patch
index 2d6c86e8a0..cfbc59e619 100644
--- a/target/linux/brcm2708/patches-4.19/950-0149-sc16is7xx-Don-t-spin-if-no-data-received.patch
+++ b/target/linux/brcm2708/patches-4.19/950-0149-sc16is7xx-Don-t-spin-if-no-data-received.patch
@@ -12,7 +12,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
-@@ -678,6 +678,8 @@ static bool sc16is7xx_port_irq(struct sc
+@@ -696,6 +696,8 @@ static bool sc16is7xx_port_irq(struct sc
rxlen = sc16is7xx_port_read(port, SC16IS7XX_RXLVL_REG);
if (rxlen)
sc16is7xx_handle_rx(port, rxlen, iir);
diff --git a/target/linux/brcm2708/patches-4.19/950-0181-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch b/target/linux/brcm2708/patches-4.19/950-0181-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch
index 690345497d..3809a7a9cb 100644
--- a/target/linux/brcm2708/patches-4.19/950-0181-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch
+++ b/target/linux/brcm2708/patches-4.19/950-0181-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch
@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/rtc/rtc-pcf8523.c
+++ b/drivers/rtc/rtc-pcf8523.c
-@@ -201,8 +201,28 @@ static int pcf8523_rtc_read_time(struct
+@@ -212,8 +212,28 @@ static int pcf8523_rtc_read_time(struct
if (err < 0)
return err;
@@ -46,7 +46,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
tm->tm_sec = bcd2bin(regs[0] & 0x7f);
tm->tm_min = bcd2bin(regs[1] & 0x7f);
-@@ -238,7 +258,6 @@ static int pcf8523_rtc_set_time(struct d
+@@ -249,7 +269,6 @@ static int pcf8523_rtc_set_time(struct d
return err;
regs[0] = REG_SECONDS;
diff --git a/target/linux/brcm2708/patches-4.19/950-0295-sc16is7xx-Fix-for-Unexpected-interrupt-8.patch b/target/linux/brcm2708/patches-4.19/950-0295-sc16is7xx-Fix-for-Unexpected-interrupt-8.patch
deleted file mode 100644
index 614e1e9e24..0000000000
--- a/target/linux/brcm2708/patches-4.19/950-0295-sc16is7xx-Fix-for-Unexpected-interrupt-8.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 53fc43d7a369bab50b4d3dce73adf7d522f0ee20 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Fri, 18 May 2018 10:26:59 +0100
-Subject: [PATCH 295/806] sc16is7xx: Fix for "Unexpected interrupt: 8"
-
-The SC16IS752 has an Enhanced Feature Register which is aliased at the
-same address as the Interrupt Identification Register; accessing it
-requires that a magic value is written to the Line Configuration
-Register. If an interrupt is raised while the EFR is mapped in then
-the ISR won't be able to access the IIR, leading to the "Unexpected
-interrupt" error messages.
-
-Avoid the problem by claiming a mutex around accesses to the EFR
-register, also claiming the mutex in the interrupt handler work
-item (this is equivalent to disabling interrupts to interlock against
-a non-threaded interrupt handler).
-
-See: https://github.com/raspberrypi/linux/issues/2529
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/tty/serial/sc16is7xx.c | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
-
---- a/drivers/tty/serial/sc16is7xx.c
-+++ b/drivers/tty/serial/sc16is7xx.c
-@@ -328,6 +328,7 @@ struct sc16is7xx_port {
- struct kthread_worker kworker;
- struct task_struct *kworker_task;
- struct kthread_work irq_work;
-+ struct mutex efr_lock;
- struct sc16is7xx_one p[0];
- };
-
-@@ -499,6 +500,21 @@ static int sc16is7xx_set_baud(struct uar
- div /= 4;
- }
-
-+ /* In an amazing feat of design, the Enhanced Features Register shares
-+ * the address of the Interrupt Identification Register, and is
-+ * switched in by writing a magic value (0xbf) to the Line Control
-+ * Register. Any interrupt firing during this time will see the EFR
-+ * where it expects the IIR to be, leading to "Unexpected interrupt"
-+ * messages.
-+ *
-+ * Prevent this possibility by claiming a mutex while accessing the
-+ * EFR, and claiming the same mutex from within the interrupt handler.
-+ * This is similar to disabling the interrupt, but that doesn't work
-+ * because the bulk of the interrupt processing is run as a workqueue
-+ * job in thread context.
-+ */
-+ mutex_lock(&s->efr_lock);
-+
- lcr = sc16is7xx_port_read(port, SC16IS7XX_LCR_REG);
-
- /* Open the LCR divisors for configuration */
-@@ -514,6 +530,8 @@ static int sc16is7xx_set_baud(struct uar
- /* Put LCR back to the normal mode */
- sc16is7xx_port_write(port, SC16IS7XX_LCR_REG, lcr);
-
-+ mutex_unlock(&s->efr_lock);
-+
- sc16is7xx_port_update(port, SC16IS7XX_MCR_REG,
- SC16IS7XX_MCR_CLKSEL_BIT,
- prescaler);
-@@ -698,6 +716,8 @@ static void sc16is7xx_ist(struct kthread
- {
- struct sc16is7xx_port *s = to_sc16is7xx_port(ws, irq_work);
-
-+ mutex_lock(&s->efr_lock);
-+
- while (1) {
- bool keep_polling = false;
- int i;
-@@ -707,6 +727,8 @@ static void sc16is7xx_ist(struct kthread
- if (!keep_polling)
- break;
- }
-+
-+ mutex_unlock(&s->efr_lock);
- }
-
- static irqreturn_t sc16is7xx_irq(int irq, void *dev_id)
-@@ -901,6 +923,9 @@ static void sc16is7xx_set_termios(struct
- if (!(termios->c_cflag & CREAD))
- port->ignore_status_mask |= SC16IS7XX_LSR_BRK_ERROR_MASK;
-
-+ /* As above, claim the mutex while accessing the EFR. */
-+ mutex_lock(&s->efr_lock);
-+
- sc16is7xx_port_write(port, SC16IS7XX_LCR_REG,
- SC16IS7XX_LCR_CONF_MODE_B);
-
-@@ -922,6 +947,8 @@ static void sc16is7xx_set_termios(struct
- /* Update LCR register */
- sc16is7xx_port_write(port, SC16IS7XX_LCR_REG, lcr);
-
-+ mutex_unlock(&s->efr_lock);
-+
- /* Get baud rate generator configuration */
- baud = uart_get_baud_rate(port, termios, old,
- port->uartclk / 16 / 4 / 0xffff,
-@@ -1187,6 +1214,7 @@ static int sc16is7xx_probe(struct device
- s->regmap = regmap;
- s->devtype = devtype;
- dev_set_drvdata(dev, s);
-+ mutex_init(&s->efr_lock);
-
- kthread_init_worker(&s->kworker);
- kthread_init_work(&s->irq_work, sc16is7xx_ist);
diff --git a/target/linux/brcm2708/patches-4.19/950-0730-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/brcm2708/patches-4.19/950-0730-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
index 9e9c79280d..fd3f2c749e 100644
--- a/target/linux/brcm2708/patches-4.19/950-0730-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
+++ b/target/linux/brcm2708/patches-4.19/950-0730-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
@@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
#define USB_VENDOR_ID_BELKIN 0x050d
#define USB_DEVICE_ID_FLIP_KVM 0x3201
-@@ -1189,6 +1192,9 @@
+@@ -1190,6 +1193,9 @@
#define USB_VENDOR_ID_XAT 0x2505
#define USB_DEVICE_ID_XAT_CSR 0x0220