domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump 4.14 to 4.14.108

Browse Source 
Refreshed all patches.

Altered patches:
- 950-0033-i2c-bcm2835-Add-debug-support.patch

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

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
Koen Vandeputte
2019-03-25 11:40:22 +01:00
parent 4bc0224149
commit af6c86dbe5
10 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@@ -4,12 +4,12 @@ LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .136 LINUX_VERSION-3.18 = .136
LINUX_VERSION-4.9 = .165 LINUX_VERSION-4.9 = .165
LINUX_VERSION-4.14 = .107 LINUX_VERSION-4.14 = .108
LINUX_VERSION-4.19 = .25 LINUX_VERSION-4.19 = .25
LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c
LINUX_KERNEL_HASH-4.9.165 = 47a0916af54b37028417f365c8938477af00235f4f36c514e9375155772f043c LINUX_KERNEL_HASH-4.9.165 = 47a0916af54b37028417f365c8938477af00235f4f36c514e9375155772f043c
LINUX_KERNEL_HASH-4.14.107 = e48d0f01468e399d03e443527fe7fa277d0bc46df4a66fad97df47ee1f9b4ef4 LINUX_KERNEL_HASH-4.14.108 = b6e33c687f26cd13934f961f48985c17ab3fd0e09aae007a175e3bbf3a8ed454
LINUX_KERNEL_HASH-4.19.25 = 7ec71d90d6e96e6f741676d157ac06f30c75be4eaf1649143a3c8b7d4f919731 LINUX_KERNEL_HASH-4.19.25 = 7ec71d90d6e96e6f741676d157ac06f30c75be4eaf1649143a3c8b7d4f919731
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))

17
target/linux/brcm2708/patches-4.14/950-0033-i2c-bcm2835-Add-debug-support.patch
View File

