Linux v4.0-rc4-88-g7b09ac704bac

- Rename arm64-xgbe-a0.patch
This commit is contained in:
Josh Boyer 2015-03-19 16:01:37 -04:00
parent 1b5309d39e
commit 287e820f02
7 changed files with 70 additions and 36 deletions

View File

@ -115,10 +115,10 @@ index ef17683484e9..105e7360d747 100644
setup_efi_pci(boot_params); setup_efi_pci(boot_params);
diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
index 44e6dd7e36a2..3ddf4150bd9e 100644 index 225b0988043a..90dbfb73e11f 100644
--- a/arch/x86/include/uapi/asm/bootparam.h --- a/arch/x86/include/uapi/asm/bootparam.h
+++ b/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h
@@ -134,7 +134,8 @@ struct boot_params { @@ -133,7 +133,8 @@ struct boot_params {
__u8 eddbuf_entries; /* 0x1e9 */ __u8 eddbuf_entries; /* 0x1e9 */
__u8 edd_mbr_sig_buf_entries; /* 0x1ea */ __u8 edd_mbr_sig_buf_entries; /* 0x1ea */
__u8 kbd_status; /* 0x1eb */ __u8 kbd_status; /* 0x1eb */
@ -129,10 +129,10 @@ index 44e6dd7e36a2..3ddf4150bd9e 100644
* The sentinel is set to a nonzero value (0xff) in header.S. * The sentinel is set to a nonzero value (0xff) in header.S.
* *
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 98dc9317286e..26741d24797e 100644 index 0a2421cca01f..a3d8174dedf9 100644
--- a/arch/x86/kernel/setup.c --- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c
@@ -1165,6 +1165,12 @@ void __init setup_arch(char **cmdline_p) @@ -1151,6 +1151,12 @@ void __init setup_arch(char **cmdline_p)
io_delay_init(); io_delay_init();
@ -146,7 +146,7 @@ index 98dc9317286e..26741d24797e 100644
* Parse the ACPI tables for possible boot-time SMP configuration. * Parse the ACPI tables for possible boot-time SMP configuration.
*/ */
diff --git a/include/linux/module.h b/include/linux/module.h diff --git a/include/linux/module.h b/include/linux/module.h
index 0c86ec9e10ed..b02dfaacc76c 100644 index b033dab5c8bf..f526b6e02f59 100644
--- a/include/linux/module.h --- a/include/linux/module.h
+++ b/include/linux/module.h +++ b/include/linux/module.h
@@ -188,6 +188,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add); @@ -188,6 +188,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add);

View File

@ -16,10 +16,10 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
2 files changed, 17 insertions(+) 2 files changed, 17 insertions(+)
diff --git a/include/linux/module.h b/include/linux/module.h diff --git a/include/linux/module.h b/include/linux/module.h
index 42999fe2dbd0..0c86ec9e10ed 100644 index b03485bcb82a..b033dab5c8bf 100644
--- a/include/linux/module.h --- a/include/linux/module.h
+++ b/include/linux/module.h +++ b/include/linux/module.h
@@ -502,6 +502,8 @@ int unregister_module_notifier(struct notifier_block *nb); @@ -506,6 +506,8 @@ int unregister_module_notifier(struct notifier_block *nb);
extern void print_modules(void); extern void print_modules(void);
@ -28,7 +28,7 @@ index 42999fe2dbd0..0c86ec9e10ed 100644
#else /* !CONFIG_MODULES... */ #else /* !CONFIG_MODULES... */
/* Given an address, look for it in the exception tables. */ /* Given an address, look for it in the exception tables. */
@@ -612,6 +614,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb) @@ -616,6 +618,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
static inline void print_modules(void) static inline void print_modules(void)
{ {
} }

View File

