Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
tbblgm119
lede
提交
f09c4d35
L
lede
项目概览
tbblgm119
/
lede
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
lede
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f09c4d35
编写于
1月 11, 2018
作者:
C
coolsnowwolf
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update kernel to 4.4.110 and 4.9.75 to fix CVE-2017-5754 aka Meltdown
上级
adf2b227
变更
44
隐藏空白更改
内联
并排
Showing
44 changed file
with
179 addition
and
168 deletion
+179
-168
include/kernel-version.mk
include/kernel-version.mk
+4
-4
target/linux/apm821xx/patches-4.9/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
...sb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
+3
-3
target/linux/apm821xx/patches-4.9/802-usb-xhci-force-msi-renesas-xhci.patch
...1xx/patches-4.9/802-usb-xhci-force-msi-renesas-xhci.patch
+2
-2
target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
...linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
+1
-1
target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
...linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
+2
-2
target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch
...c/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch
+2
-2
target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
.../backport-4.9/090-net-generalize-napi_complete_done.patch
+1
-1
target/linux/generic/hack-4.9/207-disable-modorder.patch
target/linux/generic/hack-4.9/207-disable-modorder.patch
+2
-2
target/linux/generic/hack-4.9/902-debloat_proc.patch
target/linux/generic/hack-4.9/902-debloat_proc.patch
+1
-1
target/linux/generic/pending-4.4/208-disable-modorder.patch
target/linux/generic/pending-4.4/208-disable-modorder.patch
+2
-2
target/linux/generic/pending-4.4/653-disable_netlink_trim.patch
.../linux/generic/pending-4.4/653-disable_netlink_trim.patch
+1
-1
target/linux/generic/pending-4.4/902-debloat_proc.patch
target/linux/generic/pending-4.4/902-debloat_proc.patch
+1
-1
target/linux/generic/pending-4.4/921-use_preinit_as_init.patch
...t/linux/generic/pending-4.4/921-use_preinit_as_init.patch
+1
-1
target/linux/generic/pending-4.4/995-mangle_bootargs.patch
target/linux/generic/pending-4.4/995-mangle_bootargs.patch
+2
-2
target/linux/generic/pending-4.9/920-mangle_bootargs.patch
target/linux/generic/pending-4.9/920-mangle_bootargs.patch
+2
-2
target/linux/ipq806x/patches-4.9/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
...9/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
+2
-2
target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch
...patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch
+2
-2
target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch
...31-mvneta-implement-ethtool-autonegotiation-control.patch
+3
-3
target/linux/mvebu/patches-4.4/032-net-mvneta-Make-the-default-queue-related-for-each-p.patch
...et-mvneta-Make-the-default-queue-related-for-each-p.patch
+8
-8
target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch
....4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch
+11
-11
target/linux/mvebu/patches-4.4/034-net-mvneta-Add-naive-RSS-support.patch
...bu/patches-4.4/034-net-mvneta-Add-naive-RSS-support.patch
+5
-5
target/linux/mvebu/patches-4.4/035-net-mvneta-Configure-XPS-support.patch
...bu/patches-4.4/035-net-mvneta-Configure-XPS-support.patch
+4
-4
target/linux/mvebu/patches-4.4/036-net-mvneta-fix-trivial-cut-off-issue-in-mvneta_ethto.patch
...et-mvneta-fix-trivial-cut-off-issue-in-mvneta_ethto.patch
+1
-1
target/linux/mvebu/patches-4.4/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch
...et-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch
+3
-3
target/linux/mvebu/patches-4.4/039-net-mvneta-Use-on_each_cpu-when-possible.patch
...es-4.4/039-net-mvneta-Use-on_each_cpu-when-possible.patch
+5
-5
target/linux/mvebu/patches-4.4/040-net-mvneta-Modify-the-queue-related-fields-from-each.patch
...et-mvneta-Modify-the-queue-related-fields-from-each.patch
+8
-8
target/linux/mvebu/patches-4.4/041-net-mvneta-The-mvneta_percpu_elect-function-should-b.patch
...et-mvneta-The-mvneta_percpu_elect-function-should-b.patch
+3
-3
target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch
...4/042-net-mvneta-Fix-race-condition-during-stopping.patch
+8
-8
target/linux/mvebu/patches-4.4/045-net-mvneta-bm-add-support-for-hardware-buffer-manage.patch
...et-mvneta-bm-add-support-for-hardware-buffer-manage.patch
+16
-16
target/linux/mvebu/patches-4.4/046-net-mvneta-Use-the-new-hwbm-framework.patch
...tches-4.4/046-net-mvneta-Use-the-new-hwbm-framework.patch
+1
-1
target/linux/mvebu/patches-4.4/047-net-mvneta-Fix-spinlock-usage.patch
...mvebu/patches-4.4/047-net-mvneta-Fix-spinlock-usage.patch
+2
-2
target/linux/mvebu/patches-4.4/049-net-mvneta-replace-MVNETA_CPU_D_CACHE_LINE_SIZE-with.patch
...et-mvneta-replace-MVNETA_CPU_D_CACHE_LINE_SIZE-with.patch
+2
-2
target/linux/mvebu/patches-4.4/050-net-mvneta-fix-changing-MTU-when-using-per-cpu-proce.patch
...et-mvneta-fix-changing-MTU-when-using-per-cpu-proce.patch
+4
-4
target/linux/mvebu/patches-4.4/134-net-mvneta-convert-to-phylink.patch
...mvebu/patches-4.4/134-net-mvneta-convert-to-phylink.patch
+38
-27
target/linux/mvebu/patches-4.9/420-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch
...et-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch
+4
-4
target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch
...u/patches-4.9/422-net-mvneta-add-nway_reset-support.patch
+2
-2
target/linux/mvebu/patches-4.9/424-net-mvneta-add-flow-control-support-via-phylink.patch
...424-net-mvneta-add-flow-control-support-via-phylink.patch
+5
-5
target/linux/mvebu/patches-4.9/425-net-mvneta-enable-flow-control-for-PHY-connections.patch
...-net-mvneta-enable-flow-control-for-PHY-connections.patch
+1
-1
target/linux/mvebu/patches-4.9/426-net-mvneta-enable-flow-control-for-fixed-connections.patch
...et-mvneta-enable-flow-control-for-fixed-connections.patch
+2
-2
target/linux/mvebu/patches-4.9/427-phylink-add-EEE-support.patch
...linux/mvebu/patches-4.9/427-phylink-add-EEE-support.patch
+1
-1
target/linux/mvebu/patches-4.9/428-net-mvneta-add-EEE-support.patch
...ux/mvebu/patches-4.9/428-net-mvneta-add-EEE-support.patch
+6
-6
target/linux/mvebu/patches-4.9/430-net-mvneta-add-module-EEPROM-reading-support.patch
....9/430-net-mvneta-add-module-EEPROM-reading-support.patch
+2
-2
target/linux/oxnas/patches-4.4/996-ATAG_DTB_COMPAT_CMDLINE_MANGLE.patch
...xnas/patches-4.4/996-ATAG_DTB_COMPAT_CMDLINE_MANGLE.patch
+2
-2
target/linux/x86/patches-4.9/200-pcengines-apu2-reboot.patch
target/linux/x86/patches-4.9/200-pcengines-apu2-reboot.patch
+1
-1
未找到文件。
include/kernel-version.mk
浏览文件 @
f09c4d35
...
...
@@ -3,13 +3,13 @@
LINUX_RELEASE
?=
1
LINUX_VERSION-3.18
=
.71
LINUX_VERSION-4.4
=
.1
08
LINUX_VERSION-4.9
=
.7
3
LINUX_VERSION-4.4
=
.1
10
LINUX_VERSION-4.9
=
.7
5
LINUX_VERSION-4.14
=
.12
LINUX_KERNEL_HASH-3.18.71
=
5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
LINUX_KERNEL_HASH-4.4.1
08
=
5a001198625ce9f7b0ef1e4b43e033aea859e1ef3509532412cce8f0375ba51a
LINUX_KERNEL_HASH-4.9.7
3
=
558b65c53f6d6c421d897ad4b651e51ba341fe4dd97122ec922e23ebd2c16e2b
LINUX_KERNEL_HASH-4.4.1
10
=
d099175aac5678e6cad2f23cd56ed22a2857143c0c18489390c95ba8c441db58
LINUX_KERNEL_HASH-4.9.7
5
=
de6c31b7668d4047e370f4625362a02b9ebf7da56d5c0879a4961f620ab1cadf
LINUX_KERNEL_HASH-4.14.12
=
6608f7d480efc5c1078888e9344f4e0b0cd9bef0b6541cbdaec7d138e03856af
ifdef
KERNEL_PATCHVER
...
...
target/linux/apm821xx/patches-4.9/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
浏览文件 @
f09c4d35
...
...
@@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
#include "xhci.h"
#include "xhci-trace.h"
@@ -23
6,6 +238
,458 @@
static void xhci_pme_acpi_rtd3_enable(st
@@ -23
9,6 +241
,458 @@
static void xhci_pme_acpi_rtd3_enable(st
static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
#endif /* CONFIG_ACPI */
...
...
@@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
/* called during probe() after chip reset completes */
static int xhci_pci_setup(struct usb_hcd *hcd)
{
@@ -27
5,6 +729
,22 @@
static int xhci_pci_probe(struct pci_dev
@@ -27
8,6 +732
,22 @@
static int xhci_pci_probe(struct pci_dev
struct hc_driver *driver;
struct usb_hcd *hcd;
...
...
@@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
driver = (struct hc_driver *)id->driver_data;
/* Prevent runtime suspending between USB-2 and USB-3 initialization */
@@ -33
2,6 +802
,16 @@
static void xhci_pci_remove(struct pci_d
@@ -33
5,6 +805
,16 @@
static void xhci_pci_remove(struct pci_d
{
struct xhci_hcd *xhci;
...
...
target/linux/apm821xx/patches-4.9/802-usb-xhci-force-msi-renesas-xhci.patch
浏览文件 @
f09c4d35
...
...
@@ -13,8 +13,8 @@ produce a noisy warning.
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -19
3,7 +193
,7 @@
static void xhci_pci_quirks(struct devic
}
@@ -19
6,7 +196
,7 @@
static void xhci_pci_quirks(struct devic
xhci->quirks |= XHCI_TRUST_TX_LENGTH;
if (pdev->vendor == PCI_VENDOR_ID_RENESAS &&
pdev->device == 0x0015)
- xhci->quirks |= XHCI_RESET_ON_RESUME;
...
...
target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
浏览文件 @
f09c4d35
...
...
@@ -491,7 +491,7 @@
memcpy(p, foc->val, foc->len);
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -5
05,7 +505
,7 @@
static struct sk_buff *add_grec(struct s
@@ -5
29,7 +529
,7 @@
static struct sk_buff *add_grec(struct s
if (!skb)
return NULL;
psrc = (__be32 *)skb_put(skb, sizeof(__be32));
...
...
target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
浏览文件 @
f09c4d35
...
...
@@ -448,7 +448,7 @@
memcpy(p, foc->val, foc->len);
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -5
09,7 +509
,7 @@
static struct sk_buff *add_grec(struct s
@@ -5
33,7 +533
,7 @@
static struct sk_buff *add_grec(struct s
if (!skb)
return NULL;
psrc = (__be32 *)skb_put(skb, sizeof(__be32));
...
...
@@ -795,7 +795,7 @@
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -38
86,14 +3886
,16 @@
static bool tcp_parse_aligned_timestamp(
@@ -38
92,14 +3892
,16 @@
static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);
...
...
target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch
浏览文件 @
f09c4d35
...
...
@@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -36
7,7 +367
,7 @@
struct tcp_sock {
@@ -36
8,7 +368
,7 @@
struct tcp_sock {
u32 *saved_syn;
};
...
...
@@ -27,7 +27,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
TSQ_THROTTLED,
TSQ_QUEUED,
TCP_TSQ_DEFERRED, /* tcp_tasklet_func() found socket was owned */
@@ -37
8,6 +378
,15 @@
enum tsq_flags {
@@ -37
9,6 +379
,15 @@
enum tsq_flags {
*/
};
...
...
target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
浏览文件 @
f09c4d35
...
...
@@ -615,7 +615,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
buf_int_enable_value |= NPS_ENET_ENABLE << RX_RDY_SHIFT;
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -16
15,7 +1615
,7 @@
static int fec_enet_rx_napi(struct napi_
@@ -16
23,7 +1623
,7 @@
static int fec_enet_rx_napi(struct napi_
fec_enet_tx(ndev);
if (pkts < budget) {
...
...
target/linux/generic/hack-4.9/207-disable-modorder.patch
浏览文件 @
f09c4d35
...
...
@@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/Makefile
+++ b/Makefile
@@ -1
197,7 +1197
,6 @@
all: modules
@@ -1
200,7 +1200
,6 @@
all: modules
PHONY += modules
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
...
...
@@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
@@ -12
27,7 +1226
,6 @@
_modinst_:
@@ -12
30,7 +1229
,6 @@
_modinst_:
rm -f $(MODLIB)/build ; \
ln -s $(CURDIR) $(MODLIB)/build ; \
fi
...
...
target/linux/generic/hack-4.9/902-debloat_proc.patch
浏览文件 @
f09c4d35
...
...
@@ -243,7 +243,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -179
1,10 +1791
,12 @@
static int __init setup_vmstat(void)
@@ -179
2,10 +1792
,12 @@
static int __init setup_vmstat(void)
cpu_notifier_register_done();
#endif
#ifdef CONFIG_PROC_FS
...
...
target/linux/generic/pending-4.4/208-disable-modorder.patch
浏览文件 @
f09c4d35
...
...
@@ -5,7 +5,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
--- a/Makefile
+++ b/Makefile
@@ -11
18,7 +1118
,6 @@
all: modules
@@ -11
21,7 +1121
,6 @@
all: modules
PHONY += modules
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
...
...
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
@@ -11
48,7 +1147
,6 @@
_modinst_:
@@ -11
51,7 +1150
,6 @@
_modinst_:
rm -f $(MODLIB)/build ; \
ln -s $(CURDIR) $(MODLIB)/build ; \
fi
...
...
target/linux/generic/pending-4.4/653-disable_netlink_trim.patch
浏览文件 @
f09c4d35
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -12
28,24 +1228
,7 @@
void netlink_detachskb(struct sock *sk,
@@ -12
31,24 +1231
,7 @@
void netlink_detachskb(struct sock *sk,
static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
{
...
...
target/linux/generic/pending-4.4/902-debloat_proc.patch
浏览文件 @
f09c4d35
...
...
@@ -133,7 +133,7 @@
}
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -155
5,10 +1555
,12 @@
static int __init setup_vmstat(void)
@@ -155
6,10 +1556
,12 @@
static int __init setup_vmstat(void)
cpu_notifier_register_done();
#endif
#ifdef CONFIG_PROC_FS
...
...
target/linux/generic/pending-4.4/921-use_preinit_as_init.patch
浏览文件 @
f09c4d35
--- a/init/main.c
+++ b/init/main.c
@@ -96
4,7 +964
,8 @@
static int __ref kernel_init(void *unuse
@@ -96
6,7 +966
,8 @@
static int __ref kernel_init(void *unuse
panic("Requested init %s failed (error %d).",
execute_command, ret);
}
...
...
target/linux/generic/pending-4.4/995-mangle_bootargs.patch
浏览文件 @
f09c4d35
--- a/init/main.c
+++ b/init/main.c
@@ -35
5,6 +355
,29 @@
static inline void setup_nr_cpu_ids(void
@@ -35
6,6 +356
,29 @@
static inline void setup_nr_cpu_ids(void
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
#endif
...
...
@@ -30,7 +30,7 @@
/*
* We need to store the untouched command line for future reference.
* We also need to store the touched command line since the parameter
@@ -52
7,6 +550
,7 @@
asmlinkage __visible void __init start_k
@@ -52
9,6 +552
,7 @@
asmlinkage __visible void __init start_k
pr_notice("%s", linux_banner);
setup_arch(&command_line);
mm_init_cpumask(&init_mm);
...
...
target/linux/generic/pending-4.9/920-mangle_bootargs.patch
浏览文件 @
f09c4d35
...
...
@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
help
--- a/init/main.c
+++ b/init/main.c
@@ -35
1,6 +351
,29 @@
static inline void setup_nr_cpu_ids(void
@@ -35
2,6 +352
,29 @@
static inline void setup_nr_cpu_ids(void
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
#endif
...
...
@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
/*
* We need to store the untouched command line for future reference.
* We also need to store the touched command line since the parameter
@@ -50
3,6 +526
,7 @@
asmlinkage __visible void __init start_k
@@ -50
5,6 +528
,7 @@
asmlinkage __visible void __init start_k
pr_notice("%s", linux_banner);
setup_arch(&command_line);
mm_init_cpumask(&init_mm);
...
...
target/linux/ipq806x/patches-4.9/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
浏览文件 @
f09c4d35
...
...
@@ -157,7 +157,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
}
--- a/init/main.c
+++ b/init/main.c
@@ -8
7,6 +87
,10 @@
@@ -8
8,6 +88
,10 @@
#include <asm/sections.h>
#include <asm/cacheflush.h>
...
...
@@ -168,7 +168,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
static int kernel_init(void *);
extern void init_IRQ(void);
@@ -53
7,6 +541
,18 @@
asmlinkage __visible void __init start_k
@@ -53
9,6 +543
,18 @@
asmlinkage __visible void __init start_k
page_alloc_init();
pr_notice("Kernel command line: %s\n", boot_command_line);
...
...
target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch
浏览文件 @
f09c4d35
...
...
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -10
67,15 +1067
,28 @@
static void mvneta_defaults_set(struct m
@@ -10
71,15 +1071
,28 @@
static void mvneta_defaults_set(struct m
MVNETA_GMAC_AN_SPEED_EN |
MVNETA_GMAC_AN_DUPLEX_EN;
mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);
...
...
@@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
mvneta_set_ucast_table(pp, -1);
@@ -32
28,9 +3241
,6 @@
static int mvneta_port_power_up(struct m
@@ -32
32,9 +3245
,6 @@
static int mvneta_port_power_up(struct m
return -EINVAL;
}
...
...
target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch
浏览文件 @
f09c4d35
...
...
@@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
u64 ethtool_stats[ARRAY_SIZE(mvneta_statistics)];
};
@@ -97
3,6 +973
,44 @@
static void mvneta_set_other_mcast_table
@@ -97
7,6 +977
,44 @@
static void mvneta_set_other_mcast_table
mvreg_write(pp, MVNETA_DA_FILT_OTH_MCAST + offset, val);
}
...
...
@@ -77,7 +77,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* This method sets defaults to the NETA port:
* Clears interrupt Cause and Mask registers.
* Clears all MAC tables.
@@ -10
58,39 +1096
,7 @@
static void mvneta_defaults_set(struct m
@@ -10
62,39 +1100
,7 @@
static void mvneta_defaults_set(struct m
val &= ~MVNETA_PHY_POLLING_ENABLE;
mvreg_write(pp, MVNETA_UNIT_CONTROL, val);
...
...
@@ -118,7 +118,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvneta_set_ucast_table(pp, -1);
mvneta_set_special_mcast_table(pp, -1);
mvneta_set_other_mcast_table(pp, -1);
@@ -295
4,10 +2960
,43 @@
int mvneta_ethtool_get_settings(struct n
@@ -295
8,10 +2964
,43 @@
int mvneta_ethtool_get_settings(struct n
int mvneta_ethtool_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct mvneta_port *pp = netdev_priv(dev);
...
...
target/linux/mvebu/patches-4.4/032-net-mvneta-Make-the-default-queue-related-for-each-p.patch
浏览文件 @
f09c4d35
...
...
@@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
/* Stop the Ethernet port activity */
@@ -10
67,7 +1068
,7 @@
static void mvneta_defaults_set(struct m
@@ -10
71,7 +1072
,7 @@
static void mvneta_defaults_set(struct m
mvreg_write(pp, MVNETA_ACC_MODE, val);
/* Update val of portCfg register accordingly with all RxQueue types */
...
...
@@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvreg_write(pp, MVNETA_PORT_CONFIG, val);
val = 0;
@@ -210
1,19 +2102
,19 @@
static void mvneta_set_rx_mode(struct ne
@@ -210
5,19 +2106
,19 @@
static void mvneta_set_rx_mode(struct ne
if (dev->flags & IFF_PROMISC) {
/* Accept all: Multicast + Unicast */
mvneta_rx_unicast_promisc_set(pp, 1);
...
...
@@ -63,7 +63,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
} else {
/* Accept only initialized multicast */
mvneta_set_special_mcast_table(pp, -1);
@@ -212
2,7 +2123
,7 @@
static void mvneta_set_rx_mode(struct ne
@@ -212
6,7 +2127
,7 @@
static void mvneta_set_rx_mode(struct ne
if (!netdev_mc_empty(dev)) {
netdev_for_each_mc_addr(ha, dev) {
mvneta_mcast_addr_set(pp, ha->addr,
...
...
@@ -72,7 +72,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
}
}
@@ -220
5,7 +2206
,7 @@
static int mvneta_poll(struct napi_struc
@@ -220
9,7 +2210
,7 @@
static int mvneta_poll(struct napi_struc
* RX packets
*/
cause_rx_tx |= port->cause_rx_tx;
...
...
@@ -81,7 +81,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
budget -= rx_done;
if (budget > 0) {
@@ -24
18,17 +2419
,17 @@
static void mvneta_cleanup_txqs(struct m
@@ -24
22,17 +2423
,17 @@
static void mvneta_cleanup_txqs(struct m
/* Cleanup all Rx queues */
static void mvneta_cleanup_rxqs(struct mvneta_port *pp)
{
...
...
@@ -102,7 +102,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvneta_cleanup_rxqs(pp);
return err;
}
@@ -263
4,7 +2635
,7 @@
static int mvneta_set_mac_addr(struct ne
@@ -263
8,7 +2639
,7 @@
static int mvneta_set_mac_addr(struct ne
mvneta_mac_addr_set(pp, dev->dev_addr, -1);
/* Set new addr in hw */
...
...
@@ -111,7 +111,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
eth_commit_mac_addr_change(dev, addr);
return 0;
@@ -275
3,7 +2754
,7 @@
static void mvneta_percpu_elect(struct m
@@ -275
7,7 +2758
,7 @@
static void mvneta_percpu_elect(struct m
{
int online_cpu_idx, cpu, i = 0;
...
...
@@ -120,7 +120,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
for_each_online_cpu(cpu) {
if (i == online_cpu_idx)
@@ -336
1,6 +3362
,8 @@
static int mvneta_probe(struct platform_
@@ -336
5,6 +3366
,8 @@
static int mvneta_probe(struct platform_
strcmp(managed, "in-band-status") == 0);
pp->cpu_notifier.notifier_call = mvneta_percpu_notifier;
...
...
target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch
浏览文件 @
f09c4d35
...
...
@@ -47,7 +47,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
/* Stop the Ethernet port activity */
@@ -10
26,6 +1039
,7 @@
static void mvneta_defaults_set(struct m
@@ -10
30,6 +1043
,7 @@
static void mvneta_defaults_set(struct m
int cpu;
int queue;
u32 val;
...
...
@@ -55,7 +55,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Clear all Cause registers */
mvreg_write(pp, MVNETA_INTR_NEW_CAUSE, 0);
@@ -104
1,13 +1055
,23 @@
static void mvneta_defaults_set(struct m
@@ -104
5,13 +1059
,23 @@
static void mvneta_defaults_set(struct m
/* Enable MBUS Retry bit16 */
mvreg_write(pp, MVNETA_MBUS_RETRY, 0x20);
...
...
@@ -85,7 +85,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Reset RX and TX DMAs */
mvreg_write(pp, MVNETA_PORT_RX_RESET, MVNETA_PORT_RX_DMA_RESET);
@@ -217
4,6 +2198
,7 @@
static int mvneta_poll(struct napi_struc
@@ -217
8,6 +2202
,7 @@
static int mvneta_poll(struct napi_struc
{
int rx_done = 0;
u32 cause_rx_tx;
...
...
@@ -93,7 +93,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
struct mvneta_port *pp = netdev_priv(napi->dev);
struct mvneta_pcpu_port *port = this_cpu_ptr(pp->ports);
@@ -220
5,8 +2230
,15 @@
static int mvneta_poll(struct napi_struc
@@ -220
9,8 +2234
,15 @@
static int mvneta_poll(struct napi_struc
/* For the case where the last mvneta_poll did not process all
* RX packets
*/
...
...
@@ -110,7 +110,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
budget -= rx_done;
if (budget > 0) {
@@ -24
19,19 +2451
,27 @@
static void mvneta_cleanup_txqs(struct m
@@ -24
23,19 +2455
,27 @@
static void mvneta_cleanup_txqs(struct m
/* Cleanup all Rx queues */
static void mvneta_cleanup_rxqs(struct mvneta_port *pp)
{
...
...
@@ -145,7 +145,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
return 0;
@@ -245
5,6 +2495
,19 @@
static int mvneta_setup_txqs(struct mvne
@@ -245
9,6 +2499
,19 @@
static int mvneta_setup_txqs(struct mvne
return 0;
}
...
...
@@ -165,7 +165,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void mvneta_start_dev(struct mvneta_port *pp)
{
unsigned int cpu;
@@ -247
2,11 +2525
,10 @@
static void mvneta_start_dev(struct mvne
@@ -247
6,11 +2529
,10 @@
static void mvneta_start_dev(struct mvne
napi_enable(&port->napi);
}
...
...
@@ -181,7 +181,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvreg_write(pp, MVNETA_INTR_MISC_MASK,
MVNETA_CAUSE_PHY_STATUS_CHANGE |
MVNETA_CAUSE_LINK_CHANGE |
@@ -275
2,22 +2804
,35 @@
static void mvneta_percpu_disable(void *
@@ -275
6,22 +2808
,35 @@
static void mvneta_percpu_disable(void *
static void mvneta_percpu_elect(struct mvneta_port *pp)
{
...
...
@@ -227,7 +227,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
};
@@ -280
2,12 +2867
,22 @@
static int mvneta_percpu_notifier(struct
@@ -280
6,12 +2871
,22 @@
static int mvneta_percpu_notifier(struct
mvreg_write(pp, MVNETA_INTR_MISC_MASK, 0);
napi_enable(&port->napi);
...
...
@@ -251,7 +251,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvreg_write(pp, MVNETA_INTR_NEW_MASK,
MVNETA_RX_INTR_MASK(rxq_number) |
MVNETA_TX_INTR_MASK(txq_number) |
@@ -28
58,7 +2933
,7 @@
static int mvneta_percpu_notifier(struct
@@ -28
62,7 +2937
,7 @@
static int mvneta_percpu_notifier(struct
static int mvneta_open(struct net_device *dev)
{
struct mvneta_port *pp = netdev_priv(dev);
...
...
@@ -260,7 +260,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
pp->pkt_size = MVNETA_RX_PKT_SIZE(pp->dev->mtu);
pp->frag_size = SKB_DATA_ALIGN(MVNETA_RX_BUF_SIZE(pp->pkt_size)) +
@@ -28
88,8 +2963
,13 @@
static int mvneta_open(struct net_device
@@ -28
92,8 +2967
,13 @@
static int mvneta_open(struct net_device
*/
mvneta_percpu_disable(pp);
...
...
target/linux/mvebu/patches-4.4/034-net-mvneta-Add-naive-RSS-support.patch
浏览文件 @
f09c4d35
...
...
@@ -34,7 +34,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
};
/* The mvneta_tx_desc and mvneta_rx_desc structures describe the
@@ -10
67,7 +1074
,7 @@
static void mvneta_defaults_set(struct m
@@ -10
71,7 +1078
,7 @@
static void mvneta_defaults_set(struct m
if ((rxq % max_cpu) == cpu)
rxq_map |= MVNETA_CPU_RXQ_ACCESS(rxq);
...
...
@@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
txq_map = MVNETA_CPU_TXQ_ACCESS_ALL_MASK;
mvreg_write(pp, MVNETA_CPU_MAP(cpu), rxq_map | txq_map);
@@ -25
08,6 +2515
,18 @@
static void mvneta_percpu_unmask_interru
@@ -25
12,6 +2519
,18 @@
static void mvneta_percpu_unmask_interru
MVNETA_MISCINTR_INTR_MASK);
}
...
...
@@ -62,7 +62,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void mvneta_start_dev(struct mvneta_port *pp)
{
unsigned int cpu;
@@ -32
29,6 +3248
,106 @@
static int mvneta_ethtool_get_sset_count
@@ -32
33,6 +3252
,106 @@
static int mvneta_ethtool_get_sset_count
return -EOPNOTSUPP;
}
...
...
@@ -169,7 +169,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static const struct net_device_ops mvneta_netdev_ops = {
.ndo_open = mvneta_open,
.ndo_stop = mvneta_stop,
@@ -325
3,6 +3372
,10 @@
const struct ethtool_ops mvneta_eth_tool
@@ -325
7,6 +3376
,10 @@
const struct ethtool_ops mvneta_eth_tool
.get_strings = mvneta_ethtool_get_strings,
.get_ethtool_stats = mvneta_ethtool_get_stats,
.get_sset_count = mvneta_ethtool_get_sset_count,
...
...
@@ -180,7 +180,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
};
/* Initialize hw */
@@ -344
4,6 +3567
,8 @@
static int mvneta_probe(struct platform_
@@ -344
8,6 +3571
,8 @@
static int mvneta_probe(struct platform_
pp->rxq_def = rxq_def;
...
...
target/linux/mvebu/patches-4.4/035-net-mvneta-Configure-XPS-support.patch
浏览文件 @
f09c4d35
...
...
@@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
};
struct mvneta_rx_queue {
@@ -106
2,20 +1066
,30 @@
static void mvneta_defaults_set(struct m
@@ -106
6,20 +1070
,30 @@
static void mvneta_defaults_set(struct m
/* Enable MBUS Retry bit16 */
mvreg_write(pp, MVNETA_MBUS_RETRY, 0x20);
...
...
@@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvreg_write(pp, MVNETA_CPU_MAP(cpu), rxq_map | txq_map);
}
@@ -236
2,6 +2376
,8 @@
static void mvneta_rxq_deinit(struct mvn
@@ -236
6,6 +2380
,8 @@
static void mvneta_rxq_deinit(struct mvn
static int mvneta_txq_init(struct mvneta_port *pp,
struct mvneta_tx_queue *txq)
{
...
...
@@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
txq->size = pp->tx_ring_size;
/* A queue must always have room for at least one skb.
@@ -241
4,6 +2430
,14 @@
static int mvneta_txq_init(struct mvneta
@@ -241
8,6 +2434
,14 @@
static int mvneta_txq_init(struct mvneta
}
mvneta_tx_done_pkts_coal_set(pp, txq, txq->done_pkts_coal);
...
...
@@ -93,7 +93,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return 0;
}
@@ -28
36,13 +2860
,23 @@
static void mvneta_percpu_elect(struct m
@@ -28
40,13 +2864
,23 @@
static void mvneta_percpu_elect(struct m
if ((rxq % max_cpu) == cpu)
rxq_map |= MVNETA_CPU_RXQ_ACCESS(rxq);
...
...
target/linux/mvebu/patches-4.4/036-net-mvneta-fix-trivial-cut-off-issue-in-mvneta_ethto.patch
浏览文件 @
f09c4d35
...
...
@@ -13,7 +13,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -324
0,26 +3240
,25 @@
static void mvneta_ethtool_update_stats(
@@ -324
4,26 +3244
,25 @@
static void mvneta_ethtool_update_stats(
const struct mvneta_statistic *s;
void __iomem *base = pp->base;
u32 high, low, val;
...
...
target/linux/mvebu/patches-4.4/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch
浏览文件 @
f09c4d35
...
...
@@ -20,7 +20,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -28
47,9 +2847
,14 @@
static void mvneta_percpu_disable(void *
@@ -28
51,9 +2851
,14 @@
static void mvneta_percpu_disable(void *
static void mvneta_percpu_elect(struct mvneta_port *pp)
{
...
...
@@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
max_cpu = num_present_cpus();
for_each_online_cpu(cpu) {
@@ -286
0,7 +2865
,7 @@
static void mvneta_percpu_elect(struct m
@@ -286
4,7 +2869
,7 @@
static void mvneta_percpu_elect(struct m
if ((rxq % max_cpu) == cpu)
rxq_map |= MVNETA_CPU_RXQ_ACCESS(rxq);
...
...
@@ -46,7 +46,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Map the default receive queue queue to the
* elected CPU
*/
@@ -287
1,7 +2876
,7 @@
static void mvneta_percpu_elect(struct m
@@ -287
5,7 +2880
,7 @@
static void mvneta_percpu_elect(struct m
* the CPU bound to the default RX queue
*/
if (txq_number == 1)
...
...
target/linux/mvebu/patches-4.4/039-net-mvneta-Use-on_each_cpu-when-possible.patch
浏览文件 @
f09c4d35
...
...
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -255
3,7 +2553
,7 @@
static void mvneta_percpu_mask_interrupt
@@ -255
7,7 +2557
,7 @@
static void mvneta_percpu_mask_interrupt
static void mvneta_start_dev(struct mvneta_port *pp)
{
...
...
@@ -23,7 +23,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvneta_max_rx_size_set(pp, pp->pkt_size);
mvneta_txq_max_tx_size_set(pp, pp->pkt_size);
@@ -25
69,9 +2569
,8 @@
static void mvneta_start_dev(struct mvne
@@ -25
73,9 +2573
,8 @@
static void mvneta_start_dev(struct mvne
}
/* Unmask interrupts. It has to be done from each CPU */
...
...
@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvreg_write(pp, MVNETA_INTR_MISC_MASK,
MVNETA_CAUSE_PHY_STATUS_CHANGE |
MVNETA_CAUSE_LINK_CHANGE |
@@ -299
1,7 +2990
,7 @@
static int mvneta_percpu_notifier(struct
@@ -299
5,7 +2994
,7 @@
static int mvneta_percpu_notifier(struct
static int mvneta_open(struct net_device *dev)
{
struct mvneta_port *pp = netdev_priv(dev);
...
...
@@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
pp->pkt_size = MVNETA_RX_PKT_SIZE(pp->dev->mtu);
pp->frag_size = SKB_DATA_ALIGN(MVNETA_RX_BUF_SIZE(pp->pkt_size)) +
@@ -302
4,9 +3023
,7 @@
static int mvneta_open(struct net_device
@@ -302
8,9 +3027
,7 @@
static int mvneta_open(struct net_device
/* Enable per-CPU interrupt on all the CPU to handle our RX
* queue interrupts
*/
...
...
@@ -55,7 +55,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Register a CPU notifier to handle the case where our CPU
@@ -331
3,9 +3310
,7 @@
static int mvneta_config_rss(struct mvn
@@ -331
7,9 +3314
,7 @@
static int mvneta_config_rss(struct mvn
netif_tx_stop_all_queues(pp->dev);
...
...
target/linux/mvebu/patches-4.4/040-net-mvneta-Modify-the-queue-related-fields-from-each.patch
浏览文件 @
f09c4d35
...
...
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -10
36,6 +1036
,43 @@
static void mvneta_set_autoneg(struct mv
@@ -10
40,6 +1040
,43 @@
static void mvneta_set_autoneg(struct mv
}
}
...
...
@@ -61,7 +61,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* This method sets defaults to the NETA port:
* Clears interrupt Cause and Mask registers.
* Clears all MAC tables.
@@ -105
3,14 +1090
,10 @@
static void mvneta_defaults_set(struct m
@@ -105
7,14 +1094
,10 @@
static void mvneta_defaults_set(struct m
int max_cpu = num_present_cpus();
/* Clear all Cause registers */
...
...
@@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvreg_write(pp, MVNETA_INTR_ENABLE, 0);
/* Enable MBUS Retry bit16 */
@@ -25
26,31 +2559
,6 @@
static int mvneta_setup_txqs(struct mvne
@@ -25
30,31 +2563
,6 @@
static int mvneta_setup_txqs(struct mvne
return 0;
}
...
...
@@ -110,7 +110,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void mvneta_start_dev(struct mvneta_port *pp)
{
int cpu;
@@ -260
1,13 +2609
,10 @@
static void mvneta_stop_dev(struct mvnet
@@ -260
5,13 +2613
,10 @@
static void mvneta_stop_dev(struct mvnet
mvneta_port_disable(pp);
/* Clear all ethernet port interrupts */
...
...
@@ -126,7 +126,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvneta_tx_reset(pp);
mvneta_rx_reset(pp);
@@ -29
19,9 +2924
,7 @@
static int mvneta_percpu_notifier(struct
@@ -29
23,9 +2928
,7 @@
static int mvneta_percpu_notifier(struct
}
/* Mask all ethernet port interrupts */
...
...
@@ -137,7 +137,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
napi_enable(&port->napi);
@@ -29
36,14 +2939
,8 @@
static int mvneta_percpu_notifier(struct
@@ -29
40,14 +2943
,8 @@
static int mvneta_percpu_notifier(struct
*/
mvneta_percpu_elect(pp);
...
...
@@ -154,7 +154,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvreg_write(pp, MVNETA_INTR_MISC_MASK,
MVNETA_CAUSE_PHY_STATUS_CHANGE |
MVNETA_CAUSE_LINK_CHANGE |
@@ -295
4,9 +2951
,7 @@
static int mvneta_percpu_notifier(struct
@@ -295
8,9 +2955
,7 @@
static int mvneta_percpu_notifier(struct
case CPU_DOWN_PREPARE_FROZEN:
netif_tx_stop_all_queues(pp->dev);
/* Mask all ethernet port interrupts */
...
...
@@ -165,7 +165,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
napi_synchronize(&port->napi);
napi_disable(&port->napi);
@@ -297
2,10 +2967
,7 @@
static int mvneta_percpu_notifier(struct
@@ -297
6,10 +2971
,7 @@
static int mvneta_percpu_notifier(struct
/* Check if a new CPU must be elected now this on is down */
mvneta_percpu_elect(pp);
/* Unmask all ethernet port interrupts */
...
...
target/linux/mvebu/patches-4.4/041-net-mvneta-The-mvneta_percpu_elect-function-should-b.patch
浏览文件 @
f09c4d35
...
...
@@ -31,7 +31,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Core clock */
struct clk *clk;
@@ -285
3,6 +2857
,12 @@
static void mvneta_percpu_elect(struct m
@@ -285
7,6 +2861
,12 @@
static void mvneta_percpu_elect(struct m
{
int elected_cpu = 0, max_cpu, cpu, i = 0;
...
...
@@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Use the cpu associated to the rxq when it is online, in all
* the other cases, use the cpu 0 which can't be offline.
*/
@@ -2
896,6 +2906
,7 @@
static void mvneta_percpu_elect(struct m
@@ -2
900,6 +2910
,7 @@
static void mvneta_percpu_elect(struct m
i++;
}
...
...
@@ -52,7 +52,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
};
static int mvneta_percpu_notifier(struct notifier_block *nfb,
@@ -295
0,8 +2961
,13 @@
static int mvneta_percpu_notifier(struct
@@ -295
4,8 +2965
,13 @@
static int mvneta_percpu_notifier(struct
case CPU_DOWN_PREPARE:
case CPU_DOWN_PREPARE_FROZEN:
netif_tx_stop_all_queues(pp->dev);
...
...
target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch
浏览文件 @
f09c4d35
...
...
@@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Core clock */
struct clk *clk;
@@ -285
3,16 +2854
,14 @@
static void mvneta_percpu_disable(void *
@@ -285
7,16 +2858
,14 @@
static void mvneta_percpu_disable(void *
disable_percpu_irq(pp->dev->irq);
}
...
...
@@ -47,7 +47,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Use the cpu associated to the rxq when it is online, in all
* the other cases, use the cpu 0 which can't be offline.
*/
@@ -29
06,7 +2905
,6 @@
static void mvneta_percpu_elect(struct m
@@ -29
10,7 +2909
,6 @@
static void mvneta_percpu_elect(struct m
i++;
}
...
...
@@ -55,7 +55,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
};
static int mvneta_percpu_notifier(struct notifier_block *nfb,
@@ -292
0,6 +2918
,14 @@
static int mvneta_percpu_notifier(struct
@@ -292
4,6 +2922
,14 @@
static int mvneta_percpu_notifier(struct
switch (action) {
case CPU_ONLINE:
case CPU_ONLINE_FROZEN:
...
...
@@ -70,7 +70,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
netif_tx_stop_all_queues(pp->dev);
/* We have to synchronise on tha napi of each CPU
@@ -29
57,6 +2963
,7 @@
static int mvneta_percpu_notifier(struct
@@ -29
61,6 +2967
,7 @@
static int mvneta_percpu_notifier(struct
MVNETA_CAUSE_LINK_CHANGE |
MVNETA_CAUSE_PSC_SYNC_CHANGE);
netif_tx_start_all_queues(pp->dev);
...
...
@@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
break;
case CPU_DOWN_PREPARE:
case CPU_DOWN_PREPARE_FROZEN:
@@ -298
1,7 +2988
,9 @@
static int mvneta_percpu_notifier(struct
@@ -298
5,7 +2992
,9 @@
static int mvneta_percpu_notifier(struct
case CPU_DEAD:
case CPU_DEAD_FROZEN:
/* Check if a new CPU must be elected now this on is down */
...
...
@@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Unmask all ethernet port interrupts */
on_each_cpu(mvneta_percpu_unmask_interrupt, pp, true);
mvreg_write(pp, MVNETA_INTR_MISC_MASK,
@@ -303
3,7 +3042
,7 @@
static int mvneta_open(struct net_device
@@ -303
7,7 +3046
,7 @@
static int mvneta_open(struct net_device
*/
on_each_cpu(mvneta_percpu_enable, pp, true);
...
...
@@ -97,7 +97,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Register a CPU notifier to handle the case where our CPU
* might be taken offline.
*/
@@ -30
66,9 +3075
,18 @@
static int mvneta_stop(struct net_device
@@ -30
70,9 +3079
,18 @@
static int mvneta_stop(struct net_device
{
struct mvneta_port *pp = netdev_priv(dev);
...
...
@@ -116,7 +116,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
on_each_cpu(mvneta_percpu_disable, pp, true);
free_percpu_irq(dev->irq, pp->ports);
mvneta_cleanup_rxqs(pp);
@@ -33
39,7 +3357
,9 @@
static int mvneta_config_rss(struct mvn
@@ -33
43,7 +3361
,9 @@
static int mvneta_config_rss(struct mvn
mvreg_write(pp, MVNETA_PORT_CONFIG, val);
/* Update the elected CPU matching the new rxq_def */
...
...
target/linux/mvebu/patches-4.4/045-net-mvneta-bm-add-support-for-hardware-buffer-manage.patch
浏览文件 @
f09c4d35
...
...
@@ -495,7 +495,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Start the Ethernet port RX and TX activity */
static void mvneta_port_up(struct mvneta_port *pp)
{
@@ -11
47,9 +1379
,17 @@
static void mvneta_defaults_set(struct m
@@ -11
51,9 +1383
,17 @@
static void mvneta_defaults_set(struct m
mvreg_write(pp, MVNETA_PORT_RX_RESET, 0);
/* Set Port Acceleration Mode */
...
...
@@ -514,7 +514,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Update val of portCfg register accordingly with all RxQueue types */
val = MVNETA_PORT_CONFIG_DEFL_VALUE(pp->rxq_def);
mvreg_write(pp, MVNETA_PORT_CONFIG, val);
@@ -15
16,23 +1756
,25 @@
static void mvneta_txq_done(struct mvnet
@@ -15
20,23 +1760
,25 @@
static void mvneta_txq_done(struct mvnet
}
}
...
...
@@ -547,7 +547,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int mvneta_rx_refill(struct mvneta_port *pp,
struct mvneta_rx_desc *rx_desc)
@@ -154
0,7 +1782
,7 @@
static int mvneta_rx_refill(struct mvnet
@@ -154
4,7 +1786
,7 @@
static int mvneta_rx_refill(struct mvnet
dma_addr_t phys_addr;
void *data;
...
...
@@ -556,7 +556,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (!data)
return -ENOMEM;
@@ -15
48,7 +1790
,7 @@
static int mvneta_rx_refill(struct mvnet
@@ -15
52,7 +1794
,7 @@
static int mvneta_rx_refill(struct mvnet
MVNETA_RX_BUF_SIZE(pp->pkt_size),
DMA_FROM_DEVICE);
if (unlikely(dma_mapping_error(pp->dev->dev.parent, phys_addr))) {
...
...
@@ -565,7 +565,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return -ENOMEM;
}
@@ -159
4,22 +1836
,156 @@
static void mvneta_rxq_drop_pkts(struct
@@ -159
8,22 +1840
,156 @@
static void mvneta_rxq_drop_pkts(struct
int rx_done, i;
rx_done = mvneta_rxq_busy_desc_num_get(pp, rxq);
...
...
@@ -728,7 +728,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
{
struct mvneta_pcpu_port *port = this_cpu_ptr(pp->ports);
struct net_device *dev = pp->dev;
@@ -16
28,21 +2004
,29 @@
static int mvneta_rx(struct mvneta_port
@@ -16
32,21 +2008
,29 @@
static int mvneta_rx(struct mvneta_port
/* Fairness NAPI loop */
while (rx_done < rx_todo) {
struct mvneta_rx_desc *rx_desc = mvneta_rxq_next_desc_get(rxq);
...
...
@@ -760,7 +760,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
dev->stats.rx_errors++;
mvneta_rx_error(pp, rx_desc);
/* leave the descriptor untouched */
@@ -165
3,7 +2037
,7 @@
static int mvneta_rx(struct mvneta_port
@@ -165
7,7 +2041
,7 @@
static int mvneta_rx(struct mvneta_port
/* better copy a small frame and not unmap the DMA region */
skb = netdev_alloc_skb_ip_align(dev, rx_bytes);
if (unlikely(!skb))
...
...
@@ -769,7 +769,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
dma_sync_single_range_for_cpu(dev->dev.parent,
rx_desc->buf_phys_addr,
@@ -167
1,26 +2055
,31 @@
static int mvneta_rx(struct mvneta_port
@@ -167
5,26 +2059
,31 @@
static int mvneta_rx(struct mvneta_port
rcvd_pkts++;
rcvd_bytes += rx_bytes;
...
...
@@ -807,7 +807,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (!skb)
goto err_drop_frame;
@@ -229
5,7 +2684
,10 @@
static int mvneta_poll(struct napi_struc
@@ -229
9,7 +2688
,10 @@
static int mvneta_poll(struct napi_struc
if (rx_queue) {
rx_queue = rx_queue - 1;
...
...
@@ -819,7 +819,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
budget -= rx_done;
@@ -238
4,9 +2776
,17 @@
static int mvneta_rxq_init(struct mvneta
@@ -238
8,9 +2780
,17 @@
static int mvneta_rxq_init(struct mvneta
mvneta_rx_pkts_coal_set(pp, rxq, rxq->pkts_coal);
mvneta_rx_time_coal_set(pp, rxq, rxq->time_coal);
...
...
@@ -840,7 +840,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvneta_rxq_fill(pp, rxq, rxq->size);
return 0;
@@ -26
59,6 +3059
,9 @@
static int mvneta_change_mtu(struct net_
@@ -26
63,6 +3063
,9 @@
static int mvneta_change_mtu(struct net_
dev->mtu = mtu;
if (!netif_running(dev)) {
...
...
@@ -850,7 +850,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
netdev_update_features(dev);
return 0;
}
@@ -267
1,6 +3074
,9 @@
static int mvneta_change_mtu(struct net_
@@ -267
5,6 +3078
,9 @@
static int mvneta_change_mtu(struct net_
mvneta_cleanup_txqs(pp);
mvneta_cleanup_rxqs(pp);
...
...
@@ -860,7 +860,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
pp->pkt_size = MVNETA_RX_PKT_SIZE(dev->mtu);
pp->frag_size = SKB_DATA_ALIGN(MVNETA_RX_BUF_SIZE(pp->pkt_size)) +
SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
@@ -356
3,6 +3969
,7 @@
static int mvneta_probe(struct platform_
@@ -356
7,6 +3973
,7 @@
static int mvneta_probe(struct platform_
struct resource *res;
struct device_node *dn = pdev->dev.of_node;
struct device_node *phy_node;
...
...
@@ -868,7 +868,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
struct mvneta_port *pp;
struct net_device *dev;
const char *dt_mac_addr;
@@ -369
0,26 +4097
,39 @@
static int mvneta_probe(struct platform_
@@ -369
4,26 +4101
,39 @@
static int mvneta_probe(struct platform_
pp->tx_csum_limit = tx_csum_limit;
...
...
@@ -914,7 +914,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
for_each_present_cpu(cpu) {
struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu);
@@ -374
4,6 +4164
,13 @@
static int mvneta_probe(struct platform_
@@ -374
8,6 +4168
,13 @@
static int mvneta_probe(struct platform_
return 0;
...
...
@@ -928,7 +928,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
err_free_stats:
free_percpu(pp->stats);
err_free_ports:
@@ -377
3,6 +4200
,12 @@
static int mvneta_remove(struct platform
@@ -377
7,6 +4204
,12 @@
static int mvneta_remove(struct platform
of_node_put(pp->phy_node);
free_netdev(dev);
...
...
target/linux/mvebu/patches-4.4/046-net-mvneta-Use-the-new-hwbm-framework.patch
浏览文件 @
f09c4d35
...
...
@@ -64,7 +64,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
goto bm_mtu_err;
}
mvneta_bm_pool_bufsize_set(pp, bm_pool->buf_size, bm_pool->id);
@@ -206
4,14 +2066
,14 @@
err_drop_frame:
@@ -206
8,14 +2070
,14 @@
err_drop_frame:
}
/* Refill processing */
...
...
target/linux/mvebu/patches-4.4/047-net-mvneta-Fix-spinlock-usage.patch
浏览文件 @
f09c4d35
...
...
@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -348
4,17 +3484
,17 @@
static int mvneta_stop(struct net_device
@@ -348
8,17 +3488
,17 @@
static int mvneta_stop(struct net_device
struct mvneta_port *pp = netdev_priv(dev);
/* Inform that we are stopping so we don't want to setup the
...
...
@@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
on_each_cpu(mvneta_percpu_disable, pp, true);
free_percpu_irq(dev->irq, pp->ports);
mvneta_cleanup_rxqs(pp);
@@ -40
27,6 +4027
,7 @@
static int mvneta_probe(struct platform_
@@ -40
31,6 +4031
,7 @@
static int mvneta_probe(struct platform_
dev->ethtool_ops = &mvneta_eth_tool_ops;
pp = netdev_priv(dev);
...
...
target/linux/mvebu/patches-4.4/049-net-mvneta-replace-MVNETA_CPU_D_CACHE_LINE_SIZE-with.patch
浏览文件 @
f09c4d35
...
...
@@ -33,7 +33,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#define IS_TSO_HEADER(txq, addr) \
((addr >= txq->tso_hdrs_phys) && \
@@ -276
2,9 +2761
,6 @@
static int mvneta_rxq_init(struct mvneta
@@ -276
6,9 +2765
,6 @@
static int mvneta_rxq_init(struct mvneta
if (rxq->descs == NULL)
return -ENOMEM;
...
...
@@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
rxq->last_desc = rxq->size - 1;
/* Set Rx descriptors queue starting address */
@@ -283
5,10 +2831
,6 @@
static int mvneta_txq_init(struct mvneta
@@ -283
9,10 +2835
,6 @@
static int mvneta_txq_init(struct mvneta
if (txq->descs == NULL)
return -ENOMEM;
...
...
target/linux/mvebu/patches-4.4/050-net-mvneta-fix-changing-MTU-when-using-per-cpu-proce.patch
浏览文件 @
f09c4d35
...
...
@@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -304
0,6 +3040
,20 @@
static int mvneta_check_mtu_valid(struct
@@ -304
4,6 +3044
,20 @@
static int mvneta_check_mtu_valid(struct
return mtu;
}
...
...
@@ -36,7 +36,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Change the device mtu */
static int mvneta_change_mtu(struct net_device *dev, int mtu)
{
@@ -306
4,6 +3078
,7 @@
static int mvneta_change_mtu(struct net_
@@ -306
8,6 +3082
,7 @@
static int mvneta_change_mtu(struct net_
* reallocation of the queues
*/
mvneta_stop_dev(pp);
...
...
@@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvneta_cleanup_txqs(pp);
mvneta_cleanup_rxqs(pp);
@@ -30
87,6 +3102
,7 @@
static int mvneta_change_mtu(struct net_
@@ -30
91,6 +3106
,7 @@
static int mvneta_change_mtu(struct net_
return ret;
}
...
...
@@ -52,7 +52,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvneta_start_dev(pp);
mvneta_port_up(pp);
@@ -324
0,20 +3256
,6 @@
static void mvneta_mdio_remove(struct mv
@@ -324
4,20 +3260
,6 @@
static void mvneta_mdio_remove(struct mv
pp->phy_dev = NULL;
}
...
...
target/linux/mvebu/patches-4.4/134-net-mvneta-convert-to-phylink.patch
浏览文件 @
f09c4d35
...
...
@@ -79,7 +79,18 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
struct mvneta_bm *bm_priv;
struct mvneta_bm_pool *pool_long;
@@ -1236,44 +1238,6 @@
static void mvneta_set_other_mcast_table
@@ -1177,10 +1179,6 @@
static void mvneta_port_disable(struct m
val &= ~MVNETA_GMAC0_PORT_ENABLE;
mvreg_write(pp, MVNETA_GMAC_CTRL_0, val);
- pp->link = 0;
- pp->duplex = -1;
- pp->speed = 0;
-
udelay(200);
}
@@ -1240,44 +1238,6 @@
static void mvneta_set_other_mcast_table
mvreg_write(pp, MVNETA_DA_FILT_OTH_MCAST + offset, val);
}
...
...
@@ -124,7 +135,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
static void mvneta_percpu_unmask_interrupt(void *arg)
{
struct mvneta_port *pp = arg;
@@ -142
1
,7 +1385,6 @@
static void mvneta_defaults_set(struct m
@@ -142
5
,7 +1385,6 @@
static void mvneta_defaults_set(struct m
val &= ~MVNETA_PHY_POLLING_ENABLE;
mvreg_write(pp, MVNETA_UNIT_CONTROL, val);
...
...
@@ -132,7 +143,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
mvneta_set_ucast_table(pp, -1);
mvneta_set_special_mcast_table(pp, -1);
mvneta_set_other_mcast_table(pp, -1);
@@ -261
4
,26 +2577,11 @@
static irqreturn_t mvneta_isr(int irq, v
@@ -261
8
,26 +2577,11 @@
static irqreturn_t mvneta_isr(int irq, v
return IRQ_HANDLED;
}
...
...
@@ -161,7 +172,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
/* NAPI handler
@@ -266
2
,12 +2610,11 @@
static int mvneta_poll(struct napi_struc
@@ -266
6
,12 +2610,11 @@
static int mvneta_poll(struct napi_struc
u32 cause_misc = mvreg_read(pp, MVNETA_INTR_MISC_CAUSE);
mvreg_write(pp, MVNETA_INTR_MISC_CAUSE, 0);
...
...
@@ -179,7 +190,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
/* Release Tx descriptors */
@@ -298
3
,7 +2930,7 @@
static void mvneta_start_dev(struct mvne
@@ -298
7
,7 +2930,7 @@
static void mvneta_start_dev(struct mvne
MVNETA_CAUSE_LINK_CHANGE |
MVNETA_CAUSE_PSC_SYNC_CHANGE);
...
...
@@ -188,7 +199,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
netif_tx_start_all_queues(pp->dev);
}
@@ -299
1
,7 +2938,7 @@
static void mvneta_stop_dev(struct mvnet
@@ -299
5
,7 +2938,7 @@
static void mvneta_stop_dev(struct mvnet
{
unsigned int cpu;
...
...
@@ -197,7 +208,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
for_each_online_cpu(cpu) {
struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu);
@@ -316
1
,99 +3108,219 @@
static int mvneta_set_mac_addr(struct ne
@@ -316
5
,99 +3108,219 @@
static int mvneta_set_mac_addr(struct ne
return 0;
}
...
...
@@ -438,13 +449,6 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
- struct phy_device *phy_dev;
+ struct mvneta_port *pp = netdev_priv(ndev);
+ u32 val;
+
+ if (mode == MLO_AN_PHY || mode == MLO_AN_FIXED) {
+ val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG);
+ val &= ~MVNETA_GMAC_FORCE_LINK_DOWN;
+ val |= MVNETA_GMAC_FORCE_LINK_PASS;
+ mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);
+ }
- phy_dev = of_phy_connect(pp->dev, pp->phy_node, mvneta_adjust_link, 0,
- pp->phy_interface);
...
...
@@ -460,10 +464,17 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
- pp->link = 0;
- pp->duplex = 0;
- pp->speed = 0;
+ mvneta_port_up(pp);
+}
+ if (mode == MLO_AN_PHY || mode == MLO_AN_FIXED) {
+ val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG);
+ val &= ~MVNETA_GMAC_FORCE_LINK_DOWN;
+ val |= MVNETA_GMAC_FORCE_LINK_PASS;
+ mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);
+ }
- return 0;
+ mvneta_port_up(pp);
+}
+
+static const struct phylink_mac_ops mvneta_phylink_ops = {
+ .mac_get_support = mvneta_mac_support,
+ .mac_link_state = mvneta_mac_link_state,
...
...
@@ -490,7 +501,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
/* Electing a CPU must be done in an atomic way: it should be done
@@ -350
1
,10 +3568,7 @@
static int mvneta_ioctl(struct net_devic
@@ -350
5
,10 +3568,7 @@
static int mvneta_ioctl(struct net_devic
{
struct mvneta_port *pp = netdev_priv(dev);
...
...
@@ -502,7 +513,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
/* Ethtool methods */
@@ -351
4
,54 +3578,15 @@
int mvneta_ethtool_get_settings(struct n
@@ -351
8
,54 +3578,15 @@
int mvneta_ethtool_get_settings(struct n
{
struct mvneta_port *pp = netdev_priv(dev);
...
...
@@ -559,7 +570,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
/* Set interrupt coalescing for ethtools */
@@ -36
69
,7 +3694,8 @@
static void mvneta_ethtool_update_stats(
@@ -36
73
,7 +3694,8 @@
static void mvneta_ethtool_update_stats(
{
const struct mvneta_statistic *s;
void __iomem *base = pp->base;
...
...
@@ -569,7 +580,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
u64 val64;
int i;
@@ -396
4
,14 +3990,13 @@
static int mvneta_probe(struct platform_
@@ -396
8
,14 +3990,13 @@
static int mvneta_probe(struct platform_
const struct mbus_dram_target_info *dram_target_info;
struct resource *res;
struct device_node *dn = pdev->dev.of_node;
...
...
@@ -585,7 +596,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
int tx_csum_limit;
int phy_mode;
int err;
@@ -39
87
,31 +4012,11 @@
static int mvneta_probe(struct platform_
@@ -39
91
,31 +4012,11 @@
static int mvneta_probe(struct platform_
goto err_free_netdev;
}
...
...
@@ -618,7 +629,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
dev->tx_queue_len = MVNETA_MAX_TXD;
@@ -402
2
,12 +4027,7 @@
static int mvneta_probe(struct platform_
@@ -402
6
,12 +4027,7 @@
static int mvneta_probe(struct platform_
pp = netdev_priv(dev);
spin_lock_init(&pp->lock);
...
...
@@ -632,7 +643,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
pp->cpu_notifier.notifier_call = mvneta_percpu_notifier;
pp->rxq_def = rxq_def;
@@ -40
37
,7 +4037,7 @@
static int mvneta_probe(struct platform_
@@ -40
41
,7 +4037,7 @@
static int mvneta_probe(struct platform_
pp->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(pp->clk)) {
err = PTR_ERR(pp->clk);
...
...
@@ -641,7 +652,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
clk_prepare_enable(pp->clk);
@@ -414
0
,6 +4140,14 @@
static int mvneta_probe(struct platform_
@@ -414
4
,6 +4140,14 @@
static int mvneta_probe(struct platform_
dev->priv_flags |= IFF_UNICAST_FLT | IFF_LIVE_ADDR_CHANGE;
dev->gso_max_segs = MVNETA_MAX_TSO_SEGS;
...
...
@@ -656,7 +667,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
err = register_netdev(dev);
if (err < 0) {
dev_err(&pdev->dev, "failed to register\n");
@@ -415
1
,13 +4159,6 @@
static int mvneta_probe(struct platform_
@@ -415
5
,13 +4159,6 @@
static int mvneta_probe(struct platform_
platform_set_drvdata(pdev, pp->dev);
...
...
@@ -670,7 +681,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
return 0;
@@ -41
69
,13 +4170,13 @@
err_netdev:
@@ -41
73
,13 +4170,13 @@
err_netdev:
1 << pp->id);
}
err_free_stats:
...
...
@@ -686,7 +697,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
err_free_irq:
irq_dispose_mapping(dev->irq);
err_free_netdev:
@@ -419
4
,7 +4195,7 @@
static int mvneta_remove(struct platform
@@ -419
8
,7 +4195,7 @@
static int mvneta_remove(struct platform
free_percpu(pp->ports);
free_percpu(pp->stats);
irq_dispose_mapping(dev->irq);
...
...
target/linux/mvebu/patches-4.9/420-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch
浏览文件 @
f09c4d35
...
...
@@ -12,7 +12,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -263
4,9 +2634
,11 @@
static int mvneta_poll(struct napi_struc
@@ -263
0,9 +2630
,11 @@
static int mvneta_poll(struct napi_struc
mvreg_write(pp, MVNETA_INTR_MISC_CAUSE, 0);
if (cause_misc & (MVNETA_CAUSE_PHY_STATUS_CHANGE |
...
...
@@ -26,7 +26,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
}
/* Release Tx descriptors */
@@ -29
51,8 +2953
,7 @@
static void mvneta_start_dev(struct mvne
@@ -29
47,8 +2949
,7 @@
static void mvneta_start_dev(struct mvne
mvreg_write(pp, MVNETA_INTR_MISC_MASK,
MVNETA_CAUSE_PHY_STATUS_CHANGE |
...
...
@@ -36,7 +36,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
phylink_start(pp->phylink);
netif_tx_start_all_queues(pp->dev);
@@ -34
43,8 +3444
,7 @@
static int mvneta_cpu_online(unsigned in
@@ -34
39,8 +3440
,7 @@
static int mvneta_cpu_online(unsigned in
on_each_cpu(mvneta_percpu_unmask_interrupt, pp, true);
mvreg_write(pp, MVNETA_INTR_MISC_MASK,
MVNETA_CAUSE_PHY_STATUS_CHANGE |
...
...
@@ -46,7 +46,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
netif_tx_start_all_queues(pp->dev);
spin_unlock(&pp->lock);
return 0;
@@ -348
5,8 +3485
,7 @@
static int mvneta_cpu_dead(unsigned int
@@ -348
1,8 +3481
,7 @@
static int mvneta_cpu_dead(unsigned int
on_each_cpu(mvneta_percpu_unmask_interrupt, pp, true);
mvreg_write(pp, MVNETA_INTR_MISC_MASK,
MVNETA_CAUSE_PHY_STATUS_CHANGE |
...
...
target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch
浏览文件 @
f09c4d35
...
...
@@ -11,7 +11,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -361
9,6 +3619
,13 @@
mvneta_ethtool_get_link_ksettings(struct
@@ -361
5,6 +3615
,13 @@
mvneta_ethtool_get_link_ksettings(struct
return phylink_ethtool_ksettings_get(pp->phylink, cmd);
}
...
...
@@ -25,7 +25,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
/* Set interrupt coalescing for ethtools */
static int mvneta_ethtool_set_coalesce(struct net_device *dev,
struct ethtool_coalesce *c)
@@ -38
92,6 +3899
,7 @@
static const struct net_device_ops mvnet
@@ -38
88,6 +3895
,7 @@
static const struct net_device_ops mvnet
};
const struct ethtool_ops mvneta_eth_tool_ops = {
...
...
target/linux/mvebu/patches-4.9/424-net-mvneta-add-flow-control-support-via-phylink.patch
浏览文件 @
f09c4d35
...
...
@@ -11,7 +11,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -31
83,6 +3183
,12 @@
static int mvneta_mac_link_state(struct
@@ -31
79,6 +3179
,12 @@
static int mvneta_mac_link_state(struct
state->link = !!(gmac_stat & MVNETA_GMAC_LINK_UP);
state->duplex = !!(gmac_stat & MVNETA_GMAC_FULL_DUPLEX);
...
...
@@ -24,7 +24,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
return 1;
}
@@ -322
5,6 +3231
,8 @@
static void mvneta_mac_config(struct net
@@ -322
1,6 +3227
,8 @@
static void mvneta_mac_config(struct net
if (phylink_test(state->advertising, Pause))
new_an |= MVNETA_GMAC_ADVERT_SYM_FLOW_CTRL;
...
...
@@ -33,7 +33,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
switch (mode) {
case MLO_AN_SGMII:
@@ -324
9,7 +3257
,7 @@
static void mvneta_mac_config(struct net
@@ -324
5,7 +3253
,7 @@
static void mvneta_mac_config(struct net
/* The MAC only supports FD mode */
MVNETA_GMAC_CONFIG_FULL_DUPLEX;
...
...
@@ -42,7 +42,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
new_an |= MVNETA_GMAC_AN_FLOW_CTRL_EN;
break;
@@ -371
5,6 +3723
,22 @@
static int mvneta_ethtool_set_ringparam(
@@ -371
1,6 +3719
,22 @@
static int mvneta_ethtool_set_ringparam(
return 0;
}
...
...
@@ -65,7 +65,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
static void mvneta_ethtool_get_strings(struct net_device *netdev, u32 sset,
u8 *data)
{
@@ -390
6,6 +3930
,8 @@
const struct ethtool_ops mvneta_eth_tool
@@ -390
2,6 +3926
,8 @@
const struct ethtool_ops mvneta_eth_tool
.get_drvinfo = mvneta_ethtool_get_drvinfo,
.get_ringparam = mvneta_ethtool_get_ringparam,
.set_ringparam = mvneta_ethtool_set_ringparam,
...
...
target/linux/mvebu/patches-4.9/425-net-mvneta-enable-flow-control-for-PHY-connections.patch
浏览文件 @
f09c4d35
...
...
@@ -12,7 +12,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -315
7,10 +3157
,11 @@
static void mvneta_validate_support(stru
@@ -315
3,10 +3153
,11 @@
static void mvneta_validate_support(stru
phylink_set(mask, 10baseT_Full);
phylink_set(mask, 100baseT_Half);
phylink_set(mask, 100baseT_Full);
...
...
target/linux/mvebu/patches-4.9/426-net-mvneta-enable-flow-control-for-fixed-connections.patch
浏览文件 @
f09c4d35
...
...
@@ -11,7 +11,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -314
7,6 +3147
,8 @@
static void mvneta_validate_support(stru
@@ -314
3,6 +3143
,8 @@
static void mvneta_validate_support(stru
phylink_set(mask, BNC);
phylink_set(mask, Backplane);
...
...
@@ -20,7 +20,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
/* Half-duplex at speeds higher than 100Mbit is unsupported */
phylink_set(mask, 1000baseT_Full);
phylink_set(mask, 1000baseX_Full);
@@ -315
9,9 +3161
,6 @@
static void mvneta_validate_support(stru
@@ -315
5,9 +3157
,6 @@
static void mvneta_validate_support(stru
phylink_set(mask, 100baseT_Full);
}
...
...
target/linux/mvebu/patches-4.9/427-phylink-add-EEE-support.patch
浏览文件 @
f09c4d35
...
...
@@ -10,7 +10,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -330
9,7 +3309
,8 @@
static void mvneta_mac_link_down(struct
@@ -330
5,7 +3305
,8 @@
static void mvneta_mac_link_down(struct
}
}
...
...
target/linux/mvebu/patches-4.9/428-net-mvneta-add-EEE-support.patch
浏览文件 @
f09c4d35
...
...
@@ -65,7 +65,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
u64 ethtool_stats[ARRAY_SIZE(mvneta_statistics)];
u32 indir[MVNETA_RSS_LU_TABLE_SIZE];
@@ -329
4,6 +3311
,18 @@
static void mvneta_mac_config(struct net
@@ -329
0,6 +3307
,18 @@
static void mvneta_mac_config(struct net
mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, new_an);
}
...
...
@@ -84,7 +84,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
static void mvneta_mac_link_down(struct net_device *ndev, unsigned int mode)
{
struct mvneta_port *pp = netdev_priv(ndev);
@@ -330
7,6 +3336
,9 @@
static void mvneta_mac_link_down(struct
@@ -330
3,6 +3332
,9 @@
static void mvneta_mac_link_down(struct
val |= MVNETA_GMAC_FORCE_LINK_DOWN;
mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);
}
...
...
@@ -94,7 +94,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
static void mvneta_mac_link_up(struct net_device *ndev, unsigned int mode,
@@ -33
23,6 +3355
,11 @@
static void mvneta_mac_link_up(struct ne
@@ -33
19,6 +3351
,11 @@
static void mvneta_mac_link_up(struct ne
}
mvneta_port_up(pp);
...
...
@@ -106,7 +106,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
static const struct phylink_mac_ops mvneta_phylink_ops = {
@@ -377
5,6 +3812
,13 @@
static void mvneta_ethtool_update_stats(
@@ -377
1,6 +3808
,13 @@
static void mvneta_ethtool_update_stats(
high = readl_relaxed(base + s->offset + 4);
val = (u64)high << 32 | low;
break;
...
...
@@ -120,7 +120,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
pp->ethtool_stats[i] += val;
@@ -39
10,6 +3954
,47 @@
static u16 mvneta_select_queue(struct ne
@@ -39
06,6 +3950
,47 @@
static u16 mvneta_select_queue(struct ne
}
...
...
@@ -168,7 +168,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
static const struct net_device_ops mvneta_netdev_ops = {
.ndo_open = mvneta_open,
.ndo_stop = mvneta_stop,
@@ -39
42,6 +4027
,8 @@
const struct ethtool_ops mvneta_eth_tool
@@ -39
38,6 +4023
,8 @@
const struct ethtool_ops mvneta_eth_tool
.set_rxfh = mvneta_ethtool_set_rxfh,
.get_link_ksettings = mvneta_ethtool_get_link_ksettings,
.set_link_ksettings = mvneta_ethtool_set_link_ksettings,
...
...
target/linux/mvebu/patches-4.9/430-net-mvneta-add-module-EEPROM-reading-support.patch
浏览文件 @
f09c4d35
...
...
@@ -7,7 +7,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -395
4,6 +3954
,22 @@
static u16 mvneta_select_queue(struct ne
@@ -395
0,6 +3950
,22 @@
static u16 mvneta_select_queue(struct ne
}
...
...
@@ -30,7 +30,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
static int mvneta_ethtool_get_eee(struct net_device *dev,
struct ethtool_eee *eee)
{
@@ -402
7,6 +4043
,8 @@
const struct ethtool_ops mvneta_eth_tool
@@ -402
3,6 +4039
,8 @@
const struct ethtool_ops mvneta_eth_tool
.set_rxfh = mvneta_ethtool_set_rxfh,
.get_link_ksettings = mvneta_ethtool_get_link_ksettings,
.set_link_ksettings = mvneta_ethtool_set_link_ksettings,
...
...
target/linux/oxnas/patches-4.4/996-ATAG_DTB_COMPAT_CMDLINE_MANGLE.patch
浏览文件 @
f09c4d35
...
...
@@ -153,7 +153,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
}
--- a/init/main.c
+++ b/init/main.c
@@ -8
8,6 +88
,10 @@
@@ -8
9,6 +89
,10 @@
#include <asm/sections.h>
#include <asm/cacheflush.h>
...
...
@@ -164,7 +164,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
static int kernel_init(void *);
extern void init_IRQ(void);
@@ -56
0,6 +564
,18 @@
asmlinkage __visible void __init start_k
@@ -56
2,6 +566
,18 @@
asmlinkage __visible void __init start_k
page_alloc_init();
pr_notice("Kernel command line: %s\n", boot_command_line);
...
...
target/linux/x86/patches-4.9/200-pcengines-apu2-reboot.patch
浏览文件 @
f09c4d35
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -44
3,6 +443
,16 @@
static struct dmi_system_id __initdata r
@@ -44
7,6 +447
,16 @@
static struct dmi_system_id __initdata r
},
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录