@@ -142,8 +142,8 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
+ bcm2835_debug_add(i2c_dev, ~0); + bcm2835_debug_add(i2c_dev, ~0);
} }
/* static void bcm2835_i2c_finish_transfer(struct bcm2835_i2c_dev *i2c_dev)
@@ -206,6 +289,7 @@ static irqreturn_t bcm2835_i2c_isr(int t @@ -215,6 +298,7 @@ static irqreturn_t bcm2835_i2c_isr(int t
u32 val, err; u32 val, err;
val = bcm2835_i2c_readl(i2c_dev, BCM2835_I2C_S); val = bcm2835_i2c_readl(i2c_dev, BCM2835_I2C_S);
@@ -151,7 +151,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
err = val & (BCM2835_I2C_S_CLKT | BCM2835_I2C_S_ERR); err = val & (BCM2835_I2C_S_CLKT | BCM2835_I2C_S_ERR);
if (err) { if (err) {
@@ -272,6 +356,13 @@ static int bcm2835_i2c_xfer(struct i2c_a @@ -281,6 +365,13 @@ static int bcm2835_i2c_xfer(struct i2c_a
unsigned long time_left; unsigned long time_left;
int i, ret; int i, ret;
@@ -165,18 +165,19 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
for (i = 0; i < (num - 1); i++) for (i = 0; i < (num - 1); i++)
if (msgs[i].flags & I2C_M_RD) { if (msgs[i].flags & I2C_M_RD) {
dev_warn_once(i2c_dev->dev, dev_warn_once(i2c_dev->dev,
@@ -291,6 +382,10 @@ static int bcm2835_i2c_xfer(struct i2c_a @@ -301,6 +392,11 @@ static int bcm2835_i2c_xfer(struct i2c_a
time_left = wait_for_completion_timeout(&i2c_dev->completion, time_left = wait_for_completion_timeout(&i2c_dev->completion,
adap->timeout); adap->timeout);
+ if (debug > 1 || (debug && (!time_left || i2c_dev->msg_err))) + if (debug > 1 || (debug && (!time_left || i2c_dev->msg_err)))
+ bcm2835_debug_print(i2c_dev); + bcm2835_debug_print(i2c_dev);
+ i2c_dev->debug_num_msgs = 0; + i2c_dev->debug_num_msgs = 0;
+ i2c_dev->debug_num = 0; + i2c_dev->debug_num = 0;
+
bcm2835_i2c_finish_transfer(i2c_dev);
if (!time_left) { if (!time_left) {
bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C, @@ -313,7 +409,9 @@ static int bcm2835_i2c_xfer(struct i2c_a
BCM2835_I2C_C_CLEAR);
@@ -301,7 +396,9 @@ static int bcm2835_i2c_xfer(struct i2c_a
if (!i2c_dev->msg_err) if (!i2c_dev->msg_err)
return num; return num;

6
target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch
View File

@@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/kernel/cgroup/cgroup.c --- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c
@@ -5159,6 +5159,8 @@ int __init cgroup_init_early(void) @@ -5162,6 +5162,8 @@ int __init cgroup_init_early(void)
} }
static u16 cgroup_disable_mask __initdata; static u16 cgroup_disable_mask __initdata;
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/** /**
* cgroup_init - cgroup initialization * cgroup_init - cgroup initialization
@@ -5197,6 +5199,12 @@ int __init cgroup_init(void) @@ -5200,6 +5202,12 @@ int __init cgroup_init(void)
mutex_unlock(&cgroup_mutex); mutex_unlock(&cgroup_mutex);
@@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
for_each_subsys(ss, ssid) { for_each_subsys(ss, ssid) {
if (ss->early_init) { if (ss->early_init) {
struct cgroup_subsys_state *css = struct cgroup_subsys_state *css =
@@ -5577,6 +5585,28 @@ static int __init cgroup_disable(char *s @@ -5580,6 +5588,28 @@ static int __init cgroup_disable(char *s
} }
__setup("cgroup_disable=", cgroup_disable); __setup("cgroup_disable=", cgroup_disable);

2
target/linux/ipq806x/patches-4.14/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
View File

@@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -1938,6 +1938,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN @@ -1939,6 +1939,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property. appended to the the device tree bootargs property.

2
target/linux/kirkwood/patches-4.14/200-disable-tso.patch
View File

@@ -19,7 +19,7 @@ Signed-off-by: Ezequiel Garcia <ezequiel.garcia <at> free-electrons.com>
--- ---
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -3200,11 +3200,11 @@ static int mv643xx_eth_probe(struct plat @@ -3205,11 +3205,11 @@ static int mv643xx_eth_probe(struct plat
dev->watchdog_timeo = 2 * HZ; dev->watchdog_timeo = 2 * HZ;
dev->base_addr = 0; dev->base_addr = 0;

2
target/linux/layerscape/patches-4.14/812-flexspi-support-layerscape.patch
View File

@@ -166,7 +166,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
* or local to this CPU. Furthermore it means its ACTIVE (otherwise * or local to this CPU. Furthermore it means its ACTIVE (otherwise
--- a/sound/soc/soc-dapm.c --- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c
@@ -4012,6 +4012,13 @@ int snd_soc_dapm_link_dai_widgets(struct @@ -4036,6 +4036,13 @@ int snd_soc_dapm_link_dai_widgets(struct
continue; continue;
} }

10
target/linux/layerscape/patches-4.14/820-sec-support-layerscape.patch
View File

@@ -442,7 +442,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
static int test_cipher(struct crypto_cipher *tfm, int enc, static int test_cipher(struct crypto_cipher *tfm, int enc,
const struct cipher_testvec *template, const struct cipher_testvec *template,
unsigned int tcount) unsigned int tcount)
@@ -3518,6 +3753,15 @@ static const struct alg_test_desc alg_te @@ -3524,6 +3759,15 @@ static const struct alg_test_desc alg_te
.hash = __VECS(tgr192_tv_template) .hash = __VECS(tgr192_tv_template)
} }
}, { }, {
@@ -1828,7 +1828,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
if (ivsize && ((is_rfc3686 && encrypt) || !alg->caam.geniv)) if (ivsize && ((is_rfc3686 && encrypt) || !alg->caam.geniv))
append_load_as_imm(desc, req->iv, ivsize, append_load_as_imm(desc, req->iv, ivsize,
LDST_CLASS_1_CCB | LDST_CLASS_1_CCB |
@@ -3203,9 +3247,11 @@ struct caam_crypto_alg { @@ -3204,9 +3248,11 @@ struct caam_crypto_alg {
struct caam_alg_entry caam; struct caam_alg_entry caam;
}; };
@@ -1841,7 +1841,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
ctx->jrdev = caam_jr_alloc(); ctx->jrdev = caam_jr_alloc();
if (IS_ERR(ctx->jrdev)) { if (IS_ERR(ctx->jrdev)) {
@@ -3213,10 +3259,16 @@ static int caam_init_common(struct caam_ @@ -3214,10 +3260,16 @@ static int caam_init_common(struct caam_
return PTR_ERR(ctx->jrdev); return PTR_ERR(ctx->jrdev);
} }
@@ -1859,7 +1859,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
if (dma_mapping_error(ctx->jrdev, dma_addr)) { if (dma_mapping_error(ctx->jrdev, dma_addr)) {
dev_err(ctx->jrdev, "unable to map key, shared descriptors\n"); dev_err(ctx->jrdev, "unable to map key, shared descriptors\n");
caam_jr_free(ctx->jrdev); caam_jr_free(ctx->jrdev);
@@ -3244,7 +3296,7 @@ static int caam_cra_init(struct crypto_t @@ -3245,7 +3297,7 @@ static int caam_cra_init(struct crypto_t
container_of(alg, struct caam_crypto_alg, crypto_alg); container_of(alg, struct caam_crypto_alg, crypto_alg);
struct caam_ctx *ctx = crypto_tfm_ctx(tfm); struct caam_ctx *ctx = crypto_tfm_ctx(tfm);
@@ -1868,7 +1868,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
} }
static int caam_aead_init(struct crypto_aead *tfm) static int caam_aead_init(struct crypto_aead *tfm)
@@ -3254,14 +3306,15 @@ static int caam_aead_init(struct crypto_ @@ -3255,14 +3307,15 @@ static int caam_aead_init(struct crypto_
container_of(alg, struct caam_aead_alg, aead); container_of(alg, struct caam_aead_alg, aead);
struct caam_ctx *ctx = crypto_aead_ctx(tfm); struct caam_ctx *ctx = crypto_aead_ctx(tfm);

2
target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch
View File

@@ -28,7 +28,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -1938,6 +1938,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN @@ -1939,6 +1939,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property. appended to the the device tree bootargs property.

2
target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch
View File

@@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -1938,6 +1938,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN @@ -1939,6 +1939,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property. appended to the the device tree bootargs property.

4
target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
View File

@@ -64,7 +64,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#include <media/v4l2-common.h> #include <media/v4l2-common.h>
@@ -1093,9 +1098,149 @@ static void uvc_video_decode_data(struct @@ -1101,9 +1106,149 @@ static void uvc_video_decode_data(struct
} }
} }
@@ -214,7 +214,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
/* Mark the buffer as done if the EOF marker is set. */ /* Mark the buffer as done if the EOF marker is set. */
if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) { if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n"); uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n");
@@ -1510,6 +1655,8 @@ static int uvc_init_video_isoc(struct uv @@ -1518,6 +1663,8 @@ static int uvc_init_video_isoc(struct uv
if (npackets == 0) if (npackets == 0)
return -ENOMEM; return -ENOMEM;