projects
/
openwrt
/
staging
/
981213.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9c6fb1d
)
kernel: bump 4.14 to 4.14.130
author
Koen Vandeputte
<koen.vandeputte@ncentric.com>
Tue, 25 Jun 2019 10:53:55 +0000
(12:53 +0200)
committer
Koen Vandeputte
<koen.vandeputte@ncentric.com>
Tue, 25 Jun 2019 14:50:37 +0000
(16:50 +0200)
Refreshed all patches.
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
include/kernel-version.mk
patch
|
blob
|
history
target/linux/generic/pending-4.14/201-extra_optimization.patch
patch
|
blob
|
history
target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch
patch
|
blob
|
history
target/linux/mediatek/patches-4.14/0043-net-next-mediatek-enable-special-tag-indication-for-.patch
patch
|
blob
|
history
target/linux/mediatek/patches-4.14/0046-net-mediatek-add-irq-delay.patch
patch
|
blob
|
history
target/linux/mediatek/patches-4.14/0051-net-mediatek-increase-tx_timeout.patch
patch
|
blob
|
history
target/linux/mediatek/patches-4.14/0063-atomic-sleep.patch
patch
|
blob
|
history
target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index 0aee89f2be3955f4a8c86187690403a92c621ddf..c882a477fd6b2c39842844f16516ec6f6800309b 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-3,10
+3,10
@@
LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .183
LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .183
-LINUX_VERSION-4.14 = .1
29
+LINUX_VERSION-4.14 = .1
30
LINUX_KERNEL_HASH-4.9.183 = fd57b0991cdbf4e2e933c260356a4768d6685a77460684f8de36a59fd42867f3
LINUX_KERNEL_HASH-4.9.183 = fd57b0991cdbf4e2e933c260356a4768d6685a77460684f8de36a59fd42867f3
-LINUX_KERNEL_HASH-4.14.1
29 = 7548482b03aea1784e728e4d29fe75a2abc61c9dbf9851ec925a7fbecf9336e4
+LINUX_KERNEL_HASH-4.14.1
30 = 29ca9050ff9a60b7ab3b23d4b7da008df8b0f7329492a7bc84c1685481745259
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git
a/target/linux/generic/pending-4.14/201-extra_optimization.patch
b/target/linux/generic/pending-4.14/201-extra_optimization.patch
index 4a9c67269a782ebc5c70926522b83fb141f1e036..857951cbf92b04e99666de2620852273fb8f6c48 100644
(file)
--- a/
target/linux/generic/pending-4.14/201-extra_optimization.patch
+++ b/
target/linux/generic/pending-4.14/201-extra_optimization.patch
@@
-14,7
+14,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/Makefile
+++ b/Makefile
--- a/Makefile
+++ b/Makefile
-@@ -65
3,12 +653
,12 @@ KBUILD_CFLAGS += $(call cc-disable-warni
+@@ -65
4,12 +654
,12 @@ KBUILD_CFLAGS += $(call cc-disable-warni
KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias)
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias)
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
diff --git
a/target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch
b/target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch
index 72a2ece464bcc63d1c3cb90093f65167d90afd83..d934155001e09a3e9a9c6e2328d0942a9c8879dd 100644
(file)
--- a/
target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch
+++ b/
target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch
@@
-22,7
+22,7
@@
Signed-off-by: John Crispin <john@phrozen.org>
mapped_addr = dma_map_single(eth->dev, skb->data,
skb_headlen(skb), DMA_TO_DEVICE);
mapped_addr = dma_map_single(eth->dev, skb->data,
skb_headlen(skb), DMA_TO_DEVICE);
-@@ -198
0,7 +1980
,10 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -198
1,7 +1981
,10 @@ static int mtk_hw_init(struct mtk_eth *e
mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL);
/* Enable RX VLan Offloading */
mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL);
/* Enable RX VLan Offloading */
diff --git
a/target/linux/mediatek/patches-4.14/0043-net-next-mediatek-enable-special-tag-indication-for-.patch
b/target/linux/mediatek/patches-4.14/0043-net-next-mediatek-enable-special-tag-indication-for-.patch
index a658a572fc22309a8cb183cf3e3e06eed88a9c01..a3ee4636f5842ae3d0a62f7c4028769b62ca934e 100644
(file)
--- a/
target/linux/mediatek/patches-4.14/0043-net-next-mediatek-enable-special-tag-indication-for-.patch
+++ b/
target/linux/mediatek/patches-4.14/0043-net-next-mediatek-enable-special-tag-indication-for-.patch
@@
-17,7
+17,7
@@
Signed-off-by: John Crispin <john@phrozen.org>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -198
4,6 +1984
,8 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -198
5,6 +1985
,8 @@ static int mtk_hw_init(struct mtk_eth *e
*/
val = mtk_r32(eth, MTK_CDMQ_IG_CTRL);
mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL);
*/
val = mtk_r32(eth, MTK_CDMQ_IG_CTRL);
mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL);
diff --git
a/target/linux/mediatek/patches-4.14/0046-net-mediatek-add-irq-delay.patch
b/target/linux/mediatek/patches-4.14/0046-net-mediatek-add-irq-delay.patch
index 3ace7265c6ca159871380b61261d90851c70ef65..088914fda1131e6f65ed999153ef666c2df87249 100644
(file)
--- a/
target/linux/mediatek/patches-4.14/0046-net-mediatek-add-irq-delay.patch
+++ b/
target/linux/mediatek/patches-4.14/0046-net-mediatek-add-irq-delay.patch
@@
-11,7
+11,7
@@
Signed-off-by: John Crispin <john@phrozen.org>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -199
5,6 +1995
,7 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -199
6,6 +1996
,7 @@ static int mtk_hw_init(struct mtk_eth *e
/* enable interrupt delay for RX */
mtk_w32(eth, MTK_PDMA_DELAY_RX_DELAY, MTK_PDMA_DELAY_INT);
/* enable interrupt delay for RX */
mtk_w32(eth, MTK_PDMA_DELAY_RX_DELAY, MTK_PDMA_DELAY_INT);
diff --git
a/target/linux/mediatek/patches-4.14/0051-net-mediatek-increase-tx_timeout.patch
b/target/linux/mediatek/patches-4.14/0051-net-mediatek-increase-tx_timeout.patch
index f4c0fce56686e91ee7b16b534c665ccaf0548b7d..81e984ccfa4d7fccd2b6e8a76cbf7b07c1c852e0 100644
(file)
--- a/
target/linux/mediatek/patches-4.14/0051-net-mediatek-increase-tx_timeout.patch
+++ b/
target/linux/mediatek/patches-4.14/0051-net-mediatek-increase-tx_timeout.patch
@@
-10,7
+10,7
@@
Signed-off-by: John Crispin <john@phrozen.org>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -245
4,7 +2454
,7 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -245
5,7 +2455
,7 @@ static int mtk_add_mac(struct mtk_eth *e
mac->hw_stats->reg_offset = id * MTK_STAT_OFFSET;
SET_NETDEV_DEV(eth->netdev[id], eth->dev);
mac->hw_stats->reg_offset = id * MTK_STAT_OFFSET;
SET_NETDEV_DEV(eth->netdev[id], eth->dev);
diff --git
a/target/linux/mediatek/patches-4.14/0063-atomic-sleep.patch
b/target/linux/mediatek/patches-4.14/0063-atomic-sleep.patch
index 0dde3fdb6440e03a78bb56e7cdcd7457372b9ebf..3263e656ae66d49798ac065a1b8c520dcf1b3153 100644
(file)
--- a/
target/linux/mediatek/patches-4.14/0063-atomic-sleep.patch
+++ b/
target/linux/mediatek/patches-4.14/0063-atomic-sleep.patch
@@
-20,7
+20,7
@@
continue;
}
break;
continue;
}
break;
-@@ -186
8,7 +1872
,10 @@ static void mtk_stop_dma(struct mtk_eth
+@@ -186
9,7 +1873
,10 @@ static void mtk_stop_dma(struct mtk_eth
for (i = 0; i < 10; i++) {
val = mtk_r32(eth, glo_cfg);
if (val & (MTK_TX_DMA_BUSY | MTK_RX_DMA_BUSY)) {
for (i = 0; i < 10; i++) {
val = mtk_r32(eth, glo_cfg);
if (val & (MTK_TX_DMA_BUSY | MTK_RX_DMA_BUSY)) {
@@
-32,7
+32,7
@@
continue;
}
break;
continue;
}
break;
-@@ -190
6,7 +1913
,10 @@ static void ethsys_reset(struct mtk_eth
+@@ -190
7,7 +1914
,10 @@ static void ethsys_reset(struct mtk_eth
reset_bits,
reset_bits);
reset_bits,
reset_bits);
diff --git
a/target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch
b/target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch
index 86354973b146db1809ceeb2e8df1f0e58bd33316..db05fd994dc7ec525590179bba5bd7b0469761df 100644
(file)
--- a/
target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch
+++ b/
target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch
@@
-18,7
+18,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -197
6,14 +1976
,16 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -197
7,14 +1977
,16 @@ static int mtk_hw_init(struct mtk_eth *e
}
regmap_write(eth->ethsys, ETHSYS_SYSCFG0, val);
}
regmap_write(eth->ethsys, ETHSYS_SYSCFG0, val);
@@
-41,7
+41,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
/* Set linkdown as the default for each GMAC. Its own MCR would be set
* up with the more appropriate value when mtk_phy_link_adjust call is
/* Set linkdown as the default for each GMAC. Its own MCR would be set
* up with the more appropriate value when mtk_phy_link_adjust call is
-@@ -256
8,11 +2570
,13 @@ static int mtk_probe(struct platform_dev
+@@ -256
9,11 +2571
,13 @@ static int mtk_probe(struct platform_dev
}
}
}
}
@@
-60,7
+60,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
}
for (i = 0; i < 3; i++) {
}
for (i = 0; i < 3; i++) {
-@@ -269
8,17 +2702
,20 @@ static int mtk_remove(struct platform_de
+@@ -269
9,17 +2703
,20 @@ static int mtk_remove(struct platform_de
static const struct mtk_soc_data mt2701_data = {
.caps = MTK_GMAC1_TRGMII,
static const struct mtk_soc_data mt2701_data = {
.caps = MTK_GMAC1_TRGMII,