From 8c6f00ef4f17999c5110166764773e40b9a934de Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Sun, 13 Jan 2019 21:50:36 +0200 Subject: kernel: bump 4.14 to 4.14.93 Refresh patches. Remove upstreamed patches: - backport/096-mips-math-emu-Write-protect-delay-slot-emulation-pages.patch - pending/510-f2fs-fix-sanity_check_raw_super-on-big-endian-machines.patch - brcm2708/950-0415-qmi_wwan-apply-SET_DTR-quirk-to-the-SIMCOM-shared-de.patch Compile-tested: ar71xx, ath79, brcm2708/bcm27{08,10}, octeon, x86/64 Runtime-tested: ar71xx, ath79, brcm2708/bcm27{08,10}, octeon, x86/64 Signed-off-by: Stijn Tintel --- ...cm2835-Support-pin-groups-other-than-7-11.patch | 4 +- ...13-spi-bcm2835-Disable-forced-software-CS.patch | 4 +- .../950-0014-spi-bcm2835-Remove-unused-code.patch | 4 +- ...-vc4-Fix-pitch-setup-for-T-format-scanout.patch | 2 +- ...6-cgroup-Disable-cgroup-memory-by-default.patch | 6 +-- ...170-lan78xx-Avoid-spurious-kevent-4-error.patch | 2 +- ...4-Add-the-DRM_IOCTL_VC4_GEM_MADVISE-ioctl.patch | 2 +- ...-.pixel_order-instead-of-custom-.flip_cbc.patch | 2 +- ...1-lan78xx-Read-initial-EEE-status-from-DT.patch | 2 +- ...lan78xx-Allow-for-VLAN-headers-in-timeout.patch | 2 +- ...x-Move-enabling-of-EEE-into-PHY-init-code.patch | 2 +- ...-Request-s-w-csum-check-on-VLAN-tagged-pa.patch | 2 +- ...et-lan78xx-Add-support-for-VLAN-filtering.patch | 4 +- ...an78xx-Add-support-for-VLAN-tag-stripping.patch | 10 ++--- ...et-lan78xx-Reduce-s-w-csum-check-on-VLANs.patch | 2 +- ...78xx-Disable-TCP-Segmentation-Offload-TSO.patch | 2 +- ...m-vc4-Set-premultiplied-for-alpha-formats.patch | 2 +- ...4-Check-if-plane-requires-background-fill.patch | 4 +- ...-Advertise-supported-modifiers-for-planes.patch | 8 ++-- ...-missing-formats-to-vc4_format_mod_suppor.patch | 2 +- ...357-drm-vc4-Add-support-for-SAND-modifier.patch | 14 +++---- ...-fix-rx-handling-before-first-packet-is-s.patch | 2 +- ...360-lan78xx-Fix-link-status-notifications.patch | 2 +- ...ply-SET_DTR-quirk-to-the-SIMCOM-shared-de.patch | 45 ---------------------- ...bounce-link-events-to-minimize-poll-storm.patch | 2 +- .../patches-4.14/961-lan78xx-enable-LED.patch | 2 +- 26 files changed, 45 insertions(+), 90 deletions(-) delete mode 100644 target/linux/brcm2708/patches-4.14/950-0415-qmi_wwan-apply-SET_DTR-quirk-to-the-SIMCOM-shared-de.patch (limited to 'target/linux/brcm2708') diff --git a/target/linux/brcm2708/patches-4.14/950-0012-spi-bcm2835-Support-pin-groups-other-than-7-11.patch b/target/linux/brcm2708/patches-4.14/950-0012-spi-bcm2835-Support-pin-groups-other-than-7-11.patch index edd040455f..434c63fa75 100644 --- a/target/linux/brcm2708/patches-4.14/950-0012-spi-bcm2835-Support-pin-groups-other-than-7-11.patch +++ b/target/linux/brcm2708/patches-4.14/950-0012-spi-bcm2835-Support-pin-groups-other-than-7-11.patch @@ -19,7 +19,7 @@ Signed-off-by: Phil Elwell --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c -@@ -688,6 +688,8 @@ static int bcm2835_spi_setup(struct spi_ +@@ -686,6 +686,8 @@ static int bcm2835_spi_setup(struct spi_ { int err; struct gpio_chip *chip; @@ -28,7 +28,7 @@ Signed-off-by: Phil Elwell /* * sanity checking the native-chipselects */ -@@ -704,15 +706,42 @@ static int bcm2835_spi_setup(struct spi_ +@@ -702,15 +704,42 @@ static int bcm2835_spi_setup(struct spi_ "setup: only two native chip-selects are supported\n"); return -EINVAL; } diff --git a/target/linux/brcm2708/patches-4.14/950-0013-spi-bcm2835-Disable-forced-software-CS.patch b/target/linux/brcm2708/patches-4.14/950-0013-spi-bcm2835-Disable-forced-software-CS.patch index e0ab7eceff..22d6c50609 100644 --- a/target/linux/brcm2708/patches-4.14/950-0013-spi-bcm2835-Disable-forced-software-CS.patch +++ b/target/linux/brcm2708/patches-4.14/950-0013-spi-bcm2835-Disable-forced-software-CS.patch @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c -@@ -707,6 +707,7 @@ static int bcm2835_spi_setup(struct spi_ +@@ -705,6 +705,7 @@ static int bcm2835_spi_setup(struct spi_ return -EINVAL; } @@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell /* now translate native cs to GPIO */ /* first look for chip select pins in the devices pin groups */ for (pingroup_index = 0; -@@ -756,6 +757,7 @@ static int bcm2835_spi_setup(struct spi_ +@@ -754,6 +755,7 @@ static int bcm2835_spi_setup(struct spi_ spi->chip_select, spi->cs_gpio, err); return err; } diff --git a/target/linux/brcm2708/patches-4.14/950-0014-spi-bcm2835-Remove-unused-code.patch b/target/linux/brcm2708/patches-4.14/950-0014-spi-bcm2835-Remove-unused-code.patch index 601de428f5..cb7f348a8b 100644 --- a/target/linux/brcm2708/patches-4.14/950-0014-spi-bcm2835-Remove-unused-code.patch +++ b/target/linux/brcm2708/patches-4.14/950-0014-spi-bcm2835-Remove-unused-code.patch @@ -9,7 +9,7 @@ Subject: [PATCH 014/454] spi-bcm2835: Remove unused code --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c -@@ -679,17 +679,8 @@ static void bcm2835_spi_set_cs(struct sp +@@ -677,17 +677,8 @@ static void bcm2835_spi_set_cs(struct sp bcm2835_wr(bs, BCM2835_SPI_CS, cs); } @@ -27,7 +27,7 @@ Subject: [PATCH 014/454] spi-bcm2835: Remove unused code /* * sanity checking the native-chipselects */ -@@ -707,58 +698,6 @@ static int bcm2835_spi_setup(struct spi_ +@@ -705,58 +696,6 @@ static int bcm2835_spi_setup(struct spi_ return -EINVAL; } diff --git a/target/linux/brcm2708/patches-4.14/950-0131-drm-vc4-Fix-pitch-setup-for-T-format-scanout.patch b/target/linux/brcm2708/patches-4.14/950-0131-drm-vc4-Fix-pitch-setup-for-T-format-scanout.patch index 4aa018f541..1b140f0a60 100644 --- a/target/linux/brcm2708/patches-4.14/950-0131-drm-vc4-Fix-pitch-setup-for-T-format-scanout.patch +++ b/target/linux/brcm2708/patches-4.14/950-0131-drm-vc4-Fix-pitch-setup-for-T-format-scanout.patch @@ -16,7 +16,7 @@ Fixes: 98830d91da08 ("drm/vc4: Add T-format scanout support.") --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -546,14 +546,24 @@ static int vc4_plane_mode_set(struct drm +@@ -547,14 +547,24 @@ static int vc4_plane_mode_set(struct drm tiling = SCALER_CTL0_TILING_LINEAR; pitch0 = VC4_SET_FIELD(fb->pitches[0], SCALER_SRC_PITCH); break; diff --git a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch index 9fb4b8180a..6a1bda859e 100644 --- a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch +++ b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c -@@ -5154,6 +5154,8 @@ int __init cgroup_init_early(void) +@@ -5159,6 +5159,8 @@ int __init cgroup_init_early(void) } static u16 cgroup_disable_mask __initdata; @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell /** * cgroup_init - cgroup initialization -@@ -5192,6 +5194,12 @@ int __init cgroup_init(void) +@@ -5197,6 +5199,12 @@ int __init cgroup_init(void) mutex_unlock(&cgroup_mutex); @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell for_each_subsys(ss, ssid) { if (ss->early_init) { struct cgroup_subsys_state *css = -@@ -5572,6 +5580,28 @@ static int __init cgroup_disable(char *s +@@ -5577,6 +5585,28 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); diff --git a/target/linux/brcm2708/patches-4.14/950-0170-lan78xx-Avoid-spurious-kevent-4-error.patch b/target/linux/brcm2708/patches-4.14/950-0170-lan78xx-Avoid-spurious-kevent-4-error.patch index 5731c1418f..519590b8e5 100644 --- a/target/linux/brcm2708/patches-4.14/950-0170-lan78xx-Avoid-spurious-kevent-4-error.patch +++ b/target/linux/brcm2708/patches-4.14/950-0170-lan78xx-Avoid-spurious-kevent-4-error.patch @@ -19,7 +19,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2494,7 +2494,7 @@ static void lan78xx_init_stats(struct la +@@ -2498,7 +2498,7 @@ static void lan78xx_init_stats(struct la dev->stats.rollover_max.eee_tx_lpi_transitions = 0xFFFFFFFF; dev->stats.rollover_max.eee_tx_lpi_time = 0xFFFFFFFF; diff --git a/target/linux/brcm2708/patches-4.14/950-0174-drm-vc4-Add-the-DRM_IOCTL_VC4_GEM_MADVISE-ioctl.patch b/target/linux/brcm2708/patches-4.14/950-0174-drm-vc4-Add-the-DRM_IOCTL_VC4_GEM_MADVISE-ioctl.patch index 3d10eb11fb..995c2c0db2 100644 --- a/target/linux/brcm2708/patches-4.14/950-0174-drm-vc4-Add-the-DRM_IOCTL_VC4_GEM_MADVISE-ioctl.patch +++ b/target/linux/brcm2708/patches-4.14/950-0174-drm-vc4-Add-the-DRM_IOCTL_VC4_GEM_MADVISE-ioctl.patch @@ -778,7 +778,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20171019125748.3152-1-boris. #include "vc4_drv.h" #include "vc4_regs.h" -@@ -776,21 +777,40 @@ static int vc4_prepare_fb(struct drm_pla +@@ -777,21 +778,40 @@ static int vc4_prepare_fb(struct drm_pla { struct vc4_bo *bo; struct dma_fence *fence; diff --git a/target/linux/brcm2708/patches-4.14/950-0181-drm-vc4-Use-.pixel_order-instead-of-custom-.flip_cbc.patch b/target/linux/brcm2708/patches-4.14/950-0181-drm-vc4-Use-.pixel_order-instead-of-custom-.flip_cbc.patch index 72b8d6564c..9e067686b0 100644 --- a/target/linux/brcm2708/patches-4.14/950-0181-drm-vc4-Use-.pixel_order-instead-of-custom-.flip_cbc.patch +++ b/target/linux/brcm2708/patches-4.14/950-0181-drm-vc4-Use-.pixel_order-instead-of-custom-.flip_cbc.patch @@ -66,7 +66,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/563872b69c1e5df142cb15ebfca7 }, }; -@@ -624,15 +627,8 @@ static int vc4_plane_mode_set(struct drm +@@ -625,15 +628,8 @@ static int vc4_plane_mode_set(struct drm * The pointers may be any byte address. */ vc4_state->ptr0_offset = vc4_state->dlist_count; diff --git a/target/linux/brcm2708/patches-4.14/950-0251-lan78xx-Read-initial-EEE-status-from-DT.patch b/target/linux/brcm2708/patches-4.14/950-0251-lan78xx-Read-initial-EEE-status-from-DT.patch index 534ab6d922..7cd9985e1e 100644 --- a/target/linux/brcm2708/patches-4.14/950-0251-lan78xx-Read-initial-EEE-status-from-DT.patch +++ b/target/linux/brcm2708/patches-4.14/950-0251-lan78xx-Read-initial-EEE-status-from-DT.patch @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2510,6 +2510,22 @@ static int lan78xx_open(struct net_devic +@@ -2514,6 +2514,22 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/brcm2708/patches-4.14/950-0265-net-lan78xx-Allow-for-VLAN-headers-in-timeout.patch b/target/linux/brcm2708/patches-4.14/950-0265-net-lan78xx-Allow-for-VLAN-headers-in-timeout.patch index 46f8938e04..5870fbd579 100644 --- a/target/linux/brcm2708/patches-4.14/950-0265-net-lan78xx-Allow-for-VLAN-headers-in-timeout.patch +++ b/target/linux/brcm2708/patches-4.14/950-0265-net-lan78xx-Allow-for-VLAN-headers-in-timeout.patch @@ -26,7 +26,7 @@ Signed-off-by: Dave Stevenson netdev->mtu = new_mtu; -@@ -2483,7 +2483,8 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2487,7 +2487,8 @@ static int lan78xx_reset(struct lan78xx_ buf |= FCT_TX_CTL_EN_; ret = lan78xx_write_reg(dev, FCT_TX_CTL, buf); diff --git a/target/linux/brcm2708/patches-4.14/950-0268-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/target/linux/brcm2708/patches-4.14/950-0268-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch index b0b75c18fd..6231485c09 100644 --- a/target/linux/brcm2708/patches-4.14/950-0268-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch +++ b/target/linux/brcm2708/patches-4.14/950-0268-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell /* Set LED modes: * led: 0=link/activity 1=link1000/activity * 2=link100/activity 3=link10/activity -@@ -2536,22 +2552,6 @@ static int lan78xx_open(struct net_devic +@@ -2540,22 +2556,6 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/brcm2708/patches-4.14/950-0269-net-lan78xx-Request-s-w-csum-check-on-VLAN-tagged-pa.patch b/target/linux/brcm2708/patches-4.14/950-0269-net-lan78xx-Request-s-w-csum-check-on-VLAN-tagged-pa.patch index a95b82daf9..db9a1f5a33 100644 --- a/target/linux/brcm2708/patches-4.14/950-0269-net-lan78xx-Request-s-w-csum-check-on-VLAN-tagged-pa.patch +++ b/target/linux/brcm2708/patches-4.14/950-0269-net-lan78xx-Request-s-w-csum-check-on-VLAN-tagged-pa.patch @@ -24,7 +24,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2952,8 +2952,12 @@ static void lan78xx_rx_csum_offload(stru +@@ -2956,8 +2956,12 @@ static void lan78xx_rx_csum_offload(stru struct sk_buff *skb, u32 rx_cmd_a, u32 rx_cmd_b) { diff --git a/target/linux/brcm2708/patches-4.14/950-0270-net-lan78xx-Add-support-for-VLAN-filtering.patch b/target/linux/brcm2708/patches-4.14/950-0270-net-lan78xx-Add-support-for-VLAN-filtering.patch index b3ffe3e79b..89ecbedfa3 100644 --- a/target/linux/brcm2708/patches-4.14/950-0270-net-lan78xx-Add-support-for-VLAN-filtering.patch +++ b/target/linux/brcm2708/patches-4.14/950-0270-net-lan78xx-Add-support-for-VLAN-filtering.patch @@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2275,7 +2275,7 @@ static int lan78xx_set_features(struct n +@@ -2279,7 +2279,7 @@ static int lan78xx_set_features(struct n pdata->rfe_ctl &= ~(RFE_CTL_ICMP_COE_ | RFE_CTL_IGMP_COE_); } @@ -24,7 +24,7 @@ Signed-off-by: Dave Stevenson pdata->rfe_ctl |= RFE_CTL_VLAN_FILTER_; else pdata->rfe_ctl &= ~RFE_CTL_VLAN_FILTER_; -@@ -2888,6 +2888,9 @@ static int lan78xx_bind(struct lan78xx_n +@@ -2892,6 +2892,9 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_TSO_CSUM_ENABLE) dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG; diff --git a/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch b/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch index e1e5500cbc..0ae1bf5e3e 100644 --- a/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch +++ b/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch @@ -24,7 +24,7 @@ Signed-off-by: Dave Stevenson #define TX_OVERHEAD (8) #define RXW_PADDING 2 -@@ -2275,6 +2276,11 @@ static int lan78xx_set_features(struct n +@@ -2279,6 +2280,11 @@ static int lan78xx_set_features(struct n pdata->rfe_ctl &= ~(RFE_CTL_ICMP_COE_ | RFE_CTL_IGMP_COE_); } @@ -36,7 +36,7 @@ Signed-off-by: Dave Stevenson if (features & NETIF_F_HW_VLAN_CTAG_FILTER) pdata->rfe_ctl |= RFE_CTL_VLAN_FILTER_; else -@@ -2888,6 +2894,9 @@ static int lan78xx_bind(struct lan78xx_n +@@ -2892,6 +2898,9 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_TSO_CSUM_ENABLE) dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG; @@ -46,7 +46,7 @@ Signed-off-by: Dave Stevenson if (DEFAULT_VLAN_FILTER_ENABLE) dev->net->features |= NETIF_F_HW_VLAN_CTAG_FILTER; -@@ -2968,6 +2977,16 @@ static void lan78xx_rx_csum_offload(stru +@@ -2972,6 +2981,16 @@ static void lan78xx_rx_csum_offload(stru } } @@ -63,7 +63,7 @@ Signed-off-by: Dave Stevenson static void lan78xx_skb_return(struct lan78xx_net *dev, struct sk_buff *skb) { int status; -@@ -3032,6 +3051,8 @@ static int lan78xx_rx(struct lan78xx_net +@@ -3036,6 +3055,8 @@ static int lan78xx_rx(struct lan78xx_net if (skb->len == size) { lan78xx_rx_csum_offload(dev, skb, rx_cmd_a, rx_cmd_b); @@ -72,7 +72,7 @@ Signed-off-by: Dave Stevenson skb_trim(skb, skb->len - 4); /* remove fcs */ skb->truesize = size + sizeof(struct sk_buff); -@@ -3050,6 +3071,7 @@ static int lan78xx_rx(struct lan78xx_net +@@ -3054,6 +3075,7 @@ static int lan78xx_rx(struct lan78xx_net skb_set_tail_pointer(skb2, size); lan78xx_rx_csum_offload(dev, skb2, rx_cmd_a, rx_cmd_b); diff --git a/target/linux/brcm2708/patches-4.14/950-0272-net-lan78xx-Reduce-s-w-csum-check-on-VLANs.patch b/target/linux/brcm2708/patches-4.14/950-0272-net-lan78xx-Reduce-s-w-csum-check-on-VLANs.patch index 3582c532fc..099f702f00 100644 --- a/target/linux/brcm2708/patches-4.14/950-0272-net-lan78xx-Reduce-s-w-csum-check-on-VLANs.patch +++ b/target/linux/brcm2708/patches-4.14/950-0272-net-lan78xx-Reduce-s-w-csum-check-on-VLANs.patch @@ -16,7 +16,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2964,12 +2964,13 @@ static void lan78xx_rx_csum_offload(stru +@@ -2968,12 +2968,13 @@ static void lan78xx_rx_csum_offload(stru struct sk_buff *skb, u32 rx_cmd_a, u32 rx_cmd_b) { diff --git a/target/linux/brcm2708/patches-4.14/950-0314-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/brcm2708/patches-4.14/950-0314-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch index 11b1b22abe..8bc1d5a951 100644 --- a/target/linux/brcm2708/patches-4.14/950-0314-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch +++ b/target/linux/brcm2708/patches-4.14/950-0314-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch @@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); -@@ -2891,8 +2900,14 @@ static int lan78xx_bind(struct lan78xx_n +@@ -2895,8 +2904,14 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_RX_CSUM_ENABLE) dev->net->features |= NETIF_F_RXCSUM; diff --git a/target/linux/brcm2708/patches-4.14/950-0344-drm-vc4-Set-premultiplied-for-alpha-formats.patch b/target/linux/brcm2708/patches-4.14/950-0344-drm-vc4-Set-premultiplied-for-alpha-formats.patch index cfbdfab0d7..9abfa14619 100644 --- a/target/linux/brcm2708/patches-4.14/950-0344-drm-vc4-Set-premultiplied-for-alpha-formats.patch +++ b/target/linux/brcm2708/patches-4.14/950-0344-drm-vc4-Set-premultiplied-for-alpha-formats.patch @@ -22,7 +22,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/1520556817-97297-2-git-send- --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -618,13 +618,14 @@ static int vc4_plane_mode_set(struct drm +@@ -619,13 +619,14 @@ static int vc4_plane_mode_set(struct drm SCALER_POS1_SCL_HEIGHT)); } diff --git a/target/linux/brcm2708/patches-4.14/950-0345-drm-vc4-Check-if-plane-requires-background-fill.patch b/target/linux/brcm2708/patches-4.14/950-0345-drm-vc4-Check-if-plane-requires-background-fill.patch index 709af646b4..6eaae48b0f 100644 --- a/target/linux/brcm2708/patches-4.14/950-0345-drm-vc4-Check-if-plane-requires-background-fill.patch +++ b/target/linux/brcm2708/patches-4.14/950-0345-drm-vc4-Check-if-plane-requires-background-fill.patch @@ -36,7 +36,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/1520556817-97297-3-git-send- }; static inline struct vc4_plane_state * -@@ -521,6 +527,7 @@ static int vc4_plane_mode_set(struct drm +@@ -522,6 +528,7 @@ static int vc4_plane_mode_set(struct drm u32 ctl0_offset = vc4_state->dlist_count; const struct hvs_format *format = vc4_get_hvs_format(fb->format->format); int num_planes = drm_format_num_planes(format->drm); @@ -44,7 +44,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/1520556817-97297-3-git-send- u32 scl0, scl1, pitch0; u32 lbm_size, tiling; unsigned long irqflags; -@@ -704,6 +711,16 @@ static int vc4_plane_mode_set(struct drm +@@ -705,6 +712,16 @@ static int vc4_plane_mode_set(struct drm vc4_state->dlist[ctl0_offset] |= VC4_SET_FIELD(vc4_state->dlist_count, SCALER_CTL0_SIZE); diff --git a/target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch b/target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch index 5bbb0576e6..95d2402493 100644 --- a/target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch +++ b/target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch @@ -33,7 +33,7 @@ Link: https://patchwork.freedesktop.org/patch/170828/ --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -867,6 +867,32 @@ out: +@@ -868,6 +868,32 @@ out: ctx); } @@ -66,7 +66,7 @@ Link: https://patchwork.freedesktop.org/patch/170828/ static const struct drm_plane_funcs vc4_plane_funcs = { .update_plane = vc4_update_plane, .disable_plane = drm_atomic_helper_disable_plane, -@@ -875,6 +901,7 @@ static const struct drm_plane_funcs vc4_ +@@ -876,6 +902,7 @@ static const struct drm_plane_funcs vc4_ .reset = vc4_plane_reset, .atomic_duplicate_state = vc4_plane_duplicate_state, .atomic_destroy_state = vc4_plane_destroy_state, @@ -74,7 +74,7 @@ Link: https://patchwork.freedesktop.org/patch/170828/ }; struct drm_plane *vc4_plane_init(struct drm_device *dev, -@@ -886,6 +913,11 @@ struct drm_plane *vc4_plane_init(struct +@@ -887,6 +914,11 @@ struct drm_plane *vc4_plane_init(struct u32 num_formats = 0; int ret = 0; unsigned i; @@ -86,7 +86,7 @@ Link: https://patchwork.freedesktop.org/patch/170828/ vc4_plane = devm_kzalloc(dev->dev, sizeof(*vc4_plane), GFP_KERNEL); -@@ -906,7 +938,7 @@ struct drm_plane *vc4_plane_init(struct +@@ -907,7 +939,7 @@ struct drm_plane *vc4_plane_init(struct ret = drm_universal_plane_init(dev, plane, 0, &vc4_plane_funcs, formats, num_formats, diff --git a/target/linux/brcm2708/patches-4.14/950-0356-drm-vc4-Add-missing-formats-to-vc4_format_mod_suppor.patch b/target/linux/brcm2708/patches-4.14/950-0356-drm-vc4-Add-missing-formats-to-vc4_format_mod_suppor.patch index bf9f9e2653..4bed2925a7 100644 --- a/target/linux/brcm2708/patches-4.14/950-0356-drm-vc4-Add-missing-formats-to-vc4_format_mod_suppor.patch +++ b/target/linux/brcm2708/patches-4.14/950-0356-drm-vc4-Add-missing-formats-to-vc4_format_mod_suppor.patch @@ -21,7 +21,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20180316220435.31416-2-eric@ --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -887,7 +887,9 @@ static bool vc4_format_mod_supported(str +@@ -888,7 +888,9 @@ static bool vc4_format_mod_supported(str case DRM_FORMAT_YUV420: case DRM_FORMAT_YVU420: case DRM_FORMAT_NV12: diff --git a/target/linux/brcm2708/patches-4.14/950-0357-drm-vc4-Add-support-for-SAND-modifier.patch b/target/linux/brcm2708/patches-4.14/950-0357-drm-vc4-Add-support-for-SAND-modifier.patch index 3b94f268b0..fbe7261601 100644 --- a/target/linux/brcm2708/patches-4.14/950-0357-drm-vc4-Add-support-for-SAND-modifier.patch +++ b/target/linux/brcm2708/patches-4.14/950-0357-drm-vc4-Add-support-for-SAND-modifier.patch @@ -32,7 +32,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20180316220435.31416-3-eric@ --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -466,11 +466,13 @@ static int vc4_plane_mode_set(struct drm +@@ -467,11 +467,13 @@ static int vc4_plane_mode_set(struct drm struct drm_framebuffer *fb = state->fb; u32 ctl0_offset = vc4_state->dlist_count; const struct hvs_format *format = vc4_get_hvs_format(fb->format->format); @@ -46,7 +46,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20180316220435.31416-3-eric@ int ret, i; ret = vc4_plane_setup_clipping_and_scaling(state); -@@ -510,7 +512,7 @@ static int vc4_plane_mode_set(struct drm +@@ -511,7 +513,7 @@ static int vc4_plane_mode_set(struct drm scl1 = vc4_get_scl_field(state, 0); } @@ -55,7 +55,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20180316220435.31416-3-eric@ case DRM_FORMAT_MOD_LINEAR: tiling = SCALER_CTL0_TILING_LINEAR; pitch0 = VC4_SET_FIELD(fb->pitches[0], SCALER_SRC_PITCH); -@@ -533,6 +535,49 @@ static int vc4_plane_mode_set(struct drm +@@ -534,6 +536,49 @@ static int vc4_plane_mode_set(struct drm break; } @@ -105,7 +105,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20180316220435.31416-3-eric@ default: DRM_DEBUG_KMS("Unsupported FB tiling flag 0x%16llx", (long long)fb->modifier); -@@ -543,7 +588,7 @@ static int vc4_plane_mode_set(struct drm +@@ -544,7 +589,7 @@ static int vc4_plane_mode_set(struct drm vc4_dlist_write(vc4_state, SCALER_CTL0_VALID | (format->pixel_order << SCALER_CTL0_ORDER_SHIFT) | @@ -114,7 +114,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20180316220435.31416-3-eric@ VC4_SET_FIELD(tiling, SCALER_CTL0_TILING) | (vc4_state->is_unity ? SCALER_CTL0_UNITY : 0) | VC4_SET_FIELD(scl0, SCALER_CTL0_SCL0) | -@@ -597,8 +642,13 @@ static int vc4_plane_mode_set(struct drm +@@ -598,8 +643,13 @@ static int vc4_plane_mode_set(struct drm /* Pitch word 1/2 */ for (i = 1; i < num_planes; i++) { @@ -130,7 +130,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20180316220435.31416-3-eric@ } /* Colorspace conversion words */ -@@ -881,13 +931,30 @@ static bool vc4_format_mod_supported(str +@@ -882,13 +932,30 @@ static bool vc4_format_mod_supported(str case DRM_FORMAT_BGR565: case DRM_FORMAT_ARGB1555: case DRM_FORMAT_XRGB1555: @@ -164,7 +164,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20180316220435.31416-3-eric@ case DRM_FORMAT_NV16: case DRM_FORMAT_NV61: default: -@@ -917,6 +984,9 @@ struct drm_plane *vc4_plane_init(struct +@@ -918,6 +985,9 @@ struct drm_plane *vc4_plane_init(struct unsigned i; static const uint64_t modifiers[] = { DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED, diff --git a/target/linux/brcm2708/patches-4.14/950-0359-net-lan78xx-fix-rx-handling-before-first-packet-is-s.patch b/target/linux/brcm2708/patches-4.14/950-0359-net-lan78xx-fix-rx-handling-before-first-packet-is-s.patch index 1acda73f3a..886a3d3568 100644 --- a/target/linux/brcm2708/patches-4.14/950-0359-net-lan78xx-fix-rx-handling-before-first-packet-is-s.patch +++ b/target/linux/brcm2708/patches-4.14/950-0359-net-lan78xx-fix-rx-handling-before-first-packet-is-s.patch @@ -19,7 +19,7 @@ Signed-off-by: Stefan Wahren --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2585,6 +2585,8 @@ static int lan78xx_open(struct net_devic +@@ -2589,6 +2589,8 @@ static int lan78xx_open(struct net_devic dev->link_on = false; diff --git a/target/linux/brcm2708/patches-4.14/950-0360-lan78xx-Fix-link-status-notifications.patch b/target/linux/brcm2708/patches-4.14/950-0360-lan78xx-Fix-link-status-notifications.patch index c7b1c3e5ed..b6f050b6b8 100644 --- a/target/linux/brcm2708/patches-4.14/950-0360-lan78xx-Fix-link-status-notifications.patch +++ b/target/linux/brcm2708/patches-4.14/950-0360-lan78xx-Fix-link-status-notifications.patch @@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2585,8 +2585,6 @@ static int lan78xx_open(struct net_devic +@@ -2589,8 +2589,6 @@ static int lan78xx_open(struct net_devic dev->link_on = false; diff --git a/target/linux/brcm2708/patches-4.14/950-0415-qmi_wwan-apply-SET_DTR-quirk-to-the-SIMCOM-shared-de.patch b/target/linux/brcm2708/patches-4.14/950-0415-qmi_wwan-apply-SET_DTR-quirk-to-the-SIMCOM-shared-de.patch deleted file mode 100644 index f4c433978d..0000000000 --- a/target/linux/brcm2708/patches-4.14/950-0415-qmi_wwan-apply-SET_DTR-quirk-to-the-SIMCOM-shared-de.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d0b55a012bbf2ffe4307f2632165dc1f8cdc351f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= -Date: Fri, 25 May 2018 15:00:20 +0200 -Subject: [PATCH 415/454] qmi_wwan: apply SET_DTR quirk to the SIMCOM shared - device ID -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -commit 102cd909635612c0be784a519651954a7924c786 upstream. - -SIMCOM are reusing a single device ID for many (all of their?) -different modems, based on different chipsets and firmwares. Newer -Qualcomm chipset generations require setting DTR to wake the QMI -function. The SIM7600E modem is using such a chipset, making it -fail to work with this driver despite the device ID match. - -Fix by unconditionally enabling the SET_DTR quirk for all SIMCOM -modems using this specific device ID. This is similar to what -we already have done for another case of device IDs recycled over -multiple chipset generations: 14cf4a771b30 ("drivers: net: usb: -qmi_wwan: add QMI_QUIRK_SET_DTR for Telit PID 0x1201") - -Initial testing on an older SIM7100 modem shows no immediate side -effects. - -Reported-by: Sebastian Sjoholm -Cc: Reinhard Speyerer -Signed-off-by: Bjørn Mork -Signed-off-by: David S. Miller ---- - drivers/net/usb/qmi_wwan.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/usb/qmi_wwan.c -+++ b/drivers/net/usb/qmi_wwan.c -@@ -1250,7 +1250,7 @@ static const struct usb_device_id produc - {QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)}, /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */ - {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ - {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ -- {QMI_FIXED_INTF(0x1e0e, 0x9001, 5)}, /* SIMCom 7230E */ -+ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ - {QMI_QUIRK_SET_DTR(0x2c7c, 0x0125, 4)}, /* Quectel EC25, EC20 R2.0 Mini PCIe */ - {QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */ - {QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)}, /* Quectel EG91 */ diff --git a/target/linux/brcm2708/patches-4.14/950-0454-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/brcm2708/patches-4.14/950-0454-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch index 1821616b9d..08972f121f 100644 --- a/target/linux/brcm2708/patches-4.14/950-0454-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch +++ b/target/linux/brcm2708/patches-4.14/950-0454-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch @@ -28,7 +28,7 @@ See: https://github.com/raspberrypi/linux/issues/2447 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); -@@ -3707,7 +3712,12 @@ static int lan78xx_probe(struct usb_inte +@@ -3711,7 +3716,12 @@ static int lan78xx_probe(struct usb_inte dev->pipe_intr = usb_rcvintpipe(dev->udev, dev->ep_intr->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); diff --git a/target/linux/brcm2708/patches-4.14/961-lan78xx-enable-LED.patch b/target/linux/brcm2708/patches-4.14/961-lan78xx-enable-LED.patch index ae09e08337..9fa63e332e 100644 --- a/target/linux/brcm2708/patches-4.14/961-lan78xx-enable-LED.patch +++ b/target/linux/brcm2708/patches-4.14/961-lan78xx-enable-LED.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2458,6 +2458,15 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2462,6 +2462,15 @@ static int lan78xx_reset(struct lan78xx_ ret = lan78xx_read_reg(dev, HW_CFG, &buf); buf |= HW_CFG_MEF_; -- cgit v1.2.3