@ -15,7 +15,7 @@ Upstream-status: Fedora mustard
7 files changed, 65 insertions(+), 10 deletions(-) 7 files changed, 65 insertions(+), 10 deletions(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 64a123acb97f..2964c69e7c8e 100644 index 26c5d54124c1..dab298f03a9c 100644
--- a/arch/x86/kernel/setup.c --- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c
@@ -70,6 +70,11 @@ @@ -70,6 +70,11 @@
@ -30,7 +30,7 @@ index 64a123acb97f..2964c69e7c8e 100644
#include <video/edid.h> #include <video/edid.h>
#include <asm/mtrr.h> #include <asm/mtrr.h>
@@ -1292,6 +1297,37 @@ void __init i386_reserve_resources(void) @@ -1278,6 +1283,37 @@ void __init i386_reserve_resources(void)
#endif /* CONFIG_X86_32 */ #endif /* CONFIG_X86_32 */

View File

@ -12,10 +12,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
2 files changed, 3 insertions(+) 2 files changed, 3 insertions(+)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 26741d24797e..64a123acb97f 100644 index a3d8174dedf9..26c5d54124c1 100644
--- a/arch/x86/kernel/setup.c --- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c
@@ -1167,7 +1167,9 @@ void __init setup_arch(char **cmdline_p) @@ -1153,7 +1153,9 @@ void __init setup_arch(char **cmdline_p)
#ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
if (boot_params.secure_boot) { if (boot_params.secure_boot) {

View File

@ -70,7 +70,7 @@ Summary: The Linux kernel
# The rc snapshot level # The rc snapshot level
%define rcrev 4 %define rcrev 4
# The git snapshot level # The git snapshot level
%define gitrev 0 %define gitrev 1
# Set rpm version accordingly # Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0 %define rpmversion 4.%{upstream_sublevel}.0
%endif %endif
@ -583,7 +583,7 @@ Patch15000: watchdog-Disable-watchdog-on-virtual-machines.patch
# PPC # PPC
# ARM64 # ARM64
Patch21000: arm64-xgbe-a0.patch Patch21000: net-amd-Add-xgbe-a0-driver.patch
# ARMv7 # ARMv7
Patch21020: ARM-tegra-usb-no-reset.patch Patch21020: ARM-tegra-usb-no-reset.patch
@ -1228,7 +1228,7 @@ ApplyPatch lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
# PPC # PPC
# ARM64 # ARM64
ApplyPatch arm64-xgbe-a0.patch ApplyPatch net-amd-Add-xgbe-a0-driver.patch
# #
# ARM # ARM
@ -2257,6 +2257,10 @@ fi
# #
# #
%changelog %changelog
* Thu Mar 19 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc4.git1.3
- Linux v4.0-rc4-88-g7b09ac704bac
- Rename arm64-xgbe-a0.patch
* Thu Mar 19 2015 Peter Robinson <pbrobinson@fedoraproject.org> * Thu Mar 19 2015 Peter Robinson <pbrobinson@fedoraproject.org>
- Drop arm64 non upstream patch - Drop arm64 non upstream patch

View File

@ -1,15 +1,41 @@
commit b66e64d01c606a2033d4bbb3ca95f6506a9188f4 From: Tom Lendacky <thomas.lendacky@amd.com>
Author: Tom Lendacky <thomas.lendacky@amd.com> Date: Sat, 21 Feb 2015 12:25:12 -0500
Date: Sat Feb 21 12:25:12 2015 -0500 Subject: [PATCH] net: amd: Add xgbe-a0 driver
net: amd: DO NOT UPSTREAM: Add xgbe-a0 driver Add support for A0 silicon xgbe driver. This won't be upstreamed because
the HW is being replaced with a better version.
Add support for A0 silicon xgbe driver Signed-off-by: Mark Salter <msalter@redhat.com>
---
Signed-off-by: Mark Salter <msalter@redhat.com> drivers/net/ethernet/amd/Makefile | 1 +
drivers/net/ethernet/amd/xgbe-a0/Makefile | 8 +
drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h | 1142 +++++++++
drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c | 269 ++
drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c | 373 +++
drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c | 636 +++++
drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c | 2964 +++++++++++++++++++++++
drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c | 2204 +++++++++++++++++
drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c | 616 +++++
drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c | 643 +++++
drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c | 312 +++
drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c | 284 +++
drivers/net/ethernet/amd/xgbe-a0/xgbe.h | 868 +++++++
13 files changed, 10320 insertions(+)
create mode 100644 drivers/net/ethernet/amd/xgbe-a0/Makefile
create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h
create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c
create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c
create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c
create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c
create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c
create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c
create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c
create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c
create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c
create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe.h
diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile
index a38a2dc..bf0cf2f 100644 index a38a2dce3eb3..bf0cf2f8d2db 100644
--- a/drivers/net/ethernet/amd/Makefile --- a/drivers/net/ethernet/amd/Makefile
+++ b/drivers/net/ethernet/amd/Makefile +++ b/drivers/net/ethernet/amd/Makefile
@@ -18,3 +18,4 @@ obj-$(CONFIG_PCNET32) += pcnet32.o @@ -18,3 +18,4 @@ obj-$(CONFIG_PCNET32) += pcnet32.o
@ -19,7 +45,7 @@ index a38a2dc..bf0cf2f 100644
+obj-$(CONFIG_AMD_XGBE) += xgbe-a0/ +obj-$(CONFIG_AMD_XGBE) += xgbe-a0/
diff --git a/drivers/net/ethernet/amd/xgbe-a0/Makefile b/drivers/net/ethernet/amd/xgbe-a0/Makefile diff --git a/drivers/net/ethernet/amd/xgbe-a0/Makefile b/drivers/net/ethernet/amd/xgbe-a0/Makefile
new file mode 100644 new file mode 100644
index 0000000..561116f index 000000000000..561116faadae
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/Makefile +++ b/drivers/net/ethernet/amd/xgbe-a0/Makefile
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
@ -33,7 +59,7 @@ index 0000000..561116f
+amd-xgbe-a0-$(CONFIG_DEBUG_FS) += xgbe-debugfs.o +amd-xgbe-a0-$(CONFIG_DEBUG_FS) += xgbe-debugfs.o
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h b/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h b/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h
new file mode 100644 new file mode 100644
index 0000000..75b08c6 index 000000000000..75b08c63d39f
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h +++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h
@@ -0,0 +1,1142 @@ @@ -0,0 +1,1142 @@
@ -1181,7 +1207,7 @@ index 0000000..75b08c6
+#endif +#endif
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c
new file mode 100644 new file mode 100644
index 0000000..343301c index 000000000000..343301cbf7b4
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c +++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c
@@ -0,0 +1,269 @@ @@ -0,0 +1,269 @@
@ -1456,7 +1482,7 @@ index 0000000..343301c
+} +}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c
new file mode 100644 new file mode 100644
index 0000000..ecfa6f9 index 000000000000..ecfa6f91da22
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c +++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c
@@ -0,0 +1,373 @@ @@ -0,0 +1,373 @@
@ -1835,7 +1861,7 @@ index 0000000..ecfa6f9
+} +}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c
new file mode 100644 new file mode 100644
index 0000000..5dd5777 index 000000000000..5dd57779c82c
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c +++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c
@@ -0,0 +1,636 @@ @@ -0,0 +1,636 @@
@ -2477,7 +2503,7 @@ index 0000000..5dd5777
+} +}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c
new file mode 100644 new file mode 100644
index 0000000..f6a3a58 index 000000000000..f6a3a581cc21
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c +++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c
@@ -0,0 +1,2964 @@ @@ -0,0 +1,2964 @@
@ -5447,7 +5473,7 @@ index 0000000..f6a3a58
+} +}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c
new file mode 100644 new file mode 100644
index 0000000..acaeaf5 index 000000000000..acaeaf56b63f
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c
@@ -0,0 +1,2204 @@ @@ -0,0 +1,2204 @@
@ -7657,7 +7683,7 @@ index 0000000..acaeaf5
+} +}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c
new file mode 100644 new file mode 100644
index 0000000..165ff1c index 000000000000..165ff1ceedcc
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c +++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c
@@ -0,0 +1,616 @@ @@ -0,0 +1,616 @@
@ -8279,7 +8305,7 @@ index 0000000..165ff1c
+} +}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c
new file mode 100644 new file mode 100644
index 0000000..a85fb49 index 000000000000..a85fb4965835
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c +++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c
@@ -0,0 +1,643 @@ @@ -0,0 +1,643 @@
@ -8928,7 +8954,7 @@ index 0000000..a85fb49
+module_platform_driver(xgbe_a0_driver); +module_platform_driver(xgbe_a0_driver);
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c
new file mode 100644 new file mode 100644
index 0000000..b84d048 index 000000000000..b84d0481bed8
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c +++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c
@@ -0,0 +1,312 @@ @@ -0,0 +1,312 @@
@ -9246,7 +9272,7 @@ index 0000000..b84d048
+} +}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c
new file mode 100644 new file mode 100644
index 0000000..c53c7b2 index 000000000000..c53c7b2a4b08
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c +++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c
@@ -0,0 +1,284 @@ @@ -0,0 +1,284 @@
@ -9536,7 +9562,7 @@ index 0000000..c53c7b2
+} +}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe.h b/drivers/net/ethernet/amd/xgbe-a0/xgbe.h diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe.h b/drivers/net/ethernet/amd/xgbe-a0/xgbe.h
new file mode 100644 new file mode 100644
index 0000000..dd8500d index 000000000000..dd8500da98a6
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe.h +++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe.h
@@ -0,0 +1,868 @@ @@ -0,0 +1,868 @@
@ -10408,3 +10434,6 @@ index 0000000..dd8500d
+#endif +#endif
+ +
+#endif +#endif
--
2.1.0

View File

@ -1,2 +1,3 @@
0e37c076159538ff882f190d87fe9798 linux-4.0-rc4.tar.xz 0e37c076159538ff882f190d87fe9798 linux-4.0-rc4.tar.xz
53996d49f76b39851ab26efd8c70fe53 perf-man-4.0-rc4.tar.gz 53996d49f76b39851ab26efd8c70fe53 perf-man-4.0-rc4.tar.gz
d7329b178dd9f962c06e63b246cc89e5 patch-4.0-rc4-git1.xz