Skip to content
Permalink
Browse files

kernel: bump 4.14 to 4.14.99

Refreshed all patches.

Remove upstreamed:
- 950-0434-mmc-bcm2835-Recover-from-MMC_SEND_EXT_CSD.patch

Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  • Loading branch information...
xback committed Feb 13, 2019
1 parent a23a13d commit 9a1d7ff187300767f77401302b43733ee01080b4
Showing with 71 additions and 121 deletions.
  1. +2 −2 include/kernel-version.mk
  2. +2 −2 target/linux/brcm2708/patches-4.14/950-0002-smsx95xx-fix-crimes-against-truesize.patch
  3. +4 −4 ...t/linux/brcm2708/patches-4.14/950-0016-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
  4. +1 −1 target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch
  5. +4 −4 target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch
  6. +1 −1 target/linux/brcm2708/patches-4.14/950-0131-drm-vc4-Fix-pitch-setup-for-T-format-scanout.patch
  7. +1 −1 target/linux/brcm2708/patches-4.14/950-0174-drm-vc4-Add-the-DRM_IOCTL_VC4_GEM_MADVISE-ioctl.patch
  8. +1 −1 ...t/linux/brcm2708/patches-4.14/950-0181-drm-vc4-Use-.pixel_order-instead-of-custom-.flip_cbc.patch
  9. +1 −1 target/linux/brcm2708/patches-4.14/950-0344-drm-vc4-Set-premultiplied-for-alpha-formats.patch
  10. +2 −2 target/linux/brcm2708/patches-4.14/950-0345-drm-vc4-Check-if-plane-requires-background-fill.patch
  11. +4 −4 target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch
  12. +1 −1 ...t/linux/brcm2708/patches-4.14/950-0356-drm-vc4-Add-missing-formats-to-vc4_format_mod_suppor.patch
  13. +7 −7 target/linux/brcm2708/patches-4.14/950-0357-drm-vc4-Add-support-for-SAND-modifier.patch
  14. +0 −50 target/linux/brcm2708/patches-4.14/950-0434-mmc-bcm2835-Recover-from-MMC_SEND_EXT_CSD.patch
  15. +1 −1 target/linux/gemini/patches-4.14/0016-ARM-dts-Add-TVE-TVC-and-ILI9322-panel-to-DIR-685.patch
  16. +1 −1 target/linux/gemini/patches-4.14/0031-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini.patch
  17. +2 −2 target/linux/gemini/patches-4.14/0905-arm-dts-gemini-dlink-dir-685-add-rtl8366rb.patch
  18. +8 −8 target/linux/generic/hack-4.14/204-module_strip.patch
  19. +1 −1 target/linux/ipq806x/patches-4.14/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch
  20. +1 −1 target/linux/ipq806x/patches-4.14/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch
  21. +2 −2 target/linux/ipq806x/patches-4.14/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch
  22. +1 −1 target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch
  23. +3 −3 target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch
  24. +5 −5 target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch
  25. +2 −2 target/linux/layerscape/patches-4.14/821-smmu-support-layerscape.patch
  26. +2 −2 target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch
  27. +1 −1 target/linux/layerscape/patches-4.14/824-mmc-sdhci-of-esdhc-add-voltage-switch-support-for-ls.patch
  28. +2 −2 target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch
  29. +3 −3 target/linux/mediatek/patches-4.14/0107-usb-mtu3-support-36-bit-DMA-address.patch
  30. +2 −2 target/linux/mediatek/patches-4.14/0109-usb-mtu3-add-support-for-usb3.1-IP.patch
  31. +1 −1 target/linux/ramips/patches-4.14/0051-serial-add-ugly-custom-baud-rate-hack.patch
  32. +1 −1 target/linux/ramips/patches-4.14/0070-weak_reordering.patch
  33. +1 −1 target/linux/ramips/patches-4.14/101-mt7621-timer.patch
@@ -4,12 +4,12 @@ LINUX_RELEASE?=1

LINUX_VERSION-3.18 = .134
LINUX_VERSION-4.9 = .156
LINUX_VERSION-4.14 = .98
LINUX_VERSION-4.14 = .99
LINUX_VERSION-4.19 = .20

LINUX_KERNEL_HASH-3.18.134 = 36bdd04cab3b6c824a4b7e32ae02503f437e0916d5a4ff04c90aa22da2749c2f
LINUX_KERNEL_HASH-4.9.156 = 5eb1b9ba43370512ab637452089bb93f8c0fdd7d5399e99561d382f74517a816
LINUX_KERNEL_HASH-4.14.98 = 8f021171b1b1efb41326e603116a45126fc030d06aaa9b0784ae612323010c5f
LINUX_KERNEL_HASH-4.14.99 = 8ff98caed5b20b733dedcbe99559d71a0e09e239c0c2488b3fd799c96489eb0a
LINUX_KERNEL_HASH-4.19.20 = dc7d2776dad4bf738e741ed05e7d1bea685855cfb7a62d1706f5f7aeabfa04a4

remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
@@ -25,7 +25,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
u32 *data, int in_pm)
{
@@ -1971,7 +1975,8 @@ static int smsc95xx_rx_fixup(struct usbn
@@ -1972,7 +1976,8 @@ static int smsc95xx_rx_fixup(struct usbn
if (dev->net->features & NETIF_F_RXCSUM)
smsc95xx_rx_csum_offload(skb);
skb_trim(skb, skb->len - 4); /* remove fcs */
@@ -35,7 +35,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>

return 1;
}
@@ -1989,7 +1994,8 @@ static int smsc95xx_rx_fixup(struct usbn
@@ -1990,7 +1995,8 @@ static int smsc95xx_rx_fixup(struct usbn
if (dev->net->features & NETIF_F_RXCSUM)
smsc95xx_rx_csum_offload(ax_skb);
skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
@@ -47,7 +47,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>

struct bcm2835_dmadev {
struct dma_device ddev;
@@ -925,6 +927,9 @@ static int bcm2835_dma_probe(struct plat
@@ -905,6 +907,9 @@ static int bcm2835_dma_probe(struct plat
base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(base))
return PTR_ERR(base);
@@ -57,7 +57,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>

od->base = base;

@@ -962,6 +967,9 @@ static int bcm2835_dma_probe(struct plat
@@ -942,6 +947,9 @@ static int bcm2835_dma_probe(struct plat
goto err_no_dma;
}

@@ -67,15 +67,15 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
/* get irqs for each channel that we support */
for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) {
/* skip masked out channels */
@@ -1036,6 +1044,7 @@ static int bcm2835_dma_remove(struct pla
@@ -1016,6 +1024,7 @@ static int bcm2835_dma_remove(struct pla
{
struct bcm2835_dmadev *od = platform_get_drvdata(pdev);

+ bcm_dmaman_remove(pdev);
dma_async_device_unregister(&od->ddev);
bcm2835_dma_free(od);

@@ -1051,7 +1060,22 @@ static struct platform_driver bcm2835_dm
@@ -1031,7 +1040,22 @@ static struct platform_driver bcm2835_dm
},
};

@@ -841,7 +841,7 @@ Signed-off-by: Malik Olivier Boussejra <malik@boussejra.com>
}
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -5084,7 +5084,7 @@ static void port_event(struct usb_hub *h
@@ -5094,7 +5094,7 @@ static void port_event(struct usb_hub *h
if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
u16 status = 0, unused;

@@ -170,7 +170,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma
platform_set_drvdata(dev, fb);
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1086,6 +1086,31 @@ fb_blank(struct fb_info *info, int blank
@@ -1090,6 +1090,31 @@ fb_blank(struct fb_info *info, int blank
}
EXPORT_SYMBOL(fb_blank);

@@ -202,15 +202,15 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma
static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg)
{
@@ -1096,6 +1121,7 @@ static long do_fb_ioctl(struct fb_info *
@@ -1100,6 +1125,7 @@ static long do_fb_ioctl(struct fb_info *
struct fb_cmap cmap_from;
struct fb_cmap_user cmap;
struct fb_event event;
+ struct fb_copyarea copy;
void __user *argp = (void __user *)arg;
long ret = 0;

@@ -1213,6 +1239,15 @@ static long do_fb_ioctl(struct fb_info *
@@ -1217,6 +1243,15 @@ static long do_fb_ioctl(struct fb_info *
unlock_fb_info(info);
console_unlock();
break;
@@ -226,7 +226,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma
default:
if (!lock_fb_info(info))
return -ENODEV;
@@ -1358,6 +1393,7 @@ static long fb_compat_ioctl(struct file
@@ -1362,6 +1397,7 @@ static long fb_compat_ioctl(struct file
case FBIOPAN_DISPLAY:
case FBIOGET_CON2FBMAP:
case FBIOPUT_CON2FBMAP:
@@ -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
@@ -547,14 +547,24 @@ static int vc4_plane_mode_set(struct drm
@@ -549,14 +549,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;
@@ -778,7 +778,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20171019125748.3152-1-boris.
#include "vc4_drv.h"
#include "vc4_regs.h"

@@ -777,21 +778,40 @@ static int vc4_prepare_fb(struct drm_pla
@@ -779,21 +780,40 @@ static int vc4_prepare_fb(struct drm_pla
{
struct vc4_bo *bo;
struct dma_fence *fence;
@@ -66,7 +66,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/563872b69c1e5df142cb15ebfca7
},
};

@@ -625,15 +628,8 @@ static int vc4_plane_mode_set(struct drm
@@ -627,15 +630,8 @@ static int vc4_plane_mode_set(struct drm
* The pointers may be any byte address.
*/
vc4_state->ptr0_offset = vc4_state->dlist_count;
@@ -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
@@ -619,13 +619,14 @@ static int vc4_plane_mode_set(struct drm
@@ -621,13 +621,14 @@ static int vc4_plane_mode_set(struct drm
SCALER_POS1_SCL_HEIGHT));
}

@@ -36,15 +36,15 @@ Link: https://patchwork.freedesktop.org/patch/msgid/1520556817-97297-3-git-send-
};

static inline struct vc4_plane_state *
@@ -522,6 +528,7 @@ static int vc4_plane_mode_set(struct drm
@@ -524,6 +530,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);
+ bool covers_screen;
u32 scl0, scl1, pitch0;
u32 lbm_size, tiling;
unsigned long irqflags;
@@ -705,6 +712,16 @@ static int vc4_plane_mode_set(struct drm
@@ -707,6 +714,16 @@ static int vc4_plane_mode_set(struct drm
vc4_state->dlist[ctl0_offset] |=
VC4_SET_FIELD(vc4_state->dlist_count, SCALER_CTL0_SIZE);

@@ -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
@@ -868,6 +868,32 @@ out:
@@ -870,6 +870,32 @@ out:
ctx);
}

@@ -66,15 +66,15 @@ 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,
@@ -876,6 +902,7 @@ static const struct drm_plane_funcs vc4_
@@ -878,6 +904,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,
+ .format_mod_supported = vc4_format_mod_supported,
};

struct drm_plane *vc4_plane_init(struct drm_device *dev,
@@ -887,6 +914,11 @@ struct drm_plane *vc4_plane_init(struct
@@ -889,6 +916,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);
@@ -907,7 +939,7 @@ struct drm_plane *vc4_plane_init(struct
@@ -909,7 +941,7 @@ struct drm_plane *vc4_plane_init(struct
ret = drm_universal_plane_init(dev, plane, 0,
&vc4_plane_funcs,
formats, num_formats,
@@ -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
@@ -888,7 +888,9 @@ static bool vc4_format_mod_supported(str
@@ -890,7 +890,9 @@ static bool vc4_format_mod_supported(str
case DRM_FORMAT_YUV420:
case DRM_FORMAT_YVU420:
case DRM_FORMAT_NV12:
@@ -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
@@ -467,11 +467,13 @@ static int vc4_plane_mode_set(struct drm
@@ -469,11 +469,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);
@@ -511,7 +513,7 @@ static int vc4_plane_mode_set(struct drm
@@ -513,7 +515,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);
@@ -534,6 +536,49 @@ static int vc4_plane_mode_set(struct drm
@@ -536,6 +538,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);
@@ -544,7 +589,7 @@ static int vc4_plane_mode_set(struct drm
@@ -546,7 +591,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) |
@@ -598,8 +643,13 @@ static int vc4_plane_mode_set(struct drm
@@ -600,8 +645,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 */
@@ -882,13 +932,30 @@ static bool vc4_format_mod_supported(str
@@ -884,13 +934,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:
@@ -918,6 +985,9 @@ struct drm_plane *vc4_plane_init(struct
@@ -920,6 +987,9 @@ struct drm_plane *vc4_plane_init(struct
unsigned i;
static const uint64_t modifiers[] = {
DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,

This file was deleted.

@@ -94,7 +94,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
/* 32MB of flash */
reg = <0x30000000 0x02000000>;

@@ -242,5 +292,16 @@
@@ -238,5 +288,16 @@
ata@63000000 {
status = "okay";
};
@@ -26,7 +26,7 @@ the patch is only included in the series for context.

--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
@@ -303,5 +303,13 @@
@@ -299,5 +299,13 @@
};
};
};
@@ -13,7 +13,7 @@
leds {
compatible = "gpio-leds";
led-wps {
@@ -249,6 +255,47 @@
@@ -245,6 +251,47 @@
groups = "gpio1bgrp";
};
};
@@ -61,7 +61,7 @@
};
};

@@ -290,6 +337,18 @@
@@ -286,6 +333,18 @@
<0x6000 0 0 4 &pci_intc 2>;
};

0 comments on commit 9a1d7ff

Please sign in to comment.
You can’t perform that action at this